Tianyi Cui
|
eed5ff4dcf
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/code-runtime/code-runtime-worker/package.json
# packages/spill/spill-policy/package.json
# pnpm-lock.yaml
|
2026-07-21 20:06:02 +08:00 |
|
Tianyi Cui
|
72a48fede6
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
# Conflicts:
# docs/event-producer-consumer.md
# packages/context/time-context/tests/time-context.spec.ts
# packages/context/workspace-context/tests/workspace-context.spec.ts
|
2026-07-21 19:56:43 +08:00 |
|
Tianyi Cui
|
6a45e6e16b
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
# Conflicts:
# docs/event-producer-consumer.md
# packages/cordis/tool-cordis/src/api-catalog.ts
|
2026-07-21 19:44:49 +08:00 |
|
Tianyi Cui
|
72c6696e4f
|
Merge branch 'master' into worktree/routed-model-compaction-policy
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-21 19:23:54 +08:00 |
|
Tianyi Cui
|
650a9cd82c
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
# Conflicts:
# docs/module-graph.md
|
2026-07-21 19:16:10 +08:00 |
|
Tianyi Cui
|
0cc5009f58
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
# Conflicts:
# docs/config-catalog.md
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
|
2026-07-21 19:15:18 +08:00 |
|
Tianyi Cui
|
7d9ed9f70a
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
|
2026-07-21 19:03:15 +08:00 |
|
Tianyi Cui
|
39eb6e21cd
|
Merge current master into invariant service seam
|
2026-07-21 18:35:24 +08:00 |
|
Tianyi Cui
|
78f8a3f5d9
|
Merge branch 'master' into worktree/routed-model-compaction-policy
|
2026-07-21 18:30:57 +08:00 |
|
Tianyi Cui
|
9e01fb060e
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/system-prompt.expected.md
# packages/core/tools/README.md
|
2026-07-21 18:08:56 +08:00 |
|
Tianyi Cui
|
e1633fbc3f
|
fix(tools): preserve canonical output boundaries
|
2026-07-21 18:03:01 +08:00 |
|
Yichen Jiang
|
b6f6c58435
|
Merge remote-tracking branch 'origin/master' into worktree/routed-model-compaction-policy
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.md
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.zh.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# examples/headless-agent/tests/harness.ts
# examples/repl-agent/cordis.yml
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/compact/compact-basic/tests/loader-composition.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/llm/README.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/index.ts
# scripts/gen-cordis-catalog.ts
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/llm.md
# website/zh-CN/api/harness/token-meter.md
# website/zh-CN/guide/config.md
|
2026-07-21 10:17:55 +08:00 |
|
Yichen Jiang
|
a37e2e0f16
|
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/tests/harness.ts
# packages/ui/tui/tests/plugin-shape.spec.ts
# packages/ui/tui/tests/snapshots/disposed-terminal.expected.txt
# packages/ui/tui/tests/snapshots/errors-and-help.expected.txt
# packages/ui/tui/tests/tui.spec.ts
|
2026-07-21 10:15:49 +08:00 |
|
Tianyi Cui
|
c1d7b0df81
|
feat: return typed values from Code Mode
|
2026-07-21 04:37:09 +08:00 |
|
Tianyi Cui
|
66c36e7325
|
feat: add canonical typed tool outputs
|
2026-07-21 03:22:14 +08:00 |
|
Tianyi Cui
|
55ef21d9d5
|
Merge origin/master into codex/invariant-service-seam
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/tui-demo/package.json
# packages/support/invariants/src/scoped-events.generated.ts
# packages/ui/acp/package.json
# packages/ui/tui/package.json
# packages/ui/tui/tests/tui.spec.ts
# pnpm-lock.yaml
|
2026-07-21 01:13:28 +08:00 |
|
Tianyi Cui
|
8500974fd4
|
feat: unify JSON value schema DSL
|
2026-07-21 01:11:55 +08:00 |
|
Tianyi Cui
|
4e7a687c0b
|
Merge origin/master into codex/invariant-service-seam
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/support/invariants/package.json
# packages/support/invariants/src/scoped-events.generated.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/support/invariants/tsconfig.json
# pnpm-lock.yaml
|
2026-07-21 00:44:39 +08:00 |
|
Tianyi Cui
|
22fa51845e
|
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
|
2026-07-20 23:03:55 +08:00 |
|
Tianyi Cui
|
f98f0e9838
|
Merge branch 'codex/goal-tools' into codex/goal-session
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/README.md
# packages/core/agent/README.md
|
2026-07-20 22:57:14 +08:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|