Merge remote-tracking branch 'refs/remotes/upstream/main'

# Conflicts:
#	ROADMAP.md
#	TODO.md
#	src/cli.tsx
#	src/config.ts
#	src/mcp.ts
#	src/permission.ts
#	src/prompt.ts
#	src/session.ts
#	src/snapshot.ts
#	src/subagent.ts
#	src/tools-extra.ts
#	src/tools.ts
#	src/ui/App.tsx
#	test/mcp.test.ts
#	test/prune.test.ts
#	test/session.test.ts
#	test/tools.test.ts

TODO.md

@@ -112,3 +112,7 @@ Kept for one release, then deleted.
 - [x] `workflow.enabled` / `workflow.docsDir` config keys, merged in `config.merge`
 - [x] Docs: `docs/workflow.md`, ROADMAP entry, TODO done-list entry
 - [x] Tests: `test/workflow.test.ts` (9 tests)
+
+- [x] A visible escape hatch for the stalled-agent loop: the existing repeat guard now offers a
+      configurable `step_back` recovery primitive that reads the session loop trace and steers a
+      model circling without progress to stop and change direction