bb124c2869
Merge branch 'master' into feat/send-unify
2026-07-24 16:31:00 +08:00
f27f8f6162
Merge commit 'refs/codex-unblock/20260723/pr570-master-initial' into worktree/pr570-merge-master-20260723
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-18-shared-persistence-write-coordinator.md
# docs/core-data-structures/persistence.md
# packages/session-persistence/session-persistence/README.md
2026-07-23 23:21:08 +08:00
d5f88f1221
Merge remote-tracking branch 'origin/master' into feat/send-unify
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/pty/pty-local/tests/index.spec.ts
# packages/session-query/session-query/tests/tracing.spec.ts
2026-07-23 22:41:45 +08:00
00191e75dd
Merge remote-tracking branch 'origin/master' into session-query-search
2026-07-23 21:55:59 +08:00
64eebc1b35
Merge branch 'master' into codex/plan-mode-active-exit
2026-07-23 21:52:23 +08:00
72fdf57c00
Merge remote-tracking branch 'origin/session-query-search' into session-query-search
2026-07-23 21:34:23 +08:00
9482affc48
fix(session-query): make persisted observation non-mutating
2026-07-23 21:33:28 +08:00
c596dddfe1
fix: return stored metadata from live loads
2026-07-23 21:28:52 +08:00
f9120a944c
Merge master into session-query-search
2026-07-23 21:18:05 +08:00
c1fa985c20
Merge remote-tracking branch 'origin/master' into session-query-search
...
# Conflicts:
# docs/architecture.i18n.yaml
# packages/client/ui-sidebar/tests/sidebar-root.spec.tsx
# packages/session-persistence/session-persistence-jsonl/src/index.ts
# packages/session-persistence/session-persistence/README.md
2026-07-23 21:13:29 +08:00
8e4f666238
feat(plan): add direct plan exit command
2026-07-23 21:06:03 +08:00
4e5166828b
fix: reserve cold loads across repair
2026-07-23 20:58:20 +08:00
a3ad5241ba
Merge remote-tracking branch 'origin/master' into feat/send-unify
...
# Conflicts:
# docs/persistence-catalog.md
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/context/time-context/tests/time-context.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
2026-07-23 20:54:48 +08:00
26bfd37da0
Merge commit 'refs/codex-unblock/20260723/master' into worktree/pty-review-fixes
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/tools.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# packages/core/tools/src/schema.ts
# packages/core/tools/tests/tools.spec.ts
# packages/pty/tool-pty/README.md
# packages/pty/tool-pty/src/index.ts
# packages/pty/tool-pty/src/render.ts
# packages/tasks/tool-tasks/README.md
# packages/tasks/tool-tasks/src/index.ts
2026-07-23 20:50:45 +08:00
816907ba2d
Merge remote-tracking branch 'origin/master' into refactor/eager-session-persistence
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-18-shared-persistence-write-coordinator.md
# packages/session-persistence/session-persistence-jsonl/README.md
# packages/session-persistence/session-persistence/src/coordinator.ts
# packages/session-persistence/session-persistence/tests/persistence.spec.ts
2026-07-23 20:32:19 +08:00
1e457b22e0
refactor(session-query): unify query service
2026-07-23 20:18:05 +08:00
44fd93fd06
feat(agent): unify send(target × wakeup), coalesce context/message into user/message
...
Replace send/steer/inject with one Agent.send primitive over the
(target × wakeup) matrix; followup/steer/inject become fixed-preset
alias methods on the now-abstract Agent class. Coalesce context/message
into user/message (injected context is a non-user source). Replace
agent/queued with agent/inbox/enqueue/dequeue/discard, add cancel
keepInbox, and add a FIFO-conservation invariant.
2026-07-23 19:15:45 +08:00
7f5ba286fe
fix: keep crash repair away from live sessions
2026-07-23 18:31:37 +08:00
625e8f0ed2
docs: update tutorial for canonical tool output
2026-07-23 18:04:49 +08:00
022b42a450
Merge origin/master into refactor/eager-session-persistence
2026-07-23 18:00:36 +08:00
fa5c3fa0b9
Merge origin/master into codex/code-mode-complete-result-card
2026-07-23 17:59:58 +08:00
406c82d1a7
refactor: eagerly persist session events
2026-07-23 17:57:26 +08:00
0a0f19cf57
Merge remote-tracking branch 'origin/master' into session-query-search
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-10-session-query-service.md
# .agents/notes/implemented/feature/2026-07-10-sqlite-session-query-provider.md
# .agents/notes/proposed/feature/2026-07-10-sqlite-session-query-provider.md
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/core-data-structures/persistence.md
# docs/core-data-structures/session-query.md
# docs/module-graph.md
# docs/rfc/INDEX.md
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/hooks/hooks-claude/tests/coverage.spec.ts
# packages/session-persistence/session-persistence-jsonl/src/index.ts
# packages/session-persistence/session-persistence-jsonl/tests/jsonl.spec.ts
# packages/session-persistence/session-persistence-sqlite/README.md
# packages/session-persistence/session-persistence-sqlite/src/index.ts
# packages/session-persistence/session-persistence-sqlite/src/schema.ts
# packages/session-persistence/session-persistence-sqlite/tests/sqlite.spec.ts
# packages/session-persistence/session-persistence/README.md
# packages/session-persistence/session-persistence/package.json
# packages/session-query/README.md
# packages/session-query/session-query/README.md
# packages/session-query/session-query/package.json
# packages/session-query/session-query/src/config.ts
# packages/session-query/session-query/src/index.ts
# packages/session-query/session-query/src/types.ts
# pnpm-lock.yaml
# scripts/gen-doc-graphs.ts
# scripts/type-equiv.manifest.json
# tsconfig.host.json
# tsconfig.json
2026-07-23 13:56:56 +08:00
2a1b3139f9
feat(tui): add interactive extension service
2026-07-22 21:30:17 -07:00
2821826e2c
fix(pty): close final review gaps
2026-07-23 02:53:43 +08:00
fb74156cf8
fix(code-mode): generalize failures and bound diagnostics
2026-07-23 01:32:17 +08:00
6ad8e4501f
fix(pty): retain cleanup evidence through policy
2026-07-23 01:21:14 +08:00
7f0f70ce3c
fix(pty): retain backend cleanup failures
2026-07-23 00:59:16 +08:00
5ba4f77f2b
fix(pty): surface pending rollback failures
2026-07-23 00:27:32 +08:00
590115448e
docs: refresh PTY service catalog
2026-07-23 00:15:21 +08:00
8dbea80294
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
2026-07-22 23:55:07 +08:00
8d42d3c979
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
...
# Conflicts:
# docs/config-catalog.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/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/src/index.ts
2026-07-22 23:50:41 +08:00
065d20c249
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
...
# Conflicts:
# scripts/type-equiv.manifest.json
2026-07-22 23:34:17 +08:00
5689d1a9b4
Merge remote-tracking branch 'origin/master' into worktree/pty-review-fixes
...
# Conflicts:
# docs/module-graph.md
2026-07-22 23:27:17 +08:00
d5d6960184
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/module-graph.md
2026-07-22 23:17:02 +08:00
fed32c767d
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
2026-07-22 23:12:20 +08:00
1429c5d22f
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
2026-07-22 23:03:02 +08:00
b65afd320a
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
2026-07-22 23:00:05 +08:00
73353d7a0f
Merge remote-tracking branch 'origin/feature/persistent-pty-sessions' into worktree/pty-review-fixes
2026-07-22 22:53:05 +08:00
cf5dfe46e7
Merge remote-tracking branch 'origin/rfc/pty' into worktree/pr467-retarget-latest-master
2026-07-22 22:50:55 +08:00
d92bb12963
Merge refreshed canonical outputs into typed Code Mode results
2026-07-22 22:50:28 +08:00
3d9240e423
Merge refreshed schema DSL into canonical tool outputs
2026-07-22 22:46:10 +08:00
1da62658a9
Merge updated feature/persistent-pty-sessions into review fixes
2026-07-22 22:44:01 +08:00
d99094b1ac
Merge updated rfc/pty into feature/persistent-pty-sessions
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.md
# pnpm-lock.yaml
# scripts/gen-cordis-catalog.ts
2026-07-22 22:43:20 +08:00
c51c02cafa
Merge latest master into schema DSL
2026-07-22 22:42:43 +08:00
57a47b1fb3
fix(pty): close review lifecycle gaps
2026-07-22 22:37:20 +08:00
b0f5d9e313
Merge commit 'refs/codex-unblock/20260722-pr338-master' into HEAD
...
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/acp.snapshot.ts
# packages/core/session/src/index.ts
# packages/examples/acp-demo/src/index.ts
# packages/session-persistence/session-persistence-jsonl/src/format.ts
# vitest.config.ts
2026-07-22 22:37:16 +08:00
8370365c01
Merge refreshed canonical outputs into typed Code Mode results
2026-07-22 22:10:44 +08:00
a838af896e
Merge refreshed schema DSL into canonical tool outputs
...
# Conflicts:
# packages/bash/tool-bash/tests/tools.spec.ts
2026-07-22 22:03:54 +08:00
277b65aa8c
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# pnpm-lock.yaml
2026-07-22 22:00:00 +08:00
Turtle