@bastani/atomic 0.6.6-0 → 0.6.6

package/src/sdk/runtime/executor.ts

@@ -62,11 +62,13 @@ import {
   HeadlessClaudeSessionWrapper,
 } from "../providers/claude.ts";
 import { withHeadlessOpencodeEnv } from "../providers/opencode.ts";
+import { resolveCopilotCliPath } from "../providers/copilot.ts";
 import { OrchestratorPanel } from "./panel.tsx";
 import { GraphFrontierTracker } from "./graph-inference.ts";
 import { buildSnapshot, writeSnapshot } from "./status-writer.ts";
 import { errorMessage } from "../errors.ts";
 import { createPainter } from "../../theme/colors.ts";
+import { atomicTempEnv } from "../../lib/atomic-temp.ts";
 
 /** Maximum time (ms) for the SDK probe to succeed after port is discovered. */
 export const SERVER_PROBE_TIMEOUT_MS = 60_000;
@@ -287,29 +289,37 @@ export function buildPaneCommand(
     envVars: defaultEnvVars,
   } = AGENT_CLI[agent];
   const chatFlags = overrides.chatFlags ?? defaultFlags;
+  const claudeTempEnv = agent === "claude" ? atomicTempEnv() : {};
   const envVars = overrides.envVars
     ? { ...defaultEnvVars, ...overrides.envVars }
     : defaultEnvVars;
+  const mergedEnvVars = { ...envVars, ...claudeTempEnv, ...overrides.envVars };
 
   const resolvedCmd = quotePathIfNeeded(resolveCliBinary(cmd));
 
   switch (agent) {
-    case "copilot":
+    case "copilot": {
+      // Prefer the copilot binary resolved via resolveCopilotCliPath so that
+      // COPILOT_CLI_PATH (set by applyContainerEnvDefaults in Bun-without-node
+      // environments) is honoured in the tmux pane command, keeping the pane
+      // binary consistent with the SDK subprocess binary.
+      const copilotBin = resolveCopilotCliPath() ?? resolveCliBinary(cmd);
       return {
         command: [
-          resolvedCmd,
+          quotePathIfNeeded(copilotBin),
           "--ui-server",
           "--port",
           "0",
           ...chatFlags,
           ...extraChatFlags,
         ].join(" "),
-        envVars,
+        envVars: mergedEnvVars,
       };
+    }
     case "opencode":
       return {
         command: [resolvedCmd, "--port", "0", ...chatFlags].join(" "),
-        envVars,
+        envVars: mergedEnvVars,
       };
     case "claude": {
       // Claude is started via createClaudeSession() in the workflow's run().
@@ -323,7 +333,7 @@ export function buildPaneCommand(
           : resolveCliBinary(shellCandidate);
       return {
         command: quotePathIfNeeded(resolvedShell),
-        envVars,
+        envVars: mergedEnvVars,
       };
     }
     default:
@@ -494,6 +504,7 @@ export async function executeWorkflow(
   const launcherExt = isWin ? "ps1" : "sh";
   const launcherPath = join(sessionsBaseDir, `orchestrator.${launcherExt}`);
   const logPath = join(sessionsBaseDir, "orchestrator.log");
+  const launcherEnvVars = agent === "claude" ? atomicTempEnv() : {};
 
   // Inputs are passed through as base64-encoded JSON so long multiline
   // text values survive shell quoting without any further escaping.
@@ -515,6 +526,9 @@ export async function executeWorkflow(
   const launcherScript = isWin
     ? [
         `Set-Location "${escPwsh(projectRoot)}"`,
+        ...Object.entries(launcherEnvVars).map(
+          ([key, value]) => `$env:${key} = "${escPwsh(value)}"`,
+        ),
         `$env:ATOMIC_WF_ID = "${escPwsh(workflowRunId)}"`,
         `$env:ATOMIC_WF_TMUX = "${escPwsh(tmuxSessionName)}"`,
         `$env:ATOMIC_WF_AGENT = "${escPwsh(agent)}"`,
@@ -524,6 +538,9 @@ export async function executeWorkflow(
     : [
         "#!/bin/bash",
         `cd "${escBash(projectRoot)}"`,
+        ...Object.entries(launcherEnvVars).map(
+          ([key, value]) => `export ${key}="${escBash(value)}"`,
+        ),
         `export ATOMIC_WF_ID="${escBash(workflowRunId)}"`,
         `export ATOMIC_WF_TMUX="${escBash(tmuxSessionName)}"`,
         `export ATOMIC_WF_AGENT="${escBash(agent)}"`,
@@ -536,7 +553,7 @@ export async function executeWorkflow(
   const shellCmd = isWin
     ? `pwsh -NoProfile -File "${escPwsh(launcherPath)}"`
     : `bash "${escBash(launcherPath)}"`;
-  tmux.createSession(tmuxSessionName, shellCmd, "orchestrator");
+  tmux.createSession(tmuxSessionName, shellCmd, "orchestrator", undefined, launcherEnvVars);
   tmux.setSessionEnv(tmuxSessionName, "ATOMIC_AGENT", agent);
 
   if (detach) {
@@ -1322,7 +1339,7 @@ async function initProviderClientAndSession<A extends AgentType>(
   switch (agent) {
     case "copilot": {
       const { CopilotClient, approveAll } = await import("@github/copilot-sdk");
-      const { copilotSubprocessEnv, mergeCopilotSystemMessage } =
+      const { copilotSdkLaunchOptions, mergeCopilotSystemMessage } =
         await import("../providers/copilot.ts");
       const { resolveAdditionalInstructionsContent } =
         await import("../../services/config/additional-instructions.ts");
@@ -1331,7 +1348,7 @@ async function initProviderClientAndSession<A extends AgentType>(
       // Headless: let the SDK spawn its own CLI process (no cliUrl).
       // Non-headless: connect to the CLI server running in a tmux pane.
       // `env` is only meaningful in the headless path — the SDK ignores
-      // it when `cliUrl` is set — but layering in `copilotSubprocessEnv`
+      // it when `cliUrl` is set — but layering in `copilotSdkLaunchOptions`
       // when the caller didn't supply their own env keeps the
       // SQLite `ExperimentalWarning` from leaking through the SDK's
       // `[CLI subprocess]` stderr forwarder.
@@ -1339,7 +1356,7 @@ async function initProviderClientAndSession<A extends AgentType>(
       let client: InstanceType<typeof CopilotClient>;
       if (headless) {
         client = new CopilotClient({
-          env: copilotSubprocessEnv(),
+          ...copilotSdkLaunchOptions(),
           ...copilotClientOpts,
         });
       } else {

package/src/sdk/runtime/tmux.ts

@@ -9,8 +9,8 @@
 import { join } from "node:path";
 import { requiredMuxBinaryCandidatesForPlatform } from "../../lib/spawn.ts";
 import { writeFileSync, unlinkSync } from "node:fs";
-import { tmpdir } from "node:os";
 import type { Subprocess } from "bun";
+import { atomicTempPath } from "../../lib/atomic-temp.ts";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -353,7 +353,11 @@ export function sendLiteralText(paneId: string, text: string): void {
  */
 export function sendViaPasteBuffer(paneId: string, text: string): void {
   const normalized = text.replace(/[\r\n]+/g, " ");
-  const tmp = join(tmpdir(), `atomic-paste-${process.pid}-${Date.now()}.txt`);
+  const tmp = atomicTempPath(
+    "atomic-paste",
+    ".txt",
+    `${process.pid}-${Date.now()}`,
+  );
 
   writeFileSync(tmp, normalized, "utf-8");
   try {

package/src/services/system/auth.test.ts

@@ -38,7 +38,13 @@ let copilotGetAuthStatus = mock<() => Promise<CopilotAuthStatus>>(async () => ({
   login: "octocat",
 }));
 
+// Captures the options passed to `new CopilotClient(...)` on each call.
+let lastCopilotConstructorOptions: unknown = undefined;
+
 class FakeCopilotClient {
+  constructor(options: unknown) {
+    lastCopilotConstructorOptions = options;
+  }
   async start(): Promise<void> {
     await copilotStart();
   }
@@ -114,6 +120,7 @@ afterAll(() => {
 const { checkAgentAuth, printAuthError } = await import("./auth.ts");
 
 beforeEach(() => {
+  lastCopilotConstructorOptions = undefined;
   copilotStart.mockClear();
   copilotStart.mockImplementation(async () => {});
   copilotStop.mockClear();
@@ -173,6 +180,52 @@ describe("checkAgentAuth(copilot)", () => {
     // The stop failure must not shadow the probe result.
     expect(result.detail).not.toContain("stop crashed");
   });
+
+  test("constructs CopilotClient with COPILOT_CLI_PATH as cliPath and NODE_NO_WARNINGS=1 in env", async () => {
+    const origCliPath = process.env["COPILOT_CLI_PATH"];
+    process.env["COPILOT_CLI_PATH"] = "/explicit/bin/copilot";
+    try {
+      await checkAgentAuth("copilot");
+      const opts = lastCopilotConstructorOptions as {
+        cliPath?: string;
+        env?: Record<string, string | undefined>;
+      };
+      expect(opts).toBeDefined();
+      expect(opts.cliPath).toBe("/explicit/bin/copilot");
+      expect(opts.env?.["NODE_NO_WARNINGS"]).toBe("1");
+    } finally {
+      if (origCliPath === undefined) delete process.env["COPILOT_CLI_PATH"];
+      else process.env["COPILOT_CLI_PATH"] = origCliPath;
+    }
+  });
+
+  test("constructs CopilotClient via centralized launch options — env.NODE_NO_WARNINGS=1 present even when COPILOT_CLI_PATH is unset", async () => {
+    // When COPILOT_CLI_PATH is absent the auth probe delegates entirely to
+    // copilotSdkLaunchOptions(), which always injects NODE_NO_WARNINGS=1
+    // via copilotSubprocessEnv(). No cliPath should appear in the options
+    // because resolveCopilotCliPath() returns undefined when the env var is
+    // not set and no standalone binary is found on PATH.
+    const origCliPath = process.env["COPILOT_CLI_PATH"];
+    delete process.env["COPILOT_CLI_PATH"];
+    try {
+      await checkAgentAuth("copilot");
+      const opts = lastCopilotConstructorOptions as {
+        cliPath?: string;
+        env?: Record<string, string | undefined>;
+      };
+      expect(opts).toBeDefined();
+      // Centralized env must always include NODE_NO_WARNINGS regardless of cliPath.
+      expect(opts.env?.["NODE_NO_WARNINGS"]).toBe("1");
+      // cliPath must not be injected from a stale or undefined resolution.
+      // (It may be defined if a copilot binary happens to be on PATH in the
+      // test environment, but it must never be "/explicit/bin/copilot" which
+      // is only set by the sibling test above.)
+      expect(opts.cliPath).not.toBe("/explicit/bin/copilot");
+    } finally {
+      if (origCliPath === undefined) delete process.env["COPILOT_CLI_PATH"];
+      else process.env["COPILOT_CLI_PATH"] = origCliPath;
+    }
+  });
 });
 
 describe("checkAgentAuth(claude)", () => {

package/src/services/system/auth.ts

@@ -17,7 +17,8 @@
 
 import type { AgentKey } from "../config/index.ts";
 import { COLORS } from "../../theme/colors.ts";
-import { copilotSubprocessEnv } from "../../sdk/providers/copilot.ts";
+import { copilotSdkLaunchOptions } from "../../sdk/providers/copilot.ts";
+import { withAtomicTempEnv } from "../../lib/atomic-temp.ts";
 
 export interface AuthCheckResult {
   /** True when the SDK reports the user is authenticated. */
@@ -72,7 +73,7 @@ const AUTH_PROMPTS: Record<AgentKey, { name: string; loginHint: string }> = {
 
 async function checkCopilotAuth(): Promise<AuthCheckResult> {
   const { CopilotClient } = await import("@github/copilot-sdk");
-  const client = new CopilotClient({ env: copilotSubprocessEnv() });
+  const client = new CopilotClient(copilotSdkLaunchOptions());
   try {
     await client.start();
     const status = await client.getAuthStatus();
@@ -105,33 +106,35 @@ async function checkClaudeAuth(): Promise<AuthCheckResult> {
   // actually delivered.
   async function* emptyStream(): AsyncGenerator<never, void, void> {}
 
-  const q = query({
-    prompt: emptyStream(),
-    options: {
-      pathToClaudeCodeExecutable: resolveHeadlessClaudeBin(),
-    },
-  });
+  return await withAtomicTempEnv(async () => {
+    const q = query({
+      prompt: emptyStream(),
+      options: {
+        pathToClaudeCodeExecutable: resolveHeadlessClaudeBin(),
+      },
+    });
 
-  try {
-    const init = await q.initializationResult();
-    const account = init.account ?? {};
-    const loggedIn = Boolean(
-      account.email || account.tokenSource || account.apiKeySource,
-    );
-    return {
-      loggedIn,
-      identity: account.email,
-    };
-  } catch (err) {
-    return {
-      loggedIn: false,
-      detail: err instanceof Error ? err.message : String(err),
-    };
-  } finally {
     try {
-      q.close();
-    } catch {
-      // Best effort — the subprocess is torn down on process exit anyway.
+      const init = await q.initializationResult();
+      const account = init.account ?? {};
+      const loggedIn = Boolean(
+        account.email || account.tokenSource || account.apiKeySource,
+      );
+      return {
+        loggedIn,
+        identity: account.email,
+      };
+    } catch (err) {
+      return {
+        loggedIn: false,
+        detail: err instanceof Error ? err.message : String(err),
+      };
+    } finally {
+      try {
+        q.close();
+      } catch {
+        // Best effort — the subprocess is torn down on process exit anyway.
+      }
     }
-  }
+  });
 }

package/src/services/system/detect.ts

@@ -24,7 +24,7 @@ export function isCommandInstalled(cmd: string): boolean {
  * @returns The absolute path to the command, or null if not found
  */
 export function getCommandPath(cmd: string): string | null {
-  return Bun.which(cmd);
+  return Bun.which(cmd, { PATH: process.env["PATH"] ?? "" });
 }
 
 /**