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
af267aa8c0
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
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
c386d12794
Merge branch 'codex/simp-drop-assembled-section-order' into codex/simp-drop-unused-schema-default
2026-07-15 14:07:25 +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
2f268cb47d
Merge remote-tracking branch 'origin/codex/project-instruction-files' into codex/project-instruction-files
2026-07-15 13:45:59 +08:00
Yichen Jiang
d3f8cb0f23
fix: harden replay and pi-ai request boundaries
2026-07-15 13:45:19 +08:00
Yichen Jiang
54514f48c5
Fix time-context workspace config fixture
2026-07-15 13:44:26 +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
ce1ed1dc87
Merge remote-tracking branch 'origin/codex/simp-drop-assembled-section-order' into codex/simp-drop-unused-schema-default
2026-07-15 13:22:08 +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
Tianyi Cui
bed03449ee
Merge current master into PR #251
...
Master advanced from 5143fac7f to be363166e with the Cordis and loader vendor update after the previous PR merge was validated. GitHub therefore tested a new synthetic merge where packages/util/home still selected Cordis rc.6 with loader rc.4 while the updated workspace graph requires Cordis rc.7 with loader rc.5.
That stale importer made pnpm-lock.yaml semantically incomplete even though Git merged it without a textual conflict, so every Node, sandbox, and real-API job failed during immutable install before running tests. Merge the exact current master tip and regenerate the lockfile so the home package resolves the same peer graph as the updated workspace.
Verified the repaired merge with pnpm install --frozen-lockfile; the full pre-push gate runs on the committed merge before it is published.
2026-07-15 12:50:03 +08:00
Hypatia May
edfc4dc4ac
Preserve interrupted post-tool context
2026-07-15 12:49:50 +08:00
Tianyi Cui
0642a1d666
Merge current master into PR #219 fixes
...
Origin/master advanced after the reviewed fixes were first pushed, leaving PR #219 conflicted. Merge the new vendor Cordis/loader update into the PR branch rather than rewriting pushed history, so the task fixes remain based on the exact current landing target.
Preserve the upstream package graph, lockfile, app-boot, and built-bin adjustments as landed on master; resolve only genuine overlaps with the task fixes and regenerate derived artifacts where required.
# Conflicts:
# packages/subagent/tool-subagent/package.json
2026-07-15 12:45:47 +08:00
