botmux 3.10.0 → 3.11.0

package/dist/core/pending-repo-journal.js

@@ -0,0 +1,85 @@
+import * as sessionStore from '../services/session-store.js';
+export function stagePendingRepoSetup(ds, args) {
+    const prior = {
+        queued: ds.session.queued,
+        queuedPrompt: ds.session.queuedPrompt,
+        queuedCodexAppText: ds.session.queuedCodexAppText,
+        queuedCodexAppMessageContext: ds.session.queuedCodexAppMessageContext,
+        pendingRepoSetup: ds.session.pendingRepoSetup,
+    };
+    const setup = {
+        mode: args.mode,
+        prompt: ds.pendingPrompt ?? '',
+        ...(ds.pendingRawInput ? { rawInput: ds.pendingRawInput } : {}),
+        ...(args.turnId ? { turnId: args.turnId } : {}),
+        ...(args.baseDir ? { baseDir: args.baseDir } : {}),
+        ...(ds.pendingCodexAppText !== undefined ? { codexAppText: ds.pendingCodexAppText } : {}),
+        ...(ds.pendingCodexAppApplicationContext
+            ? { codexAppApplicationContext: ds.pendingCodexAppApplicationContext }
+            : {}),
+        ...(ds.pendingCodexAppMessageContext
+            ? { codexAppMessageContext: ds.pendingCodexAppMessageContext }
+            : {}),
+        ...(ds.pendingAttachments?.length
+            ? { attachments: ds.pendingAttachments.map(attachment => ({ ...attachment })) }
+            : {}),
+        ...(ds.pendingMentions?.length
+            ? { mentions: ds.pendingMentions.map(mention => ({ ...mention })) }
+            : {}),
+        ...(ds.pendingSubstituteTrigger
+            ? { substituteTrigger: structuredClone(ds.pendingSubstituteTrigger) }
+            : {}),
+        ...(ds.pendingSender ? { sender: { ...ds.pendingSender } } : {}),
+    };
+    ds.session.queued = true;
+    ds.session.queuedPrompt = setup.prompt;
+    ds.session.queuedCodexAppText = setup.codexAppText;
+    ds.session.queuedCodexAppMessageContext = setup.codexAppMessageContext;
+    ds.session.pendingRepoSetup = setup;
+    try {
+        sessionStore.updateSession(ds.session);
+    }
+    catch (err) {
+        ds.session.queued = prior.queued;
+        ds.session.queuedPrompt = prior.queuedPrompt;
+        ds.session.queuedCodexAppText = prior.queuedCodexAppText;
+        ds.session.queuedCodexAppMessageContext = prior.queuedCodexAppMessageContext;
+        ds.session.pendingRepoSetup = prior.pendingRepoSetup;
+        throw err;
+    }
+}
+export function persistPendingRepoCardMessageId(ds, messageId) {
+    const setup = ds.session.pendingRepoSetup;
+    if (!setup)
+        return;
+    const prior = setup.repoCardMessageId;
+    setup.repoCardMessageId = messageId;
+    try {
+        sessionStore.updateSession(ds.session);
+    }
+    catch (err) {
+        setup.repoCardMessageId = prior;
+        throw err;
+    }
+}
+export function restorePendingRepoRuntime(ds) {
+    const setup = ds.session.pendingRepoSetup;
+    if (!setup || ds.session.queuedActivationPending)
+        return false;
+    ds.pendingRepo = true;
+    ds.pendingPrompt = setup.prompt;
+    ds.pendingRawInput = setup.rawInput;
+    ds.pendingCodexAppText = setup.codexAppText;
+    ds.pendingCodexAppApplicationContext = setup.codexAppApplicationContext;
+    ds.pendingCodexAppMessageContext = setup.codexAppMessageContext;
+    ds.pendingAttachments = setup.attachments?.map(attachment => ({ ...attachment }));
+    ds.pendingMentions = setup.mentions?.map(mention => ({ ...mention }));
+    ds.pendingSubstituteTrigger = setup.substituteTrigger
+        ? structuredClone(setup.substituteTrigger)
+        : undefined;
+    ds.pendingSender = setup.sender ? { ...setup.sender } : undefined;
+    ds.repoCardMessageId = setup.repoCardMessageId;
+    ds.initialStartPending = false;
+    return true;
+}
+//# sourceMappingURL=pending-repo-journal.js.map

package/dist/core/pending-repo-journal.js.map

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

package/dist/core/persistent-backend.d.ts

@@ -57,6 +57,11 @@ export declare function reconcileRiffBackendType(cliId: string, resolved: Backen
  * Riff CLI/backend pairing. Keep spawn-time callers on this single helper so
  * worktree push decisions cannot drift from the backend forkWorker will use. */
 export declare function resolvePairedSpawnBackendType(cliId: string, sessionStamp: BackendType | undefined, botType: BackendType | undefined, defaultType: BackendType): BackendType;
+/** Whether the live/persisted session is frozen onto the remote Riff backend.
+ *  Restart guards must use the session stamp rather than the bot's mutable
+ *  current config: changing a bot later must not make an existing Riff
+ *  generation look locally restartable. */
+export declare function isRiffBackendSession(ds: DaemonSession): boolean;
 /**
  * How a session's worker is torn down at daemon shutdown, branched on the
  * session's FROZEN backend (via getSessionPersistentBackendType), NOT live config:
@@ -66,7 +71,7 @@ export declare function resolvePairedSpawnBackendType(cliId: string, sessionStam
  * Freezing here stops a live backendType edit from changing how a running session
  * tears down — e.g. detach-preserving a "herdr" session whose real pane is tmux.
  */
-export declare function shutdownBackendDisposition(ds: DaemonSession): 'detach' | 'close';
+export declare function shutdownBackendDisposition(ds: DaemonSession): 'riff-drain-detach' | 'detach' | 'close';
 /** Deterministic backing-session name (`bmx-<sid8>`, same rule across backends). */
 export declare function persistentSessionName(backendType: PersistentBackendType, sessionId: string): string;
 /**

package/dist/core/persistent-backend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"persistent-backend.d.ts","sourceRoot":"","sources":["../../src/core/persistent-backend.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACvG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC,CAAC;AAE9F;;;;;;;GAOG;AACH,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,qBAAqB,EAClC,KAAK,EAAE,YAAY,GAClB,OAAO,CAET;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,WAAW,IAAI,qBAAqB,CAEtC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,+BAA+B,CAAC,EAAE,EAAE,aAAa,GAAG,qBAAqB,GAAG,SAAS,CAQpG;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,WAAW,GAAG,SAAS,EACrC,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,WAAW,EAAE,WAAW,GACvB,WAAW,CAEb;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,EACrB,WAAW,EAAE,WAAW,GACvB,WAAW,CAKb;AAED;;gFAEgF;AAChF,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,WAAW,GAAG,SAAS,EACrC,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,WAAW,EAAE,WAAW,GACvB,WAAW,CAMb;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,aAAa,GAAG,QAAQ,GAAG,OAAO,CAOhF;AAED,oFAAoF;AACpF,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAKnG;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,qBAAqB,EAClC,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,uBAAuB,GAClC,uBAAuB,CAOzB;AAED,wBAAgB,iCAAiC,CAAC,EAAE,EAAE,aAAa,GAAG,uBAAuB,GAAG,SAAS,CAQxG;AAED;;6EAE6E;AAC7E,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,qBAAqB,EAClC,QAAQ,EAAE,SAAS,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,aAAa,GAAG,yBAAyB,CAAC,EAAE,GAC1F,uBAAuB,EAAE,CAQ3B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,uBAAuB,GAAG,YAAY,CAK1F;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,uBAAuB,EAC/B,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI,CAMN;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,qBAAqB,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAKrG;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,qBAAqB,EAClC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GACtB,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAiCnC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,qBAAqB,EAClC,IAAI,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI,CAQN"}
+{"version":3,"file":"persistent-backend.d.ts","sourceRoot":"","sources":["../../src/core/persistent-backend.ts"],"names":[],"mappings":"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"}

package/dist/core/persistent-backend.js

@@ -95,6 +95,13 @@ export function reconcileRiffBackendType(cliId, resolved, defaultType) {
 export function resolvePairedSpawnBackendType(cliId, sessionStamp, botType, defaultType) {
     return reconcileRiffBackendType(cliId, resolveSpawnBackendType(sessionStamp, botType, defaultType), defaultType);
 }
+/** Whether the live/persisted session is frozen onto the remote Riff backend.
+ *  Restart guards must use the session stamp rather than the bot's mutable
+ *  current config: changing a bot later must not make an existing Riff
+ *  generation look locally restartable. */
+export function isRiffBackendSession(ds) {
+    return (ds.initConfig?.backendType ?? ds.session.backendType) === 'riff';
+}
 /**
  * How a session's worker is torn down at daemon shutdown, branched on the
  * session's FROZEN backend (via getSessionPersistentBackendType), NOT live config:
@@ -105,12 +112,11 @@ export function resolvePairedSpawnBackendType(cliId, sessionStamp, botType, defa
  * tears down — e.g. detach-preserving a "herdr" session whose real pane is tmux.
  */
 export function shutdownBackendDisposition(ds) {
-    // riff：远端任务独立于本地进程存活。daemon shutdown 走 'close' 会经 worker 的
-    // destroySession() 取消远端任务——重启不该杀任务（血缘已持久化，重启后
-    // follow-up 续上，agent 的 botmux send 照常送达）。detach = 仅 SIGTERM worker。
-    const frozen = ds.initConfig?.backendType ?? ds.session.backendType;
-    if (frozen === 'riff')
-        return 'detach';
+    // Riff 不能落进普通 detach 的直接 SIGTERM：create/follow-up 最长 10s 才返回
+    // task id，而 worker SIGTERM 会立即 exit，丢掉唯一血缘。独立 disposition 迫使
+    // daemon 先走 drain → durable ACK → commit 协议；类型检查防止未来回归。
+    if (isRiffBackendSession(ds))
+        return 'riff-drain-detach';
     return getSessionPersistentBackendType(ds) ? 'detach' : 'close';
 }
 /** Deterministic backing-session name (`bmx-<sid8>`, same rule across backends). */

package/dist/core/persistent-backend.js.map

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

package/dist/core/process-start-identity.d.ts

@@ -0,0 +1,3 @@
+/** Stable process-birth identity used by supervisor mutation authority. */
+export declare function readSupervisorProcessStartIdentity(pid: number): string | undefined;
+//# sourceMappingURL=process-start-identity.d.ts.map

package/dist/core/process-start-identity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-start-identity.d.ts","sourceRoot":"","sources":["../../src/core/process-start-identity.ts"],"names":[],"mappings":"AAUA,2EAA2E;AAC3E,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAwClF"}

package/dist/core/process-start-identity.js

@@ -0,0 +1,62 @@
+import { execFileSync } from 'node:child_process';
+import { existsSync, readFileSync } from 'node:fs';
+function systemPsBin() {
+    for (const candidate of ['/usr/bin/ps', '/bin/ps']) {
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return undefined;
+}
+/** Stable process-birth identity used by supervisor mutation authority. */
+export function readSupervisorProcessStartIdentity(pid) {
+    if (!Number.isSafeInteger(pid) || pid <= 1)
+        return undefined;
+    if (process.platform === 'linux') {
+        try {
+            const raw = readFileSync(`/proc/${pid}/stat`, 'utf8');
+            const closeParen = raw.lastIndexOf(')');
+            if (closeParen >= 0) {
+                const fields = raw.slice(closeParen + 2).trim().split(/\s+/);
+                if (fields[19])
+                    return fields[19];
+            }
+        }
+        catch { /* exited or unreadable */ }
+        return undefined;
+    }
+    if (process.platform === 'win32') {
+        try {
+            const value = execFileSync('powershell.exe', [
+                '-NoProfile',
+                '-NonInteractive',
+                '-Command',
+                `$p = Get-CimInstance Win32_Process -Filter \"ProcessId = ${pid}\"; `
+                    + 'if ($p) { $p.CreationDate.ToUniversalTime().Ticks }',
+            ], {
+                encoding: 'utf8',
+                timeout: 2_000,
+                stdio: ['ignore', 'pipe', 'ignore'],
+            }).trim();
+            return value || undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    const ps = systemPsBin();
+    if (!ps)
+        return undefined;
+    try {
+        const value = execFileSync(ps, ['-o', 'lstart=', '-p', String(pid)], {
+            encoding: 'utf8',
+            timeout: 2_000,
+            stdio: ['ignore', 'pipe', 'ignore'],
+            env: { PATH: '/usr/bin:/bin', LANG: 'C' },
+        }).trim();
+        return value || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+//# sourceMappingURL=process-start-identity.js.map

package/dist/core/process-start-identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-start-identity.js","sourceRoot":"","sources":["../../src/core/process-start-identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEnD,SAAS,WAAW;IAClB,KAAK,MAAM,SAAS,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,CAAC;QACnD,IAAI,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAC;IAC9C,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,kCAAkC,CAAC,GAAW;IAC5D,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7D,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC;YACtD,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;gBACpB,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC7D,IAAI,MAAM,CAAC,EAAE,CAAC;oBAAE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAC,0BAA0B,CAAC,CAAC;QACtC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,YAAY,CAAC,gBAAgB,EAAE;gBAC3C,YAAY;gBACZ,iBAAiB;gBACjB,UAAU;gBACV,4DAA4D,GAAG,MAAM;sBACnE,qDAAqD;aACxD,EAAE;gBACD,QAAQ,EAAE,MAAM;gBAChB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;aACpC,CAAC,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,IAAI,SAAS,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,SAAS,CAAC;QAAC,CAAC;IAC/B,CAAC;IACD,MAAM,EAAE,GAAG,WAAW,EAAE,CAAC;IACzB,IAAI,CAAC,EAAE;QAAE,OAAO,SAAS,CAAC;IAC1B,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;YACnE,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,GAAG,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,EAAE;SAC1C,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,IAAI,SAAS,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,SAAS,CAAC;IAAC,CAAC;AAC/B,CAAC"}

package/dist/core/raw-command-writer.d.ts

@@ -0,0 +1,34 @@
+/** Minimal write surface shared by PTY/session backends for literal slash
+ * commands. Historical backends return void on success; guarded backends
+ * return false when the target pane/process is already unavailable. */
+export interface RawCommandWriter {
+    write(data: string): void | boolean;
+    sendText?: (text: string) => void | boolean;
+    sendSpecialKeys?: (...keys: string[]) => void | boolean;
+}
+export interface RawCommandWriteOptions {
+    coco?: boolean;
+    cocoThrottleMs?: number;
+    submitBeatMs?: number;
+    delay?: (ms: number) => Promise<void>;
+}
+/** Type one literal input line and report whether both the text and submit
+ * writes were accepted by the backend. `undefined` remains legacy success;
+ * explicit false is a proven drop and must never produce an activation ACK. */
+export declare function writeRawCommandLine(backend: RawCommandWriter, content: string, opts?: RawCommandWriteOptions): Promise<boolean>;
+export interface RawCommandDeliveryFinalizer {
+    accepted: boolean;
+    durableActivation: boolean;
+    acknowledgeActivation: boolean;
+    hasFollowUp: boolean;
+    onAccepted: () => void;
+    onFollowUp: () => void;
+    onActivationAck: () => void;
+    onDurableFailure: () => void;
+}
+/** Apply the raw-input side effects at the acceptance boundary. A rejected
+ * text/Enter write can neither enqueue the follower nor ACK the durable head;
+ * it must retire the worker generation so daemon exit recovery keeps the exact
+ * journal routable. */
+export declare function finalizeRawCommandDelivery(args: RawCommandDeliveryFinalizer): boolean;
+//# sourceMappingURL=raw-command-writer.d.ts.map

package/dist/core/raw-command-writer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"raw-command-writer.d.ts","sourceRoot":"","sources":["../../src/core/raw-command-writer.ts"],"names":[],"mappings":"AAAA;;uEAEuE;AACvE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC;IAC5C,eAAe,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,GAAG,OAAO,CAAC;CACzD;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED;;+EAE+E;AAC/E,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC,OAAO,CAAC,CAyBlB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED;;;uBAGuB;AACvB,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CASrF"}

package/dist/core/raw-command-writer.js

@@ -0,0 +1,48 @@
+/** Type one literal input line and report whether both the text and submit
+ * writes were accepted by the backend. `undefined` remains legacy success;
+ * explicit false is a proven drop and must never produce an activation ACK. */
+export async function writeRawCommandLine(backend, content, opts = {}) {
+    const delay = opts.delay ?? (ms => new Promise(resolve => setTimeout(resolve, ms)));
+    const beatMs = opts.submitBeatMs ?? 200;
+    const sendText = backend.sendText?.bind(backend);
+    const sendSpecialKeys = backend.sendSpecialKeys?.bind(backend);
+    if (sendText && sendSpecialKeys) {
+        if (opts.coco) {
+            const cmd = content.trim();
+            const typed = cmd.includes(' ') ? cmd : `${cmd} `;
+            for (const ch of typed) {
+                if (sendText(ch) === false)
+                    return false;
+                await delay(opts.cocoThrottleMs ?? 40);
+            }
+            await delay(beatMs);
+            return sendSpecialKeys('Enter') !== false;
+        }
+        if (sendText(content) === false)
+            return false;
+        await delay(beatMs);
+        return sendSpecialKeys('Enter') !== false;
+    }
+    if (backend.write(content) === false)
+        return false;
+    await delay(beatMs);
+    return backend.write('\r') !== false;
+}
+/** Apply the raw-input side effects at the acceptance boundary. A rejected
+ * text/Enter write can neither enqueue the follower nor ACK the durable head;
+ * it must retire the worker generation so daemon exit recovery keeps the exact
+ * journal routable. */
+export function finalizeRawCommandDelivery(args) {
+    if (!args.accepted) {
+        if (args.durableActivation)
+            args.onDurableFailure();
+        return false;
+    }
+    args.onAccepted();
+    if (args.hasFollowUp)
+        args.onFollowUp();
+    if (args.acknowledgeActivation)
+        args.onActivationAck();
+    return true;
+}
+//# sourceMappingURL=raw-command-writer.js.map

package/dist/core/raw-command-writer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"raw-command-writer.js","sourceRoot":"","sources":["../../src/core/raw-command-writer.ts"],"names":[],"mappings":"AAgBA;;+EAE+E;AAC/E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAyB,EACzB,OAAe,EACf,OAA+B,EAAE;IAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,IAAI,GAAG,CAAC;IACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAE/D,IAAI,QAAQ,IAAI,eAAe,EAAE,CAAC;QAChC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC;YAClD,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;gBACvB,IAAI,QAAQ,CAAC,EAAE,CAAC,KAAK,KAAK;oBAAE,OAAO,KAAK,CAAC;gBACzC,MAAM,KAAK,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;YACzC,CAAC;YACD,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;YACpB,OAAO,eAAe,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC;QAC5C,CAAC;QACD,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC;QAC9C,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;QACpB,OAAO,eAAe,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC;IAC5C,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IACnD,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC;AACvC,CAAC;AAaD;;;uBAGuB;AACvB,MAAM,UAAU,0BAA0B,CAAC,IAAiC;IAC1E,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,iBAAiB;YAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,UAAU,EAAE,CAAC;IAClB,IAAI,IAAI,CAAC,WAAW;QAAE,IAAI,CAAC,UAAU,EAAE,CAAC;IACxC,IAAI,IAAI,CAAC,qBAAqB;QAAE,IAAI,CAAC,eAAe,EAAE,CAAC;IACvD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/core/reply-target.d.ts

@@ -1,5 +1,31 @@
 import type { DaemonSession } from './types.js';
-import type { Session } from '../types.js';
+import type { FrozenSessionReplyContext, LarkMention, ReplyTargetEntry, Session, TurnParticipant } from '../types.js';
+/** Merge participants by open_id, keeping the richest label (a later entry can
+ *  fill a missing name / promote isBot). Order-stable on first appearance so a
+ *  candidate list reads in arrival order. */
+export declare function dedupeParticipants(list: TurnParticipant[]): TurnParticipant[];
+/** Pure core of a message's turn-window contribution (daemon wraps it with live
+ *  deps). Its sender plus everyone it @-mentioned, excluding the answering bot
+ *  (by `selfOpenId` OR `selfAppId` — a self @ often arrives in app_id form, so
+ *  open_id alone would miss it and wrongly mark a plain 1v1 incomplete).
+ *  `participants` holds ONLY executable receiver-scoped open_id candidates (so
+ *  `botmux send` can hand them back as `--mention <open_id>`), each labelled bot
+ *  (`isMentionBot` proves a known peer, or sender is a platform-stamped bot) /
+ *  unknown (NOT provably human — `isMentionBot=false` does not prove a person; a
+ *  third-party bot isn't in the cross-ref). Returns `incomplete: true` when a
+ *  real, NON-self @-mention could not be reduced to a usable open_id (app_id /
+ *  user_id / union_id form — parser leaves `openId` undefined): that counterpart
+ *  is NOT listed as a candidate but forces the window ambiguous so the gate
+ *  demands an explicit decision rather than risk a wrong single-target @. Sender
+ *  name is best-effort — omitted when unknown. */
+export declare function buildTurnParticipantsFrom(sender: {
+    openId?: string;
+    isBot?: boolean;
+    name?: string;
+}, mentions: LarkMention[] | undefined, selfOpenId: string | undefined, isMentionBot: (openId: string) => boolean, selfAppId?: string): {
+    participants: TurnParticipant[];
+    incomplete: boolean;
+};
 export type SessionReplyTarget = {
     mode: 'plain';
     chatId: string;
@@ -10,28 +36,32 @@ export type SessionReplyTarget = {
     mode: 'quote';
     rootMessageId: string;
 };
-/** Per-turn reply-target entry persisted in `Session.replyTargets` (keyed by
- *  turnId, so the key is not repeated inside the value). */
-export interface ReplyTargetEntry {
-    rootMessageId: string;
-    updatedAt: string;
-    quoteOnly?: boolean;
-    substitute?: boolean;
-}
-/** The reply target for a SPECIFIC turn: exact per-turn entry first, then the
- *  single-slot currentReplyTarget (which only remembers the latest turn — with
- *  queued/concurrent turns an earlier turn would otherwise lose its anchor). */
-export declare function pickTurnReplyTarget(s: Pick<Session, 'replyTargets' | 'currentReplyTarget'>, currentTurnId: string | undefined): {
-    rootMessageId: string;
+/** Bound on `Session.replyTargets`: long-lived sessions could otherwise grow
+ * without limit. An evicted turn may use a legacy slot only when its turnId
+ * still matches exactly; it never borrows a later turn's sender. */
+export declare const REPLY_TARGETS_MAX = 32;
+/** Prune `targets` down to REPLY_TARGETS_MAX oldest-first, IN PLACE, and return
+ *  the new prune high-water mark = max(existing watermark, latest `updatedAt`
+ *  among the entries actually evicted). Both replyTargets writers
+ *  (beginReplyTargetTurn + trigger-final-suppression's inheritTriggerReplyAnchor)
+ *  MUST route eviction through here so a pruned sibling can never silently
+ *  under-count a turn's participant window — `botmux send` compares the returned
+ *  watermark against the turn window to decide incompleteness. */
+export declare function pruneReplyTargets(targets: Record<string, ReplyTargetEntry>, prevPrunedThrough: string | undefined): string | undefined;
+export interface TurnReplyTarget extends Omit<ReplyTargetEntry, 'updatedAt'> {
     turnId: string;
-    quoteOnly?: boolean;
-    substitute?: boolean;
-} | undefined;
-/** Whether `turnId` is a substitute (avatar-style) turn. With no turn context,
- *  falls back to the latest-accepted turn's flag — callers that have a turnId
- *  (screen updates, turn reactions) get an exact per-turn answer so a queued
- *  normal turn doesn't inherit a substitute turn's card-off (or vice versa). */
-export declare function isSubstituteTurn(ds: Pick<DaemonSession, 'session' | 'currentReplyTarget'>, turnId?: string): boolean;
+    updatedAt?: string;
+}
+/** Reply context for one exact turn. The per-turn entry is authoritative. Old
+ * persisted sessions may fall back to the single slots only when those slots
+ * explicitly identify the requested turn. */
+export declare function pickTurnReplyTarget(s: Pick<Session, 'replyTargets' | 'currentReplyTarget' | 'quoteTargetId' | 'quoteTargetSenderOpenId'>, currentTurnId: string | undefined): TurnReplyTarget | undefined;
+/** Whether `turnId` is a chat-scope substitute turn that disables the
+ * streaming card. Thread-scope substitute turns keep their normal card. With
+ * no turn context, falls back to the latest-accepted chat turn's flag; callers
+ * with a turnId get an exact per-turn answer so queued normal/substitute turns
+ * cannot inherit each other's card state. */
+export declare function isSubstituteTurn(ds: Pick<DaemonSession, 'scope' | 'session' | 'currentReplyTarget'>, turnId?: string): boolean;
 export declare function resolveSessionReplyTarget(ds: Pick<DaemonSession, 'scope' | 'chatId' | 'session' | 'currentReplyTarget'>, turnId?: string): SessionReplyTarget;
 export declare function resolveSendTarget(opts: {
     into?: string;
@@ -47,7 +77,40 @@ export declare function resolveSendTarget(opts: {
 export declare function beginReplyTargetTurn(ds: DaemonSession, replyRootId: string | undefined, turnId: string, nowIso?: string, opts?: {
     quoteOnly?: boolean;
     substitute?: boolean;
+    senderOpenId?: string;
+    participants?: TurnParticipant[];
+    participantsIncomplete?: boolean;
 }): void;
+/** Resolve a turn's immutable inbound destination, falling back only for
+ * legacy/non-Lark turns that predate the bounded registry. */
+export declare function frozenReplyContextForTurn(ds: Pick<DaemonSession, 'scope' | 'chatId' | 'session' | 'currentReplyTarget'>, turnId?: string): FrozenSessionReplyContext;
+/** Window within which sibling turn records are treated as the SAME turn for
+ *  --mention-back ambiguity. Type-ahead follow-ups each land as their own
+ *  per-turn record (distinct message_id), and the model may resolve
+ *  BOTMUX_TURN_ID to whichever was processed last — so `botmux send` unions the
+ *  participants of every record updated within this window of the resolved
+ *  turn. Deliberate conservative approximation: uncertainty (an incomplete
+ *  window, a pruned sibling, no window at all) fails toward explicit addressing,
+ *  and erring wide can only over-suggest an explicit --mention, never wrongly
+ *  auto-@ the wrong single counterpart. 90s comfortably spans a busy CLI batch
+ *  while not bleeding into an unrelated later conversation. */
+export declare const TURN_WINDOW_MS = 90000;
+export interface TurnWindow {
+    /** Executable receiver-scoped open_id candidates in the window (deduped). */
+    participants: TurnParticipant[];
+    /** True when the set may be UNDER-counted — a non-open_id @ we couldn't
+     *  resolve, a window-relevant sibling pruned by the bounded map, or the turn
+     *  window itself is unknown. Callers must fail toward an explicit --mention. */
+    incomplete: boolean;
+}
+/** The turn-window counterpart set for `currentTurnId`: the resolved turn's own
+ *  participants unioned with those of any sibling turn record updated within
+ *  TURN_WINDOW_MS (covers type-ahead follow-ups that folded into this model
+ *  turn under different message_ids). `incomplete` is set when the set can't be
+ *  proven complete — no anchor, a window record self-marked incomplete
+ *  (unresolved @), or the prune watermark reaches into the window (a pruned
+ *  sibling may have carried an unseen counterpart). */
+export declare function collectTurnWindowParticipants(s: Pick<Session, 'replyTargets' | 'replyTargetsPrunedThrough'>, currentTurnId: string | undefined): TurnWindow;
 /**
  * Effective turnId for a daemon-side message. Callers that know their turn
  * (worker final_output, placeholder cards) pass it explicitly and the

package/dist/core/reply-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reply-target.d.ts","sourceRoot":"","sources":["../../src/core/reply-target.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7C;4DAC4D;AAC5D,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AASD;;gFAEgF;AAChF,wBAAgB,mBAAmB,CACjC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,oBAAoB,CAAC,EACvD,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAQlG;AAED;;;gFAGgF;AAChF,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,oBAAoB,CAAC,EACzD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAYT;AAED,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,oBAAoB,CAAC,EAC9E,MAAM,CAAC,EAAE,MAAM,GACd,kBAAkB,CAmBpB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GAAG,kBAAkB,CAYrB;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,aAAa,EACjB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,SAA2B,EACjC,IAAI,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACnD,IAAI,CA+BN;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,oBAAoB,CAAC,EACzD,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,MAAM,GAAG,SAAS,CAEpB;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAIzE"}
+{"version":3,"file":"reply-target.d.ts","sourceRoot":"","sources":["../../src/core/reply-target.ts"],"names":[],"mappings":"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"}