@michengai/dsh-btw 0.1.23 → 0.1.24

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.1.24] - 2026-10-15
+
+- Side questions are no longer offered in a subagent session. Typing `/btw` there explains that you should return to the main session, instead of leaving a dialog that cannot be closed (#7).
+- Closing a side question that the host rejects because the session is owned by subagent routing no longer deletes an answer that is still on the way or already returned. A request that never started, or was cancelled before it produced an answer, can still be dismissed locally.
+
 ## [0.1.23] - 2026-10-15
 
 - Relax hardcoded timeout: Replace the strict 90s timer with a 30-minute watchdog, supporting long chain-of-thought and max-reasoning models while safeguarding concurrency slots against stalled connections (#6).

package/CHANGELOG.zh-CN.md

@@ -1,5 +1,10 @@
 # 更新日志
 
+## [0.1.24] - 2026-10-15
+
+- 子代理会话不再提供旁问。在那里输入 `/btw` 会提示返回主会话使用，而不是留下关不掉的弹窗 (#7)。
+- 宿主因子代理路由拒绝关闭时，不再删掉还在返回或已经返回的答案。尚未启动，或在产生答案前被取消的请求，仍可在本地关掉。
+
 ## [0.1.23] - 2026-10-15
 
 - 放宽硬超时限制：默认超时由写死的 90s 调整为 30 分钟兜底看门狗，支持长思维链与深度推理模型充分思考；同时保留长连接死锁自动回收机制保护并发槽位 (#6)。

package/lib/client.js

@@ -519,6 +519,7 @@ var zh = {
   "error.attachments": "\u65C1\u95EE\u53EA\u63A5\u53D7\u6587\u5B57\uFF0C\u56FE\u7247\u548C\u6587\u4EF6\u4ECD\u4FDD\u7559\u5728\u8F93\u5165\u6846\u4E2D\u3002",
   "error.removeAttachments": "\u65C1\u95EE\u53EA\u63A5\u53D7\u6587\u5B57\uFF0C\u8BF7\u5148\u79FB\u9664\u56FE\u7247\u548C\u6587\u4EF6\u3002",
   "error.backend": "BTW \u540E\u7AEF\u5C1A\u672A\u542F\u7528\uFF0C\u8BF7\u68C0\u67E5\u63D2\u4EF6\u914D\u7F6E\u3002",
+  "error.subagent": "\u5B50\u4EE3\u7406\u4F1A\u8BDD\u6682\u4E0D\u652F\u6301\u65C1\u95EE\uFF0C\u8BF7\u8FD4\u56DE\u4E3B\u4F1A\u8BDD\u4F7F\u7528 /btw\u3002",
   "error.empty": "\u8BF7\u8F93\u5165\u65C1\u95EE\u5185\u5BB9\u3002",
   "error.length": `\u65C1\u95EE\u6700\u591A\u652F\u6301 ${MAX_QUESTION_LENGTH} \u4E2A\u5B57\u7B26\u3002`,
   "error.capacity": "\u6B63\u5728\u5904\u7406\u7684\u65C1\u95EE\u8F83\u591A\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002",
@@ -572,6 +573,7 @@ var en = {
   "error.attachments": "Side questions accept text only. Your images and files remain in the input.",
   "error.removeAttachments": "Side questions accept text only. Remove the images and files first.",
   "error.backend": "The BTW backend is unavailable. Check the plugin configuration.",
+  "error.subagent": "Side questions are not supported in subagent sessions. Use /btw in the main session.",
   "error.empty": "Enter a side question.",
   "error.length": `Side questions are limited to ${MAX_QUESTION_LENGTH.toLocaleString("en-US")} characters.`,
   "error.capacity": "Too many side questions are running. Try again shortly.",
@@ -604,6 +606,8 @@ var CLOSE_COMMAND = "btw-close";
 
 // src/client/bubbles.ts
 var MAX_BUBBLES_PER_SESSION = 20;
+var SideRequestNotStartedError = class extends Error {
+};
 var BubbleStore = class {
   constructor(transport, t = translate()) {
     this.transport = transport;
@@ -613,6 +617,9 @@ var BubbleStore = class {
   listeners = /* @__PURE__ */ new Set();
   active = /* @__PURE__ */ new Map();
   closing = /* @__PURE__ */ new Map();
+  notStarted = /* @__PURE__ */ new Set();
+  runEnd = /* @__PURE__ */ new Map();
+  closeFenced = /* @__PURE__ */ new Set();
   admitting = /* @__PURE__ */ new Set();
   disposed = false;
   getSnapshot = () => this.snapshot;
@@ -649,12 +656,43 @@ var BubbleStore = class {
     const id = crypto.randomUUID();
     const controller = new AbortController();
     this.active.set(id, controller);
+    this.runEnd.set(id, "pending");
     this.publish([...this.snapshot, { id, sessionId, question, ...reference === void 0 ? {} : { reference }, answer: "", phase: "answering" }]);
     void Promise.resolve().then(() => reference === void 0 ? this.transport.run(sessionId, id, question, controller.signal) : this.transport.run(sessionId, id, question, controller.signal, reference)).then((result) => {
-      if (controller.signal.aborted || this.closing.has(id)) return;
-      this.update(id, { phase: result.kind === "success" ? "done" : "error", answer: result.kind === "success" ? result.text : "", error: result.kind === "error" ? result.text : void 0 });
+      if (result.kind === "success") {
+        this.runEnd.set(id, "success");
+        if (!this.snapshot.some((item) => item.id === id)) return;
+        const failedClose = this.closeFenced.has(id) || Boolean(this.snapshot.find((item) => item.id === id)?.closeFailed);
+        this.update(id, { phase: failedClose ? "error" : this.closing.has(id) ? "closing" : "done", answer: result.text, ...failedClose ? {} : { error: void 0 } });
+        return;
+      }
+      if (controller.signal.aborted) {
+        if (this.runEnd.get(id) === "pending") this.runEnd.set(id, "aborted");
+        this.dropIfCloseCannotFinish(id);
+        return;
+      }
+      this.runEnd.set(id, "failed");
+      if (!this.closing.has(id)) this.update(id, { phase: "error", answer: "", error: result.text });
     }).catch((error) => {
-      if (!controller.signal.aborted && !this.closing.has(id)) this.update(id, { phase: "error", error: String(error) });
+      if (this.runEnd.get(id) === "success") return;
+      const message = error instanceof Error ? error.message : String(error);
+      if (error instanceof SideRequestNotStartedError && this.snapshot.some((item) => item.id === id)) {
+        this.runEnd.set(id, "not-started");
+        this.notStarted.add(id);
+        if (this.closeFenced.has(id) || this.closing.has(id)) {
+          this.remove(id);
+          return;
+        }
+        this.update(id, { phase: "error", error: message });
+        return;
+      }
+      if (controller.signal.aborted) {
+        if (this.runEnd.get(id) === "pending") this.runEnd.set(id, "aborted");
+        this.dropIfCloseCannotFinish(id);
+        return;
+      }
+      this.runEnd.set(id, "failed");
+      if (!this.closing.has(id)) this.update(id, { phase: "error", error: message });
     }).finally(() => {
       this.active.delete(id);
     });
@@ -665,12 +703,28 @@ var BubbleStore = class {
     if (existing) return existing;
     const item = this.snapshot.find((bubble) => bubble.id === id);
     if (!item) return Promise.resolve();
+    if (this.notStarted.has(id)) {
+      this.remove(id);
+      return Promise.resolve();
+    }
     this.update(id, { phase: "closing", error: void 0, closeFailed: false });
     this.active.get(id)?.abort();
     const operation = Promise.resolve().then(() => this.transport.close(item.sessionId, id)).then((result) => {
       if (result.kind === "error") throw new Error(result.text);
-      this.publish(this.snapshot.filter((bubble) => bubble.id !== id));
+      this.remove(id);
     }).catch((error) => {
+      if (this.notStarted.has(id) || this.runEnd.get(id) === "not-started") {
+        this.remove(id);
+        return;
+      }
+      if (error instanceof SideRequestNotStartedError) {
+        this.closeFenced.add(id);
+        const end = this.runEnd.get(id);
+        if (end === "aborted" || end === "not-started") {
+          this.remove(id);
+          return;
+        }
+      }
       this.update(id, { phase: "error", closeFailed: true, error: error instanceof Error ? error.message : String(error) });
     }).finally(() => {
       this.closing.delete(id);
@@ -683,6 +737,17 @@ var BubbleStore = class {
     this.disposed = true;
     await Promise.all(this.snapshot.map((item) => this.close(item.id)));
   }
+  dropIfCloseCannotFinish(id) {
+    if (!this.closeFenced.has(id)) return;
+    const end = this.runEnd.get(id);
+    if (end === "not-started" || end === "aborted") this.remove(id);
+  }
+  remove(id) {
+    this.notStarted.delete(id);
+    this.runEnd.delete(id);
+    this.closeFenced.delete(id);
+    this.publish(this.snapshot.filter((item) => item.id !== id));
+  }
   update(id, patch2) {
     this.publish(this.snapshot.map((item) => item.id === id ? { ...item, ...patch2 } : item));
   }
@@ -13793,7 +13858,7 @@ function sessionIdOf(session) {
   if (session && typeof session === "object" && "sessionId" in session) return String(session.sessionId);
   return String(session);
 }
-function attachOfficialBtw(commandUi, claim, t) {
+function attachOfficialBtw(commandUi, claim, t, isSubagent) {
   const live = commandUi;
   if (!live) return () => {
   };
@@ -13803,7 +13868,7 @@ function attachOfficialBtw(commandUi, claim, t) {
     live.candidates = async (...args) => {
       const rows = await original.apply(live, args);
       if (!Array.isArray(rows)) return rows;
-      return rows.map((row) => {
+      return rows.filter((row) => !(isSubagent(sessionIdOf(args[0])) && row && typeof row === "object" && "name" in row && row.name === "btw")).map((row) => {
         if (!row || typeof row !== "object" || !("name" in row) || row.name !== "btw") return row;
         const item = row;
         return {
@@ -13821,14 +13886,14 @@ function attachOfficialBtw(commandUi, claim, t) {
   }
   if (typeof live.dispatch === "function") {
     const original = live.dispatch.bind(live);
-    live.dispatch = (pick) => pick.candidate?.name === "btw" ? claim(sessionIdOf(pick.session)) : original(pick);
+    live.dispatch = (pick) => pick.candidate?.name === "btw" ? isSubagent(sessionIdOf(pick.session)) ? void 0 : claim(sessionIdOf(pick.session)) : original(pick);
     restore.push(() => {
       live.dispatch = original;
     });
   }
   if (typeof live.matchSpace === "function") {
     const original = live.matchSpace.bind(live);
-    live.matchSpace = (session, token) => token === "/btw" ? claim(sessionIdOf(session)) : original(session, token);
+    live.matchSpace = (session, token) => token === "/btw" ? isSubagent(sessionIdOf(session)) ? void 0 : claim(sessionIdOf(session)) : original(session, token);
     restore.push(() => {
       live.matchSpace = original;
     });
@@ -13837,6 +13902,7 @@ function attachOfficialBtw(commandUi, claim, t) {
     const original = live.matchEnter.bind(live);
     live.matchEnter = async (session, line, signal, envelope) => {
       if (!/^\/btw(?:\s|$)/.test(line.trim())) return original(session, line, signal, envelope);
+      if (isSubagent(sessionIdOf(session))) throw new Error(t("error.subagent"));
       if (envelope?.attachments || envelope?.images) throw new Error(t("error.removeAttachments"));
       return claim(sessionIdOf(session));
     };
@@ -13848,6 +13914,7 @@ function attachOfficialBtw(commandUi, claim, t) {
     const original = live.execute.bind(live);
     live.execute = async (session, line, attachments) => {
       if (!/^\/btw(?:\s|$)/.test(line)) return original(session, line, attachments);
+      if (isSubagent(sessionIdOf(session))) return { kind: "error", text: t("error.subagent") };
       if (Array.isArray(attachments) && attachments.length) return { kind: "error", text: t("error.attachments") };
       const outcome = claim(sessionIdOf(session));
       if (!outcome || typeof outcome !== "object" || !("claim" in outcome)) return { kind: "error", text: t("error.backend") };
@@ -13868,9 +13935,19 @@ function apply(ctx) {
   const t = ctx.locale.bind(NS);
   const slots = ctx.get("slots");
   const remote = ctx.get("remote");
+  const sessions = ctx.get("sessions");
+  const isSubagent = (id) => Boolean(sessions.subagentAddress?.(id)) || sessions.list?.getSnapshot().byId[id]?.origin === "subagent";
   const execute = async (session, line, signal) => {
     const response = await remote.commands.execute(session, line, [], signal);
-    if (!response.ok) throw new Error(response.error.message);
+    if (!response.ok) {
+      const failure = response.error;
+      const code4 = failure.code;
+      const details = failure.details;
+      const reason = details && typeof details === "object" && "reason" in details && typeof details.reason === "string" ? details.reason : void 0;
+      const ownedBySubagent = (code4 === "agent-busy" || code4 === "session/agent-busy") && (reason === "use subagent delivery for this child session" || failure.message === `session "${session}" is owned by subagent routing`);
+      if (ownedBySubagent) throw new SideRequestNotStartedError(t("error.subagent"));
+      throw new Error(failure.message);
+    }
     if (!response.value) throw new Error(t("error.backend"));
     return { kind: response.value.result.kind, text: response.value.result.text ?? "" };
   };
@@ -13880,11 +13957,12 @@ function apply(ctx) {
   }, t);
   const claim = (sessionId) => ({ claim: {
     name: "btw",
-    token: "/btw",
+    token: "/btw ",
     get hint() {
       return t("command.hint");
     },
     submit: async (args, _actx, attachments) => {
+      if (isSubagent(sessionId)) return { kind: "error", text: t("error.subagent") };
       if (attachments.length) return { kind: "error", text: t("error.attachments") };
       try {
         await store.ask(sessionId, args.trim());
@@ -13894,8 +13972,8 @@ function apply(ctx) {
       }
     }
   } });
-  if (typeof ctx.inject === "function") ctx.inject(["commandUi"], (scope) => attachOfficialBtw(scope.get("commandUi"), (sessionId) => claim(sessionId), t));
-  else ctx.effect(() => attachOfficialBtw(ctx.get("commandUi"), (sessionId) => claim(sessionId), t));
+  if (typeof ctx.inject === "function") ctx.inject(["commandUi"], (scope) => attachOfficialBtw(scope.get("commandUi"), (sessionId) => claim(sessionId), t, isSubagent));
+  else ctx.effect(() => attachOfficialBtw(ctx.get("commandUi"), (sessionId) => claim(sessionId), t, isSubagent));
   ctx.effect(() => {
     const style = document.createElement("style");
     style.dataset.plugin = "@michengai/dsh-btw";
@@ -13907,7 +13985,7 @@ function apply(ctx) {
   });
   ctx.effect(() => () => store.dispose());
   function Dock(props) {
-    return /* @__PURE__ */ import_react7.default.createElement(import_react7.default.Fragment, null, /* @__PURE__ */ import_react7.default.createElement(SelectionAsk, { key: props.session.sessionId, store, sessionId: props.session.sessionId, t: props.t, addToConversation: (reference) => {
+    return /* @__PURE__ */ import_react7.default.createElement(import_react7.default.Fragment, null, !props.session.subagent && !isSubagent(props.session.sessionId) && /* @__PURE__ */ import_react7.default.createElement(SelectionAsk, { key: props.session.sessionId, store, sessionId: props.session.sessionId, t: props.t, addToConversation: (reference) => {
       const session = ctx.get("sessions").scope(props.session.sessionId);
       if (!session) throw new Error(props.t("error.backend"));
       addQuoteToComposer(ctx.conversation.input.for(session), reference, props.t);

package/lib/index.js

@@ -42,6 +42,7 @@ var zh = {
   "error.attachments": "\u65C1\u95EE\u53EA\u63A5\u53D7\u6587\u5B57\uFF0C\u56FE\u7247\u548C\u6587\u4EF6\u4ECD\u4FDD\u7559\u5728\u8F93\u5165\u6846\u4E2D\u3002",
   "error.removeAttachments": "\u65C1\u95EE\u53EA\u63A5\u53D7\u6587\u5B57\uFF0C\u8BF7\u5148\u79FB\u9664\u56FE\u7247\u548C\u6587\u4EF6\u3002",
   "error.backend": "BTW \u540E\u7AEF\u5C1A\u672A\u542F\u7528\uFF0C\u8BF7\u68C0\u67E5\u63D2\u4EF6\u914D\u7F6E\u3002",
+  "error.subagent": "\u5B50\u4EE3\u7406\u4F1A\u8BDD\u6682\u4E0D\u652F\u6301\u65C1\u95EE\uFF0C\u8BF7\u8FD4\u56DE\u4E3B\u4F1A\u8BDD\u4F7F\u7528 /btw\u3002",
   "error.empty": "\u8BF7\u8F93\u5165\u65C1\u95EE\u5185\u5BB9\u3002",
   "error.length": `\u65C1\u95EE\u6700\u591A\u652F\u6301 ${MAX_QUESTION_LENGTH} \u4E2A\u5B57\u7B26\u3002`,
   "error.capacity": "\u6B63\u5728\u5904\u7406\u7684\u65C1\u95EE\u8F83\u591A\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002",
@@ -95,6 +96,7 @@ var en = {
   "error.attachments": "Side questions accept text only. Your images and files remain in the input.",
   "error.removeAttachments": "Side questions accept text only. Remove the images and files first.",
   "error.backend": "The BTW backend is unavailable. Check the plugin configuration.",
+  "error.subagent": "Side questions are not supported in subagent sessions. Use /btw in the main session.",
   "error.empty": "Enter a side question.",
   "error.length": `Side questions are limited to ${MAX_QUESTION_LENGTH.toLocaleString("en-US")} characters.`,
   "error.capacity": "Too many side questions are running. Try again shortly.",

package/lib/types/client/bubbles.d.ts

@@ -14,6 +14,9 @@ export interface SideTransport {
     run(session: string, id: string, question: string, signal: AbortSignal, reference?: string): Promise<SideResult>;
     close(session: string, id: string): Promise<SideResult>;
 }
+/** 宿主在进入 handler 前明确拒绝启动；没有后台任务需要清理。 */
+export declare class SideRequestNotStartedError extends Error {
+}
 /** 仅内存 UI 状态；关闭请求与答案返回按请求身份分别收敛。 */
 export declare class BubbleStore {
     private readonly transport;
@@ -22,6 +25,9 @@ export declare class BubbleStore {
     private readonly listeners;
     private readonly active;
     private readonly closing;
+    private readonly notStarted;
+    private readonly runEnd;
+    private readonly closeFenced;
     private readonly admitting;
     private disposed;
     constructor(transport: SideTransport, t?: BtwTranslate);
@@ -31,6 +37,8 @@ export declare class BubbleStore {
     ask(sessionId: string, question: string, reference?: string): Promise<string>;
     close(id: string): Promise<void>;
     dispose(): Promise<void>;
+    private dropIfCloseCannotFinish;
+    private remove;
     private update;
     private publish;
 }

package/lib/types/locales.d.ts

@@ -35,6 +35,7 @@ export declare const zh: {
     'error.attachments': string;
     'error.removeAttachments': string;
     'error.backend': string;
+    'error.subagent': string;
     'error.empty': string;
     'error.length': string;
     'error.capacity': string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-btw",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "DSH 一次性只读旁问插件：基于当前上下文回答，独立气泡，不执行工具 · One-shot read-only side-ask plugin: answers from current context in an independent bubble, no tool execution",
   "repository": {
     "type": "git",