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>
164 lines
6.5 KiB
TypeScript
164 lines
6.5 KiB
TypeScript
import { z } from "zod";
|
|
import {
|
|
ISSUE_PRIORITIES,
|
|
ROUTINE_CATCH_UP_POLICIES,
|
|
ROUTINE_CONCURRENCY_POLICIES,
|
|
ROUTINE_STATUSES,
|
|
ROUTINE_TRIGGER_KINDS,
|
|
ROUTINE_TRIGGER_SIGNING_MODES,
|
|
ROUTINE_VARIABLE_TYPES,
|
|
} from "../constants.js";
|
|
import {
|
|
ISSUE_EXECUTION_WORKSPACE_PREFERENCES,
|
|
issueExecutionWorkspaceSettingsSchema,
|
|
} from "./issue.js";
|
|
import { envConfigSchema } from "./secret.js";
|
|
|
|
const routineVariableValueSchema = z.union([z.string(), z.number().finite(), z.boolean()]);
|
|
|
|
export const routineVariableSchema = z.object({
|
|
name: z.string().trim().regex(/^[A-Za-z][A-Za-z0-9_]*$/),
|
|
label: z.string().trim().max(120).optional().nullable(),
|
|
type: z.enum(ROUTINE_VARIABLE_TYPES).optional().default("text"),
|
|
defaultValue: routineVariableValueSchema.optional().nullable(),
|
|
required: z.boolean().optional().default(true),
|
|
options: z.array(z.string().trim().min(1).max(120)).max(50).optional().default([]),
|
|
}).superRefine((value, ctx) => {
|
|
if (value.type === "select" && value.options.length === 0) {
|
|
ctx.addIssue({
|
|
code: z.ZodIssueCode.custom,
|
|
path: ["options"],
|
|
message: "Select variables require at least one option",
|
|
});
|
|
}
|
|
if (value.type !== "select" && value.options.length > 0) {
|
|
ctx.addIssue({
|
|
code: z.ZodIssueCode.custom,
|
|
path: ["options"],
|
|
message: "Only select variables can define options",
|
|
});
|
|
}
|
|
if (value.type === "select" && value.defaultValue != null) {
|
|
if (typeof value.defaultValue !== "string" || !value.options.includes(value.defaultValue)) {
|
|
ctx.addIssue({
|
|
code: z.ZodIssueCode.custom,
|
|
path: ["defaultValue"],
|
|
message: "Select variable defaults must match one of the allowed options",
|
|
});
|
|
}
|
|
}
|
|
});
|
|
|
|
export const createRoutineSchema = z.object({
|
|
projectId: z.string().uuid().optional().nullable(),
|
|
goalId: z.string().uuid().optional().nullable(),
|
|
parentIssueId: z.string().uuid().optional().nullable(),
|
|
title: z.string().trim().min(1).max(200),
|
|
description: z.string().optional().nullable(),
|
|
assigneeAgentId: z.string().uuid().optional().nullable(),
|
|
priority: z.enum(ISSUE_PRIORITIES).optional().default("medium"),
|
|
status: z.enum(ROUTINE_STATUSES).optional().default("active"),
|
|
concurrencyPolicy: z.enum(ROUTINE_CONCURRENCY_POLICIES).optional().default("coalesce_if_active"),
|
|
catchUpPolicy: z.enum(ROUTINE_CATCH_UP_POLICIES).optional().default("skip_missed"),
|
|
variables: z.array(routineVariableSchema).optional().default([]),
|
|
env: envConfigSchema.optional().nullable(),
|
|
});
|
|
|
|
export type CreateRoutine = z.infer<typeof createRoutineSchema>;
|
|
|
|
export const updateRoutineSchema = createRoutineSchema.partial().extend({
|
|
baseRevisionId: z.string().uuid().optional().nullable(),
|
|
});
|
|
export type UpdateRoutine = z.infer<typeof updateRoutineSchema>;
|
|
|
|
export const routineRevisionSnapshotRoutineV1Schema = z.object({
|
|
id: z.string().uuid(),
|
|
companyId: z.string().uuid(),
|
|
projectId: z.string().uuid().nullable(),
|
|
goalId: z.string().uuid().nullable(),
|
|
parentIssueId: z.string().uuid().nullable(),
|
|
title: z.string().trim().min(1).max(200),
|
|
description: z.string().nullable(),
|
|
assigneeAgentId: z.string().uuid().nullable(),
|
|
priority: z.enum(ISSUE_PRIORITIES),
|
|
status: z.enum(ROUTINE_STATUSES),
|
|
concurrencyPolicy: z.enum(ROUTINE_CONCURRENCY_POLICIES),
|
|
catchUpPolicy: z.enum(ROUTINE_CATCH_UP_POLICIES),
|
|
variables: z.array(routineVariableSchema),
|
|
env: envConfigSchema.nullable().default(null),
|
|
}).strict();
|
|
|
|
export const routineRevisionSnapshotTriggerV1Schema = z.object({
|
|
id: z.string().uuid(),
|
|
kind: z.enum(ROUTINE_TRIGGER_KINDS),
|
|
label: z.string().nullable(),
|
|
enabled: z.boolean(),
|
|
cronExpression: z.string().nullable(),
|
|
timezone: z.string().nullable(),
|
|
publicId: z.string().nullable(),
|
|
signingMode: z.enum(ROUTINE_TRIGGER_SIGNING_MODES).nullable(),
|
|
replayWindowSec: z.number().int().min(30).max(86_400).nullable(),
|
|
}).strict();
|
|
|
|
export const routineRevisionSnapshotV1Schema = z.object({
|
|
version: z.literal(1),
|
|
routine: routineRevisionSnapshotRoutineV1Schema,
|
|
triggers: z.array(routineRevisionSnapshotTriggerV1Schema),
|
|
}).strict();
|
|
|
|
export const routineRevisionSnapshotSchema = routineRevisionSnapshotV1Schema;
|
|
export type RoutineRevisionSnapshotV1 = z.infer<typeof routineRevisionSnapshotV1Schema>;
|
|
export type RoutineRevisionSnapshot = z.infer<typeof routineRevisionSnapshotSchema>;
|
|
|
|
const baseTriggerSchema = z.object({
|
|
label: z.string().trim().max(120).optional().nullable(),
|
|
enabled: z.boolean().optional().default(true),
|
|
});
|
|
|
|
export const createRoutineTriggerSchema = z.discriminatedUnion("kind", [
|
|
baseTriggerSchema.extend({
|
|
kind: z.literal("schedule"),
|
|
cronExpression: z.string().trim().min(1),
|
|
timezone: z.string().trim().min(1).default("UTC"),
|
|
}),
|
|
baseTriggerSchema.extend({
|
|
kind: z.literal("webhook"),
|
|
signingMode: z.enum(ROUTINE_TRIGGER_SIGNING_MODES).optional().default("bearer"),
|
|
replayWindowSec: z.number().int().min(30).max(86_400).optional().default(300),
|
|
}),
|
|
baseTriggerSchema.extend({
|
|
kind: z.literal("api"),
|
|
}),
|
|
]);
|
|
|
|
export type CreateRoutineTrigger = z.infer<typeof createRoutineTriggerSchema>;
|
|
|
|
export const updateRoutineTriggerSchema = z.object({
|
|
label: z.string().trim().max(120).optional().nullable(),
|
|
enabled: z.boolean().optional(),
|
|
cronExpression: z.string().trim().min(1).optional().nullable(),
|
|
timezone: z.string().trim().min(1).optional().nullable(),
|
|
signingMode: z.enum(ROUTINE_TRIGGER_SIGNING_MODES).optional().nullable(),
|
|
replayWindowSec: z.number().int().min(30).max(86_400).optional().nullable(),
|
|
});
|
|
|
|
export type UpdateRoutineTrigger = z.infer<typeof updateRoutineTriggerSchema>;
|
|
|
|
export const runRoutineSchema = z.object({
|
|
triggerId: z.string().uuid().optional().nullable(),
|
|
payload: z.record(z.string(), z.unknown()).optional().nullable(),
|
|
variables: z.record(z.string(), routineVariableValueSchema).optional().nullable(),
|
|
projectId: z.string().uuid().optional().nullable(),
|
|
assigneeAgentId: z.string().uuid().optional().nullable(),
|
|
idempotencyKey: z.string().trim().max(255).optional().nullable(),
|
|
source: z.enum(["manual", "api"]).optional().default("manual"),
|
|
executionWorkspaceId: z.string().uuid().optional().nullable(),
|
|
executionWorkspacePreference: z.enum(ISSUE_EXECUTION_WORKSPACE_PREFERENCES).optional().nullable(),
|
|
executionWorkspaceSettings: issueExecutionWorkspaceSettingsSchema.optional().nullable(),
|
|
});
|
|
|
|
export type RunRoutine = z.infer<typeof runRoutineSchema>;
|
|
|
|
export const rotateRoutineTriggerSecretSchema = z.object({});
|
|
export type RotateRoutineTriggerSecret = z.infer<typeof rotateRoutineTriggerSecretSchema>;
|