Tianyi Cui
|
3fc6f91cea
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-18 12:07:56 +08:00 |
|
Yichen Jiang
|
be3d2076b8
|
Merge origin/master into worktree/agent-execution-context-rfc
|
2026-07-17 23:25:01 +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 |
|
pku-xht
|
0b720942df
|
review fix: qualify one-turn documentation
|
2026-07-17 17:31:35 +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 |
|
pku-xht
|
aa4e629874
|
feat(agent-loop): give each send its own turn
|
2026-07-17 17:14:52 +08:00 |
|
Yichen Jiang
|
55916f931d
|
fix(core): preserve abort-observer replacements
|
2026-07-16 19:16:54 +08:00 |
|
Yichen Jiang
|
c238992fbb
|
feat(core): make turn cancellation explicit
|
2026-07-16 18:14:13 +08:00 |
|
Yichen Jiang
|
97190c81ba
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
|
2026-07-16 16:39:13 +08:00 |
|
Yichen Jiang
|
7bcae0cd64
|
feat(core): add agent execution context
|
2026-07-16 16:29:46 +08:00 |
|
Hypatia May
|
da48435e8c
|
Merge remote-tracking branch 'origin/token-meter-service' into compact-post-step-overflow-recovery
# Conflicts:
# docs/architecture.md
|
2026-07-16 10:14:33 +08:00 |
|
Yichen Jiang
|
a621d2f9a6
|
Merge branch 'master' into codex/project-instruction-files
|
2026-07-16 09:52:52 +08:00 |
|
hypatiamay
|
5dd37a4f99
|
Merge branch 'master' into debug-pangwenjie
|
2026-07-16 09:49:28 +08:00 |
|
Tianyi Cui
|
680395e7f4
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-16 00:03:13 +08:00 |
|
Tianyi Cui
|
a83847f987
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-16 00:02:55 +08:00 |
|
Tianyi Cui
|
a48a95edde
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-16 00:02:54 +08:00 |
|
Tianyi Cui
|
3765abf731
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
|
2026-07-16 00:02:54 +08:00 |
|
imccyu
|
42b07a7022
|
feat(sdk): add developer project tooling
docs(rfc): propose SDK developer project tooling
feat: rename / docs
ci: fix windows gates
docs: revert
|
2026-07-15 23:17:29 +08:00 |
|
Hypatia May
|
12484104c8
|
feat(compact): recover context overflow (PR3 phase 2)
|
2026-07-15 16:50:44 +08:00 |
|
Tianyi Cui
|
9082cebc56
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 16:27:37 +08:00 |
|
Tianyi Cui
|
debd4ae5c8
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
|
2026-07-15 16:26:12 +08:00 |
|
Tianyi Cui
|
6d1870c8c1
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/bash/tool-bash/src/index.ts
# packages/ui/stdio-agent/README.md
# packages/ui/stdio-agent/src/index.ts
# packages/ui/stdio/src/index.ts
# packages/workflow/workflow-workerthread/tests/workflow-workerthread.spec.ts
# packages/workflow/workflow/package.json
# scripts/gen-doc-graphs.ts
|
2026-07-15 16:24:43 +08:00 |
|
Tianyi Cui
|
d42cea85c7
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-15 16:05:07 +08:00 |
|
Hypatia May
|
e8d066f750
|
feat(core): add post-step request recovery (PR3 phase 1)
|
2026-07-15 16:03:52 +08:00 |
|
Hypatia May
|
9cddfe7fd7
|
Merge remote-tracking branch 'origin/master' into debug-pangwenjie
# Conflicts:
# docs/event-producer-consumer.md
# packages/core/agent-loop/src/loop.ts
|
2026-07-15 15:31:27 +08:00 |
|
Tianyi Cui
|
c2c38b18c4
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent/src/types.ts
|
2026-07-15 15:08:10 +08:00 |
|
Tianyi Cui
|
130140feda
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 15:07:35 +08:00 |
|
Tianyi Cui
|
10f50c1b55
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# packages/core/agent/src/types.ts
|
2026-07-15 15:07:11 +08:00 |
|
Tianyi Cui
|
76c35dee8f
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-15 15:04:48 +08:00 |
|
Tianyi Cui
|
649865043d
|
docs: preserve prose cleanup in session simplification
|
2026-07-15 14:59:20 +08:00 |
|
Yichen Jiang
|
75331f03a6
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 13:30:40 +08:00 |
|
Yichen Jiang
|
ca14bcc34b
|
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/fs/fs-local/src/index.ts
# pnpm-lock.yaml
|
2026-07-15 13:07:11 +08:00 |
|
Hypatia May
|
28144077f3
|
Fix deferred injection lifecycle
|
2026-07-15 12:22:39 +08:00 |
|
imccyu
|
31f4441fd4
|
pkg: update vendor dep
|
2026-07-15 11:28:45 +08:00 |
|
Hypatia May
|
4ce32807e1
|
Fix async injection tool-result ordering
|
2026-07-15 11:12:05 +08:00 |
|
Yichen Jiang
|
815365dbbe
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/sandbox-acp-agent/cordis.yml
# examples/sandbox-acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/session/README.md
# packages/core/session/src/types.ts
# packages/core/session/tests/derived-cache.spec.ts
# packages/llm/llm-deepseek/src/index.ts
# packages/llm/llm-pi-ai/README.md
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm-pi-ai/src/convert.ts
# packages/llm/llm-pi-ai/tests/adapter.spec.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/call-config.ts
# packages/llm/llm/src/index.ts
# packages/ui/acp-agent/src/index.ts
# packages/ui/acp/tests/harness.ts
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/src/server.ts
# packages/ui/stdio-agent/README.md
# packages/ui/stdio-agent/src/index.ts
# python/sdk/README.i18n.yaml
|
2026-07-14 22:17:50 +08:00 |
|
Yichen Jiang
|
e547980d77
|
feat(llm): route adapters by provider
|
2026-07-14 21:57:52 +08:00 |
|
Yichen Jiang
|
ee111fd978
|
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# docs/rfc/implemented/architecture/2026-07-05-reconstructable-requests.md
# docs/rfc/implemented/feature/2026-06-15-code-mode.md
# docs/rfc/implemented/feature/2026-06-30-hook-bridges.md
# docs/rfc/implemented/feature/2026-06-30-interception-seams.md
# docs/rfc/implemented/feature/2026-07-08-repeat-tool-guard.md
# docs/rfc/proposed/simplification/2026-07-04-prune-dead-core-spine-surface.md
# examples/AGENTS.md
# examples/acp-agent/cordis.yml
# examples/acp-agent/tests/acp.snapshot.ts
# examples/echo-agent/cordis.yml
# examples/sandbox-acp-agent/cordis.yml
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-core/README.md
# packages/core/agent-core/src/index.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/interception.spec.ts
# packages/core/agent/src/types.ts
# packages/core/tools/README.md
# packages/core/tools/src/code-mode.ts
# packages/core/tools/src/index.ts
# packages/fs/fs-local/src/index.ts
# packages/fs/fs/README.md
# packages/fs/fs/src/index.ts
# packages/guard/repeat-tool-guard/README.md
# packages/guard/repeat-tool-guard/src/index.ts
# packages/hooks/hooks-claude/src/index.ts
# packages/hooks/hooks-codex/src/index.ts
# packages/ui/acp-agent/src/index.ts
|
2026-07-14 19:50:25 +08:00 |
|
Tianyi Cui
|
93dc0f30a9
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/tests/agent.spec.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
|
2026-07-14 18:58:29 +08:00 |
|
Tianyi Cui
|
8a5ebb1cde
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-07-06-approval-seam.md
# packages/ui/acp/README.md
# packages/ui/acp/src/index.ts
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/src/server.ts
|
2026-07-14 18:55:51 +08:00 |
|
Tianyi Cui
|
83271191d1
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/architecture/2026-06-18-agent-lifecycle-and-ownership-seams.md
# docs/rfc/implemented/architecture/2026-06-20-branded-ids.md
# docs/rfc/implemented/simplification/2026-06-20-remove-agent-boundary-mirror-events.md
# docs/rfc/proposed/feature/2026-07-07-claude-code-and-codex-subagent-backends.md
# docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/agent/README.md
# packages/core/agent/src/index.ts
# packages/guard/repeat-tool-guard/src/index.ts
# packages/hooks/hooks-claude/tests/bridge.spec.ts
# packages/subagent/subagent-acp/tests/mock-acp-server.ts
# packages/ui/acp/tests/dispose.spec.ts
# packages/ui/stdio-agent/src/index.ts
# packages/ui/stdio-agent/src/stdio-chat.ts
# packages/ui/stdio-agent/tests/stdio-chat.spec.ts
# packages/util/brand/src/index.ts
|
2026-07-14 18:51:24 +08:00 |
|
Tianyi Cui
|
897bbe89f5
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
# Conflicts:
# packages/core/agent/src/index.ts
|
2026-07-14 18:48:24 +08:00 |
|
Tianyi Cui
|
78276c52a7
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/persistence-catalog.md
# docs/rfc/implemented/architecture/2026-07-05-reconstructable-requests.md
# docs/rfc/implemented/feature/2026-06-18-compaction-capability-seam.md
# docs/rfc/implemented/feature/2026-07-06-explicit-tool-order.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# docs/rfc/implemented/feature/2026-07-07-session-prefix.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/src/request-log.ts
# packages/core/agent-loop/tests/request-reconstruction.spec.ts
# packages/core/agent/src/types.ts
# packages/core/session/README.md
# packages/core/session/src/request-header.ts
# packages/core/session/src/surface.ts
# packages/core/session/src/tool-pairing.ts
# packages/core/session/src/types.ts
# packages/core/session/tests/surface.spec.ts
# packages/core/session/tests/tool-pairing.spec.ts
# packages/llm/llm/src/call-config.ts
# packages/support/acp-snapshot/src/suite.ts
# packages/support/invariants/README.md
# packages/ui/user-approval/README.md
|
2026-07-14 18:34:34 +08:00 |
|
Tianyi Cui
|
f0fc20ca42
|
docs: align prose with runtime contracts
|
2026-07-14 16:21:41 +08:00 |
|
Tianyi Cui
|
a5e1717059
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 15:31:20 +08:00 |
|
Tianyi Cui
|
e3767c64d9
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-14 15:31:13 +08:00 |
|
Tianyi Cui
|
440afff96e
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# packages/ui/stdio-agent/README.md
|
2026-07-14 15:27:32 +08:00 |
|
Tianyi Cui
|
262a0d0a2b
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-14 15:26:53 +08:00 |
|
Tianyi Cui
|
443526285e
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
# docs/persistence-catalog.md
# packages/bash/bash/src/session-mode.ts
|
2026-07-14 15:25:26 +08:00 |
|
Tianyi Cui
|
8590ba00a4
|
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
# Conflicts:
# docs/AGENTS.md
# docs/config-catalog.md
# packages/bash/bash-sandbox/src/index.ts
# packages/bash/bash/src/session-mode.ts
# packages/bash/tool-bash/README.md
# packages/code-runtime/code-runtime-worker/README.md
# packages/compact/compact/src/index.ts
# packages/core/agent-core/README.md
# packages/hooks/hooks-claude/src/config.ts
# packages/hooks/hooks-claude/src/index.ts
# packages/hooks/hooks-codex/src/config.ts
# packages/hooks/hooks-codex/src/index.ts
# packages/llm/llm/README.md
# packages/session-persistence/session-persistence-jsonl/README.md
# packages/session-persistence/session-persistence/README.md
# packages/skill/skill-local/README.md
# packages/support/acp-snapshot/README.md
# packages/support/invariants/src/index.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc/README.md
# packages/ui/permission/README.md
# packages/ui/user-approval/README.md
# packages/ui/user-interaction/README.md
# packages/web/web-search-deepseek/README.md
|
2026-07-14 14:37:16 +08:00 |
|