botmux 2.51.1 → 2.53.0

package/dist/core/zellij-session-discovery.d.ts

@@ -0,0 +1,73 @@
+export interface LayoutPane {
+    /** Foreground command (argv0) zellij introspected for this pane, e.g. "claude". */
+    command: string;
+    /** Explicit pane name if set (zellij `name=`), else undefined. */
+    name?: string;
+    /** Absolute cwd of the pane (layout base cwd joined with the pane's relative cwd). */
+    cwd?: string;
+    /** Command args, when present in the dump. */
+    args: string[];
+}
+export interface ListedPane {
+    /** "terminal_<n>" — the id used to target zellij `action` commands. */
+    paneId: string;
+    isPlugin: boolean;
+    isFloating: boolean;
+    title?: string;
+    terminalCommand?: string | null;
+}
+export interface DiscoveredCli {
+    session: string;
+    paneId: string;
+    command: string;
+    cwd?: string;
+    args: string[];
+    title?: string;
+}
+/**
+ * Parse `zellij action dump-layout` output, returning only the panes that have
+ * a foreground `command=` (i.e. real terminal panes running something) in
+ * document order. Template sections (new_tab_template / swap_*_layout) are cut
+ * off first — their bare `pane` nodes have no command and would otherwise add
+ * noise. Plugin panes (tab-bar / status-bar / about) have no command= and are
+ * naturally excluded.
+ */
+export declare function parseDumpLayoutPanes(kdl: string): LayoutPane[];
+export interface LeafPane {
+    /** Foreground command (argv0) if the pane is running one; undefined for an
+     *  idle shell pane (zellij emits a bare `pane` with no command=). */
+    command?: string;
+    name?: string;
+    cwd?: string;
+    args: string[];
+}
+/**
+ * Parse `zellij action dump-layout` into the ordered list of LEAF terminal
+ * panes — both command-bearing panes AND idle bare shell panes — skipping
+ * plugin panes (tab-bar/status-bar/about), container panes (splits), and the
+ * floating subtree. Preserving bare panes is what makes a positional join to
+ * `list-panes` correct: a bare shell pane that sorts before the CLI pane would
+ * otherwise shift every command pane onto the wrong pane id (the bug Codex
+ * found). Templates (new_tab_template / swap_*) are cut off first.
+ *
+ * zellij always pretty-prints dump-layout one node per line, so a brace-stack
+ * line walk is reliable here.
+ */
+export declare function parseDumpLayoutLeafPanes(kdl: string): LeafPane[];
+/** Parse `zellij action list-panes --json` into a flat list (document order). */
+export declare function parseListPanesJson(json: string): ListedPane[];
+/**
+ * Join dump-layout command panes with list-panes terminal panes by document
+ * order: the i-th command pane ↔ the i-th non-plugin terminal pane (sorted by
+ * id). zellij assigns pane ids in creation order and walks the tree in a stable
+ * order, so this aligns for normal layouts. Returns one DiscoveredCli per
+ * command pane that could be bound to an id.
+ */
+export declare function joinPanes(session: string, layoutPanes: LayoutPane[], listed: ListedPane[]): DiscoveredCli[];
+/** Names of live (non-exited) zellij sessions. */
+export declare function listLiveSessions(): string[];
+/** Discover CLIs running in one session. */
+export declare function discoverSessionClis(session: string): DiscoveredCli[];
+/** Discover CLIs across every live zellij session. */
+export declare function discoverAllClis(): DiscoveredCli[];
+//# sourceMappingURL=zellij-session-discovery.d.ts.map

package/dist/core/zellij-session-discovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zellij-session-discovery.d.ts","sourceRoot":"","sources":["../../src/core/zellij-session-discovery.ts"],"names":[],"mappings":"AA4BA,MAAM,WAAW,UAAU;IACzB,mFAAmF;IACnF,OAAO,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sFAAsF;IACtF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IACzB,uEAAuE;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAID;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,CA6C9D;AAED,MAAM,WAAW,QAAQ;IACvB;yEACqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAuDhE;AAED,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,CAW7D;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,EAAE,CAmB3G;AAID,kDAAkD;AAClD,wBAAgB,gBAAgB,IAAI,MAAM,EAAE,CAS3C;AAUD,4CAA4C;AAC5C,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,EAAE,CAKpE;AAED,sDAAsD;AACtD,wBAAgB,eAAe,IAAI,aAAa,EAAE,CAEjD"}

package/dist/core/zellij-session-discovery.js

@@ -0,0 +1,259 @@
+/**
+ * Zellij session discovery for /adopt — find CLIs already running inside a
+ * user's zellij sessions and the pane needed to drive them.
+ *
+ * Why this exists (and why it's not just `list-panes`): zellij's
+ * `list-panes --json` exposes pane ids + geometry but NOT the running command,
+ * cwd, or pid, and its `terminal_command` is null for anything the user started
+ * interactively (typed `claude` into a shell — the common case). The data we
+ * need is instead surfaced by zellij's **session-resurrection** machinery: to be
+ * able to restore a session after a reboot, zellij continuously introspects each
+ * pane's *foreground process command + cwd* and exposes it via
+ * `zellij action dump-layout`. That's where we read "what CLI is in this pane".
+ *
+ * Discovery pipeline:
+ *   1. dump-layout  → per-pane { command, args, cwd }   (detection)
+ *   2. list-panes --json → per-pane { id: terminal_<n> } (drive target)
+ *   3. order/geometry join → bind command ↔ pane id
+ *   4. (caller) /proc descent under the pane shell → pid → ~/.claude/sessions/<pid>.json
+ *
+ * Parsers here are pure (string in, struct out) so they unit-test without a
+ * live zellij. The order-join (step 3) is robust for normal single/few-pane
+ * layouts; exotic multi-tab/floating arrangements may need the geometry/proc
+ * cross-check the caller layers on top.
+ */
+import { execFileSync } from 'node:child_process';
+import { isAbsolute, join as pathJoin } from 'node:path';
+import { zellijEnv } from '../setup/ensure-zellij.js';
+const TEMPLATE_MARKERS = /\b(new_tab_template|swap_tiled_layout|swap_floating_layout)\b/;
+/**
+ * Parse `zellij action dump-layout` output, returning only the panes that have
+ * a foreground `command=` (i.e. real terminal panes running something) in
+ * document order. Template sections (new_tab_template / swap_*_layout) are cut
+ * off first — their bare `pane` nodes have no command and would otherwise add
+ * noise. Plugin panes (tab-bar / status-bar / about) have no command= and are
+ * naturally excluded.
+ */
+export function parseDumpLayoutPanes(kdl) {
+    // Drop the template tail so we only see live tab content.
+    const tmplIdx = kdl.search(TEMPLATE_MARKERS);
+    const body = tmplIdx >= 0 ? kdl.slice(0, tmplIdx) : kdl;
+    const lines = body.split('\n');
+    const panes = [];
+    // Layout base cwd is a NODE: `cwd "..."` (space). Pane cwd is an ATTRIBUTE:
+    // `cwd="..."` (equals). The first node-form cwd is the layout base.
+    let layoutCwd;
+    const baseCwdMatch = body.match(/^\s*cwd\s+"([^"]*)"/m);
+    if (baseCwdMatch)
+        layoutCwd = baseCwdMatch[1];
+    let pending = null;
+    const flush = () => { if (pending) {
+        panes.push(pending);
+        pending = null;
+    } };
+    for (const line of lines) {
+        const trimmed = line.trim();
+        // A pane that runs a command (attributes can appear in any order).
+        if (/^pane\b/.test(trimmed) && /\bcommand=/.test(trimmed)) {
+            flush();
+            const command = attr(trimmed, 'command');
+            const name = attr(trimmed, 'name');
+            const cwdAttr = attr(trimmed, 'cwd');
+            pending = {
+                command: command ?? '',
+                name: name ?? undefined,
+                cwd: resolveCwd(layoutCwd, cwdAttr),
+                args: [],
+            };
+            // Single-line pane (closed on same line, no block) — flush immediately.
+            if (trimmed.includes('}') && !trimmed.endsWith('{'))
+                flush();
+            continue;
+        }
+        // args node inside the current pane block: `args "a" "b" …`
+        if (pending && /^args\b/.test(trimmed)) {
+            pending.args = [...trimmed.matchAll(/"((?:[^"\\]|\\.)*)"/g)].map(m => unescapeKdl(m[1]));
+            continue;
+        }
+        // Next pane / tab / closing — a new `pane` (without command) ends the block.
+        if (pending && /^pane\b/.test(trimmed))
+            flush();
+    }
+    flush();
+    return panes;
+}
+/**
+ * Parse `zellij action dump-layout` into the ordered list of LEAF terminal
+ * panes — both command-bearing panes AND idle bare shell panes — skipping
+ * plugin panes (tab-bar/status-bar/about), container panes (splits), and the
+ * floating subtree. Preserving bare panes is what makes a positional join to
+ * `list-panes` correct: a bare shell pane that sorts before the CLI pane would
+ * otherwise shift every command pane onto the wrong pane id (the bug Codex
+ * found). Templates (new_tab_template / swap_*) are cut off first.
+ *
+ * zellij always pretty-prints dump-layout one node per line, so a brace-stack
+ * line walk is reliable here.
+ */
+export function parseDumpLayoutLeafPanes(kdl) {
+    const tmplIdx = kdl.search(TEMPLATE_MARKERS);
+    const body = tmplIdx >= 0 ? kdl.slice(0, tmplIdx) : kdl;
+    const baseCwdMatch = body.match(/^\s*cwd\s+"([^"]*)"/m);
+    const layoutCwd = baseCwdMatch ? baseCwdMatch[1] : undefined;
+    const stack = [];
+    const leaves = [];
+    const inFloating = () => stack.some(f => f.isFloating);
+    const emit = (command, name, cwdAttr, args) => {
+        if (inFloating())
+            return;
+        leaves.push({ command, name, cwd: resolveCwd(layoutCwd, cwdAttr), args });
+    };
+    for (const raw of body.split('\n')) {
+        const line = raw.trim();
+        if (!line)
+            continue;
+        if (line === '}') {
+            const f = stack.pop();
+            // A pane frame that contained neither a plugin nor child panes is a leaf
+            // terminal pane (its block held only props like args/start_suspended).
+            if (f?.isPane && !f.hasPlugin && !f.hasChildPane && !inFloating()) {
+                leaves.push({ command: f.command, name: f.name, cwd: resolveCwd(layoutCwd, f.cwdAttr), args: f.args });
+            }
+            continue;
+        }
+        const opensBlock = line.endsWith('{');
+        if (line.startsWith('plugin')) {
+            if (stack.length && stack[stack.length - 1].isPane)
+                stack[stack.length - 1].hasPlugin = true;
+            if (opensBlock)
+                stack.push({ isPane: false, isFloating: false, args: [], hasPlugin: false, hasChildPane: false });
+            continue;
+        }
+        if (line.startsWith('pane')) {
+            if (stack.length && stack[stack.length - 1].isPane)
+                stack[stack.length - 1].hasChildPane = true;
+            const command = attr(line, 'command');
+            const name = attr(line, 'name');
+            const cwdAttr = attr(line, 'cwd');
+            if (opensBlock) {
+                stack.push({ isPane: true, isFloating: false, command, name, cwdAttr, args: [], hasPlugin: false, hasChildPane: false });
+            }
+            else {
+                emit(command, name, cwdAttr, []); // bare leaf, no block
+            }
+            continue;
+        }
+        if (opensBlock) {
+            // tab / floating_panes / swap_* / other container
+            stack.push({ isPane: false, isFloating: line.startsWith('floating_panes'), args: [], hasPlugin: false, hasChildPane: false });
+            continue;
+        }
+        if (line.startsWith('args') && stack.length && stack[stack.length - 1].isPane) {
+            stack[stack.length - 1].args = [...line.matchAll(/"((?:[^"\\]|\\.)*)"/g)].map(m => unescapeKdl(m[1]));
+        }
+    }
+    return leaves;
+}
+/** Parse `zellij action list-panes --json` into a flat list (document order). */
+export function parseListPanesJson(json) {
+    let arr;
+    try {
+        arr = JSON.parse(json);
+    }
+    catch {
+        return [];
+    }
+    if (!Array.isArray(arr))
+        return [];
+    return arr.map((p) => ({
+        paneId: `terminal_${p.id}`,
+        isPlugin: !!p.is_plugin,
+        isFloating: !!p.is_floating,
+        title: typeof p.title === 'string' ? p.title : undefined,
+        terminalCommand: p.terminal_command ?? null,
+    }));
+}
+/**
+ * Join dump-layout command panes with list-panes terminal panes by document
+ * order: the i-th command pane ↔ the i-th non-plugin terminal pane (sorted by
+ * id). zellij assigns pane ids in creation order and walks the tree in a stable
+ * order, so this aligns for normal layouts. Returns one DiscoveredCli per
+ * command pane that could be bound to an id.
+ */
+export function joinPanes(session, layoutPanes, listed) {
+    const terminals = listed
+        .filter(p => !p.isPlugin)
+        .sort((a, b) => paneNum(a.paneId) - paneNum(b.paneId));
+    const out = [];
+    for (let i = 0; i < layoutPanes.length; i++) {
+        const lp = layoutPanes[i];
+        const tp = terminals[i];
+        if (!tp)
+            break;
+        out.push({
+            session,
+            paneId: tp.paneId,
+            command: lp.command,
+            cwd: lp.cwd,
+            args: lp.args,
+            title: tp.title,
+        });
+    }
+    return out;
+}
+// ─── Runtime (shells out to zellij) ─────────────────────────────────────────
+/** Names of live (non-exited) zellij sessions. */
+export function listLiveSessions() {
+    try {
+        const out = execFileSync('zellij', ['list-sessions', '--no-formatting'], {
+            encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 3000, env: zellijEnv(),
+        });
+        return out.split('\n').map(l => l.trim())
+            .filter(l => l.length > 0 && !/EXITED/i.test(l))
+            .map(l => l.split(/\s+/)[0]).filter(Boolean);
+    }
+    catch {
+        return [];
+    }
+}
+function zellijAction(session, args) {
+    try {
+        return execFileSync('zellij', ['--session', session, 'action', ...args], {
+            encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 4000, env: zellijEnv(),
+        });
+    }
+    catch {
+        return null;
+    }
+}
+/** Discover CLIs running in one session. */
+export function discoverSessionClis(session) {
+    const layout = zellijAction(session, ['dump-layout']);
+    const panesJson = zellijAction(session, ['list-panes', '--json']);
+    if (!layout || !panesJson)
+        return [];
+    return joinPanes(session, parseDumpLayoutPanes(layout), parseListPanesJson(panesJson));
+}
+/** Discover CLIs across every live zellij session. */
+export function discoverAllClis() {
+    return listLiveSessions().flatMap(discoverSessionClis);
+}
+// ─── helpers ────────────────────────────────────────────────────────────────
+function attr(line, key) {
+    const m = line.match(new RegExp(`\\b${key}="((?:[^"\\\\]|\\\\.)*)"`));
+    return m ? unescapeKdl(m[1]) : undefined;
+}
+function resolveCwd(base, paneCwd) {
+    if (!paneCwd)
+        return base;
+    if (isAbsolute(paneCwd))
+        return paneCwd;
+    return base ? pathJoin(base, paneCwd) : paneCwd;
+}
+function paneNum(paneId) {
+    const m = paneId.match(/(\d+)$/);
+    return m ? Number(m[1]) : 0;
+}
+function unescapeKdl(s) {
+    return s.replace(/\\(.)/g, '$1');
+}
+//# sourceMappingURL=zellij-session-discovery.js.map

package/dist/core/zellij-session-discovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zellij-session-discovery.js","sourceRoot":"","sources":["../../src/core/zellij-session-discovery.ts"],"names":[],"mappings":"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"}

package/dist/daemon.d.ts

@@ -1,6 +1,9 @@
 export type { DaemonSession } from './core/types.js';
 import { WorkflowEventWatcher } from './workflows/fanout.js';
 import type { WorkflowRuntimeContext } from './workflows/runtime.js';
+export declare function enforceMessageQuotaForCliInput(larkAppId: string, chatId: string, senderOpenId: string | undefined, messageId: string, anchor: string): Promise<boolean>;
+export declare function grantRestrictedCommandText(larkAppId: string, chatId: string | undefined, senderOpenId: string | undefined, cmd: string): string | undefined;
+export declare function grantRestrictedSlashCommandText(larkAppId: string, chatId: string | undefined, senderOpenId: string | undefined, cmd: string): string | undefined;
 export declare function attachWorkflowEventWatcher(runId: string, ctx?: WorkflowRuntimeContext): WorkflowEventWatcher;
 export declare function startDaemon(botIndex?: number): Promise<void>;
 //# sourceMappingURL=daemon.d.ts.map

package/dist/daemon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AA0BA,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAmErD,OAAO,EAAE,oBAAoB,EAA6B,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,sBAAsB,EAAiB,MAAM,wBAAwB,CAAC;AAyWpF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,CA0C5G;AA6lED,wBAAsB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyTlE"}
+{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AA0BA,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAsErD,OAAO,EAAE,oBAAoB,EAA6B,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,sBAAsB,EAAiB,MAAM,wBAAwB,CAAC;AAsQpF,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CA4ClB;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAGpB;AAyJD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,CA0C5G;AAkpED,wBAAsB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6TlE"}

package/dist/daemon.js

@@ -27,7 +27,7 @@ import { buildTerminalUrl, setTerminalProxyPort } from './core/terminal-url.js';
 import { startTerminalProxy } from './core/terminal-proxy.js';
 import * as scheduler from './core/scheduler.js';
 import { scanMultipleProjects } from './services/project-scanner.js';
-import { buildRepoSelectCard, buildStreamingCard, getCliDisplayName } from './im/lark/card-builder.js';
+import { buildQuotaExhaustedCard, buildRepoSelectCard, buildStreamingCard, getCliDisplayName } from './im/lark/card-builder.js';
 import { t as tr, botLocale, localeForBot } from './i18n/index.js';
 import { createCliAdapterSync } from './adapters/cli/registry.js';
 import { initWorkerPool, setActiveSessionsRegistry, forkWorker, killWorker, scheduleCardPatch, setCurrentCliVersion, CARD_POSTING_SENTINEL, parkStreamCard, closeSession as closeSessionHelper, ensureCliEnv, writableTerminalLinkFor, } from './core/worker-pool.js';
@@ -36,14 +36,16 @@ import { saveFrozenCards } from './services/frozen-card-store.js';
 import { DAEMON_COMMANDS, SESSIONLESS_DAEMON_COMMANDS, PASSTHROUGH_COMMANDS, handleCommand, parseSlashCommandInvocation, parseForceTopicInvocation } from './core/command-handler.js';
 import { findInheritablePeer } from './core/inherit-peer.js';
 import { isCallbackUrl, handleCallbackUrl } from './utils/user-token.js';
+import { consumeQuota, removeChatGrant, removeGlobalGrant } from './services/grant-store.js';
+import { abortCharge, commitCharge, beginCharge } from './services/quota-dedup.js';
 import { getSessionWorkingDir, getProjectScanDirs, expandHome, downloadResources, formatAttachmentsHint, buildNewTopicPrompt, buildFollowUpContent, buildBridgeInputContent, buildReforkPrompt, getAvailableBots, restoreActiveSessions, executeScheduledTask, persistStreamCardState, rememberLastCliInput, } from './core/session-manager.js';
 import { handleCardAction } from './im/lark/card-handler.js';
-import { executeWorkflowCommand, resolveBotSnapshot, } from './im/lark/workflow-slash-command.js';
+import { executeWorkflowCommand, parseWorkflowCommand, resolveBotSnapshot, } from './im/lark/workflow-slash-command.js';
 import { workflowRunDetailUrl } from './im/lark/workflow-cards.js';
 import { buildWorkflowStartingCard, buildWorkflowProgressCard, buildAttemptDeeplinkEnricher, } from './im/lark/workflow-progress-card.js';
 import { EventLog as WorkflowEventLog } from './workflows/events/append.js';
 import { replay as replayWorkflow } from './workflows/events/replay.js';
-import { isBotMentioned, probeBotOpenId, startLarkEventDispatcher, writeBotInfoFile, canOperate, isKnownPeerBot, checkRequiredScopes } from './im/lark/event-dispatcher.js';
+import { isBotMentioned, probeBotOpenId, startLarkEventDispatcher, writeBotInfoFile, canOperate, evaluateTalk, grantCommandRestriction, isKnownPeerBot, checkRequiredScopes } from './im/lark/event-dispatcher.js';
 import { learnFromMentions, resolveSender, flushIdentityCacheSync } from './im/lark/identity-cache.js';
 import { renderSenderTag } from './core/session-manager.js';
 import { markSessionActivity } from './core/session-activity.js';
@@ -222,6 +224,94 @@ async function sessionReply(anchor, content, msgType = 'text', larkAppId) {
     // Thread-scope (or unknown / legacy): reply in thread.
     return replyMessage(appId, anchor, content, msgType, true);
 }
+async function revokeQuotaGrant(larkAppId, chatId, senderOpenId, ev) {
+    const result = ev.reason === 'chatGrant'
+        ? await removeChatGrant(larkAppId, chatId, senderOpenId)
+        : ev.reason === 'globalGrant'
+            ? await removeGlobalGrant(larkAppId, senderOpenId)
+            : { ok: true, removed: false };
+    if (!result.ok) {
+        logger.warn(`[quota:${larkAppId}] revoke after quota exhaustion failed: reason=${result.reason} user=${senderOpenId.substring(0, 12)} reasonType=${ev.reason}`);
+    }
+}
+async function notifyQuotaExhausted(larkAppId, anchor, senderOpenId, limit) {
+    if (typeof limit !== 'number')
+        return;
+    try {
+        await sessionReply(anchor, buildQuotaExhaustedCard(senderOpenId, limit, localeForBot(larkAppId)), 'interactive', larkAppId);
+    }
+    catch (err) {
+        logger.warn(`[quota:${larkAppId}] quota exhausted notify failed: ${err}`);
+    }
+}
+export async function enforceMessageQuotaForCliInput(larkAppId, chatId, senderOpenId, messageId, anchor) {
+    const ev = evaluateTalk(larkAppId, chatId, senderOpenId);
+    if (!ev.allowed) {
+        logger.debug(`[quota:${larkAppId}] dropping message ${messageId.substring(0, 12)} from non-allowed sender ${senderOpenId?.substring(0, 12) ?? '?'}`);
+        return false;
+    }
+    if (!ev.quotaKey)
+        return true;
+    if (!senderOpenId)
+        return false;
+    // 去重三态：'done' = 同条已成功扣费 → 放行（不重复扣）；'pending' = 同条扣费 in-flight 未定论
+    // → fail-closed drop（绝不在定论前放行第二投）；'fresh' = 首次见 → 继续扣费。
+    const charge = beginCharge(larkAppId, messageId);
+    if (charge === 'done')
+        return true;
+    if (charge === 'pending')
+        return false;
+    let quota;
+    try {
+        quota = await consumeQuota(larkAppId, ev.quotaKey);
+    }
+    catch (err) {
+        logger.warn(`[quota:${larkAppId}] consume failed; dropping message ${messageId.substring(0, 12)}: ${err}`);
+        abortCharge(larkAppId, messageId);
+        return false;
+    }
+    // 无额度记录（无限授权）：放行；标 done 去重后续重投。
+    if (!quota.tracked) {
+        commitCharge(larkAppId, messageId);
+        return true;
+    }
+    // 已超额：fail-closed drop。**绝不 commit 成 done**（否则同条重投会被 'done' 直接放行，
+    // 在 revoke 自愈失败/竞态时绕过硬上限）——abortCharge 让重投重新走扣费判定（仍会被拒，
+    // 或在授权已收回时被上面的 evaluateTalk 闸拦掉）。
+    if (!quota.allow) {
+        abortCharge(larkAppId, messageId);
+        await revokeQuotaGrant(larkAppId, chatId, senderOpenId, ev);
+        await notifyQuotaExhausted(larkAppId, anchor, senderOpenId, quota.limit);
+        return false;
+    }
+    // 扣费成功才定论为 done。
+    commitCharge(larkAppId, messageId);
+    if (quota.exhausted) {
+        await revokeQuotaGrant(larkAppId, chatId, senderOpenId, ev);
+        await notifyQuotaExhausted(larkAppId, anchor, senderOpenId, quota.limit);
+    }
+    return true;
+}
+export function grantRestrictedCommandText(larkAppId, chatId, senderOpenId, cmd) {
+    return grantCommandRestriction(larkAppId, chatId, senderOpenId).blocked
+        ? tr('cmd.grant_restricted', { cmd }, localeForBot(larkAppId))
+        : undefined;
+}
+export function grantRestrictedSlashCommandText(larkAppId, chatId, senderOpenId, cmd) {
+    if (!/^\/[a-z][a-z0-9_-]*$/.test(cmd))
+        return undefined;
+    return grantRestrictedCommandText(larkAppId, chatId, senderOpenId, cmd);
+}
+async function replyGrantRestrictionIfNeeded(larkAppId, chatId, senderOpenId, anchor, cmd) {
+    const text = grantRestrictedCommandText(larkAppId, chatId, senderOpenId, cmd);
+    if (!text)
+        return false;
+    await sessionReply(anchor, text, 'text', larkAppId);
+    return true;
+}
+function forceTopicCommandLabel(content) {
+    return /^\/topic(?:\s|$)/i.test(content.trimStart()) ? '/topic' : '/t';
+}
 // ─── PID file ────────────────────────────────────────────────────────────────
 function getPidFile() {
     const botIndex = process.env.BOTMUX_BOT_INDEX;
@@ -1384,8 +1474,12 @@ async function handleNewTopic(data, ctx) {
     // (already thread-scope) it's just a prefix strip — no routing change.
     // Empty prompt is allowed: the user can fill it in while the repo card is
     // pending (pendingFollowUps in handleThreadReply picks up subsequent text).
+    const senderOpenId = data.sender?.sender_id?.open_id;
     const forceTopic = parseForceTopicInvocation(cmdContent);
     if (forceTopic) {
+        if (await replyGrantRestrictionIfNeeded(larkAppId, chatId, senderOpenId, anchor, forceTopicCommandLabel(cmdContent))) {
+            return;
+        }
         if (scope === 'chat') {
             scope = 'thread';
             anchor = messageId;
@@ -1395,10 +1489,15 @@ async function handleNewTopic(data, ctx) {
         cmdContent = forceTopic.prompt;
         logger.info(`[/t] Force-topic invocation: prompt="${forceTopic.prompt.substring(0, 60)}" (scope=${scope}, anchor=${anchor.substring(0, 12)})`);
     }
-    const senderOpenId = data.sender?.sender_id?.open_id;
+    // senderOpenId 已在上方（force-topic grant 限制前）声明；这里只补 master 新增的 senderUnionId。
     const senderUnionId = data.sender?.sender_id?.union_id;
     const botCfg = getBot(larkAppId).config;
     logger.info(`New session: "${content.substring(0, 60)}" (scope=${scope}, anchor=${anchor.substring(0, 12)}, resources: ${resources.length}, active: ${getActiveCount()}, messageId: ${messageId}, chatId: ${chatId})`);
+    if (parseWorkflowCommand(cmdContent)) {
+        if (await replyGrantRestrictionIfNeeded(larkAppId, chatId, senderOpenId, anchor, '/workflow')) {
+            return;
+        }
+    }
     if (await handleWorkflowCommandIfAny(cmdContent, anchor, chatId, larkAppId, senderOpenId)) {
         return;
     }
@@ -1406,6 +1505,11 @@ async function handleNewTopic(data, ctx) {
     const invocation = parseSlashCommandInvocation(cmdContent);
     if (invocation) {
         const { cmd, content: commandContent } = invocation;
+        const restrictedText = grantRestrictedSlashCommandText(larkAppId, chatId, senderOpenId, cmd);
+        if (restrictedText) {
+            await sessionReply(anchor, restrictedText, 'text', larkAppId);
+            return;
+        }
         if (PASSTHROUGH_COMMANDS.has(cmd)) {
             await sessionReply(anchor, tr('daemon.cmd_requires_session', { cmd }, localeForBot(larkAppId)), 'text', larkAppId);
             return;
@@ -1479,6 +1583,9 @@ async function handleNewTopic(data, ctx) {
             return;
         }
     }
+    if (!await enforceMessageQuotaForCliInput(larkAppId, chatId, senderOpenId, messageId, anchor)) {
+        return;
+    }
     // Download attachments
     const { attachments, needLogin } = await downloadResources(larkAppId, messageId, resources);
     if (attachments.length > 0) {
@@ -1874,6 +1981,8 @@ async function handleThreadReply(data, ctx) {
     const content = parsed.content.trim();
     // Strip leading @<bot> mentions so "@bot /restart" is recognized as a command.
     const cmdContent = stripLeadingMentions(content, parsed.mentions);
+    const threadSenderOpenId = parsed.senderId || data?.sender?.sender_id?.open_id;
+    const threadChatId = ctxChatId ?? data?.message?.chat_id;
     // Intercept OAuth callback URLs (from /login flow)
     if (isCallbackUrl(content)) {
         const result = await handleCallbackUrl(content);
@@ -1885,13 +1994,31 @@ async function handleThreadReply(data, ctx) {
             return;
         }
     }
-    if (await handleWorkflowCommandIfAny(cmdContent, anchor, ctxChatId ?? data?.message?.chat_id, larkAppId, parsed.senderId || data?.sender?.sender_id?.open_id)) {
+    const threadForceTopic = parseForceTopicInvocation(cmdContent);
+    if (threadForceTopic) {
+        if (await replyGrantRestrictionIfNeeded(larkAppId, threadChatId, threadSenderOpenId, anchor, forceTopicCommandLabel(cmdContent))) {
+            return;
+        }
+    }
+    if (parseWorkflowCommand(cmdContent)) {
+        if (await replyGrantRestrictionIfNeeded(larkAppId, threadChatId, threadSenderOpenId, anchor, '/workflow')) {
+            return;
+        }
+    }
+    if (await handleWorkflowCommandIfAny(cmdContent, anchor, threadChatId, larkAppId, threadSenderOpenId)) {
         return;
     }
     // Intercept daemon commands
     const invocation = parseSlashCommandInvocation(cmdContent);
     if (invocation) {
         const { cmd, content: commandContent } = invocation;
+        const existingDs = activeSessions.get(sessionKey(anchor, larkAppId));
+        const effectiveThreadChatId = existingDs?.chatId ?? threadChatId;
+        const restrictedText = grantRestrictedSlashCommandText(larkAppId, effectiveThreadChatId, threadSenderOpenId, cmd);
+        if (restrictedText) {
+            await sessionReply(anchor, restrictedText, 'text', larkAppId);
+            return;
+        }
         if (PASSTHROUGH_COMMANDS.has(cmd)) {
             // 语义边界（刻意保留，非疏漏）：passthrough（/model /clear /compact 等）按
             // “发给 CLI 的对话输入”处理，因此不过下面 DAEMON_COMMANDS 的 oncall
@@ -1900,7 +2027,7 @@ async function handleThreadReply(data, ctx) {
             // 已存在的 session 发这些命令（清上下文/换模型，需已有活跃 worker，无法凭空
             // 拉起）。TODO（后续产品决策）：是否把 CLI passthrough 也纳入 canOperate，
             // 收紧到与 daemon 命令同档；这会同时改变真人 oncall 成员的现有行为，应单独评估。
-            const ds = activeSessions.get(sessionKey(anchor, larkAppId));
+            const ds = existingDs;
             if (ds?.worker && !ds.worker.killed) {
                 // Mark a new turn so the CLI's response to /model, /clear, /compact, etc.
                 // shows up as a fresh streaming card instead of silently PATCH-ing the
@@ -1918,10 +2045,7 @@ async function handleThreadReply(data, ctx) {
         if (DAEMON_COMMANDS.has(cmd)) {
             // canOperate gate for thread-reply daemon commands — required in every chat
             // (see spawn-path gate above). Denies chat-granted users management commands.
-            const existingDs = activeSessions.get(sessionKey(anchor, larkAppId));
-            const threadChatId = existingDs?.chatId ?? ctxChatId ?? data?.message?.chat_id;
-            const threadSenderOpenId = parsed.senderId || data?.sender?.sender_id?.open_id;
-            if (!canOperate(larkAppId, threadChatId, threadSenderOpenId)) {
+            if (!canOperate(larkAppId, effectiveThreadChatId, threadSenderOpenId)) {
                 sessionReply(anchor, tr('daemon.cmd_allowed_users_only', { cmd }, localeForBot(larkAppId)), 'text', larkAppId);
                 return;
             }
@@ -1992,6 +2116,10 @@ async function handleThreadReply(data, ctx) {
             return;
         }
     }
+    const quotaSenderOpenId = threadSenderOpenId;
+    if (!await enforceMessageQuotaForCliInput(larkAppId, ctxChatId ?? data?.message?.chat_id, quotaSenderOpenId, parsed.messageId, anchor)) {
+        return;
+    }
     // Download attachments
     const effectiveAppId = ds?.larkAppId ?? larkAppId;
     const { attachments, needLogin } = await downloadResources(effectiveAppId, parsed.messageId, resources);
@@ -2534,9 +2662,13 @@ export async function startDaemon(botIndex) {
                 const backendType = ds.larkAppId
                     ? (getBot(ds.larkAppId).config.backendType ?? config.daemon.backendType)
                     : config.daemon.backendType;
-                if (backendType === 'tmux') {
-                    // Tmux mode: just kill the worker process — tmux session survives for re-attach.
-                    // Worker's SIGTERM handler calls backend.kill() which only detaches.
+                if (backendType === 'tmux' || backendType === 'zellij') {
+                    // Persistent backends (tmux / zellij): just kill the worker process —
+                    // the multiplexer session survives for re-attach. The worker's SIGTERM
+                    // handler calls backend.kill(), which only DETACHES. Going through
+                    // killWorker() instead would send {type:'close'} → destroySession() →
+                    // `zellij delete-session -f`, permanently erasing the session and
+                    // breaking daemon-restart reattach (the blocker Codex flagged).
                     try {
                         w.kill('SIGTERM');
                     }