@openscout/scout 0.2.69 → 0.2.70

package/dist/openscout-terminal-relay.mjs

@@ -7,9 +7,9 @@ import { createRequire as createRequire2 } from "node:module";
 
 // packages/web/server/terminal-relay-session.ts
 import { createRequire } from "module";
-import { execFileSync, execSync } from "child_process";
-import { accessSync, constants, existsSync, mkdirSync, writeFileSync } from "fs";
-import { delimiter as pathDelimiter, join, dirname as pathDirname, resolve as pathResolve } from "path";
+import { execSync } from "child_process";
+import { existsSync, mkdirSync, writeFileSync } from "fs";
+import { join, dirname as pathDirname } from "path";
 var require2 = createRequire(import.meta.url);
 var pty = require2("node-pty");
 var DEFAULT_ORPHAN_TTL_MS = 30 * 60 * 1000;
@@ -56,9 +56,6 @@ function resizeSession(session, cols, rows) {
     return false;
   try {
     session.pty.resize(cols, rows);
-    if (session.backend === "tmux" && session.tmuxSession) {
-      resizeTmuxWindow(session.tmuxSession, cols, rows);
-    }
     session.cols = cols;
     session.rows = rows;
     return true;
@@ -93,78 +90,17 @@ function findBin(name, envOverride) {
     return null;
   }
 }
-function expandHomePath(value) {
-  const home = process.env.HOME || "/tmp";
-  if (value === "~")
-    return home;
-  if (value.startsWith("~/"))
-    return join(home, value.slice(2));
-  return value;
-}
-function isExecutablePath(candidate) {
-  if (!candidate)
-    return false;
-  try {
-    accessSync(candidate, constants.X_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function findExecutableInDirectories(name, directories) {
-  const seen = new Set;
-  for (const directory of directories) {
-    if (!directory)
-      continue;
-    const normalizedDirectory = pathResolve(expandHomePath(directory));
-    if (seen.has(normalizedDirectory))
-      continue;
-    seen.add(normalizedDirectory);
-    const candidate = join(normalizedDirectory, name);
-    if (isExecutablePath(candidate))
-      return candidate;
-  }
-  return null;
-}
-function findExecutableOnPath(name) {
-  return findExecutableInDirectories(name, (process.env.PATH || "").split(pathDelimiter));
-}
 function findClaudeBin() {
-  for (const envKey of ["OPENSCOUT_CLAUDE_BIN", "SCOUT_CLAUDE_BIN", "CLAUDE_BIN"]) {
-    const explicit = process.env[envKey]?.trim();
-    if (!explicit)
-      continue;
-    const expanded = expandHomePath(explicit);
-    if (isExecutablePath(expanded))
-      return pathResolve(expanded);
-    const foundOnPath = findExecutableOnPath(explicit);
-    if (foundOnPath)
-      return foundOnPath;
-  }
-  const home = process.env.HOME || "/tmp";
-  return findExecutableInDirectories("claude", [
-    join(home, ".local", "bin"),
-    join(home, ".claude", "local"),
-    "/opt/homebrew/bin",
-    "/usr/local/bin",
-    join(home, ".bun", "bin")
-  ]) ?? findExecutableOnPath("claude");
+  return findBin("claude", "CLAUDE_BIN");
 }
 function findPiBin() {
   return findBin("pi", "PI_BIN");
 }
 function findShellBin() {
-  const candidates = [
-    process.env.SHELL,
-    "/bin/zsh",
-    "/bin/bash",
-    "/bin/sh"
-  ].filter((candidate) => Boolean(candidate));
-  for (const candidate of candidates) {
-    if (existsSync(candidate))
-      return candidate;
-  }
-  return null;
+  const configured = process.env.SHELL;
+  if (configured && existsSync(configured))
+    return configured;
+  return findBin("zsh") ?? findBin("bash") ?? findBin("sh") ?? (existsSync("/bin/sh") ? "/bin/sh" : null);
 }
 function normalizePiProviderForCli(provider) {
   if (!provider)
@@ -181,22 +117,6 @@ function tmuxSessionExists(name) {
     return false;
   }
 }
-function resizeTmuxWindow(name, cols, rows) {
-  try {
-    execFileSync("tmux", [
-      "resize-window",
-      "-t",
-      name,
-      "-x",
-      String(cols),
-      "-y",
-      String(rows)
-    ], { stdio: "ignore" });
-    return true;
-  } catch {
-    return false;
-  }
-}
 function bootstrapFiles(cwd, files, sessionId) {
   for (const [relPath, content] of Object.entries(files)) {
     const absPath = join(cwd, relPath);
@@ -213,14 +133,16 @@ function bootstrapFiles(cwd, files, sessionId) {
     }
   }
 }
-function spawnTmuxSession(tmuxName, cols, rows, cwd, claudeBin, claudeArgs, env) {
+function spawnTmuxSession(tmuxName, cols, rows, cwd, commandBin, commandArgs, env) {
   const exists = tmuxSessionExists(tmuxName);
   if (!exists) {
-    const shellCmd = [claudeBin, ...claudeArgs].map((a) => a.includes(" ") ? `'${a}'` : a).join(" ");
+    const shellCmd = [commandBin, ...commandArgs].map((a) => a.includes(" ") ? `'${a}'` : a).join(" ");
     execSync(`tmux new-session -d -s ${tmuxName} -x ${cols} -y ${rows} -c '${cwd}' '${shellCmd}'`, { env });
     console.log(`[relay] Created tmux session: ${tmuxName}`);
   } else {
-    resizeTmuxWindow(tmuxName, cols, rows);
+    try {
+      execSync(`tmux resize-window -t ${tmuxName} -x ${cols} -y ${rows} 2>/dev/null`);
+    } catch {}
     console.log(`[relay] Attaching to existing tmux session: ${tmuxName}`);
   }
   return pty.spawn("tmux", ["attach", "-t", tmuxName], {
@@ -242,7 +164,7 @@ function createSession(ws, msg) {
   if (agent === "shell") {
     agentBin = findShellBin();
     if (!agentBin) {
-      const reason = "Shell not found. Set SHELL or install zsh/bash/sh.";
+      const reason = "No login shell found. Set SHELL or install zsh, bash, or sh.";
       console.error(`[relay] Session ${id} failed: ${reason}`);
       send(ws, { type: "session:error", error: reason });
       return null;
@@ -258,7 +180,7 @@ function createSession(ws, msg) {
   } else {
     agentBin = findClaudeBin();
     if (!agentBin) {
-      const reason = "Claude CLI not found. Install it with: curl -fsSL https://claude.ai/install.sh | bash";
+      const reason = "Claude CLI not found. Install it with: npm install -g @anthropic-ai/claude-code";
       console.error(`[relay] Session ${id} failed: ${reason}`);
       send(ws, { type: "session:error", error: reason });
       return null;
@@ -282,7 +204,8 @@ function createSession(ws, msg) {
   }
   let agentArgs;
   if (agent === "shell") {
-    agentArgs = [];
+    const shellName = agentBin.split("/").pop() ?? "";
+    agentArgs = shellName === "sh" ? [] : ["-l"];
   } else if (agent === "pi") {
     agentArgs = ["--verbose"];
     const provider = normalizePiProviderForCli(msg.provider);