@mono-agent/agent-runtime 0.6.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mono-agent/agent-runtime",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Agent runtime supporting Claude SDK, Claude CLI, Codex CLI, and PI SDK out of the box",
   "type": "module",
   "license": "GPL-3.0-only",

package/src/agent/tools/pi-bridge.js

@@ -18,8 +18,6 @@ import {
   writeToolImpl,
 } from "./index.js";
 import {
-  createFileEditToolResultEvent,
-  createFileEditToolUseEvent,
   fileChangeSummary,
   readFileChangeSnapshot,
   statsForCompletedChange,
@@ -165,19 +163,18 @@ function compactRawMcpResult(out) {
   };
 }
 
-/**
- * @param {any} change
- * @param {{status?: any, before?: any, after?: any, error?: any}} [options]
- */
-function fileEditPayload(change, { status, before, after, error } = {}) {
+function writeFileChangeDetails(path, before, after) {
+  const change = {
+    path,
+    kind: before && before.exists ? "update" : "add",
+  };
   const lineStats = statsForCompletedChange(change, before, after);
   const completedChange = lineStats ? { ...change, line_stats: lineStats } : change;
   const summary = fileChangeSummary([completedChange]);
   return {
+    status: "completed",
     changes: [completedChange],
-    status,
     ...(summary ? { summary } : {}),
-    ...(error ? { error } : {}),
   };
 }
 
@@ -262,24 +259,8 @@ function createBuiltinTool(name, label, description, parameters, execute, { cwd,
       if (name === "Bash" && toolPolicy?.bashReadOnly && !isReadOnlyShellCommand(normalized.command)) {
         throw new Error("Error: Planning shell policy allows only read-only inspection commands.");
       }
-      const isFileEdit = name === "Write" || name === "Edit";
-      let editState = null;
-      if (isFileEdit && normalized.file_path) {
-        const before = readFileChangeSnapshot(normalized.file_path);
-        editState = {
-          path: normalized.file_path,
-          before,
-          change: {
-            path: normalized.file_path,
-            kind: name === "Write" && before && !before.exists ? "add" : "update",
-          },
-        };
-        onEvent?.(createFileEditToolUseEvent(`file_edit:${toolCallId}`, {
-          changes: [editState.change],
-          status: "in_progress",
-        }));
-      }
-
+      const shouldTrackWrite = name === "Write" && typeof normalized.file_path === "string" && normalized.file_path.length > 0;
+      const beforeWrite = shouldTrackWrite ? readFileChangeSnapshot(normalized.file_path) : null;
       const raw = await execute(normalized, { signal, sandboxPolicy, sandboxEngine, ctx });
       // Image reads (e.g. Read on a .png) come back as a structured image
       // result so vision models see pixels; emit an image content block and let
@@ -288,22 +269,12 @@ function createBuiltinTool(name, label, description, parameters, execute, { cwd,
         return imageResult(raw.data, raw.mimeType, { tool: name, params: normalized });
       }
       const text = toolText(raw);
-      if (isFileEdit && editState) {
-        const failed = isErrorText(text);
-        const after = readFileChangeSnapshot(editState.path);
-        onEvent?.(createFileEditToolResultEvent(
-          `file_edit:${toolCallId}`,
-          fileEditPayload(editState.change, {
-            status: failed ? "failed" : "completed",
-            before: editState.before,
-            after,
-            error: failed ? text : null,
-          }),
-          { isError: failed },
-        ));
-      }
       if (isErrorText(text)) throw new Error(text);
-      return textResult(text, { tool: name, params: normalized });
+      const details = { tool: name, params: normalized };
+      if (shouldTrackWrite) {
+        details.file_change = writeFileChangeDetails(normalized.file_path, beforeWrite, readFileChangeSnapshot(normalized.file_path));
+      }
+      return textResult(text, details);
     },
   };
 }

package/src/ai/file-change-stats.js

@@ -211,24 +211,3 @@ export function createFileChangePayload(raw, { cwd = process.cwd(), snapshots =
     ...(summary ? { summary } : {}),
   };
 }
-
-export function createFileEditToolUseEvent(id, payload) {
-  return {
-    type: "assistant",
-    message: { content: [{ type: "tool_use", id, name: "file_edit", input: payload }] },
-  };
-}
-
-export function createFileEditToolResultEvent(id, payload, { isError = false } = {}) {
-  return {
-    type: "user",
-    message: {
-      content: [{
-        type: "tool_result",
-        tool_use_id: id,
-        content: payload,
-        is_error: isError,
-      }],
-    },
-  };
-}

package/src/ai/providers/claude-sdk.js

@@ -1,13 +1,5 @@
 import { query } from "@anthropic-ai/claude-agent-sdk";
 import { randomUUID } from "node:crypto";
-import { resolve } from "node:path";
-import {
-  createFileEditToolResultEvent,
-  createFileEditToolUseEvent,
-  fileChangeSummary,
-  readFileChangeSnapshot,
-  statsForCompletedChange,
-} from "../file-change-stats.js";
 import { formatLiveInputGuidance } from "../live-input-prompt.js";
 import { estimateCost } from "../cost.js";
 import { modelWithContextWindow } from "../runtime/context-windows.js";
@@ -209,8 +201,6 @@ function structuredOutputRejectionFromEvent(event) {
   return /structured output|required schema|did not match schema|schema violation/i.test(result) ? result : null;
 }
 
-const CLAUDE_FILE_EDIT_MATCHER = "Edit|Write|NotebookEdit";
-
 function mergeHookMatchers(existing = {}, additions = {}) {
   const merged = {};
   for (const [name, groups] of Object.entries(existing || {})) {
@@ -291,122 +281,7 @@ export function toolPayloadLimit(options) {
   return { bytes: MAX_TOOL_RESULT_BYTES, usedSettings: false };
 }
 
-function claudeEditPath(toolName, toolInput) {
-  const input = objectInput(toolInput);
-  if (toolName === "NotebookEdit") return input.notebook_path || input.file_path || "";
-  return input.file_path || "";
-}
-
-function claudeEditKind(toolName, before) {
-  if (toolName === "Write" && before && !before.exists) return "add";
-  return "update";
-}
-
-function fileEditStateKey(input, toolUseID, path) {
-  return toolUseID || input?.tool_use_id || input?.toolUseID || `${input?.tool_name || "file_edit"}:${path}`;
-}
-
-/**
- * @param {any} change
- * @param {{status?: any, before?: any, after?: any, error?: any}} [options]
- */
-function fileEditPayload(change, { status, before, after, error } = {}) {
-  const lineStats = statsForCompletedChange(change, before, after);
-  const completedChange = lineStats ? { ...change, line_stats: lineStats } : change;
-  const summary = fileChangeSummary([completedChange]);
-  return {
-    changes: [completedChange],
-    status,
-    ...(summary ? { summary } : {}),
-    ...(error ? { error } : {}),
-  };
-}
-
-function createClaudeFileEditHooks({ cwd, emitEvent }) {
-  const edits = new Map();
-  const runCwd = cwd || process.cwd();
-
-  function createState(input, toolUseID, { readBefore = true } = {}) {
-    const toolName = input?.tool_name;
-    const path = claudeEditPath(toolName, input?.tool_input);
-    if (!path) return null;
-    const resolvedPath = resolve(runCwd, path);
-    const key = fileEditStateKey(input, toolUseID, resolvedPath);
-    const before = readBefore ? readFileChangeSnapshot(resolvedPath) : null;
-    return {
-      key,
-      id: `file_edit:${key}`,
-      path: resolvedPath,
-      change: { path: resolvedPath, kind: claudeEditKind(toolName, before) },
-      before,
-      started: false,
-    };
-  }
-
-  function emitStart(state) {
-    if (!state || state.started) return;
-    emitEvent(createFileEditToolUseEvent(state.id, {
-      changes: [state.change],
-      status: "in_progress",
-    }));
-    state.started = true;
-  }
-
-  /**
-   * @param {any} input
-   * @param {any} toolUseID
-   * @param {{status?: any, error?: any}} [options]
-   */
-  function complete(input, toolUseID, { status, error } = {}) {
-    const directKey = toolUseID || input?.tool_use_id || input?.toolUseID;
-    const fallback = createState(input, toolUseID, { readBefore: false });
-    const state = (directKey && edits.get(directKey)) || (fallback?.key && edits.get(fallback.key)) || fallback;
-    if (!state) return;
-    emitStart(state);
-    const after = readFileChangeSnapshot(state.path);
-    const payload = fileEditPayload(state.change, {
-      status,
-      before: state.before,
-      after,
-      error,
-    });
-    emitEvent(createFileEditToolResultEvent(state.id, payload, { isError: status === "failed" }));
-    edits.delete(state.key);
-  }
-
-  return {
-    PreToolUse: [{
-      matcher: CLAUDE_FILE_EDIT_MATCHER,
-      hooks: [async (input, toolUseID) => {
-        const state = createState(input, toolUseID);
-        if (!state) return {};
-        edits.set(state.key, state);
-        emitStart(state);
-        return {};
-      }],
-    }],
-    PostToolUse: [{
-      matcher: CLAUDE_FILE_EDIT_MATCHER,
-      hooks: [async (input, toolUseID) => {
-        complete(input, toolUseID, { status: "completed" });
-        return {};
-      }],
-    }],
-    PostToolUseFailure: [{
-      matcher: CLAUDE_FILE_EDIT_MATCHER,
-      hooks: [async (input, toolUseID) => {
-        complete(input, toolUseID, {
-          status: "failed",
-          error: stringifyError(input?.error) || "tool failed",
-        });
-        return {};
-      }],
-    }],
-  };
-}
-
 function createClaudeRuntimeHooks({
-  cwd,
   emitEvent,
   persistArtifact,
   qaOutputDir,
@@ -414,7 +289,7 @@ function createClaudeRuntimeHooks({
   onToolUse,
   onToolResult,
 }) {
-  return mergeHookMatchers(createClaudeFileEditHooks({ cwd, emitEvent }), {
+  return {
     PreToolUse: [{
       matcher: "*",
       hooks: [async (input) => {
@@ -469,7 +344,7 @@ function createClaudeRuntimeHooks({
         return {};
       }],
     }],
-  });
+  };
 }
 
 function promptStringFromMessages(messages) {
@@ -607,7 +482,6 @@ export async function generateClaudeResponse(systemPrompt, options) {
     ...(approvalManager ? { canUseTool: createClaudeCanUseTool(approvalManager, model.model) } : {}),
     ...(nativeAgents ? { agents: nativeAgents } : {}),
     hooks: mergeHookMatchers(hooks, createClaudeRuntimeHooks({
-      cwd,
       emitEvent,
       persistArtifact,
       qaOutputDir,

package/src/ai/providers/codex-app.js

@@ -116,8 +116,7 @@ function sandboxForPermissionMode(permissionMode) {
 
 function approvalPolicyForPermissionMode(permissionMode) {
   if (permissionMode === "bypassPermissions") return "never";
-  if (permissionMode === "plan") return "on-request";
-  return "on-failure";
+  return "on-request";
 }
 
 function codexMcpConfig(mcpServers = {}) {

package/src/ai/providers/pi-native/stream-subscriber.js

@@ -25,6 +25,13 @@ export function toolStartProgressText(toolName) {
   return `Running ${toolName}...`;
 }
 
+function toolResultFileChange(result) {
+  const fileChange = result?.details?.file_change;
+  return fileChange && typeof fileChange === "object" && !Array.isArray(fileChange)
+    ? jsonSerializable(fileChange, null)
+    : null;
+}
+
 /**
  * The slice of run state the stream subscriber reads and mutates. A structural
  * subset of the orchestrator's runState.
@@ -96,6 +103,7 @@ export function createStreamSubscriber(runState, { onEvent, options, toolLimits,
       });
     } else if (event.type === "tool_execution_end") {
       const resultContent = toolResultContent(event.result);
+      const fileChange = toolResultFileChange(event.result);
       if (!event.isError) runState.toolResultsSeen += 1;
       const startedAt = runState.toolStartTimes.get(event.toolCallId);
       if (startedAt !== undefined) {
@@ -116,6 +124,7 @@ export function createStreamSubscriber(runState, { onEvent, options, toolLimits,
             tool_use_id: event.toolCallId,
             content: resultContent,
             raw_result: compactToolRawResult(jsonSerializable(event.result, resultContent), resultContent),
+            ...(fileChange === null ? {} : { file_change: fileChange }),
             is_error: !!event.isError,
           }],
         },

package/src/ai/streaming/codex-events.js

@@ -70,22 +70,14 @@ export function normalizeCodexItemEvent(raw, context = {}) {
   if (type === "file_change") {
     const id = itemId(item, "file_change");
     const payload = fileChangePayload(raw, item, context);
-    if (!isCompleted(raw)) {
-      return {
-        type: "assistant",
-        message: { content: [{ type: "tool_use", id, name: "file_edit", input: payload }] },
-      };
-    }
     return {
-      type: "user",
-      message: {
-        content: [{
-          type: "tool_result",
-          tool_use_id: id,
-          content: item.error || payload,
-          is_error: itemFailed(item),
-        }],
-      },
+      type: "file_change",
+      id,
+      status: payload.status,
+      changes: payload.changes,
+      ...(payload.summary ? { summary: payload.summary } : {}),
+      ...(item.error ? { error: item.error } : {}),
+      is_error: itemFailed(item),
     };
   }
 

package/types/ai/file-change-stats.d.ts

@@ -49,27 +49,3 @@ export function createFileChangePayload(raw: any, { cwd, snapshots }?: {
     changes: any;
     status: any;
 };
-export function createFileEditToolUseEvent(id: any, payload: any): {
-    type: string;
-    message: {
-        content: {
-            type: string;
-            id: any;
-            name: string;
-            input: any;
-        }[];
-    };
-};
-export function createFileEditToolResultEvent(id: any, payload: any, { isError }?: {
-    isError?: boolean;
-}): {
-    type: string;
-    message: {
-        content: {
-            type: string;
-            tool_use_id: any;
-            content: any;
-            is_error: boolean;
-        }[];
-    };
-};

package/types/ai/streaming/codex-events.d.ts

@@ -1,12 +1,21 @@
 export function normalizeCodexItemType(type: any): any;
 export function normalizeCodexItemEvent(raw: any, context?: {}): {
+    is_error: boolean;
+    error?: any;
+    summary?: any;
+    type: string;
+    id: any;
+    status: any;
+    changes: any;
+    message?: undefined;
+} | {
     type: string;
     message: {
         content: {
             type: string;
-            tool_use_id: any;
-            content: any;
-            is_error: boolean;
+            id: any;
+            name: any;
+            input: any;
         }[];
     };
 } | {
@@ -14,9 +23,9 @@ export function normalizeCodexItemEvent(raw: any, context?: {}): {
     message: {
         content: {
             type: string;
-            id: any;
-            name: any;
-            input: any;
+            tool_use_id: any;
+            content: any;
+            is_error: boolean;
         }[];
     };
 } | {