Merge branch 'codex/goal-session' into codex/commands

# Conflicts:
#	docs/config-catalog.md
#	docs/module-graph.md
#	examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
#	packages/ui/acp/README.md
#	packages/ui/tui/README.md

packages/ui/tui/tests/harness.ts

@@ -122,10 +122,11 @@ export function appendAssistant(
   session: Session,
   content: ContentBlock[],
   usage?: { inputTokens: number; outputTokens: number },
+  position: { turn: number; step: number } = { turn: 1, step: 0 },
 ): void {
   session.append('assistant/message', {
-    turn: 1,
-    step: 0,
+    turn: position.turn,
+    step: position.step,
     provenance: { provider: 'mock', model: 'deepseek-v4-flash' },
     content,
     ...usage === undefined ? {} : { usage },