Yichen Jiang
fe221be572
Merge remote-tracking branch 'origin/master' into worktree/preset-plane-fallout-p1
...
The vendored Cordis rescope (`cordis` -> `@deepseek-ai/cordis`,
`@cordisjs/plugin-*` -> `@deepseek-ai/cordis-plugin-*`) collided with this
branch's two added edges. Resolved by taking master's package names and
keeping this branch's additions: `@deepseek-ai/dsh-agent` and
`@deepseek-ai/dsh-system-prompt` peers, the `scopeChainOf` import, and the
`agent/created` type-only edge.
`docs/event-producer-consumer.*` is generated; regenerated after the merge
rather than hand-resolved.
2026-08-10 23:00:23 +08:00
Yichen Jiang
1cfbafab6a
fix(preset): keep the token meter host-plane and name unjoined agents
...
Moving the agent plane behind presets left two readers on the wrong side of
the host/agent line.
`dsh-token-meter` was disabled on the host and mounted inside each preset's
`compaction` realm, but its three projection units register into the
process-wide `sessionProjections` table. A unit registered from one preset
answers for every session, so whether a `minimal` session showed a context
meter depended on whether some other session had mounted `standard` since
boot, and a process that only ever ran `minimal` showed none. The meter takes
no configuration, keys every fold by Session, and registers no tool or prompt
section, so it returns to the host composition and leaves the presets'
`isolate` map; the realm and `compact-basic` stay, because what a preset
chooses is whether its agent compacts, not whether its tokens are counted.
Nothing named an agent that joined no preset. The join is a scope-parent link,
and without it the tools, prompt-section, and skill views resolve the empty
global layer: the agent publishes, the turn runs, and the model receives
nothing. `AgentPresets` now logs one warning per such agent while a roster is
configured, and the invariant companion fails outright — at
`system-prompt/assemble` rather than at publication, because an unjoined agent
is legal until it addresses a model and `recompose` binds exactly such an
agent. The warning stays advisory: a synchronous `agent/created` throw vetoes
publication, and the ACP bridge, SDK server, and headless bundle all create an
unjoined agent today.
Three limits are recorded rather than fixed: projection key presence is not a
per-session capability signal, a superseded standing generation is never
reclaimed, and a `cordis_mount` temporary plugin belongs to the composition
rather than the session that mounted it.
Fixes #2203
2026-08-10 22:36:06 +08:00
Turtle
820bb29035
docs: sync repository removal translations
2026-08-10 21:32:13 +08:00
Turtle
a33ee3d4f0
docs: refresh MCP config catalog
2026-08-10 21:32:13 +08:00
ZiyaZhang
c969d69f10
Merge latest master into PR branch
2026-08-10 02:10:57 -07:00
ZiyaZhang
c950366bd9
fix(ci): bound native ACL coverage gate
2026-08-10 02:09:14 -07:00
Turtle
a27efdef36
docs: make technical prose concrete
2026-08-10 16:34:20 +08:00
Turtle
8dc91d2c00
fix(feedback): report shared anonymous user id
2026-08-10 16:23:05 +08:00
ZiyaZhang
191c7625a4
Merge master and repair CI for bounded diff basis
2026-08-10 01:18:38 -07:00
creatixchu
73527c47bd
Merge remote-tracking branch 'origin/master' into worktree/drop-create-by-name
2026-08-10 15:49:49 +08:00
creatixchu
a832fc2fa5
Merge remote-tracking branch 'origin/master' into worktree/drop-create-by-name
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-25-session-list-browsing-and-manual-order.i18n.yaml
# .agents/notes/implemented/feature/2026-07-25-workspace-ui-product-flow.i18n.yaml
# .agents/notes/implemented/feature/2026-07-25-workspace-ui-product-flow.zh.md
# .agents/notes/implemented/simplification/2026-07-31-one-route-to-add-a-workspace.i18n.yaml
# .agents/notes/implemented/simplification/2026-07-31-one-route-to-add-a-workspace.md
# .agents/notes/implemented/simplification/2026-07-31-one-route-to-add-a-workspace.zh.md
# apps/cli/reference/README.i18n.yaml
# docs/config-catalog.md
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/index.ts
# packages/host/apiproxy/tests/api-proxy-approval.spec.ts
# packages/host/apiproxy/tests/api-proxy-blank.spec.ts
# packages/host/apiproxy/tests/api-proxy-cold.spec.ts
# packages/host/apiproxy/tests/api-proxy-commands.spec.ts
# packages/host/apiproxy/tests/api-proxy-config.spec.ts
# packages/host/apiproxy/tests/api-proxy-models.spec.ts
# packages/host/apiproxy/tests/api-proxy-projections.spec.ts
# packages/host/apiproxy/tests/api-proxy-question.spec.ts
# packages/host/apiproxy/tests/api-proxy-rename.spec.ts
# packages/host/apiproxy/tests/api-proxy-search.spec.ts
# packages/host/apiproxy/tests/api-proxy-subagents.spec.ts
# packages/host/apiproxy/tests/api-proxy-view.spec.ts
# packages/host/apiproxy/tests/api-proxy-workspace.spec.ts
# packages/todo/tool-todo/tests/projection.spec.ts
# scripts/hero-composer-dom-continuity.mjs
2026-08-10 15:49:34 +08:00
creatixchu
2fea703d67
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/client/ui-conversation/src/client/input/hub.ts
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/service-orchestration.spec.ts
2026-08-10 15:19:32 +08:00
Huanqi Cao
c9285753de
Merge branch 'merge/1829-master' into merge/1990-1829
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
2026-08-10 12:35:32 +08:00
creatixchu
3764ce62a5
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/connection/src/client/fixture.ts
# packages/host/apiproxy/src/api-proxy.ts
2026-08-10 12:33:36 +08:00
Yichen Jiang
c06f9041fc
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.i18n.yaml
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/core-data-structures/core.zh.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/llm-streaming.md
# docs/core-data-structures/llm-streaming.zh.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/subsystems/attachment.i18n.yaml
# docs/subsystems/attachment.md
# docs/subsystems/attachment.zh.md
# docs/subsystems/core.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
# packages/client/runtime/package.json
# packages/client/ui-conversation/package.json
# packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/index.ts
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/compact/compact-basic/README.i18n.yaml
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/src/index.ts
# packages/host/apiproxy/tests/api-proxy-models.spec.ts
# packages/self-modification/tool-cordis/src/api-catalog.ts
# pnpm-lock.yaml
# scripts/type-equiv.manifest.json
2026-08-09 23:33:35 +08:00
Huanqi Cao
a29966b71f
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.i18n.yaml
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.md
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/bash/tool-pwsh/README.i18n.yaml
# packages/bash/tool-pwsh/README.md
# packages/bash/tool-pwsh/README.zh.md
2026-08-09 23:19:14 +08:00
Yichen Jiang
7dcefeda50
Merge branch 'stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
...
# Conflicts:
# apps/cli/tests/web-agent-presets.e2e.ts
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-primitives/tests/icons.spec.tsx
# packages/client/ui-settings/src/client/contract/slots.ts
# packages/host/apiproxy/tests/api-proxy-agent-preset.spec.ts
2026-08-09 23:02:37 +08:00
Yichen Jiang
877364f7a4
Merge branch 'stack/agent-profiles-3-wire' into stack/agent-profiles-5-web-ui
...
# Conflicts:
# packages/client/ui-conversation/tests/input-bar.spec.tsx
2026-08-09 22:57:23 +08:00
Yichen Jiang
4926b296c4
Merge branch 'stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
...
# Conflicts:
# docs/persistence-catalog.i18n.yaml
# docs/persistence-catalog.md
# docs/persistence-catalog.zh.md
2026-08-09 22:56:44 +08:00
Yichen Jiang
51ca900d4e
Merge remote-tracking branch 'origin/master' into stack/agent-profiles-1-seam
2026-08-09 22:54:57 +08:00
Yichen Jiang
0d7106d902
Merge branch 'stack/agent-profiles-3-wire' into stack/agent-profiles-5-web-ui
...
# Conflicts:
# apps/cli/tests/web-agent-presets.e2e.ts
# packages/host/apiproxy/tests/api-proxy-agent-preset.spec.ts
2026-08-09 22:48:47 +08:00
Yichen Jiang
4b628a8703
docs(skill): document the layered registry and record the Agent Note
...
The skills subsystem page and dsh-skill README describe the host+per-scope
layers, SkillViewOptions joins the type-equiv corpus and the cordis-catalog
type pages, generated catalogs pick up the shifted source refs, and the
architecture Agent Note records the decision, the nearest-layer-wins
precedence choice, and the rejected alternatives.
2026-08-09 22:29:53 +08:00
Yichen Jiang
7ea8bad7ee
Merge branch 'stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# docs/subsystems/tools.i18n.yaml
# docs/subsystems/tools.md
# docs/subsystems/tools.zh.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
2026-08-09 21:38:26 +08:00
Yichen Jiang
19b6a41564
Merge branch 'stack/agent-profiles-3-wire' into stack/agent-profiles-5-web-ui
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# scripts/doc-budgets.manifest.json
2026-08-09 21:36:55 +08:00
Yichen Jiang
5aa10901ad
Merge branch 'stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
2026-08-09 21:35:37 +08:00
Yichen Jiang
0eff417b2a
Merge remote-tracking branch 'origin/master' into stack/agent-profiles-1-seam
2026-08-09 21:33:45 +08:00
Tianyi Cui
dd384f86ab
docs: bring generated-catalog zh pairs along; raise docs/AGENTS.md ceiling to 1335
...
Master's bilingual-generated-docs policy pairs the five generated catalogs;
mirror the purge's regenerated English (ConPTY note, hooks TODO wording,
thinking-format and SurfaceOp JSDoc, doc-graphs templates) into their
reviewed zh sides and re-record. Condense the evidence-citation clause and
raise the docs/AGENTS.md ceiling 1320→1335: master's seam-trio definition
and this PR's review-mandated evidence rule land in the same window.
2026-08-09 21:11:45 +08:00
Yichen Jiang
8612f39759
Merge remote-tracking branch 'origin/stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
...
# Conflicts:
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
2026-08-09 20:41:55 +08:00
Yichen Jiang
801d39d131
Merge remote-tracking branch 'origin/stack/agent-profiles-3-wire' into stack/agent-profiles-5-web-ui
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/architecture.zh.md
# docs/module-graph.md
# packages/host/apiproxy/src/api-proxy.ts
# scripts/verify-package-readme-model-experience.ts
2026-08-09 20:38:21 +08:00
Yichen Jiang
f80d2a742e
Merge remote-tracking branch 'origin/stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
...
# Conflicts:
# docs/module-graph.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/tsconfig.json
2026-08-09 20:33:55 +08:00
Yichen Jiang
a2d5e3d8a8
Merge remote-tracking branch 'origin/master' into stack/agent-profiles-1-seam
...
# Conflicts:
# packages/README.i18n.yaml
# packages/README.zh.md
# packages/boot/app-boot/README.i18n.yaml
# packages/boot/app-boot/README.zh.md
# scripts/gen-cordis-catalog.ts
# scripts/verify-package-readme-model-experience.ts
2026-08-09 20:28:03 +08:00
imccyu
27682b9384
fix: docs
2026-08-09 19:00:22 +08:00
Huanqi Cao
f5caadc808
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# packages/bash/pwsh-local/src/index.ts
# packages/sandbox/sandbox-local/src/index.ts
2026-08-09 17:50:55 +08:00
Tianyi Cui
ceba53edd7
fix(fs): observe absence before guarded recreation
2026-08-09 17:43:53 +08:00
Turtle
dda02250f5
docs: reserve seam for complete capabilities
2026-08-09 17:26:57 +08:00
Huanqi Cao
165ad7e969
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# .agents/notes/implemented/feature/2026-08-01-pwsh-tool-and-executor.i18n.yaml
# .agents/notes/implemented/feature/2026-08-01-pwsh-tool-and-executor.zh.md
# packages/bash/tool-pwsh/README.i18n.yaml
# packages/bash/tool-pwsh/README.zh.md
2026-08-09 16:59:52 +08:00
Turtle
93f519b8b8
Merge remote-tracking branch 'origin/master' into codex/concrete-provenance-prose
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-29-terminal-llm-stream-failures.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-29-terminal-llm-stream-failures.zh.md
# .agents/notes/implemented/feature/2026-07-27-trajectory-inspection-ledger.i18n.yaml
# .agents/notes/implemented/feature/2026-07-27-trajectory-inspection-ledger.zh.md
# .agents/notes/implemented/process/2026-08-08-browser-gif-evidence-chain.i18n.yaml
# .agents/notes/implemented/process/2026-08-08-browser-gif-evidence-chain.zh.md
# docs/architecture.i18n.yaml
# docs/architecture.zh.md
# packages/boot/app-boot/README.i18n.yaml
# packages/boot/app-boot/README.zh.md
2026-08-09 16:39:34 +08:00
xjt
a0d48c9c87
Merge remote-tracking branch 'origin/master' into xjt/generated-docs-zh-translation-apply
...
# Conflicts:
# .agents/notes/implemented/feature/2026-08-07-default-model-follows-the-picker.i18n.yaml
# .agents/notes/implemented/feature/2026-08-07-default-model-follows-the-picker.zh.md
# docs/architecture.i18n.yaml
# docs/architecture.zh.md
# docs/user/guide/providers.i18n.yaml
# docs/user/guide/providers.zh.md
# docs/user/guide/quickstart.i18n.yaml
# docs/user/guide/quickstart.zh.md
# packages/boot/app-boot/README.i18n.yaml
# packages/boot/app-boot/README.zh.md
# packages/bundle/headless/README.i18n.yaml
# packages/bundle/headless/README.zh.md
2026-08-09 15:17:35 +08:00
xjt
5a6738f94a
Merge remote-tracking branch 'origin/master' into xjt/generated-docs-zh-translation-apply
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-30-static-repository-plugin-format.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-30-static-repository-plugin-format.zh.md
# .agents/notes/implemented/feature/2026-07-30-config-only-repository-plugins.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-config-only-repository-plugins.zh.md
2026-08-09 13:08:49 +08:00
xjt
9087be1a2a
fix(docs): address generated translation review findings
2026-08-09 12:21:57 +08:00
xjt
7ff0cbcb7e
docs: complete Chinese proofreading and generated reference pairing
2026-08-09 11:02:16 +08:00
