@dotobokuri/fleet-console 1.58.0 → 1.58.1

package/dist/fleet-plugins/terminal/routes.mjs

@@ -23142,7 +23142,7 @@ function forChatGptBackend(request) {
   for (const field of CHATGPT_UNSUPPORTED_FIELDS) {
     delete copy[field];
   }
-  if (isClaudeCodeSuggestionMode(request)) {
+  if (request.tool_choice === "none" || isClaudeCodeSuggestionMode(request)) {
     delete copy.tools;
     delete copy.tool_choice;
     delete copy.native_tools;
@@ -23989,7 +23989,7 @@ var OpenAIChatCompletionsAdapter = class {
     const controller = new AbortController();
     const unlinkAbort = linkAbortSignal(options.signal, controller);
     const supportsImageInput = imageInputPolicy.get(this)?.(request.model) ?? true;
-    const omitTools = suggestionModeToolOmissionPolicy.has(this) && isClaudeCodeSuggestionMode2(request);
+    const omitTools = toolOmissionPolicy.has(this) && shouldOmitTools(request);
     const payload = forChatCompletionsBackend(request, supportsImageInput, omitTools);
     wireLog("openai-chat.wire.request", { url: this.url, payload });
     let response;
@@ -24036,7 +24036,7 @@ var OpenAIChatCompletionsAdapter = class {
 };
 var imageInputPolicy = /* @__PURE__ */ new WeakMap();
 var argumentPruningPolicy = /* @__PURE__ */ new WeakMap();
-var suggestionModeToolOmissionPolicy = /* @__PURE__ */ new WeakMap();
+var toolOmissionPolicy = /* @__PURE__ */ new WeakMap();
 var CLAUDE_CODE_SUGGESTION_MODE_PREFIX2 = "[SUGGESTION MODE: Suggest what the user might naturally type next into Claude Code.]";
 var CLAUDE_CODE_SUGGESTION_MODE_SUFFIXES = [
   "Reply with ONLY the suggestion.",
@@ -24054,9 +24054,19 @@ var OpencodeGoChatCompletionsAdapter = class extends OpenAIChatCompletionsAdapte
     });
     imageInputPolicy.set(this, (model) => !model.startsWith("deepseek-v4-"));
     argumentPruningPolicy.set(this, true);
-    suggestionModeToolOmissionPolicy.set(this, true);
+    toolOmissionPolicy.set(this, true);
+  }
+  /**
+   * preflight sizing은 wire에 실릴 catalog로 세야 한다. no-tools 조건에서는 실제 wire에
+   * 도구가 없는데 전체 catalog를 청구하면 발생하지 않는 비용이 잡힌다.
+   */
+  wireTools(request) {
+    return shouldOmitTools(request) ? [] : request.tools ?? [];
   }
 };
+function shouldOmitTools(request) {
+  return request.tool_choice === "none" || isClaudeCodeSuggestionMode2(request);
+}
 function isClaudeCodeSuggestionMode2(request) {
   if (request.tool_choice === "required" || typeof request.tool_choice === "object") return false;
   const last = request.input.at(-1);
@@ -25259,7 +25269,7 @@ var XaiResponsesAdapter = class {
     }
     const controller = new AbortController();
     const unlinkAbort = linkAbortSignal(options.signal, controller);
-    const payload = forXaiResponsesBackend(request);
+    const payload = forXaiResponsesBackend(request, xaiWireTools(request));
     wireLog("xai-responses.wire.request", { url: this.url, payload });
     let response;
     try {
@@ -25314,8 +25324,11 @@ var XaiResponsesAdapter = class {
       }, this.functionCallTimeoutMs)
     };
   }
+  wireTools(request) {
+    return xaiWireTools(request) ?? [];
+  }
 };
-function forXaiResponsesBackend(request) {
+function forXaiResponsesBackend(request, tools = xaiWireTools(request)) {
   const { metadata: _metadata, native_tools: _nativeTools, ...rest } = request;
   return {
     ...rest,
@@ -25327,9 +25340,29 @@ function forXaiResponsesBackend(request) {
       const { reasoning_content: _reasoningContent, ...wireItem } = item;
       return wireItem;
     }),
-    ...request.tools === void 0 ? {} : { tools: request.tools.map(({ defer_loading: _deferLoading, ...tool }) => tool) }
+    ...tools === void 0 ? {} : { tools: [...tools] }
   };
 }
+function xaiWireTools(request) {
+  if (request.tools === void 0) return void 0;
+  const tools = request.tools;
+  const toolSearchActive = tools.some((tool) => isToolSearchName(tool.name));
+  const selectedName = request.tool_choice && typeof request.tool_choice === "object" ? request.tool_choice.name : void 0;
+  const referencedNames = new Set(
+    request.input.flatMap((item) => item.type === "function_call_output" ? item.tool_references ?? [] : [])
+  );
+  return tools.filter((tool) => !toolSearchActive || tool.defer_loading !== true || isToolSearchName(tool.name) || selectedName !== void 0 && toolNameMatches(tool.name, selectedName) || referencedNames.has(tool.name)).map(({ defer_loading: _deferLoading, ...tool }) => tool);
+}
+function toolLeafName(name) {
+  const separator = name.lastIndexOf("__");
+  return separator === -1 ? name : name.slice(separator + 2);
+}
+function isToolSearchName(name) {
+  return toolLeafName(name).replace(/[_-]/g, "").toLowerCase() === "toolsearch";
+}
+function toolNameMatches(declaredName, selectedName) {
+  return declaredName === selectedName || toolLeafName(declaredName) === toolLeafName(selectedName);
+}
 function parseXaiEventStream(body, options, functionCallTimeoutMs) {
   return assembleXaiFunctionCalls(
     parseUpstreamSseStream(
@@ -25820,7 +25853,7 @@ function retryMessage(clientTools, candidates) {
       const clientToolName = typeof clientTool === "string" ? clientTool : clientTool.clientName;
       const wireName = typeof clientTool === "string" ? clientTool : clientTool.wireName;
       if (seen.has(wireName)) continue;
-      if (toolLeafName(clientToolName).toLowerCase() !== candidate.toLowerCase()) continue;
+      if (toolLeafName2(clientToolName).toLowerCase() !== candidate.toLowerCase()) continue;
       seen.add(wireName);
       matches.push(wireName);
     }
@@ -25840,12 +25873,12 @@ function retryMessage(clientTools, candidates) {
 function toolSearchWireName(clientTools) {
   for (const clientTool of clientTools) {
     const clientToolName = typeof clientTool === "string" ? clientTool : clientTool.clientName;
-    if (toolLeafName(clientToolName).replace(/[_-]/g, "").toLowerCase() !== "toolsearch") continue;
+    if (toolLeafName2(clientToolName).replace(/[_-]/g, "").toLowerCase() !== "toolsearch") continue;
     return typeof clientTool === "string" ? clientTool : clientTool.wireName;
   }
   return void 0;
 }
-function toolLeafName(name) {
+function toolLeafName2(name) {
   return name.split("__").at(-1) ?? name;
 }
 function numberValue(value) {
@@ -25996,11 +26029,11 @@ var CURSOR_HOT_PATH_TOOL_LEAVES = [
   "toolsearch"
 ];
 function isCursorHotPathToolName(name) {
-  const leaf = toolLeafName2(name).replace(/[_-]/g, "").toLowerCase();
+  const leaf = toolLeafName3(name).replace(/[_-]/g, "").toLowerCase();
   return CURSOR_HOT_PATH_TOOL_LEAVES.includes(leaf);
 }
 function isCursorNativeRedirectToolName(name) {
-  const leaf = toolLeafName2(name).replace(/[_-]/g, "").toLowerCase();
+  const leaf = toolLeafName3(name).replace(/[_-]/g, "").toLowerCase();
   return ["read", "grep", "bash", "shellcommand", "execcommand"].includes(leaf);
 }
 function cursorNativeExecRedirect(exec2, tools, providerIdentifier) {
@@ -26585,7 +26618,7 @@ function matchesLeaf(tool, candidates) {
   return candidates.some((candidate) => normalizedLeaf(tool.clientName) === normalizedLeaf(candidate));
 }
 function normalizedLeaf(name) {
-  return toolLeafName2(name).replace(/[_-]/g, "").toLowerCase();
+  return toolLeafName3(name).replace(/[_-]/g, "").toLowerCase();
 }
 function normalizedGrepOutputMode(value) {
   if (!value || value === "content") return "content";
@@ -26607,7 +26640,7 @@ function execReply2(exec2, resultName, result) {
     }
   };
 }
-function toolLeafName2(name) {
+function toolLeafName3(name) {
   return name.split("__").at(-1) ?? name;
 }
 function numberValue2(value) {

package/dist/fleet.mjs

@@ -24495,7 +24495,7 @@ function forChatGptBackend(request) {
   for (const field of CHATGPT_UNSUPPORTED_FIELDS) {
     delete copy[field];
   }
-  if (isClaudeCodeSuggestionMode(request)) {
+  if (request.tool_choice === "none" || isClaudeCodeSuggestionMode(request)) {
     delete copy.tools;
     delete copy.tool_choice;
     delete copy.native_tools;
@@ -26069,7 +26069,7 @@ var OpenAIChatCompletionsAdapter = class {
     const controller = new AbortController();
     const unlinkAbort = linkAbortSignal(options.signal, controller);
     const supportsImageInput = imageInputPolicy.get(this)?.(request.model) ?? true;
-    const omitTools = suggestionModeToolOmissionPolicy.has(this) && isClaudeCodeSuggestionMode2(request);
+    const omitTools = toolOmissionPolicy.has(this) && shouldOmitTools(request);
     const payload = forChatCompletionsBackend(request, supportsImageInput, omitTools);
     wireLog("openai-chat.wire.request", { url: this.url, payload });
     let response;
@@ -26116,7 +26116,7 @@ var OpenAIChatCompletionsAdapter = class {
 };
 var imageInputPolicy = /* @__PURE__ */ new WeakMap();
 var argumentPruningPolicy = /* @__PURE__ */ new WeakMap();
-var suggestionModeToolOmissionPolicy = /* @__PURE__ */ new WeakMap();
+var toolOmissionPolicy = /* @__PURE__ */ new WeakMap();
 var CLAUDE_CODE_SUGGESTION_MODE_PREFIX2 = "[SUGGESTION MODE: Suggest what the user might naturally type next into Claude Code.]";
 var CLAUDE_CODE_SUGGESTION_MODE_SUFFIXES = [
   "Reply with ONLY the suggestion.",
@@ -26134,9 +26134,19 @@ var OpencodeGoChatCompletionsAdapter = class extends OpenAIChatCompletionsAdapte
     });
     imageInputPolicy.set(this, (model) => !model.startsWith("deepseek-v4-"));
     argumentPruningPolicy.set(this, true);
-    suggestionModeToolOmissionPolicy.set(this, true);
+    toolOmissionPolicy.set(this, true);
+  }
+  /**
+   * preflight sizing은 wire에 실릴 catalog로 세야 한다. no-tools 조건에서는 실제 wire에
+   * 도구가 없는데 전체 catalog를 청구하면 발생하지 않는 비용이 잡힌다.
+   */
+  wireTools(request) {
+    return shouldOmitTools(request) ? [] : request.tools ?? [];
   }
 };
+function shouldOmitTools(request) {
+  return request.tool_choice === "none" || isClaudeCodeSuggestionMode2(request);
+}
 function isClaudeCodeSuggestionMode2(request) {
   if (request.tool_choice === "required" || typeof request.tool_choice === "object") return false;
   const last = request.input.at(-1);
@@ -27549,7 +27559,7 @@ var XaiResponsesAdapter = class {
     }
     const controller = new AbortController();
     const unlinkAbort = linkAbortSignal(options.signal, controller);
-    const payload = forXaiResponsesBackend(request);
+    const payload = forXaiResponsesBackend(request, xaiWireTools(request));
     wireLog("xai-responses.wire.request", { url: this.url, payload });
     let response;
     try {
@@ -27604,8 +27614,11 @@ var XaiResponsesAdapter = class {
       }, this.functionCallTimeoutMs)
     };
   }
+  wireTools(request) {
+    return xaiWireTools(request) ?? [];
+  }
 };
-function forXaiResponsesBackend(request) {
+function forXaiResponsesBackend(request, tools = xaiWireTools(request)) {
   const { metadata: _metadata, native_tools: _nativeTools, ...rest } = request;
   return {
     ...rest,
@@ -27617,9 +27630,29 @@ function forXaiResponsesBackend(request) {
       const { reasoning_content: _reasoningContent, ...wireItem } = item;
       return wireItem;
     }),
-    ...request.tools === void 0 ? {} : { tools: request.tools.map(({ defer_loading: _deferLoading, ...tool }) => tool) }
+    ...tools === void 0 ? {} : { tools: [...tools] }
   };
 }
+function xaiWireTools(request) {
+  if (request.tools === void 0) return void 0;
+  const tools = request.tools;
+  const toolSearchActive = tools.some((tool) => isToolSearchName(tool.name));
+  const selectedName = request.tool_choice && typeof request.tool_choice === "object" ? request.tool_choice.name : void 0;
+  const referencedNames = new Set(
+    request.input.flatMap((item) => item.type === "function_call_output" ? item.tool_references ?? [] : [])
+  );
+  return tools.filter((tool) => !toolSearchActive || tool.defer_loading !== true || isToolSearchName(tool.name) || selectedName !== void 0 && toolNameMatches(tool.name, selectedName) || referencedNames.has(tool.name)).map(({ defer_loading: _deferLoading, ...tool }) => tool);
+}
+function toolLeafName(name) {
+  const separator = name.lastIndexOf("__");
+  return separator === -1 ? name : name.slice(separator + 2);
+}
+function isToolSearchName(name) {
+  return toolLeafName(name).replace(/[_-]/g, "").toLowerCase() === "toolsearch";
+}
+function toolNameMatches(declaredName, selectedName) {
+  return declaredName === selectedName || toolLeafName(declaredName) === toolLeafName(selectedName);
+}
 function parseXaiEventStream(body2, options, functionCallTimeoutMs) {
   return assembleXaiFunctionCalls(
     parseUpstreamSseStream(
@@ -28110,7 +28143,7 @@ function retryMessage(clientTools, candidates) {
       const clientToolName = typeof clientTool === "string" ? clientTool : clientTool.clientName;
       const wireName = typeof clientTool === "string" ? clientTool : clientTool.wireName;
       if (seen.has(wireName)) continue;
-      if (toolLeafName(clientToolName).toLowerCase() !== candidate.toLowerCase()) continue;
+      if (toolLeafName2(clientToolName).toLowerCase() !== candidate.toLowerCase()) continue;
       seen.add(wireName);
       matches.push(wireName);
     }
@@ -28130,12 +28163,12 @@ function retryMessage(clientTools, candidates) {
 function toolSearchWireName(clientTools) {
   for (const clientTool of clientTools) {
     const clientToolName = typeof clientTool === "string" ? clientTool : clientTool.clientName;
-    if (toolLeafName(clientToolName).replace(/[_-]/g, "").toLowerCase() !== "toolsearch") continue;
+    if (toolLeafName2(clientToolName).replace(/[_-]/g, "").toLowerCase() !== "toolsearch") continue;
     return typeof clientTool === "string" ? clientTool : clientTool.wireName;
   }
   return void 0;
 }
-function toolLeafName(name) {
+function toolLeafName2(name) {
   return name.split("__").at(-1) ?? name;
 }
 function numberValue(value) {
@@ -28286,11 +28319,11 @@ var CURSOR_HOT_PATH_TOOL_LEAVES = [
   "toolsearch"
 ];
 function isCursorHotPathToolName(name) {
-  const leaf = toolLeafName2(name).replace(/[_-]/g, "").toLowerCase();
+  const leaf = toolLeafName3(name).replace(/[_-]/g, "").toLowerCase();
   return CURSOR_HOT_PATH_TOOL_LEAVES.includes(leaf);
 }
 function isCursorNativeRedirectToolName(name) {
-  const leaf = toolLeafName2(name).replace(/[_-]/g, "").toLowerCase();
+  const leaf = toolLeafName3(name).replace(/[_-]/g, "").toLowerCase();
   return ["read", "grep", "bash", "shellcommand", "execcommand"].includes(leaf);
 }
 function cursorNativeExecRedirect(exec2, tools, providerIdentifier) {
@@ -28875,7 +28908,7 @@ function matchesLeaf(tool, candidates) {
   return candidates.some((candidate) => normalizedLeaf(tool.clientName) === normalizedLeaf(candidate));
 }
 function normalizedLeaf(name) {
-  return toolLeafName2(name).replace(/[_-]/g, "").toLowerCase();
+  return toolLeafName3(name).replace(/[_-]/g, "").toLowerCase();
 }
 function normalizedGrepOutputMode(value) {
   if (!value || value === "content") return "content";
@@ -28897,7 +28930,7 @@ function execReply2(exec2, resultName, result) {
     }
   };
 }
-function toolLeafName2(name) {
+function toolLeafName3(name) {
   return name.split("__").at(-1) ?? name;
 }
 function numberValue2(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotobokuri/fleet-console",
-  "version": "1.58.0",
+  "version": "1.58.1",
   "description": "Fleet Console — sole owner of the fleet and fleet-console bins, Console web surface, and thin Claude Code launcher.",
   "repository": {
     "type": "git",