mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-22 20:29:18 +01:00
fix: avoid fresh attachment staging paths for empty wakes
Keep authorized residue scrubbing and unsafe-path checks while leaving untouched workspaces unchanged when no wake attachments were selected. Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
1 parent
4597967f89
commit
41503eb38f
2 files changed
+93
-5
No files matched your search
@@ -8,6 +8,8 @@ import {
|
||||
link,
|
||||
mkdir,
|
||||
readFile,
|
||||
readdir,
|
||||
rm,
|
||||
symlink,
|
||||
unlink,
|
||||
writeFile,
|
||||
@@ -39,6 +41,7 @@ import { issueService } from "../issues.js";
|
||||
import { findHeartbeatRunCompletionComment, resolveHeartbeatRunResponse } from "../heartbeat-run-summary.js";
|
||||
import {
|
||||
renderNativeRunnerStagedAttachmentPrompt,
|
||||
stageNativeRunnerAttachmentBytes,
|
||||
stageNativeRunnerWakeAttachments,
|
||||
} from "./native-runner-file-handoff.js";
|
||||
import { PaperclipRunnerToolAuthority } from "./paperclip-runner-tool-authority.js";
|
||||
@@ -195,6 +198,91 @@ describe("native runner file handoff", () => {
|
||||
};
|
||||
}
|
||||
|
||||
async function stageEmptyWake(root: string, boundCompanyId = companyId) {
|
||||
await db.update(heartbeatRuns)
|
||||
.set({ contextSnapshot: { issueId } })
|
||||
.where(eq(heartbeatRuns.id, runId));
|
||||
return stageNativeRunnerWakeAttachments({
|
||||
db,
|
||||
binding: {
|
||||
companyId: boundCompanyId, issueId, runId, agentId,
|
||||
workspaceRoot: root, executionTargetKind: "local",
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
it("leaves an empty workspace unchanged for an empty wake and permits later explicit staging", async () => {
|
||||
const root = await mkdtemp(path.join(temporaryRoot, "empty-wake-"));
|
||||
try {
|
||||
const wake = await stageEmptyWake(root);
|
||||
expect(wake.attachments).toEqual([]);
|
||||
await wake.cleanup();
|
||||
await expect(readdir(root)).resolves.toEqual([]);
|
||||
|
||||
const explicit = await stageNativeRunnerAttachmentBytes({ workspaceRoot: root, body: Buffer.from("later authorized bytes") });
|
||||
await expect(readFile(path.join(root, explicit.workspaceRelativePath), "utf8"))
|
||||
.resolves.toBe("later authorized bytes");
|
||||
await explicit.cleanup();
|
||||
await expect(readFile(path.join(root, explicit.workspaceRelativePath)))
|
||||
.resolves.toEqual(Buffer.alloc(0));
|
||||
} finally {
|
||||
await rm(root, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
it("scrubs inactive staging bytes on an empty wake without creating another directory", async () => {
|
||||
const root = await mkdtemp(path.join(temporaryRoot, "empty-wake-residue-"));
|
||||
try {
|
||||
const previous = await stageNativeRunnerAttachmentBytes({ workspaceRoot: root, body: Buffer.from("previous attachment") });
|
||||
await previous.cleanup();
|
||||
const slot = path.join(root, previous.workspaceRelativePath);
|
||||
await writeFile(slot, "stale bytes after an interrupted owner");
|
||||
const directories = await readdir(path.join(root, ".paperclip-inbound"));
|
||||
|
||||
const wake = await stageEmptyWake(root);
|
||||
expect(wake.attachments).toEqual([]);
|
||||
await wake.cleanup();
|
||||
await expect(readFile(slot)).resolves.toEqual(Buffer.alloc(0));
|
||||
await expect(readdir(path.join(root, ".paperclip-inbound"))).resolves.toEqual(directories);
|
||||
} finally {
|
||||
await rm(root, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
it.each(["root-file", "root-symlink", "entry-symlink"] as const)(
|
||||
"rejects unsafe %s staging on an empty wake without changing outside bytes",
|
||||
async (kind) => {
|
||||
const root = await mkdtemp(path.join(temporaryRoot, "empty-wake-unsafe-"));
|
||||
const outside = await mkdtemp(path.join(temporaryRoot, "empty-wake-outside-"));
|
||||
try {
|
||||
await writeFile(path.join(outside, "keep.txt"), "outside bytes");
|
||||
const inbound = path.join(root, ".paperclip-inbound");
|
||||
if (kind === "root-file") await writeFile(inbound, "not a directory");
|
||||
else if (kind === "root-symlink") await symlink(outside, inbound);
|
||||
else {
|
||||
await mkdir(inbound);
|
||||
await symlink(outside, path.join(inbound, "untrusted-owner"));
|
||||
}
|
||||
await expect(stageEmptyWake(root)).rejects.toThrow(/staging_(?:path|residue)_denied/);
|
||||
await expect(readFile(path.join(outside, "keep.txt"), "utf8")).resolves.toBe("outside bytes");
|
||||
} finally {
|
||||
await rm(root, { recursive: true, force: true });
|
||||
await rm(outside, { recursive: true, force: true });
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
it("still authorizes an empty wake before touching its workspace", async () => {
|
||||
const root = await mkdtemp(path.join(temporaryRoot, "empty-wake-unauthorized-"));
|
||||
try {
|
||||
await expect(stageEmptyWake(root, "00000000-0000-4000-8000-000000009199"))
|
||||
.rejects.toThrow("paperclip_runner_attachment_staging_not_authorized");
|
||||
await expect(readdir(root)).resolves.toEqual([]);
|
||||
} finally {
|
||||
await rm(root, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
it("rejects a workspace-only file completion and invented delivery receipts without asking the user to approve completion", async () => {
|
||||
for (const ref of ["launch-checklist.md", "./out/report.pdf", "/workspace/answer.txt", "file:out/report.csv", "deliverable:00000000-0000-4000-8000-000000000001"]) {
|
||||
await expect(nativeCompletionFeedback(db, runId, doneReport([ref])))
|
||||
|
||||
@@ -883,10 +883,10 @@ export async function stageNativeRunnerWakeAttachments(input: {
|
||||
if (workspaceRoot) {
|
||||
const processDirectoryName = await currentStagingProcessDirectoryName();
|
||||
await withStagingRegistryLock(workspaceRoot, async () => {
|
||||
const stagingDirectory = await ensurePrivateStagingDirectory(
|
||||
workspaceRoot,
|
||||
processDirectoryName,
|
||||
);
|
||||
// Empty wakes still scrub abandoned bytes, but need no new staging paths.
|
||||
const stagingDirectory = selections.length > 0
|
||||
? await ensurePrivateStagingDirectory(workspaceRoot, processDirectoryName)
|
||||
: null;
|
||||
const activePaths =
|
||||
activeStagingPathsByWorkspace.get(workspaceRoot) ?? new Set<string>();
|
||||
const reusablePaths = await scrubNativeRunnerStagingResidue(
|
||||
@@ -894,7 +894,7 @@ export async function stageNativeRunnerWakeAttachments(input: {
|
||||
activePaths,
|
||||
processDirectoryName,
|
||||
);
|
||||
if (selections.length > 0) {
|
||||
if (stagingDirectory !== null) {
|
||||
stagingDestinations = reusablePaths.slice(0, selections.length);
|
||||
while (stagingDestinations.length < selections.length) {
|
||||
const candidate = path.join(stagingDirectory, randomUUID());
|
||||
|
||||
Reference in new issue
Block a user