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
|
551b665d0f
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-15 16:05:02 +08:00 |
|
Tianyi Cui
|
281eed3e57
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
# Conflicts:
# docs/cordis-catalog/services.md
# docs/rfc/INDEX.md
# docs/rfc/implemented/testing/2026-07-06-pin-request-header-content-in-one-scenario.md
# docs/rfc/proposed/simplification/2026-07-12-simplify-session-log-representation.md
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/normalize.ts
# packages/support/acp-snapshot/src/suite.ts
# packages/support/acp-snapshot/tests/fixtures/suite/pin-turn/session.jsonl
# packages/support/acp-snapshot/tests/suite.spec.ts
|
2026-07-15 15:53:56 +08:00 |
|
Tianyi Cui
|
dbae83d573
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 15:31:29 +08:00 |
|
Tianyi Cui
|
0239ac3752
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 14:05:54 +08:00 |
|
Tianyi Cui
|
627738c4ed
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-code-runtime-surface
|
2026-07-15 13:58:44 +08:00 |
|
Tianyi Cui
|
96851da571
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
# Conflicts:
# docs/rfc/INDEX.md
|
2026-07-15 13:28:40 +08:00 |
|
Tianyi Cui
|
e6edee1d54
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 13:21:06 +08:00 |
|
Tianyi Cui
|
38ea10eee0
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-code-runtime-surface
|
2026-07-15 13:20:08 +08:00 |
|
Tianyi Cui
|
eccaf2e2f7
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
|
2026-07-15 13:10:16 +08:00 |
|
Tianyi Cui
|
77de6497b4
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 01:49:41 +08:00 |
|
Tianyi Cui
|
9b8b17b6fa
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
|
2026-07-15 01:49:00 +08:00 |
|
Tianyi Cui
|
81d3f85605
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-15 01:48:59 +08:00 |
|
Tianyi Cui
|
5d3c995b4c
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
|
2026-07-15 01:48:59 +08:00 |
|
Tianyi Cui
|
da75ed9056
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
|
2026-07-15 01:48:59 +08:00 |
|
Tianyi Cui
|
89bb0c47c3
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-14 23:45:40 +08:00 |
|
Tianyi Cui
|
aba1b18eac
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
|
2026-07-14 23:45:39 +08:00 |
|
Tianyi Cui
|
73b34e5c4d
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
# Conflicts:
# docs/rfc/implemented/architecture/2026-06-18-session-surface.md
# packages/core/session/src/surface.ts
# packages/core/session/tests/surface.spec.ts
|
2026-07-14 23:45:25 +08:00 |
|
Tianyi Cui
|
606337f2f7
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
|
2026-07-14 23:44:39 +08:00 |
|
Tianyi Cui
|
177144917d
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
|
2026-07-14 23:44:38 +08:00 |
|
imccyu
|
c67c3d9413
|
refactor: derive event graphs and scope invariants from TypeScript
|
2026-07-14 23:37:56 +08:00 |
|
Tianyi Cui
|
bd0a1855b9
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
|
2026-07-14 19:06:25 +08:00 |
|
Tianyi Cui
|
59c5010283
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/rfc/implemented/feature/2026-06-15-code-mode.md
|
2026-07-14 19:05:23 +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
|
f28b1bb4bf
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/compaction.md
# packages/compact/compact/src/index.ts
|
2026-07-14 18:45:25 +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
|
2df64c22ad
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-14 18:00:41 +08:00 |
|
Tianyi Cui
|
92c52eec20
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/web.md
# docs/rfc/implemented/simplification/2026-07-04-drop-unconsumed-web-observation-surface.md
# packages/web/tool-web/tests/integration.spec.ts
# packages/web/web-fetch-local/README.md
# packages/web/web-fetch-local/src/provider.ts
# packages/web/web/src/types.ts
|
2026-07-14 17:57:50 +08:00 |
|
Tianyi Cui
|
32ed403500
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# packages/core/agent-loop/src/loop.ts
# packages/core/session/README.md
# packages/core/session/tests/derived-cache.spec.ts
|
2026-07-14 17:30:34 +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
|
f0fc20ca42
|
docs: align prose with runtime contracts
|
2026-07-14 16:21:41 +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 |
|
Tianyi Cui
|
04c956a900
|
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
|
2026-07-14 14:28:40 +08:00 |
|
Tianyi Cui
|
c158f72ac8
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-14 14:27:18 +08:00 |
|
Tianyi Cui
|
b58cf7ec2f
|
fix: coordinate overlapping configured reloads
|
2026-07-14 14:24:21 +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
|
b76c2d9626
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-14 14:14:09 +08:00 |
|
Tianyi Cui
|
539850578a
|
fix: reject legacy header deltas on append
|
2026-07-14 14:06:28 +08:00 |
|
Tianyi Cui
|
6b0de58b1c
|
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
|
2026-07-14 12:46:55 +08:00 |
|
Tianyi Cui
|
faf438df58
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-14 12:46:39 +08:00 |
|
Tianyi Cui
|
b47e4c5276
|
fix: suppress teardown startup failures
|
2026-07-14 12:45:12 +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
|
7d40a9a0c5
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-14 12:39:44 +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
|
91ad787ef4
|
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
|
2026-07-14 12:26:33 +08:00 |
|