@zgeoff/atc 2.10.2 → 2.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgeoff/atc",
-  "version": "2.10.2",
+  "version": "2.10.4",
   "description": "Terminal control tower for coding-agent sessions",
   "homepage": "https://github.com/zgeoff/atc#readme",
   "bugs": "https://github.com/zgeoff/atc/issues",
@@ -27,9 +27,10 @@
     "deadcode": "knip",
     "lint": "oxlint --type-aware --type-check --report-unused-disable-directives-severity error",
     "lint:fix": "oxlint --type-aware --type-check --report-unused-disable-directives-severity error --fix",
-    "test": "bun test",
-    "test:binary": "bun test --timeout 20000 test/daemon-e2e.test.ts",
-    "test:atc-bridge": "bash scripts/test-atc-bridge.sh",
+    "test": "bash scripts/with-test-home.sh bun test",
+    "test:binary": "bash scripts/with-test-home.sh bun test --timeout 20000 test/daemon-e2e.test.ts",
+    "test:atc-bridge": "bash scripts/with-test-home.sh bash scripts/test-atc-bridge.sh",
+    "test:isolation": "bash scripts/check-test-isolation.sh",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "format": "oxfmt . && format-codemod --quiet .",
     "format:check": "oxfmt --check . && format-codemod --check --quiet .",

package/src/agents/resolve-agent-home.ts

@@ -1,5 +1,5 @@
-import { homedir } from 'node:os';
 import { join } from 'node:path';
+import { resolveHomeDir } from '../shared/resolve-home-dir';
 
 /**
  * An agent CLI's home directory: the named environment variable when it is
@@ -9,5 +9,5 @@ import { join } from 'node:path';
 export function resolveAgentHome(envVar: string, defaultDirName: string): string {
   const home = process.env[envVar];
 
-  return home !== undefined && home !== '' ? home : join(homedir(), defaultDirName);
+  return home !== undefined && home !== '' ? home : join(resolveHomeDir(), defaultDirName);
 }

package/src/agents/write-hook-settings.ts

@@ -1,8 +1,8 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { stateDir } from '../shared/config';
 import { isRecord } from '../shared/report';
+import { resolveHomeDir } from '../shared/resolve-home-dir';
 import { buildHookSettings } from './build-hook-settings';
 import type { HookSettingsProfile } from './build-hook-settings';
 
@@ -26,7 +26,7 @@ export function writeHookSettings(profile: HookSettingsProfile): string {
  */
 function readStatuslinePadding(): number {
   try {
-    const raw = readFileSync(join(homedir(), '.claude', 'settings.json'), 'utf8');
+    const raw = readFileSync(join(resolveHomeDir(), '.claude', 'settings.json'), 'utf8');
     const user: unknown = JSON.parse(raw);
     const statusLine = isRecord(user) ? user['statusLine'] : undefined;
     const padding = isRecord(statusLine) ? statusLine['padding'] : undefined;

package/src/cli.ts

@@ -3,6 +3,7 @@
 import { defineCommand, runMain } from 'citty';
 import pkg from '../package.json';
 import { collectRedirectURIs } from './collect-redirect-uris';
+import { normalizeCLIArgs } from './normalize-cli-args';
 import { parsePort } from './parse-port';
 import { getBuild } from './shared/get-build';
 
@@ -134,7 +135,7 @@ const main = defineCommand({
         meta: {
           name: 'grants',
           description:
-            'List the grants atc mcp --http clients hold, or revoke one with --revoke <id>',
+            'List the grants atc mcp --http clients hold, or revoke one with --revoke=<id>',
         },
         args: {
           revoke: { type: 'string', description: 'The ID of a grant to revoke' },
@@ -342,4 +343,4 @@ const main = defineCommand({
   },
 });
 
-await runMain(main);
+await runMain(main, { rawArgs: normalizeCLIArgs(process.argv.slice(2)) });

package/src/normalize-cli-args.ts

@@ -0,0 +1,33 @@
+/**
+ * Joins `--revoke <value>` into `--revoke=<value>` before the argument
+ * parser sees it. A grant id can start with a dash, and the parser reads a
+ * separate dash-led value as a group of short flags; an underscore among
+ * them overwrites its positional list and crashes it. Inline, the value
+ * stays the option's whatever it starts with.
+ */
+export function normalizeCLIArgs(args: readonly string[]): string[] {
+  const normalized: string[] = [];
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    const next = args[i + 1];
+
+    if (arg === '--') {
+      normalized.push(...args.slice(i));
+      break;
+    }
+
+    if (arg === '--revoke' && next !== undefined) {
+      normalized.push(`--revoke=${next}`);
+
+      i++;
+      continue;
+    }
+
+    if (arg !== undefined) {
+      normalized.push(arg);
+    }
+  }
+
+  return normalized;
+}

package/src/shared/config.ts

@@ -1,5 +1,4 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { z } from 'zod';
 import { buildOptionalString } from './build-optional-string';
@@ -9,6 +8,7 @@ import { collectGateways } from './collect-gateways';
 import type { GatewayConfig } from './collect-gateways';
 import { collectHooks } from './collect-hooks';
 import type { HooksConfig } from './collect-hooks';
+import { resolveHomeDir } from './resolve-home-dir';
 
 export interface Config {
   claudeBin: string;
@@ -49,10 +49,10 @@ const DEFAULTS: Config = {
   leader: { code: 0, label: '^Space' },
 };
 
-const configDir = join(homedir(), '.config', 'atc');
+const configDir = join(resolveHomeDir(), '.config', 'atc');
 
 export const configFile = join(configDir, 'config.json');
-export const stateDir = join(homedir(), '.local', 'state', 'atc');
+export const stateDir = join(resolveHomeDir(), '.local', 'state', 'atc');
 export const socketPath = join(process.env['XDG_RUNTIME_DIR'] ?? stateDir, 'atc.sock');
 export const daemonSocketPath = join(process.env['XDG_RUNTIME_DIR'] ?? stateDir, 'atc-daemon.sock');
 export const eventsSocketPath = join(process.env['XDG_RUNTIME_DIR'] ?? stateDir, 'atc-events.sock');

package/src/shared/resolve-home-dir.ts

@@ -0,0 +1,14 @@
+import { homedir } from 'node:os';
+
+/**
+ * The user's home directory: `$HOME` when it is set, which is how Node's
+ * `os.homedir()` resolves it, otherwise the account's home. Bun's
+ * `os.homedir()` reads `$HOME` once at startup, so this reads it on every
+ * call, and a test preload that points `$HOME` at a temp directory moves
+ * every path derived from it.
+ */
+export function resolveHomeDir(): string {
+  const home = process.env['HOME'];
+
+  return home !== undefined && home !== '' ? home : homedir();
+}