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
114b41eca4
refactor(presets): use one editor family
2026-08-10 22:47:28 +08:00
a4e679853f
Merge remote-tracking branch 'origin/master' into worktree/fix-minimal-preset-prompt
2026-08-10 22:15:30 +08:00
76061417d9
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
...
# Conflicts:
# 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/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
2026-08-10 22:02:36 +08:00
2b2899b4ce
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/subagent/subagent-inprocess/src/index.ts
# packages/subagent/subagent/package.json
# packages/subagent/subagent/src/child-agent.ts
# packages/subagent/subagent/src/continuation.ts
# packages/subagent/subagent/tsconfig.json
2026-08-10 21:42:45 +08:00
993550e6c8
refactor: remove repository plugin path
2026-08-10 21:32:13 +08:00
854f6623bb
docs: rename client manifest field references
2026-08-10 21:11:09 +08:00
388ce89823
Merge remote-tracking branch 'origin/master' into worktree/fix-minimal-preset-prompt
...
# Conflicts:
# apps/cli/config/agent-presets/minimal/preset.yml
2026-08-10 21:05:29 +08:00
4ec9e310c3
Merge remote-tracking branch 'upstream/master' into fix/workspace-context-rendered-change-proof
2026-08-10 05:10:39 -07:00
eacd5e2167
fix(prompt): remove unreachable complete branches
2026-08-10 20:09:06 +08:00
9e40fc7f6b
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
2026-08-10 19:40:14 +08:00
8ebf02e0ac
docs(subagent): cite issue 1723 as plain text in the approvals-pinned note
...
A leaked host TSX_TSCONFIG_PATH redirected the tsx gate scripts to a staging
checkout and masked the verify-public-repository-links rejection of the
internal issue URL; all tsx-driven gates re-verified clean with the variable
unset.
2026-08-10 19:34:17 +08:00
dc524c2c93
Merge remote-tracking branch 'origin/master' into worktree/fix-minimal-preset-prompt
2026-08-10 19:30:51 +08:00
501c3a8ab6
fix(subagent): pin delegated child approvals to 'never' within the inherited sandbox scope
...
A delegated in-process child now acts only within the sandbox scope fixed
at delegation: captureDelegatedPolicyOverrides still snapshots the parent's
explicit sandbox override but pins the child approval policy to 'never'
(instead of inheriting the parent's), so every child ask — sandbox_permissions
escalations included — is rejected deterministically by ApprovalService
before any answerer, with the audit pair still logged. Every in-process
child additionally receives the scoped subagent:delegation runtime-context
statement telling it to report a scope limitation instead of retrying.
Supersedes the approval half of the policy-inheritance decision (new Agent
Note cross-linked from both prior notes and the approval-seam Q&A); refreshed
child snapshot fixtures carry the pinned event, and
subagent-published-run-failure now persists a one-event child log.
2026-08-10 19:17:37 +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
9bb3a203ce
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
2026-08-10 16:50:09 +08:00
2e55964865
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
2026-08-10 16:37:14 +08:00
a27efdef36
docs: make technical prose concrete
2026-08-10 16:34:20 +08:00
8dc91d2c00
fix(feedback): report shared anonymous user id
2026-08-10 16:23:05 +08:00
6458910342
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
2026-08-10 16:03:33 +08:00
a44009ec35
Merge pull request #1864 from deepseek-harness/worktree/drop-create-by-name
...
refactor: drop the create-by-name workspace route
2026-08-10 16:01:17 +08:00
48fe8544ed
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
2026-08-10 15:59:39 +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
069f97497a
Merge remote-tracking branch 'origin/master' into worktree/remove-interjection-caption
...
# Conflicts:
# packages/client/ui-conversation/src/client/chat/MessageItem.module.css
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
2026-08-10 15:50:39 +08:00
73527c47bd
Merge remote-tracking branch 'origin/master' into worktree/drop-create-by-name
2026-08-10 15:49:49 +08:00
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
83616a5299
Merge remote-tracking branch 'upstream/master' into fix/workspace-context-rendered-change-proof
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-24-workspace-context.i18n.yaml
# .agents/notes/implemented/feature/2026-06-24-workspace-context.md
# .agents/notes/implemented/feature/2026-06-24-workspace-context.zh.md
# packages/context/workspace-context/README.i18n.yaml
# packages/context/workspace-context/src/files.ts
# packages/context/workspace-context/src/render.ts
2026-08-10 00:49:16 -07:00
1a02b82884
Merge remote-tracking branch 'origin/master' into worktree/remove-interjection-caption
2026-08-10 15:30:10 +08:00
8bbc74127e
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
2026-08-10 15:21:45 +08:00
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
5173678543
review: symmetric policy-service type imports, drop stale inprocess peers, pin child-switch and fork-default cases
...
- child-agent.ts declares both policy-service augmentations as explicit
empty type imports, so removing the ApprovalPolicy import cannot
silently degrade ctx.get('approval') typing.
- dsh-subagent-inprocess no longer consumes the policy services in src,
so its optional peers and tsconfig references are dropped; both
policy-inheritance Agent Notes state the current ownership.
- The continuable suite pins that a later child-side switch beats the
delegation snapshot and that an unswitched fork parent seeds no
policy events.
2026-08-10 14:45:34 +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
a7fc81d745
docs: replace front door terminology
2026-08-10 13:07:46 +08:00
8f0855cc9f
Merge remote-tracking branch 'origin/master' into worktree/remove-interjection-caption
2026-08-10 13:05:00 +08:00
6648ff984a
Merge pull request #1817 from deepseek-harness/feat/web-queue-steer-all
...
feat(web): 空输入时 Ctrl/Cmd+Enter 将当前排队消息全部插话发送
2026-08-10 12:58:20 +08:00
a2fa43e129
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
2026-08-10 12:53:59 +08:00
c6148f0fc3
Merge remote-tracking branch 'origin/master' into worktree/remove-interjection-caption
2026-08-10 12:53:04 +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
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
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
2a6aba0f48
Merge remote-tracking branch 'origin/master' into merge/1829-master
...
# Conflicts:
# apps/cli/package.json
# pnpm-lock.yaml
2026-08-10 12:32:14 +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
b87e2240bf
Merge pull request #1543 from deepseek-harness/stack/agent-profiles-8-authoring
...
feat(web): author agent presets from a settings page
2026-08-10 11:55:58 +08:00
52df428a10
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
2026-08-10 11:28:25 +08:00
a3cf2617a8
docs(notes): fix review findings — translate zh note headings, point supersession at the Decision, pin caption absence
2026-08-10 11:26:37 +08:00
a3a91aa654
Merge branch 'merge/1829-master' into merge/1990-1829
...
# Conflicts:
# vitest.config.ts
2026-08-10 11:24:58 +08:00
a7b973757b
Merge remote-tracking branch 'origin/master' into merge/1829-master
2026-08-10 11:23:08 +08:00
Yichen Jiang