@modelzen/feishu-codex-bridge 0.3.10 → 0.3.11

package/dist/cli.js

@@ -2871,7 +2871,9 @@ function gaugeEl(state) {
   return state.usage ? runCardGauge(state.usage.used, state.usage.window) : null;
 }
 var RC = {
-  stop: "run.stop"
+  stop: "run.stop",
+  /** goal-only: clear the goal but let the in-flight turn finish (no auto-continue). */
+  endGoal: "goal.end"
 };
 var ANSWER_EID = "answer";
 var REASONING_MAX = 1500;
@@ -2901,7 +2903,21 @@ function renderRunning(state, rc) {
   const answer = textParts.join("\n\n");
   if (answer) elements.push(mdStream(answer, ANSWER_EID));
   if (state.footer) elements.push(footerStatus(state.footer));
-  if (rc.cardKey && !rc.hideStop) elements.push(actions([button("\u23F9 \u7EC8\u6B62", { a: RC.stop, m: rc.cardKey }, "danger")]));
+  if (rc.cardKey && rc.goalControls) {
+    if (rc.goalEnding) {
+      elements.push(noteMd("_\u{1F3AF} \u76EE\u6807\u5DF2\u89E3\u9664\uFF0C\u672C\u8F6E\u8F93\u51FA\u5B8C\u6210\u540E\u505C\u6B62_"));
+      elements.push(actions([button("\u23F9 \u7EC8\u6B62", { a: RC.stop, m: rc.cardKey }, "danger")]));
+    } else {
+      elements.push(
+        actions([
+          button("\u23F9 \u7EC8\u6B62", { a: RC.stop, m: rc.cardKey }, "danger"),
+          button("\u{1F3AF} \u7ED3\u675F\u76EE\u6807", { a: RC.endGoal, m: rc.cardKey }, "default")
+        ])
+      );
+    }
+  } else if (rc.cardKey && !rc.hideStop) {
+    elements.push(actions([button("\u23F9 \u7EC8\u6B62", { a: RC.stop, m: rc.cardKey }, "danger")]));
+  }
   const gauge = gaugeEl(state);
   if (gauge) elements.push(gauge);
   return elements;
@@ -6990,7 +7006,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
   }
   const dispatcher = new CardDispatcher(channel, cfg);
   const PENDING_TTL_MS = 30 * 6e4;
-  const GOAL_MAX_MS = 30 * 6e4;
+  const GOAL_IDLE_MS = 30 * 6e4;
   const CARD_SETTLE_MS = 500;
   const settleUpdate = (msgId, c, fallbackChatId) => {
     const armedAt = Date.now();
@@ -7072,6 +7088,12 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
     if (!st || !runOwnerOrAdmin(evt, st.requesterOpenId)) return;
     st.interrupt?.();
     log.info("card", "action", { actionId: "run.stop", stopped: Boolean(st.interrupt) });
+  }).on(RC.endGoal, ({ evt, value }) => {
+    const key = typeof value.m === "string" ? value.m : evt.messageId;
+    const st = runsByCard.get(key);
+    if (!st || !runOwnerOrAdmin(evt, st.requesterOpenId)) return;
+    st.endGoal?.();
+    log.info("card", "action", { actionId: "goal.end", ended: Boolean(st.endGoal) });
   });
   const dmAdmin = (openId) => isAdmin(cfg, openId ?? "");
   const patch = (evt, c) => settleUpdate(evt.messageId, c, evt.chatId);
@@ -7853,7 +7875,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     const startTurn = () => {
       const render = new RunRender();
       render.showTools = getShowToolCalls(cfg);
-      const rc = { rs: render.snapshot(), requesterOpenId: opts.requesterOpenId, showTools: render.showTools, hideStop: true };
+      const rc = { rs: render.snapshot(), requesterOpenId: opts.requesterOpenId, showTools: render.showTools, goalControls: true };
       return { render, rc, stream: null, cardMsgId: null };
     };
     const ensureCard = async (ctx) => {
@@ -7873,19 +7895,44 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     let goalTokens = 0;
     let goalSeconds = 0;
     let goalErrorMsg;
-    let capped = false;
-    let resolveCap;
-    const capSignal = new Promise((res) => {
-      resolveCap = res;
+    let interrupted = false;
+    let goalEnded = false;
+    let idledOut = false;
+    let resolveStop;
+    let resolveEnd;
+    const stopSignal = new Promise((res) => {
+      resolveStop = res;
+    });
+    const endSignal = new Promise((res) => {
+      resolveEnd = res;
     });
-    const capTimer = setTimeout(() => {
-      capped = true;
-      resolveCap();
-    }, GOAL_MAX_MS);
     try {
       const run = opts.thread.runGoal(objective);
       state.run = run;
-      const guarded = withIdleTimeout(run.events, 0, () => void 0, capSignal);
+      state.interrupt = () => {
+        if (interrupted) return;
+        interrupted = true;
+        void opts.thread.clearGoal().catch(() => void 0);
+        resolveStop();
+      };
+      state.endGoal = () => {
+        if (goalEnded || interrupted) return;
+        goalEnded = true;
+        void opts.thread.clearGoal().catch(() => void 0);
+        if (cur) {
+          cur.rc.goalEnding = true;
+          if (cur.stream) {
+            cur.rc.rs = cur.render.snapshot();
+            cur.stream.streamCoalesced(channel, buildRunCard(cur.rc), ANSWER_EID);
+          }
+        } else {
+          resolveEnd();
+        }
+      };
+      const stop = Promise.race([stopSignal, endSignal]);
+      const guarded = withIdleTimeout(run.events, GOAL_IDLE_MS, () => {
+        idledOut = true;
+      }, stop);
       for await (const ev of guarded) {
         if (ev.type === "goal_update") {
           lastStatus = ev.status;
@@ -7918,6 +7965,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
             await finalizeCard(cur);
             cur = null;
           }
+          if (goalEnded) break;
           continue;
         }
         if (ev.type === "error") {
@@ -7937,24 +7985,28 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
         cur.rc.rs = cur.render.snapshot();
         cur.stream.streamCoalesced(channel, buildRunCard(cur.rc), ANSWER_EID);
       }
+      if (interrupted && cur) cur.render.interrupt();
       await finalizeCard(cur);
       cur = null;
       await opts.thread.clearGoal().catch(() => void 0);
-      const status = capped ? "timeout" : goalErrorMsg && !isGoalTerminal(lastStatus) ? "error" : lastStatus;
-      await sendManagedCard(
-        channel,
-        opts.chatId,
-        buildGoalDoneCard({ objective, status, tokensUsed: goalTokens, timeUsedSeconds: goalSeconds, errorMessage: goalErrorMsg }),
-        replyTo,
-        !opts.flat
-      ).catch((err) => log.fail("card", err, { phase: "goal-done" }));
+      if (!interrupted && !goalEnded) {
+        const status = idledOut ? "timeout" : goalErrorMsg && !isGoalTerminal(lastStatus) ? "error" : lastStatus;
+        await sendManagedCard(
+          channel,
+          opts.chatId,
+          buildGoalDoneCard({ objective, status, tokensUsed: goalTokens, timeUsedSeconds: goalSeconds, errorMessage: goalErrorMsg }),
+          replyTo,
+          !opts.flat
+        ).catch((err) => log.fail("card", err, { phase: "goal-done" }));
+        log.info("card", "goal-final", { status, tokens: goalTokens, seconds: goalSeconds });
+      } else {
+        log.info("card", "goal-final", { status: interrupted ? "interrupted" : "ended", tokens: goalTokens, seconds: goalSeconds });
+      }
       if (topicThreadId) await patchSession(topicThreadId, { updatedAt: Date.now() }).catch(() => void 0);
-      log.info("card", "goal-final", { status, tokens: goalTokens, seconds: goalSeconds });
     } catch (err) {
       log.fail("intake", err);
       await channel.send(opts.chatId, { markdown: `\u274C ${err instanceof Error ? err.message : String(err)}` }, { replyTo: opts.replyTo, replyInThread: !opts.flat }).catch(() => void 0);
     } finally {
-      clearTimeout(capTimer);
       active.delete(activeKey);
       if (cur?.cardMsgId) runsByCard.delete(cur.cardMsgId);
       void opts.thread.close().catch(() => void 0);

package/package.json

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