@cnwenf/occ 2.1.270 → 2.1.271

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.270","BUILD_TIME":"2026-07-16T08:48:02.935Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.271","BUILD_TIME":"2026-07-16T13:29:55.180Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -377369,6 +377369,243 @@ var init_UI4 = __esm(() => {
   jsx_runtime44 = __toESM(require_jsx_runtime(), 1);
 });
 
+// src/tools/GlobTool/UI.tsx
+function userFacingName4() {
+  return "Search";
+}
+function renderToolUseMessage5({
+  pattern,
+  path: path21
+}, {
+  verbose
+}) {
+  if (!pattern) {
+    return null;
+  }
+  if (!path21) {
+    return `pattern: "${pattern}"`;
+  }
+  return `pattern: "${pattern}", path: "${verbose ? path21 : getDisplayPath(path21)}"`;
+}
+function renderToolUseErrorMessage5(result, {
+  verbose
+}) {
+  if (!verbose && typeof result === "string" && extractTag(result, "tool_use_error")) {
+    const errorMessage2 = extractTag(result, "tool_use_error");
+    if (errorMessage2?.includes(FILE_NOT_FOUND_CWD_NOTE)) {
+      return /* @__PURE__ */ jsx_runtime45.jsx(MessageResponse, {
+        children: /* @__PURE__ */ jsx_runtime45.jsx(ThemedText, {
+          color: "error",
+          children: "File not found"
+        })
+      });
+    }
+    return /* @__PURE__ */ jsx_runtime45.jsx(MessageResponse, {
+      children: /* @__PURE__ */ jsx_runtime45.jsx(ThemedText, {
+        color: "error",
+        children: "Error searching files"
+      })
+    });
+  }
+  return /* @__PURE__ */ jsx_runtime45.jsx(FallbackToolUseErrorMessage, {
+    result,
+    verbose
+  });
+}
+function getToolUseSummary5(input) {
+  if (!input?.pattern) {
+    return null;
+  }
+  return truncate(input.pattern, TOOL_SUMMARY_MAX_LENGTH);
+}
+var jsx_runtime45;
+var init_UI5 = __esm(() => {
+  init_MessageResponse();
+  init_messages3();
+  init_FallbackToolUseErrorMessage();
+  init_toolLimits();
+  init_ink2();
+  init_file();
+  init_format();
+  init_UI4();
+  jsx_runtime45 = __toESM(require_jsx_runtime(), 1);
+});
+
+// src/tools/GlobTool/GlobTool.ts
+var inputSchema6, outputSchema6, GlobTool;
+var init_GlobTool = __esm(() => {
+  init_v4();
+  init_Tool();
+  init_cwd2();
+  init_errors();
+  init_file();
+  init_fsOperations();
+  init_glob();
+  init_path2();
+  init_filesystem();
+  init_shellRuleMatching();
+  init_UI5();
+  inputSchema6 = lazySchema(() => exports_external.strictObject({
+    pattern: exports_external.string().describe("The glob pattern to match files against"),
+    path: exports_external.string().optional().describe('The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter "undefined" or "null" - simply omit it for the default behavior. Must be a valid directory path if provided.'),
+    tools: exports_external.array(exports_external.string()).optional().describe("Tool names to re-add to the subagent tool list when running inside an embedded agent. " + "No effect in the main REPL.")
+  }));
+  outputSchema6 = lazySchema(() => exports_external.object({
+    durationMs: exports_external.number().describe("Time taken to execute the search in milliseconds"),
+    numFiles: exports_external.number().describe("Total number of files found"),
+    filenames: exports_external.array(exports_external.string()).describe("Array of file paths that match the pattern"),
+    truncated: exports_external.boolean().describe("Whether results were truncated (limited to 100 files)")
+  }));
+  GlobTool = buildTool({
+    name: GLOB_TOOL_NAME,
+    searchHint: "find files by name pattern or wildcard",
+    maxResultSizeChars: 1e5,
+    async description() {
+      return DESCRIPTION4;
+    },
+    userFacingName: userFacingName4,
+    getToolUseSummary: getToolUseSummary5,
+    getActivityDescription(input) {
+      const summary = getToolUseSummary5(input);
+      return summary ? `Finding ${summary}` : "Finding files";
+    },
+    get inputSchema() {
+      return inputSchema6();
+    },
+    get outputSchema() {
+      return outputSchema6();
+    },
+    isConcurrencySafe() {
+      return true;
+    },
+    isReadOnly() {
+      return true;
+    },
+    toAutoClassifierInput(input) {
+      return input.pattern;
+    },
+    isSearchOrReadCommand() {
+      return { isSearch: true, isRead: false };
+    },
+    getPath({ path: path21 }) {
+      return path21 ? expandPath(path21) : getCwd();
+    },
+    async preparePermissionMatcher({ pattern }) {
+      return (rulePattern) => matchWildcardPattern(rulePattern, pattern);
+    },
+    async validateInput({ pattern, path: path21 }) {
+      const nullByteField = [["pattern", pattern], ["path", path21]].find(([, v6]) => v6?.includes("\x00"));
+      if (nullByteField) {
+        return {
+          result: false,
+          message: `${GLOB_TOOL_NAME} ${nullByteField[0]} cannot contain null bytes (\\0). Remove the null byte and try again.`,
+          errorCode: 2
+        };
+      }
+      if (path21) {
+        const fs17 = getFsImplementation();
+        const absolutePath = expandPath(path21);
+        if (absolutePath.startsWith("\\\\") || absolutePath.startsWith("//")) {
+          return { result: true };
+        }
+        let stats;
+        try {
+          stats = await fs17.stat(absolutePath);
+        } catch (e4) {
+          if (isENOENT(e4)) {
+            const cwdSuggestion = await suggestPathUnderCwd(absolutePath);
+            let message = `Directory does not exist: ${path21}. ${FILE_NOT_FOUND_CWD_NOTE} ${getCwd()}.`;
+            if (cwdSuggestion) {
+              message += ` Did you mean ${cwdSuggestion}?`;
+            }
+            return {
+              result: false,
+              message,
+              errorCode: 1
+            };
+          }
+          throw e4;
+        }
+        if (!stats.isDirectory()) {
+          return {
+            result: false,
+            message: `Path is not a directory: ${path21}`,
+            errorCode: 2
+          };
+        }
+      }
+      return { result: true };
+    },
+    async checkPermissions(input, context4) {
+      const appState = context4.getAppState();
+      return checkReadPermissionForTool(GlobTool, input, appState.toolPermissionContext);
+    },
+    async prompt() {
+      return DESCRIPTION4;
+    },
+    renderToolUseMessage: renderToolUseMessage5,
+    renderToolUseErrorMessage: renderToolUseErrorMessage5,
+    renderToolResultMessage: renderToolResultMessage4,
+    extractSearchText({ filenames }) {
+      return filenames.join(`
+`);
+    },
+    async call(input, { abortController, getAppState, globLimits, setAppState }) {
+      if (input.tools && input.tools.length > 0) {
+        setAppState((prev) => ({
+          ...prev,
+          toolPermissionContext: {
+            ...prev.toolPermissionContext,
+            alwaysAllowRules: {
+              ...prev.toolPermissionContext.alwaysAllowRules,
+              command: [
+                ...new Set([
+                  ...prev.toolPermissionContext.alwaysAllowRules.command || [],
+                  ...input.tools
+                ])
+              ]
+            }
+          }
+        }));
+      }
+      const start = Date.now();
+      const appState = getAppState();
+      const limit = globLimits?.maxResults ?? 100;
+      const { files: files2, truncated } = await glob(input.pattern, GlobTool.getPath(input), { limit, offset: 0 }, abortController.signal, appState.toolPermissionContext);
+      const filenames = files2.map(toRelativePath);
+      const output = {
+        filenames,
+        durationMs: Date.now() - start,
+        numFiles: filenames.length,
+        truncated
+      };
+      return {
+        data: output
+      };
+    },
+    mapToolResultToToolResultBlockParam(output, toolUseID) {
+      if (output.filenames.length === 0) {
+        return {
+          tool_use_id: toolUseID,
+          type: "tool_result",
+          content: "No files found"
+        };
+      }
+      return {
+        tool_use_id: toolUseID,
+        type: "tool_result",
+        content: [
+          ...output.filenames,
+          ...output.truncated ? [
+            "(Results are truncated. Consider using a more specific path or pattern.)"
+          ] : []
+        ].join(`
+`)
+      };
+    }
+  });
+});
+
 // src/tools/GrepTool/GrepTool.ts
 function applyHeadLimit(items, limit, offset = 0) {
   if (limit === 0) {
@@ -377390,7 +377627,7 @@ function formatLimitInfo(appliedLimit, appliedOffset) {
     parts.push(`offset: ${appliedOffset}`);
   return parts.join(", ");
 }
-var inputSchema6, VCS_DIRECTORIES_TO_EXCLUDE2, DEFAULT_HEAD_LIMIT = 250, outputSchema6, GrepTool;
+var inputSchema7, VCS_DIRECTORIES_TO_EXCLUDE2, DEFAULT_HEAD_LIMIT = 250, outputSchema7, GrepTool;
 var init_GrepTool = __esm(() => {
   init_v4();
   init_Tool();
@@ -377408,7 +377645,7 @@ var init_GrepTool = __esm(() => {
   init_stringUtils();
   init_prompt2();
   init_UI4();
-  inputSchema6 = lazySchema(() => exports_external.strictObject({
+  inputSchema7 = lazySchema(() => exports_external.strictObject({
     pattern: exports_external.string().describe("The regular expression pattern to search for in file contents"),
     path: exports_external.string().optional().describe("File or directory to search in (rg PATH). Defaults to current working directory."),
     glob: exports_external.string().optional().describe('Glob pattern to filter files (e.g. "*.js", "*.{ts,tsx}") - maps to rg --glob'),
@@ -377433,7 +377670,7 @@ var init_GrepTool = __esm(() => {
     ".jj",
     ".sl"
   ];
-  outputSchema6 = lazySchema(() => exports_external.object({
+  outputSchema7 = lazySchema(() => exports_external.object({
     mode: exports_external.enum(["content", "files_with_matches", "count"]).optional(),
     numFiles: exports_external.number(),
     filenames: exports_external.array(exports_external.string()),
@@ -377462,10 +377699,10 @@ var init_GrepTool = __esm(() => {
       return summary ? `Searching for ${summary}` : "Searching";
     },
     get inputSchema() {
-      return inputSchema6();
+      return inputSchema7();
     },
     get outputSchema() {
-      return outputSchema6();
+      return outputSchema7();
     },
     isConcurrencySafe() {
       return true;
@@ -377702,6 +377939,11 @@ ${filenames.join(`
       for (const exclusion of await getGlobExclusionsForPluginCache(absolutePath)) {
         args.push("--glob", exclusion);
       }
+      try {
+        new RegExp(pattern);
+      } catch {
+        throw new Error(`Search failed: ripgrep rejected the pattern "${pattern}"`);
+      }
       const results = await ripGrep(args, absolutePath, abortController.signal, {
         rejectOnInputError: true
       });
@@ -377797,244 +378039,6 @@ ${filenames.join(`
   });
 });
 
-// src/tools/GlobTool/UI.tsx
-function userFacingName4() {
-  return "Search";
-}
-function renderToolUseMessage5({
-  pattern,
-  path: path21
-}, {
-  verbose
-}) {
-  if (!pattern) {
-    return null;
-  }
-  if (!path21) {
-    return `pattern: "${pattern}"`;
-  }
-  return `pattern: "${pattern}", path: "${verbose ? path21 : getDisplayPath(path21)}"`;
-}
-function renderToolUseErrorMessage5(result, {
-  verbose
-}) {
-  if (!verbose && typeof result === "string" && extractTag(result, "tool_use_error")) {
-    const errorMessage2 = extractTag(result, "tool_use_error");
-    if (errorMessage2?.includes(FILE_NOT_FOUND_CWD_NOTE)) {
-      return /* @__PURE__ */ jsx_runtime45.jsx(MessageResponse, {
-        children: /* @__PURE__ */ jsx_runtime45.jsx(ThemedText, {
-          color: "error",
-          children: "File not found"
-        })
-      });
-    }
-    return /* @__PURE__ */ jsx_runtime45.jsx(MessageResponse, {
-      children: /* @__PURE__ */ jsx_runtime45.jsx(ThemedText, {
-        color: "error",
-        children: "Error searching files"
-      })
-    });
-  }
-  return /* @__PURE__ */ jsx_runtime45.jsx(FallbackToolUseErrorMessage, {
-    result,
-    verbose
-  });
-}
-function getToolUseSummary5(input) {
-  if (!input?.pattern) {
-    return null;
-  }
-  return truncate(input.pattern, TOOL_SUMMARY_MAX_LENGTH);
-}
-var jsx_runtime45, renderToolResultMessage5;
-var init_UI5 = __esm(() => {
-  init_MessageResponse();
-  init_messages3();
-  init_FallbackToolUseErrorMessage();
-  init_toolLimits();
-  init_ink2();
-  init_file();
-  init_format();
-  init_GrepTool();
-  jsx_runtime45 = __toESM(require_jsx_runtime(), 1);
-  renderToolResultMessage5 = GrepTool.renderToolResultMessage;
-});
-
-// src/tools/GlobTool/GlobTool.ts
-var inputSchema7, outputSchema7, GlobTool;
-var init_GlobTool = __esm(() => {
-  init_v4();
-  init_Tool();
-  init_cwd2();
-  init_errors();
-  init_file();
-  init_fsOperations();
-  init_glob();
-  init_path2();
-  init_filesystem();
-  init_shellRuleMatching();
-  init_UI5();
-  inputSchema7 = lazySchema(() => exports_external.strictObject({
-    pattern: exports_external.string().describe("The glob pattern to match files against"),
-    path: exports_external.string().optional().describe('The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter "undefined" or "null" - simply omit it for the default behavior. Must be a valid directory path if provided.'),
-    tools: exports_external.array(exports_external.string()).optional().describe("Tool names to re-add to the subagent tool list when running inside an embedded agent. " + "No effect in the main REPL.")
-  }));
-  outputSchema7 = lazySchema(() => exports_external.object({
-    durationMs: exports_external.number().describe("Time taken to execute the search in milliseconds"),
-    numFiles: exports_external.number().describe("Total number of files found"),
-    filenames: exports_external.array(exports_external.string()).describe("Array of file paths that match the pattern"),
-    truncated: exports_external.boolean().describe("Whether results were truncated (limited to 100 files)")
-  }));
-  GlobTool = buildTool({
-    name: GLOB_TOOL_NAME,
-    searchHint: "find files by name pattern or wildcard",
-    maxResultSizeChars: 1e5,
-    async description() {
-      return DESCRIPTION4;
-    },
-    userFacingName: userFacingName4,
-    getToolUseSummary: getToolUseSummary5,
-    getActivityDescription(input) {
-      const summary = getToolUseSummary5(input);
-      return summary ? `Finding ${summary}` : "Finding files";
-    },
-    get inputSchema() {
-      return inputSchema7();
-    },
-    get outputSchema() {
-      return outputSchema7();
-    },
-    isConcurrencySafe() {
-      return true;
-    },
-    isReadOnly() {
-      return true;
-    },
-    toAutoClassifierInput(input) {
-      return input.pattern;
-    },
-    isSearchOrReadCommand() {
-      return { isSearch: true, isRead: false };
-    },
-    getPath({ path: path21 }) {
-      return path21 ? expandPath(path21) : getCwd();
-    },
-    async preparePermissionMatcher({ pattern }) {
-      return (rulePattern) => matchWildcardPattern(rulePattern, pattern);
-    },
-    async validateInput({ pattern, path: path21 }) {
-      const nullByteField = [["pattern", pattern], ["path", path21]].find(([, v6]) => v6?.includes("\x00"));
-      if (nullByteField) {
-        return {
-          result: false,
-          message: `${GLOB_TOOL_NAME} ${nullByteField[0]} cannot contain null bytes (\\0). Remove the null byte and try again.`,
-          errorCode: 2
-        };
-      }
-      if (path21) {
-        const fs17 = getFsImplementation();
-        const absolutePath = expandPath(path21);
-        if (absolutePath.startsWith("\\\\") || absolutePath.startsWith("//")) {
-          return { result: true };
-        }
-        let stats;
-        try {
-          stats = await fs17.stat(absolutePath);
-        } catch (e4) {
-          if (isENOENT(e4)) {
-            const cwdSuggestion = await suggestPathUnderCwd(absolutePath);
-            let message = `Directory does not exist: ${path21}. ${FILE_NOT_FOUND_CWD_NOTE} ${getCwd()}.`;
-            if (cwdSuggestion) {
-              message += ` Did you mean ${cwdSuggestion}?`;
-            }
-            return {
-              result: false,
-              message,
-              errorCode: 1
-            };
-          }
-          throw e4;
-        }
-        if (!stats.isDirectory()) {
-          return {
-            result: false,
-            message: `Path is not a directory: ${path21}`,
-            errorCode: 2
-          };
-        }
-      }
-      return { result: true };
-    },
-    async checkPermissions(input, context4) {
-      const appState = context4.getAppState();
-      return checkReadPermissionForTool(GlobTool, input, appState.toolPermissionContext);
-    },
-    async prompt() {
-      return DESCRIPTION4;
-    },
-    renderToolUseMessage: renderToolUseMessage5,
-    renderToolUseErrorMessage: renderToolUseErrorMessage5,
-    renderToolResultMessage: renderToolResultMessage5,
-    extractSearchText({ filenames }) {
-      return filenames.join(`
-`);
-    },
-    async call(input, { abortController, getAppState, globLimits, setAppState }) {
-      if (input.tools && input.tools.length > 0) {
-        setAppState((prev) => ({
-          ...prev,
-          toolPermissionContext: {
-            ...prev.toolPermissionContext,
-            alwaysAllowRules: {
-              ...prev.toolPermissionContext.alwaysAllowRules,
-              command: [
-                ...new Set([
-                  ...prev.toolPermissionContext.alwaysAllowRules.command || [],
-                  ...input.tools
-                ])
-              ]
-            }
-          }
-        }));
-      }
-      const start = Date.now();
-      const appState = getAppState();
-      const limit = globLimits?.maxResults ?? 100;
-      const { files: files2, truncated } = await glob(input.pattern, GlobTool.getPath(input), { limit, offset: 0 }, abortController.signal, appState.toolPermissionContext);
-      const filenames = files2.map(toRelativePath);
-      const output = {
-        filenames,
-        durationMs: Date.now() - start,
-        numFiles: filenames.length,
-        truncated
-      };
-      return {
-        data: output
-      };
-    },
-    mapToolResultToToolResultBlockParam(output, toolUseID) {
-      if (output.filenames.length === 0) {
-        return {
-          tool_use_id: toolUseID,
-          type: "tool_result",
-          content: "No files found"
-        };
-      }
-      return {
-        tool_use_id: toolUseID,
-        type: "tool_result",
-        content: [
-          ...output.filenames,
-          ...output.truncated ? [
-            "(Results are truncated. Consider using a more specific path or pattern.)"
-          ] : []
-        ].join(`
-`)
-      };
-    }
-  });
-});
-
 // src/services/teamMemorySync/types.ts
 var TeamMemoryContentSchema, TeamMemoryDataSchema, TeamMemoryTooManyEntriesSchema;
 var init_types12 = __esm(() => {
@@ -385518,7 +385522,7 @@ function renderToolUseQueuedMessage() {
     })
   });
 }
-function renderToolResultMessage6(content, progressMessagesForMessage, {
+function renderToolResultMessage5(content, progressMessagesForMessage, {
   verbose,
   theme: _theme,
   tools: _tools,
@@ -386329,7 +386333,7 @@ For commands that are harder to parse at a glance (piped commands, obscure flags
     renderToolUseMessage: renderToolUseMessage6,
     renderToolUseProgressMessage,
     renderToolUseQueuedMessage,
-    renderToolResultMessage: renderToolResultMessage6,
+    renderToolResultMessage: renderToolResultMessage5,
     extractSearchText({
       stdout,
       stderr
@@ -393379,6 +393383,31 @@ function resolveAgentTools(agentDefinition, availableTools, isAsync2 = false, is
     allowedAgentTypes
   };
 }
+function agentToolResultSchema() {
+  return _agentToolResultSchemaCache ??= exports_external.object({
+    agentId: exports_external.string(),
+    agentType: exports_external.string().optional(),
+    content: exports_external.array(exports_external.object({ type: exports_external.literal("text"), text: exports_external.string() })),
+    totalToolUseCount: exports_external.number(),
+    totalDurationMs: exports_external.number(),
+    totalTokens: exports_external.number(),
+    usage: exports_external.object({
+      input_tokens: exports_external.number(),
+      output_tokens: exports_external.number(),
+      cache_creation_input_tokens: exports_external.number().nullable(),
+      cache_read_input_tokens: exports_external.number().nullable(),
+      server_tool_use: exports_external.object({
+        web_search_requests: exports_external.number(),
+        web_fetch_requests: exports_external.number()
+      }).nullable(),
+      service_tier: exports_external.enum(["standard", "priority", "batch"]).nullable(),
+      cache_creation: exports_external.object({
+        ephemeral_1h_input_tokens: exports_external.number(),
+        ephemeral_5m_input_tokens: exports_external.number()
+      }).nullable()
+    })
+  });
+}
 function countToolUses(messages) {
   let count3 = 0;
   for (const m5 of messages) {
@@ -393659,7 +393688,7 @@ ${finalMessage}`;
     clearDumpState(agentIdForCleanup);
   }
 }
-var agentToolResultSchema;
+var _agentToolResultSchemaCache;
 var init_agentToolUtils = __esm(() => {
   init_featureFlags();
   init_v4();
@@ -393683,29 +393712,6 @@ var init_agentToolUtils = __esm(() => {
   init_teammateContext();
   init_tokens();
   init_constants3();
-  agentToolResultSchema = lazySchema(() => exports_external.object({
-    agentId: exports_external.string(),
-    agentType: exports_external.string().optional(),
-    content: exports_external.array(exports_external.object({ type: exports_external.literal("text"), text: exports_external.string() })),
-    totalToolUseCount: exports_external.number(),
-    totalDurationMs: exports_external.number(),
-    totalTokens: exports_external.number(),
-    usage: exports_external.object({
-      input_tokens: exports_external.number(),
-      output_tokens: exports_external.number(),
-      cache_creation_input_tokens: exports_external.number().nullable(),
-      cache_read_input_tokens: exports_external.number().nullable(),
-      server_tool_use: exports_external.object({
-        web_search_requests: exports_external.number(),
-        web_fetch_requests: exports_external.number()
-      }).nullable(),
-      service_tier: exports_external.enum(["standard", "priority", "batch"]).nullable(),
-      cache_creation: exports_external.object({
-        ephemeral_1h_input_tokens: exports_external.number(),
-        ephemeral_5m_input_tokens: exports_external.number()
-      }).nullable()
-    })
-  }));
 });
 
 // src/components/AgentProgressLine.tsx
@@ -451971,7 +451977,7 @@ function renderToolUseErrorMessage7(result, {
     verbose
   });
 }
-function renderToolResultMessage7({
+function renderToolResultMessage6({
   cell_id,
   new_source,
   error: error52
@@ -452137,7 +452143,7 @@ var init_NotebookEditTool = __esm(() => {
     renderToolUseMessage: renderToolUseMessage7,
     renderToolUseRejectedMessage: renderToolUseRejectedMessage3,
     renderToolUseErrorMessage: renderToolUseErrorMessage7,
-    renderToolResultMessage: renderToolResultMessage7,
+    renderToolResultMessage: renderToolResultMessage6,
     async validateInput({ notebook_path, cell_type, cell_id, edit_mode = "replace" }, toolUseContext) {
       const fullPath = isAbsolute22(notebook_path) ? notebook_path : resolve34(getCwd(), notebook_path);
       if (fullPath.startsWith("\\\\") || fullPath.startsWith("//")) {
@@ -471915,7 +471921,7 @@ function _temp39(pm_0) {
 function _temp210(pm) {
   return hasProgressMessage(pm.data);
 }
-function renderToolResultMessage8(data, progressMessagesForMessage, {
+function renderToolResultMessage7(data, progressMessagesForMessage, {
   tools,
   verbose,
   theme,
@@ -480588,7 +480594,7 @@ duration_ms: ${data.totalDurationMs}</usage>`
       }
       throw new Error(`Unexpected agent tool result status: ${data.status}`);
     },
-    renderToolResultMessage: renderToolResultMessage8,
+    renderToolResultMessage: renderToolResultMessage7,
     renderToolUseMessage: renderToolUseMessage9,
     renderToolUseTag: renderToolUseTag2,
     renderToolUseProgressMessage: renderToolUseProgressMessage3,
@@ -480616,7 +480622,7 @@ function getToolUseIDFromParentMessage(parentMessage, toolName) {
 }
 
 // src/tools/SkillTool/UI.tsx
-function renderToolResultMessage9(output) {
+function renderToolResultMessage8(output) {
   if ("status" in output && output.status === "forked") {
     return /* @__PURE__ */ jsx_runtime134.jsx(MessageResponse, {
       height: 1,
@@ -481404,7 +481410,7 @@ ${result.result}`
         content: `Launching skill: ${result.commandName}`
       };
     },
-    renderToolResultMessage: renderToolResultMessage9,
+    renderToolResultMessage: renderToolResultMessage8,
     renderToolUseMessage: renderToolUseMessage10,
     renderToolUseProgressMessage: renderToolUseProgressMessage4,
     renderToolUseRejectedMessage: renderToolUseRejectedMessage5,
@@ -481595,7 +481601,7 @@ function renderToolUseProgressMessage5() {
     })
   });
 }
-function renderToolResultMessage10({
+function renderToolResultMessage9({
   bytes,
   code,
   codeText,
@@ -498862,7 +498868,7 @@ ${DESCRIPTION5}`;
     },
     renderToolUseMessage: renderToolUseMessage11,
     renderToolUseProgressMessage: renderToolUseProgressMessage5,
-    renderToolResultMessage: renderToolResultMessage10,
+    renderToolResultMessage: renderToolResultMessage9,
     async call({ url: url3, prompt }, { abortController, options: { isNonInteractiveSession } }) {
       const start = Date.now();
       const response3 = await getURLMarkdownContent(url3, abortController);
@@ -574857,7 +574863,7 @@ function truncateCommand(command5) {
   }
   return truncated.trim();
 }
-function renderToolResultMessage11(output2, _progressMessagesForMessage, {
+function renderToolResultMessage10(output2, _progressMessagesForMessage, {
   verbose
 }) {
   if (false) {}
@@ -574960,7 +574966,7 @@ var init_TaskStopTool = __esm(() => {
       };
     },
     renderToolUseMessage: renderToolUseMessage12,
-    renderToolResultMessage: renderToolResultMessage11,
+    renderToolResultMessage: renderToolResultMessage10,
     async call({ task_id, shell_id }, { getAppState, setAppState, abortController }) {
       const id = task_id ?? shell_id;
       if (!id) {
@@ -575181,7 +575187,7 @@ var init_attachments = __esm(() => {
 function renderToolUseMessage13() {
   return "";
 }
-function renderToolResultMessage12(output2, _progressMessages, options) {
+function renderToolResultMessage11(output2, _progressMessages, options) {
   const hasAttachments = (output2.attachments?.length ?? 0) > 0;
   if (!output2.message && !hasAttachments) {
     return null;
@@ -575429,7 +575435,7 @@ var init_BriefTool = __esm(() => {
       };
     },
     renderToolUseMessage: renderToolUseMessage13,
-    renderToolResultMessage: renderToolResultMessage12,
+    renderToolResultMessage: renderToolResultMessage11,
     async call({ message, attachments, status }, context7) {
       const sentAt = new Date().toISOString();
       logEvent2("tengu_brief_send", {
@@ -576240,7 +576246,7 @@ function renderToolUseProgressMessage6(progressMessages) {
       return null;
   }
 }
-function renderToolResultMessage13(output2) {
+function renderToolResultMessage12(output2) {
   const {
     searchCount
   } = getSearchSummary(output2.results ?? []);
@@ -576432,7 +576438,7 @@ var init_WebSearchTool = __esm(() => {
     },
     renderToolUseMessage: renderToolUseMessage14,
     renderToolUseProgressMessage: renderToolUseProgressMessage6,
-    renderToolResultMessage: renderToolResultMessage13,
+    renderToolResultMessage: renderToolResultMessage12,
     extractSearchText() {
       return "";
     },
@@ -576649,7 +576655,7 @@ Ensure your plan is complete and unambiguous:
 function renderToolUseMessage15() {
   return null;
 }
-function renderToolResultMessage14(output2, _progressMessagesForMessage, {
+function renderToolResultMessage13(output2, _progressMessagesForMessage, {
   theme: _theme
 }) {
   const {
@@ -576940,7 +576946,7 @@ var init_ExitPlanModeV2Tool = __esm(() => {
       };
     },
     renderToolUseMessage: renderToolUseMessage15,
-    renderToolResultMessage: renderToolResultMessage14,
+    renderToolResultMessage: renderToolResultMessage13,
     renderToolUseRejectedMessage: renderToolUseRejectedMessage6,
     async call(input2, context7) {
       const isAgent = !!context7.agentId;
@@ -578192,7 +578198,7 @@ function renderToolUseErrorMessage10(result, {
     verbose
   });
 }
-function renderToolResultMessage15(output2, _progressMessages, {
+function renderToolResultMessage14(output2, _progressMessages, {
   verbose
 }) {
   if (output2.resultCount !== undefined && output2.fileCount !== undefined) {
@@ -578661,7 +578667,7 @@ var init_LSPTool = __esm(() => {
     },
     renderToolUseMessage: renderToolUseMessage16,
     renderToolUseErrorMessage: renderToolUseErrorMessage10,
-    renderToolResultMessage: renderToolResultMessage15,
+    renderToolResultMessage: renderToolResultMessage14,
     async call(input2, _context) {
       const absolutePath = expandPath(input2.filePath);
       const cwd2 = getCwd();
@@ -578811,7 +578817,7 @@ function renderToolUseMessage17(input2) {
 function userFacingName7() {
   return "readMcpResource";
 }
-function renderToolResultMessage16(output2, _progressMessagesForMessage, {
+function renderToolResultMessage15(output2, _progressMessagesForMessage, {
   verbose
 }) {
   if (!output2 || !output2.contents || output2.contents.length === 0) {
@@ -578938,7 +578944,7 @@ var init_ReadMcpResourceTool = __esm(() => {
     },
     renderToolUseMessage: renderToolUseMessage17,
     userFacingName: userFacingName7,
-    renderToolResultMessage: renderToolResultMessage16,
+    renderToolResultMessage: renderToolResultMessage15,
     isResultTruncated(output2) {
       return isOutputLineTruncated(jsonStringify(output2));
     },
@@ -578977,7 +578983,7 @@ function renderToolUseMessage18(input2) {
 function userFacingName8() {
   return "readMcpResourceDir";
 }
-function renderToolResultMessage17(output2, _progressMessagesForMessage, { verbose }) {
+function renderToolResultMessage16(output2, _progressMessagesForMessage, { verbose }) {
   if (output2?.error) {
     return /* @__PURE__ */ jsx_runtime145.jsx(OutputLine, {
       content: output2.error,
@@ -579135,7 +579141,7 @@ var init_ReadMcpResourceDirTool = __esm(() => {
     },
     renderToolUseMessage: renderToolUseMessage18,
     userFacingName: userFacingName8,
-    renderToolResultMessage: renderToolResultMessage17,
+    renderToolResultMessage: renderToolResultMessage16,
     isResultTruncated(output2) {
       return isOutputLineTruncated(jsonStringify(output2));
     },
@@ -579362,7 +579368,7 @@ In plan mode, you'll:
 function renderToolUseMessage19() {
   return null;
 }
-function renderToolResultMessage18(_output, _progressMessagesForMessage, _options) {
+function renderToolResultMessage17(_output, _progressMessagesForMessage, _options) {
   return /* @__PURE__ */ jsx_runtime146.jsxs(ThemedBox_default, {
     flexDirection: "column",
     marginTop: 1,
@@ -579461,7 +579467,7 @@ var init_EnterPlanModeTool = __esm(() => {
       return true;
     },
     renderToolUseMessage: renderToolUseMessage19,
-    renderToolResultMessage: renderToolResultMessage18,
+    renderToolResultMessage: renderToolResultMessage17,
     renderToolUseRejectedMessage: renderToolUseRejectedMessage7,
     async call(_input, context7) {
       if (context7.agentId) {
@@ -579572,7 +579578,7 @@ function getEnterWorktreeToolPrompt() {
 function renderToolUseMessage20() {
   return "Creating worktree\u2026";
 }
-function renderToolResultMessage19(output2, _progressMessagesForMessage, _options) {
+function renderToolResultMessage18(output2, _progressMessagesForMessage, _options) {
   return /* @__PURE__ */ jsx_runtime147.jsxs(ThemedBox_default, {
     flexDirection: "column",
     children: [
@@ -579765,7 +579771,7 @@ var init_EnterWorktreeTool = __esm(() => {
       return input2.name ?? "";
     },
     renderToolUseMessage: renderToolUseMessage20,
-    renderToolResultMessage: renderToolResultMessage19,
+    renderToolResultMessage: renderToolResultMessage18,
     async call(input2) {
       if (getCurrentWorktreeSession() && !input2.path) {
         throw new Error("Already in a worktree session. Pass `path` to switch into another existing worktree, or use ExitWorktree to leave this one before creating a new worktree.");
@@ -579847,7 +579853,7 @@ If called outside an EnterWorktree session, the tool is a **no-op**: it reports
 function renderToolUseMessage21() {
   return "Exiting worktree\u2026";
 }
-function renderToolResultMessage20(output2, _progressMessagesForMessage, _options) {
+function renderToolResultMessage19(output2, _progressMessagesForMessage, _options) {
   const actionLabel = output2.action === "keep" ? "Kept worktree" : "Removed worktree";
   return /* @__PURE__ */ jsx_runtime148.jsxs(ThemedBox_default, {
     flexDirection: "column",
@@ -580017,7 +580023,7 @@ var init_ExitWorktreeTool = __esm(() => {
       return { result: true };
     },
     renderToolUseMessage: renderToolUseMessage21,
-    renderToolResultMessage: renderToolResultMessage20,
+    renderToolResultMessage: renderToolResultMessage19,
     async call(input2) {
       const session = getCurrentWorktreeSession();
       if (!session) {
@@ -581077,7 +581083,7 @@ function renderToolUseMessage22(input2) {
     ]
   });
 }
-function renderToolResultMessage21(content) {
+function renderToolResultMessage20(content) {
   if (!content.success) {
     return /* @__PURE__ */ jsx_runtime149.jsx(MessageResponse, {
       children: /* @__PURE__ */ jsx_runtime149.jsxs(ThemedText, {
@@ -581925,7 +581931,7 @@ var init_ConfigTool = __esm(() => {
       };
     },
     renderToolUseMessage: renderToolUseMessage22,
-    renderToolResultMessage: renderToolResultMessage21,
+    renderToolResultMessage: renderToolResultMessage20,
     renderToolUseRejectedMessage: renderToolUseRejectedMessage8,
     async call({ setting, value }, context7) {
       if (feature("VOICE_MODE") && setting === "voiceEnabled") {
@@ -583146,7 +583152,7 @@ The response is the raw JSON from the API.`;
 function renderToolUseMessage23(input2) {
   return `${input2.action ?? ""}${input2.trigger_id ? ` ${input2.trigger_id}` : ""}`;
 }
-function renderToolResultMessage22(output2) {
+function renderToolResultMessage21(output2) {
   const lines2 = countCharInString(output2.json, `
 `) + 1;
   return /* @__PURE__ */ jsx_runtime150.jsx(MessageResponse, {
@@ -583312,7 +583318,7 @@ ${output2.json}`
       };
     },
     renderToolUseMessage: renderToolUseMessage23,
-    renderToolResultMessage: renderToolResultMessage22
+    renderToolResultMessage: renderToolResultMessage21
   });
 });
 
@@ -583948,7 +583954,7 @@ function renderToolUseMessage24(input2) {
   }
   return null;
 }
-function renderToolResultMessage23(content, _progressMessages, {
+function renderToolResultMessage22(content, _progressMessages, {
   verbose
 }) {
   const result = typeof content === "string" ? jsonParse(content) : content;
@@ -584603,7 +584609,7 @@ var init_SendMessageTool = __esm(() => {
       }
     },
     renderToolUseMessage: renderToolUseMessage24,
-    renderToolResultMessage: renderToolResultMessage23
+    renderToolResultMessage: renderToolResultMessage22
   });
 });
 
@@ -591983,7 +591989,7 @@ function renderToolUseQueuedMessage3() {
     })
   });
 }
-function renderToolResultMessage24(content, progressMessagesForMessage, {
+function renderToolResultMessage23(content, progressMessagesForMessage, {
   verbose,
   theme: _theme,
   tools: _tools,
@@ -592582,7 +592588,7 @@ var init_PowerShellTool = __esm(() => {
     renderToolUseMessage: renderToolUseMessage25,
     renderToolUseProgressMessage: renderToolUseProgressMessage7,
     renderToolUseQueuedMessage: renderToolUseQueuedMessage3,
-    renderToolResultMessage: renderToolResultMessage24,
+    renderToolResultMessage: renderToolResultMessage23,
     renderToolUseErrorMessage: renderToolUseErrorMessage11,
     mapToolResultToToolResultBlockParam({
       interrupted,
@@ -617610,7 +617616,7 @@ Parameters:
 function renderToolUseMessage26(input2) {
   return input2.server ? `List MCP resources from server "${input2.server}"` : `List all MCP resources`;
 }
-function renderToolResultMessage25(output2, _progressMessagesForMessage, {
+function renderToolResultMessage24(output2, _progressMessagesForMessage, {
   verbose
 }) {
   if (!output2 || output2.length === 0) {
@@ -617707,7 +617713,7 @@ var init_ListMcpResourcesTool = __esm(() => {
     },
     renderToolUseMessage: renderToolUseMessage26,
     userFacingName: () => "listMcpResources",
-    renderToolResultMessage: renderToolResultMessage25,
+    renderToolResultMessage: renderToolResultMessage24,
     isResultTruncated(output2) {
       return isOutputLineTruncated(jsonStringify(output2));
     },
@@ -618020,7 +618026,7 @@ function renderToolUseProgressMessage8(progressMessagesForMessage) {
     })
   });
 }
-function renderToolResultMessage26(output2, _progressMessagesForMessage, {
+function renderToolResultMessage25(output2, _progressMessagesForMessage, {
   verbose,
   input: input2
 }) {
@@ -618423,7 +618429,7 @@ var init_MCPTool = __esm(() => {
     renderToolUseMessage: renderToolUseMessage27,
     userFacingName: () => "mcp",
     renderToolUseProgressMessage: renderToolUseProgressMessage8,
-    renderToolResultMessage: renderToolResultMessage26,
+    renderToolResultMessage: renderToolResultMessage25,
     isResultTruncated(output2) {
       return isOutputLineTruncated(output2);
     },
@@ -623007,7 +623013,7 @@ function renderChromeViewTabLink(input2) {
 }
 function renderChromeToolResultMessage(output2, toolName, verbose) {
   if (verbose) {
-    return renderToolResultMessage26(output2, [], {
+    return renderToolResultMessage25(output2, [], {
       verbose
     });
   }
@@ -809168,6 +809174,19 @@ function findClosestSubcommand(word, program3) {
   return best;
 }
 
+// src/utils/forwardSubagentTextGuard.ts
+function checkForwardSubagentTextGuard(effective, isNonInteractiveSession, outputFormat, cliFlag) {
+  if (effective) {
+    if (!isNonInteractiveSession || outputFormat !== "stream-json") {
+      if (cliFlag) {
+        return FORWARD_SUBAGENT_TEXT_ERROR;
+      }
+    }
+  }
+  return null;
+}
+var FORWARD_SUBAGENT_TEXT_ERROR = "Error: --forward-subagent-text requires --print and --output-format=stream-json.";
+
 // src/migrations/migrateAutoUpdatesToSettings.ts
 function migrateAutoUpdatesToSettings() {
   const globalConfig2 = getGlobalConfig();
@@ -819948,12 +819967,11 @@ ${hint}` : hint;
         process.exit(1);
       }
     }
-    if (effectiveForwardSubagentText) {
-      if (!isNonInteractiveSession || outputFormat !== "stream-json") {
-        if (forwardSubagentText) {
-          writeToStderr(`Error: --forward-subagent-text requires --print and --output-format=stream-json.`);
-          process.exit(1);
-        }
+    {
+      const guardError = checkForwardSubagentTextGuard(effectiveForwardSubagentText, isNonInteractiveSession, outputFormat, forwardSubagentText);
+      if (guardError) {
+        writeToStderr(guardError);
+        process.exit(1);
       }
     }
     if (options.sessionPersistence === false && !isNonInteractiveSession) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.270",
+  "version": "2.1.271",
   "license": "MIT",
   "type": "module",
   "bin": {