 Tianyi Cui
|
18abf87107
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
# Conflicts:
# docs/rfc/implemented/architecture/2026-07-05-prompt-variables-and-tool-guidance-ownership.md
# packages/subagent/subagent-subprocess/src/index.ts
# packages/subagent/tool-subagent/src/index.ts
|
2026-07-14 19:02:27 +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
|
38213ff244
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 18:41:56 +08:00 |
|
|
Tianyi Cui
|
66c2996b36
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
# docs/rfc/implemented/testing/2026-07-08-shared-acp-snapshot-package.md
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/harness.ts
# packages/support/acp-snapshot/src/index.ts
|
2026-07-14 18:40:49 +08:00 |
|
|
Tianyi Cui
|
36a2430ec9
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
# Conflicts:
# docs/rfc/proposed/process/2026-06-20-discover-package-inventory.md
# examples/acp-agent/tests/acp.snapshot.ts
|
2026-07-14 18:38:18 +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
|
dbf4bebe83
|
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
# Conflicts:
# examples/AGENTS.md
# examples/coding-agent/tests/code-mode-keyless-smoke.e2e.ts
# examples/coding-agent/tests/keyless-smoke.e2e.ts
# examples/cordis-agent/tests/keyless-smoke.e2e.ts
# examples/echo-agent/tests/echo.e2e.ts
|
2026-07-14 18:30:10 +08:00 |
|
 Yichen Jiang
|
9956528495
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/bash.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# docs/rfc/proposed/architecture/2026-06-20-generic-long-running-tool-runtime.md
# examples/AGENTS.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/advanced-toolchain/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/system-prompt.golden.md
# examples/coding-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/bash/bash-local/README.md
# packages/bash/bash-local/src/index.ts
# packages/bash/bash-local/tests/executor.spec.ts
# packages/bash/bash-sandbox/README.md
# packages/bash/bash-sandbox/src/index.ts
# packages/bash/bash/README.md
# packages/bash/bash/src/index.ts
# packages/bash/bash/src/types.ts
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-core/README.md
# packages/core/agent-core/src/index.ts
# packages/subagent/subagent/README.md
# packages/subagent/tool-subagent/README.md
# packages/subagent/tool-subagent/src/index.ts
# packages/ui/acp-agent/README.md
# packages/ui/acp/README.md
# packages/ui/stdio-agent/README.md
# packages/util/brand/src/index.ts
# scripts/doc-budgets.manifest.json
|
2026-07-14 18:05:46 +08:00 |
|
|
Yichen Jiang
|
0d67c16d56
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/bash.md
# docs/module-graph.md
# docs/rfc/INDEX.md
# docs/rfc/implemented/architecture/2026-06-30-bash-stdin-env-trusted-plugin-surface.md
# docs/rfc/implemented/feature/2026-06-30-hook-bridges.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/advanced-toolchain/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/bash/bash-local/README.md
# packages/bash/bash-local/src/run.ts
# packages/bash/bash-local/tests/run.spec.ts
# packages/bash/bash/README.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-core/src/index.ts
# packages/session-persistence/session-persistence-jsonl/src/index.ts
# packages/session-persistence/session-persistence-sqlite/src/index.ts
# packages/session-persistence/session-persistence/README.md
# packages/session-persistence/session-persistence/src/index.ts
# packages/ui/acp-agent/README.md
# packages/ui/stdio-agent/README.md
|
2026-07-14 18:04:05 +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
|
fd91515d1a
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
# Conflicts:
# docs/cordis-catalog/services.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm/src/assembler.ts
# packages/llm/llm/tests/assembler.spec.ts
|
2026-07-14 17:45:52 +08:00 |
|
|
Tianyi Cui
|
d9d9487e0e
|
docs: align time-context prose standard
|
2026-07-14 17:44:32 +08:00 |
|
|
Tianyi Cui
|
f1a3484cca
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
# Conflicts:
# docs/config-catalog.md
|
2026-07-14 17:41:20 +08:00 |
|
|
Tianyi Cui
|
3c1470046a
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
# Conflicts:
# docs/config-catalog.md
# packages/bash/tool-bash/src/index.ts
|
2026-07-14 17:38:15 +08:00 |
|
|
Tianyi Cui
|
89aedb5ea6
|
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
# Conflicts:
# docs/config-catalog.md
|
2026-07-14 17:33:52 +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
|
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
|
498de7f042
|
Merge remote-tracking branch 'origin/master' into codex/time-context-plugin
|
2026-07-14 17:26:20 +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
|
71790b7047
|
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
# Conflicts:
# packages/support/README.md
|
2026-07-14 16:10:26 +08:00 |
|
|
Tianyi Cui
|
a9d74932b1
|
feat: add optional time context plugin
|
2026-07-14 16:04:34 +08:00 |
|
|
Tianyi Cui
|
d86a141e4f
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
|
2026-07-14 15:57:09 +08:00 |
|
|
Tianyi Cui
|
fdf0789938
|
Merge branch 'codex/simp-prune-web-seam-fields' into codex/simp-hide-web-provider-helpers
|
2026-07-14 15:56:51 +08:00 |
|
|
Tianyi Cui
|
b79520ab87
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
# Conflicts:
# packages/web/tool-web/README.md
# packages/web/web/README.md
|
2026-07-14 15:56:42 +08:00 |
|
|
Tianyi Cui
|
9c73c3c211
|
Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
|
2026-07-14 15:44:56 +08:00 |
|
|
Tianyi Cui
|
bd68376100
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
|
2026-07-14 15:44:49 +08:00 |
|
|
Tianyi Cui
|
989539d3ed
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
|
2026-07-14 15:44:40 +08:00 |
|
|
Tianyi Cui
|
d83618c1dc
|
Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface
|
2026-07-14 15:44:33 +08:00 |
|
|
Tianyi Cui
|
f119de8b2e
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
# Conflicts:
# packages/bash/tool-bash/README.md
|
2026-07-14 15:44:25 +08:00 |
|
|
Tianyi Cui
|
e4a08fff9e
|
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
# Conflicts:
# packages/fs/fs-local/README.md
# packages/fs/tool-fs/README.md
|
2026-07-14 15:43:35 +08:00 |
|
|
Tianyi Cui
|
6cbb3270c3
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-14 15:42:52 +08:00 |
|
|
Tianyi Cui
|
3707aaa72e
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
# Conflicts:
# packages/code-runtime/code-runtime-worker/README.md
# packages/code-runtime/code-runtime/README.md
|
2026-07-14 15:42:39 +08:00 |
|
|
Tianyi Cui
|
6682149348
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
|
2026-07-14 15:41:46 +08:00 |
|
|
Tianyi Cui
|
ab6faf78ba
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-14 15:41:34 +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
|
908603ad73
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-14 15:26:46 +08:00 |
|
|
Tianyi Cui
|
29072d9830
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-14 15:26:40 +08:00 |
|
|
Tianyi Cui
|
a30660a63f
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
# packages/support/README.md
# packages/support/acp-snapshot/README.md
|
2026-07-14 15:26:34 +08:00 |
|
|
Tianyi Cui
|
2ef709a496
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
|
2026-07-14 15:25:36 +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 |
|