@zgeoff/atc 2.3.0 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgeoff/atc",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Terminal control tower for coding-agent sessions",
   "homepage": "https://github.com/zgeoff/atc#readme",
   "bugs": "https://github.com/zgeoff/atc/issues",
@@ -63,6 +63,8 @@
   },
   "overrides": {
     "fast-uri": "3.1.6",
+    "hono": ">=4.13.5",
+    "js-yaml": ">=4.3.2 <5",
     "qs": "6.16.0"
   },
   "packageManager": "bun@1.3.10"

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

@@ -1,15 +1,19 @@
+import { z } from 'zod';
 import type { AgentID } from './agent-adapter';
 import { buildCLICommand } from './build-cli-command';
 
 /**
  * What one agent id needs on top of the shared instrumentation. The
  * environment block and the credential helper point the CLI at a backend
- * other than the default one; both are absent for the stock agent.
+ * other than the default one; both are absent for the stock agent. The
+ * settings are whatever else the config asked this agent's sessions to start
+ * with.
  */
 export interface HookSettingsProfile {
   readonly id: AgentID;
   readonly env?: Readonly<Record<string, string>>;
   readonly apiKeyHelper?: string;
+  readonly settings?: Readonly<Record<string, unknown>>;
 }
 
 /**
@@ -31,17 +35,20 @@ export function buildHookSettings(
     { hooks: [{ type: 'command', command: buildCLICommand('hook-report'), timeout: 5 }] },
   ];
 
-  return {
-    hooks: {
-      // SessionStart carries the session id at spawn/resume time, before any
-      // interaction — without it a session only enters the fleet file after
-      // its first prompt/notification.
-      SessionStart: entry,
-      Notification: entry,
-      Stop: entry,
-      UserPromptSubmit: entry,
-      SessionEnd: entry,
-    },
+  const own = {
+    hooks: mergeSessionHooks(
+      {
+        // SessionStart carries the session id at spawn/resume time, before any
+        // interaction — without it a session only enters the fleet file after
+        // its first prompt/notification.
+        SessionStart: entry,
+        Notification: entry,
+        Stop: entry,
+        UserPromptSubmit: entry,
+        SessionEnd: entry,
+      },
+      profile.settings?.['hooks'],
+    ),
 
     // Fleet status renders inside Claude Code's own status line; the injected
     // command chains the user's configured statusline first, so mirror their
@@ -56,4 +63,36 @@ export function buildHookSettings(
       : { env: profile.env }),
     ...(profile.apiKeyHelper === undefined ? {} : { apiKeyHelper: profile.apiKeyHelper }),
   };
+
+  // The configured settings fill in around what atc writes and never replace
+  // it: a session atc did not instrument is a session the fleet cannot track.
+  return { ...profile.settings, ...own };
+}
+
+type SessionHooks = Readonly<Record<string, readonly unknown[]>>;
+
+// One hook list per event name, which is the shape every harness that reads
+// this file takes.
+const CONFIGURED_HOOKS_SCHEMA = z.record(z.string(), z.array(z.unknown()));
+
+/**
+ * atc's own reporter plus whatever the config added, per event. The reporter
+ * runs first and the configured entries follow it, so an added hook joins the
+ * fleet's rather than displacing it. A block that is not hook lists is left out
+ * whole, and costs its own entries rather than atc's.
+ */
+function mergeSessionHooks(own: SessionHooks, configured: unknown): SessionHooks {
+  const parsed = CONFIGURED_HOOKS_SCHEMA.safeParse(configured);
+
+  if (!parsed.success) {
+    return own;
+  }
+
+  const merged: Record<string, readonly unknown[]> = { ...own };
+
+  for (const [event, entries] of Object.entries(parsed.data)) {
+    merged[event] = [...(merged[event] ?? []), ...entries];
+  }
+
+  return merged;
 }

package/src/agents/gateway-adapter.ts

@@ -99,6 +99,7 @@ export class GatewayAdapter implements AgentAdapter {
       ...(this.gateway.apiKeyHelper === undefined
         ? {}
         : { apiKeyHelper: this.gateway.apiKeyHelper }),
+      ...(this.gateway.settings === undefined ? {} : { settings: this.gateway.settings }),
     });
 
     return this.settingsFile;

package/src/shared/collect-gateways.ts

@@ -18,6 +18,7 @@ export interface GatewayConfig {
   readonly baseURL: string;
   readonly apiKeyHelper?: string;
   readonly env: Readonly<Record<string, string>>;
+  readonly settings?: Readonly<Record<string, unknown>>;
 }
 
 // Ids the built-in adapters answer to; a gateway may not take one.
@@ -34,6 +35,7 @@ const GATEWAY_ENTRY_SCHEMA = z.object({
   args: buildOptionalStringArray(),
   apiKeyHelper: buildOptionalNonEmptyString(),
   env: buildStringEnvRecord(),
+  settings: buildOptionalSettings(),
 });
 
 /**
@@ -76,12 +78,22 @@ export function collectGateways(
       baseURL: parsed.data.baseURL,
       ...(parsed.data.apiKeyHelper === undefined ? {} : { apiKeyHelper: parsed.data.apiKeyHelper }),
       env: parsed.data.env,
+      ...(parsed.data.settings === undefined ? {} : { settings: parsed.data.settings }),
     });
   }
 
   return gateways;
 }
 
+// Claude Code settings the sessions of this gateway are started with, on top of
+// the ones atc writes itself. Anything but an object is no extra settings.
+function buildOptionalSettings() {
+  return z.preprocess(
+    (v) => (isRecord(v) ? v : undefined),
+    z.record(z.string(), z.unknown()).optional(),
+  );
+}
+
 function buildOptionalNonEmptyString() {
   return z.preprocess(
     (v) => (typeof v === 'string' && v !== '' ? v : undefined),