@dotobokuri/fleet-console 1.66.0 → 1.67.0

package/dist/fleet.mjs

@@ -21975,18 +21975,25 @@ function withheldClaudeSkillStub(name, tokens, budget) {
 var CLAUDE_WEB_SEARCH_TOOL_NAME = "WebSearch";
 var ANTHROPIC_WEB_SEARCH_TOOL_NAME = "web_search";
 var ANTHROPIC_WEB_SEARCH_TOOL_TYPE = "web_search_20250305";
-function isClaudeWebSearchTool(tool) {
-  return tool.type === ANTHROPIC_WEB_SEARCH_TOOL_TYPE || tool.name === CLAUDE_WEB_SEARCH_TOOL_NAME || tool.name === ANTHROPIC_WEB_SEARCH_TOOL_NAME;
+var CLAUDE_WEB_SEARCH_TOOL_IDENTIFIERS = [
+  CLAUDE_WEB_SEARCH_TOOL_NAME,
+  ANTHROPIC_WEB_SEARCH_TOOL_NAME,
+  ANTHROPIC_WEB_SEARCH_TOOL_TYPE
+];
+function matchesToolIdentifier(tool, identifiers) {
+  return typeof tool.name === "string" && identifiers.has(tool.name) || typeof tool.type === "string" && identifiers.has(tool.type);
 }
-function isClaudeWebSearchToolChoice(choice) {
-  return choice?.type === "tool" && (choice.name === CLAUDE_WEB_SEARCH_TOOL_NAME || choice.name === ANTHROPIC_WEB_SEARCH_TOOL_NAME);
+function matchesToolChoice(choice, identifiers) {
+  return choice?.type === "tool" && typeof choice.name === "string" && identifiers.has(choice.name);
 }
-function omitClaudeWebSearchTools(request) {
+function omitClaudeClientTools(request, names) {
+  const identifiers = new Set(names);
+  if (identifiers.size === 0) return { request, changed: false };
   const tools = request.tools;
-  const kept = tools?.filter((tool) => !isClaudeWebSearchTool(tool));
+  const kept = tools?.filter((tool) => !matchesToolIdentifier(tool, identifiers));
   const toolsChanged = tools !== void 0 && kept !== void 0 && kept.length !== tools.length;
   const choice = request.tool_choice;
-  const choiceChanged = isClaudeWebSearchToolChoice(choice);
+  const choiceChanged = matchesToolChoice(choice, identifiers);
   if (!toolsChanged && !choiceChanged) {
     return { request, changed: false };
   }
@@ -22005,6 +22012,42 @@ function omitClaudeWebSearchTools(request) {
     changed: true
   };
 }
+var CLAUDE_USAGE_LIMIT_DIRECTIVE = /^\s*\[Usage limit [^\]]*\]\s*$/;
+function stripClaudeUsageLimitDirectives(messages) {
+  let removed = 0;
+  const kept = [];
+  for (const message of messages) {
+    const stripped = stripUsageLimitBlocks(message);
+    removed += stripped.removed;
+    if (stripped.message !== null) kept.push(stripped.message);
+  }
+  if (removed === 0) return { messages, changed: false, removed: 0 };
+  const last = kept[kept.length - 1];
+  if (last === void 0 || last.role === "assistant") {
+    return { messages, changed: false, removed: 0 };
+  }
+  return { messages: kept, changed: true, removed };
+}
+function stripUsageLimitBlocks(message) {
+  const content = message.content;
+  if (typeof content === "string") {
+    return isClaudeUsageLimitDirective(content) ? { message: null, removed: 1 } : { message, removed: 0 };
+  }
+  if (!Array.isArray(content)) return { message, removed: 0 };
+  const kept = content.filter(
+    (block) => !(isClaudeTextBlock(block) && isClaudeUsageLimitDirective(block.text))
+  );
+  const removed = content.length - kept.length;
+  if (removed === 0) return { message, removed: 0 };
+  if (kept.length === 0) return { message: null, removed };
+  return { message: { ...message, content: kept }, removed };
+}
+function isClaudeUsageLimitDirective(text) {
+  return CLAUDE_USAGE_LIMIT_DIRECTIVE.test(text);
+}
+function omitClaudeWebSearchTools(request) {
+  return omitClaudeClientTools(request, CLAUDE_WEB_SEARCH_TOOL_IDENTIFIERS);
+}
 var benchmarks_default = {
   version: 2,
   sources: {
@@ -28446,22 +28489,42 @@ function parseXaiEventStream(body2, options, functionCallTimeoutMs) {
     functionCallTimeoutMs
   );
 }
+var XAI_ASSEMBLY_DEADLINE = /* @__PURE__ */ Symbol("xai-assembly-deadline");
 async function* assembleXaiFunctionCalls(source, controller, timeoutMs) {
   const iterator = source[Symbol.asyncIterator]();
   const pending = /* @__PURE__ */ new Map();
+  let snapshot;
   let completedNormally = false;
   try {
     while (true) {
       const deadlineAt = earliestXaiFunctionCallDeadline(pending);
-      const result = deadlineAt === void 0 ? await iterator.next() : await nextXaiEventBeforeDeadline(iterator, deadlineAt, controller, timeoutMs);
+      const result = deadlineAt === void 0 ? await iterator.next() : await nextXaiEventBeforeDeadline(iterator, deadlineAt);
+      if (result === XAI_ASSEMBLY_DEADLINE) {
+        yield* salvageXaiPendingCalls(
+          pending,
+          snapshot,
+          `function call assembly exceeded ${timeoutMs}ms`,
+          controller
+        );
+        completedNormally = true;
+        return;
+      }
       if (result.done) {
         if (pending.size > 0) {
-          throw incompleteXaiFunctionCall("stream ended before function call output_item.done");
+          yield* salvageXaiPendingCalls(
+            pending,
+            snapshot,
+            "stream ended before function call output_item.done",
+            controller
+          );
         }
         completedNormally = true;
         return;
       }
       const event = result.value;
+      if (event.type === "response.created") {
+        snapshot = event.response;
+      }
       if (event.type === "response.completed" && pending.size > 0) {
         throw incompleteXaiFunctionCall("response.completed arrived before function call output_item.done");
       }
@@ -28472,10 +28535,18 @@ async function* assembleXaiFunctionCalls(source, controller, timeoutMs) {
           // Each call gets a full timeout from its own added event. Waiting uses the
           // earliest active deadline, so a later parallel call is never shortened by
           // an earlier call's age.
-          deadlineAt: Date.now() + timeoutMs
+          deadlineAt: Date.now() + timeoutMs,
+          argumentsBuffer: ""
         });
         continue;
       }
+      if (event.type === "response.function_call_arguments.delta") {
+        const call = pending.get(xaiFunctionCallKey(event.output_index, event.item_id));
+        if (call !== void 0) {
+          call.argumentsBuffer += event.delta;
+        }
+        continue;
+      }
       if (event.type === "response.function_call_arguments.done") {
         const call = pending.get(xaiFunctionCallKey(event.output_index, event.item_id));
         if (call !== void 0) {
@@ -28521,24 +28592,60 @@ function earliestXaiFunctionCallDeadline(pending) {
   }
   return earliest;
 }
-async function nextXaiEventBeforeDeadline(iterator, deadlineAt, controller, timeoutMs) {
-  const remainingMs = deadlineAt - Date.now();
-  if (remainingMs <= 0) {
-    const error51 = incompleteXaiFunctionCall(`function call assembly exceeded ${timeoutMs}ms`);
+async function* salvageXaiPendingCalls(pending, snapshot, reason, controller) {
+  const salvageable = [...pending.values()].every(
+    (call) => completeXaiArguments(call) !== void 0
+  );
+  if (snapshot === void 0 || !salvageable) {
+    const error51 = incompleteXaiFunctionCall(reason);
     controller.abort(error51);
     throw error51;
   }
+  wireLog("xai-responses.function_call.salvaged", {
+    reason,
+    calls: pending.size
+  });
+  controller.abort(incompleteXaiFunctionCall(reason));
+  for (const [key, call] of pending) {
+    const args = completeXaiArguments(call) ?? "";
+    const item = { ...call.added.item, arguments: args };
+    yield call.added;
+    yield {
+      type: "response.function_call_arguments.done",
+      item_id: call.added.item.id,
+      output_index: call.added.output_index,
+      arguments: args
+    };
+    yield { type: "response.output_item.done", output_index: call.added.output_index, item };
+    pending.delete(key);
+  }
+  yield { type: "response.completed", response: { ...snapshot, usage: null } };
+}
+function completeXaiArguments(call) {
+  const candidate = call.argumentsDone?.arguments ?? call.argumentsBuffer;
+  if (candidate.length === 0) return void 0;
+  let parsed;
+  try {
+    parsed = JSON.parse(candidate);
+  } catch {
+    return void 0;
+  }
+  return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? candidate : void 0;
+}
+async function nextXaiEventBeforeDeadline(iterator, deadlineAt) {
+  const remainingMs = deadlineAt - Date.now();
+  if (remainingMs <= 0) {
+    return XAI_ASSEMBLY_DEADLINE;
+  }
   let timeout;
   const next = iterator.next();
   void next.catch(() => void 0);
   try {
     return await Promise.race([
       next,
-      new Promise((_, reject) => {
+      new Promise((resolve3) => {
         timeout = setTimeout(() => {
-          const error51 = incompleteXaiFunctionCall(`function call assembly exceeded ${timeoutMs}ms`);
-          controller.abort(error51);
-          reject(error51);
+          resolve3(XAI_ASSEMBLY_DEADLINE);
         }, remainingMs);
       })
     ]);
@@ -28573,6 +28680,10 @@ function parseEventFrame3(frame) {
   }
   return canonicalEvent3(parsed);
 }
+var XAI_EOS_SENTINEL = "<|eos|>";
+function withoutXaiSentinel(text) {
+  return text.includes(XAI_EOS_SENTINEL) ? text.split(XAI_EOS_SENTINEL).join("") : text;
+}
 function canonicalEvent3(value) {
   if (!isRecord7(value) || typeof value.type !== "string") {
     throw new UpstreamProtocolError("Grok CLI SSE event was not an object with a type");
@@ -28592,25 +28703,30 @@ function canonicalEvent3(value) {
         content_index: number32(value.content_index, "content_index"),
         part: {
           type: "output_text",
-          text: typeof part.text === "string" ? part.text : ""
+          text: typeof part.text === "string" ? withoutXaiSentinel(part.text) : ""
         }
       };
     }
-    case "response.output_text.delta":
+    case "response.output_text.delta": {
+      const delta = withoutXaiSentinel(string32(value.delta, "delta"));
+      if (delta.length === 0) {
+        return void 0;
+      }
       return {
         type: value.type,
         item_id: string32(value.item_id, "item_id"),
         output_index: number32(value.output_index, "output_index"),
         content_index: number32(value.content_index, "content_index"),
-        delta: string32(value.delta, "delta")
+        delta
       };
+    }
     case "response.output_text.done":
       return {
         type: value.type,
         item_id: string32(value.item_id, "item_id"),
         output_index: number32(value.output_index, "output_index"),
         content_index: number32(value.content_index, "content_index"),
-        text: string32(value.text, "text")
+        text: withoutXaiSentinel(string32(value.text, "text"))
       };
     case "response.reasoning_summary_text.delta":
     case "response.reasoning_text.delta":
@@ -28632,11 +28748,17 @@ function canonicalEvent3(value) {
         item
       };
     }
-    // Hold argument fragments until the Grok CLI proxy's partial-JSON behavior is observed.
-    // The `.done` event carries the complete argument object, which downstream treats as the
-    // remainder when nothing was streamed ahead of it.
+    // Fragments still never reach the client — the assembler absorbs them and the `.done`
+    // event carries the complete argument object. They are decoded rather than discarded
+    // because this proxy has been measured ending a stream with the whole argument object
+    // delivered as fragments and no terminal frame; the buffer is that turn's only copy.
     case "response.function_call_arguments.delta":
-      return void 0;
+      return {
+        type: value.type,
+        item_id: string32(value.item_id, "item_id"),
+        output_index: number32(value.output_index, "output_index"),
+        delta: string32(value.delta, "delta")
+      };
     case "response.function_call_arguments.done":
       return {
         type: value.type,
@@ -29106,6 +29228,10 @@ function isCursorNativeRedirectToolName(name) {
   const leaf = toolLeafName3(name).replace(/[_-]/g, "").toLowerCase();
   return ["grep", "bash", "shellcommand", "execcommand"].includes(leaf);
 }
+function isCursorWithheldToolName(name) {
+  const leaf = toolLeafName3(name).replace(/[_-]/g, "").toLowerCase();
+  return ["bash", "shellcommand", "execcommand"].includes(leaf);
+}
 function cursorNativeExecRedirect(exec2, tools, providerIdentifier) {
   const messageId = numberValue2(exec2.id ?? 0);
   const execId = stringValue2(exec2.execId) || `redirect-${messageId}`;
@@ -29317,22 +29443,23 @@ function grepArguments(tool, input) {
       args.path = input.path;
     }
     const optionMappings = [
-      [input.glob || void 0, "glob"],
-      [input.outputMode, "output_mode"],
-      [input.caseInsensitive ? true : void 0, "case_insensitive"],
-      [input.contextBefore, "context_before"],
-      [input.contextAfter, "context_after"],
-      [input.context, "context"],
-      [input.type, "type"],
-      [input.headLimit, "head_limit"],
-      [input.multiline ? true : void 0, "multiline"],
-      [input.sort, "sort"],
-      [input.sortAscending, "sort_ascending"],
-      [input.offset, "offset"]
+      [input.glob || void 0, ["glob"]],
+      [input.outputMode, ["output_mode"]],
+      [input.caseInsensitive ? true : void 0, ["-i", "case_insensitive"]],
+      [input.contextBefore, ["-B", "context_before"]],
+      [input.contextAfter, ["-A", "context_after"]],
+      [input.context, ["context", "-C"]],
+      [input.type, ["type"]],
+      [input.headLimit, ["head_limit"]],
+      [input.multiline ? true : void 0, ["multiline"]],
+      [input.sort, ["sort"]],
+      [input.sortAscending, ["sort_ascending"]],
+      [input.offset, ["offset"]]
     ];
-    for (const [value, key] of optionMappings) {
+    for (const [value, candidates] of optionMappings) {
       if (value === void 0) continue;
-      if (!schemaHasProperty(tool.inputSchemaValue, key)) return null;
+      const key = firstSchemaProperty(tool.inputSchemaValue, candidates);
+      if (key === void 0) return null;
       args[key] = value;
     }
     return args;
@@ -30951,7 +31078,7 @@ function applyCursorToolBudget(request) {
   const supportsDeferredLoading = declaredTools.some((tool) => isCursorToolSearchName(tool.name));
   const sourceTools = declaredTools.filter((tool) => {
     const explicitlySelected = referencedNames.has(tool.name) || cursorToolMatches(tool.name, selectedName);
-    if (isCursorNativeRedirectToolName(tool.name) && !explicitlySelected) return false;
+    if (isCursorWithheldToolName(tool.name) && !explicitlySelected) return false;
     return !supportsDeferredLoading || tool.defer_loading !== true || isCursorToolSearchName(tool.name) || explicitlySelected;
   });
   const wireTools = sourceTools.map(toCursorWireTool);
@@ -33252,6 +33379,63 @@ function sortGatewayModelsByProvider(models) {
     return GATEWAY_MODELS.indexOf(left) - GATEWAY_MODELS.indexOf(right);
   });
 }
+var codexRequestPolicy = {
+  provider: "codex",
+  shapeRequest: (request, steps) => steps.withholdWebSearchTools(steps.pruneSkillPayloads(request))
+};
+var cursorRequestPolicy = {
+  provider: "cursor",
+  shapeRequest: (request, steps) => steps.withholdWebSearchTools(steps.pruneSkillPayloads(request))
+};
+var kimiRequestPolicy = {
+  provider: "kimi",
+  shapeRequest: (request, steps) => steps.pruneSkillPayloads(request)
+};
+var opencodeGoRequestPolicy = {
+  provider: "opencode",
+  shapeRequest: (request, steps) => steps.withholdWebSearchTools(steps.pruneSkillPayloads(request))
+};
+var xaiRequestPolicy = {
+  provider: "xai",
+  shapeRequest: (request, steps) => steps.withholdWebSearchTools(steps.pruneSkillPayloads(request))
+};
+var POLICIES = {
+  codex: codexRequestPolicy,
+  cursor: cursorRequestPolicy,
+  kimi: kimiRequestPolicy,
+  // The provider id is `opencode`; its folder carries the `-go` subscription name.
+  opencode: opencodeGoRequestPolicy,
+  xai: xaiRequestPolicy
+};
+function resolveGatewayRequestPolicy(provider) {
+  return POLICIES[provider];
+}
+function applyGatewayRequestPolicy(request, target2, withheldSkills) {
+  const context = {
+    target: target2,
+    upstreamModel: upstreamModelId(target2),
+    withheldSkills
+  };
+  const policy = resolveGatewayRequestPolicy(target2.provider);
+  return policy.shapeRequest(request, buildPolicySteps(context), context);
+}
+function buildPolicySteps(context) {
+  return {
+    pruneSkillPayloads: (request) => {
+      const pruned = pruneClaudeSkillPayloads(request.messages, {
+        ...typeof context.target.contextWindow === "number" ? { contextWindow: context.target.contextWindow } : {},
+        model: context.upstreamModel,
+        withheld: context.withheldSkills
+      });
+      for (const skill of pruned.withheld) context.withheldSkills.add(skill.name);
+      return pruned.changed ? { ...request, messages: [...pruned.messages] } : request;
+    },
+    withholdWebSearchTools: (request) => {
+      const omitted = omitClaudeWebSearchTools(request);
+      return omitted.changed ? omitted.request : request;
+    }
+  };
+}
 var HOP_BY_HOP_HEADERS = /* @__PURE__ */ new Set([
   "connection",
   "content-encoding",
@@ -33470,19 +33654,11 @@ function createAiGatewayRouter(deps) {
       writeAnthropicError(res, 403, "permission_error", `AI gateway model is not enabled: ${requested}`);
       return true;
     }
-    if (target2) {
-      const pruned = pruneClaudeSkillPayloads(body2.messages, {
-        ...typeof target2.contextWindow === "number" ? { contextWindow: target2.contextWindow } : {},
-        model: upstreamModelId(target2),
-        withheld: withheldSkills
-      });
-      for (const skill of pruned.withheld) withheldSkills.add(skill.name);
-      if (pruned.changed) body2 = { ...body2, messages: [...pruned.messages] };
-    }
-    if (target2 && target2.provider !== "kimi") {
-      const omitted = omitClaudeWebSearchTools(body2);
-      if (omitted.changed) body2 = omitted.request;
+    const withoutUsageLimitDirectives = stripClaudeUsageLimitDirectives(body2.messages);
+    if (withoutUsageLimitDirectives.changed) {
+      body2 = { ...body2, messages: [...withoutUsageLimitDirectives.messages] };
     }
+    if (target2) body2 = applyGatewayRequestPolicy(body2, target2, withheldSkills);
     let credential = "";
     let chatgptAccountId = "";
     if (target2?.provider === "cursor") {
@@ -34676,9 +34852,13 @@ function buildClaudeGatewayArgs(context) {
     ]),
     ...context.mcpServers.length > 0 ? ["--mcp-config", buildClaudeMcpConfig(context.mcpServers)] : [],
     ...buildSettingsArgs(context.skillOverrides),
+    ...buildSearchToolArgs(),
     "--dangerously-skip-permissions"
   ];
 }
+function buildSearchToolArgs() {
+  return ["--allowedTools", "Grep,Glob"];
+}
 function buildSettingsArgs(skillOverrides) {
   if (skillOverrides === void 0 || Object.keys(skillOverrides).length === 0) return [];
   return ["--settings", JSON.stringify({ skillOverrides })];

package/package.json

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

package/dist/client/assets/channel-CXR6clX_.js

@@ -1 +0,0 @@
-import{ap as o,aq as n}from"./mermaid.core-CmjUZw2x.js";const t=(a,r)=>o.lang.round(n.parse(a)[r]);export{t as c};

package/dist/client/assets/classDiagram-6PBFFD2Q-4x7ZfFx0.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-4TB4RGXK-C5bwM8_h.js";import{_ as i}from"./mermaid.core-CmjUZw2x.js";import"./chunk-FMBD7UC4-B8JSJHVV.js";import"./chunk-YZCP3GAM-B9d83zwz.js";import"./chunk-55IACEB6-BhcOy6C-.js";import"./chunk-EDXVE4YY-TOZwStuB.js";import"./index-B1tQI7A5.js";var n={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{n as diagram};

package/dist/client/assets/classDiagram-v2-HSJHXN6E-4x7ZfFx0.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-4TB4RGXK-C5bwM8_h.js";import{_ as i}from"./mermaid.core-CmjUZw2x.js";import"./chunk-FMBD7UC4-B8JSJHVV.js";import"./chunk-YZCP3GAM-B9d83zwz.js";import"./chunk-55IACEB6-BhcOy6C-.js";import"./chunk-EDXVE4YY-TOZwStuB.js";import"./index-B1tQI7A5.js";var n={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{n as diagram};

package/dist/client/assets/clone-lkppJrH0.js

@@ -1 +0,0 @@
-import{b as r}from"./graph-BCiainCT.js";var e=4;function a(o){return r(o,e)}export{a as c};