@verboo/code 0.15.15 → 0.15.16

package/dist/cli.mjs

@@ -118686,7 +118686,7 @@ function getClaudeCodeUserAgent() {
   return `claude-code/${"99.0.0"}`;
 }
 function getVerbooCodeUserAgent() {
-  const version2 = "0.15.15";
+  const version2 = "0.15.16";
   return `verboo-code/${version2}`;
 }
 
@@ -152397,19 +152397,26 @@ function toolMatchesName(tool, name) {
 function findToolByName(tools, name) {
   return tools.find((t) => toolMatchesName(t, name));
 }
-function findToolByNameOrUniquePrefix(tools, name) {
-  const exactMatch = findToolByName(tools, name);
-  if (exactMatch)
-    return exactMatch;
+function resolveToolNameByUniquePrefix(toolNames, name) {
+  const uniqueToolNames = [...new Set(toolNames)];
+  if (uniqueToolNames.includes(name))
+    return name;
   if (name.length < 3 || name.startsWith("mcp__"))
     return;
-  const prefixMatches = tools.filter((tool) => tool.name.startsWith(name));
-  const oneCharacterCompletions = prefixMatches.filter((tool) => tool.name.length === name.length + 1);
+  const prefixMatches = uniqueToolNames.filter((toolName) => toolName.startsWith(name));
+  const oneCharacterCompletions = prefixMatches.filter((toolName) => toolName.length === name.length + 1);
   if (oneCharacterCompletions.length === 1) {
     return oneCharacterCompletions[0];
   }
   return prefixMatches.length === 1 ? prefixMatches[0] : undefined;
 }
+function findToolByNameOrUniquePrefix(tools, name) {
+  const exactMatch = findToolByName(tools, name);
+  if (exactMatch)
+    return exactMatch;
+  const resolvedName = resolveToolNameByUniquePrefix(tools.map((tool) => tool.name), name);
+  return resolvedName ? tools.find((tool) => tool.name === resolvedName) : undefined;
+}
 function buildTool(def) {
   return {
     ...TOOL_DEFAULTS,
@@ -193263,7 +193270,7 @@ async function collectCodexCompletedResponse(response, signal) {
   }
   return completedResponse;
 }
-async function* codexStreamToAnthropic(response, model2, signal) {
+async function* codexStreamToAnthropic(response, model2, signal, advertisedToolNames = []) {
   const messageId = makeMessageId();
   const toolBlocksByItemId = new Map;
   let activeTextBlockIndex = null;
@@ -193301,6 +193308,107 @@ async function* codexStreamToAnthropic(response, model2, signal) {
       content_block: { type: "text", text: "" }
     };
   };
+  const findToolBlockEntry = (item) => {
+    for (const candidate of [item.id, item.call_id]) {
+      if (candidate == null)
+        continue;
+      const itemId = String(candidate);
+      const toolBlock = toolBlocksByItemId.get(itemId);
+      if (toolBlock)
+        return [itemId, toolBlock];
+    }
+    return;
+  };
+  const toolNameMayBeIncomplete = (name) => Boolean(name) && !advertisedToolNames.includes(name) && advertisedToolNames.some((toolName) => toolName.startsWith(name));
+  const canonicalizeFinalToolName = (toolBlock) => {
+    const resolvedName = resolveToolNameByUniquePrefix(advertisedToolNames, toolBlock.name);
+    if (resolvedName)
+      toolBlock.name = resolvedName;
+  };
+  const applyFinalToolItem = (toolBlock, item) => {
+    if (typeof item.name === "string" && item.name) {
+      toolBlock.name = item.name;
+    }
+    if (typeof item.arguments === "string" && (!toolBlock.hasStarted || item.arguments.startsWith(toolBlock.argumentsBuffer))) {
+      toolBlock.argumentsBuffer = item.arguments;
+    }
+    canonicalizeFinalToolName(toolBlock);
+  };
+  const emitPendingToolArguments = async function* (toolBlock) {
+    if (!toolBlock.hasStarted || toolBlock.emittedArgumentsLength >= toolBlock.argumentsBuffer.length) {
+      return;
+    }
+    yield {
+      type: "content_block_delta",
+      index: toolBlock.index,
+      delta: {
+        type: "input_json_delta",
+        partial_json: toolBlock.argumentsBuffer.slice(toolBlock.emittedArgumentsLength)
+      }
+    };
+    toolBlock.emittedArgumentsLength = toolBlock.argumentsBuffer.length;
+  };
+  const startToolBlock = async function* (toolBlock, force = false) {
+    if (toolBlock.hasStarted)
+      return;
+    if (!force && (!toolBlock.name || toolNameMayBeIncomplete(toolBlock.name))) {
+      return;
+    }
+    if (force)
+      canonicalizeFinalToolName(toolBlock);
+    toolBlock.hasStarted = true;
+    toolBlock.startedName = toolBlock.name || "tool";
+    yield {
+      type: "content_block_start",
+      index: toolBlock.index,
+      content_block: {
+        type: "tool_use",
+        id: toolBlock.toolUseId,
+        name: toolBlock.startedName,
+        input: {}
+      }
+    };
+    yield* emitPendingToolArguments(toolBlock);
+  };
+  const flushToolBlocks = async function* (force = false) {
+    const orderedBlocks = [...toolBlocksByItemId.values()].sort((a2, b) => a2.index - b.index);
+    for (const toolBlock of orderedBlocks) {
+      if (toolBlock.hasStopped)
+        continue;
+      if (!toolBlock.hasStarted) {
+        yield* startToolBlock(toolBlock, force || toolBlock.isDone);
+        if (!toolBlock.hasStarted)
+          break;
+      }
+      if (toolBlock.isDone && toolBlock.startedName !== (toolBlock.name || "tool")) {
+        toolBlock.startedName = toolBlock.name || "tool";
+        yield {
+          type: "content_block_start",
+          index: toolBlock.index,
+          content_block: {
+            type: "tool_use",
+            id: toolBlock.toolUseId,
+            name: toolBlock.startedName,
+            input: {}
+          }
+        };
+      }
+      yield* emitPendingToolArguments(toolBlock);
+      if (toolBlock.isDone) {
+        yield {
+          type: "content_block_stop",
+          index: toolBlock.index
+        };
+        toolBlock.hasStopped = true;
+      }
+    }
+  };
+  const removeStoppedToolBlocks = () => {
+    for (const [itemId, toolBlock] of toolBlocksByItemId) {
+      if (toolBlock.hasStopped)
+        toolBlocksByItemId.delete(itemId);
+    }
+  };
   yield {
     type: "message_start",
     message: {
@@ -193322,31 +193430,19 @@ async function* codexStreamToAnthropic(response, model2, signal) {
         yield* closeActiveTextBlock();
         const blockIndex = nextContentBlockIndex++;
         const toolUseId = item.call_id ?? item.id ?? `call_${blockIndex}`;
-        toolBlocksByItemId.set(String(item.id ?? toolUseId), {
+        const toolBlock = {
           index: blockIndex,
-          toolUseId
-        });
-        sawToolUse = true;
-        yield {
-          type: "content_block_start",
-          index: blockIndex,
-          content_block: {
-            type: "tool_use",
-            id: toolUseId,
-            name: item.name ?? "tool",
-            input: {}
-          }
+          toolUseId,
+          name: typeof item.name === "string" ? item.name : "",
+          argumentsBuffer: typeof item.arguments === "string" ? item.arguments : "",
+          emittedArgumentsLength: 0,
+          hasStarted: false,
+          isDone: false,
+          hasStopped: false
         };
-        if (item.arguments) {
-          yield {
-            type: "content_block_delta",
-            index: blockIndex,
-            delta: {
-              type: "input_json_delta",
-              partial_json: item.arguments
-            }
-          };
-        }
+        toolBlocksByItemId.set(String(item.id ?? toolUseId), toolBlock);
+        sawToolUse = true;
+        yield* flushToolBlocks();
       }
       continue;
     }
@@ -193376,27 +193472,23 @@ async function* codexStreamToAnthropic(response, model2, signal) {
     if (event.event === "response.function_call_arguments.delta") {
       const toolBlock = toolBlocksByItemId.get(String(payload.item_id ?? ""));
       if (toolBlock) {
-        yield {
-          type: "content_block_delta",
-          index: toolBlock.index,
-          delta: {
-            type: "input_json_delta",
-            partial_json: payload.delta ?? ""
-          }
-        };
+        if (typeof payload.delta === "string") {
+          toolBlock.argumentsBuffer += payload.delta;
+        }
+        yield* flushToolBlocks();
       }
       continue;
     }
     if (event.event === "response.output_item.done") {
       const item = payload.item;
       if (item?.type === "function_call") {
-        const toolBlock = toolBlocksByItemId.get(String(item.id ?? ""));
-        if (toolBlock) {
-          yield {
-            type: "content_block_stop",
-            index: toolBlock.index
-          };
-          toolBlocksByItemId.delete(String(item.id));
+        const toolBlockEntry = findToolBlockEntry(item);
+        if (toolBlockEntry) {
+          const [, toolBlock] = toolBlockEntry;
+          applyFinalToolItem(toolBlock, item);
+          toolBlock.isDone = true;
+          yield* flushToolBlocks();
+          removeStoppedToolBlocks();
         }
       } else if (item?.type === "message") {
         yield* closeActiveTextBlock();
@@ -193413,12 +193505,20 @@ async function* codexStreamToAnthropic(response, model2, signal) {
     }
   }
   yield* closeActiveTextBlock();
+  const finalOutput = Array.isArray(finalResponse?.output) ? finalResponse.output : [];
+  for (const item of finalOutput) {
+    if (item?.type !== "function_call")
+      continue;
+    const toolBlockEntry = findToolBlockEntry(item);
+    if (!toolBlockEntry)
+      continue;
+    applyFinalToolItem(toolBlockEntry[1], item);
+  }
   for (const toolBlock of toolBlocksByItemId.values()) {
-    yield {
-      type: "content_block_stop",
-      index: toolBlock.index
-    };
+    toolBlock.isDone = true;
   }
+  yield* flushToolBlocks(true);
+  removeStoppedToolBlocks();
   yield {
     type: "message_delta",
     delta: {
@@ -193429,7 +193529,7 @@ async function* codexStreamToAnthropic(response, model2, signal) {
   };
   yield { type: "message_stop" };
 }
-function convertCodexResponseToAnthropicMessage(data, model2) {
+function convertCodexResponseToAnthropicMessage(data, model2, advertisedToolNames = []) {
   const content = [];
   const output = Array.isArray(data.output) ? data.output : [];
   for (const item of output) {
@@ -193445,6 +193545,7 @@ function convertCodexResponseToAnthropicMessage(data, model2) {
       continue;
     }
     if (item?.type === "function_call") {
+      const toolName = resolveToolNameByUniquePrefix(advertisedToolNames, item.name ?? "") ?? item.name ?? "tool";
       let input;
       try {
         input = JSON.parse(item.arguments ?? "{}");
@@ -193454,7 +193555,7 @@ function convertCodexResponseToAnthropicMessage(data, model2) {
       content.push({
         type: "tool_use",
         id: item.call_id ?? item.id ?? makeMessageId(),
-        name: item.name ?? "tool",
+        name: toolName,
         input
       });
     }
@@ -193472,6 +193573,7 @@ function convertCodexResponseToAnthropicMessage(data, model2) {
 }
 var init_codexShim = __esm(() => {
   init_sdk();
+  init_Tool();
   init_cacheMetrics();
   init_compressToolHistory();
   init_fetchWithProxyRetry();
@@ -194735,6 +194837,16 @@ function repairPossiblyTruncatedObjectJson(raw) {
     return null;
   }
 }
+function mergeStreamedToolName(current, fragment) {
+  if (!fragment)
+    return current;
+  if (!current || fragment.startsWith(current))
+    return fragment;
+  return current + fragment;
+}
+function getAdvertisedToolNames(params) {
+  return (params.tools ?? []).flatMap((tool) => typeof tool.name === "string" && tool.name && tool.name !== "ToolSearchTool" ? [tool.name] : []);
+}
 function setOpenAIShimRouterStatusHandler(fn) {
   if (routerStatusHandler && activeWarmingHints.size > 0) {
     routerStatusHandler(null);
@@ -194800,7 +194912,7 @@ function createWarmingHintController(signal) {
   }
   return { schedule, showNow, resolve: resolve19 };
 }
-async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
+async function* openaiStreamToAnthropic(response, model2, signal, warmingHint, advertisedToolNames = []) {
   const messageId = makeMessageId2();
   let contentBlockIndex = 0;
   const activeToolCalls = new Map;
@@ -194888,6 +195000,74 @@ async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
     contentBlockIndex++;
     hasEmittedContentStart = false;
   };
+  const toolNameMayBeIncomplete = (name) => Boolean(name) && !advertisedToolNames.includes(name) && advertisedToolNames.some((toolName) => toolName.startsWith(name));
+  const canonicalizeFinalToolName = (toolCall) => {
+    const resolvedName = resolveToolNameByUniquePrefix(advertisedToolNames, toolCall.name);
+    if (resolvedName)
+      toolCall.name = resolvedName;
+  };
+  const startToolCall = async function* (toolCall, force = false) {
+    if (toolCall.hasStarted || !toolCall.id || !toolCall.name)
+      return;
+    if (!force && toolNameMayBeIncomplete(toolCall.name))
+      return;
+    if (force)
+      canonicalizeFinalToolName(toolCall);
+    toolCall.normalizeAtStop = hasToolFieldMapping(toolCall.name);
+    toolCall.hasStarted = true;
+    toolCall.startedName = toolCall.name;
+    yield {
+      type: "content_block_start",
+      index: toolCall.index,
+      content_block: {
+        type: "tool_use",
+        id: toolCall.id,
+        name: toolCall.name,
+        input: {},
+        ...toolCall.extra_content ? { extra_content: toolCall.extra_content } : {},
+        ...toolCall.extra_content?.google?.thought_signature ? {
+          signature: (toolCall.extra_content?.google).thought_signature
+        } : {}
+      }
+    };
+    if (!toolCall.normalizeAtStop && toolCall.jsonBuffer) {
+      yield {
+        type: "content_block_delta",
+        index: toolCall.index,
+        delta: {
+          type: "input_json_delta",
+          partial_json: toolCall.jsonBuffer
+        }
+      };
+      toolCall.emittedJsonLength = toolCall.jsonBuffer.length;
+    }
+  };
+  const flushReadyToolCalls = async function* (force = false) {
+    const orderedCalls = [...activeToolCalls.values()].sort((a2, b) => a2.index - b.index);
+    for (const toolCall of orderedCalls) {
+      if (!toolCall.hasStarted) {
+        if (!force && !toolCall.readyToStart)
+          break;
+        yield* startToolCall(toolCall, force);
+        if (!toolCall.hasStarted) {
+          if (!force)
+            break;
+          continue;
+        }
+      }
+      if (!toolCall.normalizeAtStop && toolCall.emittedJsonLength < toolCall.jsonBuffer.length) {
+        yield {
+          type: "content_block_delta",
+          index: toolCall.index,
+          delta: {
+            type: "input_json_delta",
+            partial_json: toolCall.jsonBuffer.slice(toolCall.emittedJsonLength)
+          }
+        };
+        toolCall.emittedJsonLength = toolCall.jsonBuffer.length;
+      }
+    }
+  };
   try {
     while (true) {
       const { done, value } = await readWithTimeout();
@@ -194908,7 +195088,9 @@ async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
             yield { type: "content_block_stop", index: contentBlockIndex };
           }
           for (const [, toolCall] of activeToolCalls) {
-            yield { type: "content_block_stop", index: toolCall.index };
+            if (toolCall.hasStarted) {
+              yield { type: "content_block_stop", index: toolCall.index };
+            }
           }
           activeToolCalls.clear();
           throw new Error(`Upstream stream closed without finish_reason after ${elapsedSec}s — likely a guard_proxy/vLLM disconnect. The session was interrupted, not completed.`);
@@ -194948,7 +195130,9 @@ async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
             yield { type: "content_block_stop", index: contentBlockIndex };
           }
           for (const [, toolCall] of activeToolCalls) {
-            yield { type: "content_block_stop", index: toolCall.index };
+            if (toolCall.hasStarted) {
+              yield { type: "content_block_stop", index: toolCall.index };
+            }
           }
           activeToolCalls.clear();
           const errorPayload = {
@@ -195007,7 +195191,8 @@ async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
           }
           if (delta.tool_calls) {
             for (const tc of delta.tool_calls) {
-              if (tc.id && tc.function?.name) {
+              let active = activeToolCalls.get(tc.index);
+              if (!active) {
                 if (hasEmittedThinkingStart && !hasClosedThinking) {
                   yield {
                     type: "content_block_stop",
@@ -195019,83 +195204,43 @@ async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
                 if (hasEmittedContentStart) {
                   yield* closeActiveContentBlock();
                 }
-                const toolBlockIndex = contentBlockIndex;
-                const initialArguments = tc.function.arguments ?? "";
-                const normalizeAtStop = hasToolFieldMapping(tc.function.name);
-                processStreamChunk(streamState, tc.function.arguments ?? "");
-                const topLevelSig = tc.thought_signature;
-                const initEC = tc.extra_content ? { ...tc.extra_content } : topLevelSig ? { google: { thought_signature: topLevelSig } } : undefined;
-                activeToolCalls.set(tc.index, {
-                  id: tc.id,
-                  name: tc.function.name,
-                  index: toolBlockIndex,
-                  jsonBuffer: initialArguments,
-                  normalizeAtStop,
-                  extra_content: initEC
-                });
-                yield {
-                  type: "content_block_start",
-                  index: toolBlockIndex,
-                  content_block: {
-                    type: "tool_use",
-                    id: tc.id,
-                    name: tc.function.name,
-                    input: {},
-                    ...initEC ? { extra_content: initEC } : {},
-                    ...initEC?.google?.thought_signature ? { signature: initEC.google.thought_signature } : {}
-                  }
+                active = {
+                  id: "",
+                  name: "",
+                  index: contentBlockIndex++,
+                  jsonBuffer: "",
+                  emittedJsonLength: 0,
+                  normalizeAtStop: false,
+                  hasStarted: false,
+                  readyToStart: false
                 };
-                contentBlockIndex++;
-                if (tc.function.arguments && !normalizeAtStop) {
-                  yield {
-                    type: "content_block_delta",
-                    index: toolBlockIndex,
-                    delta: {
-                      type: "input_json_delta",
-                      partial_json: tc.function.arguments
-                    }
-                  };
-                }
-              } else if (tc.function?.arguments) {
-                const active = activeToolCalls.get(tc.index);
-                if (active) {
-                  if (tc.function.arguments) {
-                    active.jsonBuffer += tc.function.arguments;
-                  }
-                  const contSig = tc.thought_signature;
-                  const contEC = tc.extra_content ? { ...tc.extra_content } : contSig ? { google: { thought_signature: contSig } } : undefined;
-                  if (contEC) {
-                    active.extra_content = {
-                      ...active.extra_content ?? {},
-                      ...contEC
-                    };
-                  }
-                  if (active.normalizeAtStop) {
-                    continue;
-                  }
-                  yield {
-                    type: "content_block_delta",
-                    index: active.index,
-                    delta: {
-                      type: "input_json_delta",
-                      partial_json: tc.function.arguments
-                    }
-                  };
-                }
-              } else {
-                const active = activeToolCalls.get(tc.index);
-                if (active) {
-                  const lateSig = tc.thought_signature;
-                  const lateEC = tc.extra_content ? { ...tc.extra_content } : lateSig ? { google: { thought_signature: lateSig } } : undefined;
-                  if (lateEC) {
-                    active.extra_content = {
-                      ...active.extra_content ?? {},
-                      ...lateEC
-                    };
-                  }
-                }
+                activeToolCalls.set(tc.index, active);
+              }
+              if (tc.id && !active.id) {
+                active.id = tc.id;
+              }
+              const nameFragment = tc.function?.name;
+              if (nameFragment) {
+                active.name = mergeStreamedToolName(active.name, nameFragment);
+              }
+              const argumentFragment = tc.function?.arguments;
+              if (typeof argumentFragment === "string") {
+                active.jsonBuffer += argumentFragment;
+                processStreamChunk(streamState, argumentFragment);
+              }
+              const thoughtSignature = tc.thought_signature;
+              const extraContent = tc.extra_content ? { ...tc.extra_content } : thoughtSignature ? { google: { thought_signature: thoughtSignature } } : undefined;
+              if (extraContent) {
+                active.extra_content = {
+                  ...active.extra_content ?? {},
+                  ...extraContent
+                };
+              }
+              if (argumentFragment?.trim()) {
+                active.readyToStart = true;
               }
             }
+            yield* flushReadyToolCalls();
           }
           if (choice.finish_reason && !hasProcessedFinishReason) {
             hasProcessedFinishReason = true;
@@ -195107,8 +195252,20 @@ async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
             if (hasEmittedContentStart) {
               yield* closeActiveContentBlock();
             }
+            for (const toolCall of activeToolCalls.values()) {
+              canonicalizeFinalToolName(toolCall);
+              if (toolCall.emittedJsonLength === 0) {
+                toolCall.normalizeAtStop = hasToolFieldMapping(toolCall.name);
+              }
+            }
+            const startedBeforeFinish = new Set([...activeToolCalls.values()].filter((toolCall) => toolCall.hasStarted).map((toolCall) => toolCall.index));
+            yield* flushReadyToolCalls(true);
             for (const [, tc] of activeToolCalls) {
-              if (tc.extra_content) {
+              const wasStarted = startedBeforeFinish.has(tc.index);
+              if (!tc.hasStarted) {
+                continue;
+              }
+              if (wasStarted && (tc.extra_content || tc.startedName !== tc.name)) {
                 yield {
                   type: "content_block_start",
                   index: tc.index,
@@ -195117,9 +195274,9 @@ async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
                     id: tc.id,
                     name: tc.name,
                     input: {},
-                    extra_content: tc.extra_content,
-                    ...tc.extra_content.google?.thought_signature ? {
-                      signature: tc.extra_content.google.thought_signature
+                    ...tc.extra_content ? { extra_content: tc.extra_content } : {},
+                    ...tc.extra_content?.google?.thought_signature ? {
+                      signature: (tc.extra_content?.google).thought_signature
                     } : {}
                   }
                 };
@@ -195147,6 +195304,17 @@ async function* openaiStreamToAnthropic(response, model2, signal, warmingHint) {
                 yield { type: "content_block_stop", index: tc.index };
                 continue;
               }
+              if (tc.emittedJsonLength < tc.jsonBuffer.length) {
+                yield {
+                  type: "content_block_delta",
+                  index: tc.index,
+                  delta: {
+                    type: "input_json_delta",
+                    partial_json: tc.jsonBuffer.slice(tc.emittedJsonLength)
+                  }
+                };
+                tc.emittedJsonLength = tc.jsonBuffer.length;
+              }
               let suffixToAdd = "";
               if (tc.jsonBuffer) {
                 try {
@@ -195303,6 +195471,7 @@ class OpenAIShimMessages {
   }
   create(params, options2) {
     const self2 = this;
+    const advertisedToolNames = getAdvertisedToolNames(params);
     let httpResponse;
     const promise3 = (async () => {
       const request = resolveProviderRequest({
@@ -195323,12 +195492,12 @@ class OpenAIShimMessages {
       httpResponse = response;
       if (params.stream) {
         const isResponsesStream = response.url?.includes("/responses");
-        return new OpenAIShimStream(request.transport === "codex_responses" || request.transport === "responses" || isResponsesStream ? codexStreamToAnthropic(response, request.resolvedModel, options2?.signal) : openaiStreamToAnthropic(response, request.resolvedModel, options2?.signal, warmingHint), warmingHint);
+        return new OpenAIShimStream(request.transport === "codex_responses" || request.transport === "responses" || isResponsesStream ? codexStreamToAnthropic(response, request.resolvedModel, options2?.signal, advertisedToolNames) : openaiStreamToAnthropic(response, request.resolvedModel, options2?.signal, warmingHint, advertisedToolNames), warmingHint);
       }
       warmingHint.resolve();
       if (request.transport === "codex_responses") {
         const data = await collectCodexCompletedResponse(response, options2?.signal);
-        return convertCodexResponseToAnthropicMessage(data, request.resolvedModel);
+        return convertCodexResponseToAnthropicMessage(data, request.resolvedModel, advertisedToolNames);
       }
       const isResponsesNonStream = response.url?.includes("/responses");
       if (request.transport === "responses" || isResponsesNonStream || request.transport === "chat_completions" && isGithubModelsMode()) {
@@ -195336,15 +195505,15 @@ class OpenAIShimMessages {
         if (contentType2.includes("application/json")) {
           const parsed = await response.json();
           if (parsed && typeof parsed === "object" && (("output" in parsed) || ("incomplete_details" in parsed))) {
-            return convertCodexResponseToAnthropicMessage(parsed, request.resolvedModel);
+            return convertCodexResponseToAnthropicMessage(parsed, request.resolvedModel, advertisedToolNames);
           }
-          return self2._convertNonStreamingResponse(parsed, request.resolvedModel);
+          return self2._convertNonStreamingResponse(parsed, request.resolvedModel, advertisedToolNames);
         }
       }
       const contentType = response.headers.get("content-type") ?? "";
       if (contentType.includes("application/json")) {
         const data = await response.json();
-        return self2._convertNonStreamingResponse(data, request.resolvedModel);
+        return self2._convertNonStreamingResponse(data, request.resolvedModel, advertisedToolNames);
       }
       const textBody = await response.text().catch(() => "");
       throw APIError.generate(response.status, undefined, `OpenAI API error ${response.status}: unexpected response: ${textBody.slice(0, 500)}`, response.headers);
@@ -195839,7 +196008,7 @@ class OpenAIShimMessages {
     }
     throw APIError.generate(500, undefined, "OpenAI shim: request loop exited unexpectedly", new Headers);
   }
-  _convertNonStreamingResponse(data, model2) {
+  _convertNonStreamingResponse(data, model2, advertisedToolNames = []) {
     const choice = data.choices?.[0];
     const content = [];
     const reasoningText = choice?.message?.reasoning_content;
@@ -195870,11 +196039,12 @@ class OpenAIShimMessages {
     }
     if (choice?.message?.tool_calls) {
       for (const tc of choice.message.tool_calls) {
-        const input = normalizeToolArguments(tc.function.name, tc.function.arguments);
+        const toolName = resolveToolNameByUniquePrefix(advertisedToolNames, tc.function.name) ?? tc.function.name;
+        const input = normalizeToolArguments(toolName, tc.function.arguments);
         content.push({
           type: "tool_use",
           id: tc.id,
-          name: tc.function.name,
+          name: toolName,
           input,
           ...tc.extra_content ? { extra_content: tc.extra_content } : {},
           ...tc.extra_content?.google?.thought_signature ? { signature: tc.extra_content.google.thought_signature } : {}
@@ -195926,6 +196096,7 @@ function createOpenAIShimClient(options2) {
 var GITHUB_429_MAX_RETRIES = 3, GITHUB_429_BASE_DELAY_SEC = 1, GITHUB_429_MAX_DELAY_SEC = 32, GEMINI_API_HOST = "generativelanguage.googleapis.com", VERBOO_SESSION_HEADER = "X-Verboo-Session-Id", COPILOT_HEADERS2, JSON_REPAIR_SUFFIXES, routerStatusHandler = null, routerStatusHandlerGeneration = 0, activeWarmingHints, OpenAIShimStream;
 var init_openaiShim = __esm(() => {
   init_sdk();
+  init_Tool();
   init_state();
   init_oauth();
   init_codexCredentials();
@@ -297859,7 +298030,7 @@ async function* runTools(toolUseMessages, assistantMessages, canUseTool, toolUse
 }
 function partitionToolCalls(toolUseMessages, toolUseContext) {
   return toolUseMessages.reduce((acc, toolUse) => {
-    const tool = findToolByName(toolUseContext.options.tools, toolUse.name);
+    const tool = findToolByNameOrUniquePrefix(toolUseContext.options.tools, toolUse.name);
     const parsedInput = tool?.inputSchema.safeParse(toolUse.input);
     const isConcurrencySafe = parsedInput?.success ? (() => {
       try {
@@ -298044,7 +298215,7 @@ async function* handleOrphanedPermission(orphanedPermission, tools, mutableMessa
   }
   const toolName = toolUseBlock.name;
   const toolInput = toolUseBlock.input;
-  const toolDefinition = findToolByName(tools, toolName);
+  const toolDefinition = findToolByNameOrUniquePrefix(tools, toolName);
   if (!toolDefinition) {
     return;
   }
@@ -300196,7 +300367,7 @@ function getToolSearchOrReadInfo(toolName, toolInput, tools) {
       isAbsorbedSilently: true
     };
   }
-  const tool = findToolByName(tools, toolName) ?? findToolByName(getReplPrimitiveTools(), toolName);
+  const tool = findToolByNameOrUniquePrefix(tools, toolName) ?? findToolByNameOrUniquePrefix(getReplPrimitiveTools(), toolName);
   if (!tool?.isSearchOrReadCommand) {
     return {
       isCollapsible: false,
@@ -300775,7 +300946,7 @@ function getProgressUpdate(tracker) {
 }
 function createActivityDescriptionResolver(tools) {
   return (toolName, input) => {
-    const tool = findToolByName(tools, toolName);
+    const tool = findToolByNameOrUniquePrefix(tools, toolName);
     return tool?.getActivityDescription?.(input) ?? undefined;
   };
 }
@@ -323064,7 +323235,17 @@ async function resendCardlessTrialCode(accessToken, verificationId) {
 }
 async function isGroupSubscriptionActive(accessToken, groupId, opts = {}) {
   const subscriptions = await fetchSubscriptions(accessToken, opts);
-  return subscriptions.some((sub) => sub.groupId === groupId && (sub.status === "active" || sub.status === "trialing"));
+  return hasGroupSubscriptionEntitlement(subscriptions, groupId, opts.requirement ?? "access");
+}
+function hasGroupSubscriptionEntitlement(subscriptions, groupId, requirement) {
+  return subscriptions.some((subscription) => {
+    if (subscription.groupId !== groupId)
+      return false;
+    if (requirement === "access") {
+      return subscription.status === "active" || subscription.status === "trialing";
+    }
+    return subscription.status === "active" && (subscription.source === "stripe" || subscription.source === "stripe_trial" || subscription.source === "woovi");
+  });
 }
 var httpUrlSchema, checkoutResultSchema, checkoutInputSchema, whatsappProfileSchema, cardlessTrialInputSchema, verificationRequiredSchema, trialActivatedSchema, cardlessTrialResultSchema;
 var init_verbooCheckout = __esm(() => {
@@ -323077,9 +323258,14 @@ var init_verbooCheckout = __esm(() => {
   init_verbooSubscriptions();
   httpUrlSchema = exports_external2.string().url().refine((value) => value.startsWith("https://") || value.startsWith("http://"));
   checkoutResultSchema = exports_external2.discriminatedUnion("mode", [
-    exports_external2.object({ mode: exports_external2.literal("stripe"), url: httpUrlSchema }).passthrough(),
+    exports_external2.object({
+      mode: exports_external2.literal("stripe"),
+      attemptId: exports_external2.string().uuid(),
+      url: httpUrlSchema
+    }).passthrough(),
     exports_external2.object({
       mode: exports_external2.literal("woovi"),
+      attemptId: exports_external2.string().uuid(),
       wooviQrCode: exports_external2.string().min(1),
       wooviSubscriptionId: exports_external2.string().min(1)
     }).passthrough(),
@@ -323320,6 +323506,9 @@ function movePlanFocus(index, direction, count3, columns) {
 function isCurrentLocalTrial(subscription) {
   return subscription?.status === "trialing" && ["trial", "stripe_trial"].includes(subscription.source ?? "");
 }
+function getStripeTrialConversionUrl(subscriptionId, billingInterval) {
+  return `${VERBOO_FRONT_BASE_URL}/pt/settings/billing?subscription=${encodeURIComponent(subscriptionId)}&action=convert&billingInterval=${encodeURIComponent(billingInterval)}`;
+}
 function filterCliPurchasablePlans(groups, subscriptions) {
   const subscriptionsByGroup = new Map(subscriptions.filter((subscription) => ["active", "trialing", "past_due"].includes(subscription.status)).map((subscription) => [subscription.groupId, subscription]));
   return groups.filter((group) => {
@@ -323377,10 +323566,10 @@ function paymentProviderLabel(group) {
   }
 }
 function hasCardlessTrial(group) {
-  return Boolean(group.trialEligible && group.trialDays && group.trialPaymentMethodRequired === false && group.paymentProvider !== "woovi");
+  return Boolean(group.trialEligible && group.trialDays && group.billingInterval === "month" && group.trialPaymentMethodRequired === false && group.paymentProvider !== "woovi");
 }
 function hasCardTrial(group) {
-  return Boolean(group.trialEligible && group.trialDays && group.trialPaymentMethodRequired !== false && group.paymentProvider !== "woovi");
+  return Boolean(group.trialEligible && group.trialDays && group.billingInterval === "month" && group.trialPaymentMethodRequired !== false && group.paymentProvider !== "woovi");
 }
 function getPlanDetailOptions(plan) {
   if (hasCardlessTrial(plan)) {
@@ -323831,12 +324020,15 @@ function PurchaseFlowView({
   const columnCount = getPlanColumnCount(terminalColumns);
   const [step, setStep] = import_react66.useState("splash");
   const [plans, setPlans] = import_react66.useState([]);
+  const [subscriptionsByGroup, setSubscriptionsByGroup] = import_react66.useState(new Map);
   const [selectedPlan, setSelectedPlan] = import_react66.useState(null);
   const [focusIndex, setFocusIndex] = import_react66.useState(0);
   const [inlineMessage, setInlineMessage] = import_react66.useState(null);
   const [flowError, setFlowError] = import_react66.useState(null);
   const [wooviPayment, setWooviPayment] = import_react66.useState(null);
   const [manualCheckoutUrl, setManualCheckoutUrl] = import_react66.useState(null);
+  const [manualEntitlementRequirement, setManualEntitlementRequirement] = import_react66.useState("paid");
+  const [successRequirement, setSuccessRequirement] = import_react66.useState("paid");
   const [whatsappProfile, setWhatsAppProfile] = import_react66.useState(null);
   const [cardlessVerification, setCardlessVerification] = import_react66.useState(null);
   const plansRequestRef = import_react66.default.useRef(null);
@@ -323853,7 +324045,8 @@ function PurchaseFlowView({
     setFlowError({ message, backStep, retryLabel: retry?.label });
     setStep("error");
   }, []);
-  const complete = import_react66.useCallback(() => {
+  const complete = import_react66.useCallback((requirement) => {
+    setSuccessRequirement(requirement);
     setStep("success");
     if (successTimerRef.current)
       clearTimeout(successTimerRef.current);
@@ -323883,6 +324076,7 @@ function PurchaseFlowView({
       if (plansRequestRef.current !== controller)
         return;
       const eligible2 = filterCliPurchasablePlans(groups, subscriptions);
+      setSubscriptionsByGroup(new Map(subscriptions.filter((subscription) => ["active", "trialing", "past_due"].includes(subscription.status)).map((subscription) => [subscription.groupId, subscription])));
       if (eligible2.length === 0) {
         const message = groups.length === 0 ? "Nenhum plano está disponível no momento." : "Não há novos planos compatíveis com a CLI para esta conta.";
         showError(message, "splash", {
@@ -323907,7 +324101,7 @@ function PurchaseFlowView({
         plansRequestRef.current = null;
     }
   }, [accessToken, showError]);
-  const startEntitlementPolling = import_react66.useCallback(async function pollEntitlement(groupId, displayStep = "polling") {
+  const startEntitlementPolling = import_react66.useCallback(async function pollEntitlement(groupId, displayStep = "polling", requirement = "paid") {
     pollingRef.current?.abort();
     const controller = new AbortController;
     pollingRef.current = controller;
@@ -323916,11 +324110,12 @@ function PurchaseFlowView({
     while (!controller.signal.aborted && Date.now() - startedAt < POLL_TIMEOUT_MS) {
       try {
         const active = await isGroupSubscriptionActive(accessToken, groupId, {
-          signal: controller.signal
+          signal: controller.signal,
+          requirement
         });
         if (active) {
           if (pollingRef.current === controller)
-            complete();
+            complete(requirement);
           return;
         }
       } catch (error42) {
@@ -323941,7 +324136,7 @@ function PurchaseFlowView({
     if (pollingRef.current === controller && !controller.signal.aborted) {
       showError("A assinatura foi iniciada, mas os modelos ainda não foram liberados.", "plan-detail", {
         label: "Verificar novamente",
-        run: () => void pollEntitlement(groupId, displayStep)
+        run: () => void pollEntitlement(groupId, displayStep, requirement)
       });
     }
   }, [accessToken, complete, showError]);
@@ -323980,7 +324175,7 @@ function PurchaseFlowView({
         setCardlessVerification(result);
         setStep("whatsapp-code");
       } else {
-        startEntitlementPolling(group.id, "cardless-polling");
+        startEntitlementPolling(group.id, "cardless-polling", "access");
       }
     } catch (error42) {
       const presentation = describePurchaseError(error42, "Não foi possível iniciar o teste sem cartão.");
@@ -324016,7 +324211,7 @@ function PurchaseFlowView({
     try {
       const result = await confirmCardlessTrial(accessToken, cardlessVerification.verificationId, code);
       if (result.mode === "trial_activated") {
-        startEntitlementPolling(group.id, "cardless-polling");
+        startEntitlementPolling(group.id, "cardless-polling", "access");
       } else {
         setCardlessVerification(result);
         setStep("whatsapp-code");
@@ -324064,7 +324259,7 @@ function PurchaseFlowView({
       setStep("whatsapp-code");
     }
   }, [accessToken, cardlessVerification, verificationWaitSeconds]);
-  const handleCheckout = import_react66.useCallback(async function runCheckout(group, paymentMethod, woovi) {
+  const handleCheckout = import_react66.useCallback(async function runCheckout(group, paymentMethod, woovi, requirement = "paid") {
     setInlineMessage(null);
     setStep("checkout");
     try {
@@ -324073,7 +324268,7 @@ function PurchaseFlowView({
         woovi
       });
       if (result.mode === "reactivated") {
-        startEntitlementPolling(group.id);
+        startEntitlementPolling(group.id, "polling", requirement);
         return;
       }
       if (result.mode === "woovi") {
@@ -324085,8 +324280,9 @@ function PurchaseFlowView({
         return;
       }
       setManualCheckoutUrl(result.url);
+      setManualEntitlementRequirement(requirement);
       if (await openBrowser(result.url)) {
-        startEntitlementPolling(group.id);
+        startEntitlementPolling(group.id, "polling", requirement);
       } else {
         setStep("manual-browser");
       }
@@ -324107,7 +324303,7 @@ function PurchaseFlowView({
       }
       if (presentation.code === "already_subscribed" || presentation.code === "manual_access_active") {
         setInlineMessage(presentation.message);
-        startEntitlementPolling(group.id);
+        startEntitlementPolling(group.id, "polling", requirement);
         return;
       }
       if (presentation.code === "payment_method_required" || presentation.code === "payment_method_unavailable") {
@@ -324117,20 +324313,33 @@ function PurchaseFlowView({
       }
       showError(presentation.message, "plan-detail", {
         label: "Tentar checkout novamente",
-        run: () => void runCheckout(group, paymentMethod, woovi)
+        run: () => void runCheckout(group, paymentMethod, woovi, requirement)
       });
     }
   }, [accessToken, fetchPlans, showError, startEntitlementPolling]);
-  const startPaidPurchase = import_react66.useCallback((group) => {
+  const startPaidPurchase = import_react66.useCallback(async (group) => {
     setSelectedPlan(group);
     setInlineMessage(null);
+    const currentSubscription = subscriptionsByGroup.get(group.id);
+    if (currentSubscription?.source === "stripe_trial" && currentSubscription.status === "trialing") {
+      const conversionUrl = getStripeTrialConversionUrl(currentSubscription.id, group.billingInterval);
+      setManualCheckoutUrl(conversionUrl);
+      setManualEntitlementRequirement("paid");
+      setStep("checkout");
+      if (await openBrowser(conversionUrl)) {
+        startEntitlementPolling(group.id, "polling", "paid");
+      } else {
+        setStep("manual-browser");
+      }
+      return;
+    }
     if (group.paymentProvider === "both")
       setStep("payment-method");
     else if (group.paymentProvider === "woovi")
       setStep("woovi-form");
     else
       handleCheckout(group, "stripe");
-  }, [handleCheckout]);
+  }, [handleCheckout, startEntitlementPolling, subscriptionsByGroup]);
   const cancelPlansLoading = import_react66.useCallback(() => {
     plansRequestRef.current?.abort();
     plansRequestRef.current = null;
@@ -324281,7 +324490,7 @@ function PurchaseFlowView({
                         dimColor: true,
                         children: paymentProviderLabel(plan)
                       }),
-                      plan.trialEligible && plan.trialDays ? /* @__PURE__ */ jsx_runtime86.jsxs(ThemedText, {
+                      (hasCardlessTrial(plan) || hasCardTrial(plan)) && plan.trialDays ? /* @__PURE__ */ jsx_runtime86.jsxs(ThemedText, {
                         color: "success",
                         children: [
                           plan.trialDays,
@@ -324347,7 +324556,7 @@ function PurchaseFlowView({
                   paymentProviderLabel(plan)
                 ]
               }),
-              plan.trialEligible && plan.trialDays ? /* @__PURE__ */ jsx_runtime86.jsxs(ThemedText, {
+              (hasCardlessTrial(plan) || hasCardTrial(plan)) && plan.trialDays ? /* @__PURE__ */ jsx_runtime86.jsxs(ThemedText, {
                 color: "success",
                 children: [
                   "Teste: ",
@@ -324368,7 +324577,7 @@ function PurchaseFlowView({
               if (value === "trial")
                 prepareCardlessTrial(plan);
               else if (value === "card-trial")
-                handleCheckout(plan, "stripe");
+                handleCheckout(plan, "stripe", undefined, "access");
               else if (value === "pix")
                 setStep("woovi-form");
               else if (value === "buy")
@@ -324602,7 +324811,7 @@ function PurchaseFlowView({
             ],
             onChange: (value) => {
               if (value === "verify" && selectedPlan) {
-                startEntitlementPolling(selectedPlan.id);
+                startEntitlementPolling(selectedPlan.id, "polling", manualEntitlementRequirement);
               } else if (value === "back")
                 setStep("plan-detail");
               else
@@ -324626,7 +324835,7 @@ function PurchaseFlowView({
     case "success":
       return /* @__PURE__ */ jsx_runtime86.jsx(ThemedText, {
         color: "success",
-        children: "Assinatura confirmada! Modelos disponíveis."
+        children: successRequirement === "access" ? "Trial ativado! Modelos disponíveis." : "Assinatura paga confirmada! Modelos disponíveis."
       });
     case "error":
       return /* @__PURE__ */ jsx_runtime86.jsxs(ThemedBox_default, {
@@ -324698,6 +324907,7 @@ var init_purchaseFlow = __esm(() => {
   init_select();
   init_Spinner2();
   init_TextInput();
+  init_oauth();
   init_useTerminalSize();
   init_ink2();
   init_AppState();
@@ -334198,7 +334408,7 @@ function AssistantToolUseMessage(t0) {
         t1 = null;
         break bb0;
       }
-      const tool = findToolByName(tools, param.name);
+      const tool = findToolByNameOrUniquePrefix(tools, param.name);
       if (!tool) {
         t1 = null;
         break bb0;
@@ -338231,7 +338441,7 @@ function VerboseToolUse(t0) {
   if ($2[0] !== bg || $2[1] !== content.id || $2[2] !== content.input || $2[3] !== content.name || $2[4] !== inProgressToolUseIDs || $2[5] !== lookups || $2[6] !== shouldAnimate || $2[7] !== theme || $2[8] !== tools) {
     t2 = Symbol.for("react.early_return_sentinel");
     bb0: {
-      const tool = findToolByName(tools, content.name) ?? findToolByName(getReplPrimitiveTools(), content.name);
+      const tool = findToolByNameOrUniquePrefix(tools, content.name) ?? findToolByNameOrUniquePrefix(getReplPrimitiveTools(), content.name);
       if (!tool) {
         t2 = null;
         break bb0;
@@ -338912,7 +339122,7 @@ function GroupedToolUseContent({
   inProgressToolUseIDs,
   shouldAnimate
 }) {
-  const tool = findToolByName(tools, message.toolName);
+  const tool = findToolByNameOrUniquePrefix(tools, message.toolName);
   if (!tool?.renderGroupedToolUse) {
     return null;
   }
@@ -340746,7 +340956,7 @@ function useGetToolFromMessages(toolUseID, tools, lookups) {
         t0 = null;
         break bb0;
       }
-      const tool = findToolByName(tools, toolUse.name);
+      const tool = findToolByNameOrUniquePrefix(tools, toolUse.name);
       if (!tool) {
         t0 = null;
         break bb0;
@@ -342406,7 +342616,7 @@ function extractLastToolInfo(progressMessages, tools) {
     if (toolResultBlock?.type === "tool_result") {
       const toolUseBlock = toolUseByID.get(toolResultBlock.tool_use_id);
       if (toolUseBlock) {
-        const tool = findToolByName(tools, toolUseBlock.name);
+        const tool = findToolByNameOrUniquePrefix(tools, toolUseBlock.name);
         if (!tool) {
           return toolUseBlock.name;
         }
@@ -387889,6 +388099,7 @@ class StreamingToolExecutor {
       this.tools.push({
         id: block2.id,
         block: block2,
+        canonicalName: block2.name,
         assistantMessage: assistantMessage2,
         status: "completed",
         isConcurrencySafe: true,
@@ -387921,6 +388132,7 @@ class StreamingToolExecutor {
     this.tools.push({
       id: block2.id,
       block: block2,
+      canonicalName: toolDefinition.name,
       assistantMessage: assistantMessage2,
       status: "queued",
       isConcurrencySafe,
@@ -388013,7 +388225,7 @@ class StreamingToolExecutor {
     return null;
   }
   getToolInterruptBehavior(tool) {
-    const definition = findToolByName(this.toolDefinitions, tool.block.name);
+    const definition = findToolByNameOrUniquePrefix(this.toolDefinitions, tool.canonicalName);
     if (!definition?.interruptBehavior)
       return "block";
     try {
@@ -388027,9 +388239,9 @@ class StreamingToolExecutor {
     const summary = input?.command ?? input?.file_path ?? input?.pattern ?? "";
     if (typeof summary === "string" && summary.length > 0) {
       const truncated = summary.length > 40 ? summary.slice(0, 40) + "…" : summary;
-      return `${tool.block.name}(${truncated})`;
+      return `${tool.canonicalName}(${truncated})`;
     }
-    return tool.block.name;
+    return tool.canonicalName;
   }
   updateInterruptibleState() {
     const executing = this.tools.filter((t) => t.status === "executing");
@@ -388068,7 +388280,7 @@ class StreamingToolExecutor {
         const isErrorResult = update.message.type === "user" && Array.isArray(update.message.message.content) && update.message.message.content.some((_) => _.type === "tool_result" && _.is_error === true);
         if (isErrorResult) {
           thisToolErrored = true;
-          if (tool.block.name === BASH_TOOL_NAME) {
+          if (tool.canonicalName === BASH_TOOL_NAME) {
             this.hasErrored = true;
             this.erroredToolDescription = this.getToolDescription(tool);
             this.siblingAbortController.abort("sibling_error");
@@ -390295,7 +390507,7 @@ async function* queryLoop(params, consumedCommandUuids) {
                 for (let i3 = 0;i3 < message.message.content.length; i3++) {
                   const block2 = message.message.content[i3];
                   if (block2.type === "tool_use" && typeof block2.input === "object" && block2.input !== null) {
-                    const tool = findToolByName(toolUseContext.options.tools, block2.name);
+                    const tool = findToolByNameOrUniquePrefix(toolUseContext.options.tools, block2.name);
                     if (tool?.backfillObservableInput) {
                       const originalInput = block2.input;
                       const inputCopy = { ...originalInput };
@@ -391072,7 +391284,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-08-16T02:41:36.697Z").getTime();
+  const buildTime = new Date("2026-08-18T16:18:48.339Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -405139,7 +405351,7 @@ function normalizeMessagesForAPI(messages, tools = []) {
             ...message.message,
             content: message.message.content.map((block2) => {
               if (block2.type === "tool_use") {
-                const tool = tools.find((t) => toolMatchesName(t, block2.name));
+                const tool = findToolByNameOrUniquePrefix(tools, block2.name);
                 const normalizedInput = tool ? normalizeToolInputForAPI(tool, block2.input) : block2.input;
                 const canonicalName = tool?.name ?? block2.name;
                 if (toolSearchEnabled) {
@@ -405377,11 +405589,12 @@ function normalizeContentFromAPI(contentBlocks, tools, agentId) {
         } else {
           normalizedInput = contentBlock.input;
         }
+        const resolvedTool = findToolByNameOrUniquePrefix(tools, contentBlock.name);
+        const normalizedToolName = resolvedTool && resolvedTool.name !== contentBlock.name && !resolvedTool.aliases?.includes(contentBlock.name) && resolvedTool.name.startsWith(contentBlock.name) ? resolvedTool.name : contentBlock.name;
         if (typeof normalizedInput === "object" && normalizedInput !== null) {
-          const tool = findToolByName(tools, contentBlock.name);
-          if (tool) {
+          if (resolvedTool) {
             try {
-              normalizedInput = normalizeToolInput(tool, normalizedInput, agentId);
+              normalizedInput = normalizeToolInput(resolvedTool, normalizedInput, agentId);
             } catch (error42) {
               logError2(new Error("Error normalizing tool input: " + error42));
             }
@@ -405389,6 +405602,7 @@ function normalizeContentFromAPI(contentBlocks, tools, agentId) {
         }
         return {
           ...contentBlock,
+          name: normalizedToolName,
           input: normalizedInput
         };
       }
@@ -432873,7 +433087,7 @@ function buildPrimarySection() {
   });
   return [{
     label: "Version",
-    value: "0.15.15"
+    value: "0.15.16"
   }, {
     label: "Session name",
     value: nameValue
@@ -446803,7 +447017,7 @@ function getReleaseTagUrl(version2 = publicBuildVersion) {
   return `${VERBOO_RELEASES_URL}/tag/v${normalizePublicVersion(version2)}`;
 }
 function getPublicBuildVersion() {
-  return "0.15.15";
+  return "0.15.16";
 }
 var import_semver10, VERBOO_RELEASES_URL = "https://github.com/verbeux-ai/code/releases", fallbackBuildVersion, publicBuildVersion;
 var init_version = __esm(() => {
@@ -473882,7 +474096,7 @@ var import_react_compiler_runtime198, React97, import_react155, jsx_runtime267,
     if (b_0?.type !== "tool_result" || b_0.is_error || !msg_6.toolUseResult)
       return false;
     const name = lookupsRef.current.toolUseByToolUseID.get(b_0.tool_use_id)?.name;
-    const tool = name ? findToolByName(tools, name) : undefined;
+    const tool = name ? findToolByNameOrUniquePrefix(tools, name) : undefined;
     return tool?.isResultTruncated?.(msg_6.toolUseResult) ?? false;
   }, [tools]);
   const canAnimate = (!toolJSX || !!toolJSX.shouldContinueAnimation) && !toolUseConfirmQueue.length && !isMessageSelectorVisible;
@@ -473952,7 +474166,7 @@ var import_react_compiler_runtime198, React97, import_react155, jsx_runtime267,
       const tr = msg_9.message.content.find((b_1) => b_1.type === "tool_result");
       if (tr && "tool_use_id" in tr) {
         const tu = lookups_0.toolUseByToolUseID.get(tr.tool_use_id);
-        const tool_0 = tu && findToolByName(tools, tu.name);
+        const tool_0 = tu && findToolByNameOrUniquePrefix(tools, tu.name);
         const extracted = tool_0?.extractSearchText?.(msg_9.toolUseResult);
         if (extracted !== undefined)
           text_0 = extracted;
@@ -478860,7 +479074,7 @@ var init_ultraplan = __esm(() => {
 
 // src/components/tasks/renderToolActivity.tsx
 function renderToolActivity(activity, tools, theme) {
-  const tool = findToolByName(tools, activity.toolName);
+  const tool = findToolByNameOrUniquePrefix(tools, activity.toolName);
   if (!tool) {
     return activity.toolName;
   }
@@ -498197,7 +498411,7 @@ var init_bridge_kick = __esm(() => {
 var call66 = async () => {
   return {
     type: "text",
-    value: `${"99.0.0"} (built ${"2026-08-16T02:41:36.697Z"})`
+    value: `${"99.0.0"} (built ${"2026-08-18T16:18:48.339Z"})`
   };
 }, version2, version_default;
 var init_version2 = __esm(() => {
@@ -517800,8 +518014,8 @@ async function prepareIfConditionMatcher(hookInput, tools) {
   if (hookInput.hook_event_name !== "PreToolUse" && hookInput.hook_event_name !== "PostToolUse" && hookInput.hook_event_name !== "PostToolUseFailure" && hookInput.hook_event_name !== "PermissionRequest") {
     return;
   }
-  const toolName = normalizeLegacyToolName(hookInput.tool_name);
-  const tool = tools && findToolByName(tools, hookInput.tool_name);
+  const tool = tools && findToolByNameOrUniquePrefix(tools, hookInput.tool_name);
+  const toolName = normalizeLegacyToolName(tool?.name ?? hookInput.tool_name);
   const input = tool?.inputSchema.safeParse(hookInput.tool_input);
   const patternMatcher = input?.success && tool?.preparePermissionMatcher ? await tool.preparePermissionMatcher(input.data) : undefined;
   return (ifCondition) => {
@@ -521933,7 +522147,7 @@ function printStartupScreen(modelOverride) {
   const home = process.env.HOME || process.env.USERPROFILE || "";
   const cwd2 = process.cwd();
   const displayCwd = home && cwd2.startsWith(home) ? `~${cwd2.slice(home.length)}` : cwd2;
-  const version3 = "0.15.15";
+  const version3 = "0.15.16";
   const columns = process.stdout.columns ?? STARTUP_DEFAULT_COLUMNS;
   process.stdout.write(renderStartupScreen(p, version3, displayCwd, columns));
 }
@@ -541162,7 +541376,7 @@ var init_routerRateLimitHook = __esm(() => {
 function getSemverPart(version3) {
   return `${import_semver13.major(version3, { loose: true })}.${import_semver13.minor(version3, { loose: true })}.${import_semver13.patch(version3, { loose: true })}`;
 }
-function useUpdateNotification(updatedVersion, initialVersion = "0.15.15") {
+function useUpdateNotification(updatedVersion, initialVersion = "0.15.16") {
   const [lastNotifiedSemver, setLastNotifiedSemver] = import_react226.useState(() => getSemverPart(initialVersion));
   const [pendingNotification2, setPendingNotification] = import_react226.useState(null);
   if (updatedVersion) {
@@ -541202,7 +541416,7 @@ function AutoUpdater({
       return;
     }
     if (false) {}
-    const currentVersion = "0.15.15";
+    const currentVersion = "0.15.16";
     const channel2 = getInitialSettings()?.autoUpdatesChannel ?? "latest";
     let latestVersion = await getLatestVersion(channel2);
     const isDisabled = isAutoUpdaterDisabled();
@@ -541555,17 +541769,17 @@ function PackageManagerAutoUpdater(t0) {
       const maxVersion = await getMaxVersion();
       if (maxVersion && latest && gt(latest, maxVersion)) {
         logForDebugging(`PackageManagerAutoUpdater: maxVersion ${maxVersion} is set, capping update from ${latest} to ${maxVersion}`);
-        if (gte("0.15.15", maxVersion)) {
-          logForDebugging(`PackageManagerAutoUpdater: current version ${"0.15.15"} is already at or above maxVersion ${maxVersion}, skipping update`);
+        if (gte("0.15.16", maxVersion)) {
+          logForDebugging(`PackageManagerAutoUpdater: current version ${"0.15.16"} is already at or above maxVersion ${maxVersion}, skipping update`);
           setUpdateAvailable(false);
           return;
         }
         latest = maxVersion;
       }
-      const hasUpdate = latest && !gte("0.15.15", latest) && !shouldSkipVersion(latest);
+      const hasUpdate = latest && !gte("0.15.16", latest) && !shouldSkipVersion(latest);
       setUpdateAvailable(!!hasUpdate);
       if (hasUpdate) {
-        logForDebugging(`PackageManagerAutoUpdater: Update available ${"0.15.15"} -> ${latest}`);
+        logForDebugging(`PackageManagerAutoUpdater: Update available ${"0.15.16"} -> ${latest}`);
       }
     };
     $2[0] = t1;
@@ -541599,7 +541813,7 @@ function PackageManagerAutoUpdater(t0) {
       wrap: "truncate",
       children: [
         "currentVersion: ",
-        "0.15.15"
+        "0.15.16"
       ]
     });
     $2[3] = verbose;
@@ -556135,7 +556349,7 @@ function useRemoteSession({
       },
       onPermissionRequest: (request, requestId) => {
         logForDebugging(`[useRemoteSession] Permission request for tool: ${request.tool_name}`);
-        const tool = findToolByName(toolsRef.current, request.tool_name) ?? createToolStub(request.tool_name);
+        const tool = findToolByNameOrUniquePrefix(toolsRef.current, request.tool_name) ?? createToolStub(request.tool_name);
         const syntheticMessage = createSyntheticAssistantMessage(request, requestId);
         const permissionResult = {
           behavior: "ask",
@@ -556486,7 +556700,7 @@ function useDirectConnect({
       },
       onPermissionRequest: (request, requestId) => {
         logForDebugging(`[useDirectConnect] Permission request for tool: ${request.tool_name}`);
-        const tool = findToolByName(toolsRef.current, request.tool_name) ?? createToolStub(request.tool_name);
+        const tool = findToolByNameOrUniquePrefix(toolsRef.current, request.tool_name) ?? createToolStub(request.tool_name);
         const syntheticMessage = createSyntheticAssistantMessage(request, requestId);
         const permissionResult = {
           behavior: "ask",
@@ -556636,7 +556850,7 @@ function useSSHSession({
       },
       onPermissionRequest: (request, requestId) => {
         logForDebugging(`[useSSHSession] permission request: ${request.tool_name}`);
-        const tool = findToolByName(toolsRef.current, request.tool_name) ?? createToolStub(request.tool_name);
+        const tool = findToolByNameOrUniquePrefix(toolsRef.current, request.tool_name) ?? createToolStub(request.tool_name);
         const syntheticMessage = createSyntheticAssistantMessage(request, requestId);
         const permissionResult = {
           behavior: "ask",
@@ -557289,10 +557503,10 @@ async function autoUpdateCliInBackground() {
       return;
     const channel2 = getInitialSettings()?.autoUpdatesChannel ?? "latest";
     const latest = await getLatestVersion(channel2);
-    if (!latest || gte("0.15.15", latest))
+    if (!latest || gte("0.15.16", latest))
       return;
     writeToStdout(`
-Nova versão disponível: ${latest} (atual: ${"0.15.15"})
+Nova versão disponível: ${latest} (atual: ${"0.15.16"})
 `);
     writeToStdout(`Atualizando automaticamente...
 `);
@@ -560943,7 +561157,7 @@ function useInboxPoller({
         if (!parsed)
           continue;
         if (setToolUseConfirmQueue) {
-          const tool = findToolByName(getAllBaseTools(), parsed.tool_name);
+          const tool = findToolByNameOrUniquePrefix(getAllBaseTools(), parsed.tool_name);
           if (!tool) {
             logForDebugging(`[InboxPoller] Unknown tool ${parsed.tool_name}, skipping permission request`);
             continue;
@@ -574730,7 +574944,7 @@ var init_ApproveApiKey = __esm(() => {
 
 // src/components/LogoV2/WelcomeV2.tsx
 function WelcomeV2() {
-  const version3 = "0.15.15";
+  const version3 = "0.15.16";
   return /* @__PURE__ */ jsx_runtime476.jsxs(ThemedBox_default, {
     flexDirection: "column",
     marginY: 1,
@@ -593678,7 +593892,7 @@ __export(exports_update, {
 });
 async function update() {
   logEvent("tengu_update_check", {});
-  writeToStdout(`Current version: ${"0.15.15"}
+  writeToStdout(`Current version: ${"0.15.16"}
 `);
   const channel2 = getInitialSettings()?.autoUpdatesChannel ?? "latest";
   writeToStdout(`Checking for updates to ${channel2} version...
@@ -593763,8 +593977,8 @@ async function update() {
       writeToStdout(`Verboo Code is managed by Homebrew.
 `);
       const latest = await getLatestVersion(channel2);
-      if (latest && !gte("0.15.15", latest)) {
-        writeToStdout(`Update available: ${"0.15.15"} → ${latest}
+      if (latest && !gte("0.15.16", latest)) {
+        writeToStdout(`Update available: ${"0.15.16"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -593780,8 +593994,8 @@ async function update() {
       writeToStdout(`Verboo Code is managed by winget.
 `);
       const latest = await getLatestVersion(channel2);
-      if (latest && !gte("0.15.15", latest)) {
-        writeToStdout(`Update available: ${"0.15.15"} → ${latest}
+      if (latest && !gte("0.15.16", latest)) {
+        writeToStdout(`Update available: ${"0.15.16"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -593797,8 +594011,8 @@ async function update() {
       writeToStdout(`Verboo Code is managed by apk.
 `);
       const latest = await getLatestVersion(channel2);
-      if (latest && !gte("0.15.15", latest)) {
-        writeToStdout(`Update available: ${"0.15.15"} → ${latest}
+      if (latest && !gte("0.15.16", latest)) {
+        writeToStdout(`Update available: ${"0.15.16"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -593851,11 +594065,11 @@ async function update() {
 `);
         await gracefulShutdown(1);
       }
-      if (result.latestVersion === "0.15.15") {
-        writeToStdout(source_default.green(`Verboo Code is up to date (${"0.15.15"})`) + `
+      if (result.latestVersion === "0.15.16") {
+        writeToStdout(source_default.green(`Verboo Code is up to date (${"0.15.16"})`) + `
 `);
       } else {
-        writeToStdout(source_default.green(`Successfully updated from ${"0.15.15"} to version ${result.latestVersion}`) + `
+        writeToStdout(source_default.green(`Successfully updated from ${"0.15.16"} to version ${result.latestVersion}`) + `
 `);
         await regenerateCompletionCache();
       }
@@ -593915,12 +594129,12 @@ async function update() {
 `);
     await gracefulShutdown(1);
   }
-  if (latestVersion === "0.15.15") {
-    writeToStdout(source_default.green(`Verboo Code is up to date (${"0.15.15"})`) + `
+  if (latestVersion === "0.15.16") {
+    writeToStdout(source_default.green(`Verboo Code is up to date (${"0.15.16"})`) + `
 `);
     await gracefulShutdown(0);
   }
-  writeToStdout(`New version available: ${latestVersion} (current: ${"0.15.15"})
+  writeToStdout(`New version available: ${latestVersion} (current: ${"0.15.16"})
 `);
   writeToStdout(`Installing update...
 `);
@@ -593965,7 +594179,7 @@ async function update() {
   logForDebugging(`update: Installation status: ${status2}`);
   switch (status2) {
     case "success":
-      writeToStdout(source_default.green(`Successfully updated from ${"0.15.15"} to version ${latestVersion}`) + `
+      writeToStdout(source_default.green(`Successfully updated from ${"0.15.16"} to version ${latestVersion}`) + `
 `);
       await regenerateCompletionCache();
       break;
@@ -595304,7 +595518,7 @@ ${chromeSystemPrompt}` : chromeSystemPrompt;
       is_native_binary: isInBundledMode()
     });
     logMemoryDiagnostics("start", {
-      version: "0.15.15",
+      version: "0.15.16",
       debug: debug2,
       debugToStderr,
       print: print ?? false,
@@ -596115,7 +596329,7 @@ Usage: verboo --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version(`0.15.15 (${cliDesc})`, "-v, --version", "Output the version number");
+  }).version(`0.15.16 (${cliDesc})`, "-v, --version", "Output the version number");
   program2.option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)");
   program2.option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.");
   if (canUserConfigureAdvisor()) {
@@ -596730,7 +596944,7 @@ if (false) {}
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    console.log(`${"0.15.15"} (Verboo Code)`);
+    console.log(`${"0.15.16"} (Verboo Code)`);
     return;
   }
   if (!IS_VERBOO_CLI && args.includes("--provider")) {
@@ -596904,4 +597118,4 @@ async function main2() {
 }
 main2();
 
-//# debugId=BA1810B7F2F5F50A64756E2164756E21
+//# debugId=F84B47F82CF95DAE64756E2164756E21