agent-relay-runner 0.123.0 → 0.123.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-runner",
-  "version": "0.123.0",
+  "version": "0.123.1",
   "description": "Unified provider lifecycle runner for Agent Relay",
   "type": "module",
   "bin": {

package/plugins/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.123.0",
+  "version": "0.123.1",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/launch-assembly.ts

@@ -32,6 +32,7 @@ import {
   resolveProjectMcpServers,
   profileProvisioning,
   writeCodexHooksJson,
+  writeClaudeSettingsJson,
 } from "./provisioning";
 import {
   claudeMcpLaunchArgs,
@@ -325,6 +326,28 @@ export function stripSettingsArgs(args: string[]): string[] {
   return result;
 }
 
+// #1096 — the settings.json relay WRITES into an isolated managed Claude home so the provisioned
+// hooks (baseline guard included) land in the DOCUMENTED hook source Claude honors
+// ($CLAUDE_CONFIG_DIR/settings.json — loaded under `--setting-sources "user"` and the default),
+// rather than riding ONLY the inline `--settings` CLI flag. Claude does not document `--settings`
+// as a hook source, and — unlike a file written straight to disk — that flag's JSON must survive
+// shell/tmux launcher transit and passes Claude's "silently ignore settings that fail validation"
+// gate; a written settings.json bypasses both, so the baseline guard can't be silently absent
+// (the #1096 inert-at-runtime symptom). Returns null when:
+//   • there is NO isolated managed home (host base reuses the real ~/.claude — relay must not
+//     clobber it; that path keeps the inline --settings delivery), or
+//   • a caller --settings is present (the merge/suppression path owns hook delivery inline; see
+//     claudeSettingsArgs) — so the file and inline channels never DOUBLE-register the same hook.
+// Both assembleClaude (to keep these hooks OUT of the inline --settings) and materializeClaudeAssets
+// (to write the file) call this, so the launch and the disk agree.
+export function claudeManagedHookSettings(config: RunnerSpawnConfig, configHome: string | undefined): { hooks: ProvisioningHookSet } | null {
+  if (!configHome) return null;
+  const hostDefaultArgs = profileUsesProviderHostGlobals(config) ? config.providerConfig.defaultArgs : [];
+  if (hasSettingsArg(hostDefaultArgs) || hasSettingsArg(config.providerArgs)) return null;
+  const hookSet = renderProvisionedHookSet(resolveProvisionedHooks(configHome, config));
+  return Object.keys(hookSet).length ? { hooks: hookSet } : null;
+}
+
 // ── Instruction disposition (the vanilla floor's effect on the host instruction cascade) ──
 
 function repoInstructionDisposition(profile: AgentProfile): AssembledInstructionDisposition {
@@ -374,9 +397,15 @@ function assembleClaude(config: RunnerSpawnConfig, providerConfig: ProviderConfi
   const hookHome = configHome ?? assetHome;
   const provisionedHooks = hookHome ? resolveProvisionedHooks(hookHome, config) : [];
   const provisionedHookSet = renderProvisionedHookSet(provisionedHooks);
+  // #1096 — for an isolated managed home with no caller --settings, the provisioned hooks are
+  // delivered through the managed settings.json (the documented, transit-safe hook source), so
+  // keep them OUT of the inline --settings to avoid double-registering the same guard. Host-base
+  // and caller-`--settings` launches keep inline delivery (see claudeManagedHookSettings).
+  const managedHookSettings = claudeManagedHookSettings(config, configHome);
+  const inlineHookSet = managedHookSettings ? {} : provisionedHookSet;
   const settings = claudeSettingsArgs(
     projectSettings.settings,
-    provisionedHookSet,
+    inlineHookSet,
     provisionedHooks.map((h) => h.name),
     statusLine,
     hostDefaultArgs,
@@ -629,6 +658,10 @@ function materializeClaudeAssets(config: RunnerSpawnConfig): void {
     materializeResolvedAssets(hostSkills);
     materializeResolvedAssets(resolveClaudeProjectSkills(configHome, config, new Set([...skills, ...hostSkills].map((s) => s.name))));
     materializeResolvedAssets(resolveProvisionedHooks(configHome, config));
+    // #1096 — land the provisioned hooks in the managed home's settings.json (the documented
+    // hook source), matching the assembler's decision to keep them out of the inline --settings.
+    const managedHookSettings = claudeManagedHookSettings(config, configHome);
+    if (managedHookSettings) writeClaudeSettingsJson(configHome, managedHookSettings);
   }
   if (assetHome) materializeResolvedAssets(resolveClaudeProvisionedPlugins(assetHome, config));
   if (!configHome && assetHome) materializeResolvedAssets(resolveProvisionedHooks(assetHome, config));

package/src/provisioning.ts

@@ -357,6 +357,21 @@ export function writeCodexHooksJson(codexHome: string, hooks: ProvisioningHookSe
   writeFileSync(join(codexHome, "hooks.json"), JSON.stringify({ hooks }, null, 2), { mode: 0o600 });
 }
 
+// #1096 — write relay-owned settings into an ISOLATED Claude managed home's `settings.json`
+// (the DOCUMENTED hook source Claude honors under `--setting-sources "user"` or the default,
+// unlike the inline `--settings` CLI flag). The managed home is relay-owned and freshly keyed
+// per spawn, so an unconditional write is safe (profile-home seeds only `.claude.json`/`CLAUDE.md`,
+// never `settings.json`). Removes the file when there is nothing relay-owned to deliver so disk
+// stays == report. Never called for a host-base launch (which reuses the real `~/.claude`).
+export function writeClaudeSettingsJson(claudeHome: string, settings: Record<string, unknown>): void {
+  mkdirSync(claudeHome, { recursive: true });
+  if (!Object.keys(settings).length) {
+    rmSync(join(claudeHome, "settings.json"), { force: true });
+    return;
+  }
+  writeFileSync(join(claudeHome, "settings.json"), JSON.stringify(settings, null, 2), { mode: 0o600 });
+}
+
 // Write the resolved assets to disk; returns the dirs that materialized successfully,
 // in resolution order. Idempotent — safe to re-run against an existing home.
 export function materializeResolvedAssets(assets: ResolvedAsset[]): string[] {