Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output

# Conflicts:
#	.agents/notes/implemented/feature/2026-06-30-interception-seams.md
#	docs/config-catalog.md
#	docs/cookbook/adding-a-tool.i18n.yaml
#	docs/cookbook/adding-a-tool.md
#	docs/cookbook/adding-a-tool.zh.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/core-data-structures/tools.md
#	docs/event-producer-consumer.md
#	docs/persistence-catalog.md
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
#	packages/bash/tool-bash/src/index.ts
#	packages/core/agent-loop/src/tool-calls.ts
#	packages/core/agent-loop/tests/cancel.spec.ts
#	packages/core/agent-loop/tests/contract-regressions.spec.ts
#	packages/core/agent-loop/tests/tool-calls.spec.ts
#	packages/core/tools/README.md
#	packages/core/tools/src/index.ts
#	packages/core/tools/tests/code-mode.spec.ts
#	packages/core/tools/tests/tools.spec.ts
#	packages/fs/tool-fs-search/tests/integration.spec.ts
#	packages/fs/tool-fs-search/tests/tools.spec.ts
#	packages/fs/tool-fs/tests/integration.spec.ts
#	packages/mcp/mcp-client/src/tools.ts
#	packages/timeout/timeout-policy/tests/timeout-policy.spec.ts
#	packages/web/tool-web/tests/integration.spec.ts
#	packages/web/tool-web/tests/tool-web.spec.ts

packages/llm/llm-retry/tests/invariant.spec.ts

@@ -101,7 +101,7 @@ describe('llm-retry invariants', () => {
     }).toThrow(/latest closed step is 1/)
 
     const closedTurn = closeStep(ctx, 'retry-invariant-closed-turn')
-    closedTurn.append('turn/end', { turn: 1, reason: { kind: 'aborted', reason: 'cancelled' } })
+    closedTurn.append('turn/end', { turn: 1, reason: { kind: 'aborted' } })
     expect(() => {
       closedTurn.append('llm/retry', {
         turn: 1, step: 1, retry: 1, maxRetries: 2, delayMs: 1, failure,

packages/llm/llm-retry/tests/persistence.spec.ts

@@ -43,7 +43,7 @@ describe.each(['jsonl', 'sqlite'] as const)('%s retry-event persistence', (kind)
         delayMs: 750,
         failure: { message: 'provider busy', code: 'RATE_LIMIT', status: 429 },
       })
-      session.append('turn/end', { turn: 1, reason: { kind: 'aborted', reason: 'cancelled in backoff' } })
+      session.append('turn/end', { turn: 1, reason: { kind: 'aborted' } })
 
       expect(session.deriveMessages()).toEqual([])
       await ctx.sessions.flush(session)

packages/llm/llm-retry/tests/retry.spec.ts

@@ -400,13 +400,13 @@ describe('bounded transient retry policy', () => {
     agent.send([{ type: 'text', text: 'go' }])
     await scheduled
     const idle = waitForIdle(context, agent)
-    agent.cancel('user cancelled during retry')
+    agent.cancel({ kind: 'user' })
     await idle
 
     expect(adapter.requests).toHaveLength(1)
     expect(agent.session.events.at(-1)).toMatchObject({
       type: 'turn/end',
-      data: { reason: { kind: 'aborted', reason: 'user cancelled during retry' } },
+      data: { reason: { kind: 'aborted' } },
     })
     expect(vi.getTimerCount()).toBe(0)
   })
@@ -419,7 +419,7 @@ describe('bounded transient retry policy', () => {
     ])
     ;({ ctx: context } = await harness(adapter, {}, (ctx) => {
       ctx.on('agent/request-error', async (agent, _turn, _step, _error, _failure, _history, _signal, next) => {
-        agent.cancel('cancelled by earlier recovery policy')
+        agent.cancel({ kind: 'user' })
         return next()
       })
     }))
@@ -433,7 +433,7 @@ describe('bounded transient retry policy', () => {
     expect(agent.session.events.some(event => event.type === 'llm/retry')).toBe(false)
     expect(agent.session.events.at(-1)).toMatchObject({
       type: 'turn/end',
-      data: { reason: { kind: 'aborted', reason: 'cancelled by earlier recovery policy' } },
+      data: { reason: { kind: 'aborted' } },
     })
   })
 
@@ -446,7 +446,7 @@ describe('bounded transient retry policy', () => {
     ;({ ctx: context } = await harness(adapter))
     const agent = context.agentLoop.create(SessionId('retry-event-cancel'), { provider: 'mock', model: 'mock' })
     context.on('session/event', (session, event) => {
-      if (session === agent.session && event.type === 'llm/retry') agent.cancel('cancelled by retry observer')
+      if (session === agent.session && event.type === 'llm/retry') agent.cancel({ kind: 'user' })
     })
     const idle = waitForIdle(context, agent)