Merge remote-tracking branch 'origin/master' into codex/skill-system

# Conflicts:
#	docs/architecture.md
#	docs/config-catalog.md
#	docs/module-graph.md
#	docs/rfc/INDEX.md
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
#	packages/core/agent-core/src/index.ts
#	packages/core/tools/tests/gen-tool-catalog.spec.ts
#	packages/support/acp-snapshot/src/suite.ts
#	packages/ui/acp-agent/src/index.ts

packages/support/acp-snapshot/src/harness.ts

@@ -166,6 +166,15 @@ export interface RunOptions {
    * start from an empty workspace.
    */
   workspaceDir?: string
+  /**
+   * Alternate LIVE config path for the boot (absolute), overriding
+   * {@link AgentUnderTest.configPath} for this run. A scenario needing a
+   * differently-composed tree (the Code Mode scenarios) ships an overlay
+   * whose basename still ends in `cordis.yml`, so the bin's replay swap
+   * resolves the sibling `*cordis.snapshot.yml` the same way it does for
+   * the default.
+   */
+  configPath?: string
 }
 
 /**
@@ -211,7 +220,7 @@ export async function runScenario(input: InputScript, opts: RunOptions): Promise
 
     child = spawn(
       process.execPath,
-      ['--import', tsxLoader, opts.agent.binScript, opts.agent.configPath],
+      ['--import', tsxLoader, opts.agent.binScript, opts.configPath ?? opts.agent.configPath],
       { cwd, env, stdio: ['pipe', 'pipe', 'pipe'] },
     )