Hypatia May
|
f038780ff6
|
feat(llm): add replay token metering (PR2 round 1)
|
2026-07-15 14:47:29 +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 |
|
Hypatia May
|
c9efdf68f9
|
Merge remote-tracking branch 'origin/master' into codex/compact-tool-pairing
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 13:26:57 +08:00 |
|
Hypatia May
|
cc546c4580
|
feat(compact): move pairing helpers (PR1 round 1)
|
2026-07-15 13:22:44 +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 |
|
imccyu
|
31f4441fd4
|
pkg: update vendor dep
|
2026-07-15 11:28:45 +08:00 |
|
Yichen Jiang
|
35cae1d389
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.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/code-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
|
2026-07-15 10:15:06 +08:00 |
|
Hypatia May
|
356236d08a
|
Merge remote-tracking branch 'origin/master' into session-query-trace
# Conflicts:
# docs/cordis-catalog/services.md
# docs/rfc/INDEX.md
# packages/core/session/src/surface.ts
# packages/support/invariants/src/index.ts
|
2026-07-15 09:11:19 +08:00 |
|
imccyu
|
c67c3d9413
|
refactor: derive event graphs and scope invariants from TypeScript
|
2026-07-14 23:37:56 +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
|
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
|
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 |
|
Hypatia May
|
97f5ec95cd
|
Merge remote-tracking branch 'origin/master' into session-query-trace
# Conflicts:
# docs/cordis-catalog/services.md
# packages/core/session/README.md
# packages/support/invariants/src/index.ts
# packages/support/invariants/tests/invariants.spec.ts
|
2026-07-14 17:31:46 +08:00 |
|
Tianyi Cui
|
34a059c9bc
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
# Conflicts:
# docs/cordis-catalog/services.md
# packages/core/session/README.md
# packages/core/session/tests/derived-cache.spec.ts
# packages/session-persistence/session-persistence-jsonl/tests/jsonl.spec.ts
# packages/session-persistence/session-persistence/src/coordinator.ts
# packages/session-persistence/session-persistence/src/index.ts
|
2026-07-14 17:24:02 +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
|
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
|
60260b5d5b
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
|
2026-07-14 15:24:54 +08:00 |
|
Hypatia May
|
eb42eeda13
|
Merge remote-tracking branch 'origin/master' into session-query-trace
# Conflicts:
# packages/session-query/session-query/README.md
# packages/support/invariants/src/index.ts
|
2026-07-14 14:40: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 |
|
Hypatia May
|
dc60fe9572
|
Avoid retaining processed session seqs
|
2026-07-14 14:23:02 +08:00 |
|
Tianyi Cui
|
5caa9c4f33
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/services.md
|
2026-07-14 14:14:22 +08:00 |
|
Tianyi Cui
|
539850578a
|
fix: reject legacy header deltas on append
|
2026-07-14 14:06:28 +08:00 |
|
Hypatia May
|
dbe65e1d13
|
Unify session surface validation
|
2026-07-14 13:49:36 +08:00 |
|
Tianyi Cui
|
253f707c35
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/services.md
|
2026-07-14 12:41:47 +08:00 |
|
Tianyi Cui
|
1ab64dba62
|
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
# Conflicts:
# docs/config-catalog.md
# docs/development.i18n.yaml
# docs/development.zh.md
# docs/rfc/implemented/feature/2026-06-14-acp-agent-client-protocol.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/AGENTS.md
# examples/README.md
# examples/acp-agent/README.md
# examples/acp-agent/cordis.yml
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# examples/sandbox-acp-agent/README.md
# examples/sandbox-acp-agent/cordis.snapshot.yml
# examples/sandbox-acp-agent/cordis.yml
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# packages/ui/acp-agent/src/bin.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc-agent/src/bin.ts
# scripts/verify-translation-pairing.ts
|
2026-07-14 12:34:14 +08:00 |
|
Tianyi Cui
|
49e45ff184
|
fix: reject legacy fallback headers
|
2026-07-14 12:32:44 +08:00 |
|
Tianyi Cui
|
9272d2871b
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
|
2026-07-14 11:56:09 +08:00 |
|
Tianyi Cui
|
4d5fb2cb1d
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
# docs/core-data-structures/session.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/core/session/README.md
# packages/core/session/src/index.ts
# packages/core/session/src/surface.ts
# packages/core/session/tests/surface.spec.ts
# scripts/type-equiv.manifest.json
|
2026-07-14 11:49:46 +08:00 |
|
Tianyi Cui
|
34fe20962f
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
# Conflicts:
# packages/core/session/src/surface.ts
|
2026-07-14 11:39:11 +08:00 |
|
Tianyi Cui
|
a50e8bc1f3
|
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
# Conflicts:
# packages/bash/bash-sandbox/README.md
# packages/sandbox/sandbox-local/README.md
|
2026-07-14 11:28:08 +08:00 |
|
Tianyi Cui
|
709cc7200e
|
refactor: unify agent and session identity
|
2026-07-14 01:59:21 +08:00 |
|
Tianyi Cui
|
1123e946c0
|
refactor: simplify session log representation
|
2026-07-13 23:56:10 +08:00 |
|
Tianyi Cui
|
20402b637c
|
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/rfc/proposed/feature/2026-07-08-interactive-side-sessions.md
# docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
# examples/coding-agent/tests/keyless-smoke.e2e.ts
# packages/ui/acp/src/index.ts
|
2026-07-13 23:44:44 +08:00 |
|
Tianyi Cui
|
148046b9c8
|
docs: rebalance prose cleanup and add trimming skill
|
2026-07-13 23:27:00 +08:00 |
|
Tianyi Cui
|
d060c0dd4f
|
refactor: prune dead session surfaces
|
2026-07-13 23:25:20 +08:00 |
|
Tianyi Cui
|
d77f797d89
|
docs: replace model experience tables with sections
|
2026-07-13 22:26:33 +08:00 |
|
Tianyi Cui
|
646f3d2d0c
|
docs: apply verbatim model experience guidance repo-wide
|
2026-07-13 21:33:23 +08:00 |
|
Tianyi Cui
|
c45d7927cf
|
docs: tighten prose audit after master retarget
|
2026-07-13 16:24:32 +08:00 |
|
Hypatia May
|
84e6f72ef5
|
fix(session-query): reject misplaced surface ops
|
2026-07-13 16:05:11 +08:00 |
|
Hypatia May
|
3d3789bf2d
|
Merge remote-tracking branch 'origin/session-query' into session-query-trace-filter
# Conflicts:
# docs/config-catalog.md
# docs/core-data-structures/core.md
# docs/rfc/INDEX.md
# packages/support/invariants/src/index.ts
|
2026-07-13 14:55:25 +08:00 |
|
Hypatia May
|
75de01f06d
|
refactor(session): centralize surface provenance validation
|
2026-07-13 14:46:43 +08:00 |
|
Yichen Jiang
|
adf6b8a1ab
|
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# 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
# docs/rfc/implemented/feature/2026-06-15-code-mode.md
# docs/rfc/implemented/feature/2026-06-30-interception-seams.md
# docs/rfc/proposed/simplification/2026-07-04-prune-dead-core-spine-surface.md
# docs/tool-execution-pipeline.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-core/tests/agent-core.spec.ts
# packages/core/agent-loop/src/agent.ts
# packages/core/agent/README.md
# packages/core/session/src/index.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# pnpm-lock.yaml
# scripts/gen-doc-graphs.ts
# scripts/type-equiv.manifest.json
|
2026-07-13 14:37:32 +08:00 |
|
Hypatia May
|
00bfc03d20
|
Merge remote-tracking branch 'origin/master' into session-query
# Conflicts:
# docs/core-data-structures/core.md
# docs/module-graph.md
# docs/rfc/INDEX.md
# vendor/README.md
|
2026-07-13 14:27:31 +08:00 |
|
Tianyi Cui
|
8ee569d6bf
|
Merge remote-tracking branch 'origin/codex/package-readme-limitations-audit-20260712' into codex/model-experience-readmes-20260712
# Conflicts:
# packages/core/tools/README.md
|
2026-07-13 13:48:43 +08:00 |
|
Tianyi Cui
|
f658fb35e3
|
Merge remote-tracking branch 'origin/worktree-agent-scope-design' into codex/trim-ai-prose
|
2026-07-13 13:46:51 +08:00 |
|
Tianyi Cui
|
b84165f1bf
|
Merge remote-tracking branch 'origin/worktree-agent-scope-design' into codex/package-readme-limitations-audit-20260712
|
2026-07-13 13:45:20 +08:00 |
|
Tianyi Cui
|
6a8118c967
|
docs: align scoped runtime contracts
|
2026-07-13 13:41:27 +08:00 |
|
Tianyi Cui
|
5158cc3e0b
|
Merge remote-tracking branch 'origin/codex/package-readme-limitations-audit-20260712' into codex/model-experience-readmes-20260712
# Conflicts:
# packages/AGENTS.md
|
2026-07-12 23:54:00 +08:00 |
|