@ganglion/xacpx 0.13.0 → 0.14.1

package/dist/cli.js

@@ -1075,6 +1075,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",
@@ -2171,6 +2172,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> 可看完整时间线定位错误点",
@@ -19512,6 +19514,12 @@ var init_known_plugins = __esm(() => {
       channels: ["yuanbao"],
       descriptionKey: "pluginChannelYuanbao",
       official: true
+    },
+    {
+      packageName: "@ganglion/xacpx-channel-relay",
+      channels: ["relay"],
+      descriptionKey: "pluginChannelRelay",
+      official: true
     }
   ];
 });
@@ -21780,8 +21788,9 @@ async function buildCoordinatorPrompt(input) {
 `));
   }
   if (input.userText) {
-    sections.push([t().coordinatorPrompt.userMessageLabel, input.userText].join(`
-`));
+    const hasOrchestrationContext = sections.length > 0;
+    sections.push(hasOrchestrationContext ? [t().coordinatorPrompt.userMessageLabel, input.userText].join(`
+`) : input.userText);
   }
   const claimHumanReply = shouldBind && input.chatKey && activePackage?.awaitingReplyMessageId ? {
     coordinatorSession: input.coordinatorSession,
@@ -22377,7 +22386,7 @@ async function handleSessionArchive(context, chatKey, alias, archive) {
   await archive(internalAlias);
   return { text: t().session.sessionArchived(alias) };
 }
-async function promptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage) {
+async function promptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands) {
   if (session3.archived) {
     await context.sessions.setArchived(session3.alias, false);
   }
@@ -22412,7 +22421,7 @@ async function promptWithSession(context, session3, chatKey, text, reply, replyC
   const { promptText, taskIds, groupIds, claimHumanReply } = await preparePromptWithFallback(context, session3, chatKey, text, replyContextToken, accountId);
   try {
     const replyContext = transportReply && context.quota && getChannelIdFromChatKey(chatKey) === "weixin" ? { chatKey, quota: context.quota } : undefined;
-    const result = await context.interaction.promptTransportSession(session3, promptText, transportReply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpan, onPlan, onUsage);
+    const result = await context.interaction.promptTransportSession(session3, promptText, transportReply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpan, onPlan, onUsage, onCommands);
     if (claimHumanReply) {
       try {
         await context.orchestration?.claimActiveHumanReply?.(claimHumanReply);
@@ -22432,23 +22441,23 @@ async function promptWithSession(context, session3, chatKey, text, reply, replyC
     throw error2;
   }
 }
-async function handlePromptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage) {
+async function handlePromptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands) {
   try {
-    return await promptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage);
+    return await promptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands);
   } catch (error2) {
     const recovered = await context.recovery.tryRecoverMissingSession(session3, error2);
     if (recovered) {
-      return await promptWithSession(context, recovered, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage);
+      return await promptWithSession(context, recovered, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands);
     }
     return context.recovery.renderTransportError(session3, error2);
   }
 }
-async function handlePrompt(context, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage) {
+async function handlePrompt(context, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands) {
   const session3 = metadata?.boundSessionAlias ? context.sessions.getResolvedSessionByInternalAlias(metadata.boundSessionAlias) : await context.sessions.getCurrentSession(chatKey);
   if (!session3) {
     return { text: t().session.noCurrent };
   }
-  return await handlePromptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage);
+  return await handlePromptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands);
 }
 function toCoordinatorRouteChatMetadata(metadata) {
   if (!metadata) {
@@ -24707,7 +24716,7 @@ class CommandRouter {
     this.logger = logger2 ?? createNoopAppLogger();
     this.activeTurns = activeTurns;
   }
-  async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal, onToolEvent, onThought, perfSpan, onPlan, onUsage) {
+  async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal, onToolEvent, onThought, perfSpan, onPlan, onUsage, onCommands) {
     const startedAt = Date.now();
     let command = parseCommand(input);
     if (metadata?.channel === "control" && command.kind !== "prompt") {
@@ -24869,16 +24878,16 @@ class CommandRouter {
               ...this.sessions.resolveSession(descriptor.alias, descriptor.agent, descriptor.workspace, descriptor.transportSession),
               transient: true
             };
-            return await handlePromptWithSession(sessionContext, transientSession, chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage);
+            return await handlePromptWithSession(sessionContext, transientSession, chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands);
           }
           if (metadata?.scheduledSessionAlias) {
             const scheduledSession = await this.sessions.getSession(metadata.scheduledSessionAlias);
             if (!scheduledSession) {
               throw new Error(`session "${metadata.scheduledSessionAlias}" not found for scheduled prompt`);
             }
-            return await handlePromptWithSession(sessionContext, scheduledSession, chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage);
+            return await handlePromptWithSession(sessionContext, scheduledSession, chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands);
           }
-          return await handlePrompt(sessionContext, chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage);
+          return await handlePrompt(sessionContext, chatKey, command.text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata, onPlan, onUsage, onCommands);
         }
       }
     });
@@ -25102,7 +25111,7 @@ class CommandRouter {
       setModelTransportSession: (session3, modelId) => this.setModelTransportSession(session3, modelId),
       getModelTransportSession: (session3) => this.getModelTransportSession(session3),
       cancelTransportSession: (session3) => this.cancelTransportSession(session3),
-      promptTransportSession: (session3, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpanOverride, onPlan, onUsage) => this.promptTransportSession(session3, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpanOverride ?? perfSpan, onPlan, onUsage)
+      promptTransportSession: (session3, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpanOverride, onPlan, onUsage, onCommands) => this.promptTransportSession(session3, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpanOverride ?? perfSpan, onPlan, onUsage, onCommands)
     };
   }
   createSessionRenderRecoveryOps() {
@@ -25281,7 +25290,7 @@ class CommandRouter {
   async checkTransportSession(session3) {
     return await this.measureTransportCall("has_session", session3, () => this.transport.hasSession(session3));
   }
-  async promptTransportSession(session3, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpan, onPlan, onUsage) {
+  async promptTransportSession(session3, text, reply, replyContext, media, abortSignal, onToolEvent, onThought, perfSpan, onPlan, onUsage, onCommands) {
     session3.mcpCoordinatorSession ??= stableCoordinatorSession(session3.transportSession);
     let done = false;
     let abortRequested = false;
@@ -25340,7 +25349,8 @@ class CommandRouter {
         ...onToolEvent ? { onToolEvent } : {},
         ...onThought ? { onThought } : {},
         ...onPlan ? { onPlan } : {},
-        ...onUsage ? { onUsage } : {}
+        ...onUsage ? { onUsage } : {},
+        ...onCommands ? { onCommands } : {}
       }));
     } catch (error2) {
       localOutcome = isAbortError2(error2) || abortRequested ? "aborted" : "error";
@@ -25526,7 +25536,7 @@ class ConsoleAgent {
       ...m.fileName ? { fileName: m.fileName } : {}
     })) : undefined;
     request.perfSpan?.mark("agent.dispatched");
-    return await this.router.handle(request.conversationId, request.text, request.reply, request.replyContextToken, request.accountId, promptMedia, request.metadata, request.abortSignal, request.onToolEvent, request.onThought, request.perfSpan, request.onPlan, request.onUsage);
+    return await this.router.handle(request.conversationId, request.text, request.reply, request.replyContextToken, request.accountId, promptMedia, request.metadata, request.abortSignal, request.onToolEvent, request.onThought, request.perfSpan, request.onPlan, request.onUsage, request.onCommands);
   }
   isKnownCommand(text) {
     return isKnownXacpxCommandText(text);
@@ -30607,6 +30617,10 @@ function encodeBridgePromptUsageEvent(event) {
   return `${JSON.stringify(event)}
 `;
 }
+function encodeBridgePromptCommandsEvent(event) {
+  return `${JSON.stringify(event)}
+`;
+}
 function encodeBridgeSessionProgressEvent(event) {
   return `${JSON.stringify(event)}
 `;
@@ -30913,7 +30927,14 @@ class AcpxBridgeClient {
         pending.onEvent?.({
           type: "prompt.usage",
           used: message.used,
-          size: message.size
+          size: message.size,
+          ...message.cost ? { cost: message.cost } : {},
+          ...message.breakdown ? { breakdown: message.breakdown } : {}
+        });
+      } else if (message.event === "prompt.commands") {
+        pending.onEvent?.({
+          type: "prompt.commands",
+          commands: message.commands
         });
       } else if (message.event === "session.progress") {
         pending.onEvent?.({
@@ -31376,6 +31397,8 @@ class AcpxBridgeTransport {
     let planChain = Promise.resolve();
     let usageError;
     let usageChain = Promise.resolve();
+    let commandsError;
+    let commandsChain = Promise.resolve();
     let toolEventMode = resolveToolEventMode(options);
     if ((toolEventMode === "structured" || toolEventMode === "both") && !options?.onToolEvent) {
       toolEventMode = "text";
@@ -31431,19 +31454,30 @@ class AcpxBridgeTransport {
       if (event.type === "prompt.usage") {
         const onUsage = options?.onUsage;
         if (onUsage) {
-          const usage = { used: event.used, size: event.size };
+          const usage = { used: event.used, size: event.size, ...event.cost ? { cost: event.cost } : {}, ...event.breakdown ? { breakdown: event.breakdown } : {} };
           usageChain = usageChain.then(() => onUsage(usage)).catch((error2) => {
             usageError ??= error2;
           });
         }
         return;
       }
+      if (event.type === "prompt.commands") {
+        const onCommands = options?.onCommands;
+        if (onCommands) {
+          const commands = event.commands;
+          commandsChain = commandsChain.then(() => onCommands(commands)).catch((error2) => {
+            commandsError ??= error2;
+          });
+        }
+        return;
+      }
     });
     await segmentChain;
     await toolEventChain;
     await thoughtChain;
     await planChain;
     await usageChain;
+    await commandsChain;
     if (sink) {
       const { overflowCount } = sink.finalize();
       await sink.drain({ timeoutMs: 30000 });
@@ -31467,6 +31501,9 @@ class AcpxBridgeTransport {
       if (usageError) {
         throw usageError;
       }
+      if (commandsError) {
+        throw commandsError;
+      }
       return { text: summary ? `${summary}
 
 ${result.text}` : "" };
@@ -31486,6 +31523,9 @@ ${result.text}` : "" };
     if (usageError) {
       throw usageError;
     }
+    if (commandsError) {
+      throw commandsError;
+    }
     return result;
   }
   async setMode(session3, modeId) {
@@ -31695,6 +31735,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
   let onThought;
   let onPlan;
   let onUsage;
+  let onCommands;
   let rawStream = false;
   if (options === undefined) {
     toolEventMode = "text";
@@ -31707,6 +31748,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,
@@ -31720,12 +31762,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);
@@ -31766,7 +31810,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);
     }
@@ -31793,8 +31838,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";
@@ -31844,6 +31898,29 @@ function formatToolCallEvent(update, sessionUpdate) {
   const statusText = status ? ` (${status})` : "";
   return `${emoji2} ${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;
@@ -31961,6 +32038,52 @@ function readFirstStringArray(record3, keys) {
   }
   return;
 }
+function asFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+function firstFiniteNumber(record3, keys) {
+  for (const key of keys) {
+    const n = asFiniteNumber(record3[key]);
+    if (n !== undefined)
+      return n;
+  }
+  return;
+}
+function normalizeUsageBreakdown(value) {
+  if (!isRecord3(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 (!isRecord3(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 (!isRecord3(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 isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -31986,8 +32109,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/transport/acpx-cli/node-pty-helper.ts
@@ -33497,24 +33629,29 @@ var init_workspace_fs = __esm(() => {
 });
 
 // src/control/control-service.ts
+import path15 from "node:path";
+
 class ControlService {
   deps;
   constructor(deps) {
     this.deps = deps;
   }
   workspaceFs = new WorkspaceFs(() => this.deps.workspaces.list().map((w) => ({ name: w.name, cwd: w.cwd })));
-  listDirectory(workspace3, path15) {
-    return this.workspaceFs.listDirectory(workspace3, path15);
+  listDirectory(workspace3, path16) {
+    return this.workspaceFs.listDirectory(workspace3, path16);
   }
-  readWorkspaceFile(workspace3, path15) {
-    return this.workspaceFs.readFile(workspace3, path15);
+  readWorkspaceFile(workspace3, path16) {
+    return this.workspaceFs.readFile(workspace3, path16);
   }
-  workspaceGitDiff(workspace3, path15) {
-    return this.workspaceFs.gitDiff(workspace3, path15);
+  workspaceGitDiff(workspace3, path16) {
+    return this.workspaceFs.gitDiff(workspace3, path16);
   }
   searchWorkspace(workspace3, query) {
     return this.workspaceFs.search(workspace3, query);
   }
+  async uploadFile(input) {
+    return this.deps.uploadStore.save(input.filename, input.content, input.mimeType);
+  }
   async getSessionModel(chatKey, alias) {
     const session3 = await this.resolveControlSession(chatKey, alias);
     if (!session3)
@@ -33658,7 +33795,8 @@ class ControlService {
       text: input.text,
       senderId: input.senderId,
       ...input.isOwner !== undefined ? { isOwner: input.isOwner } : {},
-      ...input.accountId !== undefined ? { accountId: input.accountId } : {}
+      ...input.accountId !== undefined ? { accountId: input.accountId } : {},
+      ...input.media !== undefined ? { media: input.media } : {}
     });
   }
   async runScheduledTurn(input) {
@@ -33730,6 +33868,32 @@ ${chunk}` : chunk
       });
       emittedChunk = true;
     };
+    const incomingMedia = params.media ?? [];
+    const sandboxedMedia = incomingMedia.length ? (() => {
+      const uploadRoot = path15.resolve(this.deps.uploadStore.root);
+      const kept = incomingMedia.filter((ref) => {
+        const resolved = path15.resolve(ref.filePath);
+        return resolved === uploadRoot || resolved.startsWith(uploadRoot + path15.sep);
+      });
+      const dropped = incomingMedia.length - kept.length;
+      if (dropped > 0) {
+        console.warn(`[control] dropped ${dropped} media ref(s) with filePath outside the upload sandbox`);
+      }
+      return kept;
+    })() : incomingMedia;
+    const chatMedia = sandboxedMedia.map((ref) => ({
+      kind: ref.kind,
+      filePath: ref.filePath,
+      mimeType: ref.mimeType,
+      ...ref.fileName ? { fileName: ref.fileName } : {},
+      sizeBytes: ref.size,
+      source: {
+        channelId: "relay",
+        accountId: params.accountId ?? "control",
+        chatKey: params.chatKey,
+        messageId: ref.id
+      }
+    }));
     try {
       const response = await this.deps.agent.chat({
         accountId: params.accountId ?? "control",
@@ -33737,6 +33901,7 @@ ${chunk}` : chunk
         text: params.text,
         metadata: buildControlMetadata(params.senderId, params.isOwner),
         abortSignal: controller.signal,
+        ...chatMedia.length > 0 ? { media: chatMedia } : {},
         reply: async (chunk) => {
           emitChunk(chunk);
         },
@@ -33770,7 +33935,17 @@ ${chunk}` : chunk
             chatKey: params.chatKey,
             sessionAlias: params.sessionAlias,
             used: usage.used,
-            size: usage.size
+            size: usage.size,
+            ...usage.cost ? { cost: usage.cost } : {},
+            ...usage.breakdown ? { breakdown: usage.breakdown } : {}
+          });
+        },
+        onCommands: (commands) => {
+          this.deps.events.emit({
+            type: "agent-commands",
+            chatKey: params.chatKey,
+            sessionAlias: params.sessionAlias,
+            commands
           });
         }
       });
@@ -33859,13 +34034,92 @@ var init_control_service = __esm(() => {
   init_workspace_fs();
 });
 
+// src/control/upload-store.ts
+import { mkdtemp as mkdtemp2, readdir as readdir5, rm as rm10, stat as stat4, writeFile as writeFile8 } from "node:fs/promises";
+import { homedir as homedir12 } from "node:os";
+import path16 from "node:path";
+function defaultRootDir() {
+  const home = process.env.HOME ?? homedir12();
+  return path16.join(coreHomeDir(home), "runtime", "uploads");
+}
+function sanitizeUploadFilename(raw) {
+  const base = path16.basename(raw).replace(/[/\\]/g, "").replace(/^\.+/, "");
+  const cleaned = base.trim();
+  return cleaned.length > 0 ? cleaned : "file";
+}
+
+class UploadStore {
+  rootDir;
+  maxBytes;
+  ttlMs;
+  now;
+  constructor(opts = {}) {
+    this.rootDir = opts.rootDir ?? defaultRootDir();
+    this.maxBytes = opts.maxBytes ?? DEFAULT_MAX_BYTES;
+    this.ttlMs = opts.ttlMs ?? DEFAULT_TTL_MS;
+    this.now = opts.now ?? (() => new Date);
+  }
+  get root() {
+    return this.rootDir;
+  }
+  async save(filename, base642, mimeType) {
+    if (base642.length > Math.ceil(this.maxBytes * 4 / 3) + 4)
+      throw new Error("file-too-large");
+    const bytes = Buffer.from(base642, "base64");
+    if (bytes.byteLength === 0)
+      throw new Error("empty-file");
+    if (bytes.byteLength > this.maxBytes)
+      throw new Error("file-too-large");
+    const safeName = sanitizeUploadFilename(filename);
+    const { mkdir: mkdir9 } = await import("node:fs/promises");
+    await mkdir9(this.rootDir, { recursive: true });
+    const dir = await mkdtemp2(path16.join(this.rootDir, "u-"));
+    const filePath = path16.join(dir, safeName);
+    await writeFile8(filePath, bytes);
+    return {
+      id: path16.basename(dir),
+      path: filePath,
+      filename: safeName,
+      mimeType,
+      size: bytes.byteLength
+    };
+  }
+  async cleanup() {
+    let entries;
+    try {
+      entries = await readdir5(this.rootDir);
+    } catch {
+      return 0;
+    }
+    const cutoff = this.now().getTime() - this.ttlMs;
+    let removed = 0;
+    for (const name of entries) {
+      const dir = path16.join(this.rootDir, name);
+      try {
+        const info = await stat4(dir);
+        if (info.mtimeMs < cutoff) {
+          await rm10(dir, { recursive: true, force: true });
+          removed += 1;
+        }
+      } catch {}
+    }
+    return removed;
+  }
+}
+var DEFAULT_MAX_BYTES, DEFAULT_TTL_MS;
+var init_upload_store = __esm(() => {
+  init_core_home();
+  DEFAULT_MAX_BYTES = 10 * 1024 * 1024;
+  DEFAULT_TTL_MS = 24 * 60 * 60 * 1000;
+});
+
 // src/config/agent-catalog.ts
 import { existsSync as existsSync3 } from "node:fs";
 import { delimiter as delimiter2, join as join21 } from "node:path";
 function isBinaryOnPath(binary) {
-  const path15 = process.env.PATH ?? "";
+  const path17 = process.env.PATH ?? "";
   const exts = process.platform === "win32" ? ["", ".exe", ".cmd", ".bat"] : [""];
-  for (const dir of path15.split(delimiter2)) {
+  for (const dir of path17.split(delimiter2)) {
     if (!dir)
       continue;
     for (const ext of exts) {
@@ -33900,6 +34154,57 @@ var init_agent_catalog = __esm(() => {
   };
 });
 
+// src/config/config-watcher.ts
+import { watch } from "node:fs";
+import { basename as basename3, dirname as dirname12 } from "node:path";
+function startConfigWatcher(options) {
+  const { configPath, onChange, debounceMs = 250, logger: logger2 } = options;
+  const watchFactory = options.watchFactory ?? watch;
+  const dir = dirname12(configPath);
+  const target = basename3(configPath);
+  let timer;
+  let watcher;
+  const fire = () => {
+    timer = undefined;
+    try {
+      onChange();
+    } catch (error2) {
+      logger2?.error("config.watch.callback_failed", "config watch callback threw", {
+        error: error2 instanceof Error ? error2.message : String(error2)
+      });
+    }
+  };
+  try {
+    watcher = watchFactory(dir, { persistent: false }, (_event, filename) => {
+      if (filename !== null && basename3(filename.toString()) !== target)
+        return;
+      if (timer)
+        clearTimeout(timer);
+      timer = setTimeout(fire, debounceMs);
+    });
+    watcher.on("error", (error2) => {
+      logger2?.error("config.watch.error", "config watcher errored", {
+        error: error2 instanceof Error ? error2.message : String(error2)
+      });
+    });
+  } catch (error2) {
+    logger2?.error("config.watch.start_failed", "could not start config watcher", {
+      error: error2 instanceof Error ? error2.message : String(error2)
+    });
+  }
+  return {
+    close: () => {
+      if (timer) {
+        clearTimeout(timer);
+        timer = undefined;
+      }
+      watcher?.close();
+      watcher = undefined;
+    }
+  };
+}
+var init_config_watcher = () => {};
+
 // src/main.ts
 var exports_main = {};
 __export(exports_main, {
@@ -33910,8 +34215,8 @@ __export(exports_main, {
   buildApp: () => buildApp
 });
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { homedir as homedir12 } from "node:os";
-import { dirname as dirname12, join as join22 } from "node:path";
+import { homedir as homedir13 } from "node:os";
+import { dirname as dirname13, join as join22 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function startProgressHeartbeat(orchestration3, config4, logger2, channel) {
   const thresholdSeconds = config4.orchestration.progressHeartbeatSeconds;
@@ -34402,6 +34707,9 @@ async function buildApp(paths, deps = {}) {
   const router3 = new CommandRouter(sessions, transport, config4, configStore, logger2, undefined, orchestration3, quota, scheduledService, deps.channel?.supportsScheduledMessages ? { supportsScheduledMessages: deps.channel.supportsScheduledMessages.bind(deps.channel) } : undefined, deps.channel?.nativeSessionListFormat ? deps.channel.nativeSessionListFormat.bind(deps.channel) : undefined, activeTurns);
   const agent3 = new ConsoleAgent(router3, logger2);
   const controlEvents = createControlEventBus(logger2);
+  const uploadStore = new UploadStore;
+  uploadStore.cleanup();
+  const uploadCleanupInterval = setInterval(() => void uploadStore.cleanup().catch(() => {}), 60 * 60 * 1000);
   const control = new ControlService({
     agent: agent3,
     sessions,
@@ -34438,12 +34746,35 @@ async function buildApp(paths, deps = {}) {
       create: async (name, cwd, description) => {
         const updated = await configStore.upsertWorkspace(name, cwd, description);
         replaceRuntimeConfig(config4, updated);
+        controlEvents.emit({ type: "workspaces-changed" });
         return { name, cwd, ...description ? { description } : {} };
       },
       remove: async (name) => {
         const updated = await configStore.removeWorkspace(name);
         replaceRuntimeConfig(config4, updated);
+        controlEvents.emit({ type: "workspaces-changed" });
       }
+    },
+    uploadStore
+  });
+  const workspaceSignature = (cfg) => JSON.stringify(Object.keys(cfg.workspaces).sort().map((name) => {
+    const ws = cfg.workspaces[name];
+    return [name, ws.cwd, ws.description ?? ""];
+  }));
+  const configWatcher = startConfigWatcher({
+    configPath: paths.configPath,
+    logger: logger2,
+    onChange: () => {
+      const before = workspaceSignature(config4);
+      reloadRuntimeConfig().then(() => {
+        if (workspaceSignature(config4) !== before) {
+          controlEvents.emit({ type: "workspaces-changed" });
+        }
+      }).catch((error2) => {
+        logger2.error("config.reload_failed", "failed to reload config after file change", {
+          error: error2 instanceof Error ? error2.message : String(error2)
+        });
+      });
     }
   });
   const scheduledScheduler = new ScheduledTaskScheduler(scheduledService, {
@@ -34514,6 +34845,8 @@ async function buildApp(paths, deps = {}) {
     reapStaleQueueOwners: () => reapWarmQueueOwners("startup"),
     dispose: async () => {
       scheduledScheduler.stop();
+      configWatcher.close();
+      clearInterval(uploadCleanupInterval);
       if (progressHeartbeatInterval !== undefined) {
         clearInterval(progressHeartbeatInterval);
       }
@@ -34574,7 +34907,7 @@ async function main() {
   }
 }
 async function prepareChannelMedia(configPath, config4) {
-  const runtimeDir = join22(dirname12(configPath), "runtime");
+  const runtimeDir = join22(dirname13(configPath), "runtime");
   const mediaRootDir = join22(runtimeDir, "media");
   const mediaStore = new RuntimeMediaStore({ rootDir: mediaRootDir });
   await mediaStore.cleanupExpired().catch((error2) => {
@@ -34584,12 +34917,12 @@ async function prepareChannelMedia(configPath, config4) {
   return { mediaStore, channelDeps: { mediaStore, allowedMediaRoots } };
 }
 function resolveRuntimePaths() {
-  const home = process.env.HOME ?? homedir12();
+  const home = process.env.HOME ?? homedir13();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
   const configPath = coreEnv("CONFIG") ?? join22(coreHomeDir(home), "config.json");
-  const runtimeDir = join22(dirname12(configPath), "runtime");
+  const runtimeDir = join22(dirname13(configPath), "runtime");
   return {
     configPath,
     statePath: coreEnv("STATE") ?? join22(coreHomeDir(home), "state.json"),
@@ -34604,12 +34937,12 @@ function resolveBridgeEntryPath() {
   return fileURLToPath5(new URL("./bridge/bridge-main.ts", import.meta.url));
 }
 function resolveAppLogPath(configPath) {
-  const rootDir = dirname12(configPath);
+  const rootDir = dirname13(configPath);
   const runtimeDir = join22(rootDir, "runtime");
   return join22(runtimeDir, "app.log");
 }
 function resolvePerfLogPath(configPath) {
-  const rootDir = dirname12(configPath);
+  const rootDir = dirname13(configPath);
   const runtimeDir = join22(rootDir, "runtime");
   return join22(runtimeDir, "perf.log");
 }
@@ -34656,7 +34989,9 @@ var init_main = __esm(async () => {
   init_render_text();
   init_quota_manager();
   init_control_service();
+  init_upload_store();
   init_agent_catalog();
+  init_config_watcher();
   init_perf_tracer();
   init_bootstrap();
   init_i18n();
@@ -34849,12 +35184,12 @@ var init_config_check = __esm(async () => {
 });
 
 // src/doctor/checks/daemon-check.ts
-import { readdir as readdir5, readFile as readFile15, rm as rm10 } from "node:fs/promises";
+import { readdir as readdir6, readFile as readFile15, rm as rm11 } from "node:fs/promises";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
-import { homedir as homedir13 } from "node:os";
+import { homedir as homedir14 } from "node:os";
 import { join as join23 } from "node:path";
 async function checkDaemon(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir13();
+  const home = options.home ?? process.env.HOME ?? homedir14();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -34988,22 +35323,22 @@ async function detectStaleConsumerLockFix(runtimeDir, deps) {
 }
 async function defaultListConsumerLocks(runtimeDir) {
   try {
-    return await readdir5(runtimeDir);
+    return await readdir6(runtimeDir);
   } catch {
     return [];
   }
 }
-async function defaultReadConsumerLock(path15) {
+async function defaultReadConsumerLock(path17) {
   try {
-    const raw = await readFile15(path15, "utf8");
+    const raw = await readFile15(path17, "utf8");
     const parsed = JSON.parse(raw);
     return typeof parsed.pid === "number" ? { pid: parsed.pid } : null;
   } catch {
     return null;
   }
 }
-async function defaultRemoveConsumerLock(path15) {
-  await rm10(path15, { force: true });
+async function defaultRemoveConsumerLock(path17) {
+  await rm11(path17, { force: true });
 }
 function resolveCliEntryPath() {
   return process.argv[1] ?? fileURLToPath6(import.meta.url);
@@ -35018,11 +35353,11 @@ var init_daemon_check = __esm(() => {
 });
 
 // src/doctor/checks/logs-check.ts
-import { stat as stat4, readdir as readdir6 } from "node:fs/promises";
-import { basename as basename3, join as join24 } from "node:path";
-import { homedir as homedir14 } from "node:os";
+import { stat as stat5, readdir as readdir7 } from "node:fs/promises";
+import { basename as basename4, join as join24 } from "node:path";
+import { homedir as homedir15 } from "node:os";
 async function checkLogs(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir14();
+  const home = options.home ?? process.env.HOME ?? homedir15();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -35049,18 +35384,18 @@ async function checkLogs(options = {}) {
       `error: ${formatError6(error2)}`
     ]);
   }
-  const baseNames = [basename3(paths.appLog), basename3(paths.stdoutLog), basename3(paths.stderrLog)];
+  const baseNames = [basename4(paths.appLog), basename4(paths.stdoutLog), basename4(paths.stderrLog)];
   const tracked = new Set(baseNames);
   const matched = entries.filter((entry) => isTrackedLogName(entry, tracked));
   const files = [];
   for (const name of matched) {
-    const path15 = join24(paths.runtimeDir, name);
+    const path17 = join24(paths.runtimeDir, name);
     try {
-      const fileStat = await probe.stat(path15);
+      const fileStat = await probe.stat(path17);
       if (fileStat.isDirectory()) {
         continue;
       }
-      files.push({ name, path: path15, size: fileStat.size });
+      files.push({ name, path: path17, size: fileStat.size });
     } catch {
       continue;
     }
@@ -35134,8 +35469,8 @@ function formatBytes(bytes) {
 }
 function createLogsFsProbe() {
   return {
-    stat: async (path15) => await stat4(path15),
-    readdir: async (path15) => await readdir6(path15)
+    stat: async (path17) => await stat5(path17),
+    readdir: async (path17) => await readdir7(path17)
   };
 }
 function formatError6(error2) {
@@ -35204,9 +35539,9 @@ var init_orchestration_health = __esm(() => {
 });
 
 // src/doctor/checks/orchestration-socket-check.ts
-import { homedir as homedir15 } from "node:os";
+import { homedir as homedir16 } from "node:os";
 async function checkOrchestrationSocket(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir15();
+  const home = options.home ?? process.env.HOME ?? homedir16();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -35379,11 +35714,11 @@ var init_plugin_check = __esm(async () => {
 
 // src/doctor/checks/runtime-check.ts
 import { constants } from "node:fs";
-import { access as access4, stat as stat5 } from "node:fs/promises";
-import { dirname as dirname13 } from "node:path";
-import { homedir as homedir16 } from "node:os";
+import { access as access4, stat as stat6 } from "node:fs/promises";
+import { dirname as dirname14 } from "node:path";
+import { homedir as homedir17 } from "node:os";
 async function checkRuntime(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir16();
+  const home = options.home ?? process.env.HOME ?? homedir17();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -35477,107 +35812,107 @@ function formatMode(mode) {
 }
 function createRuntimeFsProbe() {
   return {
-    stat: async (path15) => await stat5(path15),
-    access: async (path15, mode) => await access4(path15, mode)
+    stat: async (path17) => await stat6(path17),
+    access: async (path17, mode) => await access4(path17, mode)
   };
 }
-async function checkDirectoryCreatable(label, path15, probe, platform) {
+async function checkDirectoryCreatable(label, path17, probe, platform) {
   try {
-    const stats = await probe.stat(path15);
+    const stats = await probe.stat(path17);
     if (!stats.isDirectory()) {
       return {
         ok: false,
-        detail: `${label}: ${path15} (exists but is not a directory)`
+        detail: `${label}: ${path17} (exists but is not a directory)`
       };
     }
-    await probe.access(path15, directoryAccessMode(platform));
+    await probe.access(path17, directoryAccessMode(platform));
     return {
       ok: true,
-      detail: `${label}: ${path15} (writable)`
+      detail: `${label}: ${path17} (writable)`
     };
   } catch (error2) {
     if (!isMissingPathError2(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path15} (unusable: ${formatError9(error2)})`
+        detail: `${label}: ${path17} (unusable: ${formatError9(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(path15, probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(path17, probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
-        detail: `${label}: ${path15} (parent not writable: ${parentCheck.blockingPath})`
+        detail: `${label}: ${path17} (parent not writable: ${parentCheck.blockingPath})`
       };
     }
     return {
       ok: true,
-      detail: `${label}: ${path15} (creatable via ${parentCheck.creatableFrom})`
+      detail: `${label}: ${path17} (creatable via ${parentCheck.creatableFrom})`
     };
   }
 }
-async function checkFileCreatable(label, path15, probe, platform) {
+async function checkFileCreatable(label, path17, probe, platform) {
   try {
-    const stats = await probe.stat(path15);
+    const stats = await probe.stat(path17);
     if (stats.isDirectory()) {
       return {
         ok: false,
-        detail: `${label}: ${path15} (exists but is a directory)`
+        detail: `${label}: ${path17} (exists but is a directory)`
       };
     }
-    await probe.access(path15, constants.W_OK);
+    await probe.access(path17, constants.W_OK);
     return {
       ok: true,
-      detail: `${label}: ${path15} (writable)`
+      detail: `${label}: ${path17} (writable)`
     };
   } catch (error2) {
     if (!isMissingPathError2(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path15} (unusable: ${formatError9(error2)})`
+        detail: `${label}: ${path17} (unusable: ${formatError9(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(dirname13(path15), probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(dirname14(path17), probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
-        detail: `${label}: ${path15} (parent not writable: ${parentCheck.blockingPath})`
+        detail: `${label}: ${path17} (parent not writable: ${parentCheck.blockingPath})`
       };
     }
     return {
       ok: true,
-      detail: `${label}: ${path15} (creatable via ${parentCheck.creatableFrom})`
+      detail: `${label}: ${path17} (creatable via ${parentCheck.creatableFrom})`
     };
   }
 }
-async function checkCreatableAncestorDirectory(path15, probe, platform) {
+async function checkCreatableAncestorDirectory(path17, probe, platform) {
   try {
-    const stats = await probe.stat(path15);
+    const stats = await probe.stat(path17);
     if (!stats.isDirectory()) {
       return {
         ok: false,
-        creatableFrom: path15,
-        blockingPath: path15
+        creatableFrom: path17,
+        blockingPath: path17
       };
     }
-    await probe.access(path15, directoryAccessMode(platform));
+    await probe.access(path17, directoryAccessMode(platform));
     return {
       ok: true,
-      creatableFrom: path15
+      creatableFrom: path17
     };
   } catch (error2) {
     if (!isMissingPathError2(error2)) {
       return {
         ok: false,
-        creatableFrom: path15,
-        blockingPath: path15
+        creatableFrom: path17,
+        blockingPath: path17
       };
     }
-    const parent = dirname13(path15);
-    if (parent === path15) {
+    const parent = dirname14(path17);
+    if (parent === path17) {
       return {
         ok: false,
-        creatableFrom: path15,
-        blockingPath: path15
+        creatableFrom: path17,
+        blockingPath: path17
       };
     }
     const parentCheck = await checkCreatableAncestorDirectory(parent, probe, platform);
@@ -36016,10 +36351,10 @@ var init_render_doctor = __esm(() => {
 });
 
 // src/doctor/doctor.ts
-import { homedir as homedir17 } from "node:os";
+import { homedir as homedir18 } from "node:os";
 import { join as join25 } from "node:path";
 async function runDoctor(options = {}, deps = {}) {
-  const home = deps.home ?? process.env.HOME ?? homedir17();
+  const home = deps.home ?? process.env.HOME ?? homedir18();
   const runtimePaths = resolveDoctorRuntimePaths(home, deps.resolveRuntimePaths);
   const sharedLoadConfig = createSharedLoadConfig(runtimePaths, deps.loadConfig ?? loadConfig);
   const runners = [
@@ -36356,8 +36691,8 @@ var init_doctor2 = __esm(async () => {
 // src/cli.ts
 init_core_home();
 import { randomUUID as randomUUID4 } from "node:crypto";
-import { homedir as homedir18 } from "node:os";
-import { dirname as dirname14, join as join26, sep as sep2 } from "node:path";
+import { homedir as homedir19 } from "node:os";
+import { dirname as dirname15, join as join26, sep as sep2 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // src/runtime/migrate-core-home.ts
@@ -52962,7 +53297,7 @@ function decodeFirstRunOnboarding(raw) {
   return null;
 }
 function requireHome2() {
-  const home = process.env.HOME ?? homedir18();
+  const home = process.env.HOME ?? homedir19();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
@@ -52986,7 +53321,7 @@ function safeDaemonLogPaths() {
     const configPath = resolveConfigPathForCurrentEnv();
     const paths = resolveDaemonPathsForCurrentConfig();
     return {
-      appLog: join26(dirname14(configPath), "runtime", "app.log"),
+      appLog: join26(dirname15(configPath), "runtime", "app.log"),
       stderrLog: paths.stderrLog
     };
   } catch {