@modelzen/feishu-codex-bridge 0.3.7-test.0 → 0.3.8

package/dist/cli.js

@@ -111,11 +111,13 @@ function getMaxConcurrentRuns(cfg) {
 function getPendingPolicy(cfg) {
   return cfg.preferences?.pendingPolicy === "queue" ? "queue" : "steer";
 }
+var RUN_IDLE_TIMEOUT_MIN_SEC = 10;
+var RUN_IDLE_TIMEOUT_MAX_SEC = 3600;
 function getRunIdleTimeoutMs(cfg) {
   const raw = cfg.preferences?.runIdleTimeoutSeconds;
   if (raw === 0) return void 0;
   if (typeof raw !== "number" || !Number.isFinite(raw) || raw < 0) return 12e4;
-  const clamped = Math.min(Math.max(Math.floor(raw), 10), 1800);
+  const clamped = Math.min(Math.max(Math.floor(raw), RUN_IDLE_TIMEOUT_MIN_SEC), RUN_IDLE_TIMEOUT_MAX_SEC);
   return clamped * 1e3;
 }
 function isChatAllowed(cfg, chatId) {
@@ -2004,14 +2006,14 @@ function markInterrupted(state) {
     footer: null
   };
 }
-function markIdleTimeout(state, minutes) {
+function markIdleTimeout(state, seconds) {
   return {
     ...state,
     blocks: closeStreamingText(state.blocks),
     reasoningActive: false,
     terminal: "idle_timeout",
     footer: null,
-    idleTimeoutMinutes: minutes
+    idleTimeoutSeconds: seconds
   };
 }
 function finalizeIfRunning(state) {
@@ -2042,8 +2044,8 @@ var RunRender = class {
     return this.state.terminal;
   }
   /** Mark the run as watchdog-killed (idle timeout). */
-  timeout(minutes) {
-    this.state = markIdleTimeout(this.state, minutes);
+  timeout(seconds) {
+    this.state = markIdleTimeout(this.state, seconds);
   }
   /** Mark the run as user-interrupted (⏹). */
   interrupt() {
@@ -2691,7 +2693,9 @@ function renderTerminal(state, rc) {
   if (state.terminal === "interrupted") {
     elements.push(noteMd("_\u23F9 \u5DF2\u88AB\u4E2D\u65AD_"));
   } else if (state.terminal === "idle_timeout") {
-    elements.push(noteMd(`_\u23F1 ${state.idleTimeoutMinutes ?? 0} \u5206\u949F\u65E0\u54CD\u5E94\uFF0C\u5DF2\u81EA\u52A8\u7EC8\u6B62_`));
+    const s = state.idleTimeoutSeconds ?? 0;
+    const idleLabel = s > 0 && s % 60 === 0 ? `${s / 60} \u5206\u949F` : `${s} \u79D2`;
+    elements.push(noteMd(`_\u23F1 ${idleLabel}\u65E0\u54CD\u5E94\uFF0C\u5DF2\u81EA\u52A8\u7EC8\u6B62_`));
   } else if (state.terminal === "error" && state.errorMsg) {
     elements.push(noteMd(`\u26A0\uFE0F agent \u5931\u8D25\uFF1A${state.errorMsg}`));
   } else if (state.terminal === "done" && !answer) {
@@ -3266,6 +3270,9 @@ var DM = {
   rmCancel: "dm.rmCancel",
   setTools: "dm.set.tools",
   setWatchdog: "dm.set.watchdog",
+  // 假死超时「自定义…」：watchdogCustom 打开输入卡，watchdogCustomSubmit 保存任意秒数
+  watchdogCustom: "dm.set.watchdog.custom",
+  watchdogCustomSubmit: "dm.set.watchdog.customSubmit",
   setPending: "dm.set.pending",
   setConcurrency: "dm.set.concurrency",
   // 权限管理：全局 admins（settings 卡进入）+ 项目响应白名单（项目列表 / 建项目完成卡进入）
@@ -3624,11 +3631,12 @@ function buildSettingsCard(cfg) {
         { label: "\u663E\u793A", value: "on" },
         { label: "\u9690\u85CF", value: "off" }
       ]),
-      ...optionRow("\u23F1 \u5047\u6B7B\u8D85\u65F6", DM.setWatchdog, String(watchdogSec), [
-        { label: "\u5173\u95ED", value: "0" },
-        { label: "60\u79D2", value: "60" },
-        { label: "120\u79D2", value: "120" },
-        { label: "300\u79D2", value: "300" }
+      md(`\u23F1 \u5047\u6B7B\u8D85\u65F6\uFF08\u5F53\u524D **${watchdogSec === 0 ? "\u5173\u95ED" : `${watchdogSec} \u79D2`}**\uFF09`),
+      actions([
+        ...[0, 120, 300].map(
+          (v) => button(v === 0 ? "\u5173\u95ED" : `${v}\u79D2`, { a: DM.setWatchdog, v: String(v) }, v === watchdogSec ? "primary" : "default")
+        ),
+        button("\u81EA\u5B9A\u4E49\u2026", { a: DM.watchdogCustom })
       ]),
       ...optionRow("\u{1F4E5} \u8FD0\u884C\u4E2D\u65B0\u6D88\u606F", DM.setPending, getPendingPolicy(cfg), [
         { label: "\u5F15\u5BFC", value: "steer" },
@@ -3640,13 +3648,30 @@ function buildSettingsCard(cfg) {
         { label: "10", value: "10" },
         { label: "20", value: "20" }
       ]),
-      note("\u26A0\uFE0F \u5047\u6B7B\u8D85\u65F6 / \u5E76\u53D1\u4E0A\u9650 \u6539\u540E\u9700**\u91CD\u542F**\u751F\u6548\uFF1B\u5DE5\u5177\u663E\u793A / \u8FD0\u884C\u4E2D\u65B0\u6D88\u606F \u5373\u65F6\u751F\u6548\u3002"),
+      note("\u26A0\uFE0F \u5E76\u53D1\u4E0A\u9650 \u6539\u540E\u9700**\u91CD\u542F**\u751F\u6548\uFF1B\u5176\u4F59\u8BBE\u7F6E\uFF08\u542B\u5047\u6B7B\u8D85\u65F6\uFF09\u5373\u65F6\u751F\u6548\uFF0C\u6240\u6709\u7FA4\u7ACB\u5373\u5957\u7528\u3002"),
       hr(),
       actions([button("\u{1F46E} \u7BA1\u7406\u5458", { a: DM.admins }), button("\u2B05\uFE0F \u83DC\u5355", { a: DM.menu })])
     ],
     { header: { title: "\u2699\uFE0F \u8BBE\u7F6E", template: "blue" } }
   );
 }
+function buildWatchdogCustomCard(cfg) {
+  const cur = cfg.preferences?.runIdleTimeoutSeconds ?? 120;
+  return card(
+    [
+      md("**\u81EA\u5B9A\u4E49\u5047\u6B7B\u8D85\u65F6**"),
+      note(
+        `\u591A\u5C11\u79D2\u6CA1\u6709\u4EFB\u4F55\u8F93\u51FA\u5C31\u81EA\u52A8\u7EC8\u6B62\u672C\u8F6E\u3002\u8303\u56F4 ${RUN_IDLE_TIMEOUT_MIN_SEC}\u2013${RUN_IDLE_TIMEOUT_MAX_SEC} \u79D2\uFF1B\u586B 0 \u5173\u95ED\u3002`
+      ),
+      form("watchdog_custom", [
+        input({ name: "sec", label: "\u8D85\u65F6\u79D2\u6570", placeholder: "\u4F8B\u5982 600", value: String(cur), required: true }),
+        actions([submitButton("\u2705 \u4FDD\u5B58", { a: DM.watchdogCustomSubmit }, "primary", "submit_watchdog")])
+      ]),
+      actions([button("\u2B05\uFE0F \u8FD4\u56DE\u8BBE\u7F6E", { a: DM.settings })])
+    ],
+    { header: { title: "\u23F1 \u81EA\u5B9A\u4E49\u8D85\u65F6", template: "blue" } }
+  );
+}
 function buildGroupSettingsCard(project) {
   const kind = project.kind ?? "multi";
   const noMention = project.noMention ?? defaultNoMention(project);
@@ -6093,7 +6118,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
   const active = /* @__PURE__ */ new Map();
   const docLocks = /* @__PURE__ */ new Map();
   const sema = new Semaphore(getMaxConcurrentRuns(cfg));
-  const idleMs = getRunIdleTimeoutMs(cfg) ?? 0;
+  const currentIdleMs = () => getRunIdleTimeoutMs(cfg) ?? 0;
   const resumePending = /* @__PURE__ */ new Map();
   const modelPending = /* @__PURE__ */ new Map();
   const runsByCard = /* @__PURE__ */ new Map();
@@ -6875,6 +6900,18 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
   }).on(DM.setWatchdog, ({ evt, value }) => {
     const n = Number(value.v);
     if (Number.isFinite(n)) applyPref(evt, (p) => p.runIdleTimeoutSeconds = n);
+  }).on(DM.watchdogCustom, ({ evt }) => {
+    if (!dmAdmin(evt.operator?.openId)) return;
+    void patch(evt, buildWatchdogCustomCard(cfg));
+  }).on(DM.watchdogCustomSubmit, ({ evt, formValue }) => {
+    const raw = String(formValue?.sec ?? "").trim();
+    const n = Number(raw);
+    if (!Number.isFinite(n) || n < 0) {
+      void patch(evt, buildWatchdogCustomCard(cfg));
+      return;
+    }
+    const sec = n === 0 ? 0 : Math.min(Math.max(Math.floor(n), RUN_IDLE_TIMEOUT_MIN_SEC), RUN_IDLE_TIMEOUT_MAX_SEC);
+    applyPref(evt, (p) => p.runIdleTimeoutSeconds = sec);
   }).on(DM.setPending, ({ evt, value }) => {
     if (value.v === "steer" || value.v === "queue") applyPref(evt, (p) => p.pendingPolicy = value.v);
   }).on(DM.setConcurrency, ({ evt, value }) => {
@@ -7158,6 +7195,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
           interrupted = true;
           resolveStop();
         };
+        const idleMs = currentIdleMs();
         const guarded = withIdleTimeout(
           run.events,
           idleMs,
@@ -7191,7 +7229,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
         await stream2.drain();
         state.interrupt = void 0;
         const killed = interrupted || timedOut;
-        if (timedOut) render.timeout(Math.max(1, Math.round(idleMs / 6e4)));
+        if (timedOut) render.timeout(Math.round(idleMs / 1e3));
         else if (interrupted) render.interrupt();
         else render.finalize();
         rc.rs = render.snapshot();
@@ -7284,7 +7322,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
             const run = thread.runStreamed({ text: prompt }, { model: rec?.model, effort: rec?.effort });
             let state = initialState;
             let timedOut = false;
-            const guarded = withIdleTimeout(run.events, idleMs, () => {
+            const guarded = withIdleTimeout(run.events, currentIdleMs(), () => {
               timedOut = true;
             });
             for await (const ev of guarded) state = reduce(state, ev);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelzen/feishu-codex-bridge",
-  "version": "0.3.7-test.0",
+  "version": "0.3.8",
   "description": "Bridge Feishu/Lark messenger with local Codex via app-server (project=group, thread=session)",
   "type": "module",
   "bin": {