forked from farhoodlabs/paperclip
d734bd43d1
## Thinking Path > - Paperclip is the control plane for autonomous AI companies, so agent work needs visible ownership, recovery, and operator controls. > - This local branch had accumulated several related control-plane reliability and operator-experience fixes across recovery actions, watchdog folding, model-profile defaults, mentions, markdown editing, plugin launchers, and small UI polish. > - The branch needed to be converted into a PR against the current `origin/master` without losing dirty work or including lockfile/workflow churn. > - The safest standalone shape is a single rollup PR because the recovery/server/UI files overlap heavily across the local commits and splitting would create avoidable conflicts. > - This pull request replays the local branch onto latest `origin/master`, preserves the uncommitted work as logical commits, and adds a Zod 4 validator compatibility fix found during verification. > - The benefit is that the May 17 local branch can be reviewed and merged as one coherent, conflict-free branch under the 100-file Greptile limit. ## What Changed - Rebased the local May 17 branch work onto current `origin/master` in a dedicated worktree. - Preserved and committed previously dirty changes for recovery retry handling, plugin/sidebar launcher polish, and `.herenow` ignores. - Added recovery-action behavior for returning source issues to `todo` when retrying source-scoped recovery. - Included the existing local recovery/liveness/watchdog fold, Codex cheap-profile, markdown/mention, duplicate-agent, and UI polish commits from the branch. - Normalized shared validator `z.record(...)` schemas to explicit string-key records for Zod 4 compatibility. - Confirmed the PR has no `pnpm-lock.yaml` or `.github/workflows/*` changes and stays below the 100-file Greptile limit. ## Verification - `pnpm install --frozen-lockfile --ignore-scripts` - `npm run install` in `node_modules/.pnpm/sqlite3@5.1.7/node_modules/sqlite3` to build the local native sqlite3 binding after installing with scripts disabled - `pnpm exec vitest run packages/shared/src/validators/issue.test.ts packages/shared/src/project-mentions.test.ts packages/adapter-utils/src/server-utils.test.ts server/src/__tests__/heartbeat-model-profile.test.ts server/src/__tests__/issue-recovery-actions.test.ts server/src/__tests__/issue-agent-mutation-ownership-routes.test.ts server/src/__tests__/heartbeat-active-run-output-watchdog.test.ts server/src/__tests__/plugin-local-folders.test.ts ui/src/components/IssueRecoveryActionCard.test.tsx ui/src/components/Sidebar.test.tsx ui/src/components/SidebarAccountMenu.test.tsx ui/src/components/IssueProperties.test.tsx ui/src/components/MarkdownEditor.test.tsx ui/src/components/MarkdownBody.test.tsx ui/src/lib/duplicate-agent-payload.test.ts ui/src/pages/Routines.test.tsx` - First pass: 13 files passed with 201 passing tests; 3 server files failed before sqlite3 native binding was built. - After rebuilding sqlite3: `server/src/__tests__/heartbeat-model-profile.test.ts`, `server/src/__tests__/issue-recovery-actions.test.ts`, and `server/src/__tests__/heartbeat-active-run-output-watchdog.test.ts` passed/loaded; embedded Postgres tests were skipped by the local host guard. - `pnpm --filter @paperclipai/shared typecheck` - `pnpm --filter @paperclipai/adapter-utils typecheck` - `pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/ui typecheck` ## Risks - Medium risk: this is a broad rollup PR across recovery semantics, server tests, shared validators, and UI surfaces. - Some embedded Postgres tests skipped locally due the host guard, so CI should provide the stronger database-backed signal. - UI changes were covered by component tests, but no browser screenshot was captured in this PR creation pass. - This branch may overlap with existing recovery/liveness PR work; merge this PR independently or restack/close overlapping branches rather than merging duplicate implementations together. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex, GPT-5-based coding agent, tool-enabled local repository and GitHub workflow, medium reasoning effort. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [ ] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
138 lines
4.8 KiB
TypeScript
138 lines
4.8 KiB
TypeScript
import { z } from "zod";
|
|
|
|
export const companySkillSourceTypeSchema = z.enum(["local_path", "github", "url", "catalog", "skills_sh"]);
|
|
export const companySkillTrustLevelSchema = z.enum(["markdown_only", "assets", "scripts_executables"]);
|
|
export const companySkillCompatibilitySchema = z.enum(["compatible", "unknown", "invalid"]);
|
|
export const companySkillSourceBadgeSchema = z.enum(["paperclip", "github", "local", "url", "catalog", "skills_sh"]);
|
|
|
|
export const companySkillFileInventoryEntrySchema = z.object({
|
|
path: z.string().min(1),
|
|
kind: z.enum(["skill", "markdown", "reference", "script", "asset", "other"]),
|
|
});
|
|
|
|
export const companySkillSchema = z.object({
|
|
id: z.string().uuid(),
|
|
companyId: z.string().uuid(),
|
|
key: z.string().min(1),
|
|
slug: z.string().min(1),
|
|
name: z.string().min(1),
|
|
description: z.string().nullable(),
|
|
markdown: z.string(),
|
|
sourceType: companySkillSourceTypeSchema,
|
|
sourceLocator: z.string().nullable(),
|
|
sourceRef: z.string().nullable(),
|
|
trustLevel: companySkillTrustLevelSchema,
|
|
compatibility: companySkillCompatibilitySchema,
|
|
fileInventory: z.array(companySkillFileInventoryEntrySchema).default([]),
|
|
metadata: z.record(z.string(), z.unknown()).nullable(),
|
|
createdAt: z.coerce.date(),
|
|
updatedAt: z.coerce.date(),
|
|
});
|
|
|
|
export const companySkillListItemSchema = companySkillSchema.extend({
|
|
attachedAgentCount: z.number().int().nonnegative(),
|
|
editable: z.boolean(),
|
|
editableReason: z.string().nullable(),
|
|
sourceLabel: z.string().nullable(),
|
|
sourceBadge: companySkillSourceBadgeSchema,
|
|
});
|
|
|
|
export const companySkillUsageAgentSchema = z.object({
|
|
id: z.string().uuid(),
|
|
name: z.string().min(1),
|
|
urlKey: z.string().min(1),
|
|
adapterType: z.string().min(1),
|
|
desired: z.boolean(),
|
|
actualState: z.string().nullable().describe(
|
|
"Runtime adapter skill state when explicitly fetched; company skill detail reads return null without probing agent runtimes.",
|
|
),
|
|
});
|
|
|
|
export const companySkillDetailSchema = companySkillSchema.extend({
|
|
attachedAgentCount: z.number().int().nonnegative(),
|
|
usedByAgents: z.array(companySkillUsageAgentSchema).default([]),
|
|
editable: z.boolean(),
|
|
editableReason: z.string().nullable(),
|
|
sourceLabel: z.string().nullable(),
|
|
sourceBadge: companySkillSourceBadgeSchema,
|
|
});
|
|
|
|
export const companySkillUpdateStatusSchema = z.object({
|
|
supported: z.boolean(),
|
|
reason: z.string().nullable(),
|
|
trackingRef: z.string().nullable(),
|
|
currentRef: z.string().nullable(),
|
|
latestRef: z.string().nullable(),
|
|
hasUpdate: z.boolean(),
|
|
});
|
|
|
|
export const companySkillImportSchema = z.object({
|
|
source: z.string().min(1),
|
|
});
|
|
|
|
export const companySkillProjectScanRequestSchema = z.object({
|
|
projectIds: z.array(z.string().uuid()).optional(),
|
|
workspaceIds: z.array(z.string().uuid()).optional(),
|
|
});
|
|
|
|
export const companySkillProjectScanSkippedSchema = z.object({
|
|
projectId: z.string().uuid(),
|
|
projectName: z.string().min(1),
|
|
workspaceId: z.string().uuid().nullable(),
|
|
workspaceName: z.string().nullable(),
|
|
path: z.string().nullable(),
|
|
reason: z.string().min(1),
|
|
});
|
|
|
|
export const companySkillProjectScanConflictSchema = z.object({
|
|
slug: z.string().min(1),
|
|
key: z.string().min(1),
|
|
projectId: z.string().uuid(),
|
|
projectName: z.string().min(1),
|
|
workspaceId: z.string().uuid(),
|
|
workspaceName: z.string().min(1),
|
|
path: z.string().min(1),
|
|
existingSkillId: z.string().uuid(),
|
|
existingSkillKey: z.string().min(1),
|
|
existingSourceLocator: z.string().nullable(),
|
|
reason: z.string().min(1),
|
|
});
|
|
|
|
export const companySkillProjectScanResultSchema = z.object({
|
|
scannedProjects: z.number().int().nonnegative(),
|
|
scannedWorkspaces: z.number().int().nonnegative(),
|
|
discovered: z.number().int().nonnegative(),
|
|
imported: z.array(companySkillSchema),
|
|
updated: z.array(companySkillSchema),
|
|
skipped: z.array(companySkillProjectScanSkippedSchema),
|
|
conflicts: z.array(companySkillProjectScanConflictSchema),
|
|
warnings: z.array(z.string()),
|
|
});
|
|
|
|
export const companySkillCreateSchema = z.object({
|
|
name: z.string().min(1),
|
|
slug: z.string().min(1).nullable().optional(),
|
|
description: z.string().nullable().optional(),
|
|
markdown: z.string().nullable().optional(),
|
|
});
|
|
|
|
export const companySkillFileDetailSchema = z.object({
|
|
skillId: z.string().uuid(),
|
|
path: z.string().min(1),
|
|
kind: z.enum(["skill", "markdown", "reference", "script", "asset", "other"]),
|
|
content: z.string(),
|
|
language: z.string().nullable(),
|
|
markdown: z.boolean(),
|
|
editable: z.boolean(),
|
|
});
|
|
|
|
export const companySkillFileUpdateSchema = z.object({
|
|
path: z.string().min(1),
|
|
content: z.string(),
|
|
});
|
|
|
|
export type CompanySkillImport = z.infer<typeof companySkillImportSchema>;
|
|
export type CompanySkillProjectScan = z.infer<typeof companySkillProjectScanRequestSchema>;
|
|
export type CompanySkillCreate = z.infer<typeof companySkillCreateSchema>;
|
|
export type CompanySkillFileUpdate = z.infer<typeof companySkillFileUpdateSchema>;
|