Tianyi Cui
e138b4c8a8
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-16 02:36:25 +08:00
Tianyi Cui
2f1a40d938
docs(catalog): refresh AgentLoop source link
2026-07-16 02:35:31 +08:00
Tianyi Cui
9da038de7d
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/cordis-catalog/services.md
# packages/core/agent-loop/src/index.ts
2026-07-16 02:35:16 +08:00
Tianyi Cui
0decadd5e4
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-16 02:30:59 +08:00
Tianyi Cui
b77cfd64a1
docs(catalog): refresh repeat guard source link
2026-07-16 02:29:32 +08:00
Tianyi Cui
68b5c716b1
docs(catalog): refresh AgentLoop source link
2026-07-16 02:29:08 +08:00
Tianyi Cui
0ea614459b
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
2026-07-16 02:06:15 +08:00
Tianyi Cui
afe549b004
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-16 02:06:04 +08:00
Tianyi Cui
aae284cbc3
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-16 02:05:21 +08:00
Tianyi Cui
70c6c0ac39
docs(approval): qualify audit guarantees
2026-07-16 02:04:59 +08:00
Tianyi Cui
3befcfc566
Revert "docs(approval): qualify audit guarantees"
...
This reverts commit 14439a93c2bb915441e7b59f505d94a79b22d4af.
2026-07-16 02:04:47 +08:00
Tianyi Cui
3855a77e7d
docs(approval): qualify audit guarantees
2026-07-16 02:04:04 +08:00
Tianyi Cui
88c5d45d31
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
2026-07-16 00:03:13 +08:00
Tianyi Cui
5461f24725
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-16 00:03:13 +08:00
Tianyi Cui
680395e7f4
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-16 00:03:13 +08:00
Tianyi Cui
a83847f987
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-16 00:02:55 +08:00
Tianyi Cui
0a58a7ad5a
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-16 00:02:54 +08:00
Tianyi Cui
3fcd262890
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-16 00:02:54 +08:00
Tianyi Cui
71e1242909
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-16 00:02:54 +08:00
Tianyi Cui
17ebc0e999
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-16 00:02:54 +08:00
Tianyi Cui
3765abf731
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-16 00:02:54 +08:00
Tianyi Cui
70be6c7944
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
2026-07-16 00:02:44 +08:00
Tianyi Cui
2720aba3f7
Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
2026-07-16 00:02:38 +08:00
Tianyi Cui
30b6e9087c
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-16 00:02:38 +08:00
Tianyi Cui
735e10b64f
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
2026-07-15 23:57:57 +08:00
imccyu
8d4f64e5ce
docs: update pre-push scheduler contract
2026-07-15 23:57:44 +08:00
Tianyi Cui
f7c8e6453d
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 23:51:51 +08:00
Tianyi Cui
61a550d472
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 23:51:50 +08:00
Tianyi Cui
419b0bcf7d
docs: refresh module graph for UI identity
2026-07-15 23:51:45 +08:00
Tianyi Cui
474365ca28
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 23:51:34 +08:00
Tianyi Cui
8e37abb6c9
docs: refresh module graph for unified identity
2026-07-15 23:50:33 +08:00
Tianyi Cui
9bba95ff7c
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 23:34:36 +08:00
Tianyi Cui
c3c4197040
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/ui/acp/README.md
2026-07-15 23:34:17 +08:00
Tianyi Cui
694e323403
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# packages/ui/acp/README.md
2026-07-15 23:32:16 +08:00
Tianyi Cui
6143537d4e
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/core-data-structures/bash.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# 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/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/subagent/tool-subagent/tests/tool-subagent.spec.ts
# packages/util/brand/README.md
# packages/util/brand/src/index.ts
2026-07-15 23:29:47 +08:00
Tianyi Cui
8d0787fbb7
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 23:21:00 +08:00
Tianyi Cui
a9e9a7ddc0
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-15 23:20:58 +08:00
Tianyi Cui
eec11557a1
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-15 23:20:56 +08:00
Tianyi Cui
7489ed06fa
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-15 23:20:45 +08:00
Tianyi Cui
08dbb74ce1
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
...
# Conflicts:
# docs/tool-catalog.md
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
2026-07-15 23:18:26 +08:00
imccyu
d8f6251e3a
feat: rename dsh to dsh-sdk
2026-07-15 23:17:29 +08:00
imccyu
42b07a7022
feat(sdk): add developer project tooling
...
docs(rfc): propose SDK developer project tooling
feat: rename / docs
ci: fix windows gates
docs: revert
2026-07-15 23:17:29 +08:00
kingwl
1f38b211be
Merge origin/master (generic task runtime #219 , single-exe closure, package renames)
...
Semantic resolutions beyond line merges:
- The bash seam keeps resolveMode + the bash/resolve-mode waterfall on
master's task-free BashExecutor (run/start/resolve only; BashProcess
handles); tool-bash consults it at its stamping site and escalation
baseline on master's render/background split, with a waterfall test on
the recording executor.
- dsh-mode's BASH_FAMILY narrows to ['bash']: bash_output/bash_kill are
replaced by the kind-generic task_output/task_kill, which span every
task kind and only observe or stop work, so the access cap withholds
only the starter it can reason about.
- The plan-mode snapshot suite adopts master's pin grammar (tool-schema
sidecars; the expectedHeaderSnapshots extension is gone — the exit
transition deltas, and entering-before-turn-1 needs no second
snapshot); modes-advertise joins the plan header class (no-model, so
membership is vacuous). Fixtures re-recorded on the acp-demo bin;
the replay overlay gains the passthrough sandbox runner.
- examples/plan-acp-agent rewires to @deepseek-ai/dsh-acp-demo and drops
its tool-bash entry (the spine bundle now composes it); dsh-stdio (the
renamed stdio-chat home) keeps its /mode command and gains the dsh-mode
peer edge; the acp bridge keeps the modes surface beside master's
permission presets.
- mode README gains the Model Experience / Known Limitations sections the
new README gates require; AGENTS.md ceiling 1370 → 1440 for the kept
mode/ layout line and Agent efficiency section.
2026-07-15 23:17:18 +08:00
Tianyi Cui
b1de7c3009
Merge remote-tracking branch 'origin/codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
2026-07-15 23:11:11 +08:00
Tianyi Cui
bb1c8fa27d
fix(llm): restore pruned status contract
2026-07-15 23:09:14 +08:00
Tianyi Cui
abac7e4f44
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-15 23:07:30 +08:00
Tianyi Cui
380519b6d2
Merge remote-tracking branch 'origin/master' into codex/pr106-master-merge-review-20260715
2026-07-15 22:56:27 +08:00
Tianyi Cui
cc7642ab66
Merge remote-tracking branch 'origin/master' into codex/cli-one-shot-demo
...
# Conflicts:
# examples/coding-agent/README.md
2026-07-15 22:56:10 +08:00
Tianyi Cui
51f3a4eafc
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
...
# Conflicts:
# packages/bash/bash-sandbox/src/index.ts
2026-07-15 22:55:55 +08:00
Tianyi Cui
0fefc3d7b8
Merge branch 'master' into codex/simp-hide-web-provider-helpers
2026-07-15 22:49:56 +08:00