Tianyi Cui
ea530241d8
Merge branch 'codex/goal-domain' into codex/goal-tools
...
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
2026-07-20 22:50:36 +08:00
Tianyi Cui
023cde5d82
Merge latest master into invariant service seam
2026-07-20 22:49:27 +08:00
Yichen Jiang
a5404ec25e
Merge remote-tracking branch 'origin/master' into worktree/tui-session-controls
...
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/ui/acp/src/index.ts
# packages/ui/tui/README.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tsconfig.json
2026-07-20 22:47:55 +08:00
Tianyi Cui
076e46ebc0
Merge branch 'rfc/loop' into codex/goal-domain
...
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
2026-07-20 22:46:26 +08:00
Yichen Jiang
2c075711eb
feat(tui): add session controls and compact views
2026-07-20 22:44:01 +08:00
Tianyi Cui
78472196c8
Merge branch 'codex/goal-session' into codex/commands
...
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/module-graph.md
# knip.json
# packages/examples/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/tui-demo/package.json
# packages/ui/README.md
# packages/ui/tui/src/index.ts
2026-07-20 22:05:51 +08:00
Tianyi Cui
41196b7e4f
Merge branch 'codex/goal-tools' into codex/goal-session
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-20 21:55:13 +08:00
Tianyi Cui
9d0a75b154
Merge branch 'codex/goal-domain' into codex/goal-tools
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-20 21:44:06 +08:00
Yichen Jiang
a92d2e5f34
Merge origin/master into worktree/explicit-turn-signal
2026-07-20 21:38:49 +08:00
Tianyi Cui
11afddf61d
Merge branch 'rfc/loop' into codex/goal-domain
...
# Conflicts:
# docs/event-producer-consumer.md
# knip.json
2026-07-20 21:37:04 +08:00
Tianyi Cui
8c12f8945e
Merge latest master into codex/llm-error-recovery-rfc
...
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/persistence-catalog.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/src/types.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-deepseek/tests/adapter.spec.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/error.ts
# packages/llm/llm/tests/service.spec.ts
# packages/sandbox/sandbox-policy/tsconfig.json
# packages/ui/stdio/README.md
# packages/ui/stdio/src/index.ts
# packages/ui/stdio/tests/stdio.spec.ts
# packages/ui/tui/src/index.ts
# pnpm-lock.yaml
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/llm.md
2026-07-20 20:59:11 +08:00
Tianyi Cui
dfc401a66a
Merge branch 'codex/goal-session' into codex/commands
...
# Conflicts:
# docs/event-producer-consumer.md
# website/.vitepress/config/api-sidebar.json
# website/zh-CN/api/harness/events.md
2026-07-20 20:43:02 +08:00
Tianyi Cui
eb5ae54a79
Merge branch 'codex/goal-tools' into codex/goal-session
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-19-persisted-same-session-goal-domain.i18n.yaml
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/package.json
# packages/core/agent/README.md
# packages/core/agent/src/types.ts
# website/zh-CN/api/harness/events.md
2026-07-20 20:35:15 +08:00
Tianyi Cui
89fdfee5f1
Merge latest invariant registration gate
2026-07-20 20:29:29 +08:00
Tianyi Cui
b5ee0561f4
Merge latest invariant service seam
2026-07-20 20:29:24 +08:00
Tianyi Cui
08ee06cdaf
Merge latest master into invariant service seam
2026-07-20 20:29:19 +08:00
Tianyi Cui
1dcfc63a78
docs(goal): refresh event source links
2026-07-20 20:26:26 +08:00
Tianyi Cui
8ee54bcb22
Merge latest invariant registration gate
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-20 20:20:10 +08:00
Tianyi Cui
5f806b96f0
Merge latest invariant service seam
2026-07-20 20:19:14 +08:00
Tianyi Cui
2c04056348
Merge latest master into invariant service seam
2026-07-20 20:19:01 +08:00
Tianyi Cui
710c62474a
Merge branch 'master' into fetch-failed-diagnostics
2026-07-20 20:10:57 +08:00
Tianyi Cui
6cf681df4b
Merge branch 'rfc/loop' into codex/goal-domain
...
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/glossary.md
# docs/module-graph.md
# examples/package.json
# pnpm-lock.yaml
# website/.vitepress/config/api-sidebar.json
# website/zh-CN/api/harness/events.md
2026-07-20 20:06:23 +08:00
Tianyi Cui
b8ad62eb35
fix(invariants): finish current-master ownership migration
2026-07-20 20:04:40 +08:00
kingwl
936f2fabb5
Merge remote-tracking branch 'origin/master' into jsonl-packed-chunk-rows
...
Conflicts: the two generated catalog docs (regenerated over merged sources)
and the jsonl backend README storage-layout bullets — master's required
delegationDepth header field weaves with this branch's storage-record/packed
row wording.
2026-07-20 20:04:13 +08:00
Tianyi Cui
f78b17a352
Merge branch 'codex/invariant-package-registration-gate' into codex/package-invariant-checks
2026-07-20 19:55:46 +08:00
Tianyi Cui
9c4cc05da6
Merge branch 'codex/invariant-service-seam' into codex/invariant-package-registration-gate
2026-07-20 19:48:51 +08:00
Tianyi Cui
2f3ca3027b
Merge remote-tracking branch 'origin/master' into codex/invariant-service-seam
2026-07-20 19:42:41 +08:00
kingwl
539cb9748b
Merge remote-tracking branch 'origin/master' into jsonl-packed-chunk-rows
...
Conflict: master's docs-site rework (#e7b101a43) deleted the generated
website/zh-CN/api pages this branch had re-anchored after the last merge —
accept the deletions; the site now builds its API reference at build time.
2026-07-20 19:35:34 +08:00
Tianyi Cui
0000b17cae
docs(catalog): refresh subagent source anchors
2026-07-20 18:14:22 +08:00
Tianyi Cui
51ba53766e
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
...
# Conflicts:
# docs/persistence-catalog.md
2026-07-20 18:11:59 +08:00
Tianyi Cui
ff6359a0cd
docs(subagent): close review contract gaps
2026-07-20 18:10:31 +08:00
Tianyi Cui
d5638ee8e1
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
...
# Conflicts:
# website/zh-CN/api/harness/agents.md
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/sessions.md
# website/zh-CN/api/harness/subagents.md
2026-07-20 18:00:40 +08:00
Tianyi Cui
31580b62b8
Merge origin/master into codex/send-one-turn
...
# Conflicts:
# website/zh-CN/api/harness/events.md
2026-07-20 17:52:30 +08:00
Tianyi Cui
4e7a2c732f
fix(commands): remove adapter surface filtering
2026-07-20 17:41:22 +08:00
Tianyi Cui
ec0a2bb623
Merge origin/master into codex/send-one-turn
...
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/README.md
# website/zh-CN/api/harness/events.md
2026-07-20 17:41:06 +08:00
Tianyi Cui
b668d67dc9
Merge remote-tracking branch 'origin/master' into codex/pr270-retarget-20260720
...
# Conflicts:
# website/.vitepress/config/api-sidebar.json
2026-07-20 17:38:27 +08:00
kingwl
5869a46d94
Merge remote-tracking branch 'origin/master' into jsonl-packed-chunk-rows
...
Conflicts: generated docs only (cordis services catalog and the website
sessions API page) — resolved by regenerating both over the merged sources.
2026-07-20 17:37:30 +08:00
Tianyi Cui
a87d3e7e55
Merge branch 'codex/goal-session' into codex/commands
2026-07-20 17:24:39 +08:00
Tianyi Cui
77ab5516a9
Merge goal tool fixes and align same-session blockers
2026-07-20 17:23:55 +08:00
Tianyi Cui
60ecdbc88b
Merge remote-tracking branch 'origin/master' into codex/pr353-retarget-master-20260719
2026-07-20 17:23:17 +08:00
Turtle
ccb1d09850
Merge remote-tracking branch 'origin/master' into fetch-failed-diagnostics
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-20 17:21:43 +08:00
Tianyi Cui
0b42b2524c
Merge remote-tracking branch 'origin/master' into codex/pr270-retarget-20260720
...
# Conflicts:
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/sessions.md
2026-07-20 17:15:50 +08:00
Tianyi Cui
2d345b5882
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
...
# Conflicts:
# docs/cordis-catalog/services.md
# docs/persistence-catalog.md
# website/zh-CN/api/harness/sessions.md
2026-07-20 17:14:24 +08:00
Tianyi Cui
45aa46e924
Merge branch 'master' into fetch-failed-diagnostics
2026-07-20 17:03:49 +08:00
Tianyi Cui
7aee299bda
docs(compact): correct pruning surface contracts
2026-07-20 17:02:28 +08:00
Tianyi Cui
27f37942df
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
2026-07-20 17:02:25 +08:00
Tianyi Cui
bd99e8d04a
Merge branch 'master' into steering-unwrap
2026-07-20 17:02:18 +08:00
Tianyi Cui
97e144fff6
Merge branch 'codex/goal-domain' into codex/goal-tools
2026-07-20 16:50:40 +08:00
Tianyi Cui
63d1f7679c
docs(goal): refresh generated service references
2026-07-20 16:50:29 +08:00
Tianyi Cui
e9d9791501
Merge branch 'codex/goal-domain' into codex/goal-tools
2026-07-20 16:42:04 +08:00
