@boxes-dev/dvb 1.0.99 → 1.0.101

package/dist/bin/dvb.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 "use strict";
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c89c7337-d26d-5d0e-9378-e2535af1df44")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ff297307-c733-552d-a450-764919e5443b")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88688,8 +88688,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.99";
-      const rawGitSha = "6e1d4cbe7aabab2526d50776d8007a85d5800b43";
+      const rawPackageVersion = "1.0.101";
+      const rawGitSha = "c8b8a05e9a0277d607e90d7e79b10476b6854e54";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120679,9 +120679,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.99";
-      const rawGitSha = "6e1d4cbe7aabab2526d50776d8007a85d5800b43";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.99+6e1d4cbe7aabab2526d50776d8007a85d5800b43";
+      const rawPackageVersion = "1.0.101";
+      const rawGitSha = "c8b8a05e9a0277d607e90d7e79b10476b6854e54";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.101+c8b8a05e9a0277d607e90d7e79b10476b6854e54";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -144682,6 +144682,252 @@ var init_commandProvider = __esm({
   }
 });
 
+// src/devbox/commands/sessionUtils.ts
+var AUTO_SESSION_PREFIX, parseAutoSessionSuffix, getNextAutoSessionName, ensureUniqueAutoSessionName, shellQuote2, sanitizeSessionName, buildSessionLogPath, renameSessionLog;
+var init_sessionUtils = __esm({
+  "src/devbox/commands/sessionUtils.ts"() {
+    "use strict";
+    AUTO_SESSION_PREFIX = "new-session-";
+    parseAutoSessionSuffix = (name) => {
+      if (!name.startsWith(AUTO_SESSION_PREFIX)) return null;
+      const raw = name.slice(AUTO_SESSION_PREFIX.length);
+      const parsed = Number(raw);
+      if (!Number.isFinite(parsed) || parsed < 1) return null;
+      return Math.floor(parsed);
+    };
+    getNextAutoSessionName = (sessions) => {
+      let max = 0;
+      for (const name of Object.keys(sessions)) {
+        const suffix = parseAutoSessionSuffix(name);
+        if (suffix && suffix > max) max = suffix;
+      }
+      return `${AUTO_SESSION_PREFIX}${max + 1}`;
+    };
+    ensureUniqueAutoSessionName = (sessions, preferred, sessionId) => {
+      const start = parseAutoSessionSuffix(preferred) ?? 1;
+      let current = preferred;
+      let counter = start;
+      while (sessions[current] && sessions[current] !== sessionId) {
+        counter += 1;
+        current = `${AUTO_SESSION_PREFIX}${counter}`;
+      }
+      return current;
+    };
+    shellQuote2 = (value) => `'${value.replace(/'/g, `'\\''`)}'`;
+    sanitizeSessionName = (value) => {
+      const trimmed = value.trim();
+      const sanitized = trimmed.replace(/[^a-zA-Z0-9._-]/g, "_");
+      return sanitized || "session";
+    };
+    buildSessionLogPath = (name, remoteHome = "/home/sprite") => `${remoteHome}/.devbox/logs/${sanitizeSessionName(name)}.log`;
+    renameSessionLog = async (client2, box, fromName, toName, remoteHome = "/home/sprite") => {
+      const fromPath = buildSessionLogPath(fromName, remoteHome);
+      const toPath = buildSessionLogPath(toName, remoteHome);
+      if (fromPath === toPath) return;
+      await client2.exec(box, [
+        "/bin/bash",
+        "-lc",
+        `if [ -f ${shellQuote2(fromPath)} ]; then mv ${shellQuote2(fromPath)} ${shellQuote2(toPath)}; fi`
+      ]);
+    };
+  }
+});
+
+// src/devbox/commands/connectSessionMapping.ts
+var SESSION_NAME_TOKEN_KEY, decodeSessionNameToken, extractSessionNameFromCommand, readSessionMapSafe, initializeSessionMapState, refreshSessionMapState, finalizeAutoNamedSession, renameMappedSession;
+var init_connectSessionMapping = __esm({
+  "src/devbox/commands/connectSessionMapping.ts"() {
+    "use strict";
+    init_src();
+    init_sessionUtils();
+    SESSION_NAME_TOKEN_KEY = "DEVBOX_SESSION_NAME_B64";
+    decodeSessionNameToken = (value) => {
+      try {
+        const decoded = Buffer.from(value, "base64url").toString("utf8").trim();
+        return decoded.length > 0 ? decoded : null;
+      } catch {
+        return null;
+      }
+    };
+    extractSessionNameFromCommand = (command) => {
+      if (!command || command.length < 3) return null;
+      const script = command.slice(2).join(" ");
+      const patterns = [
+        new RegExp(`${SESSION_NAME_TOKEN_KEY}='([^']+)'`),
+        new RegExp(`${SESSION_NAME_TOKEN_KEY}="([^"]+)"`)
+      ];
+      for (const pattern of patterns) {
+        const match2 = script.match(pattern);
+        if (!match2?.[1]) continue;
+        const decoded = decodeSessionNameToken(match2[1]);
+        if (decoded) return decoded;
+      }
+      return null;
+    };
+    readSessionMapSafe = async ({
+      client: client2,
+      alias,
+      fallback: fallback2,
+      onWarn
+    }) => {
+      try {
+        return await readSpriteSessions(client2, alias);
+      } catch (error2) {
+        onWarn("sessions_read_failed", { error: String(error2) });
+        return fallback2;
+      }
+    };
+    initializeSessionMapState = async ({
+      client: client2,
+      alias,
+      sessionName,
+      autoNameRequested,
+      onWarn
+    }) => {
+      const sessions = sessionName || autoNameRequested ? await readSessionMapSafe({
+        client: client2,
+        alias,
+        fallback: {},
+        onWarn
+      }) : {};
+      const resolvedSessionName = !sessionName && autoNameRequested ? getNextAutoSessionName(sessions) : sessionName;
+      const autoNamed = !sessionName && Boolean(autoNameRequested);
+      return {
+        sessions,
+        sessionName: resolvedSessionName,
+        autoNamed,
+        requireFreshSessionOpen: autoNamed
+      };
+    };
+    refreshSessionMapState = async ({
+      client: client2,
+      alias,
+      computeProvider,
+      supportsAttachExecSession,
+      supportsListExecSessions,
+      sessionName,
+      sessionId,
+      sessions,
+      requireFreshSessionOpen,
+      explicitName,
+      onWarn
+    }) => {
+      if (!supportsAttachExecSession || !sessionName) {
+        return {
+          sessions,
+          sessionId,
+          confirmedCreateExplicit: Boolean(sessionId && explicitName)
+        };
+      }
+      const latest = await readSessionMapSafe({
+        client: client2,
+        alias,
+        fallback: sessions,
+        onWarn
+      });
+      if (requireFreshSessionOpen) {
+        return {
+          sessions: latest,
+          sessionId,
+          confirmedCreateExplicit: Boolean(sessionId && explicitName)
+        };
+      }
+      let resolvedSessionId = latest[sessionName];
+      if (!resolvedSessionId && computeProvider === "modal" && supportsListExecSessions) {
+        const available = await client2.listExecSessions(alias);
+        const matched = available.find(
+          (session) => session.tty !== false && extractSessionNameFromCommand(session.command) === sessionName
+        );
+        if (matched) {
+          resolvedSessionId = matched.id;
+          latest[sessionName] = matched.id;
+          await writeSpriteSessions(client2, alias, latest);
+        }
+      }
+      if (resolvedSessionId && supportsListExecSessions && computeProvider !== "modal") {
+        const available = await client2.listExecSessions(alias);
+        const match2 = available.find((session) => session.id === resolvedSessionId);
+        if (!match2 || match2.tty === false) {
+          delete latest[sessionName];
+          resolvedSessionId = void 0;
+          await writeSpriteSessions(client2, alias, latest);
+        }
+      }
+      return {
+        sessions: latest,
+        sessionId: resolvedSessionId,
+        confirmedCreateExplicit: Boolean(resolvedSessionId && explicitName)
+      };
+    };
+    finalizeAutoNamedSession = async ({
+      client: client2,
+      alias,
+      autoNamed,
+      sessionName,
+      sessionId,
+      sessions,
+      remoteHome,
+      onWarn
+    }) => {
+      if (!autoNamed || !sessionName) {
+        return { sessionName, sessions, renamed: false };
+      }
+      const latest = await readSessionMapSafe({
+        client: client2,
+        alias,
+        fallback: sessions,
+        onWarn
+      });
+      const uniqueName = ensureUniqueAutoSessionName(
+        latest,
+        sessionName,
+        sessionId
+      );
+      const renamed = uniqueName !== sessionName;
+      if (renamed) {
+        await renameSessionLog(client2, alias, sessionName, uniqueName, remoteHome);
+      }
+      latest[uniqueName] = sessionId;
+      await writeSpriteSessions(client2, alias, latest);
+      return { sessionName: uniqueName, sessions: latest, renamed };
+    };
+    renameMappedSession = async ({
+      client: client2,
+      alias,
+      fromName,
+      toName,
+      expectedId,
+      remoteHome,
+      sessions
+    }) => {
+      const latest = await readSessionMapSafe({
+        client: client2,
+        alias,
+        fallback: sessions,
+        onWarn: () => {
+        }
+      });
+      const currentId = latest[fromName];
+      if (!currentId) {
+        throw new Error(`Session "${fromName}" not found.`);
+      }
+      if (currentId !== expectedId) {
+        throw new Error(
+          `Session "${fromName}" no longer matches the active session.`
+        );
+      }
+      if (latest[toName] && latest[toName] !== expectedId) {
+        throw new Error(`Session "${toName}" already exists.`);
+      }
+      delete latest[fromName];
+      latest[toName] = expectedId;
+      await writeSpriteSessions(client2, alias, latest);
+      await renameSessionLog(client2, alias, fromName, toName, remoteHome);
+      return latest;
+    };
+  }
+});
+
 // ../../node_modules/nice-grpc-common/lib/Metadata.js
 var require_Metadata = __commonJS({
   "../../node_modules/nice-grpc-common/lib/Metadata.js"(exports2) {
@@ -199146,6 +199392,9 @@ var init_modalLifecycle = __esm({
       "-lc",
       [
         "set -u",
+        // PID 1 in Modal should ignore common termination signals so accidental
+        // `kill 1` does not terminate the sandbox.
+        "trap '' HUP INT QUIT TERM USR1 USR2 PIPE",
         `wrapper=${JSON.stringify(MODAL_DAEMON_WRAPPER_PATH)}`,
         'until [ -x "$wrapper" ]; do sleep 0.25; done',
         "while true; do",
@@ -201293,59 +201542,8 @@ var init_modalCommandContext = __esm({
   }
 });
 
-// src/devbox/commands/sessionUtils.ts
-var AUTO_SESSION_PREFIX, parseAutoSessionSuffix, getNextAutoSessionName, ensureUniqueAutoSessionName, shellQuote2, sanitizeSessionName, buildSessionLogPath, renameSessionLog;
-var init_sessionUtils = __esm({
-  "src/devbox/commands/sessionUtils.ts"() {
-    "use strict";
-    AUTO_SESSION_PREFIX = "new-session-";
-    parseAutoSessionSuffix = (name) => {
-      if (!name.startsWith(AUTO_SESSION_PREFIX)) return null;
-      const raw = name.slice(AUTO_SESSION_PREFIX.length);
-      const parsed = Number(raw);
-      if (!Number.isFinite(parsed) || parsed < 1) return null;
-      return Math.floor(parsed);
-    };
-    getNextAutoSessionName = (sessions) => {
-      let max = 0;
-      for (const name of Object.keys(sessions)) {
-        const suffix = parseAutoSessionSuffix(name);
-        if (suffix && suffix > max) max = suffix;
-      }
-      return `${AUTO_SESSION_PREFIX}${max + 1}`;
-    };
-    ensureUniqueAutoSessionName = (sessions, preferred, sessionId) => {
-      const start = parseAutoSessionSuffix(preferred) ?? 1;
-      let current = preferred;
-      let counter = start;
-      while (sessions[current] && sessions[current] !== sessionId) {
-        counter += 1;
-        current = `${AUTO_SESSION_PREFIX}${counter}`;
-      }
-      return current;
-    };
-    shellQuote2 = (value) => `'${value.replace(/'/g, `'\\''`)}'`;
-    sanitizeSessionName = (value) => {
-      const trimmed = value.trim();
-      const sanitized = trimmed.replace(/[^a-zA-Z0-9._-]/g, "_");
-      return sanitized || "session";
-    };
-    buildSessionLogPath = (name, remoteHome = "/home/sprite") => `${remoteHome}/.devbox/logs/${sanitizeSessionName(name)}.log`;
-    renameSessionLog = async (client2, box, fromName, toName, remoteHome = "/home/sprite") => {
-      const fromPath = buildSessionLogPath(fromName, remoteHome);
-      const toPath = buildSessionLogPath(toName, remoteHome);
-      if (fromPath === toPath) return;
-      await client2.exec(box, [
-        "/bin/bash",
-        "-lc",
-        `if [ -f ${shellQuote2(fromPath)} ]; then mv ${shellQuote2(fromPath)} ${shellQuote2(toPath)}; fi`
-      ]);
-    };
-  }
-});
-
 // src/devbox/commands/connect.ts
-var import_node_child_process4, import_node_crypto10, import_node_os9, import_node_path16, import_node_readline3, import_promises13, resolveInitialSessionId, shouldAttachToExistingSession, resolveSessionSpecifierFromExplicitTarget, isAttachReplacedCloseCode, shouldCancelConnectOnSigint, isRawCtrlCChunk, DEFAULT_TTY_COLS, DEFAULT_TTY_ROWS, TERMINAL_INPUT_MODE_RESET, resetTerminalInputModes, openBrowser2, warnSetupStatus, resolveTtyEnv, formatEnvExports, buildModalInteractiveCommand, parseEnvSize, readStreamSize, resolveTtySize, resolveSessionEnv, parseReachabilityState, runCommand, checkReachability, watchReachabilityWithScutil, watchReachabilityWithNotifyutil, waitForNetworkOnline, parseConnectArgs, parseConnectTarget, isSessionNotFoundError, SESSION_NAME_TOKEN_KEY, encodeSessionNameToken, decodeSessionNameToken, extractSessionNameFromCommand, SESSION_LOG_FLUSH_BYTES, SESSION_LOG_EOF_MARKER, createRemoteSessionLogSink, CONNECT_SHELL_CANDIDATES, resolveConnectShell, confirmNewSession, promptRenameSession, CONNECT_OPEN_TIMEOUT_MS2, runConnect;
+var import_node_child_process4, import_node_crypto10, import_node_os9, import_node_path16, import_node_readline3, import_promises13, resolveInitialSessionId, shouldAttachToExistingSession, resolveSessionSpecifierFromExplicitTarget, isAttachReplacedCloseCode, shouldCancelConnectOnSigint, isRawCtrlCChunk, DEFAULT_TTY_COLS, DEFAULT_TTY_ROWS, TERMINAL_INPUT_MODE_RESET, resetTerminalInputModes, openBrowser2, warnSetupStatus, resolveTtyEnv, formatEnvExports, buildModalInteractiveCommand, parseEnvSize, readStreamSize, resolveTtySize, resolveSessionEnv, parseReachabilityState, runCommand, checkReachability, watchReachabilityWithScutil, watchReachabilityWithNotifyutil, waitForNetworkOnline, parseConnectArgs, parseConnectTarget, isSessionNotFoundError, SESSION_NAME_TOKEN_KEY2, encodeSessionNameToken, SESSION_LOG_FLUSH_BYTES, SESSION_LOG_EOF_MARKER, createRemoteSessionLogSink, CONNECT_SHELL_CANDIDATES, resolveConnectShell, confirmNewSession, promptRenameSession, CONNECT_OPEN_TIMEOUT_MS2, runConnect;
 var init_connect2 = __esm({
   "src/devbox/commands/connect.ts"() {
     "use strict";
@@ -201366,6 +201564,7 @@ var init_connect2 = __esm({
     init_completions();
     init_boxSelect();
     init_commandProvider();
+    init_connectSessionMapping();
     init_providerClient();
     init_modalCommandContext();
     init_sessionUtils();
@@ -201474,10 +201673,7 @@ var init_connect2 = __esm({
       return env2;
     };
     formatEnvExports = (env2) => Object.entries(env2).map(([key, value]) => `export ${key}=${shellQuote2(value)}`).join("; ");
-    buildModalInteractiveCommand = ({ tty: tty2 }) => {
-      const nonCanonicalPrelude = tty2 ? "stty -icanon min 1 time 0 -echoctl; " : "";
-      return `${nonCanonicalPrelude}exec bash -il || exec sh -i`;
-    };
+    buildModalInteractiveCommand = () => "exec bash -il || exec sh -i";
     parseEnvSize = (value) => {
       if (!value) return void 0;
       const parsed = Number(value);
@@ -201507,7 +201703,7 @@ var init_connect2 = __esm({
       const env2 = {};
       if (terminalSessionId) env2.DEVBOX_TERM_SESSION_ID = terminalSessionId;
       if (sessionName) {
-        env2[SESSION_NAME_TOKEN_KEY] = encodeSessionNameToken(sessionName);
+        env2[SESSION_NAME_TOKEN_KEY2] = encodeSessionNameToken(sessionName);
       }
       return env2;
     };
@@ -201755,31 +201951,8 @@ var init_connect2 = __esm({
       const normalized = message.trim().toLowerCase();
       return normalized.includes("session") && normalized.includes("not found");
     };
-    SESSION_NAME_TOKEN_KEY = "DEVBOX_SESSION_NAME_B64";
+    SESSION_NAME_TOKEN_KEY2 = "DEVBOX_SESSION_NAME_B64";
     encodeSessionNameToken = (sessionName) => Buffer.from(sessionName, "utf8").toString("base64url");
-    decodeSessionNameToken = (value) => {
-      try {
-        const decoded = Buffer.from(value, "base64url").toString("utf8").trim();
-        return decoded.length > 0 ? decoded : null;
-      } catch {
-        return null;
-      }
-    };
-    extractSessionNameFromCommand = (command) => {
-      if (!command || command.length < 3) return null;
-      const script = command.slice(2).join(" ");
-      const patterns = [
-        new RegExp(`${SESSION_NAME_TOKEN_KEY}='([^']+)'`),
-        new RegExp(`${SESSION_NAME_TOKEN_KEY}="([^"]+)"`)
-      ];
-      for (const pattern of patterns) {
-        const match2 = script.match(pattern);
-        if (!match2?.[1]) continue;
-        const decoded = decodeSessionNameToken(match2[1]);
-        if (decoded) return decoded;
-      }
-      return null;
-    };
     SESSION_LOG_FLUSH_BYTES = 24 * 1024;
     SESSION_LOG_EOF_MARKER = "__DVB_LOG_EOF__";
     createRemoteSessionLogSink = (client2, spriteAlias, logPath) => {
@@ -202217,20 +202390,18 @@ var init_connect2 = __esm({
           });
         }
         const connectShell = computeProvider === "modal" ? "/bin/bash" : await resolveConnectShell(client2, spriteAlias);
-        const readSessionsSafe = async (fallback2) => {
-          try {
-            return await readSpriteSessions(client2, spriteAlias);
-          } catch (error2) {
-            logger8.warn("sessions_read_failed", { error: String(error2) });
-            return fallback2;
-          }
-        };
-        let sessions = sessionName || autoNameRequested ? await readSessionsSafe({}) : {};
-        if (!sessionName && autoNameRequested) {
-          sessionName = getNextAutoSessionName(sessions);
-          autoNamed = true;
-        }
-        let requireFreshSessionOpen = autoNamed;
+        const warnSessionMap = (event, fields) => logger8.warn(event, fields);
+        const initialSessionState = await initializeSessionMapState({
+          client: client2,
+          alias: spriteAlias,
+          sessionName,
+          autoNameRequested,
+          onWarn: warnSessionMap
+        });
+        let sessions = initialSessionState.sessions;
+        sessionName = initialSessionState.sessionName;
+        autoNamed = initialSessionState.autoNamed;
+        let requireFreshSessionOpen = initialSessionState.requireFreshSessionOpen;
         let sessionId = resolveInitialSessionId({
           supportsAttachExecSession,
           sessionIdOverride,
@@ -202247,78 +202418,53 @@ var init_connect2 = __esm({
           }
         }
         const refreshSessionMapping = async () => {
-          if (!supportsAttachExecSession) return;
-          if (!sessionName) return;
-          sessions = await readSessionsSafe(sessions);
-          if (requireFreshSessionOpen) {
-            return;
-          }
-          sessionId = sessions[sessionName];
-          if (!sessionId && computeProvider === "modal" && supportsListExecSessions) {
-            const available = await client2.listExecSessions(spriteAlias);
-            const matched = available.find(
-              (session) => session.tty !== false && extractSessionNameFromCommand(session.command) === sessionName
-            );
-            if (matched) {
-              sessionId = matched.id;
-              sessions[sessionName] = matched.id;
-              await writeSpriteSessions(client2, spriteAlias, sessions);
-            }
-          }
-          if (sessionId && supportsListExecSessions && computeProvider !== "modal") {
-            const available = await client2.listExecSessions(spriteAlias);
-            const match2 = available.find((session) => session.id === sessionId);
-            if (!match2 || match2.tty === false) {
-              delete sessions[sessionName];
-              sessionId = void 0;
-              await writeSpriteSessions(client2, spriteAlias, sessions);
-            }
-          }
-          if (sessionId && explicitName) {
+          const refreshed = await refreshSessionMapState({
+            client: client2,
+            alias: spriteAlias,
+            computeProvider,
+            supportsAttachExecSession,
+            supportsListExecSessions,
+            sessionName,
+            sessionId,
+            sessions,
+            requireFreshSessionOpen,
+            explicitName,
+            onWarn: warnSessionMap
+          });
+          sessions = refreshed.sessions;
+          sessionId = refreshed.sessionId;
+          if (refreshed.confirmedCreateExplicit) {
             confirmedCreateExplicit = true;
           }
         };
         const remoteHome = computeProvider === "modal" ? "/root" : "/home/sprite";
         const finalizeAutoSession = async (id) => {
-          if (!autoNamed || !sessionName) return;
-          const latest = await readSessionsSafe(sessions);
-          sessions = latest;
-          const uniqueName = ensureUniqueAutoSessionName(latest, sessionName, id);
-          const previousName = sessionName;
-          if (uniqueName !== sessionName) {
-            sessionName = uniqueName;
-            await renameSessionLog(
-              client2,
-              spriteAlias,
-              previousName,
-              uniqueName,
-              remoteHome
-            );
-            if (latency) {
-              latency.setContext({ box: spriteAlias, session: sessionName });
-            }
+          const finalized = await finalizeAutoNamedSession({
+            client: client2,
+            alias: spriteAlias,
+            autoNamed,
+            sessionName,
+            sessionId: id,
+            sessions,
+            remoteHome,
+            onWarn: warnSessionMap
+          });
+          sessions = finalized.sessions;
+          sessionName = finalized.sessionName;
+          if (finalized.renamed && latency && sessionName) {
+            latency.setContext({ box: spriteAlias, session: sessionName });
           }
-          sessions[sessionName] = id;
-          await writeSpriteSessions(client2, spriteAlias, sessions);
         };
         const renameSessionMapping = async (fromName, toName, expectedId) => {
-          const latest = await readSessionsSafe(sessions);
-          const currentId = latest[fromName];
-          if (!currentId) {
-            throw new Error(`Session "${fromName}" not found.`);
-          }
-          if (currentId !== expectedId) {
-            throw new Error(
-              `Session "${fromName}" no longer matches the active session.`
-            );
-          }
-          if (latest[toName] && latest[toName] !== expectedId) {
-            throw new Error(`Session "${toName}" already exists.`);
-          }
-          delete latest[fromName];
-          latest[toName] = expectedId;
-          await writeSpriteSessions(client2, spriteAlias, latest);
-          await renameSessionLog(client2, spriteAlias, fromName, toName, remoteHome);
+          const latest = await renameMappedSession({
+            client: client2,
+            alias: spriteAlias,
+            fromName,
+            toName,
+            expectedId,
+            remoteHome,
+            sessions
+          });
           sessions = latest;
           sessionName = toName;
           autoNamed = false;
@@ -202364,7 +202510,7 @@ var init_connect2 = __esm({
             return [connectShell, "-lc", `${envCommandPrefix}${parsed.command}`];
           }
           if (computeProvider === "modal") {
-            const interactiveCommand = buildModalInteractiveCommand({ tty: isTty });
+            const interactiveCommand = buildModalInteractiveCommand();
             if (projectWorkdir) {
               return [
                 "/bin/sh",
@@ -220047,4 +220193,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=c89c7337-d26d-5d0e-9378-e2535af1df44
+//# debugId=ff297307-c733-552d-a450-764919e5443b