replicas-cli 0.2.172 → 0.2.174

package/dist/index.mjs

@@ -7842,9 +7842,9 @@ import chalk5 from "chalk";
 // src/lib/ssh.ts
 import { spawn } from "child_process";
 var SSH_OPTIONS = ["-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null"];
-async function connectSSH(token, host) {
+async function connectSSH(token, host, proxyCommand) {
   return new Promise((resolve, reject) => {
-    const sshArgs = [...SSH_OPTIONS, `${token}@${host}`];
+    const sshArgs = proxyCommand ? [...SSH_OPTIONS, "-o", `ProxyCommand=${proxyCommand}`, `${token}@${host}`] : [...SSH_OPTIONS, `${token}@${host}`];
     const ssh = spawn("ssh", sshArgs, {
       stdio: "inherit"
     });
@@ -7949,6 +7949,7 @@ Found ${response.workspaces.length} workspaces matching "${workspaceName}":`));
     workspace: selectedWorkspace,
     sshToken: tokenResponse.token,
     sshHost: tokenResponse.host,
+    sshProxyCommand: tokenResponse.proxyCommand,
     repoName
   };
 }
@@ -7960,13 +7961,13 @@ async function connectCommand(workspaceName) {
     process.exit(1);
   }
   try {
-    const { workspace, sshToken, sshHost } = await prepareWorkspaceConnection(workspaceName);
+    const { workspace, sshToken, sshHost, sshProxyCommand } = await prepareWorkspaceConnection(workspaceName);
     console.log(chalk5.blue(`
 Connecting to ${workspace.name}...`));
     const sshCommand = `ssh ${sshToken}@${sshHost}`;
     console.log(chalk5.gray(`SSH command: ${sshCommand}`));
     console.log(chalk5.gray("\nPress Ctrl+D to disconnect.\n"));
-    await connectSSH(sshToken, sshHost);
+    await connectSSH(sshToken, sshHost, sshProxyCommand);
     console.log(chalk5.green("\n\u2713 Disconnected from workspace.\n"));
   } catch (error) {
     console.error(chalk5.red(`
@@ -8059,14 +8060,25 @@ var SANDBOX_LIFECYCLE = {
   AUTO_DELETE_MINUTES: -1,
   SSH_TOKEN_EXPIRATION_MINUTES: 3 * 60
 };
-var SANDBOX_PATHS = {
-  HOME_DIR: "/home/ubuntu",
-  WORKSPACES_DIR: "/home/ubuntu/workspaces",
-  REPLICAS_DIR: "/home/ubuntu/.replicas",
-  REPLICAS_FILES_DIR: "/home/ubuntu/.replicas/files",
-  REPLICAS_FILES_DISPLAY_DIR: "~/.replicas/files",
-  REPLICAS_RUNTIME_ENV_FILE: "/home/ubuntu/.replicas/runtime-env.sh"
-};
+function buildPaths(homeDir) {
+  return {
+    HOME_DIR: homeDir,
+    WORKSPACES_DIR: `${homeDir}/workspaces`,
+    REPLICAS_DIR: `${homeDir}/.replicas`,
+    REPLICAS_FILES_DIR: `${homeDir}/.replicas/files`,
+    REPLICAS_RUNTIME_ENV_FILE: `${homeDir}/.replicas/runtime-env.sh`
+  };
+}
+var DAYTONA_PATHS = buildPaths("/home/ubuntu");
+var E2B_PATHS = buildPaths("/home/user");
+function getSandboxPaths(providerId) {
+  switch (providerId) {
+    case "daytona":
+      return DAYTONA_PATHS;
+    case "e2b":
+      return E2B_PATHS;
+  }
+}
 
 // ../shared/src/urls.ts
 function getWorkspaceDashboardUrl(workspaceId, options = {}) {
@@ -9298,15 +9310,25 @@ function writeSSHConfig(content) {
   ensureSSHDir();
   fs2.writeFileSync(SSH_CONFIG_PATH, content, { mode: 384 });
 }
+function sanitizeSSHConfigValue(value) {
+  return value.replace(/[\r\n]+/g, " ").trim();
+}
 function generateConfigBlock(entry) {
+  const host = sanitizeSSHConfigValue(entry.host);
+  const hostname = sanitizeSSHConfigValue(entry.hostname);
+  const user = sanitizeSSHConfigValue(entry.user);
+  const proxyCommand = entry.proxyCommand ? sanitizeSSHConfigValue(entry.proxyCommand) : void 0;
   const lines = [
     REPLICAS_MARKER_START,
-    `Host ${entry.host}`,
-    `  HostName ${entry.hostname}`,
-    `  User ${entry.user}`,
+    `Host ${host}`,
+    `  HostName ${hostname}`,
+    `  User ${user}`,
     `  StrictHostKeyChecking no`,
     `  UserKnownHostsFile /dev/null`
   ];
+  if (proxyCommand) {
+    lines.push(`  ProxyCommand ${proxyCommand}`);
+  }
   lines.push(REPLICAS_MARKER_END);
   return lines.join("\n");
 }
@@ -9359,16 +9381,18 @@ async function codeCommand(workspaceName) {
     process.exit(1);
   }
   try {
-    const { workspace, sshToken, sshHost, repoName } = await prepareWorkspaceConnection(workspaceName);
+    const { workspace, sshToken, sshHost, sshProxyCommand, repoName } = await prepareWorkspaceConnection(workspaceName);
     const hostAlias = getWorkspaceHostAlias(workspace.name);
     console.log(chalk6.blue("\nConfiguring SSH connection..."));
     addOrUpdateSSHConfigEntry({
       host: hostAlias,
       hostname: sshHost,
-      user: sshToken
+      user: sshToken,
+      proxyCommand: sshProxyCommand
     });
     console.log(chalk6.green(`\u2713 SSH config entry created: ${hostAlias}`));
-    const remotePath = repoName ? `${SANDBOX_PATHS.WORKSPACES_DIR}/${repoName}` : SANDBOX_PATHS.HOME_DIR;
+    const paths = getSandboxPaths(workspace.sandbox_provider ?? "daytona");
+    const remotePath = repoName ? `${paths.WORKSPACES_DIR}/${repoName}` : paths.HOME_DIR;
     const ideCommand = getIdeCommand();
     const fullCommand = `${ideCommand} --remote ssh-remote+${hostAlias} ${remotePath}`;
     console.log(chalk6.blue(`
@@ -14811,7 +14835,7 @@ Deleted file ${pathOrId}.
 }
 
 // src/index.ts
-var CLI_VERSION = "0.2.172";
+var CLI_VERSION = "0.2.174";
 function parseBooleanOption(value) {
   if (value === "true") return true;
   if (value === "false") return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-cli",
-  "version": "0.2.172",
+  "version": "0.2.174",
   "description": "CLI for managing Replicas workspaces - SSH into cloud dev environments with automatic port forwarding",
   "main": "dist/index.mjs",
   "bin": {