@ganglion/xacpx 0.13.0 → 0.14.1

package/dist/bridge/bridge-main.js

@@ -72,6 +72,10 @@ function encodeBridgePromptUsageEvent(event) {
   return `${JSON.stringify(event)}
 `;
 }
+function encodeBridgePromptCommandsEvent(event) {
+  return `${JSON.stringify(event)}
+`;
+}
 function encodeBridgeSessionProgressEvent(event) {
   return `${JSON.stringify(event)}
 `;
@@ -429,6 +433,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
   let onThought;
   let onPlan;
   let onUsage;
+  let onCommands;
   let rawStream = false;
   if (options === undefined) {
     toolEventMode = "text";
@@ -441,6 +446,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     onThought = options.onThought;
     onPlan = options.onPlan;
     onUsage = options.onUsage;
+    onCommands = options.onCommands;
     rawStream = options.rawStream ?? false;
     toolEventMode = resolveToolEventMode({
       toolEventMode: options.mode,
@@ -454,12 +460,14 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     pendingLine: "",
     formatToolCalls,
     emittedToolCallIds: new Set,
+    toolCalls: new Map,
     toolEventMode,
     rawStream,
     onToolEvent,
     onThought,
     onPlan,
     onUsage,
+    onCommands,
     finalize() {
       if (this.pendingLine.trim().length > 0) {
         parseStreamingChunks(this, this.pendingLine);
@@ -500,7 +508,8 @@ function parseStreamingChunks(state, line) {
     const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
     const wantsText = (state.toolEventMode === "text" || state.toolEventMode === "both") && state.formatToolCalls;
     if (wantsStructured && state.onToolEvent) {
-      const toolEvent = buildToolUseEvent(update);
+      const merged = update.toolCallId ? mergeToolCallUpdate(state, update.toolCallId, update) : update;
+      const toolEvent = buildToolUseEvent(merged);
       if (toolEvent)
         state.onToolEvent(toolEvent);
     }
@@ -527,8 +536,17 @@ function parseStreamingChunks(state, line) {
   if (update.sessionUpdate === "usage_update") {
     const used = typeof update.used === "number" && Number.isFinite(update.used) ? update.used : undefined;
     const size = typeof update.size === "number" && Number.isFinite(update.size) ? update.size : undefined;
-    if (used !== undefined && size !== undefined && size > 0)
-      state.onUsage?.({ used, size });
+    if (used !== undefined && size !== undefined && size > 0) {
+      const cost = normalizeUsageCost(update.cost);
+      const breakdown = normalizeUsageBreakdown(update._meta?.usage);
+      state.onUsage?.({ used, size, ...cost ? { cost } : {}, ...breakdown ? { breakdown } : {} });
+    }
+    return;
+  }
+  if (update.sessionUpdate === "available_commands_update") {
+    if (Array.isArray(update.availableCommands)) {
+      state.onCommands?.(normalizeAgentCommands(update.availableCommands));
+    }
     return;
   }
   const isThoughtChunk = update.sessionUpdate === "agent_thought_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
@@ -578,6 +596,29 @@ function formatToolCallEvent(update, sessionUpdate) {
   const statusText = status ? ` (${status})` : "";
   return `${emoji} ${title}${statusText}${summaryText}`;
 }
+function isEmptyToolField(v) {
+  if (v === undefined || v === null)
+    return true;
+  if (typeof v === "string")
+    return v.trim().length === 0;
+  if (Array.isArray(v))
+    return v.length === 0;
+  if (typeof v === "object")
+    return Object.keys(v).length === 0;
+  return false;
+}
+function mergeToolCallUpdate(state, toolCallId, update) {
+  const prev = state.toolCalls.get(toolCallId) ?? { toolCallId };
+  const merged = { ...prev };
+  for (const key of ["kind", "title", "rawInput", "content", "rawOutput", "locations", "status"]) {
+    const next = update[key];
+    if (!isEmptyToolField(next))
+      merged[key] = next;
+  }
+  merged.toolCallId = toolCallId;
+  state.toolCalls.set(toolCallId, merged);
+  return merged;
+}
 function buildToolUseEvent(update) {
   if (!update)
     return null;
@@ -695,6 +736,52 @@ function readFirstStringArray(record, keys) {
   }
   return;
 }
+function asFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+function firstFiniteNumber(record, keys) {
+  for (const key of keys) {
+    const n = asFiniteNumber(record[key]);
+    if (n !== undefined)
+      return n;
+  }
+  return;
+}
+function normalizeUsageBreakdown(value) {
+  if (!isRecord(value))
+    return;
+  const out = {};
+  for (const [key, aliases] of USAGE_BREAKDOWN_FIELDS) {
+    const n = firstFiniteNumber(value, aliases);
+    if (n !== undefined)
+      out[key] = n;
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+function normalizeUsageCost(value) {
+  if (!isRecord(value))
+    return;
+  const amount = asFiniteNumber(value.amount);
+  const currency = readString(value, "currency");
+  if (amount === undefined && !currency)
+    return;
+  return { ...amount !== undefined ? { amount } : {}, ...currency ? { currency } : {} };
+}
+function normalizeAgentCommands(value) {
+  if (!Array.isArray(value))
+    return [];
+  const out = [];
+  for (const entry of value) {
+    if (!isRecord(entry))
+      continue;
+    const name = readString(entry, "name");
+    if (!name)
+      continue;
+    const description = readString(entry, "description");
+    out.push({ name, ...description ? { description } : {}, hasInput: entry.input != null });
+  }
+  return out;
+}
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -720,8 +807,17 @@ function isGenericToolTitle(kind, title) {
   }
   return false;
 }
+var USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
   init_tool_kind_emoji();
+  USAGE_BREAKDOWN_FIELDS = [
+    ["inputTokens", ["inputTokens", "input_tokens"]],
+    ["outputTokens", ["outputTokens", "output_tokens"]],
+    ["cachedReadTokens", ["cachedReadTokens", "cacheReadInputTokens", "cache_read_input_tokens"]],
+    ["cachedWriteTokens", ["cachedWriteTokens", "cacheCreationInputTokens", "cache_creation_input_tokens"]],
+    ["thoughtTokens", ["thoughtTokens", "thought_tokens"]],
+    ["totalTokens", ["totalTokens", "total_tokens"]]
+  ];
 });
 
 // src/recovery/discover-parent-package-paths.ts
@@ -1874,6 +1970,7 @@ var init_misc = __esm(() => {
     defaultHomeWorkspaceDescription: "Home directory",
     pluginChannelFeishu: "Feishu channel",
     pluginChannelYuanbao: "Tencent Yuanbao channel",
+    pluginChannelRelay: "Relay hub connector (drive this instance from a self-hosted relay hub)",
     pluginChannelInstallHint: (channelType, packageName) => `Channel ${channelType} requires a plugin: xacpx plugin add ${packageName}`,
     orchestrationSuggestion1: "Run /tasks --stuck to locate stuck tasks",
     orchestrationSuggestion2: "/task <id> shows the full timeline to locate errors",
@@ -2970,6 +3067,7 @@ var init_misc2 = __esm(() => {
     defaultHomeWorkspaceDescription: "用户主目录",
     pluginChannelFeishu: "飞书频道",
     pluginChannelYuanbao: "腾讯元宝频道",
+    pluginChannelRelay: "Relay hub 连接器（从自托管 relay hub 遥控这台实例）",
     pluginChannelInstallHint: (channelType, packageName) => `频道 ${channelType} 需要安装插件：xacpx plugin add ${packageName}`,
     orchestrationSuggestion1: "查看 /tasks --stuck 定位卡住的任务",
     orchestrationSuggestion2: "/task <id> 可看完整时间线定位错误点",
@@ -4049,7 +4147,8 @@ async function runStreamingPrompt(command, args, onEvent, options = {}) {
       ...onEvent && (toolEventMode === "structured" || toolEventMode === "both") ? { onToolEvent: (toolEvent) => onEvent({ type: "prompt.tool_event", event: toolEvent }) } : {},
       ...onEvent ? { onThought: (chunk) => onEvent({ type: "prompt.thought", text: chunk }) } : {},
       ...onEvent ? { onPlan: (entries) => onEvent({ type: "prompt.plan", entries }) } : {},
-      ...onEvent ? { onUsage: (usage) => onEvent({ type: "prompt.usage", used: usage.used, size: usage.size }) } : {}
+      ...onEvent ? { onUsage: (usage) => onEvent({ type: "prompt.usage", used: usage.used, size: usage.size, ...usage.cost ? { cost: usage.cost } : {}, ...usage.breakdown ? { breakdown: usage.breakdown } : {} }) } : {},
+      ...onEvent ? { onCommands: (commands) => onEvent({ type: "prompt.commands", commands }) } : {}
     });
     let lastReplyAt = now();
     const flushBuffer = () => {
@@ -4347,7 +4446,15 @@ class BridgeServer {
               id: requestId,
               event: "prompt.usage",
               used: event.used,
-              size: event.size
+              size: event.size,
+              ...event.cost ? { cost: event.cost } : {},
+              ...event.breakdown ? { breakdown: event.breakdown } : {}
+            }));
+          } else if (event.type === "prompt.commands") {
+            writeLine?.(encodeBridgePromptCommandsEvent({
+              id: requestId,
+              event: "prompt.commands",
+              commands: event.commands
             }));
           }
         });