64cd78a564
Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
2026-08-10 21:55:38 +08:00
f5b12d12d4
Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
...
# Conflicts:
# packages/sandbox/sandbox-windows-acl/src/index.ts
2026-08-10 21:50:09 +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
ad37ee33c5
Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
...
# Conflicts:
# docs/config-catalog.i18n.yaml
2026-08-10 20:24:28 +08:00
4ec9e310c3
Merge remote-tracking branch 'upstream/master' into fix/workspace-context-rendered-change-proof
2026-08-10 05:10:39 -07:00
8ea27971e3
Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
2026-08-10 19:09:06 +08:00
6f21d00169
docs(sandbox): align capability SID terminology
2026-08-10 18:08:22 +08:00
9435ca62a6
fix(sandbox): reject overlapping Windows temp roots
2026-08-10 18:08:22 +08:00
94f4183afd
Merge remote-tracking branch 'origin/master' into worktree/web-theme-settings-integration-fde706
2026-08-10 17:05:18 +08:00
c4edb6fc8c
Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# packages/sandbox/sandbox-local/README.i18n.yaml
2026-08-10 16:53:10 +08:00
390683ee27
Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
...
# Conflicts:
# docs/config-catalog.i18n.yaml
2026-08-10 16:50:19 +08:00
2e34861739
Merge commit 'b916cf8aab5bd8bca5ae47df16f72717c0a56b4a' into HEAD
...
# Conflicts:
# docs/config-catalog.i18n.yaml
2026-08-10 16:38:17 +08:00
10ba0f8ad2
docs(windows): align sandbox ownership
2026-08-10 16:38:00 +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
fd650af340
fix(sandbox): isolate Windows temp capabilities
2026-08-10 16:15:59 +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
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
9a3c89d04a
fix(sandbox): report Windows ACL limits
2026-08-10 15:41:37 +08: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
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
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
b5934b6f7c
cleanup(web): remove the steering interjection caption
...
Steering bubbles render as plain user bubbles; a mid-turn steer is
recognizable by its position in the flow. The runtime SteeringMessageNode
projection and pending-steering lifecycle are unchanged.
Partially supersedes the 2026-08-04 context-source and steer marks note;
the new simplification note owns the removal rationale.
2026-08-10 11:04:44 +08:00
2e9f24b58e
Merge remote-tracking branch 'github/master' into feat/web-queue-steer-all
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/service-orchestration.spec.ts
2026-08-10 10:21:56 +08:00
976020f2bb
refactor(sandbox): derive the private temp dir; drop the acl-session record
...
The durable sandbox/acl-session event carried a workspace binding that
always equals the session cwd and a random temp path that only needed
to be stable per session. Both are now derived: the temp subdirectory
is sha256(session id + workspace), created exclusively and removed on
provider dispose, so fork/resume semantics fall out of the derivation
and the record, its fold/provision/tamper validation, the immediate
flush kick, and the session-store dependency all disappear.
2026-08-10 01:03:29 +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
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
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
Tianyi Cui