@boxes-dev/dvb 1.0.60 → 1.0.61

package/dist/bin/dvbd.cjs

@@ -88607,8 +88607,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.60";
-      const rawGitSha = "5d6099c6753665655e7ad622e1aa388d91ea0bf7";
+      const rawPackageVersion = "1.0.61";
+      const rawGitSha = "ef3417e1e95b9ccc6114ef7c44fa645a1704b688";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120525,9 +120525,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.60";
-      const rawGitSha = "5d6099c6753665655e7ad622e1aa388d91ea0bf7";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.60+5d6099c6753665655e7ad622e1aa388d91ea0bf7";
+      const rawPackageVersion = "1.0.61";
+      const rawGitSha = "ef3417e1e95b9ccc6114ef7c44fa645a1704b688";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.61+ef3417e1e95b9ccc6114ef7c44fa645a1704b688";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;

package/dist/devbox/commands/connect.d.ts

@@ -28,6 +28,8 @@ export declare const resolveSessionSpecifierFromExplicitTarget: ({ sessionName,
     availableSessions: SessionSpecifierRecord[];
 }) => SessionSpecifierResolution;
 export declare const isAttachReplacedCloseCode: (closeCode?: number) => closeCode is 1012;
+type ConnectPhase = "connecting" | "reconnecting" | "attached";
+export declare const shouldCancelConnectOnSigint: (phase: ConnectPhase) => phase is "connecting" | "reconnecting";
 export declare const runConnect: (args: string[], overrides?: ConnectOverrides) => Promise<void>;
 export {};
 //# sourceMappingURL=connect.d.ts.map

package/dist/devbox/commands/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/devbox/commands/connect.ts"],"names":[],"mappings":"AAuDA,KAAK,gBAAgB,GAAG;IACtB,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,mGAMrC;IACD,yBAAyB,EAAE,OAAO,CAAC;IACnC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,uBAAuB,EAAE,OAAO,CAAC;CAClC,KAAG,MAAM,GAAG,SAKZ,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,oEAI3C;IACD,yBAAyB,EAAE,OAAO,CAAC;IACnC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,uBAAuB,EAAE,OAAO,CAAC;CAClC,YAC4E,CAAC;AAE9E,eAAO,MAAM,yCAAyC,GAAI,qCAGvD;IACD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,sBAAsB,EAAE,CAAC;CAC7C,KAAG,0BAYH,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,YAAY,MAAM,sBACxC,CAAC;AAukCrB,eAAO,MAAM,UAAU,GACrB,MAAM,MAAM,EAAE,EACd,YAAY,gBAAgB,kBAy4B7B,CAAC"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/devbox/commands/connect.ts"],"names":[],"mappings":"AAuDA,KAAK,gBAAgB,GAAG;IACtB,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,mGAMrC;IACD,yBAAyB,EAAE,OAAO,CAAC;IACnC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,uBAAuB,EAAE,OAAO,CAAC;CAClC,KAAG,MAAM,GAAG,SAKZ,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,oEAI3C;IACD,yBAAyB,EAAE,OAAO,CAAC;IACnC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,uBAAuB,EAAE,OAAO,CAAC;CAClC,YAC4E,CAAC;AAE9E,eAAO,MAAM,yCAAyC,GAAI,qCAGvD;IACD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,sBAAsB,EAAE,CAAC;CAC7C,KAAG,0BAYH,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,YAAY,MAAM,sBACxC,CAAC;AAErB,KAAK,YAAY,GAAG,YAAY,GAAG,cAAc,GAAG,UAAU,CAAC;AAE/D,eAAO,MAAM,2BAA2B,GAAI,OAAO,YAAY,2CACzC,CAAC;AAimCvB,eAAO,MAAM,UAAU,GACrB,MAAM,MAAM,EAAE,EACd,YAAY,gBAAgB,kBAy8B7B,CAAC"}

package/dist/devbox/commands/connect.js

@@ -40,6 +40,7 @@ export const resolveSessionSpecifierFromExplicitTarget = ({ sessionName, availab
     return { sessionName: undefined, sessionIdOverride: match.id };
 };
 export const isAttachReplacedCloseCode = (closeCode) => closeCode === 1012;
+export const shouldCancelConnectOnSigint = (phase) => phase !== "attached";
 const DEFAULT_TTY_COLS = 80;
 const DEFAULT_TTY_ROWS = 24;
 const DEFAULT_MODAL_APP_NAME = "sandbox-modal-smoke";
@@ -559,6 +560,7 @@ const promptRenameSession = async (current) => {
 const HEARTBEAT_INTERVAL_MS = 4000;
 const HEARTBEAT_TIMEOUT_MS = 8000;
 const INPUT_PROBE_TIMEOUT_MS = 1000;
+const CONNECT_OPEN_TIMEOUT_MS = 20_000;
 const WS_OPEN_STATE = 1;
 const streamExecSession = async (ws, options) => new Promise((resolve, reject) => {
     let exitCode = null;
@@ -571,6 +573,7 @@ const streamExecSession = async (ws, options) => new Promise((resolve, reject) =
     let lastSeenAt = Date.now();
     let heartbeatTimer = null;
     let inputProbeTimer = null;
+    let openTimer = null;
     let inputProbeStamp = 0;
     let disconnectNoted = false;
     let errorMessage;
@@ -823,6 +826,12 @@ const streamExecSession = async (ws, options) => new Promise((resolve, reject) =
             inputProbeTimer = null;
         }
     };
+    const stopOpenTimer = () => {
+        if (openTimer) {
+            clearTimeout(openTimer);
+            openTimer = null;
+        }
+    };
     const onPong = () => {
         markAlive();
         latency?.notePong();
@@ -927,6 +936,7 @@ const streamExecSession = async (ws, options) => new Promise((resolve, reject) =
         ws.removeEventListener("error", onError);
         ws.removeEventListener("open", onOpen);
         stopInputProbe();
+        stopOpenTimer();
         stopHeartbeat();
         stopInput();
     };
@@ -980,6 +990,7 @@ const streamExecSession = async (ws, options) => new Promise((resolve, reject) =
         resolve(result);
     };
     const onOpen = () => {
+        stopOpenTimer();
         opened = true;
         markAlive();
         latency?.noteConnectOpen();
@@ -994,6 +1005,19 @@ const streamExecSession = async (ws, options) => new Promise((resolve, reject) =
     ws.addEventListener("error", onError);
     ws.addEventListener("open", onOpen);
     sendResize();
+    const openTimeoutMs = options.openTimeoutMs ?? CONNECT_OPEN_TIMEOUT_MS;
+    if (openTimeoutMs > 0) {
+        openTimer = setTimeout(() => {
+            if (resolved || opened)
+                return;
+            noteDisconnect();
+            forceClose();
+            onError({
+                data: new Error(`Timed out waiting for session connection after ${openTimeoutMs}ms.`),
+            });
+        }, openTimeoutMs);
+        openTimer.unref();
+    }
 });
 export const runConnect = async (args, overrides) => {
     const parsed = parseConnectArgs(args);
@@ -1532,6 +1556,11 @@ export const runConnect = async (args, overrides) => {
             let retryDelayMs = 250;
             let printedSessionInfo = false;
             let sawOutput = false;
+            let connectPhase = "connecting";
+            let activeSocket = null;
+            let localCancelRequested = false;
+            let attemptedAttach = false;
+            let sigintListenerInstalled = false;
             const printSessionInfo = (message) => {
                 if (process.stderr.isTTY && process.stdout.isTTY) {
                     process.stderr.write(`\u001b7\r\n${message}\r\n\u001b8`);
@@ -1559,217 +1588,278 @@ export const runConnect = async (args, overrides) => {
                     status.stop();
                 }
             };
-            while (true) {
+            const onSigint = () => {
+                localCancelRequested = true;
+                if (!activeSocket)
+                    return;
                 try {
-                    await refreshSessionMapping();
+                    activeSocket.terminate?.();
                 }
-                catch (error) {
-                    logger.warn("session_refresh_failed", { error: String(error) });
+                catch {
+                    // ignore terminate failures
                 }
-                if (explicitName &&
-                    sessionName &&
-                    !sessionId &&
-                    !confirmedCreateExplicit) {
-                    pauseStatus();
-                    const confirmed = await confirmNewSession(sessionName);
-                    if (!confirmed) {
-                        throw new Error(`Session "${sessionName}" not created.`);
-                    }
-                    confirmedCreateExplicit = true;
+                try {
+                    activeSocket.close();
                 }
-                let createdNew = false;
-                let mappingWrite = null;
-                latency?.noteConnectStart();
-                const canAttach = shouldAttachToExistingSession({
-                    supportsAttachExecSession,
-                    sessionId,
-                    requireFreshSessionOpen,
-                });
-                stage(canAttach ? "Attaching to session" : "Opening session");
-                let ws;
-                if (canAttach) {
-                    if (!sessionId) {
-                        throw new Error("Missing session id for attach.");
-                    }
-                    ws = client.attachExecSession(spriteAlias, sessionId);
+                catch {
+                    // ignore close failures
                 }
-                else {
-                    createdNew = true;
-                    ws = client.openExecSession(spriteAlias, {
-                        cmd: execCommand,
-                        tty: isTty,
-                        stdin: openStdin,
-                        ...(ttySize ? { cols: ttySize.cols, rows: ttySize.rows } : {}),
-                        ...(modalSessionLogPath ? { logPath: modalSessionLogPath } : {}),
-                    });
+            };
+            const setConnectPhase = (phase) => {
+                connectPhase = phase;
+                const shouldInstallListener = shouldReconnect && shouldCancelConnectOnSigint(connectPhase);
+                if (shouldInstallListener && !sigintListenerInstalled) {
+                    process.on("SIGINT", onSigint);
+                    sigintListenerInstalled = true;
+                    return;
                 }
-                const shouldSendInitialInput = createdNew && Boolean(pendingInitialInput);
-                const initialInputToSend = shouldSendInitialInput
-                    ? pendingInitialInput
-                    : undefined;
-                const result = await streamExecSession(ws, {
-                    tty: isTty,
-                    stdin: localStdin,
-                    supportsResizeControlMessages,
-                    ...(latency ? { latency } : {}),
-                    onOutput: noteOutput,
-                    onOutputChunk: (chunk) => {
-                        sessionLogSink?.write(chunk);
-                    },
-                    onInputChunk: (chunk) => {
-                        sessionLogSink?.write(chunk);
-                    },
-                    onOpen: () => {
-                        if (shouldSendInitialInput) {
-                            pendingInitialInput = undefined;
-                        }
-                        if (sessionId) {
-                            reportSessionInfo(sessionId);
+                if (!shouldInstallListener && sigintListenerInstalled) {
+                    process.removeListener("SIGINT", onSigint);
+                    sigintListenerInstalled = false;
+                }
+            };
+            setConnectPhase("connecting");
+            try {
+                while (true) {
+                    if (localCancelRequested) {
+                        process.exitCode = 130;
+                        break;
+                    }
+                    setConnectPhase(attemptedAttach ? "reconnecting" : "connecting");
+                    attemptedAttach = true;
+                    try {
+                        await refreshSessionMapping();
+                    }
+                    catch (error) {
+                        logger.warn("session_refresh_failed", { error: String(error) });
+                    }
+                    if (explicitName &&
+                        sessionName &&
+                        !sessionId &&
+                        !confirmedCreateExplicit) {
+                        pauseStatus();
+                        const confirmed = await confirmNewSession(sessionName);
+                        if (!confirmed) {
+                            throw new Error(`Session "${sessionName}" not created.`);
                         }
-                    },
-                    ...(initialInputToSend ? { initialInput: initialInputToSend } : {}),
-                    onSessionInfo: (id) => {
-                        if (supportsAttachExecSession) {
-                            if (createdNew) {
-                                requireFreshSessionOpen = false;
-                            }
-                            sessionId = sessionId ?? id;
+                        confirmedCreateExplicit = true;
+                    }
+                    let createdNew = false;
+                    let mappingWrite = null;
+                    latency?.noteConnectStart();
+                    const canAttach = shouldAttachToExistingSession({
+                        supportsAttachExecSession,
+                        sessionId,
+                        requireFreshSessionOpen,
+                    });
+                    stage(canAttach ? "Attaching to session" : "Opening session");
+                    let ws;
+                    if (canAttach) {
+                        if (!sessionId) {
+                            throw new Error("Missing session id for attach.");
                         }
-                        if (sessionName && createdNew) {
-                            if (autoNamed) {
-                                mappingWrite = finalizeAutoSession(id);
-                                if (mappingWrite) {
-                                    mappingWrite
-                                        .then(() => {
-                                        reportSessionInfo(id);
-                                    })
-                                        .catch((error) => {
-                                        logger.warn("session_auto_rename_failed", {
-                                            error: String(error),
-                                        });
+                        ws = client.attachExecSession(spriteAlias, sessionId);
+                    }
+                    else {
+                        createdNew = true;
+                        ws = client.openExecSession(spriteAlias, {
+                            cmd: execCommand,
+                            tty: isTty,
+                            stdin: openStdin,
+                            ...(ttySize ? { cols: ttySize.cols, rows: ttySize.rows } : {}),
+                            ...(modalSessionLogPath ? { logPath: modalSessionLogPath } : {}),
+                        });
+                    }
+                    activeSocket = ws;
+                    const shouldSendInitialInput = createdNew && Boolean(pendingInitialInput);
+                    const initialInputToSend = shouldSendInitialInput
+                        ? pendingInitialInput
+                        : undefined;
+                    let result;
+                    try {
+                        result = await streamExecSession(ws, {
+                            tty: isTty,
+                            stdin: localStdin,
+                            supportsResizeControlMessages,
+                            ...(latency ? { latency } : {}),
+                            openTimeoutMs: CONNECT_OPEN_TIMEOUT_MS,
+                            onOutput: noteOutput,
+                            onOutputChunk: (chunk) => {
+                                sessionLogSink?.write(chunk);
+                            },
+                            onInputChunk: (chunk) => {
+                                sessionLogSink?.write(chunk);
+                            },
+                            onOpen: () => {
+                                setConnectPhase("attached");
+                                if (shouldSendInitialInput) {
+                                    pendingInitialInput = undefined;
+                                }
+                                if (sessionId) {
+                                    reportSessionInfo(sessionId);
+                                }
+                            },
+                            ...(initialInputToSend
+                                ? { initialInput: initialInputToSend }
+                                : {}),
+                            onSessionInfo: (id) => {
+                                if (supportsAttachExecSession) {
+                                    if (createdNew) {
+                                        requireFreshSessionOpen = false;
+                                    }
+                                    sessionId = sessionId ?? id;
+                                }
+                                if (sessionName && createdNew) {
+                                    if (autoNamed) {
+                                        mappingWrite = finalizeAutoSession(id);
+                                        if (mappingWrite) {
+                                            mappingWrite
+                                                .then(() => {
+                                                reportSessionInfo(id);
+                                            })
+                                                .catch((error) => {
+                                                logger.warn("session_auto_rename_failed", {
+                                                    error: String(error),
+                                                });
+                                                reportSessionInfo(id);
+                                            });
+                                        }
+                                        else {
+                                            reportSessionInfo(id);
+                                        }
+                                    }
+                                    else {
+                                        sessions[sessionName] = id;
+                                        mappingWrite = writeSpriteSessions(client, spriteAlias, sessions);
                                         reportSessionInfo(id);
-                                    });
+                                    }
                                 }
                                 else {
                                     reportSessionInfo(id);
                                 }
-                            }
-                            else {
-                                sessions[sessionName] = id;
-                                mappingWrite = writeSpriteSessions(client, spriteAlias, sessions);
-                                reportSessionInfo(id);
-                            }
-                        }
-                        else {
-                            reportSessionInfo(id);
-                        }
-                        if (isDetached) {
-                            ws.close();
-                        }
-                    },
-                    onPortEvent: notifyPortEvent,
-                    ...(shouldReconnect
-                        ? {
-                            onDisconnectNotice: () => {
-                                resetTerminalInputModes();
-                                if (!reconnectNoticeShown) {
-                                    console.error("Connection lost. Reconnecting... (Ctrl+C to cancel)");
-                                    reconnectNoticeShown = true;
+                                if (isDetached) {
+                                    ws.close();
                                 }
                             },
+                            onPortEvent: notifyPortEvent,
+                            ...(shouldReconnect
+                                ? {
+                                    onDisconnectNotice: () => {
+                                        setConnectPhase("reconnecting");
+                                        resetTerminalInputModes();
+                                        if (!reconnectNoticeShown) {
+                                            console.error("Connection lost. Reconnecting... (Ctrl+C to cancel)");
+                                            reconnectNoticeShown = true;
+                                        }
+                                    },
+                                }
+                                : {}),
+                        });
+                    }
+                    finally {
+                        activeSocket = null;
+                    }
+                    if (mappingWrite) {
+                        try {
+                            await mappingWrite;
+                        }
+                        catch (error) {
+                            logger.warn("session_write_failed", { error: String(error) });
                         }
-                        : {}),
-                });
-                if (mappingWrite) {
-                    try {
-                        await mappingWrite;
                     }
-                    catch (error) {
-                        logger.warn("session_write_failed", { error: String(error) });
+                    if (localCancelRequested) {
+                        process.exitCode = 130;
+                        break;
                     }
-                }
-                if (result.kind === "exit") {
-                    process.exitCode = result.code;
-                    break;
-                }
-                if (result.kind === "detach") {
-                    if (autoNamed && sessionName && sessionId) {
-                        const nextName = await promptRenameSession(sessionName);
-                        if (nextName && nextName !== sessionName) {
-                            try {
-                                await renameSessionMapping(sessionName, nextName, sessionId);
-                            }
-                            catch (error) {
-                                console.error(`Failed to rename session: ${error instanceof Error ? error.message : String(error)}`);
+                    if (result.kind === "exit") {
+                        process.exitCode = result.code;
+                        break;
+                    }
+                    if (result.kind === "detach") {
+                        if (autoNamed && sessionName && sessionId) {
+                            const nextName = await promptRenameSession(sessionName);
+                            if (nextName && nextName !== sessionName) {
+                                try {
+                                    await renameSessionMapping(sessionName, nextName, sessionId);
+                                }
+                                catch (error) {
+                                    console.error(`Failed to rename session: ${error instanceof Error ? error.message : String(error)}`);
+                                }
                             }
                         }
+                        process.exitCode = 0;
+                        break;
                     }
-                    process.exitCode = 0;
-                    break;
-                }
-                if (isDetached) {
-                    process.exitCode = 0;
-                    break;
-                }
-                if (isAttachReplacedCloseCode(result.closeCode)) {
-                    resetTerminalInputModes();
-                    console.error("Session attached from another client. Closing this window.");
-                    process.exitCode = 0;
-                    break;
-                }
-                if (!shouldReconnect) {
-                    if (result.errorMessage) {
-                        throw new Error(`Connection lost: ${result.errorMessage}`);
+                    if (isDetached) {
+                        process.exitCode = 0;
+                        break;
                     }
-                    throw new Error("Connection lost.");
-                }
-                resetTerminalInputModes();
-                if (!reconnectNoticeShown) {
-                    console.error("Connection lost. Reconnecting... (Ctrl+C to cancel)");
-                    reconnectNoticeShown = true;
-                }
-                if (sessionId && supportsAttachExecSession) {
-                    if (computeProvider === "modal" &&
-                        isSessionNotFoundError(result.errorMessage)) {
-                        if (sessionName) {
-                            delete sessions[sessionName];
-                            await writeSpriteSessions(client, spriteAlias, sessions);
+                    if (isAttachReplacedCloseCode(result.closeCode)) {
+                        resetTerminalInputModes();
+                        console.error("Session attached from another client. Closing this window.");
+                        process.exitCode = 0;
+                        break;
+                    }
+                    if (!shouldReconnect) {
+                        if (result.errorMessage) {
+                            throw new Error(`Connection lost: ${result.errorMessage}`);
                         }
-                        sessionId = undefined;
+                        throw new Error("Connection lost.");
                     }
-                    else if (computeProvider !== "modal" &&
-                        result.opened === false &&
-                        supportsListExecSessions) {
-                        try {
-                            const available = await client.listExecSessions(spriteAlias);
-                            const match = available.find((session) => session.id === sessionId);
-                            if (!match || match.tty === false) {
-                                if (sessionName) {
-                                    delete sessions[sessionName];
-                                    await writeSpriteSessions(client, spriteAlias, sessions);
-                                }
-                                sessionId = undefined;
+                    setConnectPhase("reconnecting");
+                    resetTerminalInputModes();
+                    if (!reconnectNoticeShown) {
+                        console.error("Connection lost. Reconnecting... (Ctrl+C to cancel)");
+                        reconnectNoticeShown = true;
+                    }
+                    if (sessionId && supportsAttachExecSession) {
+                        if (computeProvider === "modal" &&
+                            isSessionNotFoundError(result.errorMessage)) {
+                            if (sessionName) {
+                                delete sessions[sessionName];
+                                await writeSpriteSessions(client, spriteAlias, sessions);
                             }
+                            sessionId = undefined;
                         }
-                        catch (error) {
-                            logger.warn("session_lookup_failed", { error: String(error) });
+                        else if (computeProvider !== "modal" &&
+                            result.opened === false &&
+                            supportsListExecSessions) {
+                            try {
+                                const available = await client.listExecSessions(spriteAlias);
+                                const match = available.find((session) => session.id === sessionId);
+                                if (!match || match.tty === false) {
+                                    if (sessionName) {
+                                        delete sessions[sessionName];
+                                        await writeSpriteSessions(client, spriteAlias, sessions);
+                                    }
+                                    sessionId = undefined;
+                                }
+                            }
+                            catch (error) {
+                                logger.warn("session_lookup_failed", { error: String(error) });
+                            }
                         }
                     }
+                    const networkWait = await waitForNetworkOnline({
+                        targetHost: networkTargetHost,
+                        onStatus: stage,
+                        onNotice: (message) => console.error(message),
+                    });
+                    if (networkWait === "aborted" || localCancelRequested) {
+                        process.exitCode = 130;
+                        break;
+                    }
+                    if (networkWait === "waited") {
+                        retryDelayMs = 250;
+                    }
+                    await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
+                    retryDelayMs = Math.min(5000, Math.round(retryDelayMs * 1.6));
                 }
-                const networkWait = await waitForNetworkOnline({
-                    targetHost: networkTargetHost,
-                    onStatus: stage,
-                    onNotice: (message) => console.error(message),
-                });
-                if (networkWait === "aborted") {
-                    process.exitCode = 130;
-                    break;
-                }
-                if (networkWait === "waited") {
-                    retryDelayMs = 250;
+            }
+            finally {
+                if (sigintListenerInstalled) {
+                    process.removeListener("SIGINT", onSigint);
                 }
-                await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
-                retryDelayMs = Math.min(5000, Math.round(retryDelayMs * 1.6));
             }
         }
         finally {