@locusai/cli 0.22.12 → 0.22.13

package/bin/locus.js

@@ -898,10 +898,15 @@ __export(exports_sandbox, {
   displaySandboxWarning: () => displaySandboxWarning,
   detectSandboxSupport: () => detectSandboxSupport,
   detectContainerWorkdir: () => detectContainerWorkdir,
-  checkProviderSandboxMismatch: () => checkProviderSandboxMismatch
+  checkProviderSandboxMismatch: () => checkProviderSandboxMismatch,
+  buildSandboxEnvWrapper: () => buildSandboxEnvWrapper,
+  SANDBOX_DEPS_DIR: () => SANDBOX_DEPS_DIR
 });
 import { execFile, execSync as execSync2 } from "node:child_process";
 import { createInterface } from "node:readline";
+function buildSandboxEnvWrapper(workdir) {
+  return 'PATH="' + SANDBOX_DEPS_DIR + "/node_modules/.bin:" + workdir + '/node_modules/.bin:$PATH"; export PATH; ' + 'NODE_PATH="' + SANDBOX_DEPS_DIR + '/node_modules${NODE_PATH:+:$NODE_PATH}"; export NODE_PATH; ' + 'exec "$@"';
+}
 function getProviderSandboxName(config, provider) {
   return config.providers[provider];
 }
@@ -1096,7 +1101,7 @@ function probeSymlinkSupport(sandboxName, workdir) {
     return true;
   } catch {
     try {
-      execSync2(`docker sandbox exec ${sandboxName} rm -f ${JSON.stringify(`${workdir}/${probe}`)}`, { stdio: ["pipe", "pipe", "pipe"], timeout: 3000 });
+      execSync2(`docker sandbox exec --privileged ${sandboxName} rm -f ${JSON.stringify(`${workdir}/${probe}`)}`, { stdio: ["pipe", "pipe", "pipe"], timeout: 3000 });
     } catch {}
     log.debug("Symlink probe failed — bind mount does not support symlinks (ENOSYS)");
     return false;
@@ -1117,7 +1122,7 @@ function waitForEnter() {
     });
   });
 }
-var TIMEOUT_MS = 5000, cachedStatus = null;
+var SANDBOX_DEPS_DIR = "/tmp/sandbox-deps", TIMEOUT_MS = 5000, cachedStatus = null;
 var init_sandbox = __esm(() => {
   init_terminal();
   init_ai_models();
@@ -2348,7 +2353,7 @@ function parseCreateArgs(args) {
   }
   return { name, description };
 }
-function generatePackageJson(name, displayName, description, sdkVersion) {
+function generatePackageJson(name, displayName, description, sdkVersion, gatewayVersion) {
   const pkg = {
     name: `@locusai/locus-${name}`,
     version: "0.1.0",
@@ -2371,6 +2376,7 @@ function generatePackageJson(name, displayName, description, sdkVersion) {
       format: "biome format --write ."
     },
     dependencies: {
+      "@locusai/locus-gateway": `^${gatewayVersion}`,
       "@locusai/sdk": `^${sdkVersion}`
     },
     devDependencies: {
@@ -2592,20 +2598,27 @@ ${bold2("Creating package:")} ${cyan2(fullNpmName)}
 `);
   }
   let sdkVersion = "0.22.0";
+  let gatewayVersion = "0.22.0";
   try {
+    const { readFileSync: readFileSync5 } = await import("node:fs");
     const sdkPkgPath = join7(process.cwd(), "packages", "sdk", "package.json");
     if (existsSync7(sdkPkgPath)) {
-      const { readFileSync: readFileSync5 } = await import("node:fs");
       const sdkPkg = JSON.parse(readFileSync5(sdkPkgPath, "utf-8"));
       if (sdkPkg.version)
         sdkVersion = sdkPkg.version;
     }
+    const gatewayPkgPath = join7(process.cwd(), "packages", "gateway", "package.json");
+    if (existsSync7(gatewayPkgPath)) {
+      const gatewayPkg = JSON.parse(readFileSync5(gatewayPkgPath, "utf-8"));
+      if (gatewayPkg.version)
+        gatewayVersion = gatewayPkg.version;
+    }
   } catch {}
   mkdirSync6(join7(packagesDir, "src"), { recursive: true });
   mkdirSync6(join7(packagesDir, "bin"), { recursive: true });
   process.stderr.write(`${green("✓")} Created directory structure
 `);
-  writeFileSync5(join7(packagesDir, "package.json"), generatePackageJson(name, displayName, description, sdkVersion), "utf-8");
+  writeFileSync5(join7(packagesDir, "package.json"), generatePackageJson(name, displayName, description, sdkVersion, gatewayVersion), "utf-8");
   process.stderr.write(`${green("✓")} Generated package.json
 `);
   writeFileSync5(join7(packagesDir, "tsconfig.json"), generateTsconfig(), "utf-8");
@@ -5305,6 +5318,7 @@ class SandboxedClaudeRunner {
     await enforceSandboxIgnore(this.sandboxName, options.cwd, this.containerWorkdir);
     options.onStatusChange?.("Thinking...");
     const workdir = this.containerWorkdir ?? options.cwd;
+    const envWrapper = buildSandboxEnvWrapper(workdir);
     const dockerArgs = [
       "sandbox",
       "exec",
@@ -5312,6 +5326,10 @@ class SandboxedClaudeRunner {
       "-w",
       workdir,
       this.sandboxName,
+      "sh",
+      "-c",
+      envWrapper,
+      "_",
       "claude",
       ...claudeArgs
     ];
@@ -5481,6 +5499,7 @@ function formatToolCall2(name, input) {
 }
 var init_claude_sandbox = __esm(() => {
   init_logger();
+  init_sandbox();
   init_sandbox_ignore();
   init_claude();
 });
@@ -5704,6 +5723,7 @@ class SandboxedCodexRunner {
     }
     options.onStatusChange?.("Thinking...");
     const workdir = this.containerWorkdir ?? options.cwd;
+    const envWrapper = buildSandboxEnvWrapper(workdir);
     const dockerArgs = [
       "sandbox",
       "exec",
@@ -5712,6 +5732,10 @@ class SandboxedCodexRunner {
       "-w",
       workdir,
       this.sandboxName,
+      "sh",
+      "-c",
+      envWrapper,
+      "_",
       "codex",
       ...codexArgs
     ];
@@ -5873,6 +5897,7 @@ class SandboxedCodexRunner {
 }
 var init_codex_sandbox = __esm(() => {
   init_logger();
+  init_sandbox();
   init_sandbox_ignore();
   init_codex();
 });
@@ -7584,12 +7609,8 @@ function buildReplPrompt(userMessage, projectRoot, _config, previousMessages) {
 ${locusmd}
 </project-instructions>`);
   }
-  const learnings = readFileSafe(join14(projectRoot, ".locus", "LEARNINGS.md"));
-  if (learnings) {
-    sections.push(`<past-learnings>
-${learnings}
-</past-learnings>`);
-  }
+  sections.push(`<past-learnings>
+Past learnings are located in \`.locus/LEARNINGS.md\`.</past-learnings>`);
   sections.push(`<learnings-reminder>IMPORTANT: If during this interaction you discover reusable lessons (architectural patterns, non-obvious constraints, user corrections), you MUST append them to \`.locus/LEARNINGS.md\` before finishing. This is mandatory — see the "Continuous Learning" section in project instructions.</learnings-reminder>`);
   if (previousMessages && previousMessages.length > 0) {
     const recent = previousMessages.slice(-10);
@@ -7617,12 +7638,8 @@ function buildSystemContext(projectRoot) {
 ${locusmd}
 </project-instructions>`);
   }
-  const learnings = readFileSafe(join14(projectRoot, ".locus", "LEARNINGS.md"));
-  if (learnings) {
-    parts.push(`<past-learnings>
-${learnings}
-</past-learnings>`);
-  }
+  parts.push(`<past-learnings>
+Past learnings are located in \`.locus/LEARNINGS.md\`.</past-learnings>`);
   const discussionsDir = join14(projectRoot, ".locus", "discussions");
   if (existsSync15(discussionsDir)) {
     try {
@@ -13454,7 +13471,16 @@ async function handleAgentLogin(projectRoot, agent) {
   process.stderr.write(`${dim2("Login and then exit when ready.")}
 
 `);
-  const child = spawn7("docker", ["sandbox", "exec", "-it", "-w", workdir, sandboxName, agent], {
+  const child = spawn7("docker", [
+    "sandbox",
+    "exec",
+    "--privileged",
+    "-it",
+    "-w",
+    workdir,
+    sandboxName,
+    agent
+  ], {
     stdio: "inherit"
   });
   await new Promise((resolve2) => {
@@ -13668,15 +13694,42 @@ async function handleShell(projectRoot, args) {
   }
   const workdir = config.sandbox.containerWorkdir ?? projectRoot;
   process.stderr.write(`Opening shell in ${provider} sandbox ${dim2(sandboxName)}...
+`);
+  const binDirs = [
+    `"${SANDBOX_DEPS_DIR}/node_modules/.bin"`,
+    `"${workdir}/node_modules/.bin"`,
+    `"${workdir}/.venv/bin"`,
+    `"${workdir}/venv/bin"`,
+    `"${workdir}/vendor/bundle/ruby/*/bin"`,
+    `"$HOME/.cargo/bin"`,
+    `"$HOME/go/bin"`,
+    `"$HOME/.local/bin"`,
+    `"$HOME/.bun/bin"`,
+    `"$HOME/.deno/bin"`,
+    `"$HOME/.sdkman/candidates/*/current/bin"`
+  ].join(" ");
+  const shellInit = [
+    `for d in ${binDirs}; do`,
+    `  [ -d "$d" ] && case ":$PATH:" in *":$d:"*) ;; *) PATH="$d:$PATH" ;; esac`,
+    `done`,
+    `export PATH`,
+    'NODE_PATH="' + SANDBOX_DEPS_DIR + '/node_modules${NODE_PATH:+:$NODE_PATH}"',
+    `export NODE_PATH`,
+    `[ -f "${workdir}/.locus/sandbox-profile.sh" ] && . "${workdir}/.locus/sandbox-profile.sh"`,
+    `exec sh`
+  ].join(`
 `);
   await runInteractiveCommand("docker", [
     "sandbox",
     "exec",
+    "--privileged",
     "-it",
     "-w",
     workdir,
     sandboxName,
-    "sh"
+    "sh",
+    "-c",
+    shellInit
   ]);
 }
 function parseSandboxLogsArgs(args) {
@@ -13808,58 +13861,34 @@ function verifyBinEntries(sandboxName, workdir) {
     }
   } catch {}
 }
-function buildNoSymlinksInstallScript(workdir, pm) {
+function buildSandboxDepsScript(workdir, pm) {
   const installCmd = getInstallCommand(pm).join(" ");
   return [
     "set -e",
-    'TMPDIR="/tmp/locus-deps-install"',
+    `DEPS_DIR="${SANDBOX_DEPS_DIR}"`,
     `WORKDIR="${workdir}"`,
     "",
-    "# Clean previous attempt",
-    'rm -rf "$TMPDIR"',
-    'mkdir -p "$TMPDIR"',
-    'cd "$WORKDIR"',
-    "",
-    "# Copy all package.json files (preserving workspace directory structure)",
-    'find . -name package.json -not -path "*/node_modules/*" -not -path "./.git/*" | while read f; do',
-    '  mkdir -p "$TMPDIR/$(dirname "$f")"',
-    '  cp "$f" "$TMPDIR/$f"',
-    "done",
+    'rm -rf "$DEPS_DIR"',
+    'mkdir -p "$DEPS_DIR"',
     "",
-    "# Copy lockfiles and config files that affect installation",
-    "for lf in bun.lock bun.lockb yarn.lock pnpm-lock.yaml package-lock.json; do",
-    '  [ -f "$WORKDIR/$lf" ] && cp "$WORKDIR/$lf" "$TMPDIR/$lf" || true',
-    "done",
-    "for cf in bunfig.toml .npmrc .yarnrc .yarnrc.yml .pnpmfile.cjs pnpm-workspace.yaml; do",
-    '  [ -f "$WORKDIR/$cf" ] && cp "$WORKDIR/$cf" "$TMPDIR/$cf" || true',
-    "done",
-    "",
-    "# Install on native filesystem (symlinks work here)",
-    'cd "$TMPDIR"',
-    `${installCmd}`,
+    "# Copy package.json, stripping workspaces to avoid resolution errors",
+    "if command -v node >/dev/null 2>&1; then",
+    `  node -e "var p=JSON.parse(require('fs').readFileSync(process.argv[1],'utf8'));delete p.workspaces;require('fs').writeFileSync(process.argv[2],JSON.stringify(p,null,2));" "$WORKDIR/package.json" "$DEPS_DIR/package.json"`,
+    "else",
+    '  cp "$WORKDIR/package.json" "$DEPS_DIR/package.json"',
+    "fi",
     "",
-    "# Copy node_modules back to bind mount, dereferencing all symlinks.",
-    "# -L follows symlinks so they become regular files/dirs on the bind mount.",
-    "# maxdepth 5 covers root + nested workspace packages",
-    'find "$TMPDIR" -maxdepth 5 -name node_modules -type d | while read nm; do',
-    '  rel="${nm#$TMPDIR/}"',
-    '  dest="$WORKDIR/$rel"',
-    '  rm -rf "$dest"',
-    "  # cp -rL dereferences symlinks; fall back to cp -rH if -L is unsupported",
-    '  cp -rL "$nm" "$dest" 2>/dev/null || cp -rH "$nm" "$dest" 2>/dev/null || cp -r "$nm" "$dest"',
+    "# Copy lockfiles and config files",
+    "for f in bun.lock bun.lockb yarn.lock pnpm-lock.yaml package-lock.json bunfig.toml .npmrc .yarnrc .yarnrc.yml; do",
+    '  [ -f "$WORKDIR/$f" ] && cp "$WORKDIR/$f" "$DEPS_DIR/$f" || true',
     "done",
     "",
-    "# Ensure .bin entries are executable (some cp implementations drop +x)",
-    'if [ -d "$WORKDIR/node_modules/.bin" ]; then',
-    '  chmod +x "$WORKDIR/node_modules/.bin/"* 2>/dev/null || true',
-    "fi",
-    "",
-    "# Cleanup",
-    'rm -rf "$TMPDIR"'
+    'cd "$DEPS_DIR"',
+    installCmd
   ].join(`
 `);
 }
-async function runSandboxSetup(sandboxName, projectRoot, containerWorkdir, noSymlinks) {
+async function runSandboxSetup(sandboxName, projectRoot, containerWorkdir, _noSymlinks) {
   const workdir = containerWorkdir ?? projectRoot;
   const ecosystem = detectProjectEcosystem(projectRoot);
   const isJS = isJavaScriptEcosystem(ecosystem);
@@ -13868,45 +13897,30 @@ async function runSandboxSetup(sandboxName, projectRoot, containerWorkdir, noSym
     if (pm !== "npm") {
       await ensurePackageManagerInSandbox(sandboxName, pm);
     }
-    let installOk;
-    if (noSymlinks) {
-      const installCmd = getInstallCommand(pm);
-      process.stderr.write(`
-Installing dependencies (${bold2(installCmd.join(" "))}, symlink-free) in sandbox ${dim2(sandboxName)}...
-`);
-      const script = buildNoSymlinksInstallScript(workdir, pm);
-      installOk = await runInteractiveCommand("docker", [
-        "sandbox",
-        "exec",
-        "--privileged",
-        sandboxName,
-        "sh",
-        "-c",
-        script
-      ]);
-    } else {
-      const installCmd = getInstallCommand(pm);
-      process.stderr.write(`
-Installing dependencies (${bold2(installCmd.join(" "))}) in sandbox ${dim2(sandboxName)}...
-`);
-      installOk = await runInteractiveCommand("docker", [
-        "sandbox",
-        "exec",
-        "--privileged",
-        "-w",
-        workdir,
-        sandboxName,
-        ...installCmd
-      ]);
-    }
+    const installCmd = getInstallCommand(pm);
+    process.stderr.write(`
+Installing sandbox dependencies (${bold2(installCmd.join(" "))}) to container filesystem...
+`);
+    const script = buildSandboxDepsScript(workdir, pm);
+    const installOk = await runInteractiveCommand("docker", [
+      "sandbox",
+      "exec",
+      "--privileged",
+      sandboxName,
+      "sh",
+      "-c",
+      script
+    ]);
     if (!installOk) {
-      process.stderr.write(`${red2("✗")} Dependency install failed in sandbox ${dim2(sandboxName)}.
+      process.stderr.write(`${yellow2("⚠")} Sandbox dependency install failed. Platform-specific tools may not work.
+`);
+      process.stderr.write(`  ${dim2("Host node_modules will be used as fallback.")}
 `);
       return false;
     }
-    process.stderr.write(`${green("✓")} Dependencies installed in sandbox ${dim2(sandboxName)}.
+    process.stderr.write(`${green("✓")} Sandbox dependencies installed.
 `);
-    verifyBinEntries(sandboxName, workdir);
+    verifyBinEntries(sandboxName, SANDBOX_DEPS_DIR);
   } else {
     process.stderr.write(`
 ${dim2(`Detected ${ecosystem} project — skipping JS package install.`)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@locusai/cli",
-  "version": "0.22.12",
+  "version": "0.22.13",
   "description": "GitHub-native AI engineering assistant",
   "type": "module",
   "bin": {
@@ -36,7 +36,7 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "@locusai/sdk": "^0.22.12",
+    "@locusai/sdk": "^0.22.13",
     "@types/bun": "latest",
     "typescript": "^5.8.3"
   },