@xopcai/xopc 0.0.124 → 0.0.126

package/dist/src/agent/tools/apply-patch.js

@@ -1,7 +1,7 @@
 import { checkFileSafety } from "../prompt/safety.js";
 import { resolvePathUnderWorkspace } from "./tool-paths.js";
 import { evaluateFilePolicy } from "../sandbox/exec-policy.js";
-import { generateDiffString, normalizeToLF } from "./edit-diff.js";
+import { detectLineEnding, generateDiffString, normalizeToLF, restoreLineEndings } from "./edit-diff.js";
 import { dirname, relative } from "node:path";
 import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { Type } from "@sinclair/typebox";
@@ -129,7 +129,7 @@ function applyHunks(original, hunks, path) {
 	return content;
 }
 async function readExisting(path) {
-	return normalizeToLF(await readFile(path, "utf-8"));
+	return readFile(path, "utf-8");
 }
 async function assertWritable(workspace, path) {
 	const quick = checkFileSafety("write", path);
@@ -142,74 +142,128 @@ async function assertWritable(workspace, path) {
 	if (!policy.allowed) throw new Error(`Sandbox: ${policy.reason}`);
 	return resolvePathUnderWorkspace(path, workspace);
 }
+async function pathExists(path) {
+	try {
+		await stat(path);
+		return true;
+	} catch (e) {
+		if (e.code === "ENOENT") return false;
+		throw e;
+	}
+}
+async function buildPatchPlan(workspace, parsed) {
+	const changes = [];
+	const plannedTargets = /* @__PURE__ */ new Set();
+	const rememberTarget = (target) => {
+		if (plannedTargets.has(target)) throw new Error(`Patch touches the same target multiple times: ${relative(workspace, target)}`);
+		plannedTargets.add(target);
+	};
+	for (const op of parsed) {
+		if (op.kind === "add") {
+			const target = await assertWritable(workspace, op.path);
+			rememberTarget(target);
+			if (await pathExists(target)) throw new Error(`Add file target already exists: ${op.path}`);
+			const diff = generateDiffString("", op.content, op.path);
+			const counts = countDiff(diff);
+			changes.push({
+				kind: "add",
+				path: op.path,
+				absolutePath: target,
+				newContent: op.content,
+				...counts,
+				diff
+			});
+			continue;
+		}
+		if (op.kind === "delete") {
+			const target = await assertWritable(workspace, op.path);
+			rememberTarget(target);
+			const oldContent = await readExisting(target);
+			const diff = generateDiffString(oldContent, "", op.path);
+			const counts = countDiff(diff);
+			changes.push({
+				kind: "delete",
+				path: op.path,
+				absolutePath: target,
+				oldContent,
+				...counts,
+				diff
+			});
+			continue;
+		}
+		const target = await assertWritable(workspace, op.path);
+		rememberTarget(target);
+		const oldContent = await readExisting(target);
+		const lineEnding = detectLineEnding(oldContent);
+		const newContent = restoreLineEndings(applyHunks(normalizeToLF(oldContent), op.hunks, op.path), lineEnding);
+		const destination = op.moveTo ? await assertWritable(workspace, op.moveTo) : target;
+		if (destination !== target) {
+			rememberTarget(destination);
+			if (await pathExists(destination)) throw new Error(`Move target already exists: ${op.moveTo}`);
+		}
+		const diff = generateDiffString(oldContent, newContent, op.moveTo ? `${op.path} -> ${op.moveTo}` : op.path);
+		const counts = countDiff(diff);
+		changes.push({
+			kind: op.moveTo ? "move" : "update",
+			path: op.path,
+			absolutePath: target,
+			moveTo: op.moveTo,
+			absoluteMoveTo: op.moveTo ? destination : void 0,
+			oldContent,
+			newContent,
+			...counts,
+			diff
+		});
+	}
+	return changes;
+}
+async function commitPatchPlan(changes) {
+	const committed = [];
+	try {
+		for (const change of changes) {
+			committed.push(change);
+			if (change.kind === "add") {
+				await mkdir(dirname(change.absolutePath), { recursive: true });
+				await writeFile(change.absolutePath, change.newContent ?? "", "utf-8");
+			} else if (change.kind === "delete") await rm(change.absolutePath);
+			else {
+				const destination = change.absoluteMoveTo ?? change.absolutePath;
+				await mkdir(dirname(destination), { recursive: true });
+				await writeFile(destination, change.newContent ?? "", "utf-8");
+				if (destination !== change.absolutePath) await rm(change.absolutePath);
+			}
+		}
+	} catch (error) {
+		for (const change of committed.reverse()) try {
+			if (change.kind === "add") await rm(change.absolutePath, { force: true });
+			else if (change.kind === "delete") {
+				await mkdir(dirname(change.absolutePath), { recursive: true });
+				await writeFile(change.absolutePath, change.oldContent ?? "", "utf-8");
+			} else if (change.absoluteMoveTo) {
+				await rm(change.absoluteMoveTo, { force: true });
+				await mkdir(dirname(change.absolutePath), { recursive: true });
+				await writeFile(change.absolutePath, change.oldContent ?? "", "utf-8");
+			} else await writeFile(change.absolutePath, change.oldContent ?? "", "utf-8");
+		} catch {}
+		throw error;
+	}
+}
 function createApplyPatchTool(workspace, options) {
 	return {
 		name: "apply_patch",
 		label: "Apply Patch",
 		description: "Apply a strict multi-file patch. Use this for code edits instead of shell redirection or write_file.",
 		parameters: ApplyPatchSchema,
+		mutatesWorkspace: true,
+		mutationScope: "workspace",
+		supportsParallel: false,
+		idempotent: false,
+		requiresExclusiveWorkspaceLock: true,
+		finalGuardRelevant: true,
 		async execute(_toolCallId, params) {
 			try {
-				const parsed = parsePatch(params.patch ?? "");
-				const changes = [];
-				for (const op of parsed) {
-					if (op.kind === "add") {
-						const target = await assertWritable(workspace, op.path);
-						let exists = false;
-						try {
-							await stat(target);
-							exists = true;
-						} catch (e) {
-							if (e.code !== "ENOENT") throw e;
-						}
-						if (exists) throw new Error(`Add file target already exists: ${op.path}`);
-						await mkdir(dirname(target), { recursive: true });
-						await writeFile(target, op.content, "utf-8");
-						const diff = generateDiffString("", op.content, op.path);
-						const counts = countDiff(diff);
-						changes.push({
-							kind: "add",
-							path: op.path,
-							absolutePath: target,
-							...counts,
-							diff
-						});
-						continue;
-					}
-					if (op.kind === "delete") {
-						const target = await assertWritable(workspace, op.path);
-						const oldContent = await readExisting(target);
-						await rm(target);
-						const diff = generateDiffString(oldContent, "", op.path);
-						const counts = countDiff(diff);
-						changes.push({
-							kind: "delete",
-							path: op.path,
-							absolutePath: target,
-							...counts,
-							diff
-						});
-						continue;
-					}
-					const target = await assertWritable(workspace, op.path);
-					const oldContent = await readExisting(target);
-					const newContent = applyHunks(oldContent, op.hunks, op.path);
-					const destination = op.moveTo ? await assertWritable(workspace, op.moveTo) : target;
-					await mkdir(dirname(destination), { recursive: true });
-					await writeFile(destination, newContent, "utf-8");
-					if (destination !== target) await rm(target);
-					const diff = generateDiffString(oldContent, newContent, op.moveTo ? `${op.path} -> ${op.moveTo}` : op.path);
-					const counts = countDiff(diff);
-					changes.push({
-						kind: op.moveTo ? "move" : "update",
-						path: op.path,
-						absolutePath: target,
-						moveTo: op.moveTo,
-						absoluteMoveTo: op.moveTo ? destination : void 0,
-						...counts,
-						diff
-					});
-				}
+				const changes = await buildPatchPlan(workspace, parsePatch(params.patch ?? ""));
+				await commitPatchPlan(changes);
 				const diff = changes.map((change) => change.diff).join("\n");
 				const added = changes.reduce((sum, change) => sum + change.added, 0);
 				const removed = changes.reduce((sum, change) => sum + change.removed, 0);

package/dist/src/agent/tools/apply-patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"apply-patch.js","names":[],"sources":["../../../../src/agent/tools/apply-patch.ts"],"sourcesContent":["import { Type } from '@sinclair/typebox';\nimport type { AgentTool, AgentToolResult } from '@earendil-works/pi-agent-core';\nimport { mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises';\nimport { dirname, relative } from 'node:path';\n\nimport { checkFileSafety } from '../prompt/safety.js';\nimport { evaluateFilePolicy } from '../sandbox/exec-policy.js';\nimport { generateDiffString, normalizeToLF } from './edit-diff.js';\nimport { resolvePathUnderWorkspace } from './tool-paths.js';\nimport type { GoalEvidenceRecordInput } from './goal-evidence-recorder.js';\n\nconst ApplyPatchSchema = Type.Object({\n  patch: Type.String({\n    description: [\n      'Patch text using the grammar:',\n      '*** Begin Patch',\n      '*** Add File: path / *** Delete File: path / *** Update File: path',\n      'optional *** Move to: path for update hunks',\n      '@@ then lines prefixed with space, -, or +',\n      '*** End Patch',\n    ].join(' '),\n  }),\n});\n\nexport type AppliedPatchChangeKind = 'add' | 'delete' | 'update' | 'move';\n\nexport interface AppliedPatchChange {\n  kind: AppliedPatchChangeKind;\n  path: string;\n  absolutePath: string;\n  moveTo?: string;\n  absoluteMoveTo?: string;\n  added: number;\n  removed: number;\n  diff: string;\n}\n\nexport interface ApplyPatchDetails {\n  changes: AppliedPatchChange[];\n  files: string[];\n  summary: string;\n  diff: string;\n  added: number;\n  removed: number;\n}\n\nexport interface CreateApplyPatchToolOptions {\n  recordGoalEvidence?: (input: GoalEvidenceRecordInput) => Promise<void> | void;\n}\n\ntype ParsedPatch =\n  | { kind: 'add'; path: string; content: string }\n  | { kind: 'delete'; path: string }\n  | { kind: 'update'; path: string; moveTo?: string; hunks: PatchHunk[] };\n\ntype PatchHunkLine = { op: 'context' | 'add' | 'remove'; text: string };\ntype PatchHunk = { lines: PatchHunkLine[] };\n\nfunction countDiff(diff: string): { added: number; removed: number } {\n  let added = 0;\n  let removed = 0;\n  for (const line of diff.split('\\n')) {\n    if (line.startsWith('+') && !line.startsWith('+++')) added += 1;\n    if (line.startsWith('-') && !line.startsWith('---')) removed += 1;\n  }\n  return { added, removed };\n}\n\nfunction ensurePatchEnvelope(lines: string[]): void {\n  if (lines[0]?.trim() !== '*** Begin Patch') {\n    throw new Error('Patch must start with \"*** Begin Patch\"');\n  }\n  if (lines[lines.length - 1]?.trim() !== '*** End Patch') {\n    throw new Error('Patch must end with \"*** End Patch\"');\n  }\n}\n\nfunction parsePatch(rawPatch: string): ParsedPatch[] {\n  const lines = normalizeToLF(rawPatch).trimEnd().split('\\n');\n  ensurePatchEnvelope(lines);\n  const ops: ParsedPatch[] = [];\n  let i = 1;\n\n  while (i < lines.length - 1) {\n    const line = lines[i];\n    if (line.startsWith('*** Add File: ')) {\n      const path = line.slice('*** Add File: '.length).trim();\n      i += 1;\n      const body: string[] = [];\n      while (i < lines.length - 1 && !lines[i].startsWith('*** ')) {\n        const current = lines[i];\n        if (!current.startsWith('+')) {\n          throw new Error(`Add file ${path} contains a non-added line`);\n        }\n        body.push(current.slice(1));\n        i += 1;\n      }\n      ops.push({ kind: 'add', path, content: `${body.join('\\n')}${body.length > 0 ? '\\n' : ''}` });\n      continue;\n    }\n\n    if (line.startsWith('*** Delete File: ')) {\n      ops.push({ kind: 'delete', path: line.slice('*** Delete File: '.length).trim() });\n      i += 1;\n      continue;\n    }\n\n    if (line.startsWith('*** Update File: ')) {\n      const path = line.slice('*** Update File: '.length).trim();\n      i += 1;\n      let moveTo: string | undefined;\n      if (lines[i]?.startsWith('*** Move to: ')) {\n        moveTo = lines[i].slice('*** Move to: '.length).trim();\n        i += 1;\n      }\n      const hunks: PatchHunk[] = [];\n      while (i < lines.length - 1 && !lines[i].startsWith('*** ')) {\n        if (!lines[i].startsWith('@@')) {\n          throw new Error(`Update file ${path} expected \"@@\" hunk marker`);\n        }\n        i += 1;\n        const hunkLines: PatchHunkLine[] = [];\n        while (i < lines.length - 1 && !lines[i].startsWith('@@') && !lines[i].startsWith('*** ')) {\n          const current = lines[i];\n          const prefix = current[0];\n          if (prefix === ' ') hunkLines.push({ op: 'context', text: current.slice(1) });\n          else if (prefix === '+') hunkLines.push({ op: 'add', text: current.slice(1) });\n          else if (prefix === '-') hunkLines.push({ op: 'remove', text: current.slice(1) });\n          else throw new Error(`Update file ${path} has invalid hunk line prefix`);\n          i += 1;\n        }\n        hunks.push({ lines: hunkLines });\n      }\n      ops.push({ kind: 'update', path, moveTo, hunks });\n      continue;\n    }\n\n    if (!line.trim()) {\n      i += 1;\n      continue;\n    }\n    throw new Error(`Unknown patch operation: ${line}`);\n  }\n\n  if (ops.length === 0) throw new Error('Patch contains no operations');\n  return ops;\n}\n\nfunction applyHunks(original: string, hunks: PatchHunk[], path: string): string {\n  let content = normalizeToLF(original);\n  for (const hunk of hunks) {\n    const oldLines = hunk.lines\n      .filter((line) => line.op === 'context' || line.op === 'remove')\n      .map((line) => line.text);\n    const newLines = hunk.lines\n      .filter((line) => line.op === 'context' || line.op === 'add')\n      .map((line) => line.text);\n    const oldText = oldLines.join('\\n');\n    const newText = newLines.join('\\n');\n    const idx = content.indexOf(oldText);\n    if (idx === -1) {\n      const preview = oldText.split('\\n').slice(0, 4).join('\\\\n');\n      throw new Error(\n        `Hunk did not match file: ${path}. Re-read the target lines and regenerate the patch with exact current context.${preview ? ` First unmatched context: ${preview}` : ''}`,\n      );\n    }\n    content = `${content.slice(0, idx)}${newText}${content.slice(idx + oldText.length)}`;\n  }\n  return content;\n}\n\nasync function readExisting(path: string): Promise<string> {\n  return normalizeToLF(await readFile(path, 'utf-8'));\n}\n\nasync function assertWritable(workspace: string, path: string): Promise<string> {\n  const quick = checkFileSafety('write', path);\n  if (!quick.allowed) throw new Error(quick.message ?? `Cannot write ${path}`);\n  const policy = evaluateFilePolicy({ operation: 'write', path, workspaceRoot: workspace });\n  if (!policy.allowed) throw new Error(`Sandbox: ${policy.reason}`);\n  return resolvePathUnderWorkspace(path, workspace);\n}\n\nexport function createApplyPatchTool(\n  workspace: string,\n  options?: CreateApplyPatchToolOptions,\n): AgentTool {\n  return {\n    name: 'apply_patch',\n    label: 'Apply Patch',\n    description: 'Apply a strict multi-file patch. Use this for code edits instead of shell redirection or write_file.',\n    parameters: ApplyPatchSchema,\n\n    async execute(\n      _toolCallId: string,\n      params: { patch?: string },\n    ): Promise<AgentToolResult<ApplyPatchDetails>> {\n      try {\n        const patch = params.patch ?? '';\n        const parsed = parsePatch(patch);\n        const changes: AppliedPatchChange[] = [];\n\n        for (const op of parsed) {\n          if (op.kind === 'add') {\n            const target = await assertWritable(workspace, op.path);\n            let exists = false;\n            try {\n              await stat(target);\n              exists = true;\n            } catch (e) {\n              if ((e as NodeJS.ErrnoException).code !== 'ENOENT') throw e;\n            }\n            if (exists) throw new Error(`Add file target already exists: ${op.path}`);\n            await mkdir(dirname(target), { recursive: true });\n            await writeFile(target, op.content, 'utf-8');\n            const diff = generateDiffString('', op.content, op.path);\n            const counts = countDiff(diff);\n            changes.push({\n              kind: 'add',\n              path: op.path,\n              absolutePath: target,\n              ...counts,\n              diff,\n            });\n            continue;\n          }\n\n          if (op.kind === 'delete') {\n            const target = await assertWritable(workspace, op.path);\n            const oldContent = await readExisting(target);\n            await rm(target);\n            const diff = generateDiffString(oldContent, '', op.path);\n            const counts = countDiff(diff);\n            changes.push({\n              kind: 'delete',\n              path: op.path,\n              absolutePath: target,\n              ...counts,\n              diff,\n            });\n            continue;\n          }\n\n          const target = await assertWritable(workspace, op.path);\n          const oldContent = await readExisting(target);\n          const newContent = applyHunks(oldContent, op.hunks, op.path);\n          const destination = op.moveTo ? await assertWritable(workspace, op.moveTo) : target;\n          await mkdir(dirname(destination), { recursive: true });\n          await writeFile(destination, newContent, 'utf-8');\n          if (destination !== target) {\n            await rm(target);\n          }\n          const displayPath = op.moveTo ? `${op.path} -> ${op.moveTo}` : op.path;\n          const diff = generateDiffString(oldContent, newContent, displayPath);\n          const counts = countDiff(diff);\n          changes.push({\n            kind: op.moveTo ? 'move' : 'update',\n            path: op.path,\n            absolutePath: target,\n            moveTo: op.moveTo,\n            absoluteMoveTo: op.moveTo ? destination : undefined,\n            ...counts,\n            diff,\n          });\n        }\n\n        const diff = changes.map((change) => change.diff).join('\\n');\n        const added = changes.reduce((sum, change) => sum + change.added, 0);\n        const removed = changes.reduce((sum, change) => sum + change.removed, 0);\n        const files = changes.map((change) => relative(workspace, change.absoluteMoveTo ?? change.absolutePath));\n        const summary = changes\n          .map((change) => {\n            const display = change.moveTo ? `${change.path} -> ${change.moveTo}` : change.path;\n            return `${change.kind}: ${display} (+${change.added}/-${change.removed})`;\n          })\n          .join('\\n');\n\n        await options?.recordGoalEvidence?.({\n          kind: 'diff',\n          title: `Patch applied: ${changes.length} file${changes.length === 1 ? '' : 's'}`,\n          summary: diff.slice(0, 4000),\n          uri: changes.length === 1 ? changes[0].absoluteMoveTo ?? changes[0].absolutePath : undefined,\n          data: {\n            files,\n            added,\n            removed,\n          },\n        });\n\n        return {\n          content: [{ type: 'text', text: summary || 'Patch applied.' }],\n          details: { changes, files, summary, diff, added, removed },\n        };\n      } catch (error) {\n        const message = error instanceof Error ? error.message : String(error);\n        throw new Error(`apply_patch failed: ${message}`);\n      }\n    },\n  } as any;\n}\n"],"mappings":"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"}
+{"version":3,"file":"apply-patch.js","names":[],"sources":["../../../../src/agent/tools/apply-patch.ts"],"sourcesContent":["import { Type } from '@sinclair/typebox';\nimport type { AgentTool, AgentToolResult } from '@earendil-works/pi-agent-core';\nimport { mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises';\nimport { dirname, relative } from 'node:path';\n\nimport { checkFileSafety } from '../prompt/safety.js';\nimport { evaluateFilePolicy } from '../sandbox/exec-policy.js';\nimport { detectLineEnding, generateDiffString, normalizeToLF, restoreLineEndings } from './edit-diff.js';\nimport { resolvePathUnderWorkspace } from './tool-paths.js';\nimport type { GoalEvidenceRecordInput } from './goal-evidence-recorder.js';\n\nconst ApplyPatchSchema = Type.Object({\n  patch: Type.String({\n    description: [\n      'Patch text using the grammar:',\n      '*** Begin Patch',\n      '*** Add File: path / *** Delete File: path / *** Update File: path',\n      'optional *** Move to: path for update hunks',\n      '@@ then lines prefixed with space, -, or +',\n      '*** End Patch',\n    ].join(' '),\n  }),\n});\n\nexport type AppliedPatchChangeKind = 'add' | 'delete' | 'update' | 'move';\n\nexport interface AppliedPatchChange {\n  kind: AppliedPatchChangeKind;\n  path: string;\n  absolutePath: string;\n  moveTo?: string;\n  absoluteMoveTo?: string;\n  added: number;\n  removed: number;\n  diff: string;\n}\n\nexport interface ApplyPatchDetails {\n  changes: AppliedPatchChange[];\n  files: string[];\n  summary: string;\n  diff: string;\n  added: number;\n  removed: number;\n}\n\nexport interface CreateApplyPatchToolOptions {\n  recordGoalEvidence?: (input: GoalEvidenceRecordInput) => Promise<void> | void;\n}\n\ntype ParsedPatch =\n  | { kind: 'add'; path: string; content: string }\n  | { kind: 'delete'; path: string }\n  | { kind: 'update'; path: string; moveTo?: string; hunks: PatchHunk[] };\n\ntype PlannedPatchChange = {\n  kind: AppliedPatchChangeKind;\n  path: string;\n  absolutePath: string;\n  moveTo?: string;\n  absoluteMoveTo?: string;\n  oldContent?: string;\n  newContent?: string;\n  diff: string;\n  added: number;\n  removed: number;\n};\n\ntype PatchHunkLine = { op: 'context' | 'add' | 'remove'; text: string };\ntype PatchHunk = { lines: PatchHunkLine[] };\n\nfunction countDiff(diff: string): { added: number; removed: number } {\n  let added = 0;\n  let removed = 0;\n  for (const line of diff.split('\\n')) {\n    if (line.startsWith('+') && !line.startsWith('+++')) added += 1;\n    if (line.startsWith('-') && !line.startsWith('---')) removed += 1;\n  }\n  return { added, removed };\n}\n\nfunction ensurePatchEnvelope(lines: string[]): void {\n  if (lines[0]?.trim() !== '*** Begin Patch') {\n    throw new Error('Patch must start with \"*** Begin Patch\"');\n  }\n  if (lines[lines.length - 1]?.trim() !== '*** End Patch') {\n    throw new Error('Patch must end with \"*** End Patch\"');\n  }\n}\n\nfunction parsePatch(rawPatch: string): ParsedPatch[] {\n  const lines = normalizeToLF(rawPatch).trimEnd().split('\\n');\n  ensurePatchEnvelope(lines);\n  const ops: ParsedPatch[] = [];\n  let i = 1;\n\n  while (i < lines.length - 1) {\n    const line = lines[i];\n    if (line.startsWith('*** Add File: ')) {\n      const path = line.slice('*** Add File: '.length).trim();\n      i += 1;\n      const body: string[] = [];\n      while (i < lines.length - 1 && !lines[i].startsWith('*** ')) {\n        const current = lines[i];\n        if (!current.startsWith('+')) {\n          throw new Error(`Add file ${path} contains a non-added line`);\n        }\n        body.push(current.slice(1));\n        i += 1;\n      }\n      ops.push({ kind: 'add', path, content: `${body.join('\\n')}${body.length > 0 ? '\\n' : ''}` });\n      continue;\n    }\n\n    if (line.startsWith('*** Delete File: ')) {\n      ops.push({ kind: 'delete', path: line.slice('*** Delete File: '.length).trim() });\n      i += 1;\n      continue;\n    }\n\n    if (line.startsWith('*** Update File: ')) {\n      const path = line.slice('*** Update File: '.length).trim();\n      i += 1;\n      let moveTo: string | undefined;\n      if (lines[i]?.startsWith('*** Move to: ')) {\n        moveTo = lines[i].slice('*** Move to: '.length).trim();\n        i += 1;\n      }\n      const hunks: PatchHunk[] = [];\n      while (i < lines.length - 1 && !lines[i].startsWith('*** ')) {\n        if (!lines[i].startsWith('@@')) {\n          throw new Error(`Update file ${path} expected \"@@\" hunk marker`);\n        }\n        i += 1;\n        const hunkLines: PatchHunkLine[] = [];\n        while (i < lines.length - 1 && !lines[i].startsWith('@@') && !lines[i].startsWith('*** ')) {\n          const current = lines[i];\n          const prefix = current[0];\n          if (prefix === ' ') hunkLines.push({ op: 'context', text: current.slice(1) });\n          else if (prefix === '+') hunkLines.push({ op: 'add', text: current.slice(1) });\n          else if (prefix === '-') hunkLines.push({ op: 'remove', text: current.slice(1) });\n          else throw new Error(`Update file ${path} has invalid hunk line prefix`);\n          i += 1;\n        }\n        hunks.push({ lines: hunkLines });\n      }\n      ops.push({ kind: 'update', path, moveTo, hunks });\n      continue;\n    }\n\n    if (!line.trim()) {\n      i += 1;\n      continue;\n    }\n    throw new Error(`Unknown patch operation: ${line}`);\n  }\n\n  if (ops.length === 0) throw new Error('Patch contains no operations');\n  return ops;\n}\n\nfunction applyHunks(original: string, hunks: PatchHunk[], path: string): string {\n  let content = normalizeToLF(original);\n  for (const hunk of hunks) {\n    const oldLines = hunk.lines\n      .filter((line) => line.op === 'context' || line.op === 'remove')\n      .map((line) => line.text);\n    const newLines = hunk.lines\n      .filter((line) => line.op === 'context' || line.op === 'add')\n      .map((line) => line.text);\n    const oldText = oldLines.join('\\n');\n    const newText = newLines.join('\\n');\n    const idx = content.indexOf(oldText);\n    if (idx === -1) {\n      const preview = oldText.split('\\n').slice(0, 4).join('\\\\n');\n      throw new Error(\n        `Hunk did not match file: ${path}. Re-read the target lines and regenerate the patch with exact current context.${preview ? ` First unmatched context: ${preview}` : ''}`,\n      );\n    }\n    content = `${content.slice(0, idx)}${newText}${content.slice(idx + oldText.length)}`;\n  }\n  return content;\n}\n\nasync function readExisting(path: string): Promise<string> {\n  return readFile(path, 'utf-8');\n}\n\nasync function assertWritable(workspace: string, path: string): Promise<string> {\n  const quick = checkFileSafety('write', path);\n  if (!quick.allowed) throw new Error(quick.message ?? `Cannot write ${path}`);\n  const policy = evaluateFilePolicy({ operation: 'write', path, workspaceRoot: workspace });\n  if (!policy.allowed) throw new Error(`Sandbox: ${policy.reason}`);\n  return resolvePathUnderWorkspace(path, workspace);\n}\n\nasync function pathExists(path: string): Promise<boolean> {\n  try {\n    await stat(path);\n    return true;\n  } catch (e) {\n    if ((e as NodeJS.ErrnoException).code === 'ENOENT') return false;\n    throw e;\n  }\n}\n\nasync function buildPatchPlan(\n  workspace: string,\n  parsed: ParsedPatch[],\n): Promise<PlannedPatchChange[]> {\n  const changes: PlannedPatchChange[] = [];\n  const plannedTargets = new Set<string>();\n\n  const rememberTarget = (target: string) => {\n    if (plannedTargets.has(target)) {\n      throw new Error(`Patch touches the same target multiple times: ${relative(workspace, target)}`);\n    }\n    plannedTargets.add(target);\n  };\n\n  for (const op of parsed) {\n    if (op.kind === 'add') {\n      const target = await assertWritable(workspace, op.path);\n      rememberTarget(target);\n      if (await pathExists(target)) throw new Error(`Add file target already exists: ${op.path}`);\n      const diff = generateDiffString('', op.content, op.path);\n      const counts = countDiff(diff);\n      changes.push({\n        kind: 'add',\n        path: op.path,\n        absolutePath: target,\n        newContent: op.content,\n        ...counts,\n        diff,\n      });\n      continue;\n    }\n\n    if (op.kind === 'delete') {\n      const target = await assertWritable(workspace, op.path);\n      rememberTarget(target);\n      const oldContent = await readExisting(target);\n      const diff = generateDiffString(oldContent, '', op.path);\n      const counts = countDiff(diff);\n      changes.push({\n        kind: 'delete',\n        path: op.path,\n        absolutePath: target,\n        oldContent,\n        ...counts,\n        diff,\n      });\n      continue;\n    }\n\n    const target = await assertWritable(workspace, op.path);\n    rememberTarget(target);\n    const oldContent = await readExisting(target);\n    const lineEnding = detectLineEnding(oldContent);\n    const newLfContent = applyHunks(normalizeToLF(oldContent), op.hunks, op.path);\n    const newContent = restoreLineEndings(newLfContent, lineEnding);\n    const destination = op.moveTo ? await assertWritable(workspace, op.moveTo) : target;\n    if (destination !== target) {\n      rememberTarget(destination);\n      if (await pathExists(destination)) {\n        throw new Error(`Move target already exists: ${op.moveTo}`);\n      }\n    }\n    const displayPath = op.moveTo ? `${op.path} -> ${op.moveTo}` : op.path;\n    const diff = generateDiffString(oldContent, newContent, displayPath);\n    const counts = countDiff(diff);\n    changes.push({\n      kind: op.moveTo ? 'move' : 'update',\n      path: op.path,\n      absolutePath: target,\n      moveTo: op.moveTo,\n      absoluteMoveTo: op.moveTo ? destination : undefined,\n      oldContent,\n      newContent,\n      ...counts,\n      diff,\n    });\n  }\n\n  return changes;\n}\n\nasync function commitPatchPlan(changes: PlannedPatchChange[]): Promise<void> {\n  const committed: PlannedPatchChange[] = [];\n  try {\n    for (const change of changes) {\n      committed.push(change);\n      if (change.kind === 'add') {\n        await mkdir(dirname(change.absolutePath), { recursive: true });\n        await writeFile(change.absolutePath, change.newContent ?? '', 'utf-8');\n      } else if (change.kind === 'delete') {\n        await rm(change.absolutePath);\n      } else {\n        const destination = change.absoluteMoveTo ?? change.absolutePath;\n        await mkdir(dirname(destination), { recursive: true });\n        await writeFile(destination, change.newContent ?? '', 'utf-8');\n        if (destination !== change.absolutePath) {\n          await rm(change.absolutePath);\n        }\n      }\n    }\n  } catch (error) {\n    for (const change of committed.reverse()) {\n      try {\n        if (change.kind === 'add') {\n          await rm(change.absolutePath, { force: true });\n        } else if (change.kind === 'delete') {\n          await mkdir(dirname(change.absolutePath), { recursive: true });\n          await writeFile(change.absolutePath, change.oldContent ?? '', 'utf-8');\n        } else if (change.absoluteMoveTo) {\n          await rm(change.absoluteMoveTo, { force: true });\n          await mkdir(dirname(change.absolutePath), { recursive: true });\n          await writeFile(change.absolutePath, change.oldContent ?? '', 'utf-8');\n        } else {\n          await writeFile(change.absolutePath, change.oldContent ?? '', 'utf-8');\n        }\n      } catch {\n        // Best-effort rollback; the original write error is more useful to the caller.\n      }\n    }\n    throw error;\n  }\n}\n\nexport function createApplyPatchTool(\n  workspace: string,\n  options?: CreateApplyPatchToolOptions,\n): AgentTool {\n  return {\n    name: 'apply_patch',\n    label: 'Apply Patch',\n    description: 'Apply a strict multi-file patch. Use this for code edits instead of shell redirection or write_file.',\n    parameters: ApplyPatchSchema,\n    mutatesWorkspace: true,\n    mutationScope: 'workspace',\n    supportsParallel: false,\n    idempotent: false,\n    requiresExclusiveWorkspaceLock: true,\n    finalGuardRelevant: true,\n\n    async execute(\n      _toolCallId: string,\n      params: { patch?: string },\n    ): Promise<AgentToolResult<ApplyPatchDetails>> {\n      try {\n        const patch = params.patch ?? '';\n        const parsed = parsePatch(patch);\n        const changes = await buildPatchPlan(workspace, parsed);\n        await commitPatchPlan(changes);\n\n        const diff = changes.map((change) => change.diff).join('\\n');\n        const added = changes.reduce((sum, change) => sum + change.added, 0);\n        const removed = changes.reduce((sum, change) => sum + change.removed, 0);\n        const files = changes.map((change) => relative(workspace, change.absoluteMoveTo ?? change.absolutePath));\n        const summary = changes\n          .map((change) => {\n            const display = change.moveTo ? `${change.path} -> ${change.moveTo}` : change.path;\n            return `${change.kind}: ${display} (+${change.added}/-${change.removed})`;\n          })\n          .join('\\n');\n\n        await options?.recordGoalEvidence?.({\n          kind: 'diff',\n          title: `Patch applied: ${changes.length} file${changes.length === 1 ? '' : 's'}`,\n          summary: diff.slice(0, 4000),\n          uri: changes.length === 1 ? changes[0].absoluteMoveTo ?? changes[0].absolutePath : undefined,\n          data: {\n            files,\n            added,\n            removed,\n          },\n        });\n\n        return {\n          content: [{ type: 'text', text: summary || 'Patch applied.' }],\n          details: { changes, files, summary, diff, added, removed },\n        };\n      } catch (error) {\n        const message = error instanceof Error ? error.message : String(error);\n        throw new Error(`apply_patch failed: ${message}`);\n      }\n    },\n  } as any;\n}\n"],"mappings":"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"}

package/dist/src/agent/tools/concurrency.d.ts

@@ -0,0 +1,8 @@
+import type { AgentTool } from '@earendil-works/pi-agent-core';
+export type ToolLockMode = 'none' | 'exclusive';
+export declare function resolveToolLockMode(tool: AgentTool<any, any>): ToolLockMode;
+export declare class ToolConcurrencyController {
+    private tail;
+    run<T>(mode: ToolLockMode, fn: () => Promise<T>): Promise<T>;
+    private runExclusive;
+}

package/dist/src/agent/tools/concurrency.js

@@ -0,0 +1,31 @@
+import { getToolMetadata } from "./metadata.js";
+//#region src/agent/tools/concurrency.ts
+function resolveToolLockMode(tool) {
+	const meta = getToolMetadata(tool);
+	if (meta.supportsParallel && !meta.mutatesWorkspace && meta.mutationScope === "none") return "none";
+	return "exclusive";
+}
+var ToolConcurrencyController = class {
+	tail = Promise.resolve();
+	run(mode, fn) {
+		if (mode === "none") return fn();
+		return this.runExclusive(fn);
+	}
+	async runExclusive(fn) {
+		const previous = this.tail;
+		let release;
+		this.tail = new Promise((resolve) => {
+			release = resolve;
+		});
+		await previous;
+		try {
+			return await fn();
+		} finally {
+			release();
+		}
+	}
+};
+//#endregion
+export { ToolConcurrencyController, resolveToolLockMode };
+
+//# sourceMappingURL=concurrency.js.map

package/dist/src/agent/tools/concurrency.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"concurrency.js","names":[],"sources":["../../../../src/agent/tools/concurrency.ts"],"sourcesContent":["import type { AgentTool } from '@earendil-works/pi-agent-core';\n\nimport { getToolMetadata } from './metadata.js';\n\nexport type ToolLockMode = 'none' | 'exclusive';\n\nexport function resolveToolLockMode(tool: AgentTool<any, any>): ToolLockMode {\n  const meta = getToolMetadata(tool);\n  if (meta.supportsParallel && !meta.mutatesWorkspace && meta.mutationScope === 'none') {\n    return 'none';\n  }\n  return 'exclusive';\n}\n\nexport class ToolConcurrencyController {\n  private tail: Promise<void> = Promise.resolve();\n\n  run<T>(mode: ToolLockMode, fn: () => Promise<T>): Promise<T> {\n    if (mode === 'none') {\n      return fn();\n    }\n    return this.runExclusive(fn);\n  }\n\n  private async runExclusive<T>(fn: () => Promise<T>): Promise<T> {\n    const previous = this.tail;\n    let release!: () => void;\n    this.tail = new Promise<void>((resolve) => {\n      release = resolve;\n    });\n\n    await previous;\n    try {\n      return await fn();\n    } finally {\n      release();\n    }\n  }\n}\n"],"mappings":";;AAMA,SAAgB,oBAAoB,MAAyC;CAC3E,MAAM,OAAO,gBAAgB,KAAK;AAClC,KAAI,KAAK,oBAAoB,CAAC,KAAK,oBAAoB,KAAK,kBAAkB,OAC5E,QAAO;AAET,QAAO;;AAGT,IAAa,4BAAb,MAAuC;CACrC,OAA8B,QAAQ,SAAS;CAE/C,IAAO,MAAoB,IAAkC;AAC3D,MAAI,SAAS,OACX,QAAO,IAAI;AAEb,SAAO,KAAK,aAAa,GAAG;;CAG9B,MAAc,aAAgB,IAAkC;EAC9D,MAAM,WAAW,KAAK;EACtB,IAAI;AACJ,OAAK,OAAO,IAAI,SAAe,YAAY;AACzC,aAAU;IACV;AAEF,QAAM;AACN,MAAI;AACF,UAAO,MAAM,IAAI;YACT;AACR,YAAS"}

package/dist/src/agent/tools/dreaming-tool.d.ts

@@ -2,6 +2,8 @@ import type { AgentTool } from '@earendil-works/pi-agent-core';
 import type { Config } from '../../config/schema.js';
 export interface DreamingToolDeps {
     getWorkspace: () => string;
+    getDreamingRoot: () => string;
     getConfig: () => Config | undefined;
+    getAgentId?: () => string | undefined;
 }
 export declare function createDreamingTool(deps: DreamingToolDeps): AgentTool;

package/dist/src/agent/tools/dreaming-tool.js

@@ -35,16 +35,18 @@ function createDreamingTool(deps) {
 	return {
 		name: "dreaming",
 		label: "💤 Dreaming",
-		description: "Inspect and maintain the dreaming promotion state.\n\nActions:\n- status: show config gates and short-term store stats\n- reset_store: clear short-term recall store (memory/.dreams/short-term-recall.json)\n- clear_lock: remove a stale promotion lock file (memory/.dreams/short-term-promotion.lock)",
+		description: "Inspect and maintain the dreaming promotion state.\n\nActions:\n- status: show config gates and short-term store stats\n- reset_store: clear this agent short-term recall store (.dreams/short-term-recall.json)\n- clear_lock: remove this agent stale promotion lock file (.dreams/short-term-promotion.lock)",
 		parameters: DreamingSchema,
 		async execute(_toolCallId, params) {
 			const action = params.action;
-			const workspaceDir = deps.getWorkspace();
-			const resolved = resolveDreamingConfig(deps.getConfig());
-			const storePath = path.join(workspaceDir, SHORT_TERM_RECALL_STORE_RELATIVE);
-			const lockPath = path.join(workspaceDir, SHORT_TERM_PROMOTION_LOCK_RELATIVE);
+			const dreamingRoot = deps.getDreamingRoot();
+			const cfg = deps.getConfig();
+			const agentId = deps.getAgentId?.();
+			const resolved = resolveDreamingConfig(cfg, agentId);
+			const storePath = path.join(dreamingRoot, SHORT_TERM_RECALL_STORE_RELATIVE);
+			const lockPath = path.join(dreamingRoot, SHORT_TERM_PROMOTION_LOCK_RELATIVE);
 			if (action === "status") {
-				const { store } = await loadDreamingStore({ workspaceDir });
+				const { store } = await loadDreamingStore({ dreamingRoot });
 				const entries = Object.values(store.entries ?? {});
 				const total = entries.length;
 				const promoted = entries.filter((e) => Boolean(e.promotedAt)).length;
@@ -64,7 +66,8 @@ function createDreamingTool(deps) {
 					`deep.minRecallCount: ${resolved.deep.minRecallCount}`,
 					`deep.limit: ${resolved.deep.limit}`,
 					"",
-					`storePath: ${SHORT_TERM_RECALL_STORE_RELATIVE}`,
+					`agentId: ${agentId ?? "(unknown)"}`,
+					`storePath: ${storePath}`,
 					`entryCount: ${total}`,
 					`promotedCount: ${promoted}`,
 					`promotedToday: ${promotedToday}`,
@@ -76,17 +79,17 @@ function createDreamingTool(deps) {
 				].join("\n"));
 			}
 			if (action === "reset_store") {
-				const { store } = await loadDreamingStore({ workspaceDir });
+				const { store } = await loadDreamingStore({ dreamingRoot });
 				const before = Object.keys(store.entries ?? {}).length;
 				const nowIso = (/* @__PURE__ */ new Date()).toISOString();
 				store.entries = {};
 				store.updatedAt = nowIso;
 				await saveDreamingStore({
-					workspaceDir,
+					dreamingRoot,
 					store
 				});
 				log.info({
-					workspaceDir,
+					dreamingRoot,
 					before
 				}, "Dreaming store reset");
 				return textResult(`Reset short-term store. Removed ${before} entr${before === 1 ? "y" : "ies"}. Path: ${storePath}`);

package/dist/src/agent/tools/dreaming-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"dreaming-tool.js","names":[],"sources":["../../../../src/agent/tools/dreaming-tool.ts"],"sourcesContent":["import fs from 'node:fs/promises';\nimport path from 'node:path';\n\nimport { Type } from '@sinclair/typebox';\nimport type { AgentTool, AgentToolResult } from '@earendil-works/pi-agent-core';\n\nimport type { Config } from '../../config/schema.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { resolveDreamingConfig } from '../memory/dreaming/config.js';\nimport {\n  SHORT_TERM_PROMOTION_LOCK_RELATIVE,\n  SHORT_TERM_RECALL_STORE_RELATIVE,\n} from '../memory/dreaming/constants.js';\nimport { loadDreamingStore, saveDreamingStore } from '../memory/dreaming/short-term-store.js';\n\nconst log = createLogger('DreamingTool');\n\nconst DreamingSchema = Type.Object({\n  action: Type.Union([Type.Literal('status'), Type.Literal('reset_store'), Type.Literal('clear_lock')]),\n});\n\ntype DreamingParams = {\n  action: 'status' | 'reset_store' | 'clear_lock';\n};\n\nexport interface DreamingToolDeps {\n  getWorkspace: () => string;\n  getConfig: () => Config | undefined;\n}\n\nfunction textResult(text: string): AgentToolResult<{}> {\n  return { content: [{ type: 'text', text }], details: {} };\n}\n\nfunction safeStatMs(ms: number | undefined): number | null {\n  if (typeof ms !== 'number' || !Number.isFinite(ms) || ms <= 0) return null;\n  return Math.floor(ms);\n}\n\nfunction isoDay(isoLike: string | undefined): string | null {\n  if (!isoLike) return null;\n  const m = isoLike.match(/^(\\d{4}-\\d{2}-\\d{2})/);\n  return m?.[1] ?? null;\n}\n\nexport function createDreamingTool(deps: DreamingToolDeps): AgentTool {\n  return {\n    name: 'dreaming',\n    label: '💤 Dreaming',\n    description:\n      'Inspect and maintain the dreaming promotion state.\\n\\n' +\n      'Actions:\\n' +\n      '- status: show config gates and short-term store stats\\n' +\n      '- reset_store: clear short-term recall store (memory/.dreams/short-term-recall.json)\\n' +\n      '- clear_lock: remove a stale promotion lock file (memory/.dreams/short-term-promotion.lock)',\n    parameters: DreamingSchema,\n    async execute(_toolCallId, params: any): Promise<AgentToolResult<{}>> {\n      const action = (params as DreamingParams).action;\n      const workspaceDir = deps.getWorkspace();\n      const cfg = deps.getConfig();\n      const resolved = resolveDreamingConfig(cfg);\n\n      const storePath = path.join(workspaceDir, SHORT_TERM_RECALL_STORE_RELATIVE);\n      const lockPath = path.join(workspaceDir, SHORT_TERM_PROMOTION_LOCK_RELATIVE);\n\n      if (action === 'status') {\n        const { store } = await loadDreamingStore({ workspaceDir });\n        const entries = Object.values(store.entries ?? {});\n        const total = entries.length;\n        const promoted = entries.filter((e) => Boolean(e.promotedAt)).length;\n        const today = new Date().toISOString().slice(0, 10);\n        const promotedToday = entries.filter((e) => isoDay(e.promotedAt) === today).length;\n        const lastPromotedAt = entries\n          .map((e) => e.promotedAt)\n          .filter((x): x is string => typeof x === 'string' && x.length > 0)\n          .sort()\n          .at(-1);\n\n        const lockStat = await fs.stat(lockPath).catch(() => null);\n        const lockAgeMs =\n          lockStat && safeStatMs(lockStat.mtimeMs) ? Date.now() - Math.floor(lockStat.mtimeMs) : null;\n\n        const lines = [\n          'Dreaming status',\n          '',\n          `enabled: ${resolved.enabled ? 'true' : 'false'}`,\n          `deep.enabled: ${resolved.deep.enabled ? 'true' : 'false'}`,\n          `cron.frequency: ${resolved.frequency}`,\n          `cron.timezone: ${resolved.timezone ?? '(default)'}`,\n          `deep.minScore: ${resolved.deep.minScore}`,\n          `deep.minRecallCount: ${resolved.deep.minRecallCount}`,\n          `deep.limit: ${resolved.deep.limit}`,\n          '',\n          `storePath: ${SHORT_TERM_RECALL_STORE_RELATIVE}`,\n          `entryCount: ${total}`,\n          `promotedCount: ${promoted}`,\n          `promotedToday: ${promotedToday}`,\n          `lastPromotedAt: ${lastPromotedAt ?? '(none)'}`,\n          '',\n          `lockPath: ${SHORT_TERM_PROMOTION_LOCK_RELATIVE}`,\n          `lockPresent: ${lockStat ? 'true' : 'false'}`,\n          `lockAgeMs: ${lockAgeMs ?? '(n/a)'}`,\n        ];\n        return textResult(lines.join('\\n'));\n      }\n\n      if (action === 'reset_store') {\n        const { store } = await loadDreamingStore({ workspaceDir });\n        const before = Object.keys(store.entries ?? {}).length;\n        const nowIso = new Date().toISOString();\n        store.entries = {};\n        store.updatedAt = nowIso;\n        await saveDreamingStore({ workspaceDir, store });\n        log.info({ workspaceDir, before }, 'Dreaming store reset');\n        return textResult(\n          `Reset short-term store. Removed ${before} entr${before === 1 ? 'y' : 'ies'}. Path: ${storePath}`,\n        );\n      }\n\n      await fs.unlink(lockPath).catch(() => {});\n      return textResult(`Cleared lock (if present). Path: ${lockPath}`);\n    },\n  } as any;\n}\n\n"],"mappings":"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"}
+{"version":3,"file":"dreaming-tool.js","names":[],"sources":["../../../../src/agent/tools/dreaming-tool.ts"],"sourcesContent":["import fs from 'node:fs/promises';\nimport path from 'node:path';\n\nimport { Type } from '@sinclair/typebox';\nimport type { AgentTool, AgentToolResult } from '@earendil-works/pi-agent-core';\n\nimport type { Config } from '../../config/schema.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { resolveDreamingConfig } from '../memory/dreaming/config.js';\nimport {\n  SHORT_TERM_PROMOTION_LOCK_RELATIVE,\n  SHORT_TERM_RECALL_STORE_RELATIVE,\n} from '../memory/dreaming/constants.js';\nimport { loadDreamingStore, saveDreamingStore } from '../memory/dreaming/short-term-store.js';\n\nconst log = createLogger('DreamingTool');\n\nconst DreamingSchema = Type.Object({\n  action: Type.Union([Type.Literal('status'), Type.Literal('reset_store'), Type.Literal('clear_lock')]),\n});\n\ntype DreamingParams = {\n  action: 'status' | 'reset_store' | 'clear_lock';\n};\n\nexport interface DreamingToolDeps {\n  getWorkspace: () => string;\n  getDreamingRoot: () => string;\n  getConfig: () => Config | undefined;\n  getAgentId?: () => string | undefined;\n}\n\nfunction textResult(text: string): AgentToolResult<{}> {\n  return { content: [{ type: 'text', text }], details: {} };\n}\n\nfunction safeStatMs(ms: number | undefined): number | null {\n  if (typeof ms !== 'number' || !Number.isFinite(ms) || ms <= 0) return null;\n  return Math.floor(ms);\n}\n\nfunction isoDay(isoLike: string | undefined): string | null {\n  if (!isoLike) return null;\n  const m = isoLike.match(/^(\\d{4}-\\d{2}-\\d{2})/);\n  return m?.[1] ?? null;\n}\n\nexport function createDreamingTool(deps: DreamingToolDeps): AgentTool {\n  return {\n    name: 'dreaming',\n    label: '💤 Dreaming',\n    description:\n      'Inspect and maintain the dreaming promotion state.\\n\\n' +\n      'Actions:\\n' +\n      '- status: show config gates and short-term store stats\\n' +\n      '- reset_store: clear this agent short-term recall store (.dreams/short-term-recall.json)\\n' +\n      '- clear_lock: remove this agent stale promotion lock file (.dreams/short-term-promotion.lock)',\n    parameters: DreamingSchema,\n    async execute(_toolCallId, params: any): Promise<AgentToolResult<{}>> {\n      const action = (params as DreamingParams).action;\n      const dreamingRoot = deps.getDreamingRoot();\n      const cfg = deps.getConfig();\n      const agentId = deps.getAgentId?.();\n      const resolved = resolveDreamingConfig(cfg, agentId);\n\n      const storePath = path.join(dreamingRoot, SHORT_TERM_RECALL_STORE_RELATIVE);\n      const lockPath = path.join(dreamingRoot, SHORT_TERM_PROMOTION_LOCK_RELATIVE);\n\n      if (action === 'status') {\n        const { store } = await loadDreamingStore({ dreamingRoot });\n        const entries = Object.values(store.entries ?? {});\n        const total = entries.length;\n        const promoted = entries.filter((e) => Boolean(e.promotedAt)).length;\n        const today = new Date().toISOString().slice(0, 10);\n        const promotedToday = entries.filter((e) => isoDay(e.promotedAt) === today).length;\n        const lastPromotedAt = entries\n          .map((e) => e.promotedAt)\n          .filter((x): x is string => typeof x === 'string' && x.length > 0)\n          .sort()\n          .at(-1);\n\n        const lockStat = await fs.stat(lockPath).catch(() => null);\n        const lockAgeMs =\n          lockStat && safeStatMs(lockStat.mtimeMs) ? Date.now() - Math.floor(lockStat.mtimeMs) : null;\n\n        const lines = [\n          'Dreaming status',\n          '',\n          `enabled: ${resolved.enabled ? 'true' : 'false'}`,\n          `deep.enabled: ${resolved.deep.enabled ? 'true' : 'false'}`,\n          `cron.frequency: ${resolved.frequency}`,\n          `cron.timezone: ${resolved.timezone ?? '(default)'}`,\n          `deep.minScore: ${resolved.deep.minScore}`,\n          `deep.minRecallCount: ${resolved.deep.minRecallCount}`,\n          `deep.limit: ${resolved.deep.limit}`,\n          '',\n          `agentId: ${agentId ?? '(unknown)'}`,\n          `storePath: ${storePath}`,\n          `entryCount: ${total}`,\n          `promotedCount: ${promoted}`,\n          `promotedToday: ${promotedToday}`,\n          `lastPromotedAt: ${lastPromotedAt ?? '(none)'}`,\n          '',\n          `lockPath: ${SHORT_TERM_PROMOTION_LOCK_RELATIVE}`,\n          `lockPresent: ${lockStat ? 'true' : 'false'}`,\n          `lockAgeMs: ${lockAgeMs ?? '(n/a)'}`,\n        ];\n        return textResult(lines.join('\\n'));\n      }\n\n      if (action === 'reset_store') {\n        const { store } = await loadDreamingStore({ dreamingRoot });\n        const before = Object.keys(store.entries ?? {}).length;\n        const nowIso = new Date().toISOString();\n        store.entries = {};\n        store.updatedAt = nowIso;\n        await saveDreamingStore({ dreamingRoot, store });\n        log.info({ dreamingRoot, before }, 'Dreaming store reset');\n        return textResult(\n          `Reset short-term store. Removed ${before} entr${before === 1 ? 'y' : 'ies'}. Path: ${storePath}`,\n        );\n      }\n\n      await fs.unlink(lockPath).catch(() => {});\n      return textResult(`Cleared lock (if present). Path: ${lockPath}`);\n    },\n  } as any;\n}\n"],"mappings":"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"}

package/dist/src/agent/tools/exec-command.js

@@ -61,6 +61,10 @@ function createExecCommandTool(workspaceCwd, options) {
 		].join(" "),
 		parameters: ExecCommandSchema,
 		label: "Run Command",
+		mutationScope: "unknown",
+		supportsParallel: false,
+		idempotent: false,
+		finalGuardRelevant: true,
 		async execute(_toolCallId, params, signal, onUpdate) {
 			const command = (params.cmd ?? params.command ?? "").trim();
 			if (!command) return {

package/dist/src/agent/tools/exec-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec-command.js","names":[],"sources":["../../../../src/agent/tools/exec-command.ts"],"sourcesContent":["import { Type } from '@sinclair/typebox';\nimport type {\n  AgentTool,\n  AgentToolResult,\n  AgentToolUpdateCallback,\n} from '@earendil-works/pi-agent-core';\nimport { spawn } from 'node:child_process';\nimport { resolve } from 'node:path';\n\nimport { evaluateExecPolicy } from '../sandbox/exec-policy.js';\nimport { formatSize, truncateTail } from './truncate.js';\nimport type { GoalEvidenceRecordInput } from './goal-evidence-recorder.js';\n\nconst MAX_COMMAND_TIMEOUT_MS = 300_000;\nconst DEFAULT_TIMEOUT_MS = 120_000;\nconst DEFAULT_MAX_OUTPUT_CHARS = 50_000;\nconst STREAM_DELTA_MAX_CHARS = 16_000;\n\nconst ExecCommandSchema = Type.Object({\n  cmd: Type.String({ description: 'Shell command to execute.' }),\n  cwd: Type.Optional(\n    Type.String({\n      description: 'Working directory. Relative paths are resolved under the agent workspace.',\n    }),\n  ),\n  timeoutMs: Type.Optional(\n    Type.Number({\n      description: 'Command timeout in milliseconds. Defaults to 120000 and is capped at 300000.',\n    }),\n  ),\n  maxOutputChars: Type.Optional(\n    Type.Number({\n      description: 'Maximum characters returned to the model. UI streaming still receives output deltas.',\n    }),\n  ),\n});\n\nexport interface ExecCommandDetails {\n  command: string;\n  cwd: string;\n  status: 'success' | 'failed' | 'timed_out' | 'blocked';\n  exitCode: number | null;\n  durationMs: number;\n  timedOut: boolean;\n  truncated: boolean;\n  truncatedBy?: 'lines' | 'bytes' | null;\n  outputBytes: number;\n  stdout: string;\n  stderr: string;\n  aggregatedOutput: string;\n  failureHint?: string;\n}\n\nexport interface ExecCommandUpdateDetails {\n  kind: 'command_output_delta';\n  command: string;\n  cwd: string;\n  stream: 'stdout' | 'stderr';\n  delta: string;\n}\n\nexport interface CreateExecCommandToolOptions {\n  /** Env var names allowed through prepareSafeToolEnv even if they match secret heuristics. */\n  getSkillPassthroughEnvVarNames?: () => string[];\n  recordGoalEvidence?: (input: GoalEvidenceRecordInput) => Promise<void> | void;\n}\n\ntype ExecCommandParams = {\n  cmd?: string;\n  command?: string;\n  cwd?: string;\n  timeoutMs?: number;\n  maxOutputChars?: number;\n};\n\nfunction clampTimeoutMs(raw: unknown): number {\n  const n = typeof raw === 'number' && Number.isFinite(raw) ? raw : DEFAULT_TIMEOUT_MS;\n  return Math.min(MAX_COMMAND_TIMEOUT_MS, Math.max(1_000, Math.floor(n)));\n}\n\nfunction clampMaxOutputChars(raw: unknown): number {\n  const n = typeof raw === 'number' && Number.isFinite(raw) ? raw : DEFAULT_MAX_OUTPUT_CHARS;\n  return Math.max(1_000, Math.min(500_000, Math.floor(n)));\n}\n\nfunction isLikelyTestCommand(command: string): boolean {\n  return /\\b(test|vitest|jest|pytest|go test|cargo test|npm test|pnpm test|yarn test|typecheck|type-check|lint)\\b/i.test(command);\n}\n\nfunction commandStatus(exitCode: number | null, timedOut: boolean): ExecCommandDetails['status'] {\n  if (timedOut) return 'timed_out';\n  if (exitCode === 0) return 'success';\n  return 'failed';\n}\n\nfunction commandFailureHint(details: Pick<ExecCommandDetails, 'status' | 'exitCode' | 'timedOut' | 'stderr' | 'stdout'>): string | undefined {\n  if (details.status === 'success') return undefined;\n  if (details.status === 'timed_out') {\n    return 'The command timed out. Re-run a narrower command, increase timeoutMs if the long run is expected, or inspect partial output before retrying.';\n  }\n  if (details.exitCode !== 0 && details.stderr.trim()) {\n    return 'The command failed. Inspect stderr first, fix the underlying issue, then re-run the narrowest relevant verification command.';\n  }\n  if (details.exitCode !== 0 && details.stdout.trim()) {\n    return 'The command failed. Inspect stdout for the failure location, then re-run the narrowest relevant verification command.';\n  }\n  return 'The command failed without output. Verify the command, cwd, and required dependencies before retrying.';\n}\n\nfunction formatOutputForModel(\n  details: ExecCommandDetails,\n  maxOutputChars: number,\n): { text: string; truncated: boolean; truncatedBy?: 'lines' | 'bytes' | null; outputBytes: number } {\n  let prefix = '';\n  if (details.timedOut) {\n    prefix += `Command timed out after ${Math.round(details.durationMs / 1000)}s\\n`;\n  }\n  if (details.exitCode !== 0 && details.exitCode != null) {\n    prefix += `Command exited with code ${details.exitCode}\\n`;\n  }\n\n  const truncation = truncateTail(details.aggregatedOutput, {\n    maxBytes: Math.min(maxOutputChars, DEFAULT_MAX_OUTPUT_CHARS),\n  });\n  let text = `${prefix}${truncation.content}`.trimEnd();\n  if (!text) text = '(no output)';\n  if (truncation.truncated) {\n    text += `\\n\\n[Output truncated: ${formatSize(truncation.outputBytes)} of ${formatSize(truncation.totalBytes)}]`;\n  }\n  if (details.failureHint) {\n    text += `\\n\\nNext action: ${details.failureHint}`;\n  }\n  return {\n    text,\n    truncated: truncation.truncated,\n    truncatedBy: truncation.truncatedBy,\n    outputBytes: truncation.outputBytes,\n  };\n}\n\nexport function createExecCommandTool(\n  workspaceCwd: string,\n  options?: CreateExecCommandToolOptions,\n): AgentTool {\n  return {\n    name: 'exec_command',\n    description: [\n      'Run shell commands for code inspection, builds, tests, type checks, and verification.',\n      'Use apply_patch for file edits; do not edit files by shell redirection unless explicitly necessary.',\n      'Relative cwd values resolve under the current agent workspace.',\n    ].join(' '),\n    parameters: ExecCommandSchema,\n    label: 'Run Command',\n\n    async execute(\n      _toolCallId: string,\n      params: ExecCommandParams,\n      signal?: AbortSignal,\n      onUpdate?: AgentToolUpdateCallback<ExecCommandUpdateDetails>,\n    ): Promise<AgentToolResult<ExecCommandDetails>> {\n      const command = (params.cmd ?? params.command ?? '').trim();\n      if (!command) {\n        return {\n          content: [{ type: 'text', text: 'Error: cmd is required' }],\n          details: {\n            command,\n            cwd: workspaceCwd,\n            status: 'failed',\n            exitCode: null,\n            durationMs: 0,\n            timedOut: false,\n            truncated: false,\n            outputBytes: 0,\n            stdout: '',\n            stderr: 'cmd is required',\n            aggregatedOutput: 'cmd is required',\n            failureHint: 'Provide a non-empty cmd value.',\n          },\n        };\n      }\n\n      const requestedCwd = params.cwd?.trim()\n        ? resolve(workspaceCwd, params.cwd.trim())\n        : workspaceCwd;\n      const passthroughNames = options?.getSkillPassthroughEnvVarNames?.() ?? [];\n      const policy = evaluateExecPolicy({\n        command,\n        cwd: requestedCwd,\n        allowedEnvVars: passthroughNames,\n      });\n      if (!policy.allowed) {\n        const text = `Sandbox blocked command: ${policy.reason}`;\n        return {\n          content: [{ type: 'text', text }],\n          details: {\n            command,\n            cwd: requestedCwd,\n            status: 'blocked',\n            exitCode: null,\n            durationMs: 0,\n            timedOut: false,\n            truncated: false,\n            outputBytes: Buffer.byteLength(text),\n            stdout: '',\n            stderr: text,\n            aggregatedOutput: text,\n            failureHint: 'Use a narrower workspace-safe command or inspect files with read/search tools instead.',\n          },\n        };\n      }\n\n      const timeoutMs = Math.min(clampTimeoutMs(params.timeoutMs), policy.timeoutMs);\n      const maxOutputChars = clampMaxOutputChars(params.maxOutputChars);\n      const startTime = Date.now();\n      let stdout = '';\n      let stderr = '';\n      let aggregatedOutput = '';\n      let timedOut = false;\n      let settled = false;\n\n      return new Promise((resolveTool) => {\n        const proc = spawn(command, [], {\n          shell: true,\n          cwd: policy.effectiveCwd,\n          env: {\n            ...policy.sanitizedEnv,\n            COLUMNS: '200',\n          },\n        });\n\n        const publishDelta = (stream: 'stdout' | 'stderr', raw: Buffer | string) => {\n          const text = raw.toString();\n          if (!text) return;\n          if (stream === 'stdout') stdout += text;\n          else stderr += text;\n          aggregatedOutput += text;\n\n          const delta = text.length > STREAM_DELTA_MAX_CHARS\n            ? `${text.slice(0, STREAM_DELTA_MAX_CHARS)}\\n[stream delta truncated]`\n            : text;\n          onUpdate?.({\n            content: [],\n            details: {\n              kind: 'command_output_delta',\n              command,\n              cwd: policy.effectiveCwd,\n              stream,\n              delta,\n            },\n          });\n        };\n\n        const finish = (\n          exitCode: number | null,\n          errorText?: string,\n        ) => {\n          if (settled) return;\n          settled = true;\n          clearTimeout(timeout);\n          signal?.removeEventListener('abort', abort);\n          if (errorText) {\n            stderr += errorText;\n            aggregatedOutput += errorText;\n          }\n\n          const durationMs = Date.now() - startTime;\n          const baseDetails: ExecCommandDetails = {\n            command,\n            cwd: policy.effectiveCwd,\n            status: commandStatus(exitCode, timedOut),\n            exitCode,\n            durationMs,\n            timedOut,\n            truncated: false,\n            outputBytes: Buffer.byteLength(aggregatedOutput),\n            stdout,\n            stderr,\n            aggregatedOutput,\n          };\n          baseDetails.failureHint = commandFailureHint(baseDetails);\n          const formatted = formatOutputForModel(baseDetails, maxOutputChars);\n          const details: ExecCommandDetails = {\n            ...baseDetails,\n            truncated: formatted.truncated,\n            truncatedBy: formatted.truncatedBy,\n            outputBytes: formatted.outputBytes,\n          };\n\n          const result: AgentToolResult<ExecCommandDetails> = {\n            content: [{ type: 'text', text: formatted.text }],\n            details,\n          };\n\n          void Promise.resolve(options?.recordGoalEvidence?.({\n            kind: timedOut || exitCode !== 0 ? 'command' : isLikelyTestCommand(command) ? 'test' : 'command',\n            title: `Command: ${command.slice(0, 120)}`,\n            summary: formatted.text.slice(0, 2000),\n            data: {\n              command,\n              cwd: policy.effectiveCwd,\n              exitCode,\n              durationMs,\n              timedOut,\n              truncated: details.truncated,\n              outputBytes: details.outputBytes,\n            },\n          })).finally(() => resolveTool(result));\n        };\n\n        const abort = () => {\n          timedOut = true;\n          proc.kill('SIGKILL');\n        };\n\n        const timeout = setTimeout(() => {\n          timedOut = true;\n          proc.kill('SIGKILL');\n        }, timeoutMs);\n\n        if (signal?.aborted) {\n          abort();\n        } else {\n          signal?.addEventListener('abort', abort, { once: true });\n        }\n\n        proc.stdout?.on('data', (data) => publishDelta('stdout', data));\n        proc.stderr?.on('data', (data) => publishDelta('stderr', data));\n        proc.on('error', (err) => finish(null, `Error: ${err.message}`));\n        proc.on('close', (code) => finish(code));\n      });\n    },\n  } as any;\n}\n"],"mappings":";;;;;;AAaA,MAAM,yBAAyB;AAC/B,MAAM,qBAAqB;AAC3B,MAAM,2BAA2B;AACjC,MAAM,yBAAyB;AAE/B,MAAM,oBAAoB,KAAK,OAAO;CACpC,KAAK,KAAK,OAAO,EAAE,aAAa,6BAA6B,CAAC;CAC9D,KAAK,KAAK,SACR,KAAK,OAAO,EACV,aAAa,6EACd,CAAC,CACH;CACD,WAAW,KAAK,SACd,KAAK,OAAO,EACV,aAAa,gFACd,CAAC,CACH;CACD,gBAAgB,KAAK,SACnB,KAAK,OAAO,EACV,aAAa,wFACd,CAAC,CACH;CACF,CAAC;AAwCF,SAAS,eAAe,KAAsB;AAE5C,QAAO,KAAK,IAAI,wBAAwB,KAAK,IAAI,KAAO,KAAK,MADnD,OAAO,QAAQ,YAAY,OAAO,SAAS,IAAI,GAAG,MAAM,mBACG,CAAC,CAAC;;AAGzE,SAAS,oBAAoB,KAAsB;AAEjD,QAAO,KAAK,IAAI,KAAO,KAAK,IAAI,KAAS,KAAK,MADpC,OAAO,QAAQ,YAAY,OAAO,SAAS,IAAI,GAAG,MAAM,yBACZ,CAAC,CAAC;;AAG1D,SAAS,oBAAoB,SAA0B;AACrD,QAAO,2GAA2G,KAAK,QAAQ;;AAGjI,SAAS,cAAc,UAAyB,UAAiD;AAC/F,KAAI,SAAU,QAAO;AACrB,KAAI,aAAa,EAAG,QAAO;AAC3B,QAAO;;AAGT,SAAS,mBAAmB,SAAiH;AAC3I,KAAI,QAAQ,WAAW,UAAW,QAAO,KAAA;AACzC,KAAI,QAAQ,WAAW,YACrB,QAAO;AAET,KAAI,QAAQ,aAAa,KAAK,QAAQ,OAAO,MAAM,CACjD,QAAO;AAET,KAAI,QAAQ,aAAa,KAAK,QAAQ,OAAO,MAAM,CACjD,QAAO;AAET,QAAO;;AAGT,SAAS,qBACP,SACA,gBACmG;CACnG,IAAI,SAAS;AACb,KAAI,QAAQ,SACV,WAAU,2BAA2B,KAAK,MAAM,QAAQ,aAAa,IAAK,CAAC;AAE7E,KAAI,QAAQ,aAAa,KAAK,QAAQ,YAAY,KAChD,WAAU,4BAA4B,QAAQ,SAAS;CAGzD,MAAM,aAAa,aAAa,QAAQ,kBAAkB,EACxD,UAAU,KAAK,IAAI,gBAAgB,yBAAyB,EAC7D,CAAC;CACF,IAAI,OAAO,GAAG,SAAS,WAAW,UAAU,SAAS;AACrD,KAAI,CAAC,KAAM,QAAO;AAClB,KAAI,WAAW,UACb,SAAQ,0BAA0B,WAAW,WAAW,YAAY,CAAC,MAAM,WAAW,WAAW,WAAW,CAAC;AAE/G,KAAI,QAAQ,YACV,SAAQ,oBAAoB,QAAQ;AAEtC,QAAO;EACL;EACA,WAAW,WAAW;EACtB,aAAa,WAAW;EACxB,aAAa,WAAW;EACzB;;AAGH,SAAgB,sBACd,cACA,SACW;AACX,QAAO;EACL,MAAM;EACN,aAAa;GACX;GACA;GACA;GACD,CAAC,KAAK,IAAI;EACX,YAAY;EACZ,OAAO;EAEP,MAAM,QACJ,aACA,QACA,QACA,UAC8C;GAC9C,MAAM,WAAW,OAAO,OAAO,OAAO,WAAW,IAAI,MAAM;AAC3D,OAAI,CAAC,QACH,QAAO;IACL,SAAS,CAAC;KAAE,MAAM;KAAQ,MAAM;KAA0B,CAAC;IAC3D,SAAS;KACP;KACA,KAAK;KACL,QAAQ;KACR,UAAU;KACV,YAAY;KACZ,UAAU;KACV,WAAW;KACX,aAAa;KACb,QAAQ;KACR,QAAQ;KACR,kBAAkB;KAClB,aAAa;KACd;IACF;GAGH,MAAM,eAAe,OAAO,KAAK,MAAM,GACnC,QAAQ,cAAc,OAAO,IAAI,MAAM,CAAC,GACxC;GAEJ,MAAM,SAAS,mBAAmB;IAChC;IACA,KAAK;IACL,gBAJuB,SAAS,kCAAkC,IAAI,EAAE;IAKzE,CAAC;AACF,OAAI,CAAC,OAAO,SAAS;IACnB,MAAM,OAAO,4BAA4B,OAAO;AAChD,WAAO;KACL,SAAS,CAAC;MAAE,MAAM;MAAQ;MAAM,CAAC;KACjC,SAAS;MACP;MACA,KAAK;MACL,QAAQ;MACR,UAAU;MACV,YAAY;MACZ,UAAU;MACV,WAAW;MACX,aAAa,OAAO,WAAW,KAAK;MACpC,QAAQ;MACR,QAAQ;MACR,kBAAkB;MAClB,aAAa;MACd;KACF;;GAGH,MAAM,YAAY,KAAK,IAAI,eAAe,OAAO,UAAU,EAAE,OAAO,UAAU;GAC9E,MAAM,iBAAiB,oBAAoB,OAAO,eAAe;GACjE,MAAM,YAAY,KAAK,KAAK;GAC5B,IAAI,SAAS;GACb,IAAI,SAAS;GACb,IAAI,mBAAmB;GACvB,IAAI,WAAW;GACf,IAAI,UAAU;AAEd,UAAO,IAAI,SAAS,gBAAgB;IAClC,MAAM,OAAO,MAAM,SAAS,EAAE,EAAE;KAC9B,OAAO;KACP,KAAK,OAAO;KACZ,KAAK;MACH,GAAG,OAAO;MACV,SAAS;MACV;KACF,CAAC;IAEF,MAAM,gBAAgB,QAA6B,QAAyB;KAC1E,MAAM,OAAO,IAAI,UAAU;AAC3B,SAAI,CAAC,KAAM;AACX,SAAI,WAAW,SAAU,WAAU;SAC9B,WAAU;AACf,yBAAoB;KAEpB,MAAM,QAAQ,KAAK,SAAS,yBACxB,GAAG,KAAK,MAAM,GAAG,uBAAuB,CAAC,8BACzC;AACJ,gBAAW;MACT,SAAS,EAAE;MACX,SAAS;OACP,MAAM;OACN;OACA,KAAK,OAAO;OACZ;OACA;OACD;MACF,CAAC;;IAGJ,MAAM,UACJ,UACA,cACG;AACH,SAAI,QAAS;AACb,eAAU;AACV,kBAAa,QAAQ;AACrB,aAAQ,oBAAoB,SAAS,MAAM;AAC3C,SAAI,WAAW;AACb,gBAAU;AACV,0BAAoB;;KAGtB,MAAM,aAAa,KAAK,KAAK,GAAG;KAChC,MAAM,cAAkC;MACtC;MACA,KAAK,OAAO;MACZ,QAAQ,cAAc,UAAU,SAAS;MACzC;MACA;MACA;MACA,WAAW;MACX,aAAa,OAAO,WAAW,iBAAiB;MAChD;MACA;MACA;MACD;AACD,iBAAY,cAAc,mBAAmB,YAAY;KACzD,MAAM,YAAY,qBAAqB,aAAa,eAAe;KACnE,MAAM,UAA8B;MAClC,GAAG;MACH,WAAW,UAAU;MACrB,aAAa,UAAU;MACvB,aAAa,UAAU;MACxB;KAED,MAAM,SAA8C;MAClD,SAAS,CAAC;OAAE,MAAM;OAAQ,MAAM,UAAU;OAAM,CAAC;MACjD;MACD;AAEI,aAAQ,QAAQ,SAAS,qBAAqB;MACjD,MAAM,YAAY,aAAa,IAAI,YAAY,oBAAoB,QAAQ,GAAG,SAAS;MACvF,OAAO,YAAY,QAAQ,MAAM,GAAG,IAAI;MACxC,SAAS,UAAU,KAAK,MAAM,GAAG,IAAK;MACtC,MAAM;OACJ;OACA,KAAK,OAAO;OACZ;OACA;OACA;OACA,WAAW,QAAQ;OACnB,aAAa,QAAQ;OACtB;MACF,CAAC,CAAC,CAAC,cAAc,YAAY,OAAO,CAAC;;IAGxC,MAAM,cAAc;AAClB,gBAAW;AACX,UAAK,KAAK,UAAU;;IAGtB,MAAM,UAAU,iBAAiB;AAC/B,gBAAW;AACX,UAAK,KAAK,UAAU;OACnB,UAAU;AAEb,QAAI,QAAQ,QACV,QAAO;QAEP,SAAQ,iBAAiB,SAAS,OAAO,EAAE,MAAM,MAAM,CAAC;AAG1D,SAAK,QAAQ,GAAG,SAAS,SAAS,aAAa,UAAU,KAAK,CAAC;AAC/D,SAAK,QAAQ,GAAG,SAAS,SAAS,aAAa,UAAU,KAAK,CAAC;AAC/D,SAAK,GAAG,UAAU,QAAQ,OAAO,MAAM,UAAU,IAAI,UAAU,CAAC;AAChE,SAAK,GAAG,UAAU,SAAS,OAAO,KAAK,CAAC;KACxC;;EAEL"}
+{"version":3,"file":"exec-command.js","names":[],"sources":["../../../../src/agent/tools/exec-command.ts"],"sourcesContent":["import { Type } from '@sinclair/typebox';\nimport type {\n  AgentTool,\n  AgentToolResult,\n  AgentToolUpdateCallback,\n} from '@earendil-works/pi-agent-core';\nimport { spawn } from 'node:child_process';\nimport { resolve } from 'node:path';\n\nimport { evaluateExecPolicy } from '../sandbox/exec-policy.js';\nimport { formatSize, truncateTail } from './truncate.js';\nimport type { GoalEvidenceRecordInput } from './goal-evidence-recorder.js';\n\nconst MAX_COMMAND_TIMEOUT_MS = 300_000;\nconst DEFAULT_TIMEOUT_MS = 120_000;\nconst DEFAULT_MAX_OUTPUT_CHARS = 50_000;\nconst STREAM_DELTA_MAX_CHARS = 16_000;\n\nconst ExecCommandSchema = Type.Object({\n  cmd: Type.String({ description: 'Shell command to execute.' }),\n  cwd: Type.Optional(\n    Type.String({\n      description: 'Working directory. Relative paths are resolved under the agent workspace.',\n    }),\n  ),\n  timeoutMs: Type.Optional(\n    Type.Number({\n      description: 'Command timeout in milliseconds. Defaults to 120000 and is capped at 300000.',\n    }),\n  ),\n  maxOutputChars: Type.Optional(\n    Type.Number({\n      description: 'Maximum characters returned to the model. UI streaming still receives output deltas.',\n    }),\n  ),\n});\n\nexport interface ExecCommandDetails {\n  command: string;\n  cwd: string;\n  status: 'success' | 'failed' | 'timed_out' | 'blocked';\n  exitCode: number | null;\n  durationMs: number;\n  timedOut: boolean;\n  truncated: boolean;\n  truncatedBy?: 'lines' | 'bytes' | null;\n  outputBytes: number;\n  stdout: string;\n  stderr: string;\n  aggregatedOutput: string;\n  failureHint?: string;\n}\n\nexport interface ExecCommandUpdateDetails {\n  kind: 'command_output_delta';\n  command: string;\n  cwd: string;\n  stream: 'stdout' | 'stderr';\n  delta: string;\n}\n\nexport interface CreateExecCommandToolOptions {\n  /** Env var names allowed through prepareSafeToolEnv even if they match secret heuristics. */\n  getSkillPassthroughEnvVarNames?: () => string[];\n  recordGoalEvidence?: (input: GoalEvidenceRecordInput) => Promise<void> | void;\n}\n\ntype ExecCommandParams = {\n  cmd?: string;\n  command?: string;\n  cwd?: string;\n  timeoutMs?: number;\n  maxOutputChars?: number;\n};\n\nfunction clampTimeoutMs(raw: unknown): number {\n  const n = typeof raw === 'number' && Number.isFinite(raw) ? raw : DEFAULT_TIMEOUT_MS;\n  return Math.min(MAX_COMMAND_TIMEOUT_MS, Math.max(1_000, Math.floor(n)));\n}\n\nfunction clampMaxOutputChars(raw: unknown): number {\n  const n = typeof raw === 'number' && Number.isFinite(raw) ? raw : DEFAULT_MAX_OUTPUT_CHARS;\n  return Math.max(1_000, Math.min(500_000, Math.floor(n)));\n}\n\nfunction isLikelyTestCommand(command: string): boolean {\n  return /\\b(test|vitest|jest|pytest|go test|cargo test|npm test|pnpm test|yarn test|typecheck|type-check|lint)\\b/i.test(command);\n}\n\nfunction commandStatus(exitCode: number | null, timedOut: boolean): ExecCommandDetails['status'] {\n  if (timedOut) return 'timed_out';\n  if (exitCode === 0) return 'success';\n  return 'failed';\n}\n\nfunction commandFailureHint(details: Pick<ExecCommandDetails, 'status' | 'exitCode' | 'timedOut' | 'stderr' | 'stdout'>): string | undefined {\n  if (details.status === 'success') return undefined;\n  if (details.status === 'timed_out') {\n    return 'The command timed out. Re-run a narrower command, increase timeoutMs if the long run is expected, or inspect partial output before retrying.';\n  }\n  if (details.exitCode !== 0 && details.stderr.trim()) {\n    return 'The command failed. Inspect stderr first, fix the underlying issue, then re-run the narrowest relevant verification command.';\n  }\n  if (details.exitCode !== 0 && details.stdout.trim()) {\n    return 'The command failed. Inspect stdout for the failure location, then re-run the narrowest relevant verification command.';\n  }\n  return 'The command failed without output. Verify the command, cwd, and required dependencies before retrying.';\n}\n\nfunction formatOutputForModel(\n  details: ExecCommandDetails,\n  maxOutputChars: number,\n): { text: string; truncated: boolean; truncatedBy?: 'lines' | 'bytes' | null; outputBytes: number } {\n  let prefix = '';\n  if (details.timedOut) {\n    prefix += `Command timed out after ${Math.round(details.durationMs / 1000)}s\\n`;\n  }\n  if (details.exitCode !== 0 && details.exitCode != null) {\n    prefix += `Command exited with code ${details.exitCode}\\n`;\n  }\n\n  const truncation = truncateTail(details.aggregatedOutput, {\n    maxBytes: Math.min(maxOutputChars, DEFAULT_MAX_OUTPUT_CHARS),\n  });\n  let text = `${prefix}${truncation.content}`.trimEnd();\n  if (!text) text = '(no output)';\n  if (truncation.truncated) {\n    text += `\\n\\n[Output truncated: ${formatSize(truncation.outputBytes)} of ${formatSize(truncation.totalBytes)}]`;\n  }\n  if (details.failureHint) {\n    text += `\\n\\nNext action: ${details.failureHint}`;\n  }\n  return {\n    text,\n    truncated: truncation.truncated,\n    truncatedBy: truncation.truncatedBy,\n    outputBytes: truncation.outputBytes,\n  };\n}\n\nexport function createExecCommandTool(\n  workspaceCwd: string,\n  options?: CreateExecCommandToolOptions,\n): AgentTool {\n  return {\n    name: 'exec_command',\n    description: [\n      'Run shell commands for code inspection, builds, tests, type checks, and verification.',\n      'Use apply_patch for file edits; do not edit files by shell redirection unless explicitly necessary.',\n      'Relative cwd values resolve under the current agent workspace.',\n    ].join(' '),\n    parameters: ExecCommandSchema,\n    label: 'Run Command',\n    mutationScope: 'unknown',\n    supportsParallel: false,\n    idempotent: false,\n    finalGuardRelevant: true,\n\n    async execute(\n      _toolCallId: string,\n      params: ExecCommandParams,\n      signal?: AbortSignal,\n      onUpdate?: AgentToolUpdateCallback<ExecCommandUpdateDetails>,\n    ): Promise<AgentToolResult<ExecCommandDetails>> {\n      const command = (params.cmd ?? params.command ?? '').trim();\n      if (!command) {\n        return {\n          content: [{ type: 'text', text: 'Error: cmd is required' }],\n          details: {\n            command,\n            cwd: workspaceCwd,\n            status: 'failed',\n            exitCode: null,\n            durationMs: 0,\n            timedOut: false,\n            truncated: false,\n            outputBytes: 0,\n            stdout: '',\n            stderr: 'cmd is required',\n            aggregatedOutput: 'cmd is required',\n            failureHint: 'Provide a non-empty cmd value.',\n          },\n        };\n      }\n\n      const requestedCwd = params.cwd?.trim()\n        ? resolve(workspaceCwd, params.cwd.trim())\n        : workspaceCwd;\n      const passthroughNames = options?.getSkillPassthroughEnvVarNames?.() ?? [];\n      const policy = evaluateExecPolicy({\n        command,\n        cwd: requestedCwd,\n        allowedEnvVars: passthroughNames,\n      });\n      if (!policy.allowed) {\n        const text = `Sandbox blocked command: ${policy.reason}`;\n        return {\n          content: [{ type: 'text', text }],\n          details: {\n            command,\n            cwd: requestedCwd,\n            status: 'blocked',\n            exitCode: null,\n            durationMs: 0,\n            timedOut: false,\n            truncated: false,\n            outputBytes: Buffer.byteLength(text),\n            stdout: '',\n            stderr: text,\n            aggregatedOutput: text,\n            failureHint: 'Use a narrower workspace-safe command or inspect files with read/search tools instead.',\n          },\n        };\n      }\n\n      const timeoutMs = Math.min(clampTimeoutMs(params.timeoutMs), policy.timeoutMs);\n      const maxOutputChars = clampMaxOutputChars(params.maxOutputChars);\n      const startTime = Date.now();\n      let stdout = '';\n      let stderr = '';\n      let aggregatedOutput = '';\n      let timedOut = false;\n      let settled = false;\n\n      return new Promise((resolveTool) => {\n        const proc = spawn(command, [], {\n          shell: true,\n          cwd: policy.effectiveCwd,\n          env: {\n            ...policy.sanitizedEnv,\n            COLUMNS: '200',\n          },\n        });\n\n        const publishDelta = (stream: 'stdout' | 'stderr', raw: Buffer | string) => {\n          const text = raw.toString();\n          if (!text) return;\n          if (stream === 'stdout') stdout += text;\n          else stderr += text;\n          aggregatedOutput += text;\n\n          const delta = text.length > STREAM_DELTA_MAX_CHARS\n            ? `${text.slice(0, STREAM_DELTA_MAX_CHARS)}\\n[stream delta truncated]`\n            : text;\n          onUpdate?.({\n            content: [],\n            details: {\n              kind: 'command_output_delta',\n              command,\n              cwd: policy.effectiveCwd,\n              stream,\n              delta,\n            },\n          });\n        };\n\n        const finish = (\n          exitCode: number | null,\n          errorText?: string,\n        ) => {\n          if (settled) return;\n          settled = true;\n          clearTimeout(timeout);\n          signal?.removeEventListener('abort', abort);\n          if (errorText) {\n            stderr += errorText;\n            aggregatedOutput += errorText;\n          }\n\n          const durationMs = Date.now() - startTime;\n          const baseDetails: ExecCommandDetails = {\n            command,\n            cwd: policy.effectiveCwd,\n            status: commandStatus(exitCode, timedOut),\n            exitCode,\n            durationMs,\n            timedOut,\n            truncated: false,\n            outputBytes: Buffer.byteLength(aggregatedOutput),\n            stdout,\n            stderr,\n            aggregatedOutput,\n          };\n          baseDetails.failureHint = commandFailureHint(baseDetails);\n          const formatted = formatOutputForModel(baseDetails, maxOutputChars);\n          const details: ExecCommandDetails = {\n            ...baseDetails,\n            truncated: formatted.truncated,\n            truncatedBy: formatted.truncatedBy,\n            outputBytes: formatted.outputBytes,\n          };\n\n          const result: AgentToolResult<ExecCommandDetails> = {\n            content: [{ type: 'text', text: formatted.text }],\n            details,\n          };\n\n          void Promise.resolve(options?.recordGoalEvidence?.({\n            kind: timedOut || exitCode !== 0 ? 'command' : isLikelyTestCommand(command) ? 'test' : 'command',\n            title: `Command: ${command.slice(0, 120)}`,\n            summary: formatted.text.slice(0, 2000),\n            data: {\n              command,\n              cwd: policy.effectiveCwd,\n              exitCode,\n              durationMs,\n              timedOut,\n              truncated: details.truncated,\n              outputBytes: details.outputBytes,\n            },\n          })).finally(() => resolveTool(result));\n        };\n\n        const abort = () => {\n          timedOut = true;\n          proc.kill('SIGKILL');\n        };\n\n        const timeout = setTimeout(() => {\n          timedOut = true;\n          proc.kill('SIGKILL');\n        }, timeoutMs);\n\n        if (signal?.aborted) {\n          abort();\n        } else {\n          signal?.addEventListener('abort', abort, { once: true });\n        }\n\n        proc.stdout?.on('data', (data) => publishDelta('stdout', data));\n        proc.stderr?.on('data', (data) => publishDelta('stderr', data));\n        proc.on('error', (err) => finish(null, `Error: ${err.message}`));\n        proc.on('close', (code) => finish(code));\n      });\n    },\n  } as any;\n}\n"],"mappings":"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"}

package/dist/src/agent/tools/executor.d.ts

@@ -12,6 +12,9 @@
  * instead of synthesising fake-success results.
  */
 import type { AgentTool, AgentToolResult, AgentToolUpdateCallback } from '@earendil-works/pi-agent-core';
+import type { XopcToolMetadata } from './metadata.js';
+import { ToolConcurrencyController } from './concurrency.js';
+import type { ToolConcurrencyController as ToolConcurrencyControllerType } from './concurrency.js';
 export interface ToolExecutorConfig {
     /** Default per-tool timeout when the tool does not declare its own `timeoutMs`. */
     defaultTimeoutMs: number;
@@ -32,9 +35,8 @@ declare const DEFAULT_CONFIG: ToolExecutorConfig;
  * - `idempotent`: marks a tool as safe to retry. The wrapper retries only
  *   tools that opt in — write/edit-like tools must leave this `false`.
  */
-export interface XopcToolHints {
+export interface XopcToolHints extends XopcToolMetadata {
     timeoutMs?: number;
-    idempotent?: boolean;
 }
 /**
  * Execute tool with timeout (always) and retry (only for idempotent tools).
@@ -45,9 +47,9 @@ export declare function executeToolWithProtection<TDetails>(tool: AgentTool<any,
  * Wrap a single tool with the protection pipeline. Preserves the original
  * `execute` signature so streaming `signal` / `onUpdate` reach the tool.
  */
-export declare function wrapToolWithProtection<TDetails>(tool: AgentTool<any, TDetails>, config?: Partial<ToolExecutorConfig>): AgentTool<any, TDetails>;
+export declare function wrapToolWithProtection<TDetails>(tool: AgentTool<any, TDetails>, config?: Partial<ToolExecutorConfig>, concurrency?: ToolConcurrencyControllerType): AgentTool<any, TDetails>;
 /**
  * Wrap a batch of tools with protection.
  */
-export declare function wrapToolsWithProtection(tools: AgentTool<any, any>[], config?: Partial<ToolExecutorConfig>): AgentTool<any, any>[];
+export declare function wrapToolsWithProtection(tools: AgentTool<any, any>[], config?: Partial<ToolExecutorConfig>, concurrency?: ToolConcurrencyController): AgentTool<any, any>[];
 export { DEFAULT_CONFIG as DEFAULT_TOOL_EXECUTOR_CONFIG };

package/dist/src/agent/tools/executor.js

@@ -1,5 +1,6 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { ToolConcurrencyController, resolveToolLockMode } from "./concurrency.js";
 import { TimeoutError, executeWithTimeout } from "../lifecycle/timeout-wrapper.js";
 import { withRetry } from "../../infra/retry.js";
 //#region src/agent/tools/executor.ts
@@ -91,19 +92,21 @@ async function executeToolWithProtection(tool, toolCallId, params, signal, onUpd
 * Wrap a single tool with the protection pipeline. Preserves the original
 * `execute` signature so streaming `signal` / `onUpdate` reach the tool.
 */
-function wrapToolWithProtection(tool, config) {
+function wrapToolWithProtection(tool, config, concurrency) {
+	const lockMode = resolveToolLockMode(tool);
 	return {
 		...tool,
 		async execute(toolCallId, params, signal, onUpdate) {
-			return executeToolWithProtection(tool, toolCallId, params, signal, onUpdate, config);
+			const run = () => executeToolWithProtection(tool, toolCallId, params, signal, onUpdate, config);
+			return concurrency ? concurrency.run(lockMode, run) : run();
 		}
 	};
 }
 /**
 * Wrap a batch of tools with protection.
 */
-function wrapToolsWithProtection(tools, config) {
-	return tools.map((tool) => wrapToolWithProtection(tool, config));
+function wrapToolsWithProtection(tools, config, concurrency = new ToolConcurrencyController()) {
+	return tools.map((tool) => wrapToolWithProtection(tool, config, concurrency));
 }
 //#endregion
 export { DEFAULT_CONFIG as DEFAULT_TOOL_EXECUTOR_CONFIG, executeToolWithProtection, wrapToolWithProtection, wrapToolsWithProtection };