dsh-lark-bot 0.9.2 → 0.10.0

package/dist/plugin.d.ts

@@ -221,6 +221,8 @@ declare class PendingQueue<T> {
     unblock(scope: string): void;
     flushNow(scope: string): Promise<void>;
     hasPending(scope: string): boolean;
+    /** Number of messages waiting in the queue for a scope (not yet flushing). */
+    size(scope: string): number;
     isBlocked(scope: string): boolean;
     isFlushing(scope: string): boolean;
     activeFlushes(scope: string): number;

package/dist/plugin.js

@@ -1299,9 +1299,10 @@ function packageJsonFor(profile) {
   )}
 `;
 }
-function patchYamlFor() {
+function patchYamlFor(options) {
   const own = ownPackageInfo();
-  return [
+  const bridgeTools = options?.bridgeTools ?? true;
+  const lines = [
     "# dsh-lark SDK JSON-RPC runtime overlay (managed by dsh-lark-bot).",
     "# stdout is reserved for SDK JSON-RPC frames; no console logger may load.",
     "- insert:",
@@ -1322,26 +1323,31 @@ function patchYamlFor() {
     "",
     "- id: hmr",
     "  disabled: true",
-    "",
-    // In-process bridge callback tool: lets the agent mention users and push
-    // messages to other chats/topics through the running bridge process.
-    "- insert:",
-    "    - id: lark-notify",
-    `      name: '${own.name}/notify'`,
-    "      config:",
-    "        endpoint: !!js process.env.DSH_LARK_NOTIFY_URL",
-    "        token: !!js process.env.DSH_LARK_NOTIFY_TOKEN",
-    "",
-    // Question-card tool: the agent asks the user for decisions / missing
-    // information; the bridge shows a card and returns the answer.
-    "- insert:",
-    "    - id: lark-ask",
-    `      name: '${own.name}/ask'`,
-    "      config:",
-    "        endpoint: !!js process.env.DSH_LARK_ASK_URL",
-    "        token: !!js process.env.DSH_LARK_NOTIFY_TOKEN",
     ""
-  ].join("\n");
+  ];
+  if (bridgeTools) {
+    lines.push(
+      // In-process bridge callback tool: lets the agent mention users and push
+      // messages to other chats/topics through the running bridge process.
+      "- insert:",
+      "    - id: lark-notify",
+      `      name: '${own.name}/notify'`,
+      "      config:",
+      "        endpoint: !!js process.env.DSH_LARK_NOTIFY_URL",
+      "        token: !!js process.env.DSH_LARK_NOTIFY_TOKEN",
+      "",
+      // Question-card tool: the agent asks the user for decisions / missing
+      // information; the bridge shows a card and returns the answer.
+      "- insert:",
+      "    - id: lark-ask",
+      `      name: '${own.name}/ask'`,
+      "      config:",
+      "        endpoint: !!js process.env.DSH_LARK_ASK_URL",
+      "        token: !!js process.env.DSH_LARK_NOTIFY_TOKEN",
+      ""
+    );
+  }
+  return lines.join("\n");
 }
 function sdkServerInstalled(profileRoot) {
   const candidates = [
@@ -1399,7 +1405,13 @@ async function ensureSdkProfile(options) {
     await mkdir(root, { recursive: true });
     await writeFile(join3(root, "package.json"), packageJsonFor(profile), "utf8");
     await writeFile(join3(root, "cordis.yml"), "[]\n", "utf8");
-    await writeFile(join3(root, "cordis.patch.yml"), patchYamlFor(), "utf8");
+    await writeFile(
+      join3(root, "cordis.patch.yml"),
+      patchYamlFor(
+        options.bridgeTools === void 0 ? {} : { bridgeTools: options.bridgeTools }
+      ),
+      "utf8"
+    );
     const install = options.install ?? runPnpmInstall;
     if (!isSdkProfileReady(root)) {
       await install(root);
@@ -1763,6 +1775,10 @@ var PendingQueue = class {
   hasPending(scope) {
     return (this.pending.get(scope)?.length ?? 0) > 0;
   }
+  /** Number of messages waiting in the queue for a scope (not yet flushing). */
+  size(scope) {
+    return this.pending.get(scope)?.length ?? 0;
+  }
   isBlocked(scope) {
     return this.blocked.has(scope);
   }
@@ -2052,7 +2068,9 @@ var initialState = {
   footer: "thinking",
   terminal: "running",
   errorMsg: void 0,
-  idleTimeoutMinutes: void 0
+  idleTimeoutMinutes: void 0,
+  startedAtMs: void 0,
+  lastActivityMs: void 0
 };
 function closeStreamingText(blocks) {
   return blocks.map(
@@ -2198,8 +2216,16 @@ function markdown(content) {
 function noteMd(content) {
   return { tag: "markdown", content, text_size: "notation" };
 }
-function footerStatus(status) {
-  const text = status === "thinking" ? "\u{1F9E0} \u6B63\u5728\u601D\u8003" : status === "tool_running" ? "\u{1F9F0} \u6B63\u5728\u8C03\u7528\u5DE5\u5177" : "\u270D\uFE0F \u6B63\u5728\u8F93\u51FA";
+function footerStatus(status, state, now) {
+  let text = status === "thinking" ? "\u{1F9E0} \u6B63\u5728\u601D\u8003" : status === "tool_running" ? "\u{1F9F0} \u6B63\u5728\u8C03\u7528\u5DE5\u5177" : "\u270D\uFE0F \u6B63\u5728\u8F93\u51FA";
+  if (state.startedAtMs !== void 0) {
+    const elapsed = Math.max(0, Math.round((now - state.startedAtMs) / 1e3));
+    text += ` \u23F1 ${elapsed}s`;
+  }
+  if (state.lastActivityMs !== void 0) {
+    const idle = Math.max(0, Math.round((now - state.lastActivityMs) / 1e3));
+    if (idle >= 60) text += ` \xB7 \u23F8 \u65E0\u54CD\u5E94 ${idle}s`;
+  }
   return noteMd(text);
 }
 function summaryText(state) {
@@ -2233,7 +2259,7 @@ function usageLine(state) {
   if (state.usage.outputTokens !== void 0) parts.push(`out ${state.usage.outputTokens}`);
   return parts.length ? `\uFF08tokens ${parts.join(" \xB7 ")}\uFF09` : "";
 }
-function renderStandard(state) {
+function renderStandard(state, now) {
   const elements = [];
   if (state.reasoning.content) {
     elements.push(
@@ -2262,7 +2288,7 @@ function renderStandard(state) {
     if (usage) elements.push(noteMd(usage));
   }
   if (state.terminal === "running") {
-    if (state.footer) elements.push(footerStatus(state.footer));
+    if (state.footer) elements.push(footerStatus(state.footer, state, now));
     elements.push(stopButton());
   }
   return {
@@ -2274,10 +2300,10 @@ function renderStandard(state) {
     body: { elements }
   };
 }
-function renderCompact(state) {
+function renderCompact(state, now) {
   const elements = [noteMd(summaryText(state))];
   if (state.terminal === "running" && state.footer) {
-    elements.push(footerStatus(state.footer));
+    elements.push(footerStatus(state.footer, state, now));
   }
   if (state.terminal === "running") {
     elements.push(stopButton());
@@ -2291,7 +2317,7 @@ function renderCompact(state) {
     body: { elements }
   };
 }
-function renderDetailed(state) {
+function renderDetailed(state, now) {
   const elements = [];
   if (state.reasoning.content) {
     elements.push(
@@ -2330,7 +2356,7 @@ ${safeJsonPreview(tool.input)}
     if (usage) elements.push(noteMd(usage));
   }
   if (state.terminal === "running") {
-    if (state.footer) elements.push(footerStatus(state.footer));
+    if (state.footer) elements.push(footerStatus(state.footer, state, now));
     elements.push(stopButton());
   }
   return {
@@ -2350,10 +2376,10 @@ function safeJsonPreview(value) {
     return String(value).slice(0, 300);
   }
 }
-function renderCard(state, density = "standard") {
-  if (density === "compact") return renderCompact(state);
-  if (density === "detailed") return renderDetailed(state);
-  return renderStandard(state);
+function renderCard(state, density = "standard", now = Date.now()) {
+  if (density === "compact") return renderCompact(state, now);
+  if (density === "detailed") return renderDetailed(state, now);
+  return renderStandard(state, now);
 }
 
 // src/card/approval-card.ts
@@ -2505,7 +2531,12 @@ async function runAgentBatch(input) {
     } : {}
   });
   input.activeRuns.set(input.scope, { runId, stop: run.stop });
-  let state = initialState;
+  const now = Date.now();
+  let state = {
+    ...initialState,
+    startedAtMs: now,
+    lastActivityMs: now
+  };
   const stopRequested = { value: false };
   const timeoutMs = input.runPolicies?.get(input.scope) ?? input.runTimeoutMs ?? 0;
   let timedOut = false;
@@ -2516,10 +2547,16 @@ async function runAgentBatch(input) {
       input.chatId,
       renderCard(state, density),
       async (controller) => {
+        const ticker = setInterval(() => {
+          void controller.update(renderCard(state, density, Date.now())).catch(() => {
+          });
+        }, 5e3);
+        ticker.unref?.();
         const consume = async () => {
           for await (const event of run.events) {
             if (timedOut) return;
             state = applyEvent(state, event, stopRequested);
+            state = { ...state, lastActivityMs: Date.now() };
             if (event.type === "final_text") {
               assistantOutput = event.content;
             } else if (event.type === "text") {
@@ -2560,8 +2597,9 @@ async function runAgentBatch(input) {
             await consume();
           }
           state = timedOut ? markIdleTimeout(state, timeoutMs / 6e4) : finalizeIfRunning(state);
-          await controller.update(renderCard(state, density));
+          await controller.update(renderCard(state, density, Date.now()));
         } finally {
+          clearInterval(ticker);
           if (timeoutTimer !== void 0) clearTimeout(timeoutTimer);
           unsubscribeSettled?.();
         }
@@ -4188,7 +4226,18 @@ async function startChannel(deps) {
         log.fail("channel-command", error, { scope });
         return false;
       });
-      if (!handled) deps.pending.push(scope, msg);
+      if (!handled) {
+        const queued = deps.pending.size(scope);
+        const busy = queued > 0 || deps.pending.isFlushing(scope) || deps.pending.isBlocked(scope);
+        if (busy) {
+          await commandChannel.sendMarkdown(
+            msg.chatId,
+            `\u23F3 \u5DF2\u6536\u5230\uFF0C\u5F53\u524D\u6392\u961F\u4E2D\uFF08\u961F\u5217 ${queued + 1} \u6761\uFF09\u3002\u4EFB\u52A1\u5F00\u59CB\u540E\u4F1A\u5728\u8FD9\u91CC\u5B9E\u65F6\u663E\u793A\u8FDB\u5EA6\u3002`,
+            { replyTo: msg.messageId }
+          );
+        }
+        deps.pending.push(scope, msg);
+      }
     },
     cardAction: async (event) => {
       const value = event.action.value && typeof event.action.value === "object" ? event.action.value : void 0;