negotium 0.1.29 → 0.1.31

package/dist/agent-helpers.js

@@ -1296,9 +1296,9 @@ import { join as join10 } from "path";
 
 // ../../packages/core/src/agents/rollout/codex.ts
 import { randomBytes as randomBytes3 } from "crypto";
-import { existsSync as existsSync5, readFileSync as readFileSync4, statSync as statSync2, unlinkSync as unlinkSync4 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4, realpathSync, statSync as statSync2, unlinkSync as unlinkSync4 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join7 } from "path";
+import { basename, dirname as dirname4, join as join7, resolve as resolve3 } from "path";
 function codexSessionsDir() {
   return join7(process.env.CODEX_HOME || join7(homedir5(), ".codex"), "sessions");
 }
@@ -1364,6 +1364,139 @@ function patchEnvContext(envContext, cwd, currentDate, timezone) {
     }
   }
 }
+function canonicalFilePath(path) {
+  const absolute = resolve3(path);
+  try {
+    return realpathSync(absolute);
+  } catch {
+    try {
+      return join7(realpathSync(dirname4(absolute)), basename(absolute));
+    } catch {
+      return absolute;
+    }
+  }
+}
+function changedPatchLines(value) {
+  const removed = [];
+  const added = [];
+  const diffPreview = [];
+  let oldLine = 0;
+  let newLine = 0;
+  let sawHunk = false;
+  for (const line of value.split(`
+`)) {
+    const hunk = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/.exec(line);
+    if (hunk) {
+      if (sawHunk)
+        diffPreview.push("\u2026");
+      sawHunk = true;
+      oldLine = Number.parseInt(hunk[1] ?? "0", 10);
+      newLine = Number.parseInt(hunk[2] ?? "0", 10);
+      continue;
+    }
+    if (!sawHunk && (line.startsWith("--- ") || line.startsWith("+++ ")))
+      continue;
+    if (line.startsWith("\\ No newline"))
+      continue;
+    if (line.startsWith("-")) {
+      removed.push(line.slice(1));
+      diffPreview.push(`${oldLine} -${line.slice(1)}`);
+      oldLine += 1;
+      continue;
+    }
+    if (line.startsWith("+")) {
+      added.push(line.slice(1));
+      diffPreview.push(`${newLine} +${line.slice(1)}`);
+      newLine += 1;
+      continue;
+    }
+    if (line.startsWith(" ")) {
+      diffPreview.push(`${newLine}  ${line.slice(1)}`);
+      oldLine += 1;
+      newLine += 1;
+    }
+  }
+  return {
+    ...removed.length > 0 ? { before: removed.join(`
+`) } : {},
+    ...added.length > 0 ? { after: added.join(`
+`) } : {},
+    ...diffPreview.length > 0 ? { diffPreview: diffPreview.join(`
+`) } : {}
+  };
+}
+function extractLatestCodexPatchPreview(jsonl, expectedPaths, consumedCallIds = new Set, expectedCallId) {
+  const expected = expectedPaths.map(canonicalFilePath);
+  const lines = jsonl.trimEnd().split(`
+`);
+  for (let index = lines.length - 1;index >= 0; index -= 1) {
+    try {
+      const entry = JSON.parse(lines[index] ?? "");
+      if (entry.type !== "event_msg" || entry.payload?.type !== "patch_apply_end")
+        continue;
+      const callId = entry.payload.call_id;
+      const rawChanges = entry.payload.changes;
+      if (!callId || consumedCallIds.has(callId) || expectedCallId !== undefined && callId !== expectedCallId || !rawChanges) {
+        continue;
+      }
+      const entries = Object.entries(rawChanges);
+      const matched = expected.map((path) => entries.find(([candidate]) => canonicalFilePath(candidate) === path));
+      const complete = matched.filter((change) => change !== undefined);
+      if (complete.length !== expected.length)
+        continue;
+      return {
+        callId,
+        changes: complete.map(([path, change]) => {
+          if (typeof change.unified_diff === "string") {
+            return { path, ...changedPatchLines(change.unified_diff) };
+          }
+          const content = typeof change.content === "string" ? change.content.replace(/\n$/, "") : undefined;
+          return {
+            path,
+            ...change.type === "delete" && content !== undefined ? { before: content } : {},
+            ...change.type === "add" && content !== undefined ? { after: content } : {}
+          };
+        })
+      };
+    } catch {}
+  }
+  return;
+}
+function extractCodexPatchCallIds(jsonl) {
+  const callIds = [];
+  for (const line of jsonl.trimEnd().split(`
+`)) {
+    try {
+      const entry = JSON.parse(line);
+      if (entry.type === "event_msg" && entry.payload?.type === "patch_apply_end" && typeof entry.payload.call_id === "string") {
+        callIds.push(entry.payload.call_id);
+      }
+    } catch {}
+  }
+  return callIds;
+}
+function readCodexPatchCallIds(threadId) {
+  const path = latestCodexRolloutPath(threadId);
+  if (!path)
+    return [];
+  try {
+    return extractCodexPatchCallIds(readFileSync4(path, "utf8"));
+  } catch (error) {
+    logger.debug({ error, threadId }, "codex patch ids: rollout read failed");
+    return [];
+  }
+}
+function readLatestCodexPatchPreview(threadId, expectedPaths, consumedCallIds = new Set, expectedCallId) {
+  const path = latestCodexRolloutPath(threadId);
+  if (!path)
+    return;
+  try {
+    return extractLatestCodexPatchPreview(readFileSync4(path, "utf8"), expectedPaths, consumedCallIds, expectedCallId);
+  } catch (error) {
+    logger.debug({ error, threadId }, "codex patch preview: rollout read failed");
+    return;
+  }
+}
 function extractLatestCodexContextUsage(jsonl) {
   const lines = jsonl.trimEnd().split(`
 `);
@@ -1382,28 +1515,11 @@ function extractLatestCodexContextUsage(jsonl) {
   return;
 }
 function readLatestCodexContextUsage(threadId) {
-  const sessionsDir = codexSessionsDir();
-  const candidates = [];
-  const buckets = candidateDateBuckets(threadId);
+  const path = latestCodexRolloutPath(threadId);
+  if (!path)
+    return;
   try {
-    if (buckets) {
-      for (const bucket of buckets) {
-        const dir = join7(sessionsDir, bucket);
-        if (!existsSync5(dir))
-          continue;
-        const glob = new Bun.Glob(`rollout-*-${threadId}.jsonl`);
-        for (const rel of glob.scanSync({ cwd: dir, onlyFiles: true })) {
-          candidates.push(join7(dir, rel));
-        }
-      }
-    } else {
-      const glob = new Bun.Glob(`**/rollout-*-${threadId}.jsonl`);
-      for (const rel of glob.scanSync({ cwd: sessionsDir, onlyFiles: true })) {
-        candidates.push(join7(sessionsDir, rel));
-      }
-    }
-    const path = candidates.sort((a, b) => statSync2(b).mtimeMs - statSync2(a).mtimeMs)[0];
-    return path ? extractLatestCodexContextUsage(readFileSync4(path, "utf8")) : undefined;
+    return extractLatestCodexContextUsage(readFileSync4(path, "utf8"));
   } catch (error) {
     logger.debug({ error, threadId }, "codex context usage: rollout read failed");
     return;
@@ -1671,7 +1787,7 @@ import {
   unlinkSync as unlinkSync5,
   writeFileSync as writeFileSync4
 } from "fs";
-import { dirname as dirname5, join as join9 } from "path";
+import { dirname as dirname6, join as join9 } from "path";
 
 // ../../packages/core/src/security/sanitize.ts
 function sanitizeTopicName(name, lowercase = false) {
@@ -1688,7 +1804,7 @@ function sanitizeFileName(name) {
 // ../../packages/core/src/storage/storage-host.ts
 import { mkdirSync as mkdirSync6 } from "fs";
 import { homedir as homedir6 } from "os";
-import { dirname as dirname4, join as join8, resolve as resolve3 } from "path";
+import { dirname as dirname5, join as join8, resolve as resolve4 } from "path";
 var configuredHost = {};
 var fallbackDatabase = null;
 var fallbackDatabasePath = null;
@@ -1697,7 +1813,7 @@ var initializedSchemas = new WeakMap;
 var initializingDatabases = new WeakSet;
 function envPath(name, fallback) {
   const value = process.env[name]?.trim();
-  return resolve3(value || fallback);
+  return resolve4(value || fallback);
 }
 function defaultStateDir() {
   return envPath("NEGOTIUM_STATE_DIR", join8(homedir6(), ".negotium"));
@@ -1726,7 +1842,7 @@ function defaultDatabase() {
     return fallbackDatabase;
   if (fallbackDatabase)
     fallbackDatabase.close();
-  mkdirSync6(dirname4(path), { recursive: true });
+  mkdirSync6(dirname5(path), { recursive: true });
   fallbackDatabase = new Database(path, { create: true });
   fallbackDatabasePath = path;
   initializeDatabase(fallbackDatabase);
@@ -1819,7 +1935,7 @@ function appendConversationEventStrict(userId, topicName, agent, event) {
     agent,
     event
   };
-  mkdirSync7(dirname5(path), { recursive: true });
+  mkdirSync7(dirname6(path), { recursive: true });
   appendJsonlLine(path, JSON.stringify(entry));
 }
 function readConversation(userId, topicName) {
@@ -1981,7 +2097,7 @@ function cleanupAgentFork(handle) {
 }
 // ../../packages/core/src/agents/archiver.ts
 import { randomUUID as randomUUID5 } from "crypto";
-import { existsSync as existsSync13, readdirSync as readdirSync2, readFileSync as readFileSync10, statSync as statSync4 } from "fs";
+import { existsSync as existsSync13, readdirSync as readdirSync2, readFileSync as readFileSync11, statSync as statSync5 } from "fs";
 import { join as join15 } from "path";
 
 // ../../packages/core/src/agents/index.ts
@@ -2014,8 +2130,8 @@ function deepMapStrings(value, fn) {
 import { AsyncLocalStorage } from "async_hooks";
 
 // ../../packages/core/src/security/sensitive-path.ts
-import { realpathSync } from "fs";
-import { resolve as resolve4 } from "path";
+import { realpathSync as realpathSync2 } from "fs";
+import { resolve as resolve5 } from "path";
 var SENSITIVE_PATH_PATTERNS = [
   /\/\.env(\.|$)/i,
   /\/\.ssh\//i,
@@ -2032,11 +2148,11 @@ var SENSITIVE_PATH_PATTERNS = [
   /\/sessions\.db(-wal|-shm|-journal)?$/i
 ];
 function isSensitivePath(filePath) {
-  const normalized = resolve4(filePath);
+  const normalized = resolve5(filePath);
   if (SENSITIVE_PATH_PATTERNS.some((p) => p.test(normalized)))
     return true;
   try {
-    const real = realpathSync(normalized);
+    const real = realpathSync2(normalized);
     if (real !== normalized)
       return SENSITIVE_PATH_PATTERNS.some((p) => p.test(real));
   } catch {}
@@ -2340,12 +2456,12 @@ function createBackgroundBashManager(options = {}) {
     usedPorts.clear();
     knownContexts.clear();
     const deadline = now() + 3000;
-    await Promise.all(entries.map((instance) => new Promise((resolve5) => {
+    await Promise.all(entries.map((instance) => new Promise((resolve6) => {
       if (instance.process.exitCode !== null || instance.process.killed)
-        return resolve5();
-      instance.process.once("exit", resolve5);
-      instance.process.once("error", resolve5);
-      const timer = setTimeout(resolve5, Math.max(0, deadline - now()));
+        return resolve6();
+      instance.process.once("exit", resolve6);
+      instance.process.once("error", resolve6);
+      const timer = setTimeout(resolve6, Math.max(0, deadline - now()));
       timer.unref?.();
     })));
   }
@@ -2606,11 +2722,10 @@ var MCP_CATALOG = {
   },
   "background-bash": {
     ...commonRuntimeMcpPolicy("background-bash"),
-    build({ agent, bgBashPort, userId, topicId, session }) {
-      const topic = topicId ?? session;
-      if (bgBashPort === undefined || !topic)
+    build({ agent, bgBashPort, userId, topicId }) {
+      if (bgBashPort === undefined || !topicId)
         return null;
-      return backgroundBashTransport(agent, bgBashPort, userId, topic);
+      return backgroundBashTransport(agent, bgBashPort, userId, topicId);
     }
   },
   "agent-health": {
@@ -3365,7 +3480,8 @@ async function* claudeProvider(opts) {
           yield {
             type: "tool_result",
             toolUseId: trBlock.tool_use_id || "",
-            content: trContent
+            content: trContent,
+            ...trBlock.is_error ? { isError: true } : {}
           };
         }
       }
@@ -3379,7 +3495,9 @@ async function* claudeProvider(opts) {
 }
 
 // ../../packages/core/src/agents/codex-provider.ts
-import { existsSync as existsSync10 } from "fs";
+import { execFileSync as execFileSync5 } from "child_process";
+import { existsSync as existsSync10, readFileSync as readFileSync8, realpathSync as realpathSync3, statSync as statSync3 } from "fs";
+import { isAbsolute, relative, resolve as resolve6 } from "path";
 import { Codex } from "@openai/codex-sdk";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
@@ -3398,10 +3516,10 @@ import {
 } from "fs";
 import { createRequire } from "module";
 import { tmpdir } from "os";
-import { dirname as dirname6, join as join11 } from "path";
+import { dirname as dirname7, join as join11 } from "path";
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.1.29";
+var NEGOTIUM_VERSION = "0.1.31";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 var moduleRequire = createRequire(import.meta.url);
@@ -3420,7 +3538,7 @@ var SAFE_BUNDLED_CODEX_VERSION = BUNDLED_CODEX_VERSION.replace(/[^a-zA-Z0-9._-]/
 var NEGOTIUM_MODEL_CACHE = `negotium-models-cache-${SAFE_BUNDLED_CODEX_VERSION}.json`;
 var NEGOTIUM_MODEL_CATALOG = `negotium-model-catalog-${SAFE_BUNDLED_CODEX_VERSION}.json`;
 function codexCliScriptPath() {
-  return join11(dirname6(bundledCodexPackagePath), "bin", "codex.js");
+  return join11(dirname7(bundledCodexPackagePath), "bin", "codex.js");
 }
 function parseCodexModelCache(contents, sourcePath) {
   let parsed;
@@ -3461,14 +3579,14 @@ function writePrivateFileAtomic(path, contents) {
   }
 }
 function bundledCodexModelCachePath(authFilePath) {
-  return join11(dirname6(authFilePath), NEGOTIUM_MODEL_CACHE);
+  return join11(dirname7(authFilePath), NEGOTIUM_MODEL_CACHE);
 }
 async function bootstrapCodexModelCache(codexHome, cachePath) {
   const child = spawn3(process.execPath, [codexCliScriptPath(), "app-server", "--stdio"], {
     env: { ...process.env, CODEX_HOME: codexHome },
     stdio: ["pipe", "pipe", "pipe"]
   });
-  await new Promise((resolve5, reject) => {
+  await new Promise((resolve6, reject) => {
     let settled = false;
     let stdoutBuffer = "";
     let stderr = "";
@@ -3487,7 +3605,7 @@ async function bootstrapCodexModelCache(codexHome, cachePath) {
       else if (!existsSync9(cachePath))
         reject(new Error("Codex did not create its model cache"));
       else
-        resolve5();
+        resolve6();
     };
     const send = (message) => {
       child.stdin.write(`${JSON.stringify(message)}
@@ -3546,7 +3664,7 @@ async function bootstrapCodexModelCache(codexHome, cachePath) {
   });
 }
 async function bootstrapIsolatedCodexModelCache(authFilePath, bootstrap) {
-  const sourceHome = dirname6(authFilePath);
+  const sourceHome = dirname7(authFilePath);
   const isolatedHome = mkdtempSync(join11(tmpdir(), "negotium-codex-models-"));
   const isolatedCachePath = join11(isolatedHome, "models_cache.json");
   try {
@@ -3566,7 +3684,7 @@ async function bootstrapIsolatedCodexModelCache(authFilePath, bootstrap) {
   }
 }
 async function ensureCodexModelCache(authFilePath, bootstrap = bootstrapCodexModelCache) {
-  const codexHome = dirname6(authFilePath);
+  const codexHome = dirname7(authFilePath);
   const configuredCachePath = process.env.NEGOTIUM_CODEX_MODELS_CACHE_FILE;
   if (configuredCachePath) {
     if (!existsSync9(configuredCachePath)) {
@@ -3595,7 +3713,7 @@ async function ensureCodexModelCache(authFilePath, bootstrap = bootstrapCodexMod
   return bundledCachePath;
 }
 function writeCodexCatalogWithNativeMultiAgentDisabled(authFilePath, sourcePath) {
-  const codexHome = dirname6(authFilePath);
+  const codexHome = dirname7(authFilePath);
   const outputPath = join11(codexHome, NEGOTIUM_MODEL_CATALOG);
   const parsed = readCodexModelCache(sourcePath).parsed;
   const models = parsed.models.map((model, index) => {
@@ -3610,6 +3728,52 @@ function writeCodexCatalogWithNativeMultiAgentDisabled(authFilePath, sourcePath)
   return outputPath;
 }
 
+// ../../packages/core/src/agents/tool-format.ts
+import { diffLines as computeLineDiff } from "diff";
+function changedDiffLines(value) {
+  const lines = value.split(`
+`);
+  if (lines.at(-1) === "")
+    lines.pop();
+  return lines;
+}
+function buildNumberedDiffSummary(before, after, startLine = 1) {
+  const removed = [];
+  const added = [];
+  const preview = [];
+  let oldLine = startLine;
+  let newLine = startLine;
+  for (const part of computeLineDiff(before, after)) {
+    const lines = changedDiffLines(part.value);
+    if (part.removed) {
+      for (const line of lines) {
+        removed.push(line);
+        preview.push(`${oldLine} -${line}`);
+        oldLine += 1;
+      }
+      continue;
+    }
+    if (part.added) {
+      for (const line of lines) {
+        added.push(line);
+        preview.push(`${newLine} +${line}`);
+        newLine += 1;
+      }
+      continue;
+    }
+    oldLine += lines.length;
+    newLine += lines.length;
+  }
+  return {
+    ...removed.length > 0 ? { before: removed.join(`
+`) } : {},
+    ...added.length > 0 ? { after: added.join(`
+`) } : {},
+    ...preview.length > 0 ? { diffPreview: preview.join(`
+`) } : {}
+  };
+}
+
 // ../../packages/core/src/agents/codex-provider.ts
 function mapEffort(effort) {
   if (!effort)
@@ -3692,22 +3856,142 @@ function summarizeMcpToolCallResult(item) {
     return text.slice(0, 200);
   return JSON.stringify(item.result.structured_content ?? "").slice(0, 200);
 }
-function fileChangeEvents(item) {
+var CODEX_DIFF_FILE_LIMIT = 512 * 1024;
+var CODEX_DIFF_BASELINE_FILE_LIMIT = 200;
+var CODEX_DIFF_BASELINE_BYTE_LIMIT = 16 * 1024 * 1024;
+function canonicalPath(path) {
+  try {
+    return realpathSync3(resolve6(path));
+  } catch {
+    return resolve6(path);
+  }
+}
+function textFile(path, maxBytes = CODEX_DIFF_FILE_LIMIT) {
+  if (!existsSync10(path))
+    return null;
+  try {
+    const byteLimit = Math.min(CODEX_DIFF_FILE_LIMIT, Math.max(0, maxBytes));
+    if (statSync3(path).size > byteLimit)
+      return;
+    const content = readFileSync8(path);
+    if (content.byteLength > byteLimit || content.includes(0))
+      return;
+    return content.toString("utf8");
+  } catch {
+    return;
+  }
+}
+
+class CodexFilePreviewTracker {
+  #cwd;
+  #root;
+  #baseline = new Map;
+  #baselineAvailable = false;
+  constructor(cwd) {
+    this.#cwd = canonicalPath(cwd);
+    const root = this.#git(["rev-parse", "--show-toplevel"], this.#cwd)?.trim();
+    this.#root = root ? canonicalPath(root) : null;
+    if (!this.#root)
+      return;
+    const status = this.#git(["status", "--porcelain=v1", "-z", "--untracked-files=all"]);
+    if (status === undefined)
+      return;
+    this.#baselineAvailable = true;
+    let loadedFiles = 0;
+    let loadedBytes = 0;
+    const records = status.split("\x00");
+    for (let index = 0;index < records.length; index += 1) {
+      const record = records[index];
+      if (!record || record.length < 4)
+        continue;
+      const code = record.slice(0, 2);
+      const path = record.slice(3);
+      const remainingBytes = CODEX_DIFF_BASELINE_BYTE_LIMIT - loadedBytes;
+      const content = loadedFiles < CODEX_DIFF_BASELINE_FILE_LIMIT && remainingBytes > 0 ? textFile(resolve6(this.#root, path), remainingBytes) : undefined;
+      this.#baseline.set(path, content);
+      if (typeof content === "string") {
+        loadedFiles += 1;
+        loadedBytes += Buffer.byteLength(content);
+      }
+      if (/[RC]/.test(code))
+        index += 1;
+    }
+  }
+  preview(path, succeeded) {
+    if (!this.#root || !this.#baselineAvailable || !succeeded)
+      return {};
+    const absolute = canonicalPath(isAbsolute(path) ? path : resolve6(this.#cwd, path));
+    const relativePath = relative(this.#root, absolute);
+    if (!relativePath || relativePath.startsWith("..") || isAbsolute(relativePath))
+      return {};
+    const before = this.#baseline.has(relativePath) ? this.#baseline.get(relativePath) : this.#headFile(relativePath);
+    const after = textFile(absolute);
+    this.#baseline.set(relativePath, after);
+    if (before === undefined || after === undefined)
+      return {};
+    const diff = buildNumberedDiffSummary(before ?? "", after ?? "");
+    return {
+      ...diff.before !== undefined ? { before: diff.before } : {},
+      ...diff.after !== undefined ? { after: diff.after } : {},
+      ...diff.diffPreview !== undefined ? { diff_preview: diff.diffPreview } : {}
+    };
+  }
+  #headFile(path) {
+    const content = this.#git(["show", `HEAD:${path}`]);
+    if (content === undefined)
+      return null;
+    return Buffer.byteLength(content) > CODEX_DIFF_FILE_LIMIT || content.includes("\x00") ? undefined : content;
+  }
+  #git(args, cwd = this.#root ?? undefined) {
+    try {
+      return execFileSync5("git", ["-C", cwd ?? ".", ...args], {
+        encoding: "utf8",
+        maxBuffer: CODEX_DIFF_FILE_LIMIT * 4,
+        stdio: ["ignore", "pipe", "ignore"]
+      });
+    } catch {
+      return;
+    }
+  }
+}
+async function fileChangeEvents(item, previews, cwd, threadId, consumedPatchCallIds) {
+  const expectedPaths = item.changes.map((change) => isAbsolute(change.path) ? change.path : resolve6(cwd, change.path));
+  let nativePreview;
+  if (threadId && item.status === "completed") {
+    await new Promise((resolveDelay) => setTimeout(resolveDelay, 20));
+    nativePreview = readLatestCodexPatchPreview(threadId, expectedPaths, consumedPatchCallIds);
+  }
+  for (const delayMs of [20, 40, 80, 120]) {
+    if (nativePreview || !threadId || item.status !== "completed")
+      break;
+    await new Promise((resolveDelay) => setTimeout(resolveDelay, delayMs));
+    nativePreview = readLatestCodexPatchPreview(threadId, expectedPaths, consumedPatchCallIds);
+  }
+  if (nativePreview)
+    consumedPatchCallIds.add(nativePreview.callId);
   return item.changes.flatMap((change, index) => {
     const name = change.kind === "add" ? "Write" : change.kind === "delete" ? "Delete" : "Edit";
     const toolUseId = `${item.id}:${index}`;
     const success = item.status === "completed";
+    const nativeChange = nativePreview?.changes[index];
+    const fallbackPreview = previews.preview(change.path, success);
+    const preview = success && nativeChange ? {
+      ...nativeChange.before !== undefined ? { before: nativeChange.before } : {},
+      ...nativeChange.after !== undefined ? { after: nativeChange.after } : {},
+      ...nativeChange.diffPreview !== undefined ? { diff_preview: nativeChange.diffPreview } : {}
+    } : fallbackPreview;
     return [
       {
         type: "tool_use",
         name,
-        input: { file_path: change.path, change_kind: change.kind },
+        input: { file_path: change.path, change_kind: change.kind, ...preview },
         toolUseId
       },
       {
         type: "tool_result",
         toolUseId,
-        content: success ? `${change.kind} applied: ${change.path}` : `${change.kind} failed: ${change.path}`
+        content: success ? `${change.kind} applied: ${change.path}` : `${change.kind} failed: ${change.path}`,
+        ...success ? {} : { isError: true }
       }
     ];
   });
@@ -3793,6 +4077,8 @@ function prependFirstEvent(iter, firstEvent, alreadyDone) {
   };
 }
 async function* codexProvider(opts) {
+  const filePreviews = new CodexFilePreviewTracker(opts.cwd);
+  const consumedPatchCallIds = new Set(opts.sessionId ? readCodexPatchCallIds(opts.sessionId) : []);
   const codexAuthPath = hostedCodexAuthFilePath();
   if (!existsSync10(codexAuthPath)) {
     yield {
@@ -3927,10 +4213,11 @@ async function* codexProvider(opts) {
               if (!item)
                 break;
               if (item.type === "command_execution") {
+                const command = String(item.command ?? "");
                 yield {
                   type: "tool_use",
                   name: "Bash",
-                  input: { command: String(item.command ?? "") },
+                  input: { command },
                   toolUseId: String(item.id ?? "")
                 };
               } else if (item.type === "mcp_tool_call") {
@@ -3976,19 +4263,24 @@ async function* codexProvider(opts) {
                 if (reasoning)
                   yield { type: "reasoning", content: reasoning };
               } else if (item.type === "mcp_tool_call") {
+                const isError = item.status === "failed" || Boolean(item.error);
                 yield {
                   type: "tool_result",
                   toolUseId: String(item.id ?? ""),
-                  content: summarizeMcpToolCallResult(item)
+                  content: summarizeMcpToolCallResult(item),
+                  ...isError ? { isError: true } : {}
                 };
               } else if (item.type === "command_execution") {
+                const isError = item.status === "failed" || typeof item.exit_code === "number" && item.exit_code !== 0;
                 yield {
                   type: "tool_result",
                   toolUseId: String(item.id ?? ""),
-                  content: String(item.aggregated_output ?? "").slice(0, 200)
+                  content: String(item.aggregated_output ?? "").slice(0, 200),
+                  ...isError ? { isError: true } : {}
                 };
               } else if (item.type === "file_change") {
-                for (const fileEvent of fileChangeEvents(item)) {
+                const fileEvents = await fileChangeEvents(item, filePreviews, opts.cwd, currentSessionId, consumedPatchCallIds);
+                for (const fileEvent of fileEvents) {
                   yield fileEvent;
                 }
               } else if (item.type === "error") {
@@ -4184,8 +4476,8 @@ function maestroProvider(opts) {
 }
 
 // ../../packages/core/src/storage/tasks.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync8, readFileSync as readFileSync8, renameSync as renameSync5, statSync as statSync3, writeFileSync as writeFileSync6 } from "fs";
-import { dirname as dirname7, join as join12 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync8, readFileSync as readFileSync9, renameSync as renameSync5, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
+import { dirname as dirname8, join as join12 } from "path";
 function safeUserIdComponent2(userId) {
   const str = String(userId);
   if (!str || /[/\\]|\.\./.test(str)) {
@@ -4211,7 +4503,7 @@ function readTasks(userId, scopeKey) {
   if (!existsSync11(path))
     return [];
   try {
-    const parsed = JSON.parse(readFileSync8(path, "utf-8"));
+    const parsed = JSON.parse(readFileSync9(path, "utf-8"));
     return Array.isArray(parsed?.tasks) ? parsed.tasks : [];
   } catch (e) {
     logger.warn({ err: e, path }, "tasks: failed to read task store");
@@ -4220,7 +4512,7 @@ function readTasks(userId, scopeKey) {
 }
 function taskFileMtimeNs(userId, scopeKey) {
   try {
-    return statSync3(getTaskFilePath(userId, scopeKey), { bigint: true }).mtimeNs;
+    return statSync4(getTaskFilePath(userId, scopeKey), { bigint: true }).mtimeNs;
   } catch {
     return null;
   }
@@ -4541,9 +4833,15 @@ class SqliteRuntimeBus {
       toolUseId: id
     });
   }
-  broadcastToolOutput(topicId, queryId, toolUseId, content) {
+  broadcastToolOutput(topicId, queryId, toolUseId, content, isError) {
     const id = toolUseId.trim() || `${queryId}:tool`;
-    this.broadcastAiStatus(topicId, { kind: "tool_output", queryId, toolUseId: id, content });
+    this.broadcastAiStatus(topicId, {
+      kind: "tool_output",
+      queryId,
+      toolUseId: id,
+      content,
+      ...isError ? { isError: true } : {}
+    });
   }
   broadcastToolStatus(topicId, queryId, kind, content, meta) {
     this.broadcastAiStatus(topicId, {
@@ -4585,8 +4883,8 @@ var WsHub = {
 };
 
 // ../../packages/core/src/prompts/builders.ts
-import { readFileSync as readFileSync9 } from "fs";
-import { resolve as resolve5 } from "path";
+import { readFileSync as readFileSync10 } from "fs";
+import { resolve as resolve7 } from "path";
 
 // ../../packages/core/src/agents/model-catalog.ts
 var CODEX_PRO_20X_COST = "ChatGPT Pro 20x subscription: $200/month";
@@ -4687,10 +4985,10 @@ var SELECTABLE_MODELS = [
 ];
 
 // ../../packages/core/src/prompts/builders.ts
-var PROMPTS_DIR = resolve5(PROJECT_ROOT, "src/prompts");
-var SESSIONS_DIR = resolve5(PROMPTS_DIR, "sessions");
+var PROMPTS_DIR = resolve7(PROJECT_ROOT, "src/prompts");
+var SESSIONS_DIR = resolve7(PROMPTS_DIR, "sessions");
 function loadAgentPrompt(filename) {
-  const raw = readFileSync9(resolve5(AGENTS_PROMPTS_DIR, filename), "utf-8");
+  const raw = readFileSync10(resolve7(AGENTS_PROMPTS_DIR, filename), "utf-8");
   const match = raw.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
   if (!match)
     throw new Error(`Agent prompt ${filename} is missing frontmatter`);
@@ -4871,7 +5169,7 @@ function setTopicBrief(topicId, fields) {
 }
 
 // ../../packages/core/src/storage/wiki.ts
-import { basename, dirname as dirname8, join as join14 } from "path";
+import { basename as basename2, dirname as dirname9, join as join14 } from "path";
 function getSharedWikiDir(workspaceDir = resolveStorageWorkspaceDir()) {
   return workspaceDir === resolveStorageWorkspaceDir() ? resolveStorageSharedWikiDir() : join14(workspaceDir, "wiki");
 }
@@ -4884,7 +5182,11 @@ function isEphemeralWikiTopicId(topicId) {
   return topicId?.startsWith("__") ?? false;
 }
 function wikiSummaryStorageSlug(rawTopic, topicId) {
-  return topicId && !isEphemeralWikiTopicId(topicId) ? wikiSummarySlug(topicId) : wikiSummarySlug(rawTopic);
+  const titleSlug = wikiSummarySlug(rawTopic);
+  if (!topicId || isEphemeralWikiTopicId(topicId))
+    return titleSlug;
+  const idSlug = wikiSummarySlug(topicId);
+  return titleSlug === idSlug ? idSlug : `${titleSlug}--${idSlug}`;
 }
 function wikiSummaryFilename(date, rawTopic, topicId) {
   return `${date}-${wikiSummaryStorageSlug(rawTopic, topicId)}.md`;
@@ -5595,7 +5897,7 @@ function findSummaryFile(topicTitle, date, sinceMs, topicId) {
       continue;
     const p = join15(dir, f);
     try {
-      const m = statSync4(p).mtimeMs;
+      const m = statSync5(p).mtimeMs;
       if (m >= sinceMs && (!best || m > best.mtime))
         best = { path: p, mtime: m };
     } catch {}
@@ -5607,7 +5909,7 @@ function finalizeGeneralMemory(userId, topicTitle, messageCount, startMs, ok, to
   const date = new Date().toISOString().slice(0, 10);
   try {
     const summaryPath = ok ? findSummaryFile(topicTitle, date, startMs, topicId) : null;
-    const summaryMd = summaryPath ? readFileSync10(summaryPath, "utf-8") : "";
+    const summaryMd = summaryPath ? readFileSync11(summaryPath, "utf-8") : "";
     const oneLine = summaryMd && distillOneLine(summaryMd) || `${messageCount}\uAC1C \uBA54\uC2DC\uC9C0 \uC544\uCE74\uC774\uBE0C`;
     const prev = getTopicBrief(generalTopicId);
     const prevEntries = (prev?.briefMd ?? "").split(`
@@ -6567,4 +6869,4 @@ export {
   MIN_MEMORY_ARCHIVE_EXCHANGES
 };
 
-//# debugId=A260F0394930433E64756E2164756E21
+//# debugId=F639F58BC810D1BD64756E2164756E21