@opencow-ai/opencow-agent-sdk 0.4.4 → 0.4.5

package/dist/client.js

@@ -223806,26 +223806,41 @@ var init_permissionLogging = __esm(() => {
 });
 
 // src/lib/toolInputNullCoercion.ts
-function omitNullProps(input) {
-  const out = {};
-  for (const [key, value] of Object.entries(input)) {
-    if (value !== null)
-      out[key] = value;
+function containsNull(value) {
+  if (value === null)
+    return true;
+  if (Array.isArray(value))
+    return value.some(containsNull);
+  if (typeof value === "object") {
+    return Object.values(value).some(containsNull);
   }
-  return out;
+  return false;
+}
+function deepOmitNullProps(value) {
+  if (Array.isArray(value)) {
+    return value.map(deepOmitNullProps);
+  }
+  if (value !== null && typeof value === "object") {
+    const out = {};
+    for (const [key, v] of Object.entries(value)) {
+      if (v === null)
+        continue;
+      out[key] = deepOmitNullProps(v);
+    }
+    return out;
+  }
+  return value;
 }
 function safeParseToolInputWithNullCoercion(schema, input) {
   const first = schema.safeParse(input);
   if (first.success)
     return first;
-  if (input === null || typeof input !== "object" || Array.isArray(input)) {
+  if (input === null || typeof input !== "object") {
     return first;
   }
-  const record3 = input;
-  const hasNull = Object.values(record3).some((value) => value === null);
-  if (!hasNull)
+  if (!containsNull(input))
     return first;
-  const retry = schema.safeParse(omitNullProps(record3));
+  const retry = schema.safeParse(deepOmitNullProps(input));
   return retry.success ? retry : first;
 }
 
@@ -243763,7 +243778,7 @@ async function segmentedCommandPermissionResult(input, segments, bashToolHasPerm
     return {
       behavior: "ask",
       decisionReason: decisionReason2,
-      message: createPermissionRequestMessage2(BashTool2.name, decisionReason2)
+      message: createPermissionRequestMessage2(BashTool.name, decisionReason2)
     };
   }
   {
@@ -243789,7 +243804,7 @@ async function segmentedCommandPermissionResult(input, segments, bashToolHasPerm
       return {
         behavior: "ask",
         decisionReason: decisionReason2,
-        message: createPermissionRequestMessage2(BashTool2.name, decisionReason2)
+        message: createPermissionRequestMessage2(BashTool.name, decisionReason2)
       };
     }
   }
@@ -243839,7 +243854,7 @@ async function segmentedCommandPermissionResult(input, segments, bashToolHasPerm
   };
   return {
     behavior: "ask",
-    message: createPermissionRequestMessage2(BashTool2.name, decisionReason),
+    message: createPermissionRequestMessage2(BashTool.name, decisionReason),
     decisionReason,
     suggestions: suggestions.length > 0 ? suggestions : undefined
   };
@@ -243869,7 +243884,7 @@ async function bashToolCheckCommandOperatorPermissions(input, bashToolHasPermiss
     };
     return {
       behavior: "ask",
-      message: createPermissionRequestMessage2(BashTool2.name, decisionReason),
+      message: createPermissionRequestMessage2(BashTool.name, decisionReason),
       decisionReason
     };
   }
@@ -246591,21 +246606,21 @@ function getSimpleCommandPrefix(command) {
 function suggestionForExactCommand2(command) {
   const heredocPrefix = extractPrefixBeforeHeredoc(command);
   if (heredocPrefix) {
-    return suggestionForPrefix(BashTool2.name, heredocPrefix);
+    return suggestionForPrefix(BashTool.name, heredocPrefix);
   }
   if (command.includes(`
 `)) {
     const firstLine = command.split(`
 `)[0].trim();
     if (firstLine) {
-      return suggestionForPrefix(BashTool2.name, firstLine);
+      return suggestionForPrefix(BashTool.name, firstLine);
     }
   }
   const prefix = getSimpleCommandPrefix(command);
   if (prefix) {
-    return suggestionForPrefix(BashTool2.name, prefix);
+    return suggestionForPrefix(BashTool.name, prefix);
   }
-  return suggestionForExactCommand(BashTool2.name, command);
+  return suggestionForExactCommand(BashTool.name, command);
 }
 function extractPrefixBeforeHeredoc(command) {
   if (!command.includes("<<"))
@@ -246634,7 +246649,7 @@ function extractPrefixBeforeHeredoc(command) {
   return tokens.slice(i3, i3 + 2).join(" ") || null;
 }
 function suggestionForPrefix2(prefix) {
-  return suggestionForPrefix(BashTool2.name, prefix);
+  return suggestionForPrefix(BashTool.name, prefix);
 }
 function matchWildcardPattern2(pattern, command) {
   return matchWildcardPattern(pattern, command);
@@ -246785,11 +246800,11 @@ function filterRulesByContentsMatchingInput(input, rules, matchMode, {
   }).map(([, rule]) => rule);
 }
 function matchingRulesForInput(input, toolPermissionContext, matchMode, { skipCompoundCheck = false } = {}) {
-  const denyRuleByContents = getRuleByContentsForTool(toolPermissionContext, BashTool2, "deny");
+  const denyRuleByContents = getRuleByContentsForTool(toolPermissionContext, BashTool, "deny");
   const matchingDenyRules = filterRulesByContentsMatchingInput(input, denyRuleByContents, matchMode, { stripAllEnvVars: true, skipCompoundCheck: true });
-  const askRuleByContents = getRuleByContentsForTool(toolPermissionContext, BashTool2, "ask");
+  const askRuleByContents = getRuleByContentsForTool(toolPermissionContext, BashTool, "ask");
   const matchingAskRules = filterRulesByContentsMatchingInput(input, askRuleByContents, matchMode, { stripAllEnvVars: true, skipCompoundCheck: true });
-  const allowRuleByContents = getRuleByContentsForTool(toolPermissionContext, BashTool2, "allow");
+  const allowRuleByContents = getRuleByContentsForTool(toolPermissionContext, BashTool, "allow");
   const matchingAllowRules = filterRulesByContentsMatchingInput(input, allowRuleByContents, matchMode, { skipCompoundCheck });
   return {
     matchingDenyRules,
@@ -246815,7 +246830,7 @@ async function checkCommandAndSuggestRules(input, toolPermissionContext, command
       };
       return {
         behavior: "ask",
-        message: createPermissionRequestMessage2(BashTool2.name, decisionReason),
+        message: createPermissionRequestMessage2(BashTool.name, decisionReason),
         decisionReason,
         suggestions: []
       };
@@ -246836,7 +246851,7 @@ function checkSandboxAutoAllow(input, toolPermissionContext) {
   if (matchingDenyRules[0] !== undefined) {
     return {
       behavior: "deny",
-      message: `Permission to use ${BashTool2.name} with command ${command} has been denied.`,
+      message: `Permission to use ${BashTool.name} with command ${command} has been denied.`,
       decisionReason: {
         type: "rule",
         rule: matchingDenyRules[0]
@@ -246851,7 +246866,7 @@ function checkSandboxAutoAllow(input, toolPermissionContext) {
       if (subResult.matchingDenyRules[0] !== undefined) {
         return {
           behavior: "deny",
-          message: `Permission to use ${BashTool2.name} with command ${command} has been denied.`,
+          message: `Permission to use ${BashTool.name} with command ${command} has been denied.`,
           decisionReason: {
             type: "rule",
             rule: subResult.matchingDenyRules[0]
@@ -246863,7 +246878,7 @@ function checkSandboxAutoAllow(input, toolPermissionContext) {
     if (firstAskRule) {
       return {
         behavior: "ask",
-        message: createPermissionRequestMessage2(BashTool2.name),
+        message: createPermissionRequestMessage2(BashTool.name),
         decisionReason: {
           type: "rule",
           rule: firstAskRule
@@ -246874,7 +246889,7 @@ function checkSandboxAutoAllow(input, toolPermissionContext) {
   if (matchingAskRules[0] !== undefined) {
     return {
       behavior: "ask",
-      message: createPermissionRequestMessage2(BashTool2.name),
+      message: createPermissionRequestMessage2(BashTool.name),
       decisionReason: {
         type: "rule",
         rule: matchingAskRules[0]
@@ -246911,7 +246926,7 @@ function checkEarlyExitDeny(input, toolPermissionContext) {
   if (denyMatch !== undefined) {
     return {
       behavior: "deny",
-      message: `Permission to use ${BashTool2.name} with command ${input.command} has been denied.`,
+      message: `Permission to use ${BashTool.name} with command ${input.command} has been denied.`,
       decisionReason: { type: "rule", rule: denyMatch }
     };
   }
@@ -246926,7 +246941,7 @@ function checkSemanticsDeny(input, toolPermissionContext, commands) {
     if (subDeny !== undefined) {
       return {
         behavior: "deny",
-        message: `Permission to use ${BashTool2.name} with command ${input.command} has been denied.`,
+        message: `Permission to use ${BashTool.name} with command ${input.command} has been denied.`,
         decisionReason: { type: "rule", rule: subDeny }
       };
     }
@@ -246958,7 +246973,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
     return {
       behavior: "ask",
       decisionReason: decisionReason2,
-      message: createPermissionRequestMessage2(BashTool2.name, decisionReason2),
+      message: createPermissionRequestMessage2(BashTool.name, decisionReason2),
       suggestions: [],
       ...{}
     };
@@ -246976,7 +246991,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
       return {
         behavior: "ask",
         decisionReason: decisionReason2,
-        message: createPermissionRequestMessage2(BashTool2.name, decisionReason2),
+        message: createPermissionRequestMessage2(BashTool.name, decisionReason2),
         suggestions: []
       };
     }
@@ -246995,7 +247010,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
       return {
         behavior: "ask",
         decisionReason: decisionReason2,
-        message: createPermissionRequestMessage2(BashTool2.name, decisionReason2)
+        message: createPermissionRequestMessage2(BashTool.name, decisionReason2)
       };
     }
   }
@@ -247051,7 +247066,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
         }
         return {
           behavior: "ask",
-          message: createPermissionRequestMessage2(BashTool2.name),
+          message: createPermissionRequestMessage2(BashTool.name),
           decisionReason: {
             type: "other",
             reason: `Required by Bash prompt rule: "${askResult.matchedDescription}"`
@@ -247070,7 +247085,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
         appState = context3.getAppState();
         return {
           behavior: "ask",
-          message: createPermissionRequestMessage2(BashTool2.name, {
+          message: createPermissionRequestMessage2(BashTool.name, {
             type: "other",
             reason: safetyResult.message ?? "Command contains patterns that require approval"
           }),
@@ -247113,7 +247128,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
         };
         return {
           behavior: "ask",
-          message: createPermissionRequestMessage2(BashTool2.name, decisionReason2),
+          message: createPermissionRequestMessage2(BashTool.name, decisionReason2),
           decisionReason: decisionReason2,
           suggestions: [],
           ...{}
@@ -247133,7 +247148,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
     };
     return {
       behavior: "ask",
-      message: createPermissionRequestMessage2(BashTool2.name, decisionReason2),
+      message: createPermissionRequestMessage2(BashTool.name, decisionReason2),
       decisionReason: decisionReason2
     };
   }
@@ -247146,7 +247161,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
     return {
       behavior: "ask",
       decisionReason: decisionReason2,
-      message: createPermissionRequestMessage2(BashTool2.name, decisionReason2)
+      message: createPermissionRequestMessage2(BashTool.name, decisionReason2)
     };
   }
   const compoundCommandHasCd = cdCommands.length > 0;
@@ -247160,7 +247175,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
       return {
         behavior: "ask",
         decisionReason: decisionReason2,
-        message: createPermissionRequestMessage2(BashTool2.name, decisionReason2)
+        message: createPermissionRequestMessage2(BashTool.name, decisionReason2)
       };
     }
   }
@@ -247170,7 +247185,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
   if (deniedSubresult !== undefined) {
     return {
       behavior: "deny",
-      message: `Permission to use ${BashTool2.name} with command ${input.command} has been denied.`,
+      message: `Permission to use ${BashTool.name} with command ${input.command} has been denied.`,
       decisionReason: {
         type: "subcommandResults",
         reasons: new Map(subcommandPermissionDecisions.map((result, i3) => [
@@ -247296,7 +247311,7 @@ async function bashToolHasPermission(input, context3, getCommandSubcommandPrefix
   ] : undefined;
   return {
     behavior: askSubresult !== undefined ? "ask" : "passthrough",
-    message: createPermissionRequestMessage2(BashTool2.name, decisionReason),
+    message: createPermissionRequestMessage2(BashTool.name, decisionReason),
     decisionReason,
     suggestions: suggestedUpdates,
     ...{}
@@ -247337,7 +247352,7 @@ var bashCommandIsSafeAsync, splitCommand, ENV_VAR_ASSIGN_RE, MAX_SUBCOMMANDS_FOR
   if (matchingDenyRules[0] !== undefined) {
     return {
       behavior: "deny",
-      message: `Permission to use ${BashTool2.name} with command ${command} has been denied.`,
+      message: `Permission to use ${BashTool.name} with command ${command} has been denied.`,
       decisionReason: {
         type: "rule",
         rule: matchingDenyRules[0]
@@ -247347,7 +247362,7 @@ var bashCommandIsSafeAsync, splitCommand, ENV_VAR_ASSIGN_RE, MAX_SUBCOMMANDS_FOR
   if (matchingAskRules[0] !== undefined) {
     return {
       behavior: "ask",
-      message: createPermissionRequestMessage2(BashTool2.name),
+      message: createPermissionRequestMessage2(BashTool.name),
       decisionReason: {
         type: "rule",
         rule: matchingAskRules[0]
@@ -247370,7 +247385,7 @@ var bashCommandIsSafeAsync, splitCommand, ENV_VAR_ASSIGN_RE, MAX_SUBCOMMANDS_FOR
   };
   return {
     behavior: "passthrough",
-    message: createPermissionRequestMessage2(BashTool2.name, decisionReason),
+    message: createPermissionRequestMessage2(BashTool.name, decisionReason),
     decisionReason,
     suggestions: suggestionForExactCommand2(command)
   };
@@ -247386,7 +247401,7 @@ var bashCommandIsSafeAsync, splitCommand, ENV_VAR_ASSIGN_RE, MAX_SUBCOMMANDS_FOR
   if (matchingDenyRules[0] !== undefined) {
     return {
       behavior: "deny",
-      message: `Permission to use ${BashTool2.name} with command ${command} has been denied.`,
+      message: `Permission to use ${BashTool.name} with command ${command} has been denied.`,
       decisionReason: {
         type: "rule",
         rule: matchingDenyRules[0]
@@ -247396,7 +247411,7 @@ var bashCommandIsSafeAsync, splitCommand, ENV_VAR_ASSIGN_RE, MAX_SUBCOMMANDS_FOR
   if (matchingAskRules[0] !== undefined) {
     return {
       behavior: "ask",
-      message: createPermissionRequestMessage2(BashTool2.name),
+      message: createPermissionRequestMessage2(BashTool.name),
       decisionReason: {
         type: "rule",
         rule: matchingAskRules[0]
@@ -247428,7 +247443,7 @@ var bashCommandIsSafeAsync, splitCommand, ENV_VAR_ASSIGN_RE, MAX_SUBCOMMANDS_FOR
   if (modeResult.behavior !== "passthrough") {
     return modeResult;
   }
-  if (BashTool2.isReadOnly(input)) {
+  if (BashTool.isReadOnly(input)) {
     return {
       behavior: "allow",
       updatedInput: input,
@@ -247444,7 +247459,7 @@ var bashCommandIsSafeAsync, splitCommand, ENV_VAR_ASSIGN_RE, MAX_SUBCOMMANDS_FOR
   };
   return {
     behavior: "passthrough",
-    message: createPermissionRequestMessage2(BashTool2.name, decisionReason),
+    message: createPermissionRequestMessage2(BashTool.name, decisionReason),
     decisionReason,
     suggestions: suggestionForExactCommand2(command)
   };
@@ -256617,7 +256632,7 @@ function getReplPrimitiveTools() {
     FileEditTool,
     GlobTool,
     GrepTool,
-    BashTool2,
+    BashTool,
     NotebookEditTool,
     AgentTool
   ];
@@ -258856,7 +258871,7 @@ async function* runShellCommand({
   }
 }
 var fileEditUserFacingName, getBackgroundHintJSX2, renderToolResultMessage9, renderToolUseErrorMessage7, renderToolUseMessage9, renderToolUseProgressMessage3, renderToolUseQueuedMessage, EOL = `
-`, PROGRESS_THRESHOLD_MS2 = 2000, ASSISTANT_BLOCKING_BUDGET_MS = 15000, BASH_SEARCH_COMMANDS, BASH_READ_COMMANDS, BASH_LIST_COMMANDS, BASH_SEMANTIC_NEUTRAL_COMMANDS, BASH_SILENT_COMMANDS, DISALLOWED_AUTO_BACKGROUND_COMMANDS, isBackgroundTasksDisabled2, fullInputSchema2, inputSchema12, COMMON_BACKGROUND_COMMANDS, outputSchema11, BashTool2;
+`, PROGRESS_THRESHOLD_MS2 = 2000, ASSISTANT_BLOCKING_BUDGET_MS = 15000, BASH_SEARCH_COMMANDS, BASH_READ_COMMANDS, BASH_LIST_COMMANDS, BASH_SEMANTIC_NEUTRAL_COMMANDS, BASH_SILENT_COMMANDS, DISALLOWED_AUTO_BACKGROUND_COMMANDS, isBackgroundTasksDisabled2, fullInputSchema2, inputSchema12, COMMON_BACKGROUND_COMMANDS, outputSchema11, BashTool;
 var init_BashTool = __esm(() => {
   init_v4();
   init_state();
@@ -258979,7 +258994,7 @@ For commands that are harder to parse at a glance (piped commands, obscure flags
     persistedOutputPath: exports_external2.string().optional().describe("Path to the persisted full output in tool-results dir (set when output is too large for inline)"),
     persistedOutputSize: exports_external2.number().optional().describe("Total size of the output in bytes (set when output is too large for inline)")
   }));
-  BashTool2 = buildToolRuntime({
+  BashTool = buildToolRuntime({
     name: BASH_TOOL_NAME2,
     searchHint: "execute shell commands",
     maxResultSizeChars: 30000,
@@ -265347,7 +265362,7 @@ var init_PowerShellTool = __esm(() => {
 import { randomUUID as randomUUID8 } from "crypto";
 async function executeShellCommandsInPrompt(text, context3, slashCommandName, shell) {
   let result = text;
-  const shellTool = shell === "powershell" && isPowerShellToolEnabled() ? getPowerShellTool() : BashTool2;
+  const shellTool = shell === "powershell" && isPowerShellToolEnabled() ? getPowerShellTool() : BashTool;
   const blockMatches = text.matchAll(BLOCK_PATTERN);
   const inlineMatches = text.includes("!`") ? text.matchAll(INLINE_PATTERN) : [];
   await Promise.all([...blockMatches, ...inlineMatches].map(async (match) => {
@@ -282256,7 +282271,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-06-03T08:42:39.310Z").getTime();
+  const buildTime = new Date("2026-06-03T12:46:47.435Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -292669,8 +292684,8 @@ function normalizeToolInput(tool, input, agentId) {
       persistFileSnapshotIfRemote();
       return plan !== null ? { ...input, plan, planFilePath } : input;
     }
-    case BashTool2.name: {
-      const parsed = BashTool2.inputSchema.parse(input);
+    case BashTool.name: {
+      const parsed = BashTool.inputSchema.parse(input);
       const { command, timeout, description } = parsed;
       const cwd = getCwd3();
       let normalizedCommand = command.replace(`cd ${cwd} && `, "");
@@ -298760,6 +298775,7 @@ var init_messages4 = __esm(() => {
   init_xml();
   init_diagnostics2();
   init_Tool();
+  init_BashTool();
   init_FileReadTool();
   init_api3();
   init_config3();
@@ -334726,7 +334742,7 @@ var getSendMessageTool = () => (init_SendMessageTool(), __toCommonJS(exports_Sen
 function getSDKBuiltInTools() {
   return [
     AgentTool,
-    BashTool2,
+    BashTool,
     GlobTool,
     GrepTool,
     FileReadTool,
@@ -335436,4 +335452,4 @@ export {
   AbortError2 as AbortError
 };
 
-//# debugId=5C1C50C89C84EDAD64756E2164756E21
+//# debugId=EF5892485DBD67B164756E2164756E21

package/dist/lib/toolInputNullCoercion.d.ts

@@ -3,18 +3,21 @@ import type { z } from 'zod/v4';
  * 解析工具入参，并对 strict provider 把可选字段强制为 nullable 后模型回传的 `null`
  * 做兜底还原。
  *
- * 背景：OpenAI/Codex strict 模式要求每个属性都出现在 `required`，可选字段会被
+ * 背景：OpenAI/Codex/DeepSeek 等 strict 模式要求每个属性都出现在 `required`，可选字段会被
  * `makeSchemaNullable` 标成可空（见 lib/schemaSanitizer.ts），模型遂用 `null` 表达
  * 「未提供」。但工具的 Zod inputSchema 多用 `.optional()`（不接受 `null`），若直接
  * `safeParse` 会得到 InputValidationError —— 这正是「① 让 wire schema 可空」必须搭配的
  * 入参侧兜底（issue #79/#77）。
  *
- * 策略：先按原始 schema 解析；仅当「解析失败 且 顶层含 null 值」时，去掉这些 null 键
- * 再解析一次，且只有重试成功才采用重试结果。由此：
+ * 策略：先按原始 schema 解析；仅当「解析失败 且 入参任意层级含 null」时，递归去掉这些
+ * null 属性再解析一次，且只有重试成功才采用重试结果。由此：
  *   - 真正接受 null 的 `.nullable()` 字段：原始即可解析 → 不触发重试 → `null` 保留；
  *   - 与 null 无关的真实校验错误：去 null 后仍失败 → 返回原始错误，不掩盖；
  *   - 可选非空字段被强制塞入的 `null`：去掉后变缺省，`.optional()` 通过。
  *
- * 仅处理顶层 null，与 `makeSchemaNullable` 仅顶层可空的范围对齐。
+ * 递归处理嵌套对象与数组元素——`human_form_input` 这类工具的可选字段藏在
+ * `variables[].min_value` 等数组元素内部，模型对不适用的字段（如文本框的数值范围）
+ * 习惯性回传 `null`，只剥顶层会漏掉它们、导致整个阻塞工具因校验失败被跳过（handler
+ * 不执行、不阻塞，对话直接溜到下一轮）。
  */
 export declare function safeParseToolInputWithNullCoercion<T extends z.ZodType>(schema: T, input: unknown): ReturnType<T['safeParse']>;