@zgeoff/atc 3.5.0 → 3.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgeoff/atc",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Terminal control tower for coding-agent sessions",
   "homepage": "https://github.com/zgeoff/atc#readme",
   "bugs": "https://github.com/zgeoff/atc/issues",

package/src/agents/gateway-adapter.ts

@@ -58,7 +58,7 @@ export class GatewayAdapter implements AgentAdapter {
 
   // A headless turn carries the same settings file the terminal spawn does,
   // so it reaches this backend rather than the default one. A gateway whose
-  // credential comes through impd's broker runs no headless turn.
+  // credential comes through impd's broker alone runs no headless turn.
   readonly headlessRunner: HeadlessRunner | null;
 
   // The CLI's hooks are authoritative; no screen heuristics needed.
@@ -132,7 +132,7 @@ export class GatewayAdapter implements AgentAdapter {
     );
 
     this.headlessRunner =
-      headlessRun === null || gateway.auth !== undefined
+      headlessRun === null || isBrokerOnlyGateway(gateway)
         ? null
         : makeClaudeHeadlessRunner(headlessRun, {
             claudeBin: gateway.bin,
@@ -169,15 +169,16 @@ export class GatewayAdapter implements AgentAdapter {
     return {
       gateway: { id: this.gateway.id, baseURL: this.gateway.baseURL, auth },
       profiles: this.config.authProfiles,
-      brokerRequired: true,
+      brokerRequired: isBrokerOnlyGateway(this.gateway),
     };
   }
 
-  // A gateway whose credential comes through impd's broker never starts on
-  // the daemon's machine: started without the broker, the CLI would send
-  // whatever credential it holds to the gateway's host.
+  // A gateway whose credential comes through impd's broker alone never
+  // starts on the daemon's machine: started without the broker, the CLI
+  // would send whatever credential it holds to the gateway's host. One
+  // with a credential helper as well starts there under that helper.
   planSpawn(opts: SpawnOptions): SpawnPlan {
-    if (this.gateway.auth !== undefined) {
+    if (isBrokerOnlyGateway(this.gateway)) {
       throw this.buildBrokerRefusal('which only an imp target can give it');
     }
 
@@ -186,7 +187,13 @@ export class GatewayAdapter implements AgentAdapter {
 
     return {
       bin: this.gateway.bin,
-      args: this.buildArgs(opts, modeArgs, this.writeSettings(), this.writeBridge()),
+      args: this.buildArgs(
+        this.gateway.args,
+        opts,
+        modeArgs,
+        this.writeSettings(),
+        this.writeBridge(),
+      ),
     };
   }
 
@@ -196,8 +203,9 @@ export class GatewayAdapter implements AgentAdapter {
   // and placeholders in place of the credential, which the broker swaps
   // for the real one on the host's side. A shell seeds the config folder
   // before it runs the CLI, since a transferred file would replace the
-  // state an earlier run left. Any other gateway's credential
-  // helper runs on the daemon's machine, so it never runs remotely.
+  // state an earlier run left. The launch takes the auth's own arguments
+  // when it sets them, and never the credential helper, which runs on the
+  // daemon's machine alone. A gateway without auth never runs remotely.
   planGuestSpawn(opts: SpawnOptions, guest: GuestPaths): GuestSpawnPlan | null {
     if (this.gateway.auth === undefined) {
       return null;
@@ -244,11 +252,14 @@ export class GatewayAdapter implements AgentAdapter {
       argv,
     );
 
+    const args = this.gateway.auth.args ?? this.gateway.args;
+
     const launch = buildClaudeGuestLaunch(guest.dir, [
       this.gateway.bin,
       ...this.buildArgs(
+        args,
         opts,
-        this.buildGuestModeArgs(),
+        this.buildGuestModeArgs(args),
         `${guest.dir}/${settingsPath}`,
         `${guest.dir}/atc-bridge`,
       ),
@@ -291,10 +302,10 @@ export class GatewayAdapter implements AgentAdapter {
   // explicit flag, so that mode overrides the one the CLI would restore, and
   // the generated settings file, because
   // without it the CLI would resume the session against the default backend.
-  // A gateway whose credential comes through impd's broker has none, since
-  // outside atc the broker never reaches it.
+  // A gateway whose credential comes through impd's broker alone has none,
+  // since outside atc the broker never reaches it.
   buildResumeCommand(cwd: string, agentSessionID: AgentSessionID | undefined): string | null {
-    if (this.gateway.auth !== undefined) {
+    if (isBrokerOnlyGateway(this.gateway)) {
       return null;
     }
 
@@ -312,13 +323,14 @@ export class GatewayAdapter implements AgentAdapter {
   }
 
   private buildArgs(
+    args: readonly string[],
     opts: SpawnOptions,
     modeArgs: readonly string[],
     settings: string,
     pluginDir: string,
   ): string[] {
     return [
-      ...buildClaudeOverrideArgs(this.gateway.args, opts),
+      ...buildClaudeOverrideArgs(args, opts),
       ...modeArgs,
       '--settings',
       settings,
@@ -332,11 +344,11 @@ export class GatewayAdapter implements AgentAdapter {
 
   // A brokered session's Claude config is fresh, so the CLI's own default
   // mode would apply rather than the one the owner's settings set. Every
-  // start therefore names its mode: the one the gateway's arguments or
-  // settings set, else the CLI's manual mode, which asks before each
-  // action.
-  private buildGuestModeArgs(): string[] {
-    if (findFlagValue(this.gateway.args, ['--permission-mode']) !== null) {
+  // start therefore names its mode: the one the launch's arguments or the
+  // gateway's settings set, else the CLI's manual mode, which asks before
+  // each action.
+  private buildGuestModeArgs(args: readonly string[]): string[] {
+    if (findFlagValue(args, ['--permission-mode']) !== null) {
       return [];
     }
 
@@ -464,6 +476,12 @@ export class GatewayAdapter implements AgentAdapter {
   }
 }
 
+// Whether a gateway takes its credential from impd's broker with no
+// credential helper to fall back on, so it starts only behind the broker.
+function isBrokerOnlyGateway(gateway: GatewayConfig): boolean {
+  return gateway.auth !== undefined && gateway.apiKeyHelper === undefined;
+}
+
 // The variable the Claude CLI sends as a bearer authorization header, and
 // the value impd's broker replaces with the credential on the host's side.
 const BEARER_VARIABLE = 'ANTHROPIC_AUTH_TOKEN';

package/src/build-migrated-config.ts

@@ -142,6 +142,7 @@ function renderAgentEntry(entry: AgentEntry): Record<string, unknown> {
       ...(Object.keys(entry.auth.placeholderEnv).length > 0
         ? { placeholderEnv: entry.auth.placeholderEnv }
         : {}),
+      ...(entry.auth.args === undefined ? {} : { args: entry.auth.args }),
       ...(entry.mcpServers === undefined
         ? {}
         : {

package/src/shared/check-gateway-auth.ts

@@ -7,11 +7,14 @@ import { resolveAuthProfiles } from './resolve-auth-profiles';
 /**
  * The auth profiles a gateway's sessions are bound to through impd's
  * broker, and the variables each session gets in place of a credential,
- * every value the fixed placeholder.
+ * every value the fixed placeholder. `args`, when set, replaces the
+ * gateway's arguments on a launch behind the broker, whose host lays out
+ * its files apart from the daemon's.
  */
 export interface GatewayAuth {
   readonly profiles: readonly string[];
   readonly placeholderEnv: Readonly<Record<string, string>>;
+  readonly args?: readonly string[];
 }
 
 /**
@@ -19,7 +22,6 @@ export interface GatewayAuth {
  */
 interface GatewayAuthEntry {
   readonly baseURL?: string | undefined;
-  readonly apiKeyHelper?: string | undefined;
   readonly env: Readonly<Record<string, string>>;
   readonly settings?: Readonly<Record<string, unknown>> | undefined;
 }
@@ -40,15 +42,9 @@ export function checkGatewayAuth(
 
   const problems: string[] = [];
 
-  if (entry.apiKeyHelper !== undefined) {
-    problems.push(
-      'apiKeyHelper cannot be set together with auth, which supplies the credential through the broker',
-    );
-  }
-
   if (entry.settings?.['apiKeyHelper'] !== undefined) {
     problems.push(
-      'settings.apiKeyHelper cannot be set together with auth, which supplies the credential through the broker',
+      'settings.apiKeyHelper cannot be set together with auth; apiKeyHelper holds the credential helper of a launch without the broker',
     );
   }
 
@@ -128,7 +124,17 @@ function parseGatewayAuth(raw: unknown): GatewayAuth | string {
     env[key] = value;
   }
 
-  return { profiles: profiles.map(String), placeholderEnv: env };
+  const args = raw['args'];
+
+  if (args === undefined) {
+    return { profiles: profiles.map(String), placeholderEnv: env };
+  }
+
+  if (!Array.isArray(args) || !args.every((arg) => typeof arg === 'string')) {
+    return 'auth.args must be an array of strings';
+  }
+
+  return { profiles: profiles.map(String), placeholderEnv: env, args: args.map(String) };
 }
 
 // A settings env's variable names; anything but an object sets none.

package/src/shared/collect-agents.ts

@@ -325,7 +325,6 @@ function readClaudeAuth(
       raw,
       {
         baseURL: entry.baseURL,
-        apiKeyHelper: entry.apiKeyHelper,
         env: entry.env,
         settings: entry.settings,
       },

package/src/shared/collect-gateways.ts

@@ -10,8 +10,10 @@ import { isRecord } from './report';
  * A Claude-compatible backend the Claude CLI is pointed at: its own agent id,
  * its own row in the spawn menu, and its own generated settings file. The
  * credential is never held here: a helper command supplies it at run time,
- * or, with `auth`, impd's credential broker adds it to each request on the
- * host's side, so it stays out of the file atc writes.
+ * and, with `auth`, impd's credential broker adds it to each request on the
+ * host's side, so it stays out of the file atc writes. A gateway with both
+ * runs the helper on the daemon's machine and takes the broker's
+ * credential on an imp.
  */
 export interface GatewayConfig {
   readonly id: AgentID;