@ordewell/core 0.6.4 → 0.7.0

package/dist/{chunk-I6U3PVHL.mjs → chunk-LSGY7AIZ.mjs}

@@ -10,7 +10,7 @@ import {
   renumberTasks,
   stripTrailingCommas,
   updateTaskInPlan
-} from "./chunk-JRZPSNRO.mjs";
+} from "./chunk-YU4UKKKI.mjs";
 
 // src/models/Usage.ts
 function partedPromptUsage(parts) {
@@ -77,6 +77,10 @@ var KNOWN_TOOLS = {
   list: "list_dir",
   fetch: "fetch"
 };
+var FILE_EDIT_TOOLS = /* @__PURE__ */ new Set(["edit", "write", "multiedit", "notebookedit", "applypatch", "patch", "add", "update", "delete", "filechange"]);
+function isFileEditTool(name) {
+  return FILE_EDIT_TOOLS.has(name.trim().toLowerCase().replace(/[_-]/g, ""));
+}
 function mapAgentTool(name) {
   const normalized = name.trim().toLowerCase().replace(/[_-]/g, "");
   const direct = KNOWN_TOOLS[normalized] ?? KNOWN_TOOLS[name.trim().toLowerCase()];
@@ -272,13 +276,13 @@ function renderTerminalOutput(raw) {
 function renderCleanCapture(raw, doneToken) {
   const rendered = renderTerminalOutput(raw).replace(/[\s─-▟]+$/gm, "");
   if (!doneToken) return rendered.trim();
-  const lines = rendered.split("\n");
+  const lines2 = rendered.split("\n");
   const flat = (s) => flattenTerminalOutput(s);
-  for (let i = 0; i < lines.length; i++) {
-    const own = flat(lines[i]).includes(doneToken);
-    if (own) return lines.slice(0, i).join("\n").trim();
-    const window = flat(lines[i]) + (i + 1 < lines.length ? flat(lines[i + 1]) : "");
-    if (window.includes(doneToken)) return lines.slice(0, i + 1).join("\n").trim();
+  for (let i = 0; i < lines2.length; i++) {
+    const own = flat(lines2[i]).includes(doneToken);
+    if (own) return lines2.slice(0, i).join("\n").trim();
+    const window = flat(lines2[i]) + (i + 1 < lines2.length ? flat(lines2[i + 1]) : "");
+    if (window.includes(doneToken)) return lines2.slice(0, i + 1).join("\n").trim();
   }
   return rendered.trim();
 }
@@ -309,9 +313,9 @@ function oneLine(text2) {
   return text2.replace(/\s+/g, " ").trim();
 }
 function firstLineOf(command) {
-  const lines = command.trim().split(/\r?\n/);
-  const more = lines.length - 1;
-  return more > 0 ? `${lines[0]} \u2026 +${more} line${more === 1 ? "" : "s"}` : lines[0];
+  const lines2 = command.trim().split(/\r?\n/);
+  const more = lines2.length - 1;
+  return more > 0 ? `${lines2[0]} \u2026 +${more} line${more === 1 ? "" : "s"}` : lines2[0];
 }
 function text(value) {
   return typeof value === "string" ? value : "";
@@ -358,14 +362,56 @@ function toolHeadline(tool, args, toolLabel) {
   return { name, keyArg: parsed ? keyArgOf(tool, parsed) : oneLine(args) };
 }
 function outputLines(output) {
-  const lines = output.replace(/\r\n?/g, "\n").replace(ANSI_OR_CTRL_RE, "").split("\n");
-  while (lines.length > 0 && lines[lines.length - 1].trim() === "") lines.pop();
-  return lines;
+  const lines2 = output.replace(/\r\n?/g, "\n").replace(ANSI_OR_CTRL_RE, "").split("\n");
+  while (lines2.length > 0 && lines2[lines2.length - 1].trim() === "") lines2.pop();
+  return lines2;
 }
 function outputPreview(output, maxLines) {
-  const lines = outputLines(output);
-  const shown = lines.slice(0, Math.max(0, maxLines));
-  return { lines: shown, hiddenLineCount: lines.length - shown.length };
+  const lines2 = outputLines(output);
+  const shown = lines2.slice(0, Math.max(0, maxLines));
+  return { lines: shown, hiddenLineCount: lines2.length - shown.length };
+}
+function diffStat(output) {
+  const lines2 = outputLines(output);
+  let added = 0;
+  let removed = 0;
+  for (const line of lines2) {
+    if (line.startsWith("+")) added += 1;
+    else if (line.startsWith("-")) removed += 1;
+    else if (!(line.startsWith("@@") || line.startsWith(" ") || line === "" || line.startsWith("\\"))) return null;
+  }
+  return added + removed > 0 ? { added, removed } : null;
+}
+var HUNK_RANGE = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
+function diffRows(output) {
+  const rows = [];
+  let oldLine = 1;
+  let newLine = 1;
+  for (const line of outputLines(output)) {
+    const range = HUNK_RANGE.exec(line);
+    if (range) {
+      if (rows.length > 0) rows.push({ kind: "gap", text: "" });
+      oldLine = Number(range[1]);
+      newLine = Number(range[2]);
+    } else if (line.startsWith("+")) {
+      rows.push({ kind: "added", line: newLine++, text: line.slice(1) });
+    } else if (line.startsWith("-")) {
+      rows.push({ kind: "removed", line: oldLine++, text: line.slice(1) });
+    } else if (!line.startsWith("\\")) {
+      rows.push({ kind: "context", line: newLine, text: line.slice(1) });
+      oldLine += 1;
+      newLine += 1;
+    }
+  }
+  return rows;
+}
+function lines(count) {
+  return `${count} line${count === 1 ? "" : "s"}`;
+}
+function diffSummary({ added, removed }) {
+  if (!removed) return `Added ${lines(added)}`;
+  if (!added) return `Removed ${lines(removed)}`;
+  return `Added ${lines(added)}, removed ${lines(removed)}`;
 }
 
 // src/conversation/records.ts
@@ -394,7 +440,8 @@ var STATUS_OF_OUTCOME = {
   not_executed: "interrupted"
 };
 function finishedTool(call, output, outcome) {
-  return { ...call, status: STATUS_OF_OUTCOME[outcome], outcome, output, outputLineCount: outputLines(output).length };
+  const diff = outcome === "success" && isFileEditTool(call.toolLabel ?? call.tool) ? diffStat(output) : null;
+  return { ...call, status: STATUS_OF_OUTCOME[outcome], outcome, output, outputLineCount: outputLines(output).length, ...diff ? { diff } : {} };
 }
 function settledTool(call, step) {
   return finishedTool(call, step.result, step.outcome);
@@ -937,11 +984,11 @@ var UPDATABLE_FIELDS = [
   "sliceType",
   "ops"
 ];
-function taskOpsProtocol(executionNote = "") {
+function taskOpsProtocol(executionNote = "", tools = false) {
   const updateChanges = UPDATABLE_FIELDS.map((f) => f === "dependencies" ? '"dependencies"?:["<id or #order>"]' : `"${f}"?`).join(",");
   return [
-    "- To modify specific tasks, reply with ONLY this JSON object:",
-    '  {"taskOps": [',
+    tools ? "- To modify specific tasks, call edit_plan, never a JSON reply. Its argument is:" : "- To modify specific tasks, reply with ONLY this JSON object:",
+    tools ? '  {"ops": [' : '  {"taskOps": [',
     `    {"op":"update","taskId":"<id or #order>","changes":{${updateChanges}}},`,
     '    {"op":"add","task":{"title","description","prompt","dependencies":["<id or #order>"],"assignedRunner"?,"assignedModel"?,"ops"?},"handle"?:"<name>"},',
     '    {"op":"remove","taskId":"<id or #order>"},',
@@ -950,11 +997,12 @@ function taskOpsProtocol(executionNote = "") {
     '    {"op":"split","taskId":"<id or #order>","parts":[{"title","description","prompt"?,"assignedRunner"?,"assignedModel"?,...}, ...],"handle"?:"<name>"},',
     `    {"op":"rearm","taskId":"<id or #order>","changes"?:{${updateChanges}}}`,
     "  ]}",
-    '- For sweeping changes, you may instead emit a full {"tasks":[...]} plan JSON.',
+    tools ? "- For sweeping changes, you may instead call submit_plan with the full plan." : '- For sweeping changes, you may instead emit a full {"tasks":[...]} plan JSON.',
     'Every "<id or #order>" ref in a batch resolves against the plan shown above, before any op in the batch runs \u2014 an earlier remove/merge/split never shifts what a later "#N" means.',
     'Give "add", "merge", or "split" a "handle" (any name you choose, unused elsewhere in this batch) to let a LATER op in the same batch reference the task it produces \u2014 for "split", the handle names its last part. A handle used before its defining op is rejected.',
-    'When creating or changing tasks, set "assignedRunner" and "assignedModel" ({"modelId","modelLabel","thinkingEffort"?}) using only the runners and models listed in <available_models>.',
+    `When creating or changing tasks, set "assignedRunner" and "assignedModel" ({"modelId","modelLabel","thinkingEffort"?}) using only the runners and models ${tools ? "list_runners and list_models return" : "listed in <available_models>"}.`,
     'Keep dependencies consistent: no cycles, no references to removed tasks, and never touch running or completed tasks \u2014 "rearm" is the one exception, below.',
+    ...tools ? ["edit_plan checks the batch when you call it and answers with what it will change, or with the error to fix \u2014 call it again in the same reply. The edit is applied when your reply ends; edits you make in one reply join one batch."] : [],
     'Just declare the dependencies you want \u2014 display order is repaired for you afterwards, so a rewire or a newly added prerequisite never needs a "reorder" op. Only a task that is running or completed cannot be shifted, so an edit that would need one to move is rejected.' + executionNote,
     'Flipping "type" between "ai" and "user" is a content change, not just a label: an update to "user" needs "userSteps" in the SAME op, and an update to "ai" needs "prompt" in the SAME op \u2014 the model/mode/effort/autonomy fields (flipping to "user") or the userSteps (flipping to "ai") are cleared automatically.',
     '"rearm" puts a failed OR completed task back to pending \u2014 verdict and output summary are cleared, any dependents it had blocked are released, and it may carry field changes (e.g. a corrected "prompt") applied in the same op. A running task cannot be re-armed. Never rearm a task just to relabel it \u2014 only when it should actually run again.'
@@ -2090,6 +2138,9 @@ export {
   toolHeadline,
   outputLines,
   outputPreview,
+  diffStat,
+  diffRows,
+  diffSummary,
   EMPTY_TASK_LOG,
   runnerToolSubject,
   reduceTaskLog,
@@ -2136,4 +2187,4 @@ export {
   hasHiddenDetail,
   taskStartedNotice
 };
-//# sourceMappingURL=chunk-I6U3PVHL.mjs.map
+//# sourceMappingURL=chunk-LSGY7AIZ.mjs.map