larkway 0.3.46 → 0.3.48

package/README.md

@@ -8,7 +8,7 @@
 
 You @ the bot in a Feishu thread. It runs on your machine — reading your real codebase, executing commands, opening MRs — and posts the result back. You define what the agent knows and what it can do. Larkway just carries the messages.
 
-**Current release: v0.3.46**
+**Current release: v0.3.48**
 
 ---
 

package/README.zh.md

@@ -8,7 +8,7 @@
 
 你在飞书话题里 @ bot，它在你的机器上运行——读真实代码库、执行命令、开 MR——把结果贴回飞书。你定义 agent 知道什么、能做什么。Larkway 只负责传递消息。
 
-**当前版本：v0.3.46**
+**当前版本：v0.3.48**
 
 ---
 

package/dist/cli/index.js

@@ -131387,7 +131387,11 @@ var execFileAsync7 = promisify8(execFileCallback2);
 var CHAT_NAME_CACHE_MS = 5 * 60 * 1e3;
 var chatNameCache = /* @__PURE__ */ new Map();
 var eventExecFile = execFileAsync7;
+var updateExecFile = execFileAsync7;
 var LARKWAY_VERSION = resolveLarkwayVersion(import.meta.url, "0.0.0");
+var UPDATE_CHECK_TIMEOUT_MS = 5e3;
+var UPDATE_RUN_TIMEOUT_MS = 5 * 60 * 1e3;
+var UPDATE_MAX_BUFFER = 2 * 1024 * 1024;
 function createManagementContext(opts = {}) {
   const stores = {
     botsStore: opts.stores?.botsStore ?? botsStore_exports,
@@ -131449,6 +131453,174 @@ var BOT_ID_RE = /^[a-z0-9]+(-[a-z0-9]+)*$/;
 function badBotId(id) {
   return BOT_ID_RE.test(id) ? null : { status: 400, json: { error: `\u975E\u6CD5\u7684\u52A9\u624B id "${id}"` } };
 }
+function firstVersion(text) {
+  return text.match(/\b\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?\b/)?.[0] ?? null;
+}
+function compareVersion(a, b) {
+  const aa = a.split(/[+-]/)[0].split(".").map((n) => Number.parseInt(n, 10) || 0);
+  const bb = b.split(/[+-]/)[0].split(".").map((n) => Number.parseInt(n, 10) || 0);
+  for (let i = 0; i < 3; i++) {
+    if ((aa[i] ?? 0) !== (bb[i] ?? 0)) return (aa[i] ?? 0) - (bb[i] ?? 0);
+  }
+  return 0;
+}
+async function readGlobalLarkwayVersion() {
+  try {
+    const { stdout: stdout2, stderr } = await updateExecFile("larkway", ["--version"], {
+      timeout: UPDATE_CHECK_TIMEOUT_MS,
+      maxBuffer: UPDATE_MAX_BUFFER
+    });
+    return firstVersion(`${stdout2}
+${stderr}`) ?? LARKWAY_VERSION;
+  } catch {
+    return LARKWAY_VERSION;
+  }
+}
+async function readLatestLarkwayVersion() {
+  try {
+    const { stdout: stdout2, stderr } = await updateExecFile("npm", ["view", "larkway", "version"], {
+      timeout: UPDATE_CHECK_TIMEOUT_MS,
+      maxBuffer: UPDATE_MAX_BUFFER
+    });
+    return firstVersion(`${stdout2}
+${stderr}`);
+  } catch {
+    return null;
+  }
+}
+var healthScanExecFile = execFileAsync7;
+var healthScanBackendLoginProbe = defaultBackendLoginProbe;
+async function defaultBackendLoginProbe(backend) {
+  try {
+    if (backend === "claude") return await detectClaudeLogin();
+    if (backend === "codex") return await isCodexReady();
+    return null;
+  } catch {
+    return null;
+  }
+}
+var HEALTH_SCAN_TTL_MS = 10 * 60 * 1e3;
+var HEALTH_SCAN_PROBE_TIMEOUT_MS = 1e4;
+var healthScanCache = /* @__PURE__ */ new Map();
+var BOT_PERMISSION_BASELINE = [
+  { scope: "im:message", reason: "\u6536\u53D1\u6D88\u606F \u2014\u2014 @ \u89E6\u53D1\u4E0E\u8BDD\u9898\u56DE\u590D\u7684\u6839\u672C" },
+  { scope: "im:message:send_as_bot", reason: "\u4EE5\u5E94\u7528\u8EAB\u4EFD\u53D1\u6D88\u606F \u2014\u2014 \u7B54\u6848\u6295\u9012" },
+  { scope: "im:resource", reason: "\u6D88\u606F\u56FE\u7247/\u9644\u4EF6\u4E0B\u8F7D \u2014\u2014 agent \u8BFB\u7528\u6237\u53D1\u7684\u622A\u56FE\u548C\u6587\u4EF6" },
+  { scope: "im:chat:readonly", reason: "\u7FA4\u4FE1\u606F\u8BFB\u53D6 \u2014\u2014 \u6F0F\u6D88\u606F\u8865\u6293(gap-fill)\u4E0E\u7FA4\u540D\u89E3\u6790" },
+  { scope: "im:message.reactions:write_only", reason: "\u8868\u60C5\u56DE\u5E94 \u2014\u2014 \u300C\u6536\u5230\u300D\u5373\u65F6\u53CD\u9988" },
+  { scope: "cardkit:card:read", reason: "\u5361\u7247\u8BFB\u53D6 \u2014\u2014 \u6D41\u5F0F\u7B54\u6848\u5361\u72B6\u6001\u56DE\u8BFB" },
+  { scope: "cardkit:card:write", reason: "\u5361\u7247\u521B\u5EFA\u4E0E\u66F4\u65B0 \u2014\u2014 \u6D41\u5F0F\u7B54\u6848\u5361\u672C\u4F53" },
+  { scope: "task:task", reason: "\u4EFB\u52A1\u8BFB\u5199 \u2014\u2014 \u8BDD\u9898\u2194\u4EFB\u52A1\u7ED1\u5B9A(\u4E0D\u7528\u4EFB\u52A1\u6D3E\u5355\u53EF\u4E0D\u5F00)" },
+  { scope: "task:comment", reason: "\u4EFB\u52A1\u8BC4\u8BBA \u2014\u2014 \u4EFB\u52A1\u8FDB\u5C55\u6C47\u62A5(\u4E0D\u7528\u4EFB\u52A1\u6D3E\u5355\u53EF\u4E0D\u5F00)" }
+];
+async function runHealthScan(bot, hostConfigStore) {
+  const credentials = [];
+  const backend = bot.backend || "claude";
+  const login = await healthScanBackendLoginProbe(backend);
+  credentials.push({
+    id: "backend-login",
+    label: backend === "claude" ? "Claude \u767B\u5F55" : backend === "codex" ? "Codex \u767B\u5F55" : `${backend} \u767B\u5F55`,
+    status: login === null ? "unknown" : login ? "ok" : "fail",
+    severity: "required",
+    global: true,
+    ...login === false ? { hint: `\u7EC8\u7AEF\u8FD0\u884C \`${backend === "claude" ? "claude" : "codex login"}\` \u5B8C\u6210\u767B\u5F55` } : {}
+  });
+  const profile = bot.lark_cli_profile ?? bot.app_id;
+  try {
+    const { stdout: stdout2 } = await healthScanExecFile(
+      process.env.LARK_CLI_PATH || "lark-cli",
+      ["--profile", profile, "auth", "status", "--json"],
+      { timeout: HEALTH_SCAN_PROBE_TIMEOUT_MS, maxBuffer: 1024 * 1024 }
+    );
+    const payload = healthScanParseJson(stdout2);
+    const botIdentity = payload?.identities?.bot;
+    credentials.push({
+      id: "lark-profile",
+      label: "lark-cli profile",
+      status: botIdentity?.available === true ? "ok" : botIdentity ? "fail" : "unknown",
+      severity: "required",
+      global: false,
+      ...botIdentity?.available !== true ? { hint: "\u91CD\u542F Larkway \u4F1A\u81EA\u52A8\u91CD\u65B0\u914D\u7F6E profile;\u82E5\u4ECD\u5931\u8D25,\u68C0\u67E5 keychain \u662F\u5426\u9501\u5B9A" } : {}
+    });
+  } catch {
+    credentials.push({
+      id: "lark-profile",
+      label: "lark-cli profile",
+      status: "unknown",
+      severity: "required",
+      global: false,
+      hint: "lark-cli \u63A2\u6D4B\u5931\u8D25(\u672A\u5B89\u88C5\u6216\u8D85\u65F6)\u2014\u2014 \u88C5\u597D\u5DE5\u5177\u540E\u91CD\u65B0\u4F53\u68C0,\u8FD9\u9879\u4F1A\u81EA\u52A8\u8865\u4E0A"
+    });
+  }
+  const tokenEnv = bot.git_token_env ?? bot.gitlab_token_env;
+  if (Array.isArray(bot.repos) && bot.repos.length > 0 && tokenEnv) {
+    const secret = await hostConfigStore.readSecret(tokenEnv).catch(() => null);
+    credentials.push({
+      id: "git-token",
+      label: "Git \u8BBF\u95EE\u4EE4\u724C",
+      status: secret ? "ok" : "fail",
+      severity: "recommended",
+      global: false,
+      ...secret ? {} : { hint: `\u73AF\u5883\u91CC\u6CA1\u8BFB\u5230 ${tokenEnv} \u2014\u2014 \u914D\u597D\u540E clone / \u63A8\u9001 / \u5F00 MR \u624D\u8D70\u8FD9\u4E2A bot \u81EA\u5DF1\u7684\u8D26\u53F7` }
+    });
+  }
+  return {
+    credentials,
+    permissions: {
+      status: "unknown",
+      unknownReason: "lark-cli \u6682\u65F6\u67E5\u4E0D\u5230\u5E94\u7528\u5DF2\u5F00\u901A\u54EA\u4E9B\u6743\u9650(auth scopes \u53EA\u62A5\u7528\u6237\u6388\u6743)\u2014\u2014 \u8BF7\u5BF9\u7167\u57FA\u7EBF\u6E05\u5355\u5728\u5F00\u653E\u5E73\u53F0\u6838\u5BF9",
+      baseline: BOT_PERMISSION_BASELINE,
+      consoleUrl: `https://open.feishu.cn/app/${encodeURIComponent(bot.app_id)}/auth`
+    },
+    checkedAt: Date.now(),
+    fromCache: false
+  };
+}
+function healthScanParseJson(text) {
+  const raw = String(text || "").trim();
+  if (!raw) return null;
+  try {
+    const direct = JSON.parse(raw);
+    if (direct && typeof direct === "object" && !Array.isArray(direct)) return direct;
+  } catch {
+  }
+  const first = raw.indexOf("{");
+  const last = raw.lastIndexOf("}");
+  if (first >= 0 && last > first) {
+    try {
+      const parsed = JSON.parse(raw.slice(first, last + 1));
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return parsed;
+    } catch {
+    }
+  }
+  return null;
+}
+var getBotHealthScan = async (req) => {
+  const { ctx, params } = req;
+  const id = params.id;
+  {
+    const e = badBotId(id);
+    if (e) return e;
+  }
+  if (ctx.mode !== "local") {
+    return { status: 403, json: { error: "\u53EA\u652F\u6301\u5728\u672C\u673A\u52A9\u624B\u4E0A\u4E0B\u6587\u4E2D\u4F53\u68C0\u3002" } };
+  }
+  const force = req.method === "POST";
+  const cached = healthScanCache.get(id);
+  if (!force && cached && Date.now() - cached.at < HEALTH_SCAN_TTL_MS) {
+    return { status: 200, json: { ...cached.json, fromCache: true } };
+  }
+  let bot;
+  try {
+    bot = await ctx.stores.botsStore.readBot(id);
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    return { status: msg.includes("not found") ? 404 : 500, json: { error: msg } };
+  }
+  const json2 = await runHealthScan(bot, ctx.stores.hostConfig);
+  healthScanCache.set(id, { json: json2, at: Date.now() });
+  return { status: 200, json: json2 };
+};
 var getContext = async (req) => {
   const { ctx } = req;
   return {
@@ -131456,6 +131628,114 @@ var getContext = async (req) => {
     json: { mode: ctx.mode, centralAvailable: false, version: LARKWAY_VERSION }
   };
 };
+var getUpdateVersion = async () => {
+  const [currentVersion, latestVersion] = await Promise.all([
+    readGlobalLarkwayVersion(),
+    readLatestLarkwayVersion()
+  ]);
+  return {
+    status: 200,
+    json: {
+      currentVersion,
+      latestVersion,
+      updateAvailable: latestVersion ? compareVersion(latestVersion, currentVersion) > 0 : false
+    }
+  };
+};
+var updateJob = { status: "idle", log: [] };
+var updateJobRunner = defaultUpdateJobRunner;
+async function defaultUpdateJobRunner(onLine) {
+  const { spawn: spawn6 } = await import("node:child_process");
+  return new Promise((resolve2, reject) => {
+    const child = spawn6("larkway", ["update", "--latest", "--json"], {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let buf = "";
+    const feed = (chunk) => {
+      buf += String(chunk);
+      let idx;
+      while ((idx = buf.indexOf("\n")) >= 0) {
+        const line = buf.slice(0, idx).trim();
+        buf = buf.slice(idx + 1);
+        if (line) onLine(line);
+      }
+    };
+    child.stdout.on("data", feed);
+    child.stderr.on("data", feed);
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (buf.trim()) onLine(buf.trim());
+      resolve2({ code: code ?? 1 });
+    });
+  });
+}
+function updatePhaseOf(step2) {
+  if (/npm i/i.test(step2)) return { phase: "\u4E0B\u8F7D\u5B89\u88C5", phaseIndex: 1 };
+  if (/stop/i.test(step2)) return { phase: "\u91CD\u542F\u670D\u52A1", phaseIndex: 2 };
+  if (/start/i.test(step2)) return { phase: "\u6536\u5C3E", phaseIndex: 3 };
+  return { phase: step2, phaseIndex: updateJob.phaseIndex ?? 1 };
+}
+async function runUpdateJob() {
+  updateJob = {
+    status: "running",
+    phase: "\u51C6\u5907",
+    phaseIndex: 1,
+    phaseCount: 3,
+    log: [],
+    startedAt: Date.now()
+  };
+  const pushLog = (line) => {
+    updateJob.log.push(line);
+    if (updateJob.log.length > 60) updateJob.log.splice(0, updateJob.log.length - 60);
+  };
+  try {
+    const { code } = await updateJobRunner((line) => {
+      pushLog(line);
+      try {
+        const ev = JSON.parse(line);
+        if (typeof ev.step === "string") {
+          const { phase, phaseIndex } = updatePhaseOf(ev.step);
+          updateJob.phase = phase;
+          updateJob.phaseIndex = phaseIndex;
+        }
+        if (ev.ok === false && typeof ev.error === "string") updateJob.error = ev.error;
+      } catch {
+      }
+    });
+    if (code === 0) {
+      updateJob.status = "done";
+      updateJob.phase = "\u5B8C\u6210";
+      updateJob.phaseIndex = updateJob.phaseCount;
+    } else {
+      updateJob.status = "failed";
+      updateJob.error = updateJob.error ?? `updater \u9000\u51FA\u7801 ${code}`;
+    }
+  } catch (e) {
+    updateJob.status = "failed";
+    updateJob.error = e instanceof Error ? e.message : String(e);
+  }
+  updateJob.finishedAt = Date.now();
+}
+var postUpdateVersion = async () => {
+  if (updateJob.status === "running") {
+    return { status: 409, json: { ok: false, error: "\u66F4\u65B0\u5DF2\u5728\u8FDB\u884C\u4E2D\u3002" } };
+  }
+  void runUpdateJob();
+  return { status: 200, json: { ok: true, started: true } };
+};
+var getUpdateVersionStatus = async () => {
+  return {
+    status: 200,
+    json: {
+      status: updateJob.status,
+      phase: updateJob.phase,
+      phaseIndex: updateJob.phaseIndex,
+      phaseCount: updateJob.phaseCount,
+      error: updateJob.error,
+      log: updateJob.log
+    }
+  };
+};
 var getBots = async (req) => {
   const { ctx } = req;
   const dir = await ctx.activeBotsDir();
@@ -132124,8 +132404,13 @@ var getBackends = async (_req) => {
 };
 var ROUTES = {
   "GET /api/context": getContext,
+  "GET /api/update_version": getUpdateVersion,
+  "POST /api/update_version": postUpdateVersion,
+  "GET /api/update_version/status": getUpdateVersionStatus,
   "GET /api/bots": getBots,
   "GET /api/bot/:id": getBot,
+  "GET /api/bot/:id/health-scan": getBotHealthScan,
+  "POST /api/bot/:id/health-scan": getBotHealthScan,
   "GET /api/bot/:id/events": getBotEvents,
   "PUT /api/bot/:id": putBot,
   "DELETE /api/bot/:id": deleteBot2,
@@ -132366,9 +132651,9 @@ function writeBody(res, status, contentType, buf) {
 }
 async function openBrowser(url) {
   try {
-    const { spawn: spawn5 } = await import("node:child_process");
+    const { spawn: spawn6 } = await import("node:child_process");
     const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
-    spawn5(cmd, [url], { stdio: "ignore", detached: true }).unref();
+    spawn6(cmd, [url], { stdio: "ignore", detached: true }).unref();
   } catch {
   }
 }
@@ -133059,7 +133344,7 @@ function resolveOwnerOpenId(profile, _spawnSync = spawnSync) {
 }
 
 // src/lark/profileBootstrap.ts
-import { spawnSync as spawnSync2 } from "node:child_process";
+import { spawn as spawn5, spawnSync as spawnSync2 } from "node:child_process";
 function deriveLarkCliProfile(explicitProfile, appId) {
   return explicitProfile ?? appId;
 }

package/dist/main.js

@@ -118871,6 +118871,9 @@ function extractFeishuDocLinks(text) {
   if (!matches) return [];
   return [...new Set(matches)];
 }
+function isStopCommand(event) {
+  return /^\/stop$/i.test(extractText(event));
+}
 function parseMessage(event) {
   let parsedContent = null;
   try {
@@ -122445,6 +122448,16 @@ var BridgeHandler = class {
    * awaits these — the real turn boundary tests must sync assertions/cleanup on.
    */
   inFlightTurns = /* @__PURE__ */ new Set();
+  /**
+   * BL-42 /stop: per-queue-key kill hook for the CURRENTLY RUNNING turn.
+   * run()'s dispatch loop intercepts a bare `/stop` message and invokes the
+   * hook for its queue key instead of enqueueing the message (queueing would
+   * make it wait behind the very turn it is trying to stop). Registered by
+   * handleOne right after the agent subprocess spawns; deleted on every
+   * teardown path. Serial-per-key dispatch guarantees at most one live entry
+   * per key, and register/delete never interleave across turns.
+   */
+  activeTurnStops = /* @__PURE__ */ new Map();
   /**
    * v3.2 交接断链检测 (docs/task-handle.md §13, revision 2): per-thread "most
    * recently RECEIVED" timestamp, stamped in run()'s for-await loop body —
@@ -122572,6 +122585,10 @@ var BridgeHandler = class {
       if (this.closed) break;
       if (signal?.aborted) break;
       const key = typeof event.root_id === "string" && event.root_id ? event.root_id : typeof event.parent_id === "string" && event.parent_id ? event.parent_id : event.message_id;
+      if (isStopCommand(event)) {
+        this.handleStopCommand(key, event, pendingByKey);
+        continue;
+      }
       this.threadReceivedAt.set(key, Date.now());
       const legacySessionKey = typeof event.root_id === "string" && event.root_id ? event.root_id : event.message_id;
       if (legacySessionKey !== key) this.threadReceivedAt.set(legacySessionKey, Date.now());
@@ -122595,7 +122612,7 @@ var BridgeHandler = class {
             `[bridge.handler] coalescing ${followups.length} queued follow-up message(s) into turn ${primary.message_id} on thread ${key}`
           );
         }
-        return this.handleOne(primary, followups);
+        return this.handleOne(primary, followups, key);
       }).catch((err) => {
         console.error(`[bridge.handler] unhandled error on thread ${key}:`, err);
       }).finally(() => {
@@ -122615,6 +122632,38 @@ var BridgeHandler = class {
   async close() {
     this.closed = true;
   }
+  /**
+   * BL-42 /stop (see run()'s intercept site). Every consumed message —
+   * the /stop itself AND the queued messages it drops — is acknowledged so
+   * neither live-WS dedup nor any gap-fill window (this process or
+   * post-restart) ever re-dispatches them: replaying a dropped message after
+   * a /stop would resurrect exactly the work the user just cancelled.
+   *
+   * Known benign race: between "drain took the primary" and "handleOne
+   * registered the kill hook" (subprocess starting) a /stop finds no hook and
+   * only clears the queue — the user can simply /stop again once the card
+   * shows activity.
+   */
+  handleStopCommand(key, event, pendingByKey) {
+    this.deps.client.acknowledgeMessage(event.message_id);
+    const pending = pendingByKey.get(key);
+    const droppedCount = pending?.length ?? 0;
+    if (pending) {
+      for (const dropped of pending) this.deps.client.acknowledgeMessage(dropped.message_id);
+      pendingByKey.delete(key);
+    }
+    const stop = this.activeTurnStops.get(key);
+    if (stop) {
+      console.log(
+        `[bridge.handler] /stop: killing in-flight turn on thread ${key}` + (droppedCount > 0 ? ` and dropping ${droppedCount} queued message(s)` : "")
+      );
+      stop();
+    } else {
+      console.log(
+        `[bridge.handler] /stop on thread ${key}: no in-flight turn` + (droppedCount > 0 ? `; dropped ${droppedCount} queued message(s)` : " (nothing to do)")
+      );
+    }
+  }
   // ---------------------------------------------------------------------------
   // Private: single-event lifecycle
   // ---------------------------------------------------------------------------
@@ -122625,7 +122674,7 @@ var BridgeHandler = class {
    * prompt and settle together with the primary; everything else about the
    * turn (card, session, task probes) is driven by `event` alone.
    */
-  async handleOne(event, followups = []) {
+  async handleOne(event, followups = [], queueKey) {
     const settleMessageId = event.message_id;
     let settled = false;
     let agentRunCompleted = false;
@@ -122885,7 +122934,8 @@ var BridgeHandler = class {
             });
           }
         };
-        if (!isNewThread) await createCotBubble(messageId);
+        const triggerInTopic = realTopicThreadId(parsed.raw.thread_id) !== void 0;
+        if (!isNewThread && (triggerInTopic || !taskCardAnchorId)) await createCotBubble(messageId);
         const createCardKitPlaceholder = async () => {
           if (!card && cardKitAvailable && this.deps.cardKitClient) {
             try {
@@ -123187,7 +123237,7 @@ var BridgeHandler = class {
             console.warn("[bridge.handler] mtime fact computation failed (continuing):", err);
           }
         }
-        if (isNewThread) {
+        {
           const anchorMessageId = cardKitProgress?.messageId ?? card?.messageId ?? messageId;
           await createCotBubble(anchorMessageId);
         }
@@ -123317,6 +123367,7 @@ var BridgeHandler = class {
           });
           let lastActivityAt = Date.now();
           let interruptedByIdle = false;
+          let stoppedByUser = false;
           let toolsInFlight = 0;
           let toolUseTotalCount = 0;
           let idleWatchdog;
@@ -123336,6 +123387,15 @@ var BridgeHandler = class {
             }, cadenceMs);
             idleWatchdog.unref?.();
           }
+          if (queueKey) {
+            this.activeTurnStops.set(queueKey, () => {
+              stoppedByUser = true;
+              try {
+                handle.kill();
+              } catch {
+              }
+            });
+          }
           let pidFileWriteSettled = Promise.resolve();
           if (isAgentWorkspace && handle.pid != null) {
             const sessionPidFile = path10.join(worktreePath, ".larkway", "runner.pid");
@@ -123373,11 +123433,12 @@ var BridgeHandler = class {
               clearInterval(idleWatchdog);
               idleWatchdog = void 0;
             }
-            cotTurnOutcome = interruptedByIdle ? "error" : "done";
+            if (queueKey) this.activeTurnStops.delete(queueKey);
+            cotTurnOutcome = interruptedByIdle || stoppedByUser ? "error" : "done";
             if (cotPublisher) {
               void cotPublisher.finalize(
-                interruptedByIdle ? "error" : "done",
-                interruptedByIdle ? { message: "idle timeout" } : void 0
+                cotTurnOutcome,
+                stoppedByUser ? { message: "stopped by user" } : interruptedByIdle ? { message: "idle timeout" } : void 0
               ).catch(() => {
               });
             }
@@ -123443,7 +123504,7 @@ var BridgeHandler = class {
             }
             const reportedStatus = reportedState?.status;
             const reportedError = reportedState?.error;
-            const cardKitTimeoutFailure = interruptedByIdle && reportedStatus !== "ready" && reportedStatus !== "failed";
+            const cardKitTimeoutFailure = !stoppedByUser && interruptedByIdle && reportedStatus !== "ready" && reportedStatus !== "failed";
             let success;
             let failureReason;
             if (reportedStatus === "failed") {
@@ -123451,6 +123512,14 @@ var BridgeHandler = class {
               failureReason = reportedError ?? "bot \u62A5\u544A failed (\u65E0 error \u5B57\u6BB5)";
             } else if (reportedStatus === "ready") {
               success = true;
+            } else if (stoppedByUser) {
+              success = false;
+              failureReason = "\u5DF2\u88AB\u7528\u6237 /stop \u505C\u6B62";
+              await recordEvent({
+                status: "running",
+                appendPath: "\u7528\u6237\u505C\u6B62",
+                reason: failureReason
+              });
             } else if (cardKitTimeoutFailure) {
               success = false;
               failureReason = `agent turn idle for ${idleTimeoutMs}ms with no activity (treated as stuck); run interrupted`;
@@ -123517,15 +123586,15 @@ var BridgeHandler = class {
             const fallbackAnswer = trustedAnswerText.trim() || cardKitProgress?.answerText.trim() || "";
             const noOutputFallback = "\u26A0\uFE0F \u672C\u8F6E agent \u6CA1\u6709\u4EA7\u51FA\u6B63\u6587\uFF0C\u4E5F\u6CA1\u6709\u5199\u5165\u6709\u6548\u72B6\u6001(state.json)\u3002\n" + (result.exitCode !== 0 ? `agent \u8FDB\u7A0B\u5F02\u5E38\u9000\u51FA(exit code ${result.exitCode})\u3002
 ` : "") + "\u4E0B\u4E00\u6B65\uFF1A\u6362\u4E2A\u8BF4\u6CD5\u91CD\u8BD5\uFF0C\u6216\u65B0\u5F00\u4E00\u4E2A\u8BDD\u9898\u7EE7\u7EED\uFF1B\u82E5\u53CD\u590D\u5982\u6B64\uFF0C\u8BF7\u8BA9\u7EF4\u62A4\u8005\u67E5\u770B\u8BE5 session \u65E5\u5FD7\u3002";
-            const cardBody = stuckResetTriggered ? "\u26A0\uFE0F \u672C\u8F6E\u88AB\u4E2D\u65AD\uFF08\u957F\u65F6\u95F4\u65E0\u6D3B\u6027\uFF0C\u5224\u5B9A\u5361\u6B7B\uFF09\u3002\u8FDE\u7EED\u591A\u6B21\u5361\u6B7B\uFF0C\u5DF2\u91CD\u7F6E\u672C\u8BDD\u9898\u4E0A\u4E0B\u6587 \u2014\u2014 \u4E0B\u6B21 @ \u6211\u5C06\u5168\u65B0\u5F00\u59CB\uFF0C\u8BF7\u628A\u9700\u6C42\u91CD\u65B0\u8BF4\u4E00\u904D\u3002" : cardKitTimeoutFailure ? "\u26A0\uFE0F \u672C\u8F6E\u88AB\u4E2D\u65AD\uFF08\u957F\u65F6\u95F4\u65E0\u6D3B\u6027\uFF0C\u5224\u5B9A\u5361\u6B7B\uFF09\uFF0C\u672A\u5B8C\u6210\u3002\u8BF7\u91CD\u8BD5\u3002" : reportedState?.last_message ?? (fallbackAnswer ? fallbackAnswer : noOutputFallback);
+            const cardBody = stoppedByUser ? "\u23F9 \u5DF2\u6309 /stop \u505C\u6B62\u672C\u8F6E\u3002\u672C\u8BDD\u9898 session \u4FDD\u7559\uFF0C\u9700\u8981\u7EE7\u7EED\u65F6\u518D @ \u6211\u3002" : stuckResetTriggered ? "\u26A0\uFE0F \u672C\u8F6E\u88AB\u4E2D\u65AD\uFF08\u957F\u65F6\u95F4\u65E0\u6D3B\u6027\uFF0C\u5224\u5B9A\u5361\u6B7B\uFF09\u3002\u8FDE\u7EED\u591A\u6B21\u5361\u6B7B\uFF0C\u5DF2\u91CD\u7F6E\u672C\u8BDD\u9898\u4E0A\u4E0B\u6587 \u2014\u2014 \u4E0B\u6B21 @ \u6211\u5C06\u5168\u65B0\u5F00\u59CB\uFF0C\u8BF7\u628A\u9700\u6C42\u91CD\u65B0\u8BF4\u4E00\u904D\u3002" : cardKitTimeoutFailure ? "\u26A0\uFE0F \u672C\u8F6E\u88AB\u4E2D\u65AD\uFF08\u957F\u65F6\u95F4\u65E0\u6D3B\u6027\uFF0C\u5224\u5B9A\u5361\u6B7B\uFF09\uFF0C\u672A\u5B8C\u6210\u3002\u8BF7\u91CD\u8BD5\u3002" : reportedState?.last_message ?? (fallbackAnswer ? fallbackAnswer : noOutputFallback);
             const noReportThisTurn = reportedState === null;
             const neutralTitle = noReportThisTurn && success && !failureReason ? "\u{1F4AC} \u5DF2\u56DE\u590D" : void 0;
             const baseCardPayload = {
               finalText: cardBody,
               success,
               failureReason,
-              titleOverride: reportedState?.card_title ?? (cardKitTimeoutFailure ? "\u5DF2\u4E2D\u65AD" : neutralTitle),
-              colorOverride: reportedState?.card_color ?? (neutralTitle ? "neutral" : void 0),
+              titleOverride: reportedState?.card_title ?? (stoppedByUser ? "\u5DF2\u505C\u6B62" : cardKitTimeoutFailure ? "\u5DF2\u4E2D\u65AD" : neutralTitle),
+              colorOverride: reportedState?.card_color ?? (stoppedByUser || neutralTitle ? "neutral" : void 0),
               // V2 dynamic-choice buttons — agent-declared, rendered verbatim.
               // reportedState is null when state.json wasn't freshly written
               // (stale-guard), so stale leftover choices never reappear.
@@ -123700,6 +123769,7 @@ var BridgeHandler = class {
               clearInterval(idleWatchdog);
               idleWatchdog = void 0;
             }
+            if (queueKey) this.activeTurnStops.delete(queueKey);
             const errMsg = String(spawnErr.message ?? spawnErr);
             const isStaleSessionErr = errMsg.includes("No conversation found") || errMsg.includes("thread/resume failed") && errMsg.includes("no rollout found");
             if (attempt === 1 && currentExisting != null && isStaleSessionErr) {
@@ -123802,6 +123872,7 @@ var BridgeHandler = class {
         void bubbleCreate.then((handle) => handle.finalize(cotTurnOutcome).catch(() => {
         }));
       }
+      if (queueKey) this.activeTurnStops.delete(queueKey);
       settle(false);
     }
   }
@@ -130237,7 +130308,7 @@ async function reapOrphanedWarmProcess(pidFilePath) {
 }
 
 // src/lark/profileBootstrap.ts
-import { spawnSync } from "node:child_process";
+import { spawn as spawn6, spawnSync } from "node:child_process";
 function ensureLarkCliProfile(botId, profileName, appId, appSecret, _spawnSync = spawnSync, _console = console) {
   _console.log(
     `[larkway] bot "${botId}": provisioning lark-cli profile "${profileName}" for app ${appId.slice(0, 8)}\u2026`