@ganglion/xacpx 0.18.1 → 0.19.1

package/README.md

@@ -23,6 +23,8 @@ English · **[中文](./docs/zh/README_zh.md)**
 
 If you need to code or work remotely on a temporary basis, `xacpx` gives you a fast, convenient **remote entry point** so you can get things done from WeChat or Feishu anytime, anywhere.
 
+Chat isn't the only entry point: xacpx also ships a self-hostable **[relay hub](#self-hosted-relay-hub--web-dashboard)** — a multi-tenant web dashboard that drives every one of your xacpx instances from a single browser tab (installable as a PWA on your phone).
+
 > For everyday use, remember `/ss` first: it creates or reuses an xacpx logical session. If you want to attach to an existing native session of a local agent such as Codex, use `/ssn`; see [native sessions](./docs/native-sessions.md).
 
 ## 5-minute quick start
@@ -173,9 +175,17 @@ take a look at today's API timeout issue
 /ssn 1
 ```
 
-## Self-hosted relay hub (optional)
+## Self-hosted relay hub — web dashboard
+
+If you run one or more xacpx instances and want to drive them from a browser instead of (or in addition to) chat, self-host the **relay hub**. Each instance dials out to the hub over WebSocket and registers; you log in to a multi-tenant web dashboard and manage every instance's sessions from one place.
+
+What you get:
 
-If you run several xacpx instances and want to drive them all from one browser dashboard, you can self-host the **relay hub**. Each instance dials out to the hub over WebSocket and registers; you log in to a multi-tenant web dashboard and manage every instance's sessions — chat, scheduled tasks, and orchestration — from one place. The hub ships as an npm package (`@ganglion/xacpx-relay`) with the dashboard **bundled in**, served on a single port, with a single **access token** for both web login and connector pairing.
+- **A three-pane IM-style dashboard** — instance/session tree on the left, live chat in the middle, scheduled tasks & orchestration panel on the right. English + 中文 UI.
+- **Live streaming replies** rendered as markdown, with tool-call and subagent activity inline; cancel running turns from the browser.
+- **Mobile-ready** — installs as a PWA, so it feels like an app on your phone.
+- **One package, one port** — `@ganglion/xacpx-relay` ships the dashboard **bundled in**; HTTP API, web socket, and instance gateway share a single port by default. SQLite storage via the built-in `node:sqlite`/`bun:sqlite` — no native addons to compile.
+- **Multi-tenant & token-based** — every token is a user who only sees their own instances; tokens and credentials are stored hashed. Onboard teammates with **single-use invite links** (`xacpx-relay add invite`) instead of handing out tokens.
 
 ```bash
 npm i -g @ganglion/xacpx-relay
@@ -188,7 +198,7 @@ xacpx channel add relay --url wss://relay.example.com --token <access-token> --n
 xacpx restart
 ```
 
-Full walkthrough — pairing, TLS/reverse-proxy, systemd, backups, troubleshooting: **[Self-Hosting the Relay Hub](https://gadzan.github.io/xacpx/guide/relay-self-hosting)** (or [relay-deployment.md](./docs/relay-deployment.md) for the terse runbook).
+The same access token works for both web login and connector pairing. Full walkthrough — pairing, invites, TLS/reverse-proxy, systemd, backups, troubleshooting: **[Self-Hosting the Relay Hub](https://gadzan.github.io/xacpx/guide/relay-self-hosting)** (or [relay-deployment.md](./docs/relay-deployment.md) for the terse runbook).
 
 ## Config and runtime files
 

package/dist/bridge/bridge-main.js

@@ -2633,12 +2633,12 @@ var init_prompt_media = __esm(() => {
   };
 });
 
-// src/transport/claude-background-followup.ts
+// src/transport/background-followup.ts
 import { access, open as open2, readFile, readdir, stat } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { basename, dirname as dirname2, join as join2 } from "node:path";
-function isClaudeAsyncAgentLaunch(event) {
+function isAsyncAgentLaunch(event) {
   return isAsyncAgentLaunchOutput(event.rawOutput);
 }
 function isAsyncAgentLaunchOutput(rawOutput) {
@@ -2660,13 +2660,13 @@ function tryParseJsonObject(text) {
     return;
   }
 }
-function claudeAsyncAgentId(event) {
+function asyncAgentId(event) {
   const fromObject = findStringField(event.rawOutput, new Set(["agentId", "agent_id"]));
   if (fromObject)
     return fromObject;
   return /\bagent(?:Id|_id)["']?\s*[:=]\s*["']?([A-Za-z0-9_-]+)/i.exec(textOfUnknown(event.rawOutput))?.[1];
 }
-async function findClaudeTranscriptPath(input) {
+async function findNativeTranscriptPath(input) {
   const configDirName = input.driver === "qoder" ? ".qoder" : ".claude";
   const projectsDir = join2(input.homeDir ?? homedir2(), configDirName, "projects");
   const direct = join2(projectsDir, encodeClaudeProjectDirectory(input.cwd), `${input.sessionId}.jsonl`);
@@ -2686,8 +2686,8 @@ async function findClaudeTranscriptPath(input) {
   }
   return;
 }
-async function followClaudeBackgroundTurn(options) {
-  const transcriptPath = options.transcriptPath ?? await findClaudeTranscriptPath(options);
+async function followBackgroundTurn(options) {
+  const transcriptPath = options.transcriptPath ?? await findNativeTranscriptPath(options);
   if (!transcriptPath) {
     return { status: "unavailable", completedToolCallIds: [], failedToolCallIds: [] };
   }
@@ -2869,8 +2869,8 @@ async function followClaudeBackgroundTurn(options) {
         ...previous?.rawOutput !== undefined ? { rawOutput: previous.rawOutput } : output ? { rawOutput: output } : {},
         status: readBoolean(block, "is_error") || previous?.status === "error" ? "error" : "success"
       };
-      if (event.isSubagent && isClaudeAsyncAgentLaunch(event)) {
-        const agentId = claudeAsyncAgentId(event);
+      if (event.isSubagent && isAsyncAgentLaunch(event)) {
+        const agentId = asyncAgentId(event);
         if (agentId)
           parentToolCallIdByAgentId.set(agentId, event.toolCallId);
       }
@@ -3183,7 +3183,7 @@ async function waitForPoll(ms, signal) {
   });
 }
 var DEFAULT_POLL_INTERVAL_MS = 250, DEFAULT_TIMEOUT_MS, FINAL_SUBAGENT_DRAIN_MAX_POLLS = 4, FINAL_SUBAGENT_DRAIN_STABLE_POLLS = 2, ASYNC_AGENT_LAUNCH;
-var init_claude_background_followup = __esm(() => {
+var init_background_followup = __esm(() => {
   DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
   ASYNC_AGENT_LAUNCH = /Async agent launched successfully|["']?status["']?\s*:\s*["']async_launched["']/i;
 });
@@ -3223,6 +3223,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
   let onCommands;
   let rawStream = false;
   let driver;
+  let onBeforeActivityEvent;
   if (options === undefined) {
     toolEventMode = "text";
     onToolEvent = undefined;
@@ -3237,6 +3238,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     onCommands = options.onCommands;
     rawStream = options.rawStream ?? false;
     driver = options.driver?.trim().toLowerCase() || undefined;
+    onBeforeActivityEvent = options.onBeforeActivityEvent;
     toolEventMode = resolveToolEventMode({
       toolEventMode: options.mode,
       onToolEvent
@@ -3249,10 +3251,14 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     pendingLine: "",
     formatToolCalls,
     emittedToolCallIds: new Set,
+    positionedToolCallIds: new Set,
     toolCalls: new Map,
     toolEventMode,
     driver,
     rawStream,
+    lastTextTail: "",
+    activitySinceLastText: false,
+    onBeforeActivityEvent,
     onToolEvent,
     onThought,
     onPlan,
@@ -3295,6 +3301,14 @@ function parseStreamingChunks(state, line) {
   if (!update)
     return;
   if (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") {
+    const isInitialToolEvent = typeof update.toolCallId === "string" ? !state.positionedToolCallIds.has(update.toolCallId) : update.sessionUpdate === "tool_call";
+    if (isInitialToolEvent) {
+      if (update.toolCallId)
+        state.positionedToolCallIds.add(update.toolCallId);
+      markActivityBoundary(state);
+    } else {
+      flushBeforeActivityEvent(state);
+    }
     const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
     const wantsText = (state.toolEventMode === "text" || state.toolEventMode === "both") && state.formatToolCalls;
     if (wantsStructured && state.onToolEvent) {
@@ -3343,6 +3357,7 @@ function parseStreamingChunks(state, line) {
   if (isThoughtChunk) {
     const chunk2 = update.content.text;
     if (chunk2.length > 0) {
+      markActivityBoundary(state);
       state.onThought?.(chunk2);
     }
     return;
@@ -3351,10 +3366,22 @@ function parseStreamingChunks(state, line) {
   if (!isMessageChunk)
     return;
   state.hasAgentMessage = true;
-  const chunk = update.content.text ?? "";
+  let chunk = update.content.text ?? "";
   if (chunk.length === 0)
     return;
+  const messageId = typeof update.messageId === "string" && update.messageId.length > 0 ? update.messageId : undefined;
+  const messageIdChanged = state.lastMessageId !== undefined && messageId !== undefined && state.lastMessageId !== messageId;
+  const fallbackBoundary = state.activitySinceLastText && (state.lastMessageId === undefined || messageId === undefined) && endsWithSentenceTerminal(state.lastTextTail);
+  if ((messageIdChanged || fallbackBoundary) && !hasParagraphBoundaryAtJoin(state.lastTextTail, chunk)) {
+    chunk = `
+
+${chunk}`;
+    state.lastTextTail = "";
+  }
   state.buffer += chunk;
+  state.lastMessageId = messageId;
+  state.activitySinceLastText = false;
+  state.lastTextTail = `${state.lastTextTail}${chunk}`.slice(-256);
   if (state.rawStream)
     return;
   let boundary;
@@ -3368,6 +3395,24 @@ function parseStreamingChunks(state, line) {
     }
   }
 }
+function endsWithSentenceTerminal(text) {
+  return SENTENCE_TERMINAL_AT_END.test(text.trimEnd());
+}
+function hasParagraphBoundaryAtJoin(left, right) {
+  const leftHasBoundary = PARAGRAPH_BOUNDARY_AT_END.test(left);
+  const rightHasBoundary = PARAGRAPH_BOUNDARY_AT_START.test(right);
+  const boundarySpansJoin = LINE_BREAK_AT_END.test(left) && LINE_BREAK_AT_START.test(right);
+  const crlfBoundarySpansJoin = PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END.test(left) && right.startsWith(`
+`);
+  return leftHasBoundary || rightHasBoundary || boundarySpansJoin || crlfBoundarySpansJoin;
+}
+function markActivityBoundary(state) {
+  flushBeforeActivityEvent(state);
+  state.activitySinceLastText = state.hasAgentMessage;
+}
+function flushBeforeActivityEvent(state) {
+  state.onBeforeActivityEvent?.();
+}
 function formatToolCallEvent(update, sessionUpdate) {
   if (!update)
     return null;
@@ -3454,8 +3499,8 @@ function buildToolUseEvent(update, driver) {
   const claudeMeta = isClaudeDriver ? update._meta?.claudeCode : undefined;
   const claudeToolResponse = claudeMeta?.toolResponse;
   const hasClaudeToolResponse = !isEmptyToolField(claudeToolResponse);
-  const isAsyncAgentLaunch = update._meta?.claudeCode?.toolName === "Agent" && isRecord2(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
-  const status = isAsyncAgentLaunch ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
+  const isAsyncAgentLaunch2 = update._meta?.claudeCode?.toolName === "Agent" && isRecord2(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
+  const status = isAsyncAgentLaunch2 ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
   const rawInput = update.rawInput;
   const content = update.content;
   const rawOutput = update.rawOutput ?? claudeToolResponse;
@@ -3629,10 +3674,16 @@ function isGenericToolTitle(kind, title) {
   }
   return false;
 }
-var USAGE_BREAKDOWN_FIELDS;
+var SENTENCE_TERMINAL_AT_END, PARAGRAPH_BOUNDARY_AT_END, PARAGRAPH_BOUNDARY_AT_START, LINE_BREAK_AT_END, LINE_BREAK_AT_START, PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END, USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
-  init_claude_background_followup();
+  init_background_followup();
   init_tool_kind_emoji();
+  SENTENCE_TERMINAL_AT_END = /(?:\p{Sentence_Terminal}|…|⋯)[\p{Close_Punctuation}\p{Final_Punctuation}"“”‘’*_~`]*$/u;
+  PARAGRAPH_BOUNDARY_AT_END = /\r?\n[\t ]*\r?\n[\t ]*$/;
+  PARAGRAPH_BOUNDARY_AT_START = /^[\t ]*\r?\n[\t ]*\r?\n/;
+  LINE_BREAK_AT_END = /\r?\n[\t ]*$/;
+  LINE_BREAK_AT_START = /^[\t ]*\r?\n/;
+  PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END = /\r?\n[\t ]*\r$/;
   USAGE_BREAKDOWN_FIELDS = [
     ["inputTokens", ["inputTokens", "input_tokens"]],
     ["outputTokens", ["outputTokens", "output_tokens"]],
@@ -7534,10 +7585,14 @@ async function runStreamingPrompt(command, args, onEvent, options = {}) {
     let stdout = "";
     let stderr = "";
     const toolEventMode = options.toolEventMode ?? "text";
+    let flushPendingText = () => {};
     const state = createStreamingPromptState(options.formatToolCalls ?? false, {
       mode: toolEventMode,
       driver: options.driver,
       rawStream,
+      onBeforeActivityEvent: () => {
+        flushPendingText();
+      },
       ...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 }) } : {},
@@ -7553,6 +7608,13 @@ async function runStreamingPrompt(command, args, onEvent, options = {}) {
         lastReplyAt = now();
       }
     };
+    flushPendingText = () => {
+      for (const segment of state.segments.splice(0)) {
+        onEvent?.({ type: "prompt.segment", text: segment });
+        lastReplyAt = now();
+      }
+      flushBuffer();
+    };
     const timer = setIntervalFn(() => {
       if (state.buffer.trim().length > 0 && now() - lastReplyAt >= maxSegmentWaitMs) {
         flushBuffer();

package/dist/cli.js

@@ -32775,6 +32775,25 @@ var init_quota_gated_reply_sink = __esm(() => {
   ADAPTIVE_WINDOW_SCHEDULE_MS = [3000, 6000, 12000, 24000, 48000, 60000];
 });
 
+// src/transport/serialized-callback-queue.ts
+function createSerializedCallbackQueue() {
+  let chain = Promise.resolve();
+  let firstError;
+  return {
+    enqueue(callback) {
+      chain = chain.then(callback).catch((error2) => {
+        firstError ??= error2;
+      });
+    },
+    async drain() {
+      await chain;
+    },
+    getError() {
+      return firstError;
+    }
+  };
+}
+
 // src/transport/tool-event-mode.ts
 function resolveToolEventMode(input) {
   if (input?.toolEventMode !== undefined) {
@@ -32827,12 +32846,7 @@ class AcpxBridgeTransport {
       reply,
       ...replyContext ? { replyContext } : {}
     }) : null;
-    let segmentError;
-    let segmentChain = Promise.resolve();
-    let toolEventError;
-    let toolEventChain = Promise.resolve();
-    let thoughtError;
-    let thoughtChain = Promise.resolve();
+    const transcriptEvents = createSerializedCallbackQueue();
     let planError;
     let planChain = Promise.resolve();
     let usageError;
@@ -32852,22 +32866,19 @@ class AcpxBridgeTransport {
     }, (event) => {
       if (event.type === "prompt.segment") {
         const onSegment = options?.onSegment;
-        if (onSegment) {
-          const segmentText = event.text;
-          segmentChain = segmentChain.then(() => onSegment(segmentText)).catch((error2) => {
-            segmentError ??= error2;
-          });
-        }
-        sink2?.feedSegment(event.text);
+        const segmentText = event.text;
+        transcriptEvents.enqueue(async () => {
+          const segmentResult = onSegment?.(segmentText);
+          sink2?.feedSegment(segmentText);
+          await segmentResult;
+        });
         return;
       }
       if (event.type === "prompt.tool_event") {
         const onToolEvent = options?.onToolEvent;
         if (onToolEvent) {
           const toolEvent = event.event;
-          toolEventChain = toolEventChain.then(() => onToolEvent(toolEvent)).catch((error2) => {
-            toolEventError ??= error2;
-          });
+          transcriptEvents.enqueue(() => onToolEvent(toolEvent));
         }
         return;
       }
@@ -32875,9 +32886,7 @@ class AcpxBridgeTransport {
         const onThought = options?.onThought;
         if (onThought) {
           const thoughtText = event.text;
-          thoughtChain = thoughtChain.then(() => onThought(thoughtText)).catch((error2) => {
-            thoughtError ??= error2;
-          });
+          transcriptEvents.enqueue(() => onThought(thoughtText));
         }
         return;
       }
@@ -32912,9 +32921,7 @@ class AcpxBridgeTransport {
         return;
       }
     });
-    await segmentChain;
-    await toolEventChain;
-    await thoughtChain;
+    await transcriptEvents.drain();
     await planChain;
     await usageChain;
     await commandsChain;
@@ -32926,14 +32933,9 @@ class AcpxBridgeTransport {
         throw deferred;
       }
       const summary = buildOverflowSummary(overflowCount);
-      if (segmentError) {
-        throw segmentError;
-      }
-      if (toolEventError) {
-        throw toolEventError;
-      }
-      if (thoughtError) {
-        throw thoughtError;
+      const transcriptError2 = transcriptEvents.getError();
+      if (transcriptError2) {
+        throw transcriptError2;
       }
       if (planError) {
         throw planError;
@@ -32948,14 +32950,9 @@ class AcpxBridgeTransport {
 
 ${result.text}` : "" };
     }
-    if (segmentError) {
-      throw segmentError;
-    }
-    if (toolEventError) {
-      throw toolEventError;
-    }
-    if (thoughtError) {
-      throw thoughtError;
+    const transcriptError = transcriptEvents.getError();
+    if (transcriptError) {
+      throw transcriptError;
     }
     if (planError) {
       throw planError;
@@ -33177,12 +33174,12 @@ var init_prompt_media = __esm(() => {
   };
 });
 
-// src/transport/claude-background-followup.ts
+// src/transport/background-followup.ts
 import { access as access4, open as open5, readFile as readFile14, readdir as readdir3, stat as stat3 } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 import { homedir as homedir10 } from "node:os";
 import { basename as basename3, dirname as dirname12, join as join20 } from "node:path";
-function isClaudeAsyncAgentLaunch(event) {
+function isAsyncAgentLaunch(event) {
   return isAsyncAgentLaunchOutput(event.rawOutput);
 }
 function isAsyncAgentLaunchOutput(rawOutput) {
@@ -33204,13 +33201,13 @@ function tryParseJsonObject(text) {
     return;
   }
 }
-function claudeAsyncAgentId(event) {
+function asyncAgentId(event) {
   const fromObject = findStringField(event.rawOutput, new Set(["agentId", "agent_id"]));
   if (fromObject)
     return fromObject;
   return /\bagent(?:Id|_id)["']?\s*[:=]\s*["']?([A-Za-z0-9_-]+)/i.exec(textOfUnknown(event.rawOutput))?.[1];
 }
-async function findClaudeTranscriptPath(input) {
+async function findNativeTranscriptPath(input) {
   const configDirName = input.driver === "qoder" ? ".qoder" : ".claude";
   const projectsDir = join20(input.homeDir ?? homedir10(), configDirName, "projects");
   const direct = join20(projectsDir, encodeClaudeProjectDirectory(input.cwd), `${input.sessionId}.jsonl`);
@@ -33230,8 +33227,8 @@ async function findClaudeTranscriptPath(input) {
   }
   return;
 }
-async function followClaudeBackgroundTurn(options) {
-  const transcriptPath = options.transcriptPath ?? await findClaudeTranscriptPath(options);
+async function followBackgroundTurn(options) {
+  const transcriptPath = options.transcriptPath ?? await findNativeTranscriptPath(options);
   if (!transcriptPath) {
     return { status: "unavailable", completedToolCallIds: [], failedToolCallIds: [] };
   }
@@ -33413,8 +33410,8 @@ async function followClaudeBackgroundTurn(options) {
         ...previous?.rawOutput !== undefined ? { rawOutput: previous.rawOutput } : output ? { rawOutput: output } : {},
         status: readBoolean(block, "is_error") || previous?.status === "error" ? "error" : "success"
       };
-      if (event.isSubagent && isClaudeAsyncAgentLaunch(event)) {
-        const agentId = claudeAsyncAgentId(event);
+      if (event.isSubagent && isAsyncAgentLaunch(event)) {
+        const agentId = asyncAgentId(event);
         if (agentId)
           parentToolCallIdByAgentId.set(agentId, event.toolCallId);
       }
@@ -33727,7 +33724,7 @@ async function waitForPoll(ms, signal) {
   });
 }
 var DEFAULT_POLL_INTERVAL_MS = 250, DEFAULT_TIMEOUT_MS, FINAL_SUBAGENT_DRAIN_MAX_POLLS = 4, FINAL_SUBAGENT_DRAIN_STABLE_POLLS = 2, ASYNC_AGENT_LAUNCH;
-var init_claude_background_followup = __esm(() => {
+var init_background_followup = __esm(() => {
   DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
   ASYNC_AGENT_LAUNCH = /Async agent launched successfully|["']?status["']?\s*:\s*["']async_launched["']/i;
 });
@@ -33756,6 +33753,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
   let onCommands;
   let rawStream = false;
   let driver;
+  let onBeforeActivityEvent;
   if (options === undefined) {
     toolEventMode = "text";
     onToolEvent = undefined;
@@ -33770,6 +33768,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     onCommands = options.onCommands;
     rawStream = options.rawStream ?? false;
     driver = options.driver?.trim().toLowerCase() || undefined;
+    onBeforeActivityEvent = options.onBeforeActivityEvent;
     toolEventMode = resolveToolEventMode({
       toolEventMode: options.mode,
       onToolEvent
@@ -33782,10 +33781,14 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     pendingLine: "",
     formatToolCalls,
     emittedToolCallIds: new Set,
+    positionedToolCallIds: new Set,
     toolCalls: new Map,
     toolEventMode,
     driver,
     rawStream,
+    lastTextTail: "",
+    activitySinceLastText: false,
+    onBeforeActivityEvent,
     onToolEvent,
     onThought,
     onPlan,
@@ -33828,6 +33831,14 @@ function parseStreamingChunks(state, line) {
   if (!update)
     return;
   if (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") {
+    const isInitialToolEvent = typeof update.toolCallId === "string" ? !state.positionedToolCallIds.has(update.toolCallId) : update.sessionUpdate === "tool_call";
+    if (isInitialToolEvent) {
+      if (update.toolCallId)
+        state.positionedToolCallIds.add(update.toolCallId);
+      markActivityBoundary(state);
+    } else {
+      flushBeforeActivityEvent(state);
+    }
     const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
     const wantsText = (state.toolEventMode === "text" || state.toolEventMode === "both") && state.formatToolCalls;
     if (wantsStructured && state.onToolEvent) {
@@ -33876,6 +33887,7 @@ function parseStreamingChunks(state, line) {
   if (isThoughtChunk) {
     const chunk2 = update.content.text;
     if (chunk2.length > 0) {
+      markActivityBoundary(state);
       state.onThought?.(chunk2);
     }
     return;
@@ -33884,10 +33896,22 @@ function parseStreamingChunks(state, line) {
   if (!isMessageChunk)
     return;
   state.hasAgentMessage = true;
-  const chunk = update.content.text ?? "";
+  let chunk = update.content.text ?? "";
   if (chunk.length === 0)
     return;
+  const messageId = typeof update.messageId === "string" && update.messageId.length > 0 ? update.messageId : undefined;
+  const messageIdChanged = state.lastMessageId !== undefined && messageId !== undefined && state.lastMessageId !== messageId;
+  const fallbackBoundary = state.activitySinceLastText && (state.lastMessageId === undefined || messageId === undefined) && endsWithSentenceTerminal(state.lastTextTail);
+  if ((messageIdChanged || fallbackBoundary) && !hasParagraphBoundaryAtJoin(state.lastTextTail, chunk)) {
+    chunk = `
+
+${chunk}`;
+    state.lastTextTail = "";
+  }
   state.buffer += chunk;
+  state.lastMessageId = messageId;
+  state.activitySinceLastText = false;
+  state.lastTextTail = `${state.lastTextTail}${chunk}`.slice(-256);
   if (state.rawStream)
     return;
   let boundary;
@@ -33901,6 +33925,24 @@ function parseStreamingChunks(state, line) {
     }
   }
 }
+function endsWithSentenceTerminal(text) {
+  return SENTENCE_TERMINAL_AT_END.test(text.trimEnd());
+}
+function hasParagraphBoundaryAtJoin(left, right) {
+  const leftHasBoundary = PARAGRAPH_BOUNDARY_AT_END.test(left);
+  const rightHasBoundary = PARAGRAPH_BOUNDARY_AT_START.test(right);
+  const boundarySpansJoin = LINE_BREAK_AT_END.test(left) && LINE_BREAK_AT_START.test(right);
+  const crlfBoundarySpansJoin = PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END.test(left) && right.startsWith(`
+`);
+  return leftHasBoundary || rightHasBoundary || boundarySpansJoin || crlfBoundarySpansJoin;
+}
+function markActivityBoundary(state) {
+  flushBeforeActivityEvent(state);
+  state.activitySinceLastText = state.hasAgentMessage;
+}
+function flushBeforeActivityEvent(state) {
+  state.onBeforeActivityEvent?.();
+}
 function formatToolCallEvent(update, sessionUpdate) {
   if (!update)
     return null;
@@ -33987,8 +34029,8 @@ function buildToolUseEvent(update, driver) {
   const claudeMeta = isClaudeDriver ? update._meta?.claudeCode : undefined;
   const claudeToolResponse = claudeMeta?.toolResponse;
   const hasClaudeToolResponse = !isEmptyToolField(claudeToolResponse);
-  const isAsyncAgentLaunch = update._meta?.claudeCode?.toolName === "Agent" && isRecord4(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
-  const status = isAsyncAgentLaunch ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
+  const isAsyncAgentLaunch2 = update._meta?.claudeCode?.toolName === "Agent" && isRecord4(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
+  const status = isAsyncAgentLaunch2 ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
   const rawInput = update.rawInput;
   const content = update.content;
   const rawOutput = update.rawOutput ?? claudeToolResponse;
@@ -34162,10 +34204,16 @@ function isGenericToolTitle(kind, title) {
   }
   return false;
 }
-var USAGE_BREAKDOWN_FIELDS;
+var SENTENCE_TERMINAL_AT_END, PARAGRAPH_BOUNDARY_AT_END, PARAGRAPH_BOUNDARY_AT_START, LINE_BREAK_AT_END, LINE_BREAK_AT_START, PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END, USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
-  init_claude_background_followup();
+  init_background_followup();
   init_tool_kind_emoji();
+  SENTENCE_TERMINAL_AT_END = /(?:\p{Sentence_Terminal}|…|⋯)[\p{Close_Punctuation}\p{Final_Punctuation}"“”‘’*_~`]*$/u;
+  PARAGRAPH_BOUNDARY_AT_END = /\r?\n[\t ]*\r?\n[\t ]*$/;
+  PARAGRAPH_BOUNDARY_AT_START = /^[\t ]*\r?\n[\t ]*\r?\n/;
+  LINE_BREAK_AT_END = /\r?\n[\t ]*$/;
+  LINE_BREAK_AT_START = /^[\t ]*\r?\n/;
+  PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END = /\r?\n[\t ]*\r$/;
   USAGE_BREAKDOWN_FIELDS = [
     ["inputTokens", ["inputTokens", "input_tokens"]],
     ["outputTokens", ["outputTokens", "output_tokens"]],
@@ -35074,12 +35122,7 @@ ${baseText}` : "" };
       let stdout2 = "";
       let stderr = "";
       let lastReplyAt = now();
-      let segmentChain = Promise.resolve();
-      let segmentError;
-      let toolEventChain = Promise.resolve();
-      let toolEventError;
-      let thoughtChain = Promise.resolve();
-      let thoughtError;
+      const transcriptEvents = createSerializedCallbackQueue();
       let planChain = Promise.resolve();
       let planError;
       let usageChain = Promise.resolve();
@@ -35091,22 +35134,22 @@ ${baseText}` : "" };
       const userOnPlan = onPlan;
       const userOnUsage = onUsage;
       const userOnCommands = onCommands;
+      let flushPendingText = () => {};
       const state = createStreamingPromptState(formatToolCalls, {
         mode: toolEventMode,
         driver,
         rawStream,
+        onBeforeActivityEvent: () => {
+          flushPendingText();
+        },
         ...userOnToolEvent ? {
           onToolEvent: (event) => {
-            toolEventChain = toolEventChain.then(() => userOnToolEvent(event)).catch((error2) => {
-              toolEventError ??= error2;
-            });
+            transcriptEvents.enqueue(() => userOnToolEvent(event));
           }
         } : {},
         ...userOnThought ? {
           onThought: (chunk) => {
-            thoughtChain = thoughtChain.then(() => userOnThought(chunk)).catch((error2) => {
-              thoughtError ??= error2;
-            });
+            transcriptEvents.enqueue(() => userOnThought(chunk));
           }
         } : {},
         ...userOnPlan ? {
@@ -35136,12 +35179,11 @@ ${baseText}` : "" };
         ...replyContext ? { replyContext } : {}
       }) : null;
       const feedSegment = (segment) => {
-        if (onSegment) {
-          segmentChain = segmentChain.then(() => onSegment(segment)).catch((error2) => {
-            segmentError ??= error2;
-          });
-        }
-        sink2?.feedSegment(segment);
+        transcriptEvents.enqueue(async () => {
+          const segmentResult = onSegment?.(segment);
+          sink2?.feedSegment(segment);
+          await segmentResult;
+        });
         lastReplyAt = now();
       };
       const flushBuffer = () => {
@@ -35151,6 +35193,12 @@ ${baseText}` : "" };
           feedSegment(remaining);
         }
       };
+      flushPendingText = () => {
+        for (const segment of state.segments.splice(0)) {
+          feedSegment(segment);
+        }
+        flushBuffer();
+      };
       const timer = setIntervalFn(() => {
         if (state.buffer.trim().length > 0 && now() - lastReplyAt >= maxSegmentWaitMs) {
           flushBuffer();
@@ -35177,31 +35225,23 @@ ${baseText}` : "" };
         if (remaining.length > 0) {
           feedSegment(remaining);
         }
-        const { overflowCount } = sink2?.finalize() ?? { overflowCount: 0 };
-        Promise.all([
-          sink2?.drain({ timeoutMs: 30000 }) ?? Promise.resolve(),
-          segmentChain,
-          toolEventChain,
-          thoughtChain,
-          planChain,
-          usageChain,
-          commandsChain
-        ]).then(() => {
+        (async () => {
+          await Promise.all([
+            transcriptEvents.drain(),
+            planChain,
+            usageChain,
+            commandsChain
+          ]);
+          const { overflowCount } = sink2?.finalize() ?? { overflowCount: 0 };
+          await (sink2?.drain({ timeoutMs: 30000 }) ?? Promise.resolve());
           const deferred = sink2?.getPendingError();
           if (deferred) {
             reject(deferred);
             return;
           }
-          if (segmentError) {
-            reject(segmentError);
-            return;
-          }
-          if (toolEventError) {
-            reject(toolEventError);
-            return;
-          }
-          if (thoughtError) {
-            reject(thoughtError);
+          const transcriptError = transcriptEvents.getError();
+          if (transcriptError) {
+            reject(transcriptError);
             return;
           }
           if (planError) {
@@ -35220,7 +35260,7 @@ ${baseText}` : "" };
             result: { code: code ?? 1, stdout: stdout2, stderr },
             overflowCount
           });
-        }).catch((error2) => {
+        })().catch((error2) => {
           reject(error2);
         });
       });
@@ -35314,9 +35354,9 @@ var init_acpx_cli_transport = __esm(() => {
   require4 = createRequire5(import.meta.url);
 });
 
-// src/transport/claude-background-followup-transport.ts
-function createClaudeBackgroundFollowupTransport(delegate, options) {
-  const followBackgroundTurn = options.followBackgroundTurn ?? followClaudeBackgroundTurn;
+// src/transport/background-followup-transport.ts
+function createBackgroundFollowupTransport(delegate, options) {
+  const runBackgroundFollowup = options.followBackgroundTurn ?? followBackgroundTurn;
   const prompt = async (session3, text, reply, replyContext, promptOptions) => {
     const latestToolEvents = new Map;
     const pendingToolEvents = new Map;
@@ -35329,9 +35369,9 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
         pendingToolEvents.set(event.toolCallId, event);
       else
         pendingToolEvents.delete(event.toolCallId);
-      if (event.isSubagent && isClaudeAsyncAgentLaunch(event)) {
+      if (event.isSubagent && isAsyncAgentLaunch(event)) {
         asyncToolCallIds.add(event.toolCallId);
-        const agentId = claudeAsyncAgentId(event);
+        const agentId = asyncAgentId(event);
         if (agentId)
           subagentIdsByToolCallId.set(event.toolCallId, agentId);
       }
@@ -35350,7 +35390,7 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
       try {
         agentSessionId = await delegate.getAgentSessionId?.(session3);
       } catch (error2) {
-        await options.logger.error("transport.claude_background_followup.session_id_failed", "failed to resolve agent session id for background follow-up", { alias: session3.alias, error: error2 instanceof Error ? error2.message : String(error2) });
+        await options.logger.error(`${LEGACY_LOG_EVENT_PREFIX}.session_id_failed`, "failed to resolve agent session id for background follow-up", { alias: session3.alias, error: error2 instanceof Error ? error2.message : String(error2) });
       }
     }
     if (!agentSessionId) {
@@ -35363,8 +35403,8 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
       }
       return result;
     }
-    await options.logger.info("transport.claude_background_followup.started", "following background-agent continuation", { alias: session3.alias, agentSessionId, driver, taskCount: asyncToolCallIds.size });
-    const followup = await followBackgroundTurn({
+    await options.logger.info(`${LEGACY_LOG_EVENT_PREFIX}.started`, "following background-agent continuation", { alias: session3.alias, agentSessionId, driver, taskCount: asyncToolCallIds.size });
+    const followup = await runBackgroundFollowup({
       cwd: session3.cwd,
       sessionId: agentSessionId,
       driver,
@@ -35399,7 +35439,7 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
         ...followup.status === "completed" && !failed ? {} : { rawOutput: { message: failed ? "background Agent failed" : `background continuation ${followup.status}` } }
       });
     }
-    await options.logger.info(`transport.claude_background_followup.${followup.status}`, `background-agent follow-up ${followup.status}`, {
+    await options.logger.info(`${LEGACY_LOG_EVENT_PREFIX}.${followup.status}`, `background-agent follow-up ${followup.status}`, {
       alias: session3.alias,
       agentSessionId,
       driver,
@@ -35417,8 +35457,9 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
     }
   });
 }
-var init_claude_background_followup_transport = __esm(() => {
-  init_claude_background_followup();
+var LEGACY_LOG_EVENT_PREFIX = "transport.claude_background_followup";
+var init_background_followup_transport = __esm(() => {
+  init_background_followup();
 });
 
 // src/util/async.ts
@@ -36782,21 +36823,28 @@ class WorkspaceGit {
     }
     return startPoint;
   }
-  async includeRenameSources(root, paths) {
-    const selected = new Set(paths);
-    const expanded = new Set(paths);
+  async readPorcelain(root) {
     const fields = (await this.runRaw(root, ["-c", "core.quotePath=false", "status", "--porcelain", "-z"])).split("\x00");
+    const entries = [];
     for (let index = 0;index < fields.length; index += 1) {
       const field = fields[index];
       if (!field)
         continue;
       const status = field.slice(0, 2);
       const path14 = field.slice(3);
-      if (status[0] !== "R" && status[0] !== "C")
-        continue;
-      const originalPath = fields[++index];
-      if (originalPath && selected.has(path14))
-        expanded.add(originalPath);
+      const entry = { status, path: path14 };
+      if (status[0] === "R" || status[0] === "C")
+        entry.originalPath = fields[++index];
+      entries.push(entry);
+    }
+    return entries;
+  }
+  async includeRenameSources(root, paths) {
+    const selected = new Set(paths);
+    const expanded = new Set(paths);
+    for (const entry of await this.readPorcelain(root)) {
+      if (entry.originalPath && selected.has(entry.path))
+        expanded.add(entry.originalPath);
     }
     return [...expanded];
   }
@@ -36834,6 +36882,38 @@ class WorkspaceGit {
       }
     });
   }
+  async untrack(workspace3, paths) {
+    await this.withWrite(workspace3, async () => {
+      const root = await this.rootFor(workspace3);
+      await this.run(root, ["--literal-pathspecs", "rm", "--cached", "--force", "--", ...this.validatePaths(paths)]);
+    });
+  }
+  async discard(workspace3, paths) {
+    await this.withWrite(workspace3, async () => {
+      const root = await this.rootFor(workspace3);
+      const selected = new Set(this.validatePaths(paths));
+      const deletePaths = new Set;
+      const restorePaths = new Set;
+      for (const entry of await this.readPorcelain(root)) {
+        if (!selected.has(entry.path))
+          continue;
+        if (entry.status === "??" || entry.status[0] === "A" || entry.originalPath !== undefined) {
+          deletePaths.add(entry.path);
+          if (entry.originalPath)
+            restorePaths.add(entry.originalPath);
+        } else {
+          restorePaths.add(entry.path);
+        }
+      }
+      if (deletePaths.size) {
+        await this.run(root, ["--literal-pathspecs", "reset", "-q", "--", ...deletePaths]);
+        await this.run(root, ["--literal-pathspecs", "clean", "-qf", "--", ...deletePaths]);
+      }
+      if (restorePaths.size) {
+        await this.run(root, ["--literal-pathspecs", "restore", "--source=HEAD", "--staged", "--worktree", "--", ...restorePaths]);
+      }
+    });
+  }
   async commit(workspace3, message) {
     return this.withWrite(workspace3, async () => {
       const root = await this.rootFor(workspace3);
@@ -37564,6 +37644,12 @@ class ControlService {
   gitUnstage(workspace3, paths) {
     return this.mutateWorkspaceGit(() => this.workspaceGit.unstage(workspace3, paths));
   }
+  gitUntrack(workspace3, paths) {
+    return this.mutateWorkspaceGit(() => this.workspaceGit.untrack(workspace3, paths));
+  }
+  gitDiscard(workspace3, paths) {
+    return this.mutateWorkspaceGit(() => this.workspaceGit.discard(workspace3, paths));
+  }
   gitCommit(workspace3, message) {
     return this.mutateWorkspaceGit(() => this.workspaceGit.commit(workspace3, message));
   }
@@ -38594,7 +38680,7 @@ async function buildApp(paths, deps = {}) {
       });
     }
   })))) : deps.createCliTransport?.(acpxCommand) ?? new AcpxCliTransport({ ...config4.transport, command: acpxCommand });
-  const transport = createClaudeBackgroundFollowupTransport(baseTransport, {
+  const transport = createBackgroundFollowupTransport(baseTransport, {
     logger,
     resolveDriver: (agent4) => config4.agents[agent4]?.driver
   });
@@ -39269,7 +39355,7 @@ var init_main = __esm(async () => {
   init_acpx_bridge_client();
   init_acpx_bridge_transport();
   init_acpx_cli_transport();
-  init_claude_background_followup_transport();
+  init_background_followup_transport();
   init_queue_owner_reaper();
   init_collect_reap_targets();
   init_channel_registry();

package/dist/control/control-service.d.ts

@@ -158,6 +158,8 @@ export declare class ControlService {
     private withWorktreeRegistration;
     gitStage(workspace: string, paths: string[]): Promise<void>;
     gitUnstage(workspace: string, paths: string[]): Promise<void>;
+    gitUntrack(workspace: string, paths: string[]): Promise<void>;
+    gitDiscard(workspace: string, paths: string[]): Promise<void>;
     gitCommit(workspace: string, message: string): Promise<GitCommitResult>;
     gitFetch(workspace: string, remote?: string): Promise<void>;
     gitPull(workspace: string): Promise<void>;

package/dist/control/workspace-git.d.ts

@@ -77,6 +77,7 @@ export declare class WorkspaceGit {
     private validatePaths;
     private validateBranch;
     private validateStartPoint;
+    private readPorcelain;
     private includeRenameSources;
     /** Git write commands for one configured workspace share a FIFO. Reads remain
      * concurrent, and a failed write releases the next command instead of poisoning
@@ -84,6 +85,8 @@ export declare class WorkspaceGit {
     private withWrite;
     stage(workspace: string, paths: string[]): Promise<void>;
     unstage(workspace: string, paths: string[]): Promise<void>;
+    untrack(workspace: string, paths: string[]): Promise<void>;
+    discard(workspace: string, paths: string[]): Promise<void>;
     commit(workspace: string, message: string): Promise<GitCommitResult>;
     checkout(workspace: string, options: GitCheckoutOptions): Promise<void>;
     fetch(workspace: string, remote?: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ganglion/xacpx",
-  "version": "0.18.1",
+  "version": "0.19.1",
   "description": "随时随地通过聊天频道（微信 / 飞书 / 元宝等）远程控制 `acpx` 上的 Claude Code、Codex 等 Agents。",
   "keywords": [
     "acpx",