@boxes-dev/dvb 1.0.54 → 1.0.55

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]="b688f344-5d53-57d8-9464-1da40ea2bc02")}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]="4d4f5269-c2cd-5397-a6d4-993b4d24cfdc")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88683,8 +88683,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.54";
-      const rawGitSha = "9b08274a528c685a1a8720a6c9af9946e2a99af5";
+      const rawPackageVersion = "1.0.55";
+      const rawGitSha = "fd6acb6139b570fb0b4ff18a48c7dfe864bb6513";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120672,9 +120672,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.54";
-      const rawGitSha = "9b08274a528c685a1a8720a6c9af9946e2a99af5";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.54+9b08274a528c685a1a8720a6c9af9946e2a99af5";
+      const rawPackageVersion = "1.0.55";
+      const rawGitSha = "fd6acb6139b570fb0b4ff18a48c7dfe864bb6513";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.55+fd6acb6139b570fb0b4ff18a48c7dfe864bb6513";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -197021,7 +197021,7 @@ var init_destroyLocalState = __esm({
 });
 
 // src/devbox/commands/commandProvider.ts
-var MODAL_CONNECT_CAPABILITIES, normalizeBoxKey, resolveRegistryEntry, resolveCommandComputeProvider, assertCommandProviderCapability, hasCommandProviderCapability;
+var MODAL_CONNECT_CAPABILITIES, MODAL_MOUNT_CAPABILITIES, normalizeBoxKey, resolveRegistryEntry, resolveCommandComputeProvider, assertCommandProviderCapability, hasCommandProviderCapability;
 var init_commandProvider = __esm({
   "src/devbox/commands/commandProvider.ts"() {
     "use strict";
@@ -197033,6 +197033,7 @@ var init_commandProvider = __esm({
       "exec.sessions.list",
       "exec.sessions.kill"
     ]);
+    MODAL_MOUNT_CAPABILITIES = /* @__PURE__ */ new Set(["files.read"]);
     normalizeBoxKey = (value) => {
       if (typeof value !== "string") return null;
       const trimmed = value.trim();
@@ -197090,6 +197091,9 @@ var init_commandProvider = __esm({
       if (provider === "modal" && command === "connect" && MODAL_CONNECT_CAPABILITIES.has(capability)) {
         return;
       }
+      if (provider === "modal" && command === "mount" && MODAL_MOUNT_CAPABILITIES.has(capability)) {
+        return;
+      }
       throw new ProviderCapabilityError({
         provider,
         capability,
@@ -197116,7 +197120,7 @@ var init_commandProvider = __esm({
 });
 
 // src/devbox/commands/init/provider/modalRuntime.ts
-var import_node_crypto8, import_node_path16, import_ws3, SERVICE_BASE_DIR, SERVICE_META_SUFFIX, SERVICE_RUN_SUFFIX, SERVICE_PID_SUFFIX, SERVICE_LOG_SUFFIX, SERVICE_NAME_PATTERN, shellQuote2, MODAL_EXEC_WS_PATH2, MODAL_CONNECT_TOKEN_QUERY2, MODAL_DAEMON_HANDSHAKE_TIMEOUT_MS, MODAL_DAEMON_REQUEST_TIMEOUT_MS, serviceMetaPath, serviceRunnerPath, servicePidPath, serviceLogPath, validateServiceName, isSandboxNotFoundError2, resolveReadPath, buildWsUrlFromConnectToken, decodeBase642, parseJsonRecord2, readCreateConnectToken2, withTimeout2, connectModalDaemonWebSocket, awaitModalDaemonMessage, parseControlError, mapControlSessionRecord, ModalDaemonExecSocket, createModalInitRuntimeClient;
+var import_node_crypto8, import_node_path16, import_ws3, SERVICE_BASE_DIR, SERVICE_META_SUFFIX, SERVICE_RUN_SUFFIX, SERVICE_PID_SUFFIX, SERVICE_LOG_SUFFIX, SERVICE_NAME_PATTERN, shellQuote2, MODAL_EXEC_WS_PATH2, MODAL_CONNECT_TOKEN_QUERY2, MODAL_DAEMON_HANDSHAKE_TIMEOUT_MS, MODAL_DAEMON_REQUEST_TIMEOUT_MS, MODAL_DAEMON_TTY_HANDSHAKE_TIMEOUT_MS, MODAL_SANDBOX_RESOLVE_TIMEOUT_MS, serviceMetaPath, serviceRunnerPath, servicePidPath, serviceLogPath, validateServiceName, isSandboxNotFoundError2, resolveReadPath, buildWsUrlFromConnectToken, decodeBase642, parseJsonRecord2, readCreateConnectToken2, withTimeout2, connectModalDaemonWebSocket, awaitModalDaemonMessage, parseControlError, mapControlSessionRecord, ModalDaemonExecSocket, createModalInitRuntimeClient;
 var init_modalRuntime = __esm({
   "src/devbox/commands/init/provider/modalRuntime.ts"() {
     "use strict";
@@ -197136,6 +197140,8 @@ var init_modalRuntime = __esm({
     MODAL_CONNECT_TOKEN_QUERY2 = "_modal_connect_token";
     MODAL_DAEMON_HANDSHAKE_TIMEOUT_MS = 1e4;
     MODAL_DAEMON_REQUEST_TIMEOUT_MS = 15e3;
+    MODAL_DAEMON_TTY_HANDSHAKE_TIMEOUT_MS = 3e4;
+    MODAL_SANDBOX_RESOLVE_TIMEOUT_MS = 3e4;
     serviceMetaPath = (service) => `${SERVICE_BASE_DIR}/${service}${SERVICE_META_SUFFIX}`;
     serviceRunnerPath = (service) => `${SERVICE_BASE_DIR}/${service}${SERVICE_RUN_SUFFIX}`;
     servicePidPath = (service) => `${SERVICE_BASE_DIR}/${service}${SERVICE_PID_SUFFIX}`;
@@ -197331,6 +197337,7 @@ var init_modalRuntime = __esm({
       ws = null;
       closed = false;
       pongListeners = /* @__PURE__ */ new Set();
+      handshakeTimer = null;
       emit(type, event = {}) {
         for (const listener of this.listeners[type]) {
           listener(event);
@@ -197341,6 +197348,26 @@ var init_modalRuntime = __esm({
           listener();
         }
       }
+      clearHandshakeTimer() {
+        if (!this.handshakeTimer) {
+          return;
+        }
+        clearTimeout(this.handshakeTimer);
+        this.handshakeTimer = null;
+      }
+      startHandshakeTimer() {
+        this.clearHandshakeTimer();
+        this.handshakeTimer = setTimeout(() => {
+          if (this.closed || this.readyState !== 0) {
+            return;
+          }
+          this.emit("error", {
+            data: new Error("Timed out waiting for modal tty session handshake.")
+          });
+          this.close();
+        }, MODAL_DAEMON_TTY_HANDSHAKE_TIMEOUT_MS);
+        this.handshakeTimer.unref();
+      }
       emitMessagePayload(streamId, payload) {
         if (this.closed) return;
         const framed = new Uint8Array(payload.length + 1);
@@ -197358,6 +197385,7 @@ var init_modalRuntime = __esm({
         const type = typeof message.type === "string" ? message.type : "";
         if (type === "tty_ready") {
           const sessionId = typeof message.sessionId === "string" ? message.sessionId : "";
+          this.clearHandshakeTimer();
           this.readyState = 1;
           this.emit("open");
           this.emit("message", {
@@ -197402,6 +197430,7 @@ var init_modalRuntime = __esm({
           const wsUrl = buildWsUrlFromConnectToken(credentials);
           const ws = new import_ws3.default(wsUrl);
           this.ws = ws;
+          this.startHandshakeTimer();
           ws.on("open", () => {
             try {
               const authPayload = {
@@ -197432,17 +197461,20 @@ var init_modalRuntime = __esm({
             this.emitPong();
           });
           ws.on("error", (error2) => {
+            this.clearHandshakeTimer();
             this.emit("error", {
               data: error2 instanceof Error ? error2 : new Error(String(error2))
             });
           });
           ws.on("close", (code2) => {
+            this.clearHandshakeTimer();
             if (this.closed) return;
             this.closed = true;
             this.readyState = 3;
             this.emit("close", { code: code2 });
           });
         } catch (error2) {
+          this.clearHandshakeTimer();
           const err = error2 instanceof Error ? error2 : new Error(String(error2));
           this.emit("error", { data: err });
           this.close();
@@ -197497,6 +197529,7 @@ var init_modalRuntime = __esm({
       }
       close() {
         if (this.closed) return;
+        this.clearHandshakeTimer();
         this.closed = true;
         this.readyState = 3;
         if (this.ws && this.ws.readyState <= import_ws3.default.OPEN) {
@@ -197575,7 +197608,11 @@ var init_modalRuntime = __esm({
         if (sandboxPromise) return sandboxPromise;
         sandboxPromise = (async () => {
           try {
-            const runningSandbox = await modal.sandboxes.fromName(appName, alias);
+            const runningSandbox = await withTimeout2(
+              modal.sandboxes.fromName(appName, alias),
+              MODAL_SANDBOX_RESOLVE_TIMEOUT_MS,
+              "Timed out resolving running modal sandbox by name."
+            );
             sandboxId = runningSandbox.sandboxId;
             return runningSandbox;
           } catch (error2) {
@@ -197584,12 +197621,24 @@ var init_modalRuntime = __esm({
             }
           }
           if (ensureActive) {
-            const ensured = await ensureActive(intent);
+            const ensured = await withTimeout2(
+              ensureActive(intent),
+              MODAL_SANDBOX_RESOLVE_TIMEOUT_MS,
+              "Timed out waiting for modal devbox wake."
+            );
             appName = ensured.appName;
             sandboxId = ensured.sandboxId;
-            return await modal.sandboxes.fromId(ensured.sandboxId);
+            return await withTimeout2(
+              modal.sandboxes.fromId(ensured.sandboxId),
+              MODAL_SANDBOX_RESOLVE_TIMEOUT_MS,
+              "Timed out resolving modal sandbox after wake."
+            );
           }
-          return await modal.sandboxes.fromId(sandboxId);
+          return await withTimeout2(
+            modal.sandboxes.fromId(sandboxId),
+            MODAL_SANDBOX_RESOLVE_TIMEOUT_MS,
+            "Timed out resolving modal sandbox by id."
+          );
         })().catch((error2) => {
           sandboxPromise = null;
           throw error2;
@@ -198552,6 +198601,76 @@ var init_providerClient = __esm({
   }
 });
 
+// src/devbox/commands/provider/modalCommandContext.ts
+var resolveModalCommandContext;
+var init_modalCommandContext = __esm({
+  "src/devbox/commands/provider/modalCommandContext.ts"() {
+    "use strict";
+    init_src();
+    init_auth();
+    init_controlPlane();
+    init_providerClient();
+    resolveModalCommandContext = async (options) => {
+      const config4 = await loadConfig(
+        process.env.HOME ? { homeDir: process.env.HOME } : void 0
+      );
+      const store = await createSecretStore(
+        config4?.tokenStore,
+        process.env.HOME ? { homeDir: process.env.HOME } : void 0
+      );
+      const modalCredentialContext = createProviderCredentialContext({
+        mode: "auto",
+        controlPlaneToken: await store.getControlPlaneToken()
+      });
+      let operationOptions = await resolveModalCommandOperationOptions({
+        credentials: modalCredentialContext,
+        cwd: options.cwd
+      });
+      if (operationOptions.credentialMode === "shared" && (!operationOptions.credentials.modalTokenId || !operationOptions.credentials.modalTokenSecret)) {
+        const controlPlaneToken2 = await ensureControlPlaneToken(
+          store,
+          options.stage
+        );
+        if (controlPlaneToken2) {
+          operationOptions = await resolveModalCommandOperationOptions({
+            credentials: createProviderCredentialContext({
+              mode: "auto",
+              controlPlaneToken: controlPlaneToken2
+            }),
+            cwd: options.cwd
+          });
+        }
+      }
+      let controlPlaneToken = modalCredentialContext.controlPlaneToken;
+      const ensureActive = async (intent) => {
+        if (!controlPlaneToken) {
+          controlPlaneToken = await ensureControlPlaneToken(store, options.stage);
+        }
+        if (!controlPlaneToken) {
+          throw new Error(
+            "Control plane authentication is required to wake modal devboxes. Run `dvb setup` and retry."
+          );
+        }
+        const ensured = await ensureModalDevboxActive2(
+          controlPlaneToken,
+          options.alias,
+          intent
+        );
+        return {
+          appName: ensured.appName,
+          sandboxId: ensured.sandboxId,
+          woke: ensured.woke,
+          wakeSource: ensured.wakeSource
+        };
+      };
+      return {
+        operationOptions,
+        ensureActive
+      };
+    };
+  }
+});
+
 // src/devbox/commands/sessionUtils.ts
 var AUTO_SESSION_PREFIX, parseAutoSessionSuffix, getNextAutoSessionName, ensureUniqueAutoSessionName, shellQuote3, sanitizeSessionName, buildSessionLogPath, renameSessionLog;
 var init_sessionUtils = __esm({
@@ -198618,7 +198737,6 @@ var init_connect2 = __esm({
     init_src();
     init_daemonClient();
     init_auth();
-    init_controlPlane();
     init_logger3();
     init_latency();
     init_osc();
@@ -198627,7 +198745,7 @@ var init_connect2 = __esm({
     init_boxSelect();
     init_commandProvider();
     init_providerClient();
-    init_modalLifecycle();
+    init_modalCommandContext();
     init_sessionUtils();
     DEFAULT_TTY_COLS = 80;
     DEFAULT_TTY_ROWS = 24;
@@ -199561,73 +199679,27 @@ var init_connect2 = __esm({
         let networkTargetHost = null;
         if (computeProvider === "modal") {
           stage("Loading modal auth");
-          const config4 = await loadConfig(
-            process.env.HOME ? { homeDir: process.env.HOME } : void 0
-          );
-          const store = await createSecretStore(
-            config4?.tokenStore,
-            process.env.HOME ? { homeDir: process.env.HOME } : void 0
-          );
-          const modalCredentialContext = createProviderCredentialContext({
-            mode: "auto",
-            controlPlaneToken: await store.getControlPlaneToken()
-          });
-          let modalOperationOptions = await resolveModalCommandOperationOptions({
-            credentials: modalCredentialContext,
-            cwd: process.cwd()
+          const modalContext = await resolveModalCommandContext({
+            alias: spriteAlias,
+            cwd: process.cwd(),
+            stage
           });
-          if (modalOperationOptions.credentialMode === "shared" && (!modalOperationOptions.credentials.modalTokenId || !modalOperationOptions.credentials.modalTokenSecret)) {
-            const controlPlaneToken2 = await ensureControlPlaneToken(store, stage);
-            if (controlPlaneToken2) {
-              modalOperationOptions = await resolveModalCommandOperationOptions({
-                credentials: createProviderCredentialContext({
-                  mode: "auto",
-                  controlPlaneToken: controlPlaneToken2
-                }),
-                cwd: process.cwd()
-              });
-            }
-          }
-          let controlPlaneToken = modalCredentialContext.controlPlaneToken;
           const ensureActive = async (intent) => {
-            if (!controlPlaneToken) {
-              controlPlaneToken = await ensureControlPlaneToken(store, stage);
-            }
-            if (!controlPlaneToken) {
-              throw new Error(
-                "Control plane authentication is required to wake modal devboxes. Run `dvb setup` and retry."
-              );
-            }
-            const ensured = await ensureModalDevboxActive2(
-              controlPlaneToken,
-              spriteAlias,
-              intent
-            );
+            const ensured2 = await modalContext.ensureActive(intent);
             return {
-              appName: ensured.appName,
-              sandboxId: ensured.sandboxId
+              appName: ensured2.appName,
+              sandboxId: ensured2.sandboxId
             };
           };
-          stage("Checking modal sandbox");
-          const sandbox = await findModalSandbox(
-            {
-              alias: spriteAlias,
-              includeFinished: true
-            },
-            modalOperationOptions
-          );
-          let appName = sandbox?.appName ?? "";
-          let sandboxId = sandbox?.sandboxId ?? "";
-          if (!appName || !sandboxId) {
-            const ensured = await ensureActive("shell");
-            appName = ensured.appName;
-            sandboxId = ensured.sandboxId;
-          }
+          stage("Ensuring modal sandbox");
+          const ensured = await ensureActive("shell");
+          const appName = ensured.appName;
+          const sandboxId = ensured.sandboxId;
           client2 = createModalConnectSpritesClient({
             alias: spriteAlias,
             appName,
             sandboxId,
-            operationOptions: modalOperationOptions,
+            operationOptions: modalContext.operationOptions,
             ensureActive
           });
         } else {
@@ -202983,7 +203055,7 @@ var init_registry2 = __esm({
 });
 
 // src/devbox/commands/mountSsh.ts
-var import_node_child_process7, import_promises19, import_node_os12, import_node_path23, DEVBOX_SSH_DIR, MOUNT_KEY_PATH, MOUNT_PUBLIC_KEY_PATH, KNOWN_HOSTS_PATH, REMOTE_SSH_DIR, REMOTE_AUTH_KEYS, REMOTE_SSHD_CONFIG, SSHD_SERVICE_NAME, REMOTE_SSH_USER_PATTERN, shellEscape, runCommand4, ensureDevboxSshDir, ensureKnownHostsFile, ensureLocalMountKey, readLocalMountPublicKey, resolveRemoteSshUser, buildSshdConfig, ensureRemoteMountAccess, ensureSshdService;
+var import_node_child_process7, import_promises19, import_node_os12, import_node_path23, DEVBOX_SSH_DIR, MOUNT_KEY_PATH, MOUNT_PUBLIC_KEY_PATH, KNOWN_HOSTS_PATH, REMOTE_MOUNT_ROOT, REMOTE_SSH_DIR, REMOTE_AUTH_KEYS, REMOTE_SSHD_CONFIG, SSHD_SERVICE_NAME, REMOTE_SSH_USER_PATTERN, shellEscape, runCommand4, ensureDevboxSshDir, ensureKnownHostsFile, ensureLocalMountKey, readLocalMountPublicKey, ensureRemoteMountRoot, resolveRemoteSshUser, buildSshdConfig, ensureRemoteMountAccess, ensureSshdService, getRemoteMountRoot;
 var init_mountSsh = __esm({
   "src/devbox/commands/mountSsh.ts"() {
     "use strict";
@@ -202996,7 +203068,8 @@ var init_mountSsh = __esm({
     MOUNT_KEY_PATH = import_node_path23.default.join(DEVBOX_SSH_DIR, "mount_ed25519");
     MOUNT_PUBLIC_KEY_PATH = `${MOUNT_KEY_PATH}.pub`;
     KNOWN_HOSTS_PATH = import_node_path23.default.join(DEVBOX_SSH_DIR, "known_hosts");
-    REMOTE_SSH_DIR = "/home/sprite/.devbox/ssh";
+    REMOTE_MOUNT_ROOT = "/home/sprite";
+    REMOTE_SSH_DIR = `${REMOTE_MOUNT_ROOT}/.devbox/ssh`;
     REMOTE_AUTH_KEYS = `${REMOTE_SSH_DIR}/authorized_keys`;
     REMOTE_SSHD_CONFIG = `${REMOTE_SSH_DIR}/sshd_config`;
     SSHD_SERVICE_NAME = "devbox-sshd";
@@ -203056,6 +203129,25 @@ var init_mountSsh = __esm({
       }
       return trimmed;
     };
+    ensureRemoteMountRoot = async (client2, spriteName) => {
+      const result = await client2.exec(spriteName, [
+        "/bin/bash",
+        "-lc",
+        `test -d ${shellEscape(REMOTE_MOUNT_ROOT)}`
+      ]);
+      if (result.exitCode === 0) {
+        return;
+      }
+      const stderr = result.stderr.trim();
+      const stdout = result.stdout.trim();
+      const combined = [stderr, stdout].filter(Boolean).join("\n");
+      const details = combined ? `
+
+${combined}` : "";
+      throw new Error(
+        `Remote mount root "${REMOTE_MOUNT_ROOT}" is missing or inaccessible. Run \`dvb init --resume\` for this devbox before mounting.${details}`
+      );
+    };
     resolveRemoteSshUser = async (client2, spriteName) => {
       const detectScript = [
         "set -euo pipefail",
@@ -203132,9 +203224,9 @@ ${combined}` : "";
         "    sudo -n DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openssh-server",
         "  fi",
         "fi",
-        "sudo -n mkdir -p /home/sprite/.devbox/ssh",
-        `sudo -n chown ${shellEscape(sshUser)}:${shellEscape(sshUser)} /home/sprite/.devbox/ssh`,
-        "sudo -n chmod 700 /home/sprite/.devbox/ssh",
+        `sudo -n mkdir -p ${shellEscape(REMOTE_SSH_DIR)}`,
+        `sudo -n chown ${shellEscape(sshUser)}:${shellEscape(sshUser)} ${shellEscape(REMOTE_SSH_DIR)}`,
+        `sudo -n chmod 700 ${shellEscape(REMOTE_SSH_DIR)}`,
         ...sshUser === "root" ? [] : [
           `account_status=$(sudo -n passwd -S ${shellEscape(sshUser)} 2>/dev/null | awk '{print $2}' || true)`,
           'if [ "$account_status" = "L" ]; then',
@@ -203205,6 +203297,7 @@ ${combined}` : "";
         });
       }
     };
+    getRemoteMountRoot = () => REMOTE_MOUNT_ROOT;
   }
 });
 
@@ -210772,7 +210865,7 @@ var init_logout = __esm({
 });
 
 // src/devbox/commands/mount.ts
-var import_node_child_process11, import_promises29, import_node_os19, import_node_path35, parseMountArgs, resolveMountDir, commandExists, ensureLocalDependencies, resolveSpriteAlias, runCommand5, forwardSshPort, stopSshPort, unmount, runMount, runUnmount;
+var import_node_child_process11, import_promises29, import_node_os19, import_node_path35, parseMountArgs, resolveMountDir, commandExists, ensureLocalDependencies, resolveSpritesMountRuntimeClient, resolveModalMountRuntimeClient, resolveMountRuntimeClient, resolveSpriteAlias, runCommand5, forwardSshPort, stopSshPort, resolveMountProviderTarget, unmount, runMount, runUnmount;
 var init_mount = __esm({
   "src/devbox/commands/mount.ts"() {
     "use strict";
@@ -210786,7 +210879,10 @@ var init_mount = __esm({
     init_logger3();
     init_boxSelect();
     init_commandProvider();
+    init_modalRuntime();
     init_mountSsh();
+    init_modalCommandContext();
+    init_modalLifecycle();
     parseMountArgs = (args) => {
       const parsed = {};
       for (const arg of args) {
@@ -210817,6 +210913,86 @@ var init_mount = __esm({
         throw new Error("Missing ssh client.");
       }
     };
+    resolveSpritesMountRuntimeClient = async () => {
+      const config4 = await loadConfig(
+        process.env.HOME ? { homeDir: process.env.HOME } : void 0
+      );
+      const store = await createSecretStore(
+        config4?.tokenStore,
+        process.env.HOME ? { homeDir: process.env.HOME } : void 0
+      );
+      const apiBaseUrl = resolveSpritesApiUrl(config4);
+      const { token } = await ensureSpritesToken(store, void 0, {
+        apiBaseUrl
+      });
+      return createSpritesClient({ apiBaseUrl, token });
+    };
+    resolveModalMountRuntimeClient = async (options, dependencies = {}) => {
+      const resolveModalContext = dependencies.resolveModalContext ?? resolveModalCommandContext;
+      const findSandbox = dependencies.findSandbox ?? findModalSandbox;
+      const createRuntimeClient = dependencies.createRuntimeClient ?? createModalInitRuntimeClient;
+      const modalContext = await resolveModalContext({
+        alias: options.alias,
+        cwd: options.cwd
+      });
+      const sandbox = await findSandbox(
+        {
+          alias: options.alias,
+          includeFinished: true
+        },
+        modalContext.operationOptions
+      );
+      let appName = sandbox?.appName ?? "";
+      let sandboxId = sandbox?.sandboxId ?? "";
+      if (!sandbox || sandbox.status !== "running") {
+        try {
+          const ensured = await modalContext.ensureActive("proxy");
+          appName = ensured.appName;
+          sandboxId = ensured.sandboxId;
+        } catch (error2) {
+          const reason = error2 instanceof Error ? error2.message : String(error2);
+          if (!sandbox) {
+            throw new Error(
+              `No running modal sandbox found named "${options.targetBox}" and it could not be resumed for mount.
+
+${reason}`
+            );
+          }
+          throw new Error(
+            `Modal sandbox "${options.targetBox}" is ${sandbox.status} and could not be resumed for mount.
+
+${reason}`
+          );
+        }
+      }
+      return createRuntimeClient({
+        alias: options.alias,
+        appName,
+        sandboxId,
+        credentialMode: modalContext.operationOptions.credentialMode,
+        credentials: modalContext.operationOptions.credentials,
+        ...modalContext.operationOptions.cwd ? { cwd: modalContext.operationOptions.cwd } : {},
+        ensureActive: async (intent) => {
+          const ensured = await modalContext.ensureActive(intent);
+          return {
+            appName: ensured.appName,
+            sandboxId: ensured.sandboxId
+          };
+        }
+      });
+    };
+    resolveMountRuntimeClient = async (options, dependencies = {}) => {
+      if (options.provider === "modal") {
+        const resolveModalRuntimeClient = dependencies.resolveModalRuntimeClient ?? (async (modalOptions) => await resolveModalMountRuntimeClient(modalOptions));
+        return await resolveModalRuntimeClient({
+          alias: options.alias,
+          targetBox: options.targetBox,
+          cwd: options.cwd
+        });
+      }
+      const resolveSpritesRuntimeClient = dependencies.resolveSpritesRuntimeClient ?? resolveSpritesMountRuntimeClient;
+      return await resolveSpritesRuntimeClient();
+    };
     resolveSpriteAlias = async (_socketPath, box) => box;
     runCommand5 = (command, args, options = {}) => new Promise((resolve2, reject) => {
       const child = (0, import_node_child_process11.spawn)(command, args, {
@@ -210855,28 +211031,8 @@ var init_mount = __esm({
         throw new Error(`dvbd error: ${response.status}`);
       }
     };
-    unmount = async (mountDir) => {
-      const command = process.platform === "darwin" ? "diskutil" : "umount";
-      const args = process.platform === "darwin" ? ["unmount", mountDir] : [mountDir];
-      const exitCode = await runCommand5(command, args);
-      if (exitCode !== 0) {
-        throw new Error(`Failed to unmount ${mountDir}`);
-      }
-    };
-    runMount = async (args) => {
-      const parsed = parseMountArgs(args);
-      let targetBox = parsed.box;
-      if (!targetBox) {
-        const selected = await selectDevbox(
-          "Use `dvb mount <box>` to target a specific box."
-        );
-        if (!selected) return;
-        targetBox = selected.box;
-      }
-      const socketInfo = resolveSocketInfo();
-      await ensureDaemonRunning(socketInfo.socketPath);
-      await requireDaemonFeatures(socketInfo.socketPath, ["ports.forward"]);
-      let spriteAlias = await resolveSpriteAlias(socketInfo.socketPath, targetBox);
+    resolveMountProviderTarget = async (socketPath, targetBox) => {
+      const spriteAlias = await resolveSpriteAlias(socketPath, targetBox);
       let providerLookupBoxes = null;
       try {
         providerLookupBoxes = await listDevboxes();
@@ -210886,14 +211042,14 @@ var init_mount = __esm({
           error: String(error2)
         });
       }
-      const providerTarget = await resolveCommandComputeProvider({
+      return await resolveCommandComputeProvider({
         box: spriteAlias,
         boxes: providerLookupBoxes,
         homeDir: process.env.HOME ?? import_node_os19.default.homedir(),
         persistAssumedComputeProvider: async ({ alias, computeProvider }) => {
           try {
             const response = await requestJson3(
-              socketInfo.socketPath,
+              socketPath,
               "POST",
               "/registry/upsert",
               DAEMON_TIMEOUT_MS.registry,
@@ -210919,26 +211075,49 @@ var init_mount = __esm({
           }
         }
       });
+    };
+    unmount = async (mountDir) => {
+      const command = process.platform === "darwin" ? "diskutil" : "umount";
+      const args = process.platform === "darwin" ? ["unmount", mountDir] : [mountDir];
+      const exitCode = await runCommand5(command, args);
+      if (exitCode !== 0) {
+        throw new Error(`Failed to unmount ${mountDir}`);
+      }
+    };
+    runMount = async (args) => {
+      const parsed = parseMountArgs(args);
+      let targetBox = parsed.box;
+      if (!targetBox) {
+        const selected = await selectDevbox(
+          "Use `dvb mount <box>` to target a specific box."
+        );
+        if (!selected) return;
+        targetBox = selected.box;
+      }
+      const socketInfo = resolveSocketInfo();
+      await ensureDaemonRunning(socketInfo.socketPath);
+      await requireDaemonFeatures(socketInfo.socketPath, ["ports.forward"]);
+      const providerTarget = await resolveMountProviderTarget(
+        socketInfo.socketPath,
+        targetBox
+      );
       assertCommandProviderCapability({
         provider: providerTarget.computeProvider,
         command: "mount",
         capability: "files.read"
       });
-      spriteAlias = providerTarget.alias;
+      const spriteAlias = providerTarget.alias;
       ensureLocalDependencies();
-      const config4 = await loadConfig(
-        process.env.HOME ? { homeDir: process.env.HOME } : void 0
-      );
-      const store = await createSecretStore(
-        config4?.tokenStore,
-        process.env.HOME ? { homeDir: process.env.HOME } : void 0
-      );
-      const apiBaseUrl = resolveSpritesApiUrl(config4);
-      const { token } = await ensureSpritesToken(store, void 0, { apiBaseUrl });
-      const client2 = createSpritesClient({ apiBaseUrl, token });
+      const client2 = await resolveMountRuntimeClient({
+        provider: providerTarget.computeProvider,
+        alias: spriteAlias,
+        targetBox,
+        cwd: process.cwd()
+      });
       const { privateKeyPath } = await ensureLocalMountKey();
       const publicKey = await readLocalMountPublicKey();
       const knownHostsPath = await ensureKnownHostsFile();
+      await ensureRemoteMountRoot(client2, spriteAlias);
       const remoteMountAccess = await ensureRemoteMountAccess(
         client2,
         spriteAlias,
@@ -210959,12 +211138,24 @@ var init_mount = __esm({
         "StrictHostKeyChecking=accept-new",
         "-p",
         String(localPort),
-        `${remoteMountAccess.sshUser}@localhost:/home/sprite`,
+        `${remoteMountAccess.sshUser}@localhost:${getRemoteMountRoot()}`,
         mountDir
       ];
-      const exitCode = await runCommand5("sshfs", sshfsArgs);
-      if (exitCode !== 0) {
-        throw new Error("sshfs failed to mount.");
+      try {
+        const exitCode = await runCommand5("sshfs", sshfsArgs);
+        if (exitCode !== 0) {
+          throw new Error("sshfs failed to mount.");
+        }
+      } catch (error2) {
+        try {
+          await stopSshPort(socketInfo.socketPath, spriteAlias);
+        } catch (stopError) {
+          logger7.warn("mount_forward_cleanup_failed", {
+            box: spriteAlias,
+            error: String(stopError)
+          });
+        }
+        throw error2;
       }
       console.log(`Mounted ${spriteAlias} at ${mountDir}`);
     };
@@ -210981,10 +211172,11 @@ var init_mount = __esm({
       const socketInfo = resolveSocketInfo();
       await ensureDaemonRunning(socketInfo.socketPath);
       await requireDaemonFeatures(socketInfo.socketPath, ["ports.forward"]);
-      const spriteAlias = await resolveSpriteAlias(
+      const providerTarget = await resolveMountProviderTarget(
         socketInfo.socketPath,
         targetBox
       );
+      const spriteAlias = providerTarget.alias;
       const mountDir = resolveMountDir(spriteAlias);
       await unmount(mountDir);
       await stopSshPort(socketInfo.socketPath, spriteAlias);
@@ -215926,4 +216118,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=b688f344-5d53-57d8-9464-1da40ea2bc02
+//# debugId=4d4f5269-c2cd-5397-a6d4-993b4d24cfdc