Yichen Jiang
|
eb86fce086
|
Merge remote-tracking branch 'origin/master' into worktree/fix-sqlite-file-permissions
# Conflicts:
# docs/config-catalog.md
|
2026-07-17 23:06:20 +08:00 |
|
Tianyi Cui
|
06ea8643ff
|
Merge newest origin/master into token-meter-service
|
2026-07-17 22:49:54 +08:00 |
|
Tianyi Cui
|
f943bc8d4c
|
Merge latest origin/master into token-meter-service
|
2026-07-17 22:38:46 +08:00 |
|
Tianyi Cui
|
7a2d5cd28d
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 22:33:42 +08:00 |
|
Tianyi Cui
|
3e07f9b270
|
Merge latest origin/master into parallel-tool-call
|
2026-07-17 22:28:38 +08:00 |
|
Tianyi Cui
|
1c6a36e4a3
|
Merge origin/master into token-meter-service
|
2026-07-17 22:22:55 +08:00 |
|
Tianyi Cui
|
b79e7a5e30
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 22:20:06 +08:00 |
|
Tianyi Cui
|
911600d92e
|
Merge remote-tracking branch 'origin/master' into codex/pr265-merge-master-20260717
|
2026-07-17 22:15:28 +08:00 |
|
Tianyi Cui
|
688b95a7e5
|
Merge origin/master into parallel-tool-call
|
2026-07-17 22:13:33 +08:00 |
|
Tianyi Cui
|
fb8a10f8ea
|
docs(mode): correct Codex plan mode prior art
|
2026-07-17 22:10:54 +08:00 |
|
Tianyi Cui
|
cedb78be3d
|
Merge remote-tracking branch 'origin/master' into feat/plan-mode
|
2026-07-17 22:09:44 +08:00 |
|
Tianyi Cui
|
847a1a1a5a
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/core/session/README.md
# packages/core/session/tests/tool-pairing.spec.ts
# website/zh-CN/api/harness/sessions.md
|
2026-07-17 22:07:37 +08:00 |
|
Tianyi Cui
|
578e89a29e
|
Merge current master into codex/simp-session-log-representation
|
2026-07-17 22:01:08 +08:00 |
|
Tianyi Cui
|
35e45af081
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
|
2026-07-17 21:56:43 +08:00 |
|
Tianyi Cui
|
53680ee6bc
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/context/time-context/tests/time-context.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/session/README.md
# packages/core/session/src/types.ts
# packages/core/session/tests/surface.spec.ts
# packages/examples/acp-demo/tests/acp-agent.spec.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/hooks/hooks-claude/tests/coverage.spec.ts
# packages/hooks/hooks-codex/tests/coverage.spec.ts
# packages/session-query/session-query/tests/session-query.spec.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/ui/acp/tests/harness.ts
|
2026-07-17 21:56:10 +08:00 |
|
Tianyi Cui
|
24bd0f3832
|
Merge origin/master into compact-tool-pairing
|
2026-07-17 21:55:51 +08:00 |
|
Tianyi Cui
|
487f120604
|
Merge latest master into codex/simp-session-log-representation
|
2026-07-17 21:55:29 +08:00 |
|
Tianyi Cui
|
62f6251bf9
|
fix(agent-loop): reclassify pending tool calls
|
2026-07-17 21:55:10 +08:00 |
|
Tianyi Cui
|
ce393ccb93
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 21:51:36 +08:00 |
|
Tianyi Cui
|
644245f581
|
Merge latest master into feat/website-docs
|
2026-07-17 21:47:19 +08:00 |
|
Tianyi Cui
|
a770c8b093
|
Merge origin/master into compact-tool-pairing
|
2026-07-17 21:44:30 +08:00 |
|
Tianyi Cui
|
ecd84f7eb9
|
Merge origin/master into compact-tool-pairing
|
2026-07-17 21:36:06 +08:00 |
|
Tianyi Cui
|
a385b3e465
|
Merge remote-tracking branch 'origin/master' into codex/pr358-merge-master-20260717
# Conflicts:
# docs/event-producer-consumer.md
# packages/session-persistence/session-persistence/README.md
|
2026-07-17 21:35:43 +08:00 |
|
Tianyi Cui
|
246e32c5a0
|
Merge remote-tracking branch 'origin/master' into feat/plan-mode
|
2026-07-17 21:27:33 +08:00 |
|
Tianyi Cui
|
de63ce4d52
|
Merge remote-tracking branch 'origin/master' into codex/pr271-merge-master-20260717
|
2026-07-17 21:26:43 +08:00 |
|
Tianyi Cui
|
b3b353b017
|
Merge master into codex/grep-glob-require-rg
|
2026-07-17 21:25:37 +08:00 |
|
Tianyi Cui
|
447a4ef9fb
|
Merge latest master into feat/website-docs
|
2026-07-17 21:25:24 +08:00 |
|
Tianyi Cui
|
4ee880a189
|
Merge remote-tracking branch 'origin/master' into feat/plan-mode
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/README.md
# packages/bash/tool-bash/src/index.ts
# packages/core/tools/tests/gen-tool-catalog.spec.ts
# pnpm-lock.yaml
# scripts/doc-budgets.manifest.json
|
2026-07-17 21:22:16 +08:00 |
|
Tianyi Cui
|
d447a7efb8
|
Merge branch 'master' into feat/website-docs
|
2026-07-17 21:19:33 +08:00 |
|
Tianyi Cui
|
92b8abdd88
|
Merge remote-tracking branch 'origin/master' into codex/pr199-merge-master-20260717
# Conflicts:
# docs/rfc/INDEX.md
|
2026-07-17 21:13:43 +08:00 |
|
Tianyi Cui
|
e9a1f63ebd
|
Merge latest master into worktree-fast-gates
|
2026-07-17 20:39:05 +08:00 |
|
Tianyi Cui
|
8462bdb041
|
Merge latest master into worktree-fast-gates
|
2026-07-17 20:33:24 +08:00 |
|
Tianyi Cui
|
256300c58d
|
Merge branch 'master' into time-context-history
|
2026-07-17 20:32:55 +08:00 |
|
Tianyi Cui
|
7caa723aeb
|
Merge branch 'master' into worktree-fast-gates
|
2026-07-17 20:22:34 +08:00 |
|
Tianyi Cui
|
dc3f61e78b
|
Merge branch 'master' into time-context-history
|
2026-07-17 20:22:31 +08:00 |
|
Tianyi Cui
|
322a7e0709
|
Merge remote-tracking branch 'origin/master' into worktree/agent-loop-testkit
|
2026-07-17 20:17:27 +08:00 |
|
Yichen Jiang
|
559939623a
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/capability-seams.md
# packages/cordis/tool-cordis/src/api-catalog.ts
|
2026-07-17 19:16:15 +08:00 |
|
Yichen Jiang
|
46a6c77beb
|
Merge remote-tracking branch 'origin/master' into worktree/agent-loop-testkit
# Conflicts:
# packages/README.md
|
2026-07-17 19:13:37 +08:00 |
|
Tianyi Cui
|
e01b5dc354
|
Merge origin/master into session-query-trace
|
2026-07-17 18:41:42 +08:00 |
|
Yichen Jiang
|
7d85d3027d
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# docs/rfc/INDEX.md
# packages/README.md
# packages/bash/bash-local/README.md
# packages/bash/bash/README.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/examples/acp-demo/src/index.ts
# packages/examples/acp-demo/tests/acp-agent.spec.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/util/README.md
# pnpm-lock.yaml
# tsconfig.build.json
# tsconfig.json
|
2026-07-17 18:39:05 +08:00 |
|
Tianyi Cui
|
1b102b7279
|
Merge branch 'master' into feat/website-docs
|
2026-07-17 18:23:01 +08:00 |
|
Dudu-0223
|
a3f62478e1
|
Merge origin/master into codex/truncated-design
|
2026-07-17 18:21:54 +08:00 |
|
pku-xht
|
915c727e14
|
review fix: distinguish checkpoint settlement
|
2026-07-17 17:38:39 +08:00 |
|
pku-xht
|
0b720942df
|
review fix: qualify one-turn documentation
|
2026-07-17 17:31:35 +08:00 |
|
Yichen Jiang
|
a38ff125a7
|
feat(dsbench): add SDK evaluation composition
|
2026-07-17 17:29:38 +08:00 |
|
pku-xht
|
55f61189b1
|
Merge remote-tracking branch 'origin/master' into codex/send-one-turn
# Conflicts:
# docs/architecture.md
# docs/core-data-structures/core.md
# docs/rfc/implemented/feature/2026-06-30-interception-seams.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/src/types.ts
|
2026-07-17 17:25:06 +08:00 |
|
Yichen Jiang
|
a6915745e0
|
fix(bash-local): bound inherited pipe drain and spill files
|
2026-07-17 17:21:23 +08:00 |
|
pku-xht
|
aa4e629874
|
feat(agent-loop): give each send its own turn
|
2026-07-17 17:14:52 +08:00 |
|
Turtle
|
7f91a05ed7
|
docs: add TUI screenshots
|
2026-07-17 17:13:41 +08:00 |
|
pku-xht
|
97c5ca940d
|
review fix: preserve blocked-prompt RFC contract
|
2026-07-17 16:58:56 +08:00 |
|