botmux 3.11.0-canary.1 → 3.12.0

package/dist/.runtime-build-id

@@ -1 +1 @@
-90b8834b47c0304b4b6eab82833f1339dc9d4e5ec0d9c1fe75f335c83e338c91
+a63627355856e846a26be9f4935292c6302f4a68df15eebdd3467897f32a02ea

package/dist/adapters/backend/riff-backend.d.ts

@@ -1,4 +1,4 @@
-import type { SessionBackend, SpawnOpts } from './types.js';
+import type { SessionBackend, SessionDestroyResult, SessionShutdownDetachResult, SpawnOpts } from './types.js';
 /**
  * Mandatory setup commands run in the riff sandbox to ensure `botmux` is
  * available. These are ALWAYS sent to the riff API via `config.setupCommands`
@@ -173,6 +173,24 @@ export declare class RiffBackend implements SessionBackend {
     private cancelTimeoutMs;
     private createTimeoutMs;
     private destroyDeadlineMs;
+    /** Exact late/current task whose close cancellation failed. Retained across
+     * the prepare-close handshake so the daemon can persist a retry handle. */
+    private closeFailureTaskId;
+    private closeFailureError;
+    private closeLateTaskHandled;
+    private closePrepared;
+    private closeAttempt;
+    private destroyInFlight;
+    private cancelInFlight;
+    private abortInFlight;
+    /** Graceful daemon shutdown is a non-cancelling two-phase detach. It fences
+     * only writes arriving after prepare; writes already appended to writeChain
+     * still drain so a late child id can be durably handed to the daemon. */
+    private shutdownDetaching;
+    private shutdownDetachPrepared;
+    private shutdownDetachAttempt;
+    private shutdownDetachInFlight;
+    private shutdownDetachAbortInFlight;
     /** Serializes write() → createTask/followUp. Without this, a second message
      *  arriving before the first task-execute HTTP returns would see
      *  currentTaskId === null and create a duplicate task. */
@@ -191,12 +209,17 @@ export declare class RiffBackend implements SessionBackend {
     private resolveJwt;
     private readJwtFromBytecloudKeychain;
     spawn(_bin: string, _args: string[], _opts: SpawnOpts): void;
-    write(data: string): void;
+    write(data: string): boolean;
     resize(_cols: number, _rows: number): void;
     onData(cb: (data: string) => void): void;
     onExit(cb: (code: number | null, signal: string | null) => void): void;
     kill(): void;
-    destroySession(): Promise<void>;
+    destroySession(): Promise<SessionDestroyResult>;
+    abortDestroySession(): Promise<void>;
+    commitDestroySession(): void;
+    prepareShutdownDetach(): Promise<SessionShutdownDetachResult>;
+    abortShutdownDetach(): Promise<SessionShutdownDetachResult>;
+    commitShutdownDetach(): void;
     getChildPid(): number | null;
     captureCurrentScreen(): string;
     captureViewport(): string;
@@ -240,8 +263,8 @@ export declare class RiffBackend implements SessionBackend {
      * Post-await adoption gate for a freshly created/followed-up task id.
      * - closing（/close 竞态窗口）：这个 late task 已经没有会话可服务——立即取消
      *   （有界+一次重试），绝不 stream/登记，防远端 orphan；
-     * - killed（detach：重启/休眠）：登记 id 让 daemon 持久化血缘，但不 stream
-     *   （任务合法续跑，重启后 follow-up 接上）；
+     * - killed / shutdownDetaching（detach）：登记 id 让 daemon 持久化血缘，
+     *   但不 stream（任务合法续跑，重启后 follow-up 接上）；
      * - 正常：登记 + 由调用方启动 stream。
      */
     private adoptLateTask;
@@ -251,6 +274,7 @@ export declare class RiffBackend implements SessionBackend {
      *  with no UI left to clear it. */
     private buildRepos;
     private cancelTask;
+    private cancelTaskWithRetry;
     private streamTask;
     private handleSseEvent;
     /**

package/dist/adapters/backend/riff-backend.d.ts.map

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

package/dist/adapters/backend/riff-backend.js

@@ -250,6 +250,24 @@ export class RiffBackend {
     cancelTimeoutMs = 4_000;
     createTimeoutMs = 10_000;
     destroyDeadlineMs = 20_000;
+    /** Exact late/current task whose close cancellation failed. Retained across
+     * the prepare-close handshake so the daemon can persist a retry handle. */
+    closeFailureTaskId = null;
+    closeFailureError = null;
+    closeLateTaskHandled = false;
+    closePrepared = false;
+    closeAttempt = null;
+    destroyInFlight = null;
+    cancelInFlight = null;
+    abortInFlight = null;
+    /** Graceful daemon shutdown is a non-cancelling two-phase detach. It fences
+     * only writes arriving after prepare; writes already appended to writeChain
+     * still drain so a late child id can be durably handed to the daemon. */
+    shutdownDetaching = false;
+    shutdownDetachPrepared = false;
+    shutdownDetachAttempt = null;
+    shutdownDetachInFlight = null;
+    shutdownDetachAbortInFlight = null;
     /** Serializes write() → createTask/followUp. Without this, a second message
      *  arriving before the first task-execute HTTP returns would see
      *  currentTaskId === null and create a duplicate task. */
@@ -325,8 +343,16 @@ export class RiffBackend {
         // No actual process to spawn. Task creation happens on first write().
     }
     write(data) {
-        if (this.killed || this.closing)
-            return;
+        if (this.killed)
+            return false;
+        if (this.shutdownDetaching) {
+            logger.warn('[riff] write rejected while graceful shutdown detach is preparing/prepared');
+            return false;
+        }
+        if (this.closing) {
+            logger.warn('[riff] write rejected while explicit close is preparing/prepared');
+            return false;
+        }
         const { text, attachments } = this.extractAttachments(data);
         this.writeChain = this.writeChain
             .then(async () => {
@@ -348,6 +374,7 @@ export class RiffBackend {
             .catch((err) => {
             logger.warn(`[riff] queued write failed: ${err}`);
         });
+        return true;
     }
     resize(_cols, _rows) {
         // No terminal screen to resize.
@@ -372,7 +399,7 @@ export class RiffBackend {
         this.exitCb?.(0, null);
     }
     async destroySession() {
-        // /close（及 /restart 的替换路径）必须把远端任务真正取消掉——fire-and-forget
+        // /close 必须把远端任务真正取消掉——fire-and-forget
         // 在 worker 紧接 process.exit 时大概率发不出去，已关闭话题的远端 agent 会
         // 继续拿着注入的凭证发消息。有界 await + 一次重试，失败也明确留痕。
         //
@@ -380,11 +407,31 @@ export class RiffBackend {
         // currentTaskId 还是 null/旧值，直接 cancel 会漏掉 late task。先立 closing
         // 门（拒新写 + 令 in-flight 完成后自取消），再有界等 writeChain 沉降，最后
         // cancel 沉降后的 current task。
+        if (this.shutdownDetaching) {
+            return {
+                ok: false,
+                ...(this.currentTaskId ? { taskId: this.currentTaskId } : {}),
+                error: 'shutdown_detach_in_progress',
+            };
+        }
+        if (this.destroyInFlight)
+            return this.destroyInFlight;
+        if (this.closePrepared) {
+            return {
+                ok: true,
+                ...(this.currentTaskId ? { taskId: this.currentTaskId } : {}),
+            };
+        }
+        const attempt = Symbol('riff-close-prepare');
+        this.closeAttempt = attempt;
         this.closing = true;
+        this.closeFailureTaskId = null;
+        this.closeFailureError = null;
+        this.closeLateTaskHandled = false;
         // 预算层级（单调覆盖，无内层 race——writeChain 本身有界）：
         //   create/follow-up fetch 10s + late cancel 4s×2 = chain 最坏 18s
         //   own cancel 4s×2 = 8s（与 late 情形互斥：closing 分支不登记 current）
-        //   → destroySession 总 deadline 20s → worker close/restart race 22s
+        //   → destroySession 总 deadline 20s → worker close handshake 22s
         //   → daemon SIGTERM backstop 24s / SIGKILL 29s。
         // 对 writeChain 只整体 await：单独给它小窗口会在窗口边缘掐掉链内的
         // late cancel（create 于 t≈窗口末返回 → cancel 尚 pending → teardown 提前
@@ -394,25 +441,220 @@ export class RiffBackend {
                 await this.writeChain;
             }
             catch { /* writeChain never rejects (caught internally) */ }
-            if (this.currentTaskId && !this.taskDone) {
+            if (this.closeAttempt !== attempt) {
+                return {
+                    ok: false,
+                    ...(this.currentTaskId ? { taskId: this.currentTaskId } : {}),
+                    error: 'close_aborted',
+                };
+            }
+            if (this.closeFailureTaskId) {
+                return {
+                    ok: false,
+                    taskId: this.closeFailureTaskId,
+                    error: this.closeFailureError ?? 'late_task_cancel_failed',
+                };
+            }
+            // A task materialized while closing was already cancelled inside the
+            // writeChain. Do not then cancel its stale parent lineage as if it were
+            // still the active execution.
+            if (!this.closeLateTaskHandled && this.currentTaskId && !this.taskDone) {
                 const id = this.currentTaskId;
-                try {
-                    await this.cancelTask(id);
+                const cancelled = await this.cancelTaskWithRetry(id, 'close');
+                // abortDestroySession invalidates the exact attempt before waiting for
+                // an already-issued cancellation. A late successful HTTP response must
+                // not resurrect that aborted generation as a prepared close.
+                if (this.closeAttempt !== attempt || !this.closing) {
+                    return {
+                        ok: false,
+                        ...(this.currentTaskId ? { taskId: this.currentTaskId } : {}),
+                        error: 'close_aborted',
+                    };
+                }
+                if (cancelled) {
                     logger.info(`[riff] task ${id} cancelled on close`);
                 }
-                catch (err) {
-                    try {
-                        await this.cancelTask(id);
-                        logger.info(`[riff] task ${id} cancelled on close (retry)`);
-                    }
-                    catch (err2) {
-                        logger.warn(`[riff] task-cancel failed on close (task ${id} may keep running remotely): ${err2}`);
-                    }
+                else {
+                    return {
+                        ok: false,
+                        taskId: id,
+                        error: this.closeFailureError ?? 'task_cancel_failed',
+                    };
                 }
             }
+            if (this.closeAttempt !== attempt || !this.closing) {
+                return {
+                    ok: false,
+                    ...(this.currentTaskId ? { taskId: this.currentTaskId } : {}),
+                    error: 'close_aborted',
+                };
+            }
+            return {
+                ok: true,
+                ...(this.currentTaskId ? { taskId: this.currentTaskId } : {}),
+            };
         })();
-        await Promise.race([teardown, new Promise((r) => setTimeout(r, this.destroyDeadlineMs))]);
-        this.kill();
+        this.destroyInFlight = Promise.race([
+            teardown,
+            new Promise(resolve => setTimeout(() => resolve({
+                ok: false,
+                ...(this.closeFailureTaskId || this.currentTaskId
+                    ? { taskId: this.closeFailureTaskId ?? this.currentTaskId }
+                    : {}),
+                error: 'close_timeout',
+            }), this.destroyDeadlineMs)),
+        ]).then(async (result) => {
+            // Promise.race and the teardown continuation each add a microtask
+            // boundary. Revalidate the generation immediately before publishing the
+            // prepared bit so a concurrent abort can never be overwritten.
+            if (result.ok && (this.closeAttempt !== attempt || !this.closing)) {
+                result = {
+                    ok: false,
+                    ...(this.currentTaskId ? { taskId: this.currentTaskId } : {}),
+                    error: 'close_aborted',
+                };
+            }
+            if (result.ok) {
+                this.closePrepared = true;
+            }
+            else {
+                // A failed prepare is not a terminal close. Restore admission so the
+                // still-active durable owner can accept a follow-up or a close retry.
+                await this.abortDestroySession();
+            }
+            return result;
+        }).finally(() => {
+            this.destroyInFlight = null;
+        });
+        return this.destroyInFlight;
+    }
+    async abortDestroySession() {
+        if (this.killed)
+            return;
+        if (this.abortInFlight)
+            return this.abortInFlight;
+        this.closeAttempt = null;
+        this.closePrepared = false;
+        const pendingCancel = this.cancelInFlight;
+        this.abortInFlight = (async () => {
+            // A close timeout can win Promise.race after task-cancel was already
+            // issued. Reopening admission before that request settles lets a new
+            // follow-up race a late successful cancellation of its parent. Keep the
+            // backend fenced until the exact cancellation attempt reaches terminal.
+            if (pendingCancel) {
+                try {
+                    await pendingCancel;
+                }
+                catch { /* cancel helper returns boolean */ }
+            }
+            if (this.killed || this.closeAttempt !== null || this.closePrepared)
+                return;
+            this.closing = false;
+            this.closeFailureTaskId = null;
+            this.closeFailureError = null;
+            this.closeLateTaskHandled = false;
+            logger.info('[riff] explicit close aborted; write admission restored');
+        })().finally(() => {
+            this.abortInFlight = null;
+        });
+        return this.abortInFlight;
+    }
+    commitDestroySession() {
+        // The daemon has durably published the closed row. Keep admission fenced
+        // until the worker immediately detaches/exits.
+        this.closePrepared = false;
+        this.closeAttempt = null;
+        this.closing = true;
+    }
+    async prepareShutdownDetach() {
+        if (this.shutdownDetachInFlight)
+            return this.shutdownDetachInFlight;
+        if (this.shutdownDetachPrepared) {
+            return { ok: true, taskId: this.currentTaskId };
+        }
+        if (this.killed) {
+            return { ok: false, taskId: this.currentTaskId, error: 'backend_killed' };
+        }
+        if (this.closing || this.destroyInFlight || this.closePrepared) {
+            return { ok: false, taskId: this.currentTaskId, error: 'explicit_close_in_progress' };
+        }
+        const attempt = Symbol('riff-shutdown-detach');
+        this.shutdownDetachAttempt = attempt;
+        this.shutdownDetaching = true;
+        // Existing SSE delivery is presentation-only. Stop it now, but do not
+        // cancel the remote task. Any create/follow-up already accepted before the
+        // fence remains in writeChain and is allowed to materialize below.
+        this.abortController?.abort();
+        const drain = (async () => {
+            try {
+                await this.writeChain;
+            }
+            catch { /* writeChain catches its own failures */ }
+            if (this.killed || this.shutdownDetachAttempt !== attempt || !this.shutdownDetaching) {
+                return { ok: false, taskId: this.currentTaskId, error: 'shutdown_detach_aborted' };
+            }
+            if (this.closing || this.closePrepared) {
+                return { ok: false, taskId: this.currentTaskId, error: 'explicit_close_in_progress' };
+            }
+            this.shutdownDetachPrepared = true;
+            logger.info(`[riff] graceful shutdown detach prepared`
+                + `${this.currentTaskId ? ` (task ${this.currentTaskId})` : ' (no task lineage)'}`);
+            return { ok: true, taskId: this.currentTaskId };
+        })();
+        this.shutdownDetachInFlight = drain.finally(() => {
+            this.shutdownDetachInFlight = null;
+        });
+        return this.shutdownDetachInFlight;
+    }
+    async abortShutdownDetach() {
+        if (this.killed) {
+            return { ok: false, taskId: this.currentTaskId, error: 'backend_killed' };
+        }
+        if (this.shutdownDetachAbortInFlight)
+            return this.shutdownDetachAbortInFlight;
+        const pending = this.shutdownDetachInFlight;
+        const pendingCancel = this.cancelInFlight;
+        this.shutdownDetachAttempt = null;
+        this.shutdownDetachPrepared = false;
+        this.shutdownDetachAbortInFlight = (async () => {
+            // Normally shutdown detach never cancels a remote task. Still wait for
+            // any exact cancellation already issued by an overlapping explicit close
+            // before reopening admission, otherwise its late result could invalidate
+            // a newly accepted follow-up.
+            await Promise.all([
+                pending ? pending.catch(() => undefined) : Promise.resolve(),
+                pendingCancel ? pendingCancel.catch(() => false) : Promise.resolve(),
+            ]);
+            if (this.killed) {
+                return { ok: false, taskId: this.currentTaskId, error: 'backend_killed' };
+            }
+            if (this.closing || this.shutdownDetachAttempt !== null) {
+                return {
+                    ok: false,
+                    taskId: this.currentTaskId,
+                    error: this.closing ? 'explicit_close_in_progress' : 'new_shutdown_detach_in_progress',
+                };
+            }
+            this.shutdownDetaching = false;
+            // prepare stopped SSE before the persistence ACK. If shutdown is
+            // aborted, reconnect the exact current task so the still-live owner
+            // resumes normal output and completion tracking.
+            if (this.currentTaskId && !this.taskDone) {
+                this.reconnectAttempts = 0;
+                void this.streamTask(this.currentTaskId);
+            }
+            logger.info('[riff] graceful shutdown detach aborted; write admission restored');
+            return { ok: true, taskId: this.currentTaskId };
+        })().finally(() => {
+            this.shutdownDetachAbortInFlight = null;
+        });
+        return this.shutdownDetachAbortInFlight;
+    }
+    commitShutdownDetach() {
+        this.shutdownDetachPrepared = false;
+        this.shutdownDetachAttempt = null;
+        // Keep admission fenced until the worker exits immediately after commit.
+        this.shutdownDetaching = true;
     }
     getChildPid() {
         return null;
@@ -648,8 +890,8 @@ export class RiffBackend {
      * Post-await adoption gate for a freshly created/followed-up task id.
      * - closing（/close 竞态窗口）：这个 late task 已经没有会话可服务——立即取消
      *   （有界+一次重试），绝不 stream/登记，防远端 orphan；
-     * - killed（detach：重启/休眠）：登记 id 让 daemon 持久化血缘，但不 stream
-     *   （任务合法续跑，重启后 follow-up 接上）；
+     * - killed / shutdownDetaching（detach）：登记 id 让 daemon 持久化血缘，
+     *   但不 stream（任务合法续跑，重启后 follow-up 接上）；
      * - 正常：登记 + 由调用方启动 stream。
      */
     async adoptLateTask(taskId) {
@@ -657,22 +899,22 @@ export class RiffBackend {
             // 在 writeChain 内 await——destroySession 等 writeChain 沉降时就能把这次
             // 取消一起等到（void 触发会在 worker exit 时被掐断）。
             logger.info(`[riff] task ${taskId} created during close — cancelling late task`);
-            try {
-                await this.cancelTask(taskId);
-            }
-            catch {
-                try {
-                    await this.cancelTask(taskId);
-                }
-                catch (err) {
-                    logger.warn(`[riff] late-task cancel failed (task ${taskId} may keep running remotely): ${err}`);
-                }
-            }
+            this.closeLateTaskHandled = true;
+            // Preserve the exact newest lineage even when cancellation succeeds.
+            // If the daemon cannot durably commit the close and sends abort, the
+            // next follow-up must continue from this child rather than its stale
+            // parent. Publishing before the cancel also makes a failed cancel
+            // retryable by the daemon.
+            this.currentTaskId = taskId;
+            this.taskIdCb?.(taskId);
+            const cancelled = await this.cancelTaskWithRetry(taskId, 'late-task close');
+            if (!cancelled)
+                this.taskDone = false;
             return false;
         }
         this.currentTaskId = taskId;
         this.taskIdCb?.(taskId);
-        if (this.killed)
+        if (this.killed || this.shutdownDetaching)
             return false;
         return true;
     }
@@ -699,6 +941,35 @@ export class RiffBackend {
         if (!resp.ok)
             throw new Error(`task-cancel HTTP ${resp.status}`);
     }
+    async cancelTaskWithRetry(taskId, context) {
+        const operation = (async () => {
+            try {
+                await this.cancelTask(taskId);
+                return true;
+            }
+            catch {
+                try {
+                    await this.cancelTask(taskId);
+                    logger.info(`[riff] task ${taskId} cancelled on ${context} (retry)`);
+                    return true;
+                }
+                catch (err) {
+                    this.closeFailureTaskId = taskId;
+                    this.closeFailureError = err instanceof Error ? err.message : String(err);
+                    logger.warn(`[riff] ${context} cancel failed (task ${taskId} may keep running remotely): ${err}`);
+                    return false;
+                }
+            }
+        })();
+        this.cancelInFlight = operation;
+        try {
+            return await operation;
+        }
+        finally {
+            if (this.cancelInFlight === operation)
+                this.cancelInFlight = null;
+        }
+    }
     async streamTask(taskId) {
         const url = `${this.config.baseUrl}/api2/task-stream?id=${encodeURIComponent(taskId)}`;
         const headers = {};
@@ -885,9 +1156,18 @@ export class RiffBackend {
                     const kind = data['kind'];
                     const group = data['group']
                         ?? data['payload']?.['group'];
-                    // stdout logs are the real output stream — emit as data regardless of logLevel
+                    // stdout logs are the real output stream — emit as data regardless of logLevel.
+                    // riff stores each stdout log line BARE (no trailing newline): the runner's
+                    // logger persists `message` verbatim (Logger.createRootLog) and the SSE `log`
+                    // event carries it as `text` unchanged (taskLog.ts runnerLog*→text: log.message).
+                    // For codex_app_server that message is one `JSON.stringify(event)` per line. Since
+                    // emitText only NORMALIZES existing newlines and never adds a separator, emitting
+                    // the bare text would butt consecutive events together into one unreadable wall.
+                    // Re-add the per-line separator here (safe & non-duplicating precisely because the
+                    // stored line has no trailing newline). NOTE: the `output`/chunk path stays raw —
+                    // those chunks may be partial lines, so they must NOT get a synthetic newline.
                     if (group === 'stdout' && text) {
-                        this.emitText(text);
+                        this.emitText(`${text}\n`);
                     }
                     else if (this.config.logLevel === 'verbose' && text) {
                         this.emitLine(`[riff:${kind ?? 'log'}] ${text}`);