Tianyi Cui
37ccb0c664
Merge branch 'master' into codex/agent-session-jsonl-location
2026-07-15 16:39:15 +08:00
Tianyi Cui
e7bae3aa3b
Merge branch 'master' into feat/mcp-client
2026-07-15 15:50:59 +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
TianleLin
905b8ead9f
Merge branch 'master' into feat/mcp-client
2026-07-15 15:22:32 +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
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
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
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
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
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
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
Tianyi Cui
ac820b68a6
Merge branch 'master' into feat/mcp-client
2026-07-15 11:35:45 +08:00
Yichen Jiang
904397a7ef
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.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/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# packages/session-persistence/session-persistence/src/index.ts
2026-07-15 11:12:39 +08:00
imccyu
80fbeefbd6
refactor(ui): extract stdio plugin package
...
Move the readline front door from stdio-agent into @deepseek-ai/dsh-stdio, keeping the loader shape and the stdio coverage with the new package.
2026-07-15 10:04:40 +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
3ff4d2a051
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
2026-07-15 01:49:01 +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
358bc91a9e
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
2026-07-15 01:49:00 +08:00
Tianyi Cui
ce364cdff0
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
2026-07-15 01:49:00 +08:00
Tianyi Cui
b69b084c7a
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
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
imccyu
13255ceb15
docs: add rfc
2026-07-15 00:42:08 +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
0bbb2a5426
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
2026-07-14 23:44:40 +08:00
Tianyi Cui
ebf2fb763a
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
2026-07-14 23:44:40 +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
d8cced2602
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
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
Tianyi Cui
a673ee4888
Merge remote-tracking branch 'origin/master' into codex/pr202-merge-review
2026-07-14 23:42:36 +08:00
Tianyi Cui
7993f41da3
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
2026-07-14 23:39:05 +08:00
imccyu
c67c3d9413
refactor: derive event graphs and scope invariants from TypeScript
2026-07-14 23:37:56 +08:00
Tianyi Cui
7b50c573ca
Merge branch 'master' into codex/fix-acp-snapshot-fs-registration
2026-07-14 23:32:41 +08:00
Tianyi Cui
7cbed547c7
Merge remote-tracking branch 'origin/master' into codex/pr202-merge-review
2026-07-14 23:21:47 +08:00
