diff --git a/server/src/__tests__/agent-instruction-git-exclusion.test.ts b/server/src/__tests__/agent-instruction-git-exclusion.test.ts index 73f81d4c92f..f41aff56206 100644 --- a/server/src/__tests__/agent-instruction-git-exclusion.test.ts +++ b/server/src/__tests__/agent-instruction-git-exclusion.test.ts @@ -4,7 +4,7 @@ import path from "node:path"; import { execFile as execFileCallback } from "node:child_process"; import { promisify } from "node:util"; import { afterEach, beforeEach, expect, it } from "vitest"; -import { instructionGitExcludeProgram } from "../services/agent-instruction-files.js"; +import { instructionGitExcludeFailureReason, instructionGitExcludeProgram } from "../services/agent-instruction-files.js"; const execFile = promisify(execFileCallback); let root: string; @@ -85,3 +85,43 @@ it("replaces a linked ignore file without writing through its external inode", a expect(await fs.readFile(externalFile, "utf8")).toBe("untouched\n"); expect(await fs.readFile(path.join(runtime, ".gitignore"), "utf8")).toBe("*\n"); }); + +async function failureReason(cwd: string) { + const failed = await exclude(cwd).then(() => null, (error: { code?: number; signal?: string | null; stderr?: string }) => error); + expect(failed).not.toBeNull(); + const reason = instructionGitExcludeFailureReason({ exitCode: typeof failed!.code === "number" ? failed!.code : null, + timedOut: false, signal: failed!.signal ?? null, stderr: failed!.stderr ?? "" }); + expect(reason).not.toContain(root); + return reason; +} + +it("names a missing task directory without its path", async () => { + await expect(failureReason(path.join(root, "missing"))).resolves.toBe("enoent"); +}); + +it.each(["directory", "file"])("names an unsafe runtime exclusion %s", async kind => { + const workspace = path.join(root, "workspace"), runtime = path.join(workspace, ".paperclip-runtime"); + await fs.mkdir(workspace); + if (kind === "directory") await fs.writeFile(runtime, "not a directory"); + else await fs.mkdir(path.join(runtime, ".gitignore"), { recursive: true }); + await expect(failureReason(workspace)).resolves.toBe(`unsafe_${kind}`); +}); + +it.skipIf(process.getuid?.() === 0)("names a task directory the sandbox user cannot write", async () => { + const workspace = path.join(root, "workspace"); + await fs.mkdir(workspace, { mode: 0o500 }); + try { + await expect(failureReason(workspace)).resolves.toBe("eacces"); + } finally { await fs.chmod(workspace, 0o700); } +}); + +it.each([ + [{ exitCode: null, timedOut: true, stderr: "" }, "timed_out"], + [{ exitCode: 127, timedOut: false, stderr: "sh: 1: node: not found" }, "node_unavailable"], + [{ exitCode: null, timedOut: false, signal: "SIGKILL", stderr: "" }, "signal_sigkill"], + [{ exitCode: 1, timedOut: false, stderr: "Error: ENOSPC: no space left on device, open '/home/user/x'" }, "enospc"], + [{ exitCode: 3, timedOut: false, stderr: "something else at /home/user/secret" }, "exit_3"], + [{ exitCode: null, timedOut: false, signal: "not a signal", stderr: "" }, "unknown"], +] as const)("classifies %j as %s", (result, reason) => { + expect(instructionGitExcludeFailureReason(result)).toBe(reason); +}); diff --git a/server/src/services/agent-directory-working-copies.ts b/server/src/services/agent-directory-working-copies.ts index 31c36c79183..ec4298d8035 100644 --- a/server/src/services/agent-directory-working-copies.ts +++ b/server/src/services/agent-directory-working-copies.ts @@ -9,7 +9,7 @@ import { prepareAdapterExecutionTargetRuntime, runAdapterExecutionTargetShellCom import { withDirectoryMergeLock, directorySnapshotSha256, parseDirectorySnapshot, serializeDirectorySnapshot, type DirectoryMergeLockOperation } from "@paperclipai/adapter-utils/workspace-restore-merge"; import { AGENT_FILES_CONTRACT, AgentFileLimitError, agentFileStore, agentStorageWarning, inspectAgentDirectory } from "./agent-file-store.js"; import { agentInstructionsBundleMode, deriveBundleState, resolveManagedInstructionsRoot } from "./agent-instructions.js"; -import { instructionGitExcludeProgram } from "./agent-instruction-files.js"; +import { instructionGitExcludeFailureReason, instructionGitExcludeProgram } from "./agent-instruction-files.js"; import { resolveInstructionActor } from "./agent-instruction-authorization.js"; import { HttpError, conflict, notFound } from "../errors.js"; import type { AuthorizationActor } from "./authorization.js"; @@ -239,7 +239,9 @@ export function agentDirectoryWorkingCopyService(db: Db, get: (companyId: string const excluded = await runAdapterExecutionTargetShellCommand(input.runId, input.target, `node -e ${quote(instructionGitExcludeProgram)} ${quote(input.target.remoteCwd)}`, { cwd: input.target.remoteCwd, env: {}, timeoutSec: 15 }); - if (excluded.exitCode !== 0 || excluded.timedOut) throw new Error("Could not exclude agent files from task Git staging"); + if (excluded.exitCode !== 0 || excluded.timedOut) { + throw new Error(`Could not exclude agent files from task Git staging (reason=${instructionGitExcludeFailureReason(excluded)})`); + } const runtime = await transport(row, input.target, false); transports.set(key(row), runtime); if (input.target.transport === "sandbox") { diff --git a/server/src/services/agent-instruction-files.ts b/server/src/services/agent-instruction-files.ts index 6f3db874aca..27d4b6704fb 100644 --- a/server/src/services/agent-instruction-files.ts +++ b/server/src/services/agent-instruction-files.ts @@ -176,3 +176,17 @@ if(existing && (existing.isSymbolicLink() || !existing.isFile()))throw Error('Un const temporary=path.join(root,'.ignore-'+crypto.randomUUID()+'.tmp'); try{fs.writeFileSync(temporary,'*\n',{flag:'wx',mode:0o600});fs.renameSync(temporary,filename)}finally{fs.rmSync(temporary,{force:true})} `; + +export function instructionGitExcludeFailureReason(result: { + exitCode: number | null; timedOut: boolean; signal?: string | null; stderr?: string | null; +}): string { + if (result.timedOut) return "timed_out"; + const stderr = result.stderr ?? ""; + if (stderr.includes("Unsafe runtime exclusion directory")) return "unsafe_directory"; + if (stderr.includes("Unsafe runtime exclusion file")) return "unsafe_file"; + const nodeCode = /\b(E[A-Z]{2,15})\b(?::| )/.exec(stderr)?.[1]; + if (nodeCode) return nodeCode.toLowerCase(); + if (result.exitCode === 127) return "node_unavailable"; + if (result.signal && /^SIG[A-Z0-9]{1,10}$/.test(result.signal)) return `signal_${result.signal.toLowerCase()}`; + return Number.isSafeInteger(result.exitCode) ? `exit_${result.exitCode}` : "unknown"; +}