2e59ff5ef0
Merge remote-tracking branch 'origin/master' into worktree/fix-minimal-preset-prompt
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
2026-08-10 22:49:25 +08:00
9e40fc7f6b
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
2026-08-10 19:40:14 +08:00
dc524c2c93
Merge remote-tracking branch 'origin/master' into worktree/fix-minimal-preset-prompt
2026-08-10 19:30:51 +08:00
86d5dd4384
fix(preset): align minimal agent with RL composition
2026-08-10 18:02:11 +08:00
94f4183afd
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
2026-08-10 17:05:18 +08:00
1ac58714d1
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
2026-08-10 16:54:44 +08:00
a27efdef36
docs: make technical prose concrete
2026-08-10 16:34:20 +08:00
ac9c39c4c7
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/client/ui-conversation/package.json
# pnpm-lock.yaml
2026-08-10 15:58:52 +08:00
9ff522ee60
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
2026-08-10 15:55:36 +08:00
9a46d5dc96
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
2026-08-10 15:36:10 +08:00
658a8b1cac
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
2026-08-10 15:34:01 +08:00
76c6e14c8b
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
2026-08-10 15:26:23 +08:00
3639b10c83
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
2026-08-10 14:36:08 +08:00
259d998455
fix(web): follow a blank session's preset switch in the slash catalog
...
Presets own the rows that decide what a session's `/` menu contains, but
both browser catalogs cache per session and had no invalidation edge for a
recompose: `commands/changed` is registry-wide and recomposing registers
nothing, so the menu kept serving the composition the session no longer ran.
The host stream now frames the logged `agent-preset/selected` commit as
`host/session-preset-changed`; the runtime bridges it to the typed
`session/preset-changed` event, `ui-command` soft-refreshes that session's
directory key and `ui-skill` invalidates its catalog entry.
Reaching the host on a second switch was a separate defect: the list-row
identity guard compared every summary field except `agentPreset`, and the
merge keeps the row's `updatedAt`, so a switched row looked unchanged and
served its cached instance forever. The hero chip compares the pick against
that row, so switching back to the creation-time preset sent no RPC at all.
2026-08-10 14:35:13 +08:00
a2bd3059ac
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-30-client-locale-full-rollout.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-30-client-locale-full-rollout.zh.md
# .agents/notes/implemented/feature/2026-07-30-web-queue-steer-action.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-web-queue-steer-action.zh.md
# .agents/notes/implemented/feature/2026-07-31-browser-derived-initial-locale.i18n.yaml
# .agents/notes/implemented/feature/2026-07-31-browser-derived-initial-locale.zh.md
# .agents/notes/implemented/testing/2026-07-24-web-gui-browser-e2e-lane.i18n.yaml
# apps/web/tests/scaffold.ts
# docs/module-graph.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/package.json
# packages/client/test-runtime/README.i18n.yaml
# packages/client/test-runtime/README.zh.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/package.json
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-theme/README.i18n.yaml
# packages/client/ui-theme/README.md
# packages/client/ui-theme/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.zh.md
# pnpm-lock.yaml
2026-08-10 12:50:43 +08:00
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
64e0fbfd6d
fix(subagent): inherit parent policy overrides in continuable children
...
A continuable background child (the default backgroundMode for both
delegation tools) never received the parent session's explicit
sandbox/approval overrides: materialization applied only child
composition, so a danger-full-access parent produced workspace-write
children whose every out-of-workspace operation raised an approval
prompt.
Move the one-shot driver's capture/append pair into the shared
child-agent module (captureDelegatedPolicyOverrides /
appendDelegatedPolicyOverrides) and call it from both paths:
startContinuable captures before its first await, only fresh
materialization appends the source-tagged events (after any fork seed),
and a cold resume replays the persisted delegation events instead of
re-capturing the parent.
Adds the continuable inheritance unit suite, the ACP snapshot scenario
subagent-continuable-inheritance (fails without the fix), the
continuable policy-inheritance Agent Note, and the seam-level README
contract, with bilingual counterparts.
Fixes #1692
2026-08-10 12:16:19 +08:00
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
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
51ca900d4e
Merge remote-tracking branch 'origin/master' into stack/agent-profiles-1-seam
2026-08-09 22:54:57 +08:00
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
0eff417b2a
Merge remote-tracking branch 'origin/master' into stack/agent-profiles-1-seam
2026-08-09 21:33:45 +08:00
25dcd7293c
docs: purge chain-of-thought leakage from prose
...
Delete design-session citations (decision/audit/plan ordinals, stack
positions), change narration, review choreography, and reviewer-addressed
justification from comments, JSDoc, docs, READMEs, Agent Notes, tests, and
generator templates; restate every affected fact as current-state contract
prose. Fix generated docs at their sources and regenerate the catalogs and
cordis-surface regions; re-paste type-equiv blocks; update every bilingual
counterpart and re-record the pairs. Record the citation rule in the
committed-artifact-citations Agent Note.
2026-08-09 21:10:59 +08:00
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
27682b9384
fix: docs
2026-08-09 19:00:22 +08:00
522acc7432
test: update conversation assembly coverage and docs
2026-08-09 18:16:44 +08:00
ceba53edd7
fix(fs): observe absence before guarded recreation
2026-08-09 17:43:53 +08:00
dda02250f5
docs: reserve seam for complete capabilities
2026-08-09 17:26:57 +08:00
9d5eb37638
fix(headless): dsh run is a direct core front door
2026-08-09 13:44:44 +08:00
101b074241
Merge remote-tracking branch 'origin/master' into stack/agent-profiles-1-seam
...
# Conflicts:
# docs/capability-seams.md
# docs/cordis-catalog/services.md
# docs/module-graph.md
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
# packages/boot/app-boot/README.i18n.yaml
# pnpm-lock.yaml
# scripts/gen-cordis-catalog.ts
2026-08-09 02:55:11 +08:00
36cf4f32f4
docs(agent-note): flip the regrouping note to implemented
...
Move the triplet to implemented/architecture/, rewrite Proposal into a
present-tense Decision, fold Acceptance criteria and Risks into
Consequences (recording what pins the result), retitle the migration
section to what the move actually touched, and repoint the seven
inbound FIXME/README links.
2026-08-09 01:25:24 +08:00
b5a8a1f722
chore(docs): re-record the packages pairing after the master merge
2026-08-09 00:24:06 +08:00
d47df8ff9d
chore(rebase): refresh generated docs after the round-two replay
...
Restores master's vitest config and packages-README pairing record (the
replay had carried old-lineage copies; this branch claims neither), and
regenerates the doc graphs, catalogs, and architecture pairing the
replay's ours-side resolutions had flattened to master's content.
2026-08-08 21:28:00 +08:00
336c84baf0
docs(subagent): clarify interrupt edge cases
2026-08-08 20:02:36 +08:00
df30c62e2b
fix(agent-loop): latch wakes landing in the cancel-convergence window
2026-08-08 19:42:42 +08:00
ec9a08bdde
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/core-data-structures/core.i18n.yaml
# docs/module-graph.md
# packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/index.ts
# packages/compact/compact-basic/README.i18n.yaml
2026-08-08 17:56:53 +08:00
21c3bb1713
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
...
# Conflicts:
# docs/module-graph.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/tsconfig.json
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
2026-08-08 16:56:49 +08:00
bd518cb684
Merge pull request #1696 from deepseek-harness/codex/dsh-badge-plugin
...
feat: add optional dsh badge skill provider
2026-08-08 16:33:00 +08:00
d174edf9eb
Merge pull request #2034 from deepseek-harness/worktree/merge-compact-card
...
feat(web): merge compact status and summary cards
2026-08-08 16:23:00 +08:00
2268f0ecec
Merge origin/master into codex/dsh-badge-plugin
2026-08-08 16:03:30 +08:00
6d0a14d428
Merge origin/master into codex/dsh-badge-plugin
2026-08-08 15:42:47 +08:00
e0f113f55b
Merge origin/master into codex/dsh-badge-plugin
2026-08-08 15:33:41 +08:00
49dff10abd
fix(workspace-context): commit projections after tool steps
2026-08-08 15:29:36 +08:00
be3e4ac455
fix(test): address cli demo cleanup review feedback
2026-08-08 15:08:07 +08:00
dc57f7d854
cleanup(cli): remove dsh-cli-demo
2026-08-08 15:08:07 +08:00
7aca4c6b94
Merge branch 'master' into worktree/merge-compact-card
2026-08-08 14:45:55 +08:00
1db327ea6c
feat(web): merge compact status and summary cards
2026-08-08 14:11:26 +08:00
0d53752c49
refactor(host)!: retire the skill.invoke RPC for the gesture boundary
...
Invocation is an ordinary session.prompt again: the pre-step gesture
boundary makes it deterministic host-side for every front end, so the
dedicated RPC (handler, wire schema, error codes, client face, fixtures)
and ui-skill's claim machinery are net deletions. The menu keeps decision
21 exactly — a pick lands literal /name text — plus the user-only marker
from skill.list's modelInvocable flag.
2026-08-08 13:15:52 +08:00
25d959aa08
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.md
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.zh.md
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.md
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.zh.md
# THIRD_PARTY_NOTICES.md
# apps/cli/composition.md
# apps/cli/config/base.cordis.yml
# apps/cli/package.json
# apps/cli/src/app-cli-entry.ts
# apps/cli/src/bin.ts
# apps/cli/tests/args.spec.ts
# apps/web/tests/built-boot.snapshot.ts
# apps/web/tests/navigation-panes.e2e.ts
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/bundle/README.i18n.yaml
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
# packages/client/connection/src/client/fixture.ts
# packages/client/connection/src/http-bridge.ts
# packages/client/connection/src/index.ts
# packages/client/connection/tests/fixture.spec.ts
# packages/client/connection/tests/node-half.spec.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/runtime/src/client/contract/session.ts
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/src/client/apply.ts
# 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.module.css
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-conversation/src/client/index.ts
# packages/client/ui-conversation/src/client/input/contract.ts
# packages/client/ui-conversation/src/client/input/facade.ts
# packages/client/ui-conversation/src/client/input/hub.ts
# packages/client/ui-conversation/src/client/locales.ts
# packages/client/ui-conversation/src/client/service.ts
# packages/client/ui-conversation/src/client/skeleton/ConversationSession.tsx
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/apply-inject.spec.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-conversation/tests/input-scenarios.spec.tsx
# packages/client/ui-conversation/tests/service-orchestration.spec.ts
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/client/ui-trajectory/tests/views.spec.tsx
# packages/compact/compact-basic/README.i18n.yaml
# packages/cordis/tool-cordis/src/api-catalog.ts
# 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/api/rpc.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/src/index.ts
# packages/host/apiproxy/tests/api-proxy-models.spec.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
# packages/llm/llm-pi-ai/README.i18n.yaml
# packages/llm/llm-pi-ai/README.md
# packages/llm/llm-pi-ai/README.zh.md
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm/README.i18n.yaml
# packages/ui/tui/README.md
# packages/ui/tui/README.zh.md
# packages/ui/tui/src/components/content.ts
# packages/ui/tui/src/components/transcript.ts
# packages/ui/tui/tests/tui.spec.ts
# pnpm-lock.yaml
2026-08-08 01:56:29 +08:00
3584d8e088
docs(skill): document the user-explicit invocation path
...
Bilingual README updates for the four touched packages (ui-skill's claim
flow and deterministic-injection model experience, the apiproxy skills
domain, the shared renderSkillContent seam export, the catalog stitch
sentence), the implemented Agent Note triplet recording the decision and
its peer-product evidence, and the regenerated catalogs/graphs.
2026-08-08 01:52:43 +08:00
Yichen Jiang