Commit Graph
1905 Commits
Author SHA1 Message Date
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 af267aa8c0 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-15 15:04:47 +08:00
Tianyi Cui a2acfb858e Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-15 15:04:47 +08:00
Tianyi Cui 188698723c Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-15 15:04:47 +08:00
Tianyi Cui 17693d20c4 Merge remote-tracking branch 'origin/codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
# Conflicts:
#	packages/support/acp-snapshot/src/suite.ts
2026-07-15 15:04:29 +08:00
Tianyi Cui 649865043d docs: preserve prose cleanup in session simplification 2026-07-15 14:59:20 +08:00
Hypatia May f038780ff6 feat(llm): add replay token metering (PR2 round 1) 2026-07-15 14:47: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 3da772998b Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers 2026-07-15 14:04:21 +08:00
Tianyi Cui c122c2f0e6 Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract 2026-07-15 14:02:55 +08:00
Tianyi Cui d711dad726 Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface 2026-07-15 14:01:14 +08:00
Yichen Jiang 3c7f4d4162 Merge branch 'master' into worktree/provider-routed-llm-adapters 2026-07-15 13:59:52 +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
Yichen Jiang e4bc2f3021 Merge remote-tracking branch 'origin/master' into worktree/docs-website
# Conflicts:
#	docs/rfc/INDEX.md
#	package.json
#	pnpm-lock.yaml
2026-07-15 13:57:09 +08:00
Yichen Jiang 40336f945a Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks 2026-07-15 13:38:22 +08:00
Yichen Jiang 09d9fec6f9 Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
#	docs/config-catalog.md
#	docs/core-data-structures/bash.md
#	packages/bash/bash-local/src/index.ts
#	packages/bash/bash/src/types.ts
#	packages/bash/bash/tests/service.spec.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
2026-07-15 13:38:17 +08:00
Yichen Jiang aa284e0802 Merge branch 'master' into codex/project-instruction-files 2026-07-15 13:36:53 +08:00
Yichen Jiang 28344ac124 Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location 2026-07-15 13:35:54 +08:00
Yichen Jiang 2ed2fa3896 Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
#	packages/bash/bash-local/tests/run.spec.ts
#	packages/bash/tool-bash/src/index.ts
2026-07-15 13:34:09 +08:00
Yichen Jiang f1d39921c9 feat(acp): advertise and switch llm models 2026-07-15 13:33:42 +08:00
Tianyi Cui 713b50cc2c Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers 2026-07-15 13:32:45 +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 3285b77d3c Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-15 13:30:39 +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
Yichen Jiang 8a50ddc6f4 Merge remote-tracking branch 'origin/codex/agent-session-jsonl-location' into codex/agent-session-jsonl-location 2026-07-15 13:28:00 +08:00
Yichen Jiang 72105ad89c Merge remote-tracking branch 'origin/master' into codex/project-instruction-files 2026-07-15 13:27:28 +08:00
Tianyi Cui 40065dd4fc Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface 2026-07-15 13:27:16 +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
Yichen Jiang 9e6a2827c6 Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
#	docs/module-graph.md
#	packages/README.md
#	packages/cordis/tool-cordis/src/api-catalog.ts
#	packages/core/tools/README.md
#	packages/core/tools/src/index.ts
#	packages/ui/stdio-agent/tests/built-bin.e2e.ts
2026-07-15 13:25:44 +08:00
Yichen Jiang 6edd4a205b Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
#	packages/README.md
2026-07-15 13:25:29 +08:00
Tianyi Cui fe2d61198f Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface 2026-07-15 13:23:16 +08:00
Hypatia May cc546c4580 feat(compact): move pairing helpers (PR1 round 1) 2026-07-15 13:22:44 +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 3eb8c15b36 Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface 2026-07-15 13:14:56 +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
imccyu 8aa4c8f660 Merge branch 'master' into refactor/agent-leaf-dependencies 2026-07-15 13:10:14 +08:00
imccyu 517964fe84 Merge branch 'master' into refactor/agent-leaf-dependencies 2026-07-15 13:09:33 +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
Tianyi Cui 4d29e8b5d7 Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness 2026-07-15 13:03:53 +08:00
Tianyi Cui e16ce4d04e Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events 2026-07-15 12:59:17 +08:00
Tianyi Cui cc5856e1c8 Merge latest filesystem cleanup from master
Master advanced from be363166e to b06e3e9c6 immediately after the lockfile-repair run completed. The new parent change hides internal filesystem implementation helpers and updates its focused tests and generated configuration catalog.

Merge that exact tip so PR #251 remains based on current master rather than publishing an already-behind branch. The filesystem change is disjoint from the managed-environment fix; Git only needed to combine the generated config catalog and did so without a manual semantic choice.

The normal pre-push gate validates the combined documentation, filesystem tests, package surfaces, build, and snapshots before publication.
2026-07-15 12:58:09 +08:00
imccyu 4593bf6ed4 Merge remote-tracking branch 'origin/master' into refactor/agent-leaf-dependencies 2026-07-15 12:54:06 +08:00
Tianyi Cui cb682af117 Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface 2026-07-15 12:53:29 +08:00
Hypatia May edfc4dc4ac Preserve interrupted post-tool context 2026-07-15 12:49:50 +08:00
Tianyi Cui baf64e8b21 fix(bash): close managed environment review gaps
The managed DSH_* runtime path was correct, but its public extension and documentation contracts were incomplete. A contributor following the README could access ctx.bashEnv without declaring an injection, the new environment types had no drift-checked catalog entries, and the capability graph omitted three packages that now query sessionPersistence.

Declare the README injection, catalog DshEnvironmentKey and DshEnvironment, and add tool-bash plus both hook bridges to the generated persistence consumer graph. Keep BashEnvRegistry.list() contributor-only for now because no production caller treats it as exhaustive, but record the built-in enumeration gap before diagnostics, prompt, or UI code depends on it.

Validated on the exact resulting tree with typecheck, lint, coverage, snapshot, documentation, module-graph, build, hygiene, demo-smoke, and built-artifact checks.
2026-07-15 12:42:20 +08:00
Hypatia May c3d5568efd Document deferred injection ordering 2026-07-15 12:31:25 +08:00
Hypatia May 28144077f3 Fix deferred injection lifecycle 2026-07-15 12:22:39 +08:00
Tianyi Cui 06452b11a9 Merge latest PR #219 head into review fixes
The PR branch advanced after the local blocker fixes with a merge of current origin/master. Merge that moving parent into this child fix branch instead of rewriting either pushed lineage, so the fixes are validated against the exact PR head and master state that would land.

The only conflicts were an already-paired adding-a-tool translation and nondeterministic approval UUIDs in replay snapshots. Keep the parent versions because the English source and replay behavior are unchanged, avoiding child-only documentation and generated-artifact churn while preserving the parent semantic-gate updates.
2026-07-15 11:48:19 +08:00