@jun133/kitty 0.0.13 → 0.0.14

package/dist/cli.js

@@ -40,7 +40,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@jun133/kitty",
-      version: "0.0.13",
+      version: "0.0.14",
       description: "Agent",
       license: "MIT",
       keywords: [
@@ -1917,14 +1917,21 @@ async function launchCommand(command, cwd, timeoutMs, abortSignal) {
 function encodePowerShellCommand(command) {
   const wrapped = [
     "$ProgressPreference = 'SilentlyContinue'",
+    "$ErrorActionPreference = 'Stop'",
     "[Console]::InputEncoding = [System.Text.Encoding]::UTF8",
     "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8",
     "$OutputEncoding = [System.Text.Encoding]::UTF8",
     "try { chcp 65001 > $null } catch { }",
+    "$code = 0",
+    "try {",
     `& { ${command} }`,
     "$code = if ($null -ne $LASTEXITCODE) { [int]$LASTEXITCODE } elseif ($?) { 0 } else { 1 }",
+    "} catch {",
+    "[Console]::Error.WriteLine($_.Exception.Message)",
+    "$code = 1",
+    "}",
     "exit $code"
-  ].join("; ");
+  ].join("\n");
   return Buffer.from(wrapped, "utf16le").toString("base64");
 }
 function buildCommandEnvironment() {
@@ -1943,6 +1950,26 @@ var init_launch = __esm({
   }
 });
 
+// src/utils/commandRunner/output.ts
+function normalizeCommandOutput(output) {
+  if (!output.includes("#< CLIXML")) {
+    return output;
+  }
+  const errors = [...output.matchAll(/<S\s+S="Error">([\s\S]*?)<\/S>/g)].map((match) => decodePowerShellText(match[1] ?? "")).map((line) => line.trimEnd()).filter(Boolean);
+  if (errors.length === 0) {
+    return output;
+  }
+  return errors.join("\n").replace(/\n{3,}/g, "\n\n").trim();
+}
+function decodePowerShellText(value) {
+  return value.replace(/_x000D__x000A_/g, "\n").replace(/_x000D_/g, "\r").replace(/_x000A_/g, "\n").replace(/_x0009_/g, "	").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, "&");
+}
+var init_output = __esm({
+  "src/utils/commandRunner/output.ts"() {
+    "use strict";
+  }
+});
+
 // src/extensions/tools/background/tools/backgroundRun.ts
 function createBackgroundOutputTracker(onOutput) {
   let buffer = "";
@@ -1978,6 +2005,7 @@ var init_backgroundRun = __esm({
   "src/extensions/tools/background/tools/backgroundRun.ts"() {
     "use strict";
     init_launch();
+    init_output();
     init_fs();
     init_shared2();
     init_background();
@@ -2016,9 +2044,10 @@ var init_backgroundRun = __esm({
         registerBackgroundProcess(job.id, subprocess);
         store.markRunning(job.id, { pid: subprocess.pid ?? 0 });
         const outputTracker = createBackgroundOutputTracker((output) => {
+          const normalizedOutput = normalizeCommandOutput(output);
           store.updateRunningOutput(job.id, {
-            output,
-            summary: summarizeBackgroundOutput(output),
+            output: normalizedOutput,
+            summary: summarizeBackgroundOutput(normalizedOutput),
             lastOutputAt: (/* @__PURE__ */ new Date()).toISOString()
           });
         });
@@ -2028,7 +2057,7 @@ var init_backgroundRun = __esm({
         void subprocess.then(async (result) => {
           outputTracker.flush();
           const running2 = store.load(job.id);
-          const resultOutput = typeof result.all === "string" ? result.all : "";
+          const resultOutput = normalizeCommandOutput(typeof result.all === "string" ? result.all : "");
           const output = resultOutput || running2?.output || "";
           store.close(job.id, {
             status: result.exitCode === 0 ? "completed" : "failed",
@@ -2040,7 +2069,7 @@ var init_backgroundRun = __esm({
         }, async (error) => {
           outputTracker.flush();
           const running2 = store.load(job.id);
-          const errorOutput = typeof error.all === "string" ? error.all : "";
+          const errorOutput = normalizeCommandOutput(typeof error.all === "string" ? error.all : "");
           const output = errorOutput || running2?.output || String(error.message);
           store.close(job.id, {
             status: "failed",
@@ -3878,439 +3907,17 @@ var init_outputCapture = __esm({
   }
 });
 
-// src/utils/commandRunner/platformArgs.ts
-function splitByAndAnd(command) {
-  const segments = [];
-  let current = "";
-  let inSingle = false;
-  let inDouble = false;
-  for (let index = 0; index < command.length; index += 1) {
-    const char = command.charAt(index);
-    if (char === "'" && !inDouble) {
-      inSingle = !inSingle;
-      current += char;
-      continue;
-    }
-    if (char === '"' && !inSingle) {
-      inDouble = !inDouble;
-      current += char;
-      continue;
-    }
-    if (!inSingle && !inDouble && char === "&" && command.charAt(index + 1) === "&") {
-      if (current.trim()) {
-        segments.push(current.trim());
-      }
-      current = "";
-      index += 1;
-      continue;
-    }
-    current += char;
-  }
-  if (current.trim()) {
-    segments.push(current.trim());
-  }
-  return segments.length > 0 ? segments : [command];
-}
-function joinWithAndSemantics(segments) {
-  if (segments.length <= 1) {
-    return segments[0] ?? "";
-  }
-  let script = segments[0] ?? "";
-  for (let index = 1; index < segments.length; index += 1) {
-    const segment = segments[index];
-    script += `; if ($?) { ${segment} }`;
-  }
-  return script;
-}
-function splitArgs(command) {
-  const args = [];
-  let current = "";
-  let inSingle = false;
-  let inDouble = false;
-  for (let index = 0; index < command.length; index += 1) {
-    const char = command.charAt(index);
-    if (char === "'" && !inDouble) {
-      inSingle = !inSingle;
-      continue;
-    }
-    if (char === '"' && !inSingle) {
-      inDouble = !inDouble;
-      continue;
-    }
-    if (!inSingle && !inDouble && /\s/.test(char)) {
-      if (current) {
-        args.push(current);
-        current = "";
-      }
-      continue;
-    }
-    current += char;
-  }
-  if (current) {
-    args.push(current);
-  }
-  return args;
-}
-function expandPaths(paths) {
-  return paths.flatMap((targetPath) => expandBraces(targetPath));
-}
-function normalizeWindowsPath(value) {
-  if (value.includes("://")) {
-    return value;
-  }
-  return value.replace(/\//g, "\\");
-}
-function quotePowerShell(value) {
-  const escaped = value.replace(/'/g, "''");
-  return `'${escaped}'`;
-}
-function expandBraces(input) {
-  const start = findBraceStart(input);
-  if (start === -1) {
-    return [input];
-  }
-  const end = findMatchingBrace(input, start);
-  if (end === -1) {
-    return [input];
-  }
-  const prefix = input.slice(0, start);
-  const suffix = input.slice(end + 1);
-  const body = input.slice(start + 1, end);
-  const parts = splitBraceParts(body);
-  const expandedSuffix = expandBraces(suffix);
-  const results = [];
-  for (const part of parts) {
-    for (const expandedPart of expandBraces(part)) {
-      for (const tail of expandedSuffix) {
-        results.push(`${prefix}${expandedPart}${tail}`);
-      }
-    }
-  }
-  return results;
-}
-function findBraceStart(input) {
-  let inSingle = false;
-  let inDouble = false;
-  for (let index = 0; index < input.length; index += 1) {
-    const char = input.charAt(index);
-    if (char === "'" && !inDouble) {
-      inSingle = !inSingle;
-      continue;
-    }
-    if (char === '"' && !inSingle) {
-      inDouble = !inDouble;
-      continue;
-    }
-    if (!inSingle && !inDouble && char === "{") {
-      return index;
-    }
-  }
-  return -1;
-}
-function findMatchingBrace(input, start) {
-  let depth = 0;
-  let inSingle = false;
-  let inDouble = false;
-  for (let index = start; index < input.length; index += 1) {
-    const char = input.charAt(index);
-    if (char === "'" && !inDouble) {
-      inSingle = !inSingle;
-      continue;
-    }
-    if (char === '"' && !inSingle) {
-      inDouble = !inDouble;
-      continue;
-    }
-    if (inSingle || inDouble) {
-      continue;
-    }
-    if (char === "{") {
-      depth += 1;
-    } else if (char === "}") {
-      depth -= 1;
-      if (depth === 0) {
-        return index;
-      }
-    }
-  }
-  return -1;
-}
-function splitBraceParts(input) {
-  const parts = [];
-  let current = "";
-  let depth = 0;
-  for (let index = 0; index < input.length; index += 1) {
-    const char = input.charAt(index);
-    if (char === "{") {
-      depth += 1;
-      current += char;
-      continue;
-    }
-    if (char === "}") {
-      depth -= 1;
-      current += char;
-      continue;
-    }
-    if (char === "," && depth === 0) {
-      parts.push(current);
-      current = "";
-      continue;
-    }
-    current += char;
-  }
-  if (current) {
-    parts.push(current);
-  }
-  return parts.length > 0 ? parts : [input];
-}
-var init_platformArgs = __esm({
-  "src/utils/commandRunner/platformArgs.ts"() {
-    "use strict";
-  }
-});
-
-// src/utils/commandRunner/platformTransforms.ts
-function startsWithExplicitShell(command) {
-  return /^\s*(cmd(?:\.exe)?\s+\/c|powershell(?:\.exe)?\b|pwsh\b|bash\b)/i.test(command);
-}
-function normalizeWindowsSegment(segment) {
-  const trimmed = segment.trim();
-  if (!trimmed) {
-    return segment;
-  }
-  const lowered = trimmed.toLowerCase();
-  if (lowered.startsWith("get-childitem") || lowered.startsWith("new-item")) {
-    return segment;
-  }
-  if (lowered.startsWith("ls")) {
-    return normalizeLsSegment(trimmed);
-  }
-  if (lowered.startsWith("mkdir") || lowered.startsWith("md ")) {
-    return normalizeMkdirSegment(trimmed);
-  }
-  if (lowered.startsWith("rm ")) {
-    return normalizeRemoveSegment(trimmed);
-  }
-  if (lowered.startsWith("cp ")) {
-    return normalizeCopySegment(trimmed);
-  }
-  if (lowered.startsWith("mv ")) {
-    return normalizeMoveSegment(trimmed);
-  }
-  if (lowered.startsWith("touch ")) {
-    return normalizeTouchSegment(trimmed);
-  }
-  if (lowered.startsWith("cat ")) {
-    return normalizeCatSegment(trimmed);
-  }
-  return segment;
-}
-function normalizeLsSegment(segment) {
-  const args = splitArgs(segment).slice(1);
-  const flags = args.filter((arg) => arg.startsWith("-"));
-  const paths = args.filter((arg) => !arg.startsWith("-"));
-  const force = flags.some((flag) => flag.includes("a"));
-  const targetPath = paths[0];
-  let command = "Get-ChildItem";
-  if (force) {
-    command += " -Force";
-  }
-  if (targetPath) {
-    command += ` -LiteralPath ${quotePowerShell(normalizeWindowsPath(targetPath))}`;
-  }
-  return command;
-}
-function normalizeMkdirSegment(segment) {
-  const args = splitArgs(segment);
-  if (args.length <= 1) {
-    return segment;
-  }
-  const rest = args.slice(1);
-  let hasParents = false;
-  const paths = rest.filter((arg) => {
-    const lowered = arg.toLowerCase();
-    if (lowered === "-p" || lowered === "--parents") {
-      hasParents = true;
-      return false;
-    }
-    return true;
-  });
-  const needsNormalization = hasParents || paths.some((targetPath) => targetPath.includes("{"));
-  if (!needsNormalization) {
-    return segment;
-  }
-  const expanded = expandPaths(paths);
-  if (expanded.length === 0) {
-    return segment;
-  }
-  const normalizedPaths = expanded.map((targetPath) => quotePowerShell(normalizeWindowsPath(targetPath)));
-  return `New-Item -ItemType Directory -Force -Path ${normalizedPaths.join(", ")}`;
-}
-function normalizeRemoveSegment(segment) {
-  const args = splitArgs(segment);
-  if (args.length <= 1) {
-    return segment;
-  }
-  const flags = args.slice(1).filter((arg) => arg.startsWith("-"));
-  const paths = args.slice(1).filter((arg) => !arg.startsWith("-"));
-  if (paths.length === 0) {
-    return segment;
-  }
-  const recurse = flags.some((flag) => /r/i.test(flag));
-  const force = flags.some((flag) => /f/i.test(flag));
-  let command = "Remove-Item";
-  if (recurse) {
-    command += " -Recurse";
-  }
-  if (force) {
-    command += " -Force";
-  }
-  command += ` -LiteralPath ${paths.map((targetPath) => quotePowerShell(normalizeWindowsPath(targetPath))).join(", ")}`;
-  return command;
-}
-function normalizeCopySegment(segment) {
-  const args = splitArgs(segment);
-  if (args.length < 3) {
-    return segment;
-  }
-  const flags = args.slice(1).filter((arg) => arg.startsWith("-"));
-  const paths = args.slice(1).filter((arg) => !arg.startsWith("-"));
-  if (paths.length < 2) {
-    return segment;
-  }
-  const recurse = flags.some((flag) => /r/i.test(flag));
-  const force = flags.some((flag) => /f/i.test(flag));
-  const destination = paths[paths.length - 1];
-  if (!destination) {
-    return segment;
-  }
-  const sources = paths.slice(0, -1);
-  let command = "Copy-Item";
-  if (recurse) {
-    command += " -Recurse";
-  }
-  if (force) {
-    command += " -Force";
-  }
-  command += ` -Path ${sources.map((targetPath) => quotePowerShell(normalizeWindowsPath(targetPath))).join(", ")}`;
-  command += ` -Destination ${quotePowerShell(normalizeWindowsPath(destination))}`;
-  return command;
-}
-function normalizeMoveSegment(segment) {
-  const args = splitArgs(segment);
-  if (args.length < 3) {
-    return segment;
-  }
-  const flags = args.slice(1).filter((arg) => arg.startsWith("-"));
-  const paths = args.slice(1).filter((arg) => !arg.startsWith("-"));
-  if (paths.length < 2) {
-    return segment;
-  }
-  const force = flags.some((flag) => /f/i.test(flag));
-  const destination = paths[paths.length - 1];
-  if (!destination) {
-    return segment;
-  }
-  const sources = paths.slice(0, -1);
-  let command = "Move-Item";
-  if (force) {
-    command += " -Force";
-  }
-  command += ` -Path ${sources.map((targetPath) => quotePowerShell(normalizeWindowsPath(targetPath))).join(", ")}`;
-  command += ` -Destination ${quotePowerShell(normalizeWindowsPath(destination))}`;
-  return command;
-}
-function normalizeTouchSegment(segment) {
-  const args = splitArgs(segment).slice(1);
-  if (args.length === 0) {
-    return segment;
-  }
-  const expanded = expandPaths(args);
-  if (expanded.length === 0) {
-    return segment;
-  }
-  const paths = expanded.map((targetPath) => quotePowerShell(normalizeWindowsPath(targetPath)));
-  return `New-Item -ItemType File -Force -Path ${paths.join(", ")}`;
-}
-function normalizeCatSegment(segment) {
-  const args = splitArgs(segment).slice(1);
-  if (args.length === 0) {
-    return segment;
-  }
-  const targetPath = args[0];
-  if (!targetPath) {
-    return segment;
-  }
-  return `Get-Content -LiteralPath ${quotePowerShell(normalizeWindowsPath(targetPath))}`;
-}
-var init_platformTransforms = __esm({
-  "src/utils/commandRunner/platformTransforms.ts"() {
-    "use strict";
-    init_platformArgs();
-  }
-});
-
-// src/utils/commandRunner/platform.ts
-function normalizeCommandForPlatform(command) {
-  if (process.platform !== "win32") {
-    return command;
-  }
-  const trimmed = command.trim();
-  if (!trimmed) {
-    return command;
-  }
-  const normalized = normalizeWindowsCommand(trimmed);
-  return normalizeNpmCommandNames(normalized);
-}
-function normalizeWindowsCommand(command) {
-  if (startsWithExplicitShell(command)) {
-    return command;
-  }
-  const segments = splitByAndAnd(command);
-  const normalizedSegments = segments.map((segment) => normalizeWindowsSegment(segment));
-  return joinWithAndSemantics(normalizedSegments);
-}
-function normalizeNpmCommandNames(command) {
-  const commandNames = {
-    npm: "npm.cmd",
-    npx: "npx.cmd",
-    pnpm: "pnpm.cmd",
-    yarn: "yarn.cmd"
-  };
-  const pattern = /(^|[;&|]|\&\&)\s*(npm|npx|pnpm|yarn)(?=\s|$)/gi;
-  return command.replace(pattern, (match, prefix, tool) => {
-    const replacement = commandNames[String(tool).toLowerCase()];
-    if (!replacement) {
-      return match;
-    }
-    if (!prefix) {
-      return replacement;
-    }
-    return `${prefix} ${replacement}`;
-  });
-}
-var init_platform = __esm({
-  "src/utils/commandRunner/platform.ts"() {
-    "use strict";
-    init_platformArgs();
-    init_platformTransforms();
-  }
-});
-
 // src/utils/commandRunner/run.ts
 async function runCommandWithPolicy(options) {
-  const normalizedCommand = normalizeCommandForPlatform(options.command);
-  return runCommandOnce({
-    ...options,
-    command: normalizedCommand
-  });
+  return runCommandOnce(options);
 }
 async function runCommandOnce(options) {
   const start = Date.now();
   let stalled = false;
   let stallTimer = null;
   let forceKillTimer = null;
-  const { subprocess } = await launchCommand(options.command, options.cwd, options.timeoutMs, options.abortSignal);
+  const launched = await launchCommand(options.command, options.cwd, options.timeoutMs, options.abortSignal);
+  const { subprocess } = launched;
   const outputCapture = await createBashOutputCapture(options.outputCapture ?? {});
   const clearTimers = () => {
     if (stallTimer) {
@@ -4363,9 +3970,11 @@ async function runCommandOnce(options) {
     const result = await subprocess;
     clearTimers();
     const shellOutput = await outputCapture.finalize();
+    const output = normalizeCommandOutput(shellOutput.outputPreview);
     return {
+      command: options.command,
       exitCode: typeof result.exitCode === "number" ? result.exitCode : null,
-      output: shellOutput.outputPreview,
+      output,
       outputPath: shellOutput.outputPath,
       truncated: shellOutput.truncated,
       outputChars: shellOutput.outputChars,
@@ -4380,9 +3989,12 @@ async function runCommandOnce(options) {
     const timedOut = isTimedOutError(error);
     clearTimers();
     const shellOutput = await outputCapture.finalize();
+    const fallbackOutput = shellOutput.outputChars > 0 ? shellOutput.outputPreview : readProcessOutput(error);
+    const output = normalizeCommandOutput(fallbackOutput);
     return {
+      command: options.command,
       exitCode: readExitCode(error),
-      output: shellOutput.outputChars > 0 ? shellOutput.outputPreview : readProcessOutput(error),
+      output,
       outputPath: shellOutput.outputPath,
       truncated: shellOutput.truncated,
       outputChars: shellOutput.outputChars,
@@ -4423,7 +4035,7 @@ var init_run = __esm({
     init_abort();
     init_outputCapture();
     init_launch();
-    init_platform();
+    init_output();
     STALL_KILL_TIMEOUT_MS = 5e3;
   }
 });
@@ -14033,7 +13645,7 @@ var init_bash = __esm({
         const status = result.aborted ? "aborted" : result.stalled ? "stalled" : result.timedOut ? "timed_out" : result.exitCode === 0 ? "completed" : "failed";
         const outputGovernance = governToolOutput({
           toolName: "bash",
-          command,
+          command: result.command,
           status,
           exitCode: result.exitCode,
           durationMs: result.durationMs,
@@ -14061,7 +13673,7 @@ var init_bash = __esm({
         return okResult(
           JSON.stringify(
             {
-              command,
+              command: result.command,
               cwd: resolvedCwd,
               exitCode: result.exitCode,
               status,
@@ -226409,6 +226021,63 @@ var init_toolBatch = __esm({
   }
 });
 
+// src/session/events.ts
+var events_exports = {};
+__export(events_exports, {
+  SessionEventStore: () => SessionEventStore
+});
+function createEventId() {
+  return `${(/* @__PURE__ */ new Date()).toISOString().replace(/[-:.TZ]/g, "").slice(0, 14)}-${Math.random().toString(16).slice(2, 10)}`;
+}
+function sanitizeSessionId2(sessionId) {
+  return sessionId.replace(/[^a-zA-Z0-9_.-]/g, "_");
+}
+var import_promises30, import_node_path42, SessionEventStore;
+var init_events = __esm({
+  "src/session/events.ts"() {
+    "use strict";
+    import_promises30 = __toESM(require("fs/promises"));
+    import_node_path42 = __toESM(require("path"));
+    SessionEventStore = class {
+      constructor(eventsDir) {
+        this.eventsDir = eventsDir;
+      }
+      async append(event) {
+        const record = {
+          id: createEventId(),
+          createdAt: event.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+          type: event.type,
+          sessionId: event.sessionId,
+          cwd: event.cwd,
+          host: event.host,
+          message: event.message,
+          details: event.details
+        };
+        await import_promises30.default.mkdir(this.eventsDir, { recursive: true });
+        await import_promises30.default.appendFile(this.getSessionEventPath(event.sessionId), `${JSON.stringify(record)}
+`, "utf8");
+        return record;
+      }
+      async list(sessionId, limit = 100) {
+        const filePath = this.getSessionEventPath(sessionId);
+        let raw = "";
+        try {
+          raw = await import_promises30.default.readFile(filePath, "utf8");
+        } catch (error) {
+          if (error.code === "ENOENT") {
+            return [];
+          }
+          throw error;
+        }
+        return raw.split(/\r?\n/).filter(Boolean).map((line) => JSON.parse(line)).slice(-limit);
+      }
+      getSessionEventPath(sessionId) {
+        return import_node_path42.default.join(this.eventsDir, `${sanitizeSessionId2(sessionId)}.jsonl`);
+      }
+    };
+  }
+});
+
 // src/agent/turn/toolFailure.ts
 function readToolFailureError(output) {
   try {
@@ -226449,9 +226118,16 @@ async function processToolCallBatch(input) {
   const batchToolMessages = [];
   const batchModelOutputs = [];
   const batchChangedPaths = /* @__PURE__ */ new Set();
+  const sessionEvents = new SessionEventStore(options.config.paths.eventsDir);
   const leadWaitExecutionsBefore = identity.kind === "lead" ? listLeadWaitExecutions(projectContext.stateRootDir) : [];
   for (const toolCall of response.toolCalls) {
     throwIfAborted(options.abortSignal, "Turn aborted by user.");
+    await sessionEvents.append({
+      type: "tool.started",
+      sessionId: session.id,
+      cwd: options.cwd,
+      details: buildToolStartedEventDetails(toolCall, identity)
+    });
     options.callbacks?.onToolCall?.(toolCall.function.name, toolCall.function.arguments);
     await recordObservabilityEvent(projectContext.stateRootDir, {
       event: "tool.execution",
@@ -226485,6 +226161,7 @@ async function processToolCallBatch(input) {
     } else if (metadata?.sessionDiff) {
       session = await options.sessionStore.save(noteSessionDiff(session, metadata.sessionDiff));
     }
+    const failureError = result.ok ? void 0 : readToolFailureError(result.output);
     await recordObservabilityEvent(projectContext.stateRootDir, {
       event: "tool.execution",
       status: result.ok ? "completed" : "failed",
@@ -226493,11 +226170,23 @@ async function processToolCallBatch(input) {
       identityName: identity.name,
       toolName: toolCall.function.name,
       durationMs,
-      error: result.ok ? void 0 : readToolFailureError(result.output),
+      error: failureError,
       details: {
         changedPathCount: metadata?.changedPaths?.length ?? 0
       }
     });
+    await sessionEvents.append({
+      type: result.ok ? "tool.completed" : "tool.failed",
+      sessionId: session.id,
+      cwd: options.cwd,
+      details: buildToolFinishedEventDetails({
+        toolCall,
+        identity,
+        durationMs,
+        changedPathCount: metadata?.changedPaths?.length ?? 0,
+        error: failureError ? formatToolFailureError(failureError) : void 0
+      })
+    });
     if (metadata?.outputGovernance) {
       await recordObservabilityEvent(projectContext.stateRootDir, {
         event: "tool.output",
@@ -226591,6 +226280,33 @@ async function processToolCallBatch(input) {
     }
   };
 }
+function buildToolStartedEventDetails(toolCall, identity) {
+  return {
+    toolName: toolCall.function.name,
+    toolCallId: toolCall.id,
+    identityKind: identity.kind,
+    identityName: identity.name,
+    argumentsPreview: previewToolArguments(toolCall.function.arguments)
+  };
+}
+function buildToolFinishedEventDetails(input) {
+  return {
+    toolName: input.toolCall.function.name,
+    toolCallId: input.toolCall.id,
+    identityKind: input.identity.kind,
+    identityName: input.identity.name,
+    durationMs: input.durationMs,
+    changedPathCount: input.changedPathCount,
+    error: input.error
+  };
+}
+function previewToolArguments(rawArgs) {
+  const normalized = rawArgs.replace(/\s+/g, " ").trim();
+  return normalized.length > 240 ? `${normalized.slice(0, 237)}...` : normalized;
+}
+function formatToolFailureError(error) {
+  return error.code ? `${error.code}: ${error.message}` : error.message;
+}
 var init_toolBatchLifecycle = __esm({
   "src/agent/turn/toolBatchLifecycle.ts"() {
     "use strict";
@@ -226603,6 +226319,7 @@ var init_toolBatchLifecycle = __esm({
     init_persistence();
     init_toolBatch();
     init_writer();
+    init_events();
     init_abort();
     init_toolFailure();
   }
@@ -226718,13 +226435,13 @@ function createChangeId() {
   const random = import_node_crypto4.default.randomUUID().slice(0, 8);
   return `${date}-${random}`;
 }
-var import_node_crypto4, import_promises30, import_node_path42, ChangeStore;
+var import_node_crypto4, import_promises31, import_node_path43, ChangeStore;
 var init_store5 = __esm({
   "src/agent/changes/store.ts"() {
     "use strict";
     import_node_crypto4 = __toESM(require("crypto"));
-    import_promises30 = __toESM(require("fs/promises"));
-    import_node_path42 = __toESM(require("path"));
+    import_promises31 = __toESM(require("fs/promises"));
+    import_node_path43 = __toESM(require("path"));
     ChangeStore = class {
       constructor(changesDir) {
         this.changesDir = changesDir;
@@ -226732,8 +226449,8 @@ var init_store5 = __esm({
       async record(input) {
         const id = createChangeId();
         const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-        const blobDir = import_node_path42.default.join(this.changesDir, id);
-        await import_promises30.default.mkdir(blobDir, { recursive: true });
+        const blobDir = import_node_path43.default.join(this.changesDir, id);
+        await import_promises31.default.mkdir(blobDir, { recursive: true });
         const operations = await Promise.all(
           input.operations.map(async (operation, index) => {
             const beforeSnapshotPath = await this.writeSnapshot(
@@ -226773,21 +226490,21 @@ var init_store5 = __esm({
           preview: input.preview,
           operations
         };
-        await import_promises30.default.mkdir(this.changesDir, { recursive: true });
-        await import_promises30.default.writeFile(this.getMetadataPath(id), `${JSON.stringify(record, null, 2)}
+        await import_promises31.default.mkdir(this.changesDir, { recursive: true });
+        await import_promises31.default.writeFile(this.getMetadataPath(id), `${JSON.stringify(record, null, 2)}
 `, "utf8");
         return record;
       }
       async list(limit = 20) {
-        await import_promises30.default.mkdir(this.changesDir, { recursive: true });
-        const entries = await import_promises30.default.readdir(this.changesDir, { withFileTypes: true });
+        await import_promises31.default.mkdir(this.changesDir, { recursive: true });
+        const entries = await import_promises31.default.readdir(this.changesDir, { withFileTypes: true });
         const changes = await Promise.all(
-          entries.filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map(async (entry) => this.load(import_node_path42.default.basename(entry.name, ".json")))
+          entries.filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map(async (entry) => this.load(import_node_path43.default.basename(entry.name, ".json")))
         );
         return changes.sort((left, right) => right.createdAt.localeCompare(left.createdAt)).slice(0, limit);
       }
       async load(id) {
-        const raw = await import_promises30.default.readFile(this.getMetadataPath(id), "utf8");
+        const raw = await import_promises31.default.readFile(this.getMetadataPath(id), "utf8");
         return JSON.parse(raw);
       }
       async loadLatestUndoable() {
@@ -226811,17 +226528,17 @@ var init_store5 = __esm({
           restoredPaths.push(operation.path);
           if (operation.beforeSnapshotPath) {
             const buffer = await this.readSnapshot(operation.beforeSnapshotPath);
-            await import_promises30.default.mkdir(import_node_path42.default.dirname(operation.path), { recursive: true });
-            await import_promises30.default.writeFile(operation.path, buffer);
+            await import_promises31.default.mkdir(import_node_path43.default.dirname(operation.path), { recursive: true });
+            await import_promises31.default.writeFile(operation.path, buffer);
             continue;
           }
-          await import_promises30.default.rm(operation.path, { force: true });
+          await import_promises31.default.rm(operation.path, { force: true });
         }
         const updated = {
           ...record,
           undoneAt: (/* @__PURE__ */ new Date()).toISOString()
         };
-        await import_promises30.default.writeFile(this.getMetadataPath(updated.id), `${JSON.stringify(updated, null, 2)}
+        await import_promises31.default.writeFile(this.getMetadataPath(updated.id), `${JSON.stringify(updated, null, 2)}
 `, "utf8");
         return {
           record: updated,
@@ -226829,19 +226546,19 @@ var init_store5 = __esm({
         };
       }
       getMetadataPath(id) {
-        return import_node_path42.default.join(this.changesDir, `${id}.json`);
+        return import_node_path43.default.join(this.changesDir, `${id}.json`);
       }
       async writeSnapshot(blobDir, label, buffer) {
         if (!buffer) {
           return void 0;
         }
         const fileName = `${label}.bin`;
-        const absolutePath = import_node_path42.default.join(blobDir, fileName);
-        await import_promises30.default.writeFile(absolutePath, buffer);
-        return import_node_path42.default.relative(this.changesDir, absolutePath);
+        const absolutePath = import_node_path43.default.join(blobDir, fileName);
+        await import_promises31.default.writeFile(absolutePath, buffer);
+        return import_node_path43.default.relative(this.changesDir, absolutePath);
       }
       async readSnapshot(relativePath) {
-        return import_promises30.default.readFile(import_node_path42.default.join(this.changesDir, relativePath));
+        return import_promises31.default.readFile(import_node_path43.default.join(this.changesDir, relativePath));
       }
     };
   }
@@ -227233,14 +226950,14 @@ async function recordHostTurnFinished(rootDir, input) {
   });
 }
 function resolveHostStateRoot(stateDir, fallbackCwd) {
-  const kittyDir = import_node_path43.default.dirname(stateDir);
-  return import_node_path43.default.basename(kittyDir).toLowerCase() === PROJECT_STATE_DIR_NAME ? import_node_path43.default.dirname(kittyDir) : fallbackCwd;
+  const kittyDir = import_node_path44.default.dirname(stateDir);
+  return import_node_path44.default.basename(kittyDir).toLowerCase() === PROJECT_STATE_DIR_NAME ? import_node_path44.default.dirname(kittyDir) : fallbackCwd;
 }
-var import_node_path43, QueuedHostMessageRecorder;
+var import_node_path44, QueuedHostMessageRecorder;
 var init_hostEvents = __esm({
   "src/observability/hostEvents.ts"() {
     "use strict";
-    import_node_path43 = __toESM(require("path"));
+    import_node_path44 = __toESM(require("path"));
     init_writer();
     init_statePaths();
     QueuedHostMessageRecorder = class {
@@ -227270,63 +226987,6 @@ var init_hostEvents = __esm({
   }
 });
 
-// src/session/events.ts
-var events_exports = {};
-__export(events_exports, {
-  SessionEventStore: () => SessionEventStore
-});
-function createEventId() {
-  return `${(/* @__PURE__ */ new Date()).toISOString().replace(/[-:.TZ]/g, "").slice(0, 14)}-${Math.random().toString(16).slice(2, 10)}`;
-}
-function sanitizeSessionId2(sessionId) {
-  return sessionId.replace(/[^a-zA-Z0-9_.-]/g, "_");
-}
-var import_promises31, import_node_path44, SessionEventStore;
-var init_events = __esm({
-  "src/session/events.ts"() {
-    "use strict";
-    import_promises31 = __toESM(require("fs/promises"));
-    import_node_path44 = __toESM(require("path"));
-    SessionEventStore = class {
-      constructor(eventsDir) {
-        this.eventsDir = eventsDir;
-      }
-      async append(event) {
-        const record = {
-          id: createEventId(),
-          createdAt: event.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-          type: event.type,
-          sessionId: event.sessionId,
-          cwd: event.cwd,
-          host: event.host,
-          message: event.message,
-          details: event.details
-        };
-        await import_promises31.default.mkdir(this.eventsDir, { recursive: true });
-        await import_promises31.default.appendFile(this.getSessionEventPath(event.sessionId), `${JSON.stringify(record)}
-`, "utf8");
-        return record;
-      }
-      async list(sessionId, limit = 100) {
-        const filePath = this.getSessionEventPath(sessionId);
-        let raw = "";
-        try {
-          raw = await import_promises31.default.readFile(filePath, "utf8");
-        } catch (error) {
-          if (error.code === "ENOENT") {
-            return [];
-          }
-          throw error;
-        }
-        return raw.split(/\r?\n/).filter(Boolean).map((line) => JSON.parse(line)).slice(-limit);
-      }
-      getSessionEventPath(sessionId) {
-        return import_node_path44.default.join(this.eventsDir, `${sanitizeSessionId2(sessionId)}.jsonl`);
-      }
-    };
-  }
-});
-
 // src/host/toolRegistry.ts
 async function createHostToolRegistry(config, options = {}) {
   const extraTools = options.extraTools ?? [];
@@ -231040,7 +230700,7 @@ function createCliOutputPort() {
     }
   };
 }
-var init_output = __esm({
+var init_output2 = __esm({
   "src/shell/cli/output.ts"() {
     "use strict";
     init_console();
@@ -231387,7 +231047,7 @@ function createCliInteractionShell() {
 var init_shell = __esm({
   "src/shell/cli/shell.ts"() {
     "use strict";
-    init_output();
+    init_output2();
     init_readlineInput();
     init_turnDisplay();
   }
@@ -231641,6 +231301,9 @@ function formatSessionEventsForCli(result) {
   return result.events.map(formatSessionEventForCli).join("\n");
 }
 function formatSessionEventForCli(event) {
+  if (isToolEvent(event)) {
+    return formatToolEventForCli(event);
+  }
   const parts = [
     event.createdAt,
     event.type,
@@ -231650,10 +231313,39 @@ function formatSessionEventForCli(event) {
   ];
   return parts.filter(Boolean).join("  ");
 }
+function formatToolEventForCli(event) {
+  const details = event.details ?? {};
+  const toolName = readString7(details.toolName);
+  const toolCallId = readString7(details.toolCallId);
+  const durationMs = readNumber3(details.durationMs);
+  const changedPathCount = readNumber3(details.changedPathCount);
+  const error = readString7(details.error);
+  const parts = [
+    event.createdAt,
+    event.type,
+    toolName ? `tool=${toolName}` : void 0,
+    toolCallId ? `call=${toolCallId}` : void 0,
+    durationMs === void 0 ? void 0 : `duration=${durationMs}ms`,
+    changedPathCount === void 0 ? void 0 : `changed=${changedPathCount}`,
+    error ? `error=${formatInline(error)}` : void 0,
+    event.host ? `host=${event.host}` : void 0,
+    event.message ? `message=${formatInline(event.message)}` : void 0
+  ];
+  return parts.filter(Boolean).join("  ");
+}
+function isToolEvent(event) {
+  return event.type === "tool.started" || event.type === "tool.completed" || event.type === "tool.failed";
+}
 function formatInline(value) {
   const normalized = value.replace(/\s+/g, " ").trim();
   return normalized.length > 120 ? `${normalized.slice(0, 117)}...` : normalized;
 }
+function readString7(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function readNumber3(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
 var init_events3 = __esm({
   "src/cli/commands/events.ts"() {
     "use strict";