 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
|
38eaa05be9
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-21 18:22:48 +08:00 |
|
|
Tianyi Cui
|
1f4f147699
|
test(tools): close canonical output coverage gaps
|
2026-07-21 18:22:14 +08:00 |
|
|
Tianyi Cui
|
80603b22f9
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-21 18:20:32 +08:00 |
|
|
Tianyi Cui
|
72693a346e
|
test(tools): cover adversarial JSON containers
|
2026-07-21 18:20:18 +08:00 |
|
|
Tianyi Cui
|
8a93072537
|
Merge origin/master into worktree/tui-session-controls
|
2026-07-21 18:12:11 +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 |
|
|
Tianyi Cui
|
8f3aca4128
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-21 17:45:00 +08:00 |
|
|
Tianyi Cui
|
4574340d7a
|
fix(tools): harden unified JSON value boundaries
|
2026-07-21 17:44:46 +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 |
|
 Dudu-0223
|
2a55f6b684
|
Merge origin/master into lsp
|
2026-07-21 09:57:36 +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
|
8500974fd4
|
feat: unify JSON value schema DSL
|
2026-07-21 01:11:55 +08:00 |
|
|
Tianyi Cui
|
cbae54c184
|
Merge branch 'codex/goal-commands' into codex/ralph-tool
# Conflicts:
# docs/module-graph.md
|
2026-07-20 23:15:34 +08:00 |
|
|
Tianyi Cui
|
a9a9d40cb1
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# packages/examples/acp-demo/README.md
# packages/examples/acp-demo/src/index.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
|
2026-07-20 23:10:33 +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 |
|
|
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 |
|
|
Yichen Jiang
|
2c075711eb
|
feat(tui): add session controls and compact views
|
2026-07-20 22:44:01 +08:00 |
|
|
Tianyi Cui
|
1b04e8eb2b
|
Merge branch 'codex/goal-commands' into codex/ralph-tool
# Conflicts:
# examples/repl-agent/README.md
# examples/repl-agent/composition.md
# examples/repl-agent/cordis.yml
|
2026-07-20 22:25:16 +08:00 |
|
|
Tianyi Cui
|
5c301febbf
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/module-graph.md
# packages/examples/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
|
2026-07-20 22:18:20 +08:00 |
|
|
Tianyi Cui
|
cc2e14f76e
|
fix: close recovery review gaps
|
2026-07-20 22:11:26 +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
|
30d2ec4a95
|
Merge branch 'codex/goal-commands' into codex/ralph-tool
# Conflicts:
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/model-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/permission-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/skill-load/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/text-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/workspace-edit/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/workspace-edit/tool-schemas.expected.json
# scripts/gen-tool-catalog.ts
|
2026-07-20 21:05:05 +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
|
d121f87def
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/core-data-structures/core.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/model-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/permission-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/skill-load/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/text-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/workspace-edit/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/workspace-edit/tool-schemas.expected.json
|
2026-07-20 20:55:50 +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
|
a86b4c19f5
|
Merge remote-tracking branch 'origin/master' into codex/remove-stdio-agent
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/tests/config-session-id.spec.ts
# packages/ui/stdio/README.md
# packages/ui/stdio/src/index.ts
# packages/ui/stdio/tests/stdio.spec.ts
|
2026-07-20 20:29:08 +08:00 |
|
|
Tianyi Cui
|
3e3f9a911d
|
Merge branch 'codex/goal-domain' into codex/goal-tools
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/core/agent/README.md
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:21:01 +08:00 |
|
|
Tianyi Cui
|
710c62474a
|
Merge branch 'master' into fetch-failed-diagnostics
|
2026-07-20 20:10:57 +08:00 |
|
|
Tianyi Cui
|
2191d45ece
|
Merge origin/master into codex/remove-stdio-agent
# Conflicts:
# examples/repl-agent/cordis.yml
|
2026-07-20 19:58:40 +08:00 |
|
|
Tianyi Cui
|
4cadf096ce
|
Remove the stdio agent
|
2026-07-20 19:26:04 +08:00 |
|
|
Tianyi Cui
|
3293d56a06
|
fix: clarify provider retry delay contract
|
2026-07-20 18:38:22 +08:00 |
|
|
Tianyi Cui
|
8e95f305b0
|
refactor(agent-loop): reuse loaded session metadata
|
2026-07-20 18:26:19 +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
|
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
|
c40e63d04b
|
fix(session-persistence-jsonl): require delegation depth
|
2026-07-20 17:51:21 +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
|
ddad8833df
|
Merge remote-tracking branch 'origin/master' into codex/pr353-retarget-master-20260719
|
2026-07-20 17:27:24 +08:00 |
|
|
Tianyi Cui
|
02a048ffd9
|
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
|
2026-07-20 17:25:21 +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
|
442330d55b
|
Merge origin/master into worktree/contain-result-observer-rejections
|
2026-07-20 17:19:55 +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 |
|