bfe6369ef5
## Thinking Path > - Paperclip is the control plane that coordinates AI-agent work through issues, heartbeats, comments, approvals, and auditable recovery paths. > - The affected subsystem is heartbeat/recovery orchestration, especially the optional cheap model profile used for operational recovery overhead. > - Cheap recovery should repair status and liveness, but it must not become the worker lane that writes deliverables, continues source work, or propagates cheap execution hints into downstream retries. > - The gap was that cheap-profile hints could follow recovery wake contexts and assignment overrides farther than intended, making real work eligible to run on the cheap model. > - This pull request separates status-only cheap recovery from normal source-work continuations, adds route guards for deliverable mutations during cheap status-only runs, and documents the invariant. > - The benefit is safer retry/recovery behavior: cheap runs can clean up control-plane state, while any remaining source work resumes through a normal/original model path. ## What Changed - Added recovery model-profile work classes so status-only recovery carries explicit guard context and normal-model continuations scrub cheap hints. - Updated heartbeat, productivity review, liveness continuation, and recovery service wakeups to request cheap only for bounded status-only recovery work. - Blocked cheap status-only recovery runs from writing issue documents, plans, attachments, work products, or assigning downstream work back to `modelProfile: "cheap"`. - Added/updated server tests for cheap profile propagation, artifact/document guards, route authorization, retry scheduling, and successful-run handoff behavior. - Documented the recovery model-profile lane in `doc/SPEC-implementation.md` and `doc/execution-semantics.md`. - After rebasing onto current `public-gh/master`, stabilized the new `InstanceSidebar` plugin-filter tests so the PR check lane stays green. ## Verification - Local: `pnpm exec vitest run --config vitest.config.ts src/services/recovery/model-profile-hint.test.ts src/__tests__/issue-agent-mutation-ownership-routes.test.ts src/__tests__/issue-document-restore-routes.test.ts` from `server/` - 3 files, 37 tests passed after final edits. - Local: `pnpm exec vitest run --config vitest.config.ts src/__tests__/heartbeat-process-recovery.test.ts` from `server/` - 44 tests passed after rerunning the cleanup-sensitive file alone. - Local: `pnpm --filter @paperclipai/ui exec vitest run src/components/InstanceSidebar.test.tsx` - 4 tests passed. - Local: `pnpm --filter @paperclipai/server typecheck` - passed. - Local: `pnpm --filter @paperclipai/ui typecheck` - passed. - PR checks on latest head `6f8c3b1380f5bd872c6f49f6f7188ecf3bb6d263` - all green, including `verify`, build, typecheck, server/general/serialized tests, e2e, Snyk, and policy. - Greptile: pass 3 returned Confidence Score 5/5 with zero unresolved Greptile review threads. ## Risks - Medium risk: recovery behavior is intentionally stricter, so any path that incorrectly relies on cheap recovery to keep doing source work will now need to hand back to a normal-model run. - Low migration risk: no schema changes. - No product UI changes; the UI file touched is a test-only stabilization after rebasing onto current `master`. > 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 coding agent, GPT-5 model family (`gpt-5`), tool use and local code execution enabled; context window not exposed in this environment. ## 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 - [x] If this change affects the UI, I have included before/after screenshots (N/A: no product UI changes) - [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
190 lines
6.4 KiB
TypeScript
190 lines
6.4 KiB
TypeScript
import { and, eq, inArray } from "drizzle-orm";
|
|
import type { Db } from "@paperclipai/db";
|
|
import { agentWakeupRequests, agents, heartbeatRuns, issues } from "@paperclipai/db";
|
|
import type { RunLivenessState } from "@paperclipai/shared";
|
|
import { withRecoveryModelProfileHint } from "./model-profile-hint.js";
|
|
import { RECOVERY_REASON_KINDS } from "./origins.js";
|
|
|
|
export const RUN_LIVENESS_CONTINUATION_REASON = RECOVERY_REASON_KINDS.runLivenessContinuation;
|
|
export const DEFAULT_MAX_LIVENESS_CONTINUATION_ATTEMPTS = 2;
|
|
|
|
const ACTIONABLE_LIVENESS_STATES = new Set<RunLivenessState>(["plan_only", "empty_response"]);
|
|
const CONTINUATION_ACTIVE_ISSUE_STATUSES = new Set(["todo", "in_progress"]);
|
|
// A prior adapter error should not permanently suppress bounded liveness
|
|
// continuations; the max-attempt/idempotency guards prevent unbounded retries.
|
|
const CONTINUATION_AGENT_STATUSES = new Set(["active", "idle", "running", "error"]);
|
|
const IDEMPOTENT_WAKE_STATUSES = ["queued", "deferred_issue_execution", "completed"];
|
|
|
|
type HeartbeatRunRow = typeof heartbeatRuns.$inferSelect;
|
|
type IssueRow = Pick<
|
|
typeof issues.$inferSelect,
|
|
"id" | "companyId" | "identifier" | "title" | "status" | "assigneeAgentId" | "executionState" | "projectId"
|
|
>;
|
|
type AgentRow = Pick<typeof agents.$inferSelect, "id" | "companyId" | "status">;
|
|
|
|
export type RunContinuationDecision =
|
|
| {
|
|
kind: "enqueue";
|
|
nextAttempt: number;
|
|
idempotencyKey: string;
|
|
payload: Record<string, unknown>;
|
|
contextSnapshot: Record<string, unknown>;
|
|
}
|
|
| {
|
|
kind: "exhausted";
|
|
attempt: number;
|
|
maxAttempts: number;
|
|
comment: string;
|
|
}
|
|
| {
|
|
kind: "skip";
|
|
reason: string;
|
|
};
|
|
|
|
export function readContinuationAttempt(value: unknown): number {
|
|
const numeric = typeof value === "number" ? value : Number.parseInt(String(value ?? ""), 10);
|
|
return Number.isFinite(numeric) && numeric > 0 ? Math.floor(numeric) : 0;
|
|
}
|
|
|
|
export function buildRunLivenessContinuationIdempotencyKey(input: {
|
|
issueId: string;
|
|
sourceRunId: string;
|
|
livenessState: RunLivenessState;
|
|
nextAttempt: number;
|
|
}) {
|
|
return [
|
|
RUN_LIVENESS_CONTINUATION_REASON,
|
|
input.issueId,
|
|
input.sourceRunId,
|
|
input.livenessState,
|
|
String(input.nextAttempt),
|
|
].join(":");
|
|
}
|
|
|
|
export async function findExistingRunLivenessContinuationWake(
|
|
db: Db,
|
|
input: {
|
|
companyId: string;
|
|
idempotencyKey: string;
|
|
},
|
|
) {
|
|
return db
|
|
.select({ id: agentWakeupRequests.id, status: agentWakeupRequests.status })
|
|
.from(agentWakeupRequests)
|
|
.where(
|
|
and(
|
|
eq(agentWakeupRequests.companyId, input.companyId),
|
|
eq(agentWakeupRequests.idempotencyKey, input.idempotencyKey),
|
|
inArray(agentWakeupRequests.status, IDEMPOTENT_WAKE_STATUSES),
|
|
),
|
|
)
|
|
.limit(1)
|
|
.then((rows) => rows[0] ?? null);
|
|
}
|
|
|
|
export function decideRunLivenessContinuation(input: {
|
|
run: HeartbeatRunRow;
|
|
issue: IssueRow | null;
|
|
agent: AgentRow | null;
|
|
livenessState: RunLivenessState | null;
|
|
livenessReason: string | null;
|
|
nextAction: string | null;
|
|
budgetBlocked: boolean;
|
|
idempotentWakeExists: boolean;
|
|
maxAttempts?: number;
|
|
}): RunContinuationDecision {
|
|
const {
|
|
run,
|
|
issue,
|
|
agent,
|
|
livenessState,
|
|
livenessReason,
|
|
nextAction,
|
|
budgetBlocked,
|
|
idempotentWakeExists,
|
|
} = input;
|
|
const maxAttempts = input.maxAttempts ?? DEFAULT_MAX_LIVENESS_CONTINUATION_ATTEMPTS;
|
|
|
|
if (!livenessState || !ACTIONABLE_LIVENESS_STATES.has(livenessState)) {
|
|
return { kind: "skip", reason: "liveness state is not actionable for continuation" };
|
|
}
|
|
if (!issue) return { kind: "skip", reason: "issue not found" };
|
|
if (!agent) return { kind: "skip", reason: "agent not found" };
|
|
if (issue.companyId !== run.companyId || agent.companyId !== run.companyId) {
|
|
return { kind: "skip", reason: "company scope mismatch" };
|
|
}
|
|
if (issue.assigneeAgentId !== run.agentId) {
|
|
return { kind: "skip", reason: "issue is no longer assigned to the source run agent" };
|
|
}
|
|
if (!CONTINUATION_ACTIVE_ISSUE_STATUSES.has(issue.status)) {
|
|
return { kind: "skip", reason: `issue status ${issue.status} is not continuable` };
|
|
}
|
|
if (issue.executionState) {
|
|
return { kind: "skip", reason: "issue is blocked by execution policy state" };
|
|
}
|
|
if (!CONTINUATION_AGENT_STATUSES.has(agent.status)) {
|
|
return { kind: "skip", reason: `agent status ${agent.status} is not invokable` };
|
|
}
|
|
if (budgetBlocked) {
|
|
return { kind: "skip", reason: "budget hard stop blocks continuation" };
|
|
}
|
|
const currentAttempt = readContinuationAttempt(run.continuationAttempt);
|
|
if (currentAttempt >= maxAttempts) {
|
|
return {
|
|
kind: "exhausted",
|
|
attempt: currentAttempt,
|
|
maxAttempts,
|
|
comment: [
|
|
"Bounded liveness continuation exhausted",
|
|
"",
|
|
`- Last liveness state: \`${livenessState}\``,
|
|
`- Attempts used: ${currentAttempt}/${maxAttempts}`,
|
|
`- Reason: ${livenessReason ?? "Run ended without concrete progress"}`,
|
|
"- Next action: a human or manager should inspect the run and either clarify the task, mark it blocked, or assign a concrete follow-up.",
|
|
].join("\n"),
|
|
};
|
|
}
|
|
|
|
const nextAttempt = currentAttempt + 1;
|
|
const idempotencyKey = buildRunLivenessContinuationIdempotencyKey({
|
|
issueId: issue.id,
|
|
sourceRunId: run.id,
|
|
livenessState,
|
|
nextAttempt,
|
|
});
|
|
if (idempotentWakeExists) {
|
|
return { kind: "skip", reason: "continuation wake already exists for this source run and attempt" };
|
|
}
|
|
|
|
const payload = withRecoveryModelProfileHint({
|
|
issueId: issue.id,
|
|
sourceRunId: run.id,
|
|
livenessState,
|
|
livenessReason,
|
|
continuationAttempt: nextAttempt,
|
|
maxContinuationAttempts: maxAttempts,
|
|
instruction:
|
|
nextAction ??
|
|
"The previous run ended without concrete progress. Take the first concrete action now or mark the issue blocked with a specific unblock request.",
|
|
}, "normal_model");
|
|
|
|
return {
|
|
kind: "enqueue",
|
|
nextAttempt,
|
|
idempotencyKey,
|
|
payload,
|
|
contextSnapshot: withRecoveryModelProfileHint({
|
|
issueId: issue.id,
|
|
taskId: issue.id,
|
|
taskKey: issue.id,
|
|
wakeReason: RUN_LIVENESS_CONTINUATION_REASON,
|
|
livenessContinuationAttempt: nextAttempt,
|
|
livenessContinuationMaxAttempts: maxAttempts,
|
|
livenessContinuationSourceRunId: run.id,
|
|
livenessContinuationState: livenessState,
|
|
livenessContinuationReason: livenessReason,
|
|
livenessContinuationInstruction: payload.instruction,
|
|
}, "normal_model"),
|
|
};
|
|
}
|