The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
fix: gate instructions file I/O and commandNotes on fresh sessions only
lempkeye3804f792dcb
diff --git a/packages/adapters/claude-local/src/server/execute.ts b/packages/adapters/claude-local/src/server/execute.tsindex 62247eb7ca..7a9a5bc82a 100644--- a/packages/adapters/claude-local/src/server/execute.ts+++ b/packages/adapters/claude-local/src/server/execute.ts@@ -335,12 +335,6 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecconst dangerouslySkipPermissions = asBoolean(config.dangerouslySkipPermissions, true);const instructionsFilePath = asString(config.instructionsFilePath, "").trim();const instructionsFileDir = instructionsFilePath ? `${path.dirname(instructionsFilePath)}/` : "";- const commandNotes = instructionsFilePath- ? [- `Injected agent instructions via --append-system-prompt-file ${instructionsFilePath} (with path directive appended)`,- ]- : [];-const runtimeConfig = await buildClaudeRuntimeConfig({runId,agent,@@ -369,11 +363,27 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecconst billingType = resolveClaudeBillingType(effectiveEnv);const skillsDir = await buildSkillsDir(config);+ const runtimeSessionParams = parseObject(runtime.sessionParams);+ const runtimeSessionId = asString(runtimeSessionParams.sessionId, runtime.sessionId ?? "");+ const runtimeSessionCwd = asString(runtimeSessionParams.cwd, "");+ const canResumeSession =+ runtimeSessionId.length > 0 &&+ (runtimeSessionCwd.length === 0 || path.resolve(runtimeSessionCwd) === path.resolve(cwd));+ const sessionId = canResumeSession ? runtimeSessionId : null;+ if (runtimeSessionId && !canResumeSession) {+ await onLog(+ "stdout",+ `[paperclip] Claude session "${runtimeSessionId}" was saved for cwd "${runtimeSessionCwd}" and will not be resumed in "${cwd}".\n`,+ );+ }+// When instructionsFilePath is configured, create a combined temp file that// includes both the file content and the path directive, so we only need// --append-system-prompt-file (Claude CLI forbids using both flags together).+ // Skipped on resumed sessions — the instructions are already baked into the+ // session cache and re-injecting them wastes tokens.let effectiveInstructionsFilePath: string | undefined = instructionsFilePath;- if (instructionsFilePath) {+ if (instructionsFilePath && !canResumeSession) {try {const instructionsContent = await fs.readFile(instructionsFilePath, "utf-8");const pathDirective = `\nThe above agent instructions were loaded from ${instructionsFilePath}. Resolve any relative file references from ${instructionsFileDir}.`;@@ -388,21 +398,16 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec);effectiveInstructionsFilePath = undefined;}+ } else if (canResumeSession) {+ effectiveInstructionsFilePath = undefined;}- const runtimeSessionParams = parseObject(runtime.sessionParams);- const runtimeSessionId = asString(runtimeSessionParams.sessionId, runtime.sessionId ?? "");- const runtimeSessionCwd = asString(runtimeSessionParams.cwd, "");- const canResumeSession =- runtimeSessionId.length > 0 &&- (runtimeSessionCwd.length === 0 || path.resolve(runtimeSessionCwd) === path.resolve(cwd));- const sessionId = canResumeSession ? runtimeSessionId : null;- if (runtimeSessionId && !canResumeSession) {- await onLog(- "stdout",- `[paperclip] Claude session "${runtimeSessionId}" was saved for cwd "${runtimeSessionCwd}" and will not be resumed in "${cwd}".\n`,- );- }+ const commandNotes =+ instructionsFilePath && !sessionId+ ? [+ `Injected agent instructions via --append-system-prompt-file ${instructionsFilePath} (with path directive appended)`,+ ]+ : [];const bootstrapPromptTemplate = asString(config.bootstrapPromptTemplate, "");const templateData = {agentId: agent.id,diff --git a/server/src/__tests__/claude-local-execute.test.ts b/server/src/__tests__/claude-local-execute.test.tsindex 71377d432c..abbff4375b 100644--- a/server/src/__tests__/claude-local-execute.test.ts+++ b/server/src/__tests__/claude-local-execute.test.ts@@ -117,6 +117,113 @@ describe("claude execute", () => {}});+ /**+ * Regression tests for commandNotes accuracy (Greptile P2).+ *+ * commandNotes should only claim instructions were injected when the flag+ * was actually passed — i.e. on fresh sessions, not resumed ones.+ */+ it("commandNotes reports injection on a fresh session with instructionsFile", async () => {+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-claude-exec-notes-fresh-"));+ const { workspace, commandPath, restore } = await setupExecuteEnv(root);+ const instructionsFile = path.join(root, "instructions.md");+ await fs.writeFile(instructionsFile, "# Agent instructions", "utf-8");+ let capturedNotes: string[] = [];+ try {+ await execute({+ runId: "run-notes-fresh",+ agent: { id: "agent-1", companyId: "co-1", name: "Test", adapterType: "claude_local", adapterConfig: {} },+ runtime: { sessionId: null, sessionParams: null, sessionDisplayId: null, taskKey: null },+ config: {+ command: commandPath,+ cwd: workspace,+ env: {},+ promptTemplate: "Do work.",+ instructionsFilePath: instructionsFile,+ },+ context: {},+ authToken: "tok",+ onLog: async () => {},+ onMeta: async (meta) => { capturedNotes = (meta.commandNotes as string[]) ?? []; },+ });+ expect(capturedNotes.some((n) => n.includes("--append-system-prompt-file"))).toBe(true);+ } finally {+ restore();+ await fs.rm(root, { recursive: true, force: true });+ }+ });++ it("commandNotes is empty on a resumed session even when instructionsFile is set", async () => {+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-claude-exec-notes-resume-"));+ const { workspace, commandPath, restore } = await setupExecuteEnv(root);+ const instructionsFile = path.join(root, "instructions.md");+ await fs.writeFile(instructionsFile, "# Agent instructions", "utf-8");+ let capturedNotes: string[] = ["sentinel"];+ try {+ await execute({+ runId: "run-notes-resume",+ agent: { id: "agent-1", companyId: "co-1", name: "Test", adapterType: "claude_local", adapterConfig: {} },+ runtime: { sessionId: "claude-session-1", sessionParams: null, sessionDisplayId: null, taskKey: null },+ config: {+ command: commandPath,+ cwd: workspace,+ env: {},+ promptTemplate: "Do work.",+ instructionsFilePath: instructionsFile,+ },+ context: {},+ authToken: "tok",+ onLog: async () => {},+ onMeta: async (meta) => { capturedNotes = (meta.commandNotes as string[]) ?? []; },+ });+ expect(capturedNotes).toHaveLength(0);+ } finally {+ restore();+ await fs.rm(root, { recursive: true, force: true });+ }+ });++ /**+ * Regression test for unnecessary file I/O on resumed sessions (Greptile P2).+ *+ * The combined agent-instructions.md temp file must NOT be written when+ * resuming, since the instructions are already baked into the session cache.+ */+ it("does not write agent-instructions temp file on a resumed session", async () => {+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-claude-exec-io-resume-"));+ const { workspace, commandPath, restore } = await setupExecuteEnv(root);+ const instructionsFile = path.join(root, "instructions.md");+ await fs.writeFile(instructionsFile, "# Agent instructions", "utf-8");+ try {+ await execute({+ runId: "run-io-resume",+ agent: { id: "agent-1", companyId: "co-1", name: "Test", adapterType: "claude_local", adapterConfig: {} },+ runtime: { sessionId: "claude-session-1", sessionParams: null, sessionDisplayId: null, taskKey: null },+ config: {+ command: commandPath,+ cwd: workspace,+ env: {},+ promptTemplate: "Do work.",+ instructionsFilePath: instructionsFile,+ },+ context: {},+ authToken: "tok",+ onLog: async () => {},+ onMeta: async () => {},+ });+ // The skills dir lives under HOME/.paperclip/skills — verify no combined+ // agent-instructions.md was written anywhere under root on a resume.+ const allFiles = await fs.readdir(root, { recursive: true });+ const tempInstructionsWritten = (allFiles as string[]).some((f) =>+ f.includes("agent-instructions.md"),+ );+ expect(tempInstructionsWritten).toBe(false);+ } finally {+ restore();+ await fs.rm(root, { recursive: true, force: true });+ }+ });+it("logs HOME, CLAUDE_CONFIG_DIR, and the resolved executable path in invocation metadata", async () => {const root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-claude-execute-meta-"));const workspace = path.join(root, "workspace");