@bastani/atomic 0.6.6-0 → 0.6.6

package/src/lib/terminal-env.test.ts

@@ -0,0 +1,343 @@
+import { describe, expect, test } from "bun:test";
+import {
+  TERMINAL_ENV_KEYS,
+  buildLauncherEnv,
+  buildSpawnEnv,
+  buildTmuxEnv,
+  mergeTerminalEnv,
+  normalizedTerminalEnv,
+  pickTerminalEnv,
+} from "./terminal-env.ts";
+
+describe("normalizedTerminalEnv", () => {
+  test("missing locale defaults to en_US.UTF-8", () => {
+    const env = normalizedTerminalEnv({});
+    expect(env["LANG"]).toBe("en_US.UTF-8");
+    expect(env["LC_ALL"]).toBe("en_US.UTF-8");
+    expect(env["LC_CTYPE"]).toBe("en_US.UTF-8");
+  });
+
+  test("existing UTF-8 locale is preserved", () => {
+    const base = { LANG: "en_GB.UTF-8", LC_ALL: "fr_FR.utf8", LC_CTYPE: "C.UTF-8" };
+    const env = normalizedTerminalEnv(base);
+    expect(env["LANG"]).toBe("en_GB.UTF-8");
+    expect(env["LC_ALL"]).toBe("fr_FR.utf8");
+    expect(env["LC_CTYPE"]).toBe("C.UTF-8");
+  });
+
+  test("non-UTF-8 locale is replaced with en_US.UTF-8", () => {
+    const base = { LANG: "en_US.ISO-8859-1", LC_ALL: "C", LC_CTYPE: "POSIX" };
+    const env = normalizedTerminalEnv(base);
+    expect(env["LANG"]).toBe("en_US.UTF-8");
+    expect(env["LC_ALL"]).toBe("en_US.UTF-8");
+    expect(env["LC_CTYPE"]).toBe("en_US.UTF-8");
+  });
+
+  test("TERM=dumb becomes xterm-256color", () => {
+    const env = normalizedTerminalEnv({ TERM: "dumb" });
+    expect(env["TERM"]).toBe("xterm-256color");
+  });
+
+  test("missing TERM defaults to xterm-256color", () => {
+    const env = normalizedTerminalEnv({});
+    expect(env["TERM"]).toBe("xterm-256color");
+  });
+
+  test("explicit COLORTERM is preserved", () => {
+    const env = normalizedTerminalEnv({ COLORTERM: "24bit" });
+    expect(env["COLORTERM"]).toBe("24bit");
+  });
+
+  test("missing COLORTERM defaults to truecolor", () => {
+    const env = normalizedTerminalEnv({});
+    expect(env["COLORTERM"]).toBe("truecolor");
+  });
+
+  test("other env vars carried through unchanged", () => {
+    const env = normalizedTerminalEnv({ HOME: "/root", PATH: "/usr/bin" });
+    expect(env["HOME"]).toBe("/root");
+    expect(env["PATH"]).toBe("/usr/bin");
+  });
+
+  test("undefined values dropped", () => {
+    const base: NodeJS.ProcessEnv = { SOME_VAR: undefined };
+    const env = normalizedTerminalEnv(base);
+    expect("SOME_VAR" in env).toBe(false);
+  });
+});
+
+describe("mergeTerminalEnv", () => {
+  test("explicit env vars win over defaults", () => {
+    const env = mergeTerminalEnv(
+      { LANG: "ja_JP.UTF-8", TERM: "screen", COLORTERM: "256" },
+      {},
+    );
+    expect(env["LANG"]).toBe("ja_JP.UTF-8");
+    expect(env["TERM"]).toBe("screen");
+    expect(env["COLORTERM"]).toBe("256");
+  });
+
+  test("missing keys still get sane defaults", () => {
+    const env = mergeTerminalEnv({}, {});
+    expect(env["LANG"]).toBe("en_US.UTF-8");
+    expect(env["TERM"]).toBe("xterm-256color");
+    expect(env["COLORTERM"]).toBe("truecolor");
+  });
+
+  test("explicit vars merged on top of baseEnv normalization", () => {
+    const base = { LANG: "C", TERM: "dumb" };
+    const env = mergeTerminalEnv({ LANG: "de_DE.UTF-8" }, base);
+    // explicit wins
+    expect(env["LANG"]).toBe("de_DE.UTF-8");
+    // TERM=dumb normalized then no override → xterm-256color
+    expect(env["TERM"]).toBe("xterm-256color");
+  });
+});
+
+describe("TERMINAL_ENV_KEYS", () => {
+  test("contains exactly the five expected keys", () => {
+    expect(TERMINAL_ENV_KEYS).toEqual(["LANG", "LC_ALL", "LC_CTYPE", "TERM", "COLORTERM"]);
+  });
+});
+
+describe("pickTerminalEnv", () => {
+  test("picks only TERMINAL_ENV_KEYS", () => {
+    const env = { LANG: "en_US.UTF-8", TERM: "xterm", HOME: "/home/user", PATH: "/usr/bin" };
+    const picked = pickTerminalEnv(env);
+    expect(Object.keys(picked)).toEqual(expect.arrayContaining(["LANG", "TERM"]));
+    expect("HOME" in picked).toBe(false);
+    expect("PATH" in picked).toBe(false);
+  });
+
+  test("omits absent keys rather than setting undefined", () => {
+    const env = { LANG: "en_US.UTF-8" };
+    const picked = pickTerminalEnv(env);
+    expect("LC_ALL" in picked).toBe(false);
+    expect("TERM" in picked).toBe(false);
+    expect("COLORTERM" in picked).toBe(false);
+  });
+
+  test("returns all five when all present", () => {
+    const env = { LANG: "a", LC_ALL: "b", LC_CTYPE: "c", TERM: "d", COLORTERM: "e" };
+    const picked = pickTerminalEnv(env);
+    expect(Object.keys(picked).sort()).toEqual(["COLORTERM", "LANG", "LC_ALL", "LC_CTYPE", "TERM"]);
+  });
+});
+
+describe("buildSpawnEnv", () => {
+  test("includes full normalized baseEnv", () => {
+    const base = { HOME: "/root", PATH: "/usr/bin", TERM: "xterm-256color" };
+    const env = buildSpawnEnv({ MY_VAR: "1" }, base);
+    expect(env["HOME"]).toBe("/root");
+    expect(env["PATH"]).toBe("/usr/bin");
+    expect(env["MY_VAR"]).toBe("1");
+  });
+
+  test("explicit env wins over baseEnv", () => {
+    const base = { LANG: "C", TERM: "dumb" };
+    const env = buildSpawnEnv({ LANG: "ja_JP.UTF-8" }, base);
+    expect(env["LANG"]).toBe("ja_JP.UTF-8");
+  });
+
+  test("applies sane terminal defaults from baseEnv", () => {
+    const env = buildSpawnEnv({}, {});
+    expect(env["TERM"]).toBe("xterm-256color");
+    expect(env["COLORTERM"]).toBe("truecolor");
+  });
+});
+
+describe("buildLauncherEnv", () => {
+  test("does NOT include non-terminal keys from baseEnv", () => {
+    const base = { HOME: "/root", PATH: "/usr/bin", LANG: "en_US.UTF-8", TERM: "xterm-256color", COLORTERM: "truecolor" };
+    const env = buildLauncherEnv({}, base);
+    expect("HOME" in env).toBe(false);
+    expect("PATH" in env).toBe(false);
+  });
+
+  test("includes TERMINAL_ENV_KEYS from normalized baseEnv", () => {
+    const base = { LANG: "C", TERM: "dumb" };
+    const env = buildLauncherEnv({}, base);
+    // normalization applies: C → en_US.UTF-8, dumb → xterm-256color
+    expect(env["LANG"]).toBe("en_US.UTF-8");
+    expect(env["TERM"]).toBe("xterm-256color");
+    expect(env["COLORTERM"]).toBe("truecolor");
+  });
+
+  test("explicit env wins and is included", () => {
+    const base = { LANG: "en_US.UTF-8", TERM: "xterm-256color" };
+    const env = buildLauncherEnv({ LANG: "ja_JP.UTF-8", MY_VAR: "hello" }, base);
+    expect(env["LANG"]).toBe("ja_JP.UTF-8");
+    expect(env["MY_VAR"]).toBe("hello");
+  });
+
+  test("no process.env leakage with empty baseEnv", () => {
+    const env = buildLauncherEnv({}, {});
+    // Only terminal keys + sane defaults, no PATH/HOME from process.env
+    const envKeys = Object.keys(env);
+    const nonTerminalKeys = envKeys.filter(
+      (k) => !(TERMINAL_ENV_KEYS as readonly string[]).includes(k),
+    );
+    expect(nonTerminalKeys).toEqual([]);
+  });
+
+  test("excludes secret env vars: GH_TOKEN, COPILOT_GITHUB_TOKEN, ANTHROPIC_API_KEY", () => {
+    const base = {
+      LANG: "en_US.UTF-8",
+      TERM: "xterm-256color",
+      COLORTERM: "truecolor",
+      GH_TOKEN: "ghp_secret",
+      COPILOT_GITHUB_TOKEN: "ghu_secret",
+      ANTHROPIC_API_KEY: "sk-ant-secret",
+      HOME: "/home/user",
+      PATH: "/usr/bin:/bin",
+    };
+    const env = buildLauncherEnv({}, base);
+    expect("GH_TOKEN" in env).toBe(false);
+    expect("COPILOT_GITHUB_TOKEN" in env).toBe(false);
+    expect("ANTHROPIC_API_KEY" in env).toBe(false);
+    expect("HOME" in env).toBe(false);
+    expect("PATH" in env).toBe(false);
+    // terminal keys still present
+    expect(env["LANG"]).toBe("en_US.UTF-8");
+    expect(env["TERM"]).toBe("xterm-256color");
+    expect(env["COLORTERM"]).toBe("truecolor");
+  });
+
+  test("buildSpawnEnv preserves full inherited env including non-terminal keys", () => {
+    const base = {
+      HOME: "/home/user",
+      PATH: "/usr/bin:/bin",
+      GH_TOKEN: "ghp_secret",
+      LANG: "C",
+      TERM: "dumb",
+    };
+    const env = buildSpawnEnv({ MY_EXPLICIT: "yes" }, base);
+    // full env inherited
+    expect(env["HOME"]).toBe("/home/user");
+    expect(env["PATH"]).toBe("/usr/bin:/bin");
+    expect(env["GH_TOKEN"]).toBe("ghp_secret");
+    // normalization applied
+    expect(env["LANG"]).toBe("en_US.UTF-8");
+    expect(env["TERM"]).toBe("xterm-256color");
+    // explicit override present
+    expect(env["MY_EXPLICIT"]).toBe("yes");
+  });
+});
+
+describe("buildTmuxEnv", () => {
+  const SENSITIVE_BASE = {
+    LANG: "en_US.UTF-8",
+    LC_ALL: "en_US.UTF-8",
+    LC_CTYPE: "en_US.UTF-8",
+    TERM: "xterm-256color",
+    COLORTERM: "truecolor",
+    GH_TOKEN: "ghp_secret",
+    COPILOT_GITHUB_TOKEN: "ghu_secret",
+    ANTHROPIC_API_KEY: "sk-ant-secret",
+    OPENAI_API_KEY: "sk-openai-secret",
+    HOME: "/home/user",
+    PATH: "/usr/bin:/bin",
+    ARBITRARY_VAR: "should-not-appear",
+  };
+
+  test("excludes GH_TOKEN", () => {
+    const env = buildTmuxEnv({}, SENSITIVE_BASE);
+    expect("GH_TOKEN" in env).toBe(false);
+  });
+
+  test("excludes COPILOT_GITHUB_TOKEN", () => {
+    const env = buildTmuxEnv({}, SENSITIVE_BASE);
+    expect("COPILOT_GITHUB_TOKEN" in env).toBe(false);
+  });
+
+  test("excludes ANTHROPIC_API_KEY", () => {
+    const env = buildTmuxEnv({}, SENSITIVE_BASE);
+    expect("ANTHROPIC_API_KEY" in env).toBe(false);
+  });
+
+  test("excludes OPENAI_API_KEY", () => {
+    const env = buildTmuxEnv({}, SENSITIVE_BASE);
+    expect("OPENAI_API_KEY" in env).toBe(false);
+  });
+
+  test("excludes HOME", () => {
+    const env = buildTmuxEnv({}, SENSITIVE_BASE);
+    expect("HOME" in env).toBe(false);
+  });
+
+  test("excludes PATH", () => {
+    const env = buildTmuxEnv({}, SENSITIVE_BASE);
+    expect("PATH" in env).toBe(false);
+  });
+
+  test("excludes arbitrary inherited env vars", () => {
+    const env = buildTmuxEnv({}, SENSITIVE_BASE);
+    expect("ARBITRARY_VAR" in env).toBe(false);
+  });
+
+  test("includes normalized LANG", () => {
+    const env = buildTmuxEnv({}, { LANG: "C" });
+    expect(env["LANG"]).toBe("en_US.UTF-8");
+  });
+
+  test("includes normalized LC_ALL", () => {
+    const env = buildTmuxEnv({}, { LC_ALL: "POSIX" });
+    expect(env["LC_ALL"]).toBe("en_US.UTF-8");
+  });
+
+  test("includes normalized LC_CTYPE", () => {
+    const env = buildTmuxEnv({}, { LC_CTYPE: "en_US.ISO-8859-1" });
+    expect(env["LC_CTYPE"]).toBe("en_US.UTF-8");
+  });
+
+  test("includes normalized TERM (dumb → xterm-256color)", () => {
+    const env = buildTmuxEnv({}, { TERM: "dumb" });
+    expect(env["TERM"]).toBe("xterm-256color");
+  });
+
+  test("includes normalized COLORTERM default", () => {
+    const env = buildTmuxEnv({}, {});
+    expect(env["COLORTERM"]).toBe("truecolor");
+  });
+
+  test("preserves explicit UTF-8 LANG", () => {
+    const env = buildTmuxEnv({}, { LANG: "ja_JP.UTF-8" });
+    expect(env["LANG"]).toBe("ja_JP.UTF-8");
+  });
+
+  test("preserves explicit TERM when not dumb", () => {
+    const env = buildTmuxEnv({}, { TERM: "screen-256color" });
+    expect(env["TERM"]).toBe("screen-256color");
+  });
+
+  test("includes explicit ATOMIC_AGENT", () => {
+    const env = buildTmuxEnv({ ATOMIC_AGENT: "copilot" }, {});
+    expect(env["ATOMIC_AGENT"]).toBe("copilot");
+  });
+
+  test("includes explicit COPILOT_CUSTOM_INSTRUCTIONS_DIRS", () => {
+    const env = buildTmuxEnv({ COPILOT_CUSTOM_INSTRUCTIONS_DIRS: "/a:/b" }, {});
+    expect(env["COPILOT_CUSTOM_INSTRUCTIONS_DIRS"]).toBe("/a:/b");
+  });
+
+  test("explicit env wins over baseEnv for terminal keys", () => {
+    const env = buildTmuxEnv({ LANG: "de_DE.UTF-8", TERM: "screen" }, { LANG: "C", TERM: "dumb" });
+    expect(env["LANG"]).toBe("de_DE.UTF-8");
+    expect(env["TERM"]).toBe("screen");
+  });
+
+  test("only TERMINAL_ENV_KEYS + explicit vars — no leakage", () => {
+    const env = buildTmuxEnv({ ATOMIC_AGENT: "claude" }, SENSITIVE_BASE);
+    const envKeys = Object.keys(env);
+    const allowedKeys = new Set([...(TERMINAL_ENV_KEYS as readonly string[]), "ATOMIC_AGENT"]);
+    const leaked = envKeys.filter((k) => !allowedKeys.has(k));
+    expect(leaked).toEqual([]);
+  });
+
+  test("all TERMINAL_ENV_KEYS present with empty baseEnv", () => {
+    const env = buildTmuxEnv({}, {});
+    for (const key of TERMINAL_ENV_KEYS) {
+      expect(key in env).toBe(true);
+    }
+  });
+});

package/src/lib/terminal-env.ts

@@ -0,0 +1,100 @@
+const UTF8_RE = /utf-?8/i;
+
+function isUtf8(value: string): boolean {
+  return UTF8_RE.test(value);
+}
+
+const DEFAULT_LOCALE = "en_US.UTF-8";
+const DEFAULT_TERM = "xterm-256color";
+const DEFAULT_COLORTERM = "truecolor";
+
+const LOCALE_KEYS = ["LANG", "LC_ALL", "LC_CTYPE"] as const;
+
+export const TERMINAL_ENV_KEYS = [
+  "LANG",
+  "LC_ALL",
+  "LC_CTYPE",
+  "TERM",
+  "COLORTERM",
+] as const;
+
+export type TerminalEnvKey = (typeof TERMINAL_ENV_KEYS)[number];
+
+export function normalizedTerminalEnv(
+  baseEnv: NodeJS.ProcessEnv = process.env,
+): Record<string, string> {
+  const result: Record<string, string> = {};
+
+  for (const [key, value] of Object.entries(baseEnv)) {
+    if (typeof value === "string") {
+      result[key] = value;
+    }
+  }
+
+  for (const key of LOCALE_KEYS) {
+    const existing = result[key];
+    if (!existing || !isUtf8(existing)) {
+      result[key] = DEFAULT_LOCALE;
+    }
+  }
+
+  const term = result["TERM"];
+  if (!term || term === "dumb") {
+    result["TERM"] = DEFAULT_TERM;
+  }
+
+  if (!result["COLORTERM"]) {
+    result["COLORTERM"] = DEFAULT_COLORTERM;
+  }
+
+  return result;
+}
+
+export function mergeTerminalEnv(
+  envVars: Record<string, string> = {},
+  baseEnv: NodeJS.ProcessEnv = process.env,
+): Record<string, string> {
+  const defaults = normalizedTerminalEnv(baseEnv);
+  return { ...defaults, ...envVars };
+}
+
+export function pickTerminalEnv(
+  env: Record<string, string>,
+): Partial<Record<TerminalEnvKey, string>> {
+  const result: Partial<Record<TerminalEnvKey, string>> = {};
+  for (const key of TERMINAL_ENV_KEYS) {
+    if (key in env) {
+      result[key] = env[key];
+    }
+  }
+  return result;
+}
+
+export function buildSpawnEnv(
+  explicitEnv: Record<string, string>,
+  baseEnv: NodeJS.ProcessEnv = process.env,
+): Record<string, string> {
+  return { ...normalizedTerminalEnv(baseEnv), ...explicitEnv };
+}
+
+function buildMinimalEnv(
+  explicitEnv: Record<string, string>,
+  baseEnv: NodeJS.ProcessEnv = process.env,
+): Record<string, string> {
+  const terminalEnv = pickTerminalEnv(normalizedTerminalEnv(baseEnv));
+  return { ...terminalEnv, ...explicitEnv };
+}
+
+export function buildLauncherEnv(
+  explicitEnv: Record<string, string>,
+  baseEnv: NodeJS.ProcessEnv = process.env,
+): Record<string, string> {
+  return buildMinimalEnv(explicitEnv, baseEnv);
+}
+
+export function buildTmuxEnv(
+  explicitEnv: Record<string, string>,
+  baseEnv: NodeJS.ProcessEnv = process.env,
+): Record<string, string> {
+  return buildLauncherEnv(explicitEnv, baseEnv);
+}

package/src/scripts/clean-dist.test.ts

@@ -0,0 +1,53 @@
+import { describe, expect, test } from "bun:test";
+import { mkdir, writeFile, access } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { cleanDist } from "./clean-dist.ts";
+
+/**
+ * Verify cleanDist removes files using a temp directory stand-in.
+ *
+ * cleanDist hard-codes DIST = resolve(ROOT, "dist"), so we test the
+ * exported helper by temporarily monkey-patching `process.env` is NOT
+ * needed — instead we test the real cleanDist against the real dist
+ * path when dist does not exist (no-op / force), and separately verify
+ * the file-removal behavior via a parallel helper that mirrors the
+ * implementation with a temp path.
+ */
+
+async function pathExists(p: string): Promise<boolean> {
+  return access(p).then(
+    () => true,
+    () => false,
+  );
+}
+
+describe("cleanDist", () => {
+  test("removes nested files and directories", async () => {
+    // Build a temp tree that mirrors what a dist/ dir might look like.
+    const tmp = join(tmpdir(), `atomic-clean-dist-test-${crypto.randomUUID()}`);
+    const nested = join(tmp, "subdir", "deeply", "nested");
+    await mkdir(nested, { recursive: true });
+    await writeFile(join(tmp, "index.js"), "// bundle");
+    await writeFile(join(nested, "chunk.js"), "// chunk");
+
+    // Confirm setup
+    expect(await pathExists(tmp)).toBe(true);
+    expect(await pathExists(join(nested, "chunk.js"))).toBe(true);
+
+    // Use node:fs/promises rm directly (same API as cleanDist) to verify
+    // the underlying approach works for arbitrary paths — mirrors the
+    // cleanDist implementation without coupling to its hard-coded DIST path.
+    const { rm } = await import("node:fs/promises");
+    await rm(tmp, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
+
+    expect(await pathExists(tmp)).toBe(false);
+    expect(await pathExists(join(nested, "chunk.js"))).toBe(false);
+  });
+
+  test("cleanDist is idempotent when dist does not exist (force=true, no throw)", async () => {
+    // cleanDist uses force:true so calling it when dist is absent should not throw.
+    // This also exercises the real export without side effects in CI (dist may or may not exist).
+    await expect(cleanDist()).resolves.toBeUndefined();
+  });
+});

package/src/scripts/clean-dist.ts

@@ -0,0 +1,37 @@
+#!/usr/bin/env bun
+/**
+ * Removes the dist directory relative to the repo root.
+ *
+ * Usage:
+ *   bun run src/scripts/clean-dist.ts
+ */
+
+import { rm, access } from "node:fs/promises";
+import { resolve } from "node:path";
+
+const ROOT = resolve(import.meta.dir, "../..");
+const DIST = resolve(ROOT, "dist");
+
+/**
+ * Removes the repo-local dist directory and verifies it no longer exists.
+ *
+ * @throws {Error} with path-specific message if dist still exists after removal.
+ */
+export async function cleanDist(): Promise<void> {
+  await rm(DIST, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
+
+  const stillExists = await access(DIST).then(
+    () => true,
+    () => false,
+  );
+
+  if (stillExists) {
+    throw new Error(`Cleanup failed: "${DIST}" still exists after removal`);
+  }
+}
+
+// Run when executed directly (not imported).
+if (import.meta.main) {
+  await cleanDist();
+  console.log(`Removed: ${DIST}`);
+}

package/src/sdk/providers/claude.ts

@@ -30,13 +30,17 @@ import { watch, unlink, mkdir, writeFile } from "node:fs/promises";
 import { existsSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { randomUUID } from "node:crypto";
-import os from "node:os";
 import { claudeHookDirs } from "../../commands/cli/claude-stop-hook.ts";
 import {
   clearInflightTracking,
   waitForInflightDrained,
 } from "../../commands/cli/claude-inflight-hook.ts";
 import { resolveAdditionalInstructionsContent } from "../../services/config/additional-instructions.ts";
+import {
+  atomicContentTempPath,
+  atomicTempPath,
+  withAtomicTempEnv,
+} from "../../lib/atomic-temp.ts";
 
 // ---------------------------------------------------------------------------
 // Session tracking — ensures createClaudeSession is called before claudeQuery
@@ -423,18 +427,17 @@ async function spawnClaudeWithPrompt(
   chatFlags: string[],
   sessionId: string,
 ): Promise<void> {
-  // sessionDir is the workflow's `${name}-${sessionId}` directory under
-  // ~/.atomic/sessions — slug-based, so single-quoting is sufficient on
-  // POSIX and PowerShell alike.
-  const argvPrompt = `'${readPromptInstruction(promptFile)}'`;
+  const settingsPath = workflowHookSettingsPath();
+  const argvPrompt = `"${escBash(readPromptInstruction(promptFile))}"`;
   const cmd = [
     "claude",
     ...chatFlags,
-    // Workflow-owned Stop hook. Placed AFTER chatFlags so commander's
-    // last-wins semantics shadow any user-provided --settings, making this
-    // non-overridable by `.atomic/settings.json` chatFlags overrides.
+    // Workflow-owned hooks. Placed AFTER chatFlags so commander's last-wins
+    // semantics shadow any user-provided --settings, making this
+    // non-overridable by `.atomic/settings.json` chatFlags overrides. Passing
+    // a path avoids Claude Code's content-hashed /tmp/claude-settings*.json.
     "--settings",
-    `'${WORKFLOW_HOOK_SETTINGS}'`,
+    `"${escBash(settingsPath)}"`,
     "--session-id",
     sessionId,
     argvPrompt,
@@ -454,6 +457,19 @@ async function spawnClaudeWithPrompt(
   await waitForReadyMarker(sessionId);
 }
 
+function workflowHookSettingsPath(): string {
+  const path = atomicContentTempPath(
+    "claude-settings-atomic",
+    ".json",
+    WORKFLOW_HOOK_SETTINGS,
+  );
+  writeFileSync(path, WORKFLOW_HOOK_SETTINGS, {
+    encoding: "utf-8",
+    mode: 0o600,
+  });
+  return path;
+}
+
 /**
  * Wait for the SessionStart hook's ready marker at
  * `~/.atomic/claude-ready/<session_id>`.
@@ -1055,11 +1071,15 @@ export async function claudeQuery(options: ClaudeQueryOptions): Promise<SessionM
       // Read-tool indirection. The tmp file only has to live long enough
       // for Claude's first Read tool call, so we delete it once waitForIdle
       // returns (the turn is complete by then).
-      spawnPromptFile = join(
-        os.tmpdir(),
-        `atomic-claude-prompt-${claudeSessionId}-${randomUUID()}.txt`,
+      spawnPromptFile = atomicTempPath(
+        "atomic-claude-prompt",
+        ".txt",
+        `${claudeSessionId}-${randomUUID()}`,
       );
-      writeFileSync(spawnPromptFile, prompt, "utf-8");
+      writeFileSync(spawnPromptFile, prompt, {
+        encoding: "utf-8",
+        mode: 0o600,
+      });
 
       await spawnClaudeWithPrompt(
         paneId,
@@ -1369,15 +1389,17 @@ export class HeadlessClaudeSessionWrapper {
     let sdkSessionId = "";
     let structuredOutput: unknown = undefined;
     try {
-      for await (const msg of sdkQuery({ prompt, options: headlessSdkOpts })) {
-        if (msg.type === "result") {
-          const record = msg as Record<string, unknown>;
-          sdkSessionId = String(record.session_id ?? "");
-          if (record.subtype === "success" && "structured_output" in record) {
-            structuredOutput = record.structured_output;
+      await withAtomicTempEnv(async () => {
+        for await (const msg of sdkQuery({ prompt, options: headlessSdkOpts })) {
+          if (msg.type === "result") {
+            const record = msg as Record<string, unknown>;
+            sdkSessionId = String(record.session_id ?? "");
+            if (record.subtype === "success" && "structured_output" in record) {
+              structuredOutput = record.structured_output;
+            }
           }
         }
-      }
+      });
     } catch (err) {
       const detail = err instanceof Error ? err.message : String(err);
       throw new Error(`Claude SDK query failed: ${detail}`);