@saadnvd1/agent-os 0.3.660 → 0.3.662

package/app/api/sessions/[id]/summarize/route.ts

@@ -8,6 +8,7 @@ import { randomUUID } from "crypto";
 import { readFile } from "fs/promises";
 import { homedir } from "os";
 import { pasteText, tmux } from "@/lib/tmux/exec";
+import { sessionBaseEnv, UNSET_SERVER_ENV } from "@/lib/agents/server-env";
 
 // Get Claude session ID from tmux environment
 async function getClaudeSessionId(tmuxSession: string): Promise<string | null> {
@@ -135,7 +136,7 @@ async function generateSummary(conversation: string): Promise<string> {
   const routed = await routedRun("helper");
   return new Promise((resolve, reject) => {
     const claude = spawn("claude", ["-p", prompt, "--model", routed.model], {
-      env: { ...process.env, ...routed.env },
+      env: { ...sessionBaseEnv(), ...routed.env },
       stdio: ["pipe", "pipe", "pipe"],
     });
 
@@ -309,7 +310,7 @@ export async function POST(
 
       // Start new tmux session with Claude directly
       const isRoot = process.getuid?.() === 0;
-      const envPrefix = isRoot ? "IS_SANDBOX=1 " : "";
+      const envPrefix = UNSET_SERVER_ENV + (isRoot ? "IS_SANDBOX=1 " : "");
       const claudeCmd = effectiveAutoApprove(session.auto_approve)
         ? `${envPrefix}claude --dangerously-skip-permissions`
         : "claude";

package/lib/agents/launch.ts

@@ -10,6 +10,7 @@ import { runInBackground } from "../async-operations";
 import { trustPromptKeys } from "../tasks/state";
 import { BUS_BRIEF } from "./brief";
 import { selfUrl } from "./self-env";
+import { sessionBaseEnv, UNSET_SERVER_ENV } from "./server-env";
 import { sessionPath } from "./tool-path";
 import { autoCompactEnv } from "../chat/refresh";
 import { subagentEnv } from "../models/subagents";
@@ -110,7 +111,7 @@ export async function launchClaude(opts: {
     model_provider: opts.provider ?? null,
   });
   const mcpFlags = routedMcpFlags(opts.provider);
-  const agent = `export PATH=${shellQuote(AOS_BIN_DIR)}:"$HOME/.local/bin:$PATH"; ${routing.exportKey} ${provider.command} ${flags} ${mcpFlags}${CLAUDE_STATUS_SETTINGS_FLAG} --append-system-prompt-file ${shellQuote(briefFile)} "$(cat ${shellQuote(promptFile)})"; exec "\${SHELL:-/bin/sh}" -l`;
+  const agent = `${UNSET_SERVER_ENV}export PATH=${shellQuote(AOS_BIN_DIR)}:"$HOME/.local/bin:$PATH"; ${routing.exportKey} ${provider.command} ${flags} ${mcpFlags}${CLAUDE_STATUS_SETTINGS_FLAG} --append-system-prompt-file ${shellQuote(briefFile)} "$(cat ${shellQuote(promptFile)})"; exec "\${SHELL:-/bin/sh}" -l`;
   await execFileAsync(
     "tmux",
     [
@@ -123,7 +124,7 @@ export async function launchClaude(opts: {
       ...envArgs({ ...agentEnv(opts.sessionId), ...routing.env }),
       agent,
     ],
-    { cwd: opts.cwd }
+    { cwd: opts.cwd, env: sessionBaseEnv() }
   );
   runInBackground(
     () => acceptTrustPrompt(opts.tmuxName),

package/lib/agents/server-env.ts

@@ -0,0 +1,24 @@
+// Variables the server sets only for itself (`npm start`, `npm run dev`,
+// the dev-instance spawner). A session that inherits them breaks the
+// project it works in: NODE_ENV=production makes Vitest load React's
+// production build, PORT makes a dev server bind the live one's port.
+// AGENTOS_URL, AGENTOS_PORT and the session ids are not here: sessions need them.
+export const SERVER_ONLY_ENV = [
+  "NODE_ENV",
+  "PORT",
+  "AGENTOS_SERVER",
+  "AGENTOS_DEV",
+] as const;
+
+// Shell text that clears them inside a pane. `tmux new-session -e` can only
+// add variables, and an already-running tmux server may hold them globally.
+export const UNSET_SERVER_ENV = `unset ${SERVER_ONLY_ENV.join(" ")}; `;
+
+// The server's environment as an agent or its tools should see it.
+export function sessionBaseEnv(
+  env: NodeJS.ProcessEnv = process.env
+): NodeJS.ProcessEnv {
+  const out = { ...env };
+  for (const k of SERVER_ONLY_ENV) delete out[k];
+  return out;
+}

package/lib/chat/drivers/claude.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import { randomUUID } from "crypto";
 import {
   getSessionMessages,
@@ -145,7 +146,7 @@ export const claudeDriver: ChatDriver = {
         cwd,
         permissionMode: "bypassPermissions",
         allowDangerouslySkipPermissions: true,
-        env: { ...process.env, ...env },
+        env: { ...sessionBaseEnv(), ...env },
       },
     });
     try {
@@ -235,7 +236,7 @@ export const claudeDriver: ChatDriver = {
           append: options.systemAppend,
         },
         env: {
-          ...process.env,
+          ...sessionBaseEnv(),
           ...options.env,
           // When the agent is done with every turn it had queued: the end
           // of a turn that never sent its result.

package/lib/chat/drivers/codex.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import type { ChatConversation, ChatDriver } from "../driver";
 import type { ChatImage, DriverEvent } from "../events";
 import { InputQueue } from "../queue";
@@ -16,7 +17,7 @@ export const codexDriver: ChatDriver = {
 
   async discover({ cwd, env }) {
     const rpc = new CodexRpc(
-      { cwd, env: { ...process.env, ...env } },
+      { cwd, env: { ...sessionBaseEnv(), ...env } },
       { notify: () => {}, request: () => {}, exit: () => {} }
     );
     try {
@@ -51,7 +52,7 @@ export const codexDriver: ChatDriver = {
     let starting = false;
     let stopOnStart = false;
     const rpc: CodexRpc = new CodexRpc(
-      { cwd: options.cwd, env: { ...process.env, ...options.env } },
+      { cwd: options.cwd, env: { ...sessionBaseEnv(), ...options.env } },
       {
         notify(method, params) {
           if (method === "item/started") approvals.sawItem(params.item as P);

package/lib/chat/drivers/copilot.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import type { ChatConversation, ChatDriver, ChatStartOptions } from "../driver";
 import type { ChatImage, DriverEvent } from "../events";
 import { InputQueue } from "../queue";
@@ -52,7 +53,7 @@ export const copilotDriver: ChatDriver = {
     const held: { text: string; images?: ChatImage[] }[] = [];
     const rpc: CopilotRpc = new CopilotRpc(
       copilotArgs(options),
-      { cwd: options.cwd, env: { ...process.env, ...options.env } },
+      { cwd: options.cwd, env: { ...sessionBaseEnv(), ...options.env } },
       {
         notify(method, params) {
           if (method === "session/update")

package/lib/chat/drivers/opencode.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import type { ChatConversation, ChatDriver } from "../driver";
 import type { ChatImage, DriverEvent } from "../events";
 import { InputQueue } from "../queue";
@@ -46,7 +47,7 @@ export const openCodeDriver: ChatDriver = {
   atRest: false,
 
   async discover({ cwd, env }) {
-    const server = new OpenCodeServer(cwd, { ...process.env, ...env });
+    const server = new OpenCodeServer(cwd, { ...sessionBaseEnv(), ...env });
     try {
       const [providers, commands] = await Promise.all([
         server.call<{ all: P[]; connected: string[] }>("GET", "/provider"),
@@ -79,7 +80,7 @@ export const openCodeDriver: ChatDriver = {
     const out = new InputQueue<DriverEvent>();
     const emit = (e: DriverEvent) => out.push(e);
     const server = new OpenCodeServer(options.cwd, {
-      ...process.env,
+      ...sessionBaseEnv(),
       ...options.env,
     });
     let sessionId: string | null = null;

package/lib/chat/drivers/pi.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import type { ChatConversation, ChatDriver, ChatStartOptions } from "../driver";
 import type { ChatImage, DriverEvent } from "../events";
 import { InputQueue } from "../queue";
@@ -45,7 +46,7 @@ export const piDriver: ChatDriver = {
   async discover({ cwd, env }) {
     const rpc = new PiRpc(
       ["--no-session", "--offline"],
-      { cwd, env: { ...process.env, ...env } },
+      { cwd, env: { ...sessionBaseEnv(), ...env } },
       { event: () => {}, ui: () => {}, exit: () => {} }
     );
     try {
@@ -82,7 +83,7 @@ export const piDriver: ChatDriver = {
       {
         cwd: options.cwd,
         env: {
-          ...process.env,
+          ...sessionBaseEnv(),
           ...options.env,
           AGENTOS_PI_ACCESS_FILE: access.file,
           PI_OFFLINE: "1",

package/lib/chat/worker/client.ts

@@ -1,3 +1,4 @@
+import { UNSET_SERVER_ENV, sessionBaseEnv } from "../../agents/server-env";
 /**
  * The server's side of a chat worker: starts one in tmux when none is
  * running, connects to its socket, and passes commands and events along.
@@ -224,7 +225,7 @@ async function spawnWorker(sessionId: string): Promise<void> {
   if (await tmuxHas(name)) return;
   fs.mkdirSync(workerDir(), { recursive: true, mode: 0o700 });
   const env: Record<string, string | undefined> = {
-    ...process.env,
+    ...sessionBaseEnv(),
     DB_PATH: path.resolve(
       process.env.DB_PATH || path.join(process.cwd(), "agent-os.db")
     ),
@@ -233,18 +234,22 @@ async function spawnWorker(sessionId: string): Promise<void> {
   delete env.TMUX_PANE;
   fs.writeFileSync(envPath(sessionId), JSON.stringify(env), { mode: 0o600 });
   const entry = path.join(process.cwd(), "lib/chat/worker/main.ts");
-  await execFileAsync("tmux", [
-    "new-session",
-    "-d",
-    "-s",
-    name,
-    "-c",
-    process.cwd(),
-    // The worker finds its env file by DB_PATH, so it can't come from there.
-    "-e",
-    `DB_PATH=${env.DB_PATH}`,
-    `exec ${shellQuote(process.execPath)} --import tsx ${shellQuote(entry)} ${shellQuote(sessionId)} > ${shellQuote(path.join(workerDir(), `${sessionId}.log`))} 2>&1`,
-  ]);
+  await execFileAsync(
+    "tmux",
+    [
+      "new-session",
+      "-d",
+      "-s",
+      name,
+      "-c",
+      process.cwd(),
+      // The worker finds its env file by DB_PATH, so it can't come from there.
+      "-e",
+      `DB_PATH=${env.DB_PATH}`,
+      `${UNSET_SERVER_ENV}exec ${shellQuote(process.execPath)} --import tsx ${shellQuote(entry)} ${shellQuote(sessionId)} > ${shellQuote(path.join(workerDir(), `${sessionId}.log`))} 2>&1`,
+    ],
+    { env: sessionBaseEnv() }
+  );
 }
 
 const shellQuote = (s: string) => `'${s.replace(/'/g, `'\\''`)}'`;

package/lib/hosts/attach.ts

@@ -1,5 +1,12 @@
 import { SSH_OPTIONS, loginShellCommand, shellQuote } from "./ssh";
 import { isValidTmuxName } from "./tmux-name";
+import { SERVER_ONLY_ENV } from "../agents/server-env";
+
+// For a shared tmux server that already holds them: attach is the one path
+// that cannot prefix the pane command.
+const UNSET_GLOBAL_ENV = SERVER_ONLY_ENV.map(
+  (k) => `set-environment -gu ${k} \\;`
+).join(" ");
 
 export interface AttachSpec {
   sessionName: string;
@@ -28,7 +35,7 @@ export function buildTmuxAttachCommand(spec: AttachSpec): string {
   }
   // Commands chained after an attaching command only run once the client
   // detaches, so options go first; start-server keeps a fresh server alive.
-  const prefix = "tmux start-server \\; set -g mouse on \\;";
+  const prefix = `tmux start-server \\; set -g mouse on \\; ${UNSET_GLOBAL_ENV}`;
   if (spec.attachOnly) {
     // Quoted: zsh expands a bare "=word" to a command path.
     return `${prefix} attach-session -t ${shellQuote(`=${spec.sessionName}`)}`;

package/lib/orchestration.ts

@@ -15,6 +15,7 @@ import { resolveModelForAgent } from "./model-catalog";
 import { type AgentType, getProvider } from "./providers";
 import { statusDetector } from "./status-detector";
 import { wrapWithBanner } from "./banner";
+import { UNSET_SERVER_ENV } from "./agents/server-env";
 import { runInBackground } from "./async-operations";
 import { tmux } from "./tmux/exec";
 import { endTmuxSession } from "./tmux/end";
@@ -168,7 +169,8 @@ export async function spawnWorker(
 
   // Create tmux session with the agent and banner
   const agentCmd = `${provider.command} ${flagsStr}`;
-  const newSessionCmd = wrapWithBanner(agentCmd, provider.preamble);
+  const newSessionCmd =
+    UNSET_SERVER_ENV + wrapWithBanner(agentCmd, provider.preamble);
   try {
     await tmux(["set", "-g", "mouse", "on"]).catch(() => {});
     // The last argument is the agent's command line, which tmux runs.

package/lib/pr-generation.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "./agents/server-env";
 import { routedRun } from "./models/launch";
 import { execFile } from "child_process";
 import { git as runGit } from "./git-exec";
@@ -163,7 +164,7 @@ async function claudePrint(cwd: string, prompt: string): Promise<string> {
       ["--print", "--model", routed.model],
       {
         cwd,
-        env: { ...process.env, ...routed.env },
+        env: { ...sessionBaseEnv(), ...routed.env },
         encoding: "utf-8",
         timeout: 30_000,
         killSignal: "SIGKILL",

package/lib/tmux/exec.ts

@@ -1,5 +1,6 @@
 import { execFile } from "child_process";
 import { promisify } from "util";
+import { sessionBaseEnv } from "../agents/server-env";
 
 const execFileAsync = promisify(execFile);
 
@@ -9,6 +10,7 @@ export async function tmux(args: string[], timeout = 10_000): Promise<string> {
   const { stdout } = await execFileAsync("tmux", args, {
     timeout,
     maxBuffer: 8 << 20,
+    env: sessionBaseEnv(),
   });
   return stdout;
 }
@@ -24,7 +26,7 @@ export async function pasteText(
     const child = execFile(
       "tmux",
       ["load-buffer", "-b", buffer, "-"],
-      { timeout: 10_000 },
+      { timeout: 10_000, env: sessionBaseEnv() },
       (err) => (err ? reject(err) : resolve())
     );
     // tmux gone before it read everything is a failed paste, not a crash.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.660",
+  "version": "0.3.662",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"