@odla-ai/harness 0.9.1 → 0.9.2

package/dist/node.cjs

@@ -33,6 +33,7 @@ __export(node_exports, {
   V2_SYSTEM_PROMPT: () => V2_SYSTEM_PROMPT,
   V3_SYSTEM_PROMPT: () => V3_SYSTEM_PROMPT,
   applyCodePatch: () => applyCodePatch,
+  applyPatchDialectToDiff: () => applyPatchDialectToDiff,
   assertCodeBuildRecipe: () => assertCodeBuildRecipe,
   assertDisjointPlan: () => assertDisjointPlan,
   assertPinnedImage: () => assertPinnedImage,
@@ -50,6 +51,7 @@ __export(node_exports, {
   describePatchFailure: () => describePatchFailure,
   digestStagedWorkspace: () => digestStagedWorkspace,
   feedbackIsActionable: () => feedbackIsActionable,
+  hasContextFreeHunk: () => hasContextFreeHunk,
   hazardFromAttempt: () => hazardFromAttempt,
   installedDependencies: () => installedDependencies,
   integrateSubGoals: () => integrateSubGoals,
@@ -999,7 +1001,7 @@ async function parseSource(value) {
 }
 function parseReview(value) {
   const review = record2(record2(value)?.review);
-  if (!review || !["approved", "rejected"].includes(String(review.verdict)) || typeof review.reviewDigest !== "string" || !/^sha256:[0-9a-f]{64}$/.test(review.reviewDigest) || typeof review.provider !== "string" || !review.provider || typeof review.model !== "string" || !review.model || !Number.isSafeInteger(review.policyVersion) || Number(review.policyVersion) < 1) throw invalid("review");
+  if (!review || !["approved", "rejected"].includes(String(review.verdict)) || typeof review.reviewDigest !== "string" || !/^sha256:[0-9a-f]{64}$/.test(review.reviewDigest) || typeof review.provider !== "string" || !review.provider || typeof review.model !== "string" || !review.model || !Number.isSafeInteger(review.policyVersion) || Number(review.policyVersion) < 1 || !Number.isSafeInteger(review.score) || Number(review.score) < 0 || Number(review.score) > 100 || typeof review.summary !== "string" || !Array.isArray(review.findings) || review.findings.length > 12) throw invalid("review");
   return review;
 }
 function parseCandidate(value) {
@@ -1306,10 +1308,41 @@ var SECRET = /^(?:\.env(?:\..+)?|\.dev\.vars|credentials(?:\..+)?\.json|dev-toke
 var PATH = /^[A-Za-z0-9_@+.,-]+(?:\/[A-Za-z0-9_@+.,-]+)*$/;
 var FORBIDDEN = /^(?:GIT binary patch|Binary files |rename (?:from|to) |copy (?:from|to) |similarity index |old mode |new mode |deleted file mode 160000|new file mode 160000)/m;
 function stripPatchEnvelope(patch2) {
-  if (!/^\*\*\* (?:Begin|End) Patch\s*$/m.test(patch2)) return patch2;
+  if (!/^\*\*\* (?:Begin|End) Patch\s*$/m.test(patch2)) return applyPatchDialectToDiff(patch2);
   const kept = patch2.split("\n").filter((line) => !/^\*\*\* (?:Begin|End) Patch\s*$/.test(line));
   const stripped = kept.join("\n");
-  return /^diff --git /m.test(stripped) ? stripped : patch2;
+  if (/^diff --git /m.test(stripped)) return stripped;
+  const translated = applyPatchDialectToDiff(stripped);
+  return translated === stripped ? patch2 : translated;
+}
+function applyPatchDialectToDiff(patch2) {
+  if (!/^\*\*\* (?:Update|Add|Delete) File: /m.test(patch2)) return patch2;
+  const out = [];
+  let open = false;
+  for (const line of patch2.split("\n")) {
+    const file = /^\*\*\* (Update|Add|Delete) File: (.+?)\s*$/.exec(line);
+    if (file) {
+      const [, verb, raw] = file;
+      const path = raw.trim();
+      if (!PATH.test(path)) return patch2;
+      out.push(`diff --git a/${path} b/${path}`);
+      if (verb === "Add") out.push("new file mode 100644", "--- /dev/null", `+++ b/${path}`);
+      else if (verb === "Delete") out.push(`--- a/${path}`, "+++ /dev/null");
+      else out.push(`--- a/${path}`, `+++ b/${path}`);
+      open = true;
+      continue;
+    }
+    if (/^\*\*\* /.test(line)) continue;
+    if (!open) continue;
+    if (/^@@/.test(line)) {
+      out.push("@@ -1 +1 @@");
+      continue;
+    }
+    out.push(line);
+  }
+  if (!open) return patch2;
+  return `${out.join("\n").replace(/\n+$/, "")}
+`;
 }
 function validateCodePatch(rawPatch, maxBytes) {
   const patch2 = stripPatchEnvelope(rawPatch);
@@ -1362,17 +1395,20 @@ function resolveCodePath(workspaceDir, path) {
   if (target !== root && !target.startsWith(`${root}${import_node_path6.sep}`)) throw new TypeError("path escapes the staged workspace");
   return target;
 }
+function hasContextFreeHunk(patch2) {
+  const bodies = patch2.split(/^@@.*$/m).slice(1);
+  return bodies.some((body) => !body.split("\n").some((line) => line.startsWith(" ") && line.trim().length > 0));
+}
 function describePatchFailure(patch2, detail) {
   const hunks = patch2.split("\n").filter((line) => line.startsWith("@@"));
-  const bodies = patch2.split(/^@@.*$/m).slice(1);
-  const contextless = bodies.some((body) => !body.split("\n").some((line) => line.startsWith(" ") && line.trim().length > 0));
-  const hint = hunks.length > 0 && contextless ? " A hunk has no context lines; include at least one unchanged line above or below each change." : "";
+  const hint = hunks.length > 0 && hasContextFreeHunk(patch2) ? " A hunk has no context lines; include at least one unchanged line above or below each change." : "";
   return `patch did not apply: ${detail}${hint}`;
 }
 async function applyCodePatch(workspaceDir, rawPatch, paths2) {
   const patch2 = stripPatchEnvelope(rawPatch);
-  await gitApply(workspaceDir, patch2, true);
-  await gitApply(workspaceDir, patch2, false);
+  const zero = hasContextFreeHunk(patch2);
+  await gitApply(workspaceDir, patch2, true, zero);
+  await gitApply(workspaceDir, patch2, false, zero);
   for (const path of paths2) {
     try {
       const info = await (0, import_promises6.lstat)(resolveCodePath(workspaceDir, path));
@@ -1384,9 +1420,16 @@ async function applyCodePatch(workspaceDir, rawPatch, paths2) {
     }
   }
 }
-function gitApply(cwd, patch2, check) {
+function gitApply(cwd, patch2, check, unidiffZero = false) {
   return new Promise((accept, reject) => {
-    const args = ["apply", "--recount", "--whitespace=nowarn", ...check ? ["--check"] : [], "-"];
+    const args = [
+      "apply",
+      "--recount",
+      ...unidiffZero ? ["--unidiff-zero"] : [],
+      "--whitespace=nowarn",
+      ...check ? ["--check"] : [],
+      "-"
+    ];
     const child = (0, import_node_child_process4.spawn)("git", args, {
       cwd,
       shell: false,
@@ -1794,9 +1837,9 @@ async function prepareRuntimeCheckpoint(input) {
       if (evidence.receipt.outcome === "passed") {
         verification = evidence.receipt;
         review = await input.review(patch2, verification);
-        note = review.verdict === "approved" ? "Clean verification and independent review passed" : "Clean verification passed; independent review rejected the candidate";
+        note = describeReview(review);
       } else {
-        note = `Clean verification failed: ${evidence.receipt.recipes.filter((recipe2) => recipe2.status !== "passed").map((recipe2) => `${recipe2.recipeId}=${recipe2.status}`).join(", ")}`;
+        note = describeGateFailure(evidence);
       }
     } catch (cause) {
       note = `Candidate verification or review failed closed: ${message(cause)}`;
@@ -1821,6 +1864,23 @@ async function prepareRuntimeCheckpoint(input) {
   });
   return { checkpoint, verification, review, note };
 }
+function describeReview(review) {
+  const findings = review.findings.map((finding) => `  - [${finding.severity}] ${finding.detail}`).join("\n");
+  const head = review.verdict === "approved" ? `Clean verification and independent review passed (score ${review.score}/100).` : `Clean verification passed; independent review REJECTED this candidate (score ${review.score}/100). Address the findings and checkpoint again.`;
+  return [head, review.summary, findings].filter(Boolean).join("\n").slice(0, 4e3);
+}
+function describeGateFailure(evidence) {
+  const failed = evidence.receipt.recipes.filter((recipe2) => recipe2.status !== "passed");
+  const detail = failed.map((recipe2) => {
+    const log = evidence.logs.find((entry) => entry.recipeId === recipe2.recipeId);
+    const output = `${log?.stdout ?? ""}
+${log?.stderr ?? ""}`.trim();
+    return `${recipe2.recipeId}=${recipe2.status}${output ? `
+${output.slice(0, 1500)}` : ""}`;
+  }).join("\n\n");
+  return `Clean verification failed. Fix this and checkpoint again:
+${detail}`.slice(0, 4e3);
+}
 var message = (value) => (value instanceof Error ? value.message : String(value)).slice(0, 500);
 
 // src/code-runtime-checkpoint-manager.ts
@@ -2465,6 +2525,166 @@ function createCodeRuntimeInference(options) {
   };
 }
 
+// src/code-tool-presentation.ts
+var text = (value, maximum) => {
+  if (typeof value !== "string") return void 0;
+  const bounded = value.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, " ").trim();
+  return bounded ? bounded.slice(0, maximum) : void 0;
+};
+var integer2 = (value) => Number.isSafeInteger(value) && Number(value) >= 0 ? Number(value) : void 0;
+var record4 = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+var excerpt = (value, tail = false) => {
+  if (typeof value !== "string") return void 0;
+  const safe = value.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, " ");
+  const source = (tail ? safe.slice(-1e4) : safe.slice(0, 1e4)).trim();
+  if (!source) return void 0;
+  const lines = source.split("\n").filter((line) => line.trim()).map((line) => line.slice(0, 240));
+  const selected = tail ? lines.slice(-10) : lines.slice(0, 10);
+  return text(selected.join("\n"), 2400);
+};
+var paths = (value) => {
+  if (!Array.isArray(value)) return void 0;
+  const items = value.flatMap((item) => {
+    const path = text(item, 1024);
+    return path ? [path] : [];
+  }).slice(0, 12);
+  return items.length ? items : void 0;
+};
+function patchStats(value) {
+  if (typeof value !== "string") return {};
+  let additions = 0;
+  let deletions = 0;
+  for (const line of value.slice(0, 262144).split("\n")) {
+    if (line.startsWith("+++") || line.startsWith("---")) continue;
+    if (line.startsWith("+")) additions += 1;
+    else if (line.startsWith("-")) deletions += 1;
+  }
+  return { ...additions ? { additions } : {}, ...deletions ? { deletions } : {} };
+}
+function searchResults(value) {
+  if (typeof value !== "string") return void 0;
+  const results = value.split("\n").flatMap((line) => {
+    const match = /^([^:\n]{1,1024}):(\d+):\s?(.*)$/.exec(line);
+    if (!match) return [];
+    const lineNumber = Number(match[2]);
+    const itemText = text(match[3], 240);
+    if (!Number.isSafeInteger(lineNumber) || lineNumber < 1) return [];
+    return [{ path: match[1], line: lineNumber, ...itemText ? { text: itemText } : {} }];
+  }).slice(0, 5);
+  return results.length ? results : void 0;
+}
+function codeToolRequestPresentation(request) {
+  const input = request.input;
+  if (request.tool === "sandbox.read") {
+    const path = text(input.path, 1024);
+    if (!path) return void 0;
+    const startLine = integer2(input.startLine);
+    const endLine = integer2(input.endLine);
+    return { kind: "read", path, ...startLine ? { startLine } : {}, ...endLine ? { endLine } : {} };
+  }
+  if (request.tool === "sandbox.list") {
+    const scope = text(input.prefix, 1024);
+    return { kind: "list", ...scope ? { scope } : {} };
+  }
+  if (request.tool === "sandbox.search" || request.tool === "sandbox.overview" || request.tool === "sandbox.where_is" || request.tool === "sandbox.who_imports" || request.tool === "sandbox.who_touches") {
+    const query = text(input.query, 512);
+    const scope = request.tool === "sandbox.search" ? text(input.prefix, 1024) : void 0;
+    if (request.tool === "sandbox.search" && !query) return void 0;
+    return { kind: "query", ...query ? { query } : {}, ...scope ? { scope } : {} };
+  }
+  if (request.tool === "sandbox.apply_patch") {
+    return { kind: "patch", ...patchStats(input.patch) };
+  }
+  const recipeId = text(input.recipeId, 120);
+  return recipeId ? { kind: "recipe", recipeId } : void 0;
+}
+function codeToolResultPresentation(request, response2) {
+  const started = codeToolRequestPresentation(request);
+  if (!started || !response2.ok) return started;
+  const details = record4(response2.details);
+  if (started.kind === "read") {
+    return {
+      ...started,
+      ...integer2(details?.startLine) ? { startLine: integer2(details?.startLine) } : {},
+      ...integer2(details?.endLine) ? { endLine: integer2(details?.endLine) } : {},
+      ...excerpt(response2.content) ? { excerpt: excerpt(response2.content) } : {}
+    };
+  }
+  if (started.kind === "list") {
+    const listed = response2.content.split("\n").filter((line) => line && !line.startsWith("\u2026") && !line.startsWith("Workspace ")).map((line) => text(line, 1024)).filter((line) => Boolean(line)).slice(0, 8);
+    return {
+      ...started,
+      ...integer2(details?.count) !== void 0 ? { count: integer2(details?.count) } : {},
+      ...listed.length ? { paths: listed } : {}
+    };
+  }
+  if (started.kind === "query") {
+    const results = request.tool === "sandbox.search" ? searchResults(response2.content) : void 0;
+    const resultExcerpt = request.tool === "sandbox.search" ? void 0 : excerpt(response2.content);
+    return {
+      ...started,
+      ...integer2(details?.count) !== void 0 ? { count: integer2(details?.count) } : {},
+      ...results ? { results } : {},
+      ...resultExcerpt ? { excerpt: resultExcerpt } : {}
+    };
+  }
+  if (started.kind === "patch") {
+    return { ...started, ...paths(details?.paths) ? { paths: paths(details?.paths) } : {} };
+  }
+  const output = response2.content.replace(/^Recipe [^\n]*\.?\s*/u, "");
+  return {
+    ...started,
+    ...integer2(details?.exitCode) !== void 0 ? { exitCode: integer2(details?.exitCode) } : {},
+    ...typeof details?.timedOut === "boolean" ? { timedOut: details.timedOut } : {},
+    ...typeof details?.outputLimitExceeded === "boolean" ? { outputLimitExceeded: details.outputLimitExceeded } : {},
+    ...excerpt(output, true) ? { excerpt: excerpt(output, true) } : {}
+  };
+}
+
+// src/code-runtime-observer.ts
+var MAX_FAILURE_REASON = 240;
+function toolFailureReason(response2) {
+  if (response2.ok) return void 0;
+  const supplied = response2.details?.failureReason;
+  const reason = typeof supplied === "string" && supplied || DEFAULT_FAILURE_REASON[response2.content] || response2.content || "tool request failed; inspect the tool input and workspace state";
+  return reason.slice(0, MAX_FAILURE_REASON);
+}
+var DEFAULT_FAILURE_REASON = {
+  "tool denied by CaMeL policy": "tool denied by CaMeL policy",
+  "review sessions are read-only": "review session is read-only; workspace changes are not permitted"
+};
+function observedBroker(input) {
+  const now = input.now ?? Date.now;
+  return {
+    execute: async (context, request) => {
+      const startedAt = now();
+      const operationId = input.operationIdFor(request.requestId);
+      const startedPresentation = codeToolRequestPresentation(request);
+      await input.emit({
+        type: "tool",
+        phase: "started",
+        tool: request.tool,
+        operationId,
+        ...startedPresentation ? { presentation: startedPresentation } : {}
+      });
+      const response2 = await input.broker.execute(context, request);
+      const completedPresentation = codeToolResultPresentation(request, response2);
+      const failureReason = toolFailureReason(response2);
+      await input.emit({
+        type: "tool",
+        phase: "completed",
+        tool: request.tool,
+        ok: response2.ok,
+        durationMs: now() - startedAt,
+        operationId,
+        ...failureReason ? { failureReason } : {},
+        ...completedPresentation ? { presentation: completedPresentation } : {}
+      });
+      return response2;
+    }
+  };
+}
+
 // src/code-tool-policy.ts
 var import_camel = require("@odla-ai/camel");
 var import_policy = require("@odla-ai/camel/policy");
@@ -2703,8 +2923,14 @@ function optionalInteger(value) {
   if (!Number.isSafeInteger(value) || value < 1) throw new TypeError("line bounds must be positive integers");
   return value;
 }
+var DEFAULT_FAILURE_REASON2 = {
+  "tool denied by CaMeL policy": "tool denied by CaMeL policy",
+  "review sessions are read-only": "review session is read-only; workspace changes are not permitted"
+};
 function response(request, ok, content, details) {
-  return { requestId: request.requestId, ok, content, ...details ? { details } : {} };
+  if (ok) return { requestId: request.requestId, ok, content, ...details ? { details } : {} };
+  const failureReason = typeof details?.failureReason === "string" && details.failureReason || DEFAULT_FAILURE_REASON2[content] || content || "tool request failed; inspect the tool input and workspace state";
+  return { requestId: request.requestId, ok, content, details: { ...details, failureReason } };
 }
 
 // src/code-tool-reads.ts
@@ -3505,122 +3731,6 @@ async function appendCodeRuntimeEvent(control, command, event, refs) {
 var digestRuntimeValue = (value) => `sha256:${(0, import_node_crypto4.createHash)("sha256").update(value).digest("hex")}`;
 var runtimeErrorMessage = (value) => value instanceof Error ? value.message : String(value);
 
-// src/code-tool-presentation.ts
-var text = (value, maximum) => {
-  if (typeof value !== "string") return void 0;
-  const bounded = value.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, " ").trim();
-  return bounded ? bounded.slice(0, maximum) : void 0;
-};
-var integer2 = (value) => Number.isSafeInteger(value) && Number(value) >= 0 ? Number(value) : void 0;
-var record4 = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
-var excerpt = (value, tail = false) => {
-  if (typeof value !== "string") return void 0;
-  const safe = value.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, " ");
-  const source = (tail ? safe.slice(-1e4) : safe.slice(0, 1e4)).trim();
-  if (!source) return void 0;
-  const lines = source.split("\n").filter((line) => line.trim()).map((line) => line.slice(0, 240));
-  const selected = tail ? lines.slice(-10) : lines.slice(0, 10);
-  return text(selected.join("\n"), 2400);
-};
-var paths = (value) => {
-  if (!Array.isArray(value)) return void 0;
-  const items = value.flatMap((item) => {
-    const path = text(item, 1024);
-    return path ? [path] : [];
-  }).slice(0, 12);
-  return items.length ? items : void 0;
-};
-function patchStats(value) {
-  if (typeof value !== "string") return {};
-  let additions = 0;
-  let deletions = 0;
-  for (const line of value.slice(0, 262144).split("\n")) {
-    if (line.startsWith("+++") || line.startsWith("---")) continue;
-    if (line.startsWith("+")) additions += 1;
-    else if (line.startsWith("-")) deletions += 1;
-  }
-  return { ...additions ? { additions } : {}, ...deletions ? { deletions } : {} };
-}
-function searchResults(value) {
-  if (typeof value !== "string") return void 0;
-  const results = value.split("\n").flatMap((line) => {
-    const match = /^([^:\n]{1,1024}):(\d+):\s?(.*)$/.exec(line);
-    if (!match) return [];
-    const lineNumber = Number(match[2]);
-    const itemText = text(match[3], 240);
-    if (!Number.isSafeInteger(lineNumber) || lineNumber < 1) return [];
-    return [{ path: match[1], line: lineNumber, ...itemText ? { text: itemText } : {} }];
-  }).slice(0, 5);
-  return results.length ? results : void 0;
-}
-function codeToolRequestPresentation(request) {
-  const input = request.input;
-  if (request.tool === "sandbox.read") {
-    const path = text(input.path, 1024);
-    if (!path) return void 0;
-    const startLine = integer2(input.startLine);
-    const endLine = integer2(input.endLine);
-    return { kind: "read", path, ...startLine ? { startLine } : {}, ...endLine ? { endLine } : {} };
-  }
-  if (request.tool === "sandbox.list") {
-    const scope = text(input.prefix, 1024);
-    return { kind: "list", ...scope ? { scope } : {} };
-  }
-  if (request.tool === "sandbox.search" || request.tool === "sandbox.overview" || request.tool === "sandbox.where_is" || request.tool === "sandbox.who_imports" || request.tool === "sandbox.who_touches") {
-    const query = text(input.query, 512);
-    const scope = request.tool === "sandbox.search" ? text(input.prefix, 1024) : void 0;
-    if (request.tool === "sandbox.search" && !query) return void 0;
-    return { kind: "query", ...query ? { query } : {}, ...scope ? { scope } : {} };
-  }
-  if (request.tool === "sandbox.apply_patch") {
-    return { kind: "patch", ...patchStats(input.patch) };
-  }
-  const recipeId = text(input.recipeId, 120);
-  return recipeId ? { kind: "recipe", recipeId } : void 0;
-}
-function codeToolResultPresentation(request, response2) {
-  const started = codeToolRequestPresentation(request);
-  if (!started || !response2.ok) return started;
-  const details = record4(response2.details);
-  if (started.kind === "read") {
-    return {
-      ...started,
-      ...integer2(details?.startLine) ? { startLine: integer2(details?.startLine) } : {},
-      ...integer2(details?.endLine) ? { endLine: integer2(details?.endLine) } : {},
-      ...excerpt(response2.content) ? { excerpt: excerpt(response2.content) } : {}
-    };
-  }
-  if (started.kind === "list") {
-    const listed = response2.content.split("\n").filter((line) => line && !line.startsWith("\u2026") && !line.startsWith("Workspace ")).map((line) => text(line, 1024)).filter((line) => Boolean(line)).slice(0, 8);
-    return {
-      ...started,
-      ...integer2(details?.count) !== void 0 ? { count: integer2(details?.count) } : {},
-      ...listed.length ? { paths: listed } : {}
-    };
-  }
-  if (started.kind === "query") {
-    const results = request.tool === "sandbox.search" ? searchResults(response2.content) : void 0;
-    const resultExcerpt = request.tool === "sandbox.search" ? void 0 : excerpt(response2.content);
-    return {
-      ...started,
-      ...integer2(details?.count) !== void 0 ? { count: integer2(details?.count) } : {},
-      ...results ? { results } : {},
-      ...resultExcerpt ? { excerpt: resultExcerpt } : {}
-    };
-  }
-  if (started.kind === "patch") {
-    return { ...started, ...paths(details?.paths) ? { paths: paths(details?.paths) } : {} };
-  }
-  const output = response2.content.replace(/^Recipe [^\n]*\.?\s*/u, "");
-  return {
-    ...started,
-    ...integer2(details?.exitCode) !== void 0 ? { exitCode: integer2(details?.exitCode) } : {},
-    ...typeof details?.timedOut === "boolean" ? { timedOut: details.timedOut } : {},
-    ...typeof details?.outputLimitExceeded === "boolean" ? { outputLimitExceeded: details.outputLimitExceeded } : {},
-    ...excerpt(output, true) ? { excerpt: excerpt(output, true) } : {}
-  };
-}
-
 // src/code-runtime-acknowledgement-gate.ts
 function codeRuntimeAcknowledgementGate(signal) {
   let settle;
@@ -3927,36 +4037,11 @@ var TheseusRuntimeEngine = class {
   }
   /** Report every brokered effect as it starts and finishes. */
   #observed(command, active, broker) {
-    return {
-      execute: async (context, request) => {
-        const startedAt = Date.now();
-        const operationId = digestRuntimeValue(`${command.commandId}:${request.requestId}`);
-        const startedPresentation = codeToolRequestPresentation(request);
-        await this.#event(
-          command,
-          {
-            type: "tool",
-            phase: "started",
-            tool: request.tool,
-            operationId,
-            ...startedPresentation ? { presentation: startedPresentation } : {}
-          },
-          active.conversationRefs
-        ).catch(() => void 0);
-        const response2 = await broker.execute(context, request);
-        const completedPresentation = codeToolResultPresentation(request, response2);
-        await this.#event(command, {
-          type: "tool",
-          phase: "completed",
-          tool: request.tool,
-          ok: response2.ok,
-          durationMs: Date.now() - startedAt,
-          operationId,
-          ...completedPresentation ? { presentation: completedPresentation } : {}
-        }, active.conversationRefs).catch(() => void 0);
-        return response2;
-      }
-    };
+    return observedBroker({
+      broker,
+      operationIdFor: (requestId) => digestRuntimeValue(`${command.commandId}:${requestId}`),
+      emit: (event) => this.#event(command, event, active.conversationRefs).catch(() => void 0)
+    });
   }
   async #checkpoint(command) {
     const active = this.#active.get(command.sessionId);
@@ -4300,6 +4385,7 @@ async function installedDependencies(repoRoot) {
   V2_SYSTEM_PROMPT,
   V3_SYSTEM_PROMPT,
   applyCodePatch,
+  applyPatchDialectToDiff,
   assertCodeBuildRecipe,
   assertDisjointPlan,
   assertPinnedImage,
@@ -4317,6 +4403,7 @@ async function installedDependencies(repoRoot) {
   describePatchFailure,
   digestStagedWorkspace,
   feedbackIsActionable,
+  hasContextFreeHunk,
   hazardFromAttempt,
   installedDependencies,
   integrateSubGoals,