@fangyb/ahchat-bridge 0.1.24 → 0.1.26

package/dist/index.js

@@ -5467,6 +5467,14 @@ runtime\u3002\u5B83\u4EEC\u4E0D\u662F"\u4E0D\u540C\u7684\u4EBA"\u2014\u2014\u516
   \`# \u3010\u6807\u9898\u3011\` (a single \`#\` followed by Chinese bracket-enclosed title).
   For single-topic or short conversational replies, omit headings entirely.
 
+# AskUserQuestion tool
+- When you need the user to choose from options or answer a clarification question, call the real
+  \`AskUserQuestion\` tool with a \`questions\` array.
+- Never output \`<AskUserQuestion>\`, \`</AskUserQuestion>\`, or raw JSON question payloads as chat text.
+  Text like that is not an interactive panel and the user cannot answer it through the tool flow.
+- If you are not able to call \`AskUserQuestion\`, ask the question as plain natural language instead of
+  emitting tool-shaped XML or JSON.
+
 # Runtime payload \u2014 how to read unread messages
 
 \u6BCF\u4E2A turn \u91CC runtime \u4F1A\u7ED9\u4F60\u300C\u672A\u8BFB\u7FA4\u6D88\u606F\uFF08N \u6761\uFF0C\u6309\u65F6\u95F4\u987A\u5E8F\uFF09\u300D\u6BB5\u3002\u8BFB\u6CD5\uFF1A
@@ -5896,11 +5904,20 @@ function parseWSMessage(raw) {
   }
   return parsed;
 }
+function isAskUserQuestionToolName(toolName) {
+  if (!toolName) return false;
+  const normalized = toolName.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+  return normalized === "askuserquestion" || normalized.endsWith("askuserquestion");
+}
 
 // ../shared/src/utils/subscription.ts
+var PRIMARY_COMPANY_SUBSCRIPTION_ID = "sub_company_primary";
 function isSubscriptionType(v) {
   return v === "system" || v === "project";
 }
+function isPrimaryCompanySubscriptionId(v) {
+  return v === PRIMARY_COMPANY_SUBSCRIPTION_ID;
+}
 
 // ../shared/src/utils/agentConfig.ts
 function parseAgentConfig(raw) {
@@ -21514,6 +21531,13 @@ function normalizeDocumentText(value) {
   return value.replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/\n{4,}/g, "\n\n\n").trim();
 }
 
+// src/bridgeHttp.ts
+var BRIDGE_TOKEN_HEADER = "X-AHChat-Bridge-Token";
+function bridgeAuthHeaders(bridgeToken) {
+  const token = bridgeToken?.trim();
+  return token ? { [BRIDGE_TOKEN_HEADER]: token } : {};
+}
+
 // src/neuralMcpServer.ts
 var logger6 = createModuleLogger("neural.mcpServer");
 function formatScopeLabel(key, groupName) {
@@ -21532,6 +21556,26 @@ function filterContactsByOwner(all, ownerId) {
     (a) => a.kind === "system" || a.ownerId === ownerId || a.ownerId == null || a.kind === "human" && a.id === ownerId
   );
 }
+async function resolveTierSubscriptionPreference(preferredSubscriptionId, deps) {
+  if (!preferredSubscriptionId || !isPrimaryCompanySubscriptionId(preferredSubscriptionId)) {
+    return preferredSubscriptionId;
+  }
+  if (!deps.serverApiUrl) return preferredSubscriptionId;
+  try {
+    const base = deps.serverApiUrl.replace(/\/$/, "");
+    const res = await fetch(`${base}/api/subscriptions`, {
+      headers: bridgeAuthHeaders(deps.bridgeToken ?? null)
+    });
+    if (!res.ok) return preferredSubscriptionId;
+    const subscriptions = await res.json();
+    return subscriptions.find(
+      (subscription) => subscription.billingMode === "company_billable" && subscription.isPrimaryCompany === true
+    )?.id ?? preferredSubscriptionId;
+  } catch (e) {
+    logger6.warn("Primary company tier preference resolution failed", { error: e });
+    return preferredSubscriptionId;
+  }
+}
 function resolveMyHuman(registry2, agentId) {
   const all = registry2.getAll();
   const myOwnerId = contactOwnerId(registry2, agentId);
@@ -22687,8 +22731,8 @@ ${result.warnings.map((warning) => `- ${warning}`).join("\n")}
     "fetch_logs",
     `\u62C9\u53D6\u7CFB\u7EDF\u65E5\u5FD7\uFF08\u6309\u65F6\u95F4\u7A97 + \u53EF\u9009 traceId / module / level \u8FC7\u6EE4\uFF09\u3002
 \u8BFB SKILL "log-analysis" \u540E\u624D\u7528\u8FD9\u4E2A\u5DE5\u5177\u3002\u4E00\u6B21\u8C03\u7528\u53EA\u80FD\u62C9\u4E00\u4E2A source\uFF08server \u6216 bridge\uFF09\uFF0C\u5168\u666F\u9700\u8981\u4E24\u6B21\u3002
-limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679C\u9876\u90E8\u5E26\u5206\u7EA7\u7EDF\u8BA1\uFF08ERROR/WARN/INFO \u5404\u591A\u5C11\u6761\uFF09\uFF0C\u6309\u65F6\u95F4\u5347\u5E8F\u6392\u5217\u3002\u6BCF\u884C\u5E26 file / lineNum\uFF0C\u5F15\u7528\u65E5\u5FD7\u65F6\u5FC5\u987B\u7CBE\u786E\u5199 [<file>:L<lineNum>]\u3002
-\u6CE8\u610F\uFF1A\u5982\u679C\u7ED3\u679C\u8FC7\u957F\u4F1A\u88AB\u622A\u65AD\uFF0Cheader \u4F1A\u6807\u6CE8"\u5DF2\u622A\u65AD"\u2014\u2014\u6B64\u65F6\u7F29\u5C0F\u65F6\u95F4\u7A97\u6216\u52A0 module/traceId \u8FC7\u6EE4\u518D\u67E5\u3002`,
+limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\uFF1B\u652F\u6301 offset \u5206\u9875\u3002\u8FD4\u56DE\u7ED3\u679C\u9876\u90E8\u5E26\u5206\u7EA7\u7EDF\u8BA1\uFF08ERROR/WARN/INFO \u5404\u591A\u5C11\u6761\uFF09\uFF0C\u6309\u65F6\u95F4\u5012\u5E8F\u6392\u5217\uFF0C\u6700\u65B0\u65E5\u5FD7\u5728\u524D\u3002\u6BCF\u884C\u5E26 file / lineNum\uFF0C\u5F15\u7528\u65E5\u5FD7\u65F6\u5FC5\u987B\u7CBE\u786E\u5199 [<file>:L<lineNum>]\u3002
+\u6CE8\u610F\uFF1A\u5982\u679C\u8FD8\u6709\u66F4\u591A\u7ED3\u679C\uFF0Cheader \u4F1A\u6807\u6CE8 nextOffset\uFF1B\u7EE7\u7EED\u67E5\u8BE2\u65F6\u5E26\u4E0A offset=nextOffset\u3002`,
     {
       source: external_exports.enum(["server", "bridge"]).describe('\u65E5\u5FD7\u6765\u6E90\uFF0C\u5FC5\u987B\u662F "server" \u6216 "bridge" \u4E4B\u4E00\u3002'),
       start_iso: external_exports.string().describe('\u8D77\u59CB\u65F6\u95F4\uFF0CISO 8601 \u6216\u76F8\u5BF9\u683C\u5F0F\uFF1A"now-5m" / "now-1h" / "now-24h"\u3002'),
@@ -22697,7 +22741,8 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
       trace_id: external_exports.string().optional().describe("\u8FC7\u6EE4\u7279\u5B9A traceId\uFF08\u7CBE\u786E\u5339\u914D\uFF09\u3002"),
       module: external_exports.string().optional().describe('\u8FC7\u6EE4 module \u524D\u7F00\uFF08\u5982 "ws.handler" / "agent.manager"\uFF09\u3002'),
       msg_contains: external_exports.string().optional().describe("msg \u5B50\u4E32\u8FC7\u6EE4\uFF08\u533A\u5206\u5927\u5C0F\u5199\uFF09\u3002"),
-      limit: external_exports.number().int().min(1).max(2e3).optional().describe("\u8FD4\u56DE\u6761\u6570\u4E0A\u9650\uFF0C\u9ED8\u8BA4 500\uFF0C\u6700\u5927 2000\u3002")
+      limit: external_exports.number().int().min(1).max(2e3).optional().describe("\u8FD4\u56DE\u6761\u6570\u4E0A\u9650\uFF0C\u9ED8\u8BA4 500\uFF0C\u6700\u5927 2000\u3002"),
+      offset: external_exports.number().int().min(0).optional().describe("\u5206\u9875\u504F\u79FB\u91CF\uFF1B\u9996\u6B21\u67E5\u8BE2\u4E0D\u4F20\uFF0C\u7EE7\u7EED\u67E5\u8BE2\u65F6\u4F20\u4E0A\u6B21\u8FD4\u56DE\u7684 nextOffset\u3002")
     },
     async (args) => {
       if (!deps.isSmith) {
@@ -22722,9 +22767,11 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
         traceId: args.trace_id,
         module: args.module,
         levelMin: args.level_min,
-        limit: args.limit
+        limit: args.limit,
+        offset: args.offset
       });
       const parsedLimit = typeof args.limit === "number" && Number.isFinite(args.limit) ? args.limit : 500;
+      const parsedOffset = typeof args.offset === "number" && Number.isFinite(args.offset) ? args.offset : 0;
       try {
         const url2 = `${deps.serverApiUrl.replace(/\/$/, "")}/api/admin/logs`;
         const body = {
@@ -22735,7 +22782,8 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
           traceId: args.trace_id,
           module: args.module,
           msgContains: args.msg_contains,
-          limit: Number.isFinite(parsedLimit) ? parsedLimit : 500
+          limit: Number.isFinite(parsedLimit) ? parsedLimit : 500,
+          offset: Number.isFinite(parsedOffset) ? parsedOffset : 0
         };
         const res = await fetch(url2, {
           method: "POST",
@@ -22758,7 +22806,9 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
           source,
           count: json2.entries.length,
           truncated: json2.truncated,
-          totalScanned: json2.totalScanned
+          totalScanned: json2.totalScanned,
+          totalMatched: json2.totalMatched,
+          nextOffset: json2.nextOffset
         });
         const lines = json2.entries.map((e) => {
           const dataStr = e.data ? ` data=${JSON.stringify(e.data).slice(0, 200)}` : "";
@@ -22771,9 +22821,10 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
         const infoCount = json2.entries.filter((e) => e.level === "INFO").length;
         const traceCount = json2.entries.filter((e) => e.level === "TRACE" || e.level === "DEBUG").length;
         const header = [
-          `[${source}] \u5171\u626B ${json2.totalScanned} \u884C\uFF0C\u547D\u4E2D ${json2.entries.length} \u6761`,
+          `[${source}] \u5171\u626B ${json2.totalScanned} \u884C\uFF0C\u5DF2\u8FD4\u56DE ${json2.entries.length} \u6761\uFF0C\u547D\u4E2D ${json2.totalMatched ?? json2.entries.length} \u6761`,
           `  ERROR/FATAL: ${errorCount} | WARN: ${warnCount} | INFO: ${infoCount} | TRACE/DEBUG: ${traceCount}`
-        ].join("\n") + (json2.truncated ? "\n\uFF08\u5DF2\u622A\u65AD\uFF0C\u8BF7\u7F29\u5C0F\u65F6\u95F4\u7A97\u6216\u52A0\u8FC7\u6EE4\u6761\u4EF6\u518D\u67E5\uFF09" : "");
+        ].join("\n") + (json2.nextOffset != null ? `
+nextOffset=${json2.nextOffset}\uFF08\u7EE7\u7EED\u67E5\u8BE2\u65F6\u4F20 offset=${json2.nextOffset}\uFF09` : "");
         const text = [header, "", ...lines].join("\n");
         return { content: [{ type: "text", text }] };
       } catch (e) {
@@ -22860,7 +22911,11 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
             const tiers = await tierRes.json();
             const self = deps.agentRegistry?.getById(deps.agentId);
             const preferredSubscriptionId = parseAgentConfig(self?.config).subscriptionId;
-            const tierConfig = tiers.find((t) => t.tier === tier && t.subscriptionId === preferredSubscriptionId) ?? tiers.find((t) => t.tier === tier);
+            const resolvedPreferredSubscriptionId = await resolveTierSubscriptionPreference(
+              preferredSubscriptionId,
+              deps
+            );
+            const tierConfig = tiers.find((t) => t.tier === tier && t.subscriptionId === resolvedPreferredSubscriptionId) ?? tiers.find((t) => t.tier === tier);
             if (tierConfig) {
               agentConfig = JSON.stringify({
                 capabilityTier: tier,
@@ -23015,7 +23070,11 @@ limit \u9ED8\u8BA4 500\uFF0C\u786C\u4E0A\u9650 2000\u3002\u8FD4\u56DE\u7ED3\u679
           if (tierRes.ok) {
             const tiers = await tierRes.json();
             const preferredSubscriptionId = parseAgentConfig(existing.config).subscriptionId;
-            const tierConfig = tiers.find((t) => t.tier === tier && t.subscriptionId === preferredSubscriptionId) ?? tiers.find((t) => t.tier === tier);
+            const resolvedPreferredSubscriptionId = await resolveTierSubscriptionPreference(
+              preferredSubscriptionId,
+              deps
+            );
+            const tierConfig = tiers.find((t) => t.tier === tier && t.subscriptionId === resolvedPreferredSubscriptionId) ?? tiers.find((t) => t.tier === tier);
             if (tierConfig) {
               agentConfig = JSON.stringify({
                 capabilityTier: tier,
@@ -23646,6 +23705,8 @@ var GroupDispatchMemoryStore = class {
 };
 
 // src/groupInboxPromptBuilder.ts
+var MAX_SYSTEM_NOTE_COUNT = 8;
+var MAX_SYSTEM_NOTE_LEN = 1e3;
 function formatHHMM(epochMs) {
   const d = new Date(epochMs);
   const hh = String(d.getHours()).padStart(2, "0");
@@ -23656,6 +23717,37 @@ function truncate(text, maxLen) {
   if (text.length <= maxLen) return text;
   return `${text.slice(0, maxLen)}\u2026`;
 }
+function formatIsoHHMM(iso) {
+  const epochMs = Date.parse(iso);
+  if (!Number.isFinite(epochMs)) return "";
+  return formatHHMM(epochMs);
+}
+function collectSystemNotes(entries) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    for (const msg of entry.context) {
+      if (msg.role !== "system") continue;
+      byId.set(msg.id, {
+        id: msg.id,
+        time: formatIsoHHMM(msg.createdAt),
+        content: truncate(msg.content, MAX_SYSTEM_NOTE_LEN)
+      });
+    }
+  }
+  return [...byId.values()].slice(-MAX_SYSTEM_NOTE_COUNT);
+}
+function appendSystemNotes(lines, entries) {
+  const notes = collectSystemNotes(entries);
+  if (notes.length === 0) return;
+  lines.push(`--- \u7FA4\u5185\u7CFB\u7EDF\u8BB0\u5F55\uFF08${notes.length} \u6761\uFF0C\u4F9B\u4E0A\u4E0B\u6587\uFF1B\u975E\u666E\u901A\u804A\u5929\u5386\u53F2\uFF09---`);
+  lines.push("\u8FD9\u4E9B\u8BB0\u5F55\u53EA\u7528\u4E8E\u7406\u89E3\u7528\u6237\u5DF2\u4F5C\u51FA\u7684 AskUserQuestion/\u7CFB\u7EDF\u51B3\u7B56\uFF1B\u4E0D\u8981\u76F4\u63A5\u56DE\u590D\u7CFB\u7EDF\u8BB0\u5F55\u672C\u8EAB\u3002");
+  for (const note of notes) {
+    const prefix = note.time ? `[${note.time}] system:` : "system:";
+    lines.push(`${prefix} ${note.content}`);
+  }
+  lines.push("--- \u7FA4\u5185\u7CFB\u7EDF\u8BB0\u5F55 end ---");
+  lines.push("");
+}
 function appendBoardContext(lines, latest) {
   if (latest.boardMeta?.vision) {
     lines.push("--- project vision ---");
@@ -23724,6 +23816,7 @@ function buildGroupInboxPrompt(entries, opts = {}) {
     );
   }
   lines.push("");
+  appendSystemNotes(lines, entries);
   lines.push(`--- \u672A\u8BFB\u7FA4\u6D88\u606F\uFF08${entries.length} \u6761\uFF0C\u6309\u65F6\u95F4\u987A\u5E8F\uFF09---`);
   for (const e of entries) {
     const ts = formatHHMM(e.arrivedAt);
@@ -24067,6 +24160,31 @@ function extractUsage(message) {
   }
   return result;
 }
+function hasUsageValue(usage) {
+  return typeof usage.tokenCount === "number" || typeof usage.inputTokens === "number" || typeof usage.cacheReadTokens === "number" || typeof usage.cacheCreationTokens === "number" || typeof usage.costUsd === "number";
+}
+function emitUsageReported(proc, emit, base, usage, messageId) {
+  if (!hasUsageValue(usage)) return;
+  const groupId = proc.currentTask?.groupId;
+  const scopeKeyValue = proc.scope.kind === "group" ? `group:${proc.scope.groupId}` : "single";
+  emit({
+    type: "agent:usage_reported",
+    payload: {
+      ...wireBase(base),
+      ...messageId ? { messageId } : {},
+      ...groupId ? { groupId } : {},
+      scopeKey: scopeKeyValue,
+      model: usage.model,
+      usage: {
+        inputTokens: usage.inputTokens,
+        outputTokens: usage.tokenCount,
+        cacheReadTokens: usage.cacheReadTokens,
+        cacheCreationTokens: usage.cacheCreationTokens
+      },
+      providerCostUsd: usage.costUsd
+    }
+  });
+}
 function isGroupTask(proc) {
   return proc.currentTask?.groupId != null;
 }
@@ -24328,7 +24446,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
             proc.currentToolName = block.name ?? "unknown";
             proc.accumulatedToolInput = "";
             const toolName = block.name ?? "unknown";
-            if (toolName !== "ExitPlanMode" && toolName !== "AskUserQuestion") {
+            if (toolName !== "ExitPlanMode" && !isAskUserQuestionToolName(toolName)) {
               emit({
                 type: "agent:tool_use",
                 payload: {
@@ -24492,9 +24610,9 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
                 });
               }
             }
-            if (proc.currentToolName === "AskUserQuestion") {
+            if (isAskUserQuestionToolName(proc.currentToolName)) {
               const last = proc.contentBlocks[proc.contentBlocks.length - 1];
-              if (last?.type === "tool_use" && last.toolName === "AskUserQuestion") {
+              if (last?.type === "tool_use" && isAskUserQuestionToolName(last.toolName)) {
                 proc.contentBlocks.pop();
               }
             }
@@ -24546,7 +24664,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
             const toolName = proc.currentToolName ?? "unknown";
             const isError = toolName === "ExitPlanMode" ? false : !!b.is_error;
             const output = typeof b.content === "string" ? b.content : JSON.stringify(b.content);
-            if (toolName === "AskUserQuestion") {
+            if (isAskUserQuestionToolName(toolName)) {
               proc.currentToolName = null;
               continue;
             }
@@ -24630,6 +24748,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
         const watermarkUsage = proc.peakContextUsage ?? usage;
         if (trimmed === NO_REPLY_TOKEN) {
           checkInputTokenWatermark(proc, watermarkUsage, base.traceId);
+          emitUsageReported(proc, emit, base, usage);
           if (groupMode && proc.contentBlocks.length > 0) {
             emitGroupSegment(
               proc,
@@ -24669,6 +24788,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
         }
         if (groupMode) {
           checkInputTokenWatermark(proc, watermarkUsage, base.traceId);
+          emitUsageReported(proc, emit, base, usage);
           if (proc.contentBlocks.length > 0) {
             logger8.info("Group turn trailing audit segment", {
               agentId: proc.agentId,
@@ -24703,6 +24823,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
         }
         if (proc.accumulatedText.length === 0 && proc.contentBlocks.length === 0) {
           cleanupPlanMode(proc, emit, base, "error");
+          emitUsageReported(proc, emit, base, usage);
           logger8.warn("SDK success produced empty assistant output; emitting agent:error", {
             agentId: proc.agentId,
             ackId: base.replyMessageId,
@@ -24730,6 +24851,7 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
         checkInputTokenWatermark(proc, watermarkUsage, base.traceId);
         cleanupPlanMode(proc, emit, base, "success");
         carrierMessageId = createMessageId();
+        emitUsageReported(proc, emit, base, usage, carrierMessageId);
         logger8.info("Agent task done, emitting agent:done", {
           agentId: proc.agentId,
           ackId: base.replyMessageId,
@@ -24750,6 +24872,11 @@ function mapSDKMessage(proc, message, rawEmit, sessionStore, onCompleted) {
               thinkingDuration: Date.now() - proc.currentTaskStartedAt,
               toolCallCount: proc.contentBlocks.filter((b) => b.type === "tool_use").length,
               tokenCount: usage.tokenCount,
+              outputTokens: usage.tokenCount,
+              inputTokens: usage.inputTokens,
+              cacheReadTokens: usage.cacheReadTokens,
+              cacheCreationTokens: usage.cacheCreationTokens,
+              costUsd: usage.costUsd,
               model: usage.model
             }
           }
@@ -25075,6 +25202,12 @@ var wsMetrics = new WsMetrics();
 
 // src/agentManager.ts
 var logger11 = createModuleLogger("agent.manager");
+function missingSubscriptionMessage(subscriptionId) {
+  if (isPrimaryCompanySubscriptionId(subscriptionId)) {
+    return "AHChat \u9ED8\u8BA4\u6A21\u578B\u6682\u65F6\u4E0D\u53EF\u7528\uFF1A\u8FD9\u53F0\u673A\u5668\u8FD8\u6CA1\u6709\u540C\u6B65\u5230\u7BA1\u7406\u5458\u542F\u7528\u7684\u9ED8\u8BA4\u6A21\u578B\uFF0C\u8BF7\u66F4\u65B0\u5E76\u91CD\u542F Bridge \u540E\u91CD\u8BD5\u3002";
+  }
+  return `\u8BA2\u9605\u6E90\u4E0D\u53EF\u7528\uFF1A${subscriptionId}\u3002\u8BF7\u91CD\u65B0\u9009\u62E9\u6A21\u578B\u6765\u6E90\uFF0C\u6216\u91CD\u542F Bridge \u540E\u91CD\u8BD5\u3002`;
+}
 var NODE_USER_UID = 1e3;
 var POST_MERGE_CONTINUATION_ROUTE_MS = 15e3;
 var DOCUMENT_READING_RULES = `DOCUMENT READING:
@@ -25139,6 +25272,27 @@ var BridgeBusyError = class extends Error {
     this.name = "BridgeBusyError";
   }
 };
+function senderLabelForQuote(message) {
+  if (message.senderAgentName) return message.senderAgentName;
+  if (message.role === "user") return "user";
+  if (message.role === "agent") return `agent:${message.senderAgentId ?? "unknown"}`;
+  return "system";
+}
+function buildSingleReplyPrompt(task) {
+  if (!task.replyToMessage) return task.content;
+  const quoted = task.replyToMessage;
+  const label = senderLabelForQuote(quoted);
+  return [
+    "--- reply-to message ---",
+    `You are replying to this earlier message from [${label}]:`,
+    quoted.content || (quoted.attachments?.length ? "[attachment]" : ""),
+    "--- end reply-to message ---",
+    "",
+    "--- user message ---",
+    task.content,
+    "--- end user message ---"
+  ].join("\n");
+}
 var AgentManager = class {
   agents = /* @__PURE__ */ new Map();
   lastUsedAt = /* @__PURE__ */ new Map();
@@ -25274,16 +25428,16 @@ var AgentManager = class {
         agentId: agent.id,
         subscriptionId: cfg.subscriptionId
       });
-      return cfg;
+      throw new Error(missingSubscriptionMessage(cfg.subscriptionId));
     }
     let sub = this.subscriptionRegistry.getById(cfg.subscriptionId);
     if (!sub) sub = await this.subscriptionRegistry.fetchById(cfg.subscriptionId);
     if (!sub) {
-      logger11.warn("Subscription not found; falling back to system OAuth", {
+      logger11.warn("Subscription not found; refusing native OAuth fallback", {
         agentId: agent.id,
         subscriptionId: cfg.subscriptionId
       });
-      return { ...cfg, subscriptionType: "system" };
+      throw new Error(missingSubscriptionMessage(cfg.subscriptionId));
     }
     const isPinnedModel = cfg.model && cfg.model !== "default";
     const resolvedModel = isPinnedModel ? cfg.model : sub.defaultModel;
@@ -26482,8 +26636,9 @@ ${lines.join("\n")}`;
     });
   }
   async pushTaskContent(runtime, task, onYielded) {
+    const textContent = buildSingleReplyPrompt(task);
     if (!task.attachments || task.attachments.length === 0) {
-      runtime.inputController.push(task.content, runtime.ccSessionId ?? "", onYielded);
+      runtime.inputController.push(textContent, runtime.ccSessionId ?? "", onYielded);
       return;
     }
     const supportsVision = await this.detectVisionSupport();
@@ -26495,7 +26650,7 @@ ${lines.join("\n")}`;
         supportsVision
       }
     );
-    const text = task.content.trim() || "\u8BF7\u67E5\u770B\u6211\u53D1\u9001\u7684\u9644\u4EF6\u3002";
+    const text = textContent.trim() || "\u8BF7\u67E5\u770B\u6211\u53D1\u9001\u7684\u9644\u4EF6\u3002";
     const contentParts = [
       { type: "text", text },
       ...attachmentBlocks
@@ -26533,9 +26688,12 @@ ${lines.join("\n")}`;
     return materialized;
   }
   async resolveExistingWorkspaceAttachmentPath(runtime, attachment) {
+    const localWorkspacePath = attachment.metadata?.localWorkspacePath;
     const workspacePath = attachment.metadata?.workspacePath;
-    if (typeof workspacePath !== "string" || !workspacePath.trim()) return null;
-    const candidate = path11.resolve(workspacePath);
+    const rawPath = typeof localWorkspacePath === "string" && localWorkspacePath.trim() ? localWorkspacePath : workspacePath;
+    if (typeof rawPath !== "string" || !rawPath.trim()) return null;
+    const remapped = remapServerWorkspacePath(rawPath, this.workspacesDir);
+    const candidate = path11.resolve(remapped.path);
     if (!this.isPathInsideBase(candidate, runtime.cwd)) return null;
     try {
       const stat3 = await fs5.stat(candidate);
@@ -26545,6 +26703,8 @@ ${lines.join("\n")}`;
         agentId: runtime.agentId,
         attachmentId: attachment.id,
         workspacePath,
+        localWorkspacePath,
+        resolvedPath: candidate,
         error: e
       });
       return null;
@@ -27743,7 +27903,7 @@ function computeBoardSignature(entry) {
 
 // src/bridgeFetchAuth.ts
 var logger12 = createModuleLogger("bridge.fetchAuth");
-var BRIDGE_TOKEN_HEADER = "X-AHChat-Bridge-Token";
+var BRIDGE_TOKEN_HEADER2 = "X-AHChat-Bridge-Token";
 function installBridgeFetchAuth(serverApiUrl, token) {
   if (typeof globalThis.fetch !== "function") {
     logger12.warn("globalThis.fetch not available, cannot install bridge fetch auth");
@@ -27771,8 +27931,8 @@ function installBridgeFetchAuth(serverApiUrl, token) {
     else url2 = input.url;
     if (!shouldInject(url2)) return original(input, init);
     const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : void 0));
-    if (!headers.has(BRIDGE_TOKEN_HEADER)) {
-      headers.set(BRIDGE_TOKEN_HEADER, token);
+    if (!headers.has(BRIDGE_TOKEN_HEADER2)) {
+      headers.set(BRIDGE_TOKEN_HEADER2, token);
     }
     return original(input, { ...init, headers });
   });
@@ -27782,13 +27942,6 @@ function installBridgeFetchAuth(serverApiUrl, token) {
   });
 }
 
-// src/bridgeHttp.ts
-var BRIDGE_TOKEN_HEADER2 = "X-AHChat-Bridge-Token";
-function bridgeAuthHeaders(bridgeToken) {
-  const token = bridgeToken?.trim();
-  return token ? { [BRIDGE_TOKEN_HEADER2]: token } : {};
-}
-
 // src/agentRegistry.ts
 var logger13 = createModuleLogger("agent.registry");
 var HttpAgentRegistry = class {
@@ -27902,6 +28055,23 @@ var HttpSubscriptionRegistry = class {
     const path24 = suffix.startsWith("/") ? suffix : `/${suffix}`;
     return `${base}${path24}`;
   }
+  primaryAliasFrom(sub) {
+    return {
+      ...sub,
+      id: PRIMARY_COMPANY_SUBSCRIPTION_ID,
+      name: "\u516C\u53F8\u4E3B\u8BA2\u9605",
+      resolvedSubscriptionId: sub.id,
+      isVirtual: true
+    };
+  }
+  rebuildPrimaryAlias() {
+    this.subscriptions.delete(PRIMARY_COMPANY_SUBSCRIPTION_ID);
+    const primary = Array.from(this.subscriptions.values()).find(
+      (sub) => sub.billingMode === "company_billable" && sub.isPrimaryCompany === true
+    );
+    if (!primary) return;
+    this.subscriptions.set(PRIMARY_COMPANY_SUBSCRIPTION_ID, this.primaryAliasFrom(primary));
+  }
   async refresh() {
     const attempt = async () => {
       try {
@@ -27929,6 +28099,7 @@ var HttpSubscriptionRegistry = class {
         const s = item;
         if (s && typeof s.id === "string") this.subscriptions.set(s.id, s);
       }
+      this.rebuildPrimaryAlias();
       logger14.info("Subscription registry refreshed", { count: this.subscriptions.size });
     } catch (e) {
       logger14.warn("Subscription registry parse failed", { error: e });
@@ -27938,6 +28109,10 @@ var HttpSubscriptionRegistry = class {
     return this.subscriptions.get(id) ?? null;
   }
   async fetchById(id) {
+    if (isPrimaryCompanySubscriptionId(id)) {
+      await this.refresh();
+      return this.getById(id);
+    }
     try {
       const res = await fetch(this.apiUrl(`/api/subscriptions/${encodeURIComponent(id)}`), {
         headers: bridgeAuthHeaders(this.bridgeToken)
@@ -27953,9 +28128,11 @@ var HttpSubscriptionRegistry = class {
   }
   upsert(sub) {
     this.subscriptions.set(sub.id, sub);
+    this.rebuildPrimaryAlias();
   }
   remove(id) {
     this.subscriptions.delete(id);
+    this.rebuildPrimaryAlias();
   }
 };
 
@@ -28894,7 +29071,6 @@ import path14 from "path";
 import os8 from "os";
 import readline from "readline";
 var logger19 = createModuleLogger("bridge.logScanner");
-var DEFAULT_LIMIT = 500;
 var MAX_LIMIT = 2e3;
 function listLogFiles(logsDir, baseName) {
   let names;
@@ -28907,7 +29083,7 @@ function listLogFiles(logsDir, baseName) {
   const pattern = new RegExp(`^${baseName.replace(".", "\\.")}(\\.\\d+)?$`);
   return names.filter((n) => pattern.test(n)).map((n) => path14.join(logsDir, n));
 }
-async function scanFile(filePath, source, filter, limit, state) {
+async function scanFile(filePath, source, filter, state) {
   const file2 = path14.basename(filePath);
   const stream = fs8.createReadStream(filePath, { encoding: "utf-8" });
   const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
@@ -28919,31 +29095,36 @@ async function scanFile(filePath, source, filter, limit, state) {
     if (!parsed) continue;
     if (parsed.source !== source) continue;
     if (!matchesFilter(parsed, filter)) continue;
-    state.hits.push({ ...parsed, file: file2, lineNum });
-    if (state.hits.length > limit) {
-      state.truncated = true;
-      state.hits.length = limit;
-    }
+    state.hits.push({ ...parsed, raw: line, file: file2, lineNum });
   }
 }
 async function scanLocalLogs(logsDir, baseName, filter) {
   const source = filter.source;
-  const limit = Math.min(Math.max(filter.limit ?? DEFAULT_LIMIT, 1), MAX_LIMIT);
+  const limit = filter.limit == null ? null : Math.min(Math.max(filter.limit, 1), MAX_LIMIT);
+  const offset = Math.max(filter.offset ?? 0, 0);
   const files = listLogFiles(logsDir, baseName);
   const state = { hits: [], totalScanned: 0, truncated: false };
   for (const filePath of files) {
-    if (state.truncated) break;
     try {
-      await scanFile(filePath, source, filter, limit, state);
+      await scanFile(filePath, source, filter, state);
     } catch (e) {
       logger19.warn("scanLocalLogs: file read failed", { filePath, error: e });
     }
   }
-  state.hits.sort((a, b) => a.ts.localeCompare(b.ts));
+  state.hits.sort((a, b) => b.ts.localeCompare(a.ts));
+  const totalMatched = state.hits.length;
+  const endOffset = limit === null ? totalMatched : offset + limit;
+  const entries = state.hits.slice(offset, endOffset);
+  const nextOffset = endOffset < totalMatched ? endOffset : void 0;
+  if (nextOffset !== void 0) {
+    state.truncated = true;
+  }
   return {
-    entries: state.hits,
+    entries,
     truncated: state.truncated,
-    totalScanned: state.totalScanned
+    totalScanned: state.totalScanned,
+    totalMatched,
+    nextOffset
   };
 }
 async function scanBridgeLogs(filter) {
@@ -28957,6 +29138,8 @@ async function scanBridgeLogs(filter) {
   const result = await scanLocalLogs(logDir, "bridge.log", { ...filter, source: "bridge" });
   logger19.info("scanBridgeLogs complete", {
     hitCount: result.entries.length,
+    totalMatched: result.totalMatched,
+    nextOffset: result.nextOffset,
     totalScanned: result.totalScanned,
     truncated: result.truncated
   });
@@ -29029,6 +29212,10 @@ function isProcessAlive(pid) {
   } catch (e) {
     const err = e;
     if (err.code === "ESRCH") return false;
+    if (err.code === "EPERM") {
+      logger21.warn("Treating inaccessible lock PID as stale", { pid, error: e });
+      return false;
+    }
     throw e;
   }
 }
@@ -29154,6 +29341,7 @@ function createTaskDispatchHandler(agentManager, agentRegistry, emit) {
         conversationId: payload.conversationId,
         content: payload.content,
         attachments: payload.attachments ?? void 0,
+        replyToMessage: payload.replyToMessage ?? void 0,
         replyMessageId: payload.ackId,
         traceId: payload.traceId,
         planMode: payload.planMode ?? void 0
@@ -29480,9 +29668,11 @@ var SessionStore = class {
 };
 
 // src/claudeRuntime.ts
-import { accessSync as accessSync2, constants as constants3, existsSync as existsSync2 } from "fs";
+import { accessSync as accessSync2, constants as constants3, existsSync as existsSync2, readdirSync as readdirSync2, realpathSync } from "fs";
+import { createRequire } from "module";
 import path18 from "path";
 var logger25 = createModuleLogger("bridge.claudeRuntime");
+var require2 = createRequire(import.meta.url);
 var EXPLICIT_CLAUDE_EXECUTABLE_ENV = "AHCHAT_CLAUDE_EXECUTABLE";
 var BUNDLED_CLAUDE_PATH_ENV = "AHCHAT_BUNDLED_CLAUDE_PATH";
 function normalizePath(value) {
@@ -29532,6 +29722,118 @@ function validateCandidate(source, candidatePath) {
     version: version2
   };
 }
+function getSdkRuntimeTargets() {
+  const binaryName = process.platform === "win32" ? "claude.exe" : "claude";
+  const targetPrefix = "@anthropic-ai/claude-agent-sdk";
+  if (process.platform === "darwin") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [{ packageName: `${targetPrefix}-darwin-${process.arch}`, binaryName }];
+    }
+    return [];
+  }
+  if (process.platform === "win32") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [{ packageName: `${targetPrefix}-win32-${process.arch}`, binaryName }];
+    }
+    return [];
+  }
+  if (process.platform === "linux") {
+    if (process.arch === "arm64" || process.arch === "x64") {
+      return [
+        { packageName: `${targetPrefix}-linux-${process.arch}`, binaryName },
+        { packageName: `${targetPrefix}-linux-${process.arch}-musl`, binaryName }
+      ];
+    }
+  }
+  return [];
+}
+function safeResolve(specifier, paths) {
+  try {
+    return require2.resolve(specifier, paths ? { paths } : void 0);
+  } catch {
+    return void 0;
+  }
+}
+function resolveClaudeAgentSdkDir() {
+  const sdkEntry = safeResolve("@anthropic-ai/claude-agent-sdk");
+  if (!sdkEntry) return void 0;
+  try {
+    return path18.dirname(realpathSync(sdkEntry));
+  } catch {
+    return path18.dirname(sdkEntry);
+  }
+}
+function findPnpmStoreDir(fromDir) {
+  let current = fromDir;
+  while (current !== path18.dirname(current)) {
+    if (path18.basename(current) === ".pnpm") return current;
+    current = path18.dirname(current);
+  }
+  return void 0;
+}
+function resolvePnpmRuntimeBinary(sdkDir, target) {
+  const pnpmStoreDir = findPnpmStoreDir(sdkDir);
+  if (!pnpmStoreDir) return void 0;
+  const encodedName = target.packageName.replace("/", "+");
+  let entries;
+  try {
+    entries = readdirSync2(pnpmStoreDir);
+  } catch {
+    return void 0;
+  }
+  for (const entry of entries) {
+    if (!entry.startsWith(`${encodedName}@`)) continue;
+    const candidate = path18.join(
+      pnpmStoreDir,
+      entry,
+      "node_modules",
+      ...target.packageName.split("/"),
+      target.binaryName
+    );
+    if (existsSync2(candidate)) return candidate;
+  }
+  return void 0;
+}
+function resolveSdkRuntimeBinary(target) {
+  const directPath = safeResolve(`${target.packageName}/${target.binaryName}`);
+  if (directPath && existsSync2(directPath)) return directPath;
+  const sdkDir = resolveClaudeAgentSdkDir();
+  if (!sdkDir) return void 0;
+  const scopedPackageName = target.packageName.split("/")[1] ?? target.packageName;
+  const candidates = [
+    safeResolve(`${target.packageName}/${target.binaryName}`, [sdkDir]),
+    path18.join(sdkDir, "..", scopedPackageName, target.binaryName),
+    path18.join(sdkDir, "node_modules", ...target.packageName.split("/"), target.binaryName),
+    resolvePnpmRuntimeBinary(sdkDir, target)
+  ].filter((candidate) => Boolean(candidate));
+  return candidates.find((candidate) => existsSync2(candidate));
+}
+function resolveSdkBundledAttempts() {
+  const targets = getSdkRuntimeTargets();
+  if (targets.length === 0) {
+    return [{
+      source: "sdk-bundled",
+      ok: false,
+      error: `unsupported platform for Claude Agent SDK runtime: ${process.platform}-${process.arch}`
+    }];
+  }
+  const attempts = [];
+  for (const target of targets) {
+    const binaryPath = resolveSdkRuntimeBinary(target);
+    if (!binaryPath) {
+      attempts.push({
+        source: "sdk-bundled",
+        ok: false,
+        error: `optional runtime package ${target.packageName} is not installed`
+      });
+      continue;
+    }
+    const attempt = validateCandidate("sdk-bundled", binaryPath);
+    attempts.push(attempt);
+    if (attempt.ok) break;
+  }
+  return attempts;
+}
 function resolvePathCandidate() {
   const resolved = resolveCommand(["claude", "anthropic-cli"]);
   if (!resolved) return void 0;
@@ -29539,12 +29841,13 @@ function resolvePathCandidate() {
 }
 function buildMissingError(attempts) {
   if (attempts.length === 0) {
-    return "Claude runtime not found. Install Claude Code manually or use the bundled desktop runtime.";
+    return "Claude runtime not found. Reinstall @fangyb/ahchat-bridge with npm optional dependencies, install Claude Code manually, or use the bundled desktop runtime.";
   }
-  return attempts.map((attempt) => {
+  const attemptDetails = attempts.map((attempt) => {
     const pathSuffix = attempt.path ? ` at ${attempt.path}` : "";
     return `${attempt.source}${pathSuffix}: ${attempt.error ?? "unavailable"}`;
   }).join("; ");
+  return `Claude runtime not found. ${attemptDetails}. Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUDE_EXECUTABLE, install Claude Code manually, or use the bundled desktop runtime.`;
 }
 function resolveClaudeRuntime(env2 = process.env) {
   const attempts = [];
@@ -29582,6 +29885,19 @@ function resolveClaudeRuntime(env2 = process.env) {
       };
     }
   }
+  const sdkAttempts = resolveSdkBundledAttempts();
+  for (const attempt of sdkAttempts) {
+    attempts.push(attempt);
+    if (attempt.ok) {
+      return {
+        ok: true,
+        source: "sdk-bundled",
+        path: attempt.path,
+        version: attempt.version,
+        attempts
+      };
+    }
+  }
   const pathAttempt = resolvePathCandidate();
   if (pathAttempt) {
     attempts.push(pathAttempt);
@@ -30014,7 +30330,7 @@ Claude runtime is unavailable.
 
 ${claudeRuntime.error ?? "Install Claude Code manually or use the bundled desktop runtime."}
 
-Set AHCHAT_CLAUDE_EXECUTABLE to a valid Claude Code binary path, install Claude Code, or use AHChat Desktop with its bundled runtime.
+Reinstall @fangyb/ahchat-bridge with npm optional dependencies, set AHCHAT_CLAUDE_EXECUTABLE to a valid Claude Code binary path, install Claude Code, or use AHChat Desktop with its bundled runtime.
 `
     );
     process.exit(1);
@@ -30097,6 +30413,7 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
     onConnected: async () => {
       await agentRegistry.refresh();
       await groupRegistry.refresh();
+      await subscriptionRegistry.refresh();
       await agentManager.recoverFromRestart(agentRegistry.getAll());
     },
     onServerPush: async (msg) => {
@@ -30224,7 +30541,7 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
             const entries = await listDirectoryEntries(resolved.path);
             connector?.send({
               type: "bridge:list_dir_response",
-              payload: { requestId, entries }
+              payload: { requestId, entries, localPath: resolved.path }
             });
             logger29.info("list_dir response sent", { requestId, count: entries.length });
           } catch (e) {
@@ -30261,6 +30578,7 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
               payload: {
                 requestId,
                 path: written.path,
+                bridgePath: written.path,
                 relativePath: written.relativePath,
                 size: written.size
               }
@@ -30355,7 +30673,9 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
             endIso: filter.endIso,
             traceId: filter.traceId,
             module: filter.module,
-            levelMin: filter.levelMin
+            levelMin: filter.levelMin,
+            limit: filter.limit,
+            offset: filter.offset
           });
           try {
             const result = await scanBridgeLogs({ ...filter, source: "bridge" });
@@ -30365,13 +30685,17 @@ Bridge token (register this machine at Settings \u2192 \u5DF2\u8FDE\u63A5\u7684\
                 requestId,
                 entries: result.entries,
                 truncated: result.truncated,
-                totalScanned: result.totalScanned
+                totalScanned: result.totalScanned,
+                totalMatched: result.totalMatched,
+                nextOffset: result.nextOffset
               }
             });
             logger29.info("fetch_logs response sent", {
               requestId,
               count: result.entries.length,
-              truncated: result.truncated
+              truncated: result.truncated,
+              totalMatched: result.totalMatched,
+              nextOffset: result.nextOffset
             });
           } catch (e) {
             const err = e instanceof Error ? e.message : String(e);