@odla-ai/harness 0.9.0 → 0.9.2

package/dist/{chunk-NG7AYYH3.js → chunk-Q4NL5XO3.js}

@@ -1,13 +1,16 @@
+import {
+  observedBroker
+} from "./chunk-FAN2R3GW.js";
 import {
   SKIP_WORKSPACE_DIRS,
   assertPinnedImage,
   stageWorkspace,
   stageWorkspacePair,
   verifyContainerEngineBoundary
-} from "./chunk-CR6RE3A2.js";
+} from "./chunk-5LRYJKUI.js";
 import {
   HARNESS_PROTOCOL_VERSION
-} from "./chunk-RXNHCGWE.js";
+} from "./chunk-U324RQ4N.js";
 
 // src/workspace-digest.ts
 import { createHash } from "crypto";
@@ -186,12 +189,14 @@ async function runCodeRuntimeHeartbeatLoop(options) {
   } while (!options.signal?.aborted);
 }
 var CodeRuntimeReconciler = class {
-  constructor(control, engine) {
+  constructor(control, engine, onDiagnostic) {
     this.control = control;
     this.engine = engine;
+    this.onDiagnostic = onDiagnostic;
   }
   control;
   engine;
+  onDiagnostic;
   results = /* @__PURE__ */ new Map();
   async reconcile(snapshot) {
     for (const command of snapshot.commands) {
@@ -209,7 +214,13 @@ var CodeRuntimeReconciler = class {
       }
       await this.control.acknowledge(command.commandId, completed.result);
       if (!completed.notified) {
-        await this.engine.acknowledged?.(command, completed.result);
+        try {
+          await this.engine.acknowledged?.(command, completed.result);
+        } catch (error) {
+          this.onDiagnostic?.(
+            `command ${command.commandId} acknowledged handling failed \xB7 ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
         completed.notified = true;
       }
     }
@@ -336,7 +347,7 @@ async function parseSource(value) {
 }
 function parseReview(value) {
   const review = record(record(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) {
@@ -443,10 +454,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);
@@ -462,7 +504,7 @@ function validateCodePatch(rawPatch, maxBytes) {
   if (FORBIDDEN.test(patch2) || /(?:old|new)(?: file)? mode 120000/.test(patch2)) {
     throw new TypeError("patch uses a forbidden binary, link, mode, rename, or copy operation");
   }
-  const paths2 = [];
+  const paths = [];
   const lines = patch2.split("\n");
   for (let index = 0; index < lines.length; index += 1) {
     const line = lines[index];
@@ -478,10 +520,10 @@ function validateCodePatch(rawPatch, maxBytes) {
     if (!validHeaderPath(oldPath, path, "a") || !validHeaderPath(newPath, path, "b")) {
       throw new TypeError("patch file headers do not match the declared path");
     }
-    paths2.push(path);
+    paths.push(path);
   }
-  if (!paths2.length || new Set(paths2).size !== paths2.length) throw new TypeError("patch has no diffs or repeats a path");
-  return paths2;
+  if (!paths.length || new Set(paths).size !== paths.length) throw new TypeError("patch has no diffs or repeats a path");
+  return paths;
 }
 function validHeaderPath(value, path, prefix) {
   return value === "/dev/null" || value === `${prefix}/${path}`;
@@ -499,18 +541,21 @@ function resolveCodePath(workspaceDir, path) {
   if (target !== root && !target.startsWith(`${root}${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) {
+async function applyCodePatch(workspaceDir, rawPatch, paths) {
   const patch2 = stripPatchEnvelope(rawPatch);
-  await gitApply(workspaceDir, patch2, true);
-  await gitApply(workspaceDir, patch2, false);
-  for (const path of paths2) {
+  const zero = hasContextFreeHunk(patch2);
+  await gitApply(workspaceDir, patch2, true, zero);
+  await gitApply(workspaceDir, patch2, false, zero);
+  for (const path of paths) {
     try {
       const info = await lstat(resolveCodePath(workspaceDir, path));
       if (info.isSymbolicLink() || !info.isFile() && !info.isDirectory()) {
@@ -521,9 +566,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 = spawn("git", args, {
       cwd,
       shell: false,
@@ -532,8 +584,8 @@ function gitApply(cwd, patch2, check) {
     });
     let stderr = "";
     child.stderr.setEncoding("utf8");
-    child.stderr.on("data", (text2) => {
-      if (stderr.length < 4e3) stderr += text2.slice(0, 4e3);
+    child.stderr.on("data", (text) => {
+      if (stderr.length < 4e3) stderr += text.slice(0, 4e3);
     });
     child.once("error", reject);
     child.once("exit", (code) => code === 0 ? accept() : reject(new TypeError(describePatchFailure(patch2, stderr.trim().slice(0, 500)))));
@@ -563,8 +615,8 @@ async function restoreCodeWorkspaceCheckpoint(input) {
   const workspace = await stageWorkspace(input.trustedBaseDir, input.stage);
   try {
     if (checkpoint.patch) {
-      const paths2 = validateCodePatch(checkpoint.patch, 256 * 1024);
-      await applyCodePatch(workspace.workspaceDir, checkpoint.patch, paths2);
+      const paths = validateCodePatch(checkpoint.patch, 256 * 1024);
+      await applyCodePatch(workspace.workspaceDir, checkpoint.patch, paths);
     }
     return { workspace, checkpoint };
   } catch (error) {
@@ -733,8 +785,8 @@ async function verifyCodeCandidate(input) {
   try {
     const baseDigest = await digestStagedWorkspace(staged.workspaceDir, limits);
     if (baseDigest !== input.trustedBaseDigest) throw new TypeError("trusted base does not match its registered digest");
-    const paths2 = validateCodePatch(input.candidatePatch, policy.maximumPatchBytes);
-    await applyCodePatch(staged.workspaceDir, input.candidatePatch, paths2);
+    const paths = validateCodePatch(input.candidatePatch, policy.maximumPatchBytes);
+    await applyCodePatch(staged.workspaceDir, input.candidatePatch, paths);
     const sourceDigest = await digestStagedWorkspace(staged.workspaceDir, limits);
     const policyDigest = digestPolicy(policy);
     const patchDigest = digestBytes(input.candidatePatch);
@@ -743,7 +795,7 @@ async function verifyCodeCandidate(input) {
       trustedBaseDigest: input.trustedBaseDigest,
       patchDigest
     });
-    const changedTests = changedTestPaths(paths2, policy);
+    const changedTests = changedTestPaths(paths, policy);
     if (changedTests.length > policy.maximumChangedTests) throw new TypeError("candidate changes too many test files");
     const recipes = [];
     const logs = [];
@@ -810,8 +862,8 @@ function validate(input) {
   }
   return result;
 }
-function changedTestPaths(paths2, policy) {
-  return paths2.filter((path) => policy.testPathSuffixes.some((suffix) => path.endsWith(suffix)) || policy.testPathPrefixes.some((prefix) => path.startsWith(prefix) || path.includes(`/${prefix}`))).sort();
+function changedTestPaths(paths, policy) {
+  return paths.filter((path) => policy.testPathSuffixes.some((suffix) => path.endsWith(suffix)) || policy.testPathPrefixes.some((prefix) => path.startsWith(prefix) || path.includes(`/${prefix}`))).sort();
 }
 function recipeReceipt(recipe2, result, artifacts) {
   const status = result.timedOut ? "timed_out" : result.outputLimitExceeded ? "output_limited" : result.exitCode === 0 && artifacts.every((item) => item.status === "verified") ? "passed" : "failed";
@@ -935,9 +987,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)}`;
@@ -962,6 +1014,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
@@ -1618,7 +1687,7 @@ function createWorkspaceFileRegistry(limit = DEFAULT_MAX_FILES, enumerate = regi
     files(root) {
       const existing = cache2.get(root);
       if (existing) return existing;
-      const pending = enumerate(root, limit).then((paths2) => Object.freeze(paths2));
+      const pending = enumerate(root, limit).then((paths) => Object.freeze(paths));
       cache2.set(root, pending);
       void pending.catch(() => {
         if (cache2.get(root) === pending) cache2.delete(root);
@@ -1631,7 +1700,7 @@ function createWorkspaceFileRegistry(limit = DEFAULT_MAX_FILES, enumerate = regi
   };
 }
 async function registeredFiles(root, limit = DEFAULT_MAX_FILES) {
-  const paths2 = [];
+  const paths = [];
   const walk = async (directory) => {
     for (const entry of await readdir2(directory, { withFileTypes: true })) {
       if (SKIP_WORKSPACE_DIRS.has(entry.name)) continue;
@@ -1645,26 +1714,26 @@ async function registeredFiles(root, limit = DEFAULT_MAX_FILES) {
         } catch {
           continue;
         }
-        paths2.push(path);
-        if (paths2.length > limit) throw new TypeError("workspace file registry exceeds its bound");
+        paths.push(path);
+        if (paths.length > limit) throw new TypeError("workspace file registry exceeds its bound");
       }
     }
   };
   await walk(resolve4(root));
-  return paths2.sort();
+  return paths.sort();
 }
-function listWorkspace(paths2, options = {}) {
+function listWorkspace(paths, options = {}) {
   const max = options.maxEntries ?? 1e3;
   const prefix = options.prefix?.replace(/\/+$/, "");
-  const scoped = prefix ? paths2.filter((path) => path === prefix || path.startsWith(`${prefix}/`)) : [...paths2];
+  const scoped = prefix ? paths.filter((path) => path === prefix || path.startsWith(`${prefix}/`)) : [...paths];
   return scoped.slice(0, max);
 }
-async function searchWorkspace(root, paths2, options) {
+async function searchWorkspace(root, paths, options) {
   options.signal?.throwIfAborted();
   if (!options.query) throw new TypeError("search query must be a non-empty string");
   const maxResults = options.maxResults ?? DEFAULT_MAX_RESULTS;
   const maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;
-  const scoped = listWorkspace(paths2, { ...options.prefix ? { prefix: options.prefix } : {}, maxEntries: paths2.length });
+  const scoped = listWorkspace(paths, { ...options.prefix ? { prefix: options.prefix } : {}, maxEntries: paths.length });
   if (scoped.length === 0) return [];
   try {
     return await nativeSearch(root, scoped, { ...options, maxResults, maxFileBytes });
@@ -1674,11 +1743,11 @@ async function searchWorkspace(root, paths2, options) {
   }
 }
 var MAX_NATIVE_ARG_BYTES = 96 * 1024;
-async function nativeSearch(root, paths2, options) {
+async function nativeSearch(root, paths, options) {
   const batches = [];
   let batch = [];
   let bytes = 0;
-  for (const path of paths2) {
+  for (const path of paths) {
     const size = Buffer.byteLength(path) + 1;
     if (batch.length > 0 && bytes + size > MAX_NATIVE_ARG_BYTES) {
       batches.push(batch);
@@ -1697,7 +1766,7 @@ async function nativeSearch(root, paths2, options) {
   }
   return matches;
 }
-function nativeSearchBatch(root, paths2, options, remaining) {
+function nativeSearchBatch(root, paths, options, remaining) {
   return new Promise((resolveMatches, reject) => {
     const args = [
       "--fixed-strings",
@@ -1710,7 +1779,7 @@ function nativeSearchBatch(root, paths2, options, remaining) {
       options.caseSensitive === false ? "--ignore-case" : "--case-sensitive",
       "--",
       options.query,
-      ...paths2
+      ...paths
     ];
     const child = spawn3("rg", args, {
       cwd: root,
@@ -1908,16 +1977,16 @@ function createCodePolicyGate(options) {
     }
   };
 }
-function directoryPrefixes(paths2) {
+function directoryPrefixes(paths) {
   const prefixes = /* @__PURE__ */ new Set(["."]);
-  for (const path of paths2) {
+  for (const path of paths) {
     const parts = path.split("/");
     for (let index = 1; index < parts.length; index += 1) prefixes.add(parts.slice(0, index).join("/"));
   }
   return [...prefixes].sort();
 }
-async function safePrefix(base, paths2, prefix) {
-  const prefixes = directoryPrefixes(paths2);
+async function safePrefix(base, paths, prefix) {
+  const prefixes = directoryPrefixes(paths);
   const conversions = await conversionRegistry(
     [await registeredPolicy("code.prefix.v1", "code.prefixes.v1", prefixes)],
     { "code.prefixes.v1": prefixes }
@@ -2027,8 +2096,14 @@ function optionalInteger(value) {
   if (!Number.isSafeInteger(value) || value < 1) throw new TypeError("line bounds must be positive integers");
   return value;
 }
+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 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_REASON[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
@@ -2047,7 +2122,7 @@ import {
 } from "@odla-ai/graph";
 import { buildCodeGraph, FILE, IMPORTS, PACKAGE, READS, SYMBOL, WRITES } from "@odla-ai/graph/code";
 var cache = /* @__PURE__ */ new Map();
-function workspaceGraphs(workspaceDir, paths2) {
+function workspaceGraphs(workspaceDir, paths) {
   const existing = cache.get(workspaceDir);
   if (existing) return existing;
   const read2 = (path) => readFile3(join3(workspaceDir, path), "utf8");
@@ -2055,7 +2130,7 @@ function workspaceGraphs(workspaceDir, paths2) {
     // No knownTables: a staged workspace may not carry migrations, and a filter
     // that silently drops every table is worse than an unfiltered one. Callers
     // with ground truth should build the graph themselves.
-    graph: await buildCodeGraph({ paths: paths2, read: read2, data: { ignore: (path) => path.includes(".generated.") } })
+    graph: await buildCodeGraph({ paths, read: read2, data: { ignore: (path) => path.includes(".generated.") } })
   }))();
   cache.set(workspaceDir, built);
   return built;
@@ -2117,11 +2192,11 @@ async function read(context, request, options, policy, registry) {
   if (endLine < startLine || endLine - startLine + 1 > (options.maxReadLines ?? 2e3)) {
     throw new TypeError("requested line range exceeds its bound");
   }
-  const paths2 = await registry.files(context.workspaceDir);
-  if (!paths2.includes(path)) {
+  const paths = await registry.files(context.workspaceDir);
+  if (!paths.includes(path)) {
     throw new TypeError(`no such file in the staged workspace: "${path}". Use sandbox.overview, sandbox.where_is or sandbox.search to find the correct path.`);
   }
-  const allowed = await policy.read(policyContext(context, request, options, { paths: paths2, path, startLine, endLine }));
+  const allowed = await policy.read(policyContext(context, request, options, { paths, path, startLine, endLine }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
   const target = resolveCodePath(context.workspaceDir, path);
   const info = await stat(target);
@@ -2143,16 +2218,16 @@ async function list(context, request, options, policy, registry) {
   const prefix = typeof raw === "string" && raw.length > 0 ? raw : void 0;
   const maxEntries = optionalInteger(request.input.maxEntries) ?? 1e3;
   if (maxEntries > 5e3) throw new TypeError("maxEntries exceeds its bound");
-  const paths2 = await registry.files(context.workspaceDir);
-  const allowed = await policy.list(policyContext(context, request, options, { paths: paths2, ...prefix ? { prefix } : {} }));
+  const paths = await registry.files(context.workspaceDir);
+  const allowed = await policy.list(policyContext(context, request, options, { paths, ...prefix ? { prefix } : {} }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
-  const entries = listWorkspace(paths2, { ...prefix ? { prefix } : {}, maxEntries });
+  const entries = listWorkspace(paths, { ...prefix ? { prefix } : {}, maxEntries });
   if (!entries.length) {
     return response(request, true, prefix ? `No files under "${prefix}".` : "Workspace is empty.", { count: 0 });
   }
-  const truncated = entries.length < paths2.length && entries.length === maxEntries;
-  const hint = !prefix && paths2.length > 500 ? `
-\u2026 ${paths2.length} files total. sandbox.overview is far cheaper for orientation; use a prefix here once you know the area.` : "";
+  const truncated = entries.length < paths.length && entries.length === maxEntries;
+  const hint = !prefix && paths.length > 500 ? `
+\u2026 ${paths.length} files total. sandbox.overview is far cheaper for orientation; use a prefix here once you know the area.` : "";
   return response(
     request,
     true,
@@ -2170,10 +2245,10 @@ async function search(context, request, options, policy, registry) {
   const maxResults = optionalInteger(request.input.maxResults) ?? 100;
   if (maxResults > 500) throw new TypeError("maxResults exceeds its bound");
   const caseSensitive = request.input.caseSensitive === void 0 ? true : request.input.caseSensitive === true;
-  const paths2 = await registry.files(context.workspaceDir);
-  const allowed = await policy.search(policyContext(context, request, options, { paths: paths2, query, ...prefix ? { prefix } : {} }));
+  const paths = await registry.files(context.workspaceDir);
+  const allowed = await policy.search(policyContext(context, request, options, { paths, query, ...prefix ? { prefix } : {} }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
-  const matches = await searchWorkspace(context.workspaceDir, paths2, {
+  const matches = await searchWorkspace(context.workspaceDir, paths, {
     query,
     maxResults,
     caseSensitive,
@@ -2195,8 +2270,8 @@ async function graphQuery(context, request, options, policy, registry) {
     selector: query
   }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
-  const paths2 = await registry.files(context.workspaceDir);
-  const graphs = await workspaceGraphs(context.workspaceDir, paths2);
+  const paths = await registry.files(context.workspaceDir);
+  const graphs = await workspaceGraphs(context.workspaceDir, paths);
   if (request.tool === "sandbox.overview") {
     return response(request, true, renderOverview(graphs, query || void 0));
   }
@@ -2260,16 +2335,16 @@ function toolFailureMessage(reason) {
 async function patch(context, request, options, policy, registry) {
   exactKeys(request.input, ["patch"]);
   const value = stringField(request.input, "patch");
-  const paths2 = validateCodePatch(value, options.maxPatchBytes ?? 256 * 1024);
-  if (paths2.some((path) => options.readOnlyPrefixes?.some((prefix) => path === prefix || path.startsWith(`${prefix}/`)))) {
+  const paths = validateCodePatch(value, options.maxPatchBytes ?? 256 * 1024);
+  if (paths.some((path) => options.readOnlyPrefixes?.some((prefix) => path === prefix || path.startsWith(`${prefix}/`)))) {
     throw new TypeError("patch targets a read-only reference source");
   }
   const allowed = await policy.patch(policyContext(context, request, options, { patch: value }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
-  await applyCodePatch(context.workspaceDir, value, paths2);
+  await applyCodePatch(context.workspaceDir, value, paths);
   registry.invalidate(context.workspaceDir);
   forgetWorkspaceGraphs(context.workspaceDir);
-  return response(request, true, `Applied patch to ${paths2.length} file(s).`, { paths: paths2 });
+  return response(request, true, `Applied patch to ${paths.length} file(s).`, { paths });
 }
 async function recipe(context, request, options, recipes, policy) {
   exactKeys(request.input, ["recipeId"]);
@@ -2660,122 +2735,6 @@ async function appendCodeRuntimeEvent(control, command, event, refs) {
 var digestRuntimeValue = (value) => `sha256:${createHash3("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 record3 = (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 = record3(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;
@@ -2795,6 +2754,57 @@ function codeRuntimeAcknowledgementGate(signal) {
   return { ready, release };
 }
 
+// src/code-runtime-session-activity.ts
+function observeCodeRuntimeSessionSkills(command, skills, emit) {
+  return skills.map((skill) => ({
+    ...skill,
+    tools: skill.tools.map((tool) => {
+      if (!tool.handler) return tool;
+      const handler = tool.handler;
+      return {
+        ...tool,
+        handler: async (input, context) => {
+          const startedAt = Date.now();
+          const operationId = digestRuntimeValue(
+            `${command.commandId}:${skill.name}:${tool.name}:${context.toolCallId ?? "missing"}`
+          );
+          await emit({
+            type: "collaboration",
+            phase: "started",
+            skill: skill.name,
+            tool: tool.name,
+            operationId
+          }).catch(() => void 0);
+          try {
+            const output = await handler(input, context);
+            await emit({
+              type: "collaboration",
+              phase: "completed",
+              skill: skill.name,
+              tool: tool.name,
+              operationId,
+              ok: output.isError !== true,
+              durationMs: Date.now() - startedAt
+            }).catch(() => void 0);
+            return output;
+          } catch (cause) {
+            await emit({
+              type: "collaboration",
+              phase: "completed",
+              skill: skill.name,
+              tool: tool.name,
+              operationId,
+              ok: false,
+              durationMs: Date.now() - startedAt
+            }).catch(() => void 0);
+            throw cause;
+          }
+        }
+      };
+    })
+  }));
+}
+
 // src/code-runtime-engine.ts
 var TheseusRuntimeEngine = class {
   constructor(options) {
@@ -2992,7 +3002,7 @@ var TheseusRuntimeEngine = class {
       event: (event) => this.#event(command, event, active.conversationRefs)
     });
     await this.#event(command, { type: "status", status: "running" }, active.conversationRefs);
-    const extraSkills = await sessionSkillsFor(this.options, command);
+    const extraSkills = observeCodeRuntimeSessionSkills(command, await sessionSkillsFor(this.options, command), (event) => this.#event(command, event, active.conversationRefs));
     const result = await this.#attempt({
       inference,
       broker,
@@ -3031,36 +3041,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);
@@ -3097,9 +3082,11 @@ export {
   runCodeRuntimeHeartbeatLoop,
   CodeRuntimeReconciler,
   stripPatchEnvelope,
+  applyPatchDialectToDiff,
   validateCodePatch,
   validateRelativePath,
   resolveCodePath,
+  hasContextFreeHunk,
   describePatchFailure,
   applyCodePatch,
   createCodeWorkspaceCheckpoint,
@@ -3134,4 +3121,4 @@ export {
   runGoal,
   TheseusRuntimeEngine
 };
-//# sourceMappingURL=chunk-NG7AYYH3.js.map
+//# sourceMappingURL=chunk-Q4NL5XO3.js.map