mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-30 05:16:50 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - The native runner connects task state to provider sessions. > - Follow-up turns must retain provider memory and carry new user direction. > - Lost session IDs caused repeated context and extra input tokens. > - Native question answers and approval races could leave valid work blocked. > - This pull request repairs those paths and adds regression coverage. > - Agents can continue accepted work without repeating the conversation or losing the user's answer. ## Linked Issues or Issue Description Refs #13574. That merged PR shortened continuation prompts and moved question instructions into tool documentation. This change preserves sessions and fixes failures exposed by broader testing. Related runtime work: #13408 and #13410. **What happened?** Native follow-up turns could lose the provider session ID. Completion guidance could replace the original task with its latest comment. Claude native questions could remain pending after the user answered. Approval during a running tool call could suspend the run before the tool response arrived. Onboarding and chat handoff instructions also caused repeated planning or missing plan documents. **Expected behavior** Reuse a valid provider session. Send only new events when that session already has the history. Preserve the task requirements and apply later user direction. Store the question answer and deliver it to the waiting run. Finish governed tool responses before suspending. Execute the accepted plan without asking for the same approval again. **Steps to reproduce** Run the continuation, local-session-integrity, first-task, and agent-chat suites with native Codex and Claude. Include provider-question-bridge, accept-while-running, and plan-handoff. **Paperclip version or commit** This branch is based on masterd54b75011. The active full catalog run tests4e75881db. Later review fixes have separate regression coverage. **Deployment mode** Isolated local instances and Daytona sandboxes in the existing Runner full-stack E2E harness. ## What Changed - Retain provider session identity across turns and late usage snapshots. Send new continuation events on session reuse, with full context available for a fresh session. - Preserve task requirements and later direction in completion guidance. Return the current contract revision after a stale completion submission. - Bridge native Claude questions to saved Paperclip cards. Submit answers through the saved card and resume the same run. - Delay governed suspension until tool results settle. Add a deterministic test barrier for approval during an active run. - Clarify free-text question examples, explicit onboarding plans, and execution of accepted chat plans. - Fix continuation readiness, verified output evidence, and declared screenshot collection. - Qualify the legacy Claude test CLI at 2.1.277. The old 2.1.19 CLI did not discover mounted skills. Update the existing workflow pin and isolated launcher together. - Refresh the Daytona image lockfile integrity pin after reviewing master patch updates. - Carry continuation mode as runtime metadata instead of inferring it from user-visible text. Install the test Claude CLI without lifecycle scripts. ## Verification - Targeted paid verification: 20/20 cases passed across local-environment campaigns before the rebase. [Report](https://pages.paperclip.ing/runner-e2e-seven-fixes-35397904249/). - Harness checks: 379 unit tests passed; harness typecheck passed. - Latest-head PR checks: 55 passed, two intentionally skipped. Greptile is 5/5; the security scan passes. - Review regressions: 350 executor tests and 204 session/driver tests passed. A script-free Claude install was verified with the actual CLI. - Full catalog, including the explicit-only everyday suite: [run 35417932353](https://github.com/paperclipai/paperclip/actions/runs/35417932353). Completed: **164/205 passed; 41 failed**. [Full dashboard and failure investigation](https://pages.paperclip.ing/runner-e2e-full-catalog-35417932353/). Includes 204 case artifacts and one pre-case GitHub authorization timeout; missing evidence is not scored as a pass. The full run tested `4e75881db`; Final-head metadata/CLI smoke cases both passed. In the separate [six infrastructure retries](https://github.com/paperclipai/paperclip/actions/runs/35419769343), the GitHub timeout case passed and all five Docker preflight failures repeated. [Follow-up dashboard](https://pages.paperclip.ing/runner-e2e-full-catalog-35417932353/follow-up/). - Full local typecheck and build passed on the rebased branch. The full local unit run completed with 657 passing files, two test timeouts and one suite setup timeout. All three affected files passed when rerun in isolation (84 tests). The first full local run was not clean. - Focused regression coverage includes the live question bridge, same-run response delivery, UI routing, stale revisions, approval overlap, and session reuse. ## Full-catalog follow-ups - Test infrastructure: 14 Claude everyday cells probe an absent host CLI; six cells failed pre-task GitHub/Docker qualification (GitHub passes on retry; all five Docker cases repeat; the workflow preflight allowlist omits their case IDs); five ACPX Codex cells cannot create sandbox namespaces. - Runtime: four OpenCode completion-criteria mismatches masked by shutdown errors, one service-approval suspension failure; three Daytona recovery failures encounter existing skill files; one duplicate completion wake. - Confirmed test defects: question pagination and a noncanonical plan document key. - Product/behavior: mismatched visible/required question sets, an attachment instead of the requested task document, one lone-option onboarding question, early completion instead of review, and a Codex Mini completion-schema failure. - The report job itself fails on trusted master’s stale patch/lock configuration. The linked report is rebuilt with the shared renderer from original cell results and public fixture screenshots; it excludes private snapshots, logs and traces. These are investigated follow-ups, not silently regraded passes. First-task passed 51/52. The PR checks are green independently of the broader catalog’s behavioral/infrastructure failures. ## Risks - Session reuse depends on a valid provider identity and context coverage. Fresh-session fallback and reset tests cover this boundary. - Native question delivery spans saved interaction state and a live provider run. Tests cover duplicate events, closed runs, and same-run answers. - Provider behavior varies. The full paid catalog may expose failures beyond these targeted fixes; those results will be reported without relaxing valid approval or output checks. - The legacy Claude version update is limited to test infrastructure. No database migration is included. ## Model Used OpenAI Codex, GPT-6 family, with repository inspection, code execution, and browser/E2E tools. The exact runtime model identifier and context-window size are not exposed in this session. ## 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 searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass (targeted checks and all three timeout-file reruns pass; full-run timeout caveat above) - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
157 lines
11 KiB
TypeScript
157 lines
11 KiB
TypeScript
import { and, eq } from "drizzle-orm";
|
|
import { assets, issueAttachments, issueWorkProducts, type Db } from "@paperclipai/db";
|
|
import type { PrpStructuredRunResult } from "../../vendor/paperclip-runner/index.js";
|
|
|
|
function evidenceRefs(value: unknown): string[] {
|
|
if (!Array.isArray(value)) return [];
|
|
return value.flatMap((entry) => {
|
|
if (typeof entry === "string") return [entry];
|
|
if (entry && typeof entry === "object" && typeof entry.ref === "string") return [entry.ref];
|
|
return [];
|
|
});
|
|
}
|
|
|
|
function record(value: unknown): Record<string, unknown> {
|
|
return value && typeof value === "object" && !Array.isArray(value)
|
|
? value as Record<string, unknown> : {};
|
|
}
|
|
|
|
async function hasCurrentPublicationReceipt(db: Db, companyId: string, receipts: unknown, attachment: {
|
|
id: string; filename: string | null; byteSize: number; sha256: string;
|
|
}): Promise<boolean> {
|
|
for (const value of Object.values(record(receipts))) {
|
|
const receipt = record(value);
|
|
const input = record(receipt.input);
|
|
const result = record(receipt.result);
|
|
if ((result.disposition !== "applied" && result.disposition !== "duplicate") ||
|
|
!Array.isArray(result.entityRefs) || result.entityRefs[0] !== attachment.id) continue;
|
|
if (receipt.operationId === "register_deliverable" &&
|
|
result.commandId === `deliverable-prepared:${attachment.id}` &&
|
|
typeof input.filename === "string" && input.filename.trim() === attachment.filename &&
|
|
input.byteSize === attachment.byteSize &&
|
|
typeof input.sha256 === "string" && input.sha256.trim().toLowerCase() === attachment.sha256.toLowerCase()) return true;
|
|
if (receipt.operationId !== "reuse_chat_attachment" ||
|
|
result.commandId !== `chat-attachment-reused:${attachment.id}`) continue;
|
|
const prepared = record(result.prepared);
|
|
const source = record(result.source);
|
|
if (prepared.attachmentId !== attachment.id ||
|
|
source.attachmentId !== input.attachmentId || source.commentId !== input.sourceCommentId ||
|
|
typeof prepared.sha256 !== "string" || prepared.sha256.toLowerCase() !== attachment.sha256.toLowerCase() ||
|
|
typeof source.sha256 !== "string" || source.sha256.toLowerCase() !== attachment.sha256.toLowerCase()) continue;
|
|
if ("filename" in prepared || "byteSize" in prepared) {
|
|
if (prepared.filename === attachment.filename && prepared.byteSize === attachment.byteSize) return true;
|
|
continue;
|
|
}
|
|
// Older committed reuse receipts contain the authenticated source and hash,
|
|
// but not its filename/size. Only an intact, matching source can supply those
|
|
// missing facts; this does not authorize a new reuse or bypass its tool gate.
|
|
const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/iu;
|
|
if (typeof source.attachmentId !== "string" || !uuid.test(source.attachmentId) ||
|
|
typeof source.commentId !== "string" || !uuid.test(source.commentId)) continue;
|
|
const [original] = await db.select({ filename: assets.originalFilename, byteSize: assets.byteSize, sha256: assets.sha256 })
|
|
.from(issueAttachments).innerJoin(assets, and(eq(assets.id, issueAttachments.assetId), eq(assets.companyId, companyId)))
|
|
.where(and(eq(issueAttachments.id, source.attachmentId), eq(issueAttachments.companyId, companyId),
|
|
eq(issueAttachments.issueCommentId, source.commentId))).limit(1);
|
|
if (original?.filename === attachment.filename && original.byteSize === attachment.byteSize &&
|
|
original.sha256.toLowerCase() === attachment.sha256.toLowerCase()) return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/** Recognize explicit output requests, not incidental mentions of source files.
|
|
* The current server-bound objective is authoritative; summaries cannot invent
|
|
* an output requirement or erase a user's request for a file.
|
|
*/
|
|
export function explicitlyRequestsFileOutput(objective: string): boolean {
|
|
return objective.split(/(?:[.!?](?:\s|$)|\n|[;,]|\bbut\b)/iu).some(clause => {
|
|
const file = /\b(?:files?|attachments?|downloads?|pdf|spreadsheets?|workbooks?|slide decks?|powerpoints?|docx|xlsx|csv)\b|\b[^\s/]+\.(?:md|txt|pdf|docx?|xlsx?|csv|pptx?|png|jpe?g|svg|zip)\b/giu;
|
|
const create = /\b(?:create|make|write|save|export|attach|send|generate|produce|prepare|provide|give|return|build)\b/iu.exec(clause);
|
|
if (create && /\b(?:do not|don't|never|no need to)\s*$/iu.test(clause.slice(0, create.index))) return false;
|
|
const output = create ? clause.slice(create.index + create[0].length) : "";
|
|
const fileObject = [...output.matchAll(file)].some(match => {
|
|
const prefix = output.slice(0, match.index);
|
|
const suffix = output.slice(match.index + match[0].length);
|
|
// "Create no files" is a prohibition, even though it contains a creation
|
|
// verb. Negate this object only; another explicit output can still count.
|
|
if (/\b(?:no|zero|without(?:\s+any)?)\s+(?:(?:new|temporary|downloadable|attached|additional)\s+)*$/iu.test(prefix)) return false;
|
|
// "Write a summary of this PDF" names input, not a requested file.
|
|
// Explicit export destinations still count after such input references.
|
|
const destination = /\b(?:as|into|to)\s+(?:(?:a|an|the|new|separate|markdown|word|excel)\s+)*$/iu.test(prefix);
|
|
if (!destination && /\b(?:of|about|on|from|using|for|with)\b/iu.test(prefix)) return false;
|
|
if (/^files?$/iu.test(match[0]) && /^\s+(?:permissions?|systems?|formats?|names?|paths?|types?|sizes?|descriptors?)\b/iu.test(suffix)) return false;
|
|
return true;
|
|
});
|
|
return fileObject ||
|
|
(!/\b(?:no|without)\s+(?:downloadable|attached)/iu.test(clause) && /\b(?:downloadable|attached)\s+(?:file|report|document|checklist|draft)\b/iu.test(clause));
|
|
});
|
|
}
|
|
|
|
/** Files cited as completed output must be reachable outside the agent workspace. */
|
|
export async function validateNativeDeliverableEvidence(
|
|
db: Db,
|
|
binding: { companyId: string; issueId: string; runId: string; objective: string; semanticToolReceipts: unknown },
|
|
result: PrpStructuredRunResult,
|
|
): Promise<void> {
|
|
if (result.reportedWorkDisposition !== "done") return;
|
|
const fileRequested = explicitlyRequestsFileOutput(binding.objective);
|
|
const artifactRefs = new Set(evidenceRefs(result.artifacts));
|
|
const refs = new Set([
|
|
...evidenceRefs(result.evidence),
|
|
...artifactRefs,
|
|
...result.completionClaim.criteria.flatMap(({ evidenceRefs }) => evidenceRefs),
|
|
]);
|
|
let registeredAttachment = false;
|
|
for (const value of refs) {
|
|
if (typeof value !== "string") continue;
|
|
const ref = value.trim();
|
|
const attachmentPath = /^\/api\/attachments\/([^/?#]+)\/content(?:[?#].*)?$/u.exec(ref);
|
|
if (ref.startsWith("deliverable:") || attachmentPath) {
|
|
const id = attachmentPath?.[1] ?? ref.slice("deliverable:".length);
|
|
const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/iu;
|
|
const [attachment] = uuid.test(id)
|
|
? await db.select({ id: issueAttachments.id, originatingRunId: issueAttachments.originatingRunId,
|
|
filename: assets.originalFilename, byteSize: assets.byteSize, sha256: assets.sha256 }).from(issueAttachments)
|
|
.innerJoin(assets, and(eq(assets.id, issueAttachments.assetId), eq(assets.companyId, binding.companyId)))
|
|
.where(and(eq(issueAttachments.id, id), eq(issueAttachments.companyId, binding.companyId), eq(issueAttachments.issueId, binding.issueId)))
|
|
.limit(1)
|
|
: [];
|
|
if (!attachment) {
|
|
throw new Error("Completion cites no registered attachment on this task. Use register_deliverable for the requested file and cite deliverable:<attachmentId> from its receipt. No human completion approval was created.");
|
|
}
|
|
// A prior output (or user input) can be useful context, but does not prove
|
|
// this run published the newly requested output. The receipt survives a
|
|
// controller restart of this run; a replacement can re-register preserved
|
|
// workspace bytes internally rather than asking the user to confirm them.
|
|
if (fileRequested && attachment.originatingRunId !== binding.runId) continue;
|
|
if (fileRequested && !await hasCurrentPublicationReceipt(db, binding.companyId, binding.semanticToolReceipts, attachment)) {
|
|
throw new Error("This attachment has no matching verified publication receipt for this run's requested output. Inspect any preserved file and use register_deliverable to verify its current filename, size, and SHA-256, then cite the new receipt. No human completion approval was created.");
|
|
}
|
|
registeredAttachment = true;
|
|
continue;
|
|
}
|
|
// URLs and typed durable refs are not workspace paths. Verification commands
|
|
// belong in verification; do not scan prose or upload files named by a model.
|
|
const localFile = /^(?:file:|\.{0,2}\/|[a-z]:[\\/])/iu.test(ref)
|
|
|| (!/^[a-z][a-z0-9+.-]*:/iu.test(ref) && /^[^\r\n]+\.[a-z0-9]{1,16}(?::\d+(?::\d+)?)?$/iu.test(ref));
|
|
if (localFile && (fileRequested || artifactRefs.has(value))) {
|
|
throw new Error("Completion cites a workspace-only file that the user cannot download. Before finishing, use register_deliverable for requested file outputs and cite deliverable:<attachmentId> from the receipt, with /api/attachments/<attachmentId>/content as the download link. For repository changes, cite an accessible PR or registered work product instead. No human completion approval was created.");
|
|
}
|
|
}
|
|
if (fileRequested && !registeredAttachment) {
|
|
const products = refs.size ? await db.select().from(issueWorkProducts).where(and(
|
|
eq(issueWorkProducts.companyId, binding.companyId), eq(issueWorkProducts.issueId, binding.issueId),
|
|
)) : [];
|
|
const accessibleProduct = products.some(product => {
|
|
if (product.createdByRunId !== binding.runId) return false;
|
|
if (["failed", "cancelled", "archived"].includes(product.status)) return false;
|
|
// A workspace_file resource is only a locator: registration neither checks
|
|
// its current bytes nor keeps them alive after workspace cleanup. Requested
|
|
// files need a published URL or the verified attachment receipt above.
|
|
const accessible = typeof product.url === "string" && /^https?:\/\//iu.test(product.url);
|
|
return accessible && [product.url, `work_product:${product.id}`, `work-product:${product.id}`, `artifact:${product.id}`]
|
|
.some(ref => typeof ref === "string" && refs.has(ref));
|
|
});
|
|
if (!accessibleProduct) throw new Error("The requested file has no accessible delivery evidence. Use register_deliverable and cite deliverable:<attachmentId>, or cite an accessible work product registered by this run for this task. Empty evidence, prior-run output, and a verification result cannot substitute for the requested file. Continue publishing or report a concrete blocker; no human completion approval was created.");
|
|
}
|
|
}
|