@volter/supercode-terminal 0.2.60 → 0.2.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-terminal",
-  "version": "0.2.60",
+  "version": "0.2.61",
   "type": "module",
   "description": "Optional leak-safe terminal and tmux host adapter for Volter Harness frontends",
   "exports": {

package/substrate/tmux.js

@@ -59,12 +59,22 @@ export async function createSession({ command, cwd, env, name, owner, ownerOptio
     // set-options just configured. On an already-running server they are simply
     // reapplied.
     const sessionEnv = env ?? {};
+    // A tmux server keeps the environment of whoever started it as its global environment, and every pane inherits
+    // it. When an agent's session started the server (or is the launcher), that includes the session's own harness
+    // identity, so a new pane would resolve as that session. A pane's identity is only what its own session sets:
+    // every identity variable the server or the launcher holds and the session does not set is unset in the pane.
+    const identity = /^(CLAUDECODE|CLAUDE_CODE_SESSION_ID|CLAUDE_CODE_ENTRYPOINT|CODEX_THREAD_ID|CODEX_SESSION_ID|SUPERCODE_CALLER|SUPERCODE_CALLER_NAME|SUPERCODE_AGENT_[A-Z_]+)$/;
+    const serverNames = await runAsync("tmux", tmuxArgs(socket, ["show-environment", "-g"]))
+        .then((out) => out.split("\n").map((line) => /^([A-Za-z_][A-Za-z0-9_]*)=/.exec(line)?.[1]).filter((name) => Boolean(name)))
+        .catch(() => []); // no server yet: the one this creates starts from this launcher's environment
+    const inherited = [...new Set([...serverNames, ...Object.keys(process.env)])]
+        .filter((name) => identity.test(name) && !(name in sessionEnv));
     const bootstrapDirectories = [];
     const paneBootstrapArgs = (pane) => {
         const commandArgs = command === undefined ? [] : [command.program, ...(command.arguments ?? [])];
         // With neither command nor overrides, retain tmux's default-shell and
         // default-command behavior rather than choosing a shell for it.
-        if (command === undefined && Object.keys(sessionEnv).length === 0)
+        if (command === undefined && Object.keys(sessionEnv).length === 0 && inherited.length === 0)
             return [];
         // The complete command rides the private bootstrap file as well as its
         // environment. tmux's command message is bounded (roughly 16 KiB), much
@@ -72,7 +82,7 @@ export async function createSession({ command, cwd, env, name, owner, ownerOptio
         const directory = mkdtempSync(join(tmpdir(), "tmux-session-env-"));
         bootstrapDirectories.push(directory);
         const shell = process.env.SHELL ?? "/bin/sh";
-        return writeSessionEnvironmentBootstrap(directory, pane, sessionEnv, commandArgs.length === 0 ? [shell, "-l"] : commandArgs);
+        return writeSessionEnvironmentBootstrap(directory, pane, sessionEnv, inherited, commandArgs.length === 0 ? [shell, "-l"] : commandArgs);
     };
     try {
         const startArgs = [...sessionServerOptionArgs(), "new-session", "-d", "-s", name];
@@ -395,7 +405,7 @@ function tmuxClientEnvironment(source = process.env) {
     }
     return environment;
 }
-function writeSessionEnvironmentBootstrap(directory, pane, environment, command) {
+function writeSessionEnvironmentBootstrap(directory, pane, environment, unset, command) {
     const environmentPath = join(directory, `pane-${pane}.env`);
     const wrapperPath = join(directory, `pane-${pane}.sh`);
     const lines = Object.entries(environment).map(([name, value]) => {
@@ -404,6 +414,7 @@ function writeSessionEnvironmentBootstrap(directory, pane, environment, command)
         }
         return `export ${name}=${shellQuote(value)}`;
     });
+    lines.unshift(...unset.map((name) => `unset ${name}`));
     writeFileSync(environmentPath, `${lines.join("\n")}\n`, { flag: "wx", mode: 0o600 });
     writeFileSync(wrapperPath, [
         "#!/bin/sh",