_Kerman
289a23421d
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-06-sandbox.i18n.yaml
# .agents/notes/implemented/feature/2026-07-06-sandbox.md
# .agents/notes/implemented/feature/2026-07-06-sandbox.zh.md
# packages/host/apiproxy/README.i18n.yaml
2026-08-05 15:34:19 +08:00
imccyu
e4d5ec548e
Merge pull request #1050 from deepseek-harness/worktree/custom-deepseek-models
...
feat(web): configure custom DeepSeek models, with a restyled Models card
2026-08-05 14:04:18 +08:00
_Kerman
b76543cc1c
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# apps/web/tests/markdown-images.e2e.ts
# docs/cordis-catalog/services.md
# docs/core-data-structures/session.i18n.yaml
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/context/time-context/tests/invariant.spec.ts
# packages/context/time-context/tests/time-context.spec.ts
# packages/core/agent-loop/src/invariant.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/core/agent-loop/tests/request-reconstruction.spec.ts
# packages/core/agent/tests/agent.spec.ts
# packages/core/session/README.i18n.yaml
# packages/core/session/src/index.ts
# packages/core/session/tests/derived-cache.spec.ts
# packages/core/session/tests/request-header.spec.ts
# packages/core/session/tests/session.spec.ts
# packages/core/session/tests/surface.spec.ts
# packages/fs/tool-str-replace-editor/tests/tools.spec.ts
# packages/goal/goal/tests/goal.spec.ts
# packages/plan/plan-mode/tests/plan-mode.spec.ts
# packages/pty/pty-local/tests/index.spec.ts
# packages/pty/pty-local/tests/local.spec.ts
# packages/pty/pty/tests/service.spec.ts
# packages/pty/tool-bash-persistent/tests/loader-composition.spec.ts
# packages/pty/tool-bash-persistent/tests/tools.spec.ts
# packages/pty/tool-pty/tests/loader-composition.spec.ts
# packages/pty/tool-pty/tests/tools.spec.ts
# packages/session-title/session-title-all-messages-llm/tests/provider.spec.ts
# packages/tasks/tasks-local/tests/tasks.spec.ts
# packages/ui/user-approval/tests/approval.spec.ts
2026-08-05 13:53:35 +08:00
Yichen Jiang
e9b377e9c5
Merge remote-tracking branch 'origin/master' into worktree/custom-deepseek-models
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-30-web-config-plane.i18n.yaml
# .agents/notes/implemented/feature/2026-07-24-web-session-model-selector.i18n.yaml
# packages/client/ui-model/README.i18n.yaml
# packages/client/ui-model/README.zh.md
# packages/client/ui-models/README.i18n.yaml
# packages/client/ui-models/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# packages/llm/llm-deepseek/README.i18n.yaml
2026-08-05 12:50:58 +08:00
imccyu
8cbdd5b9d0
refactor(session): route construction through Session.create
2026-08-05 11:56:14 +08:00
Yichen Jiang
086656afae
Merge remote-tracking branch 'origin/master' into worktree/custom-deepseek-models
...
# Conflicts:
# packages/client/ui-models/src/client/ModelsSection.module.css
# packages/client/ui-models/src/client/ModelsSection.tsx
2026-08-05 11:46:23 +08:00
_Kerman
423f7517b6
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/core/agent/package.json
2026-08-05 10:46:01 +08:00
_Kerman
97e7d68340
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cancel-tool-calls/session.jsonl
2026-08-05 10:39:18 +08:00
imccyu
ca27512529
fix(packages): omit source publication payloads
2026-08-05 01:15:19 +08:00
imccyu
7557de1131
fix(packages): ship web and theme assets
2026-08-05 01:11:50 +08:00
imccyu
b7c0e4ea08
fix: dsh exports
...
fix: pty-local postinstall
2026-08-05 01:11:49 +08:00
imccyu
1dffc3cb86
pkg: upgrade node-addon
2026-08-05 01:11:49 +08:00
Huanqi Cao
c5acd4ce96
Merge remote-tracking branch 'origin/master' into feat/pwsh-tool
2026-08-04 22:05:31 +08:00
_Kerman
694f9009ec
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-23-web-permission-and-approval.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
2026-08-04 21:04:43 +08:00
Huanqi Cao
acda0e39bc
Merge remote-tracking branch 'origin/master' into feat/pwsh-tool
2026-08-04 20:39:17 +08:00
Turtle
e2049910d5
refactor(client): keep pending interaction change UI-scoped
2026-08-04 20:28:23 +08:00
_Kerman
674278cb17
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/client/ui-conversation/src/client/queue/QueueDock.tsx
2026-08-04 19:37:51 +08:00
Turtle
76d43d616d
Merge remote-tracking branch 'origin/master' into codex/session-pending-interactions
...
# Conflicts:
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
2026-08-04 19:03:01 +08:00
imccyu
6f10f9c01c
Merge pull request #1527 from deepseek-harness/worktree-websocket
...
feat(web): move connection downlinks to WebSocket
2026-08-04 18:18:32 +08:00
Huanqi Cao
39b0695d48
Merge remote-tracking branch 'origin/master' into feat/pwsh-tool
...
# Conflicts:
# apps/cli/composition.md
# docs/testing.i18n.yaml
# docs/testing.md
# docs/testing.zh.md
2026-08-04 17:54:45 +08:00
imccyu
69d5a83b87
test(web): align snapshots with responsive chrome
2026-08-04 17:16:53 +08:00
Turtle
00d4349eb4
feat(client): surface pending session interactions
2026-08-04 17:15:10 +08:00
_Kerman
09e909b96b
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# apps/web/tests/snapshots/queue-actions/preserved.expected.md
# packages/client/runtime/src/client/sessions/session.ts
2026-08-04 16:56:44 +08:00
imccyu
7f3a2dae91
fix(web): quiesce websocket teardown
2026-08-04 16:42:50 +08:00
imccyu
72f82f65c9
Merge remote-tracking branch 'origin/master' into mergebot/pr1389
...
# Conflicts:
# apps/web/tests/snapshots/sidebar-scrollbar/geometry.expected.md
# packages/client/ui-conversation/src/client/chat/MessageIconActions.tsx
# packages/client/ui-conversation/src/client/chat/message-chrome.ts
2026-08-04 16:33:55 +08:00
imccyu
e9d76dae64
fix(web): address UI polish review feedback
2026-08-04 16:25:09 +08:00
creatixchu
29646074cd
Merge origin/master into worktree/sidebar-scrollbar-reveal
2026-08-04 16:19:46 +08:00
imccyu
b9f4e46462
Merge remote-tracking branch 'origin/master' into mergebot/pr1389
...
# Conflicts:
# packages/client/ui-workspace/src/client/WorkspaceBrowser.module.css
2026-08-04 16:06:38 +08:00
imccyu
3be257ba1d
fix(web): preserve polish accessibility contracts
2026-08-04 16:04:26 +08:00
imccyu
ad03ccbd7a
Merge branch 'master' into feat/turn-running-time
2026-08-04 16:03:31 +08:00
_Kerman
f5c599d0ca
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
2026-08-04 15:49:22 +08:00
_Kerman
d5527da905
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.md
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-search-render-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-search-render-card.md
# .agents/notes/implemented/feature/2026-07-30-search-render-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-web-read-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-web-read-card.md
# .agents/notes/implemented/feature/2026-07-30-web-read-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-web-result-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-web-result-card.md
# .agents/notes/implemented/feature/2026-07-30-web-result-card.zh.md
2026-08-04 15:49:07 +08:00
creatixchu
86514f2921
Merge origin/master into worktree/sidebar-scrollbar-reveal
...
#1381 landed the bar's horizontal position; this branch decides when it is
drawn. The e2e keeps both scenarios and the golden carries both palettes'
pointer-state readings alongside the new edge-offset lines.
2026-08-04 15:46:53 +08:00
creatixchu
10ce8d8a45
fix(web): decide the sidebar's pointer leave by geometry, and tighten the gate
...
Review findings from the first round:
- ui-settings renders its full-viewport panel as a fixed-position DESCENDANT
of the sidebar column, so `pointerleave` never fires when the pointer moves
onto it and the bars stayed drawn after it closed. Leaving is now decided
against the column's box from a document-level pointermove that exists only
while the bars are drawn; the element's own leave stays for the pointer that
leaves the window.
- The rebind gate judges the rule rather than each declaration, so a pair that
mixes `transparent` with an l2 hover no longer passes, and the elevation
half compares whole values instead of token shape.
- Hiding no longer exempts a sheet from the elevated-surface rebind check.
- The e2e polls the reveal before reading a colour for the golden, and pins
that a pointerless scroll draws no thumb.
2026-08-04 15:42:39 +08:00
creatixchu
398ab58a69
Merge remote-tracking branch 'origin/master' into worktree/composer-caret-binding
2026-08-04 15:40:27 +08:00
imccyu
2a828f09da
Merge remote-tracking branch 'origin/master' into feat/turn-running-time
2026-08-04 15:22:28 +08:00
fz
193d918856
Merge remote-tracking branch 'origin/master' into codex/fix-headless-sigint
...
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# apps/cli/config/base.cordis.yml
2026-08-04 15:18:48 +08:00
_Kerman
0606a0b981
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
2026-08-04 15:10:07 +08:00
_Kerman
a04037479b
test(web): await stopped queue state
2026-08-04 15:09:55 +08:00
creatixchu
a030397aca
feat(web): draw the sidebar's scrollbar only under the pointer
...
The session list overflows after a handful of sessions, and its scrollbar
was drawn permanently in a column that is at rest most of the time.
SidebarRoot now tracks the pointer over the whole column and rebinds
ui-theme's scrollbar indirection pair to `transparent` while it is
outside, keeping the thumb for 2s after the pointer leaves so it does not
blink out on the way past. Rebinding colour leaves the list's
`scrollbar-gutter: stable` reservation in force, so revealing the bar
moves no row.
ui-theme's gate now states the widened contract: a rebind targets an -l2
token pair or `transparent`, and nothing else.
2026-08-04 15:05:32 +08:00
_Kerman
099edf1f4b
Merge pull request #1381 from deepseek-harness/xtr/sidebar-session-spacing
...
fix(web): tighten sidebar session spacing
2026-08-04 15:04:19 +08:00
_Kerman
d238a865b9
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
2026-08-04 15:01:31 +08:00
_Kerman
369fad9faf
fix(web): inset sidebar scrollbar by 2px
2026-08-04 14:56:30 +08:00
imccyu
9f33f1d652
Merge pull request #1391 from deepseek-harness/worktree-tsx-map
...
fix(client): correct sourcemap in devtools
2026-08-04 14:56:08 +08:00
Yichen Jiang
17b480de51
feat(web): align the model catalog with the pi-ai provider form
...
Both editors live in `ui-models` and list the same thing, so they now share
one row shape rather than diverging when #1368 lands: a bordered entry per
model, id and display name on the row, and the capacities behind the row's
own disclosure. The context window is joined there by the per-model output
cap the adapter just gained; both read a decimal K/M suffix.
The shared class names carry this file's token spellings, not that branch's.
`--dsw-alias-border-subtle`, `--dsw-alias-text-tertiary`, and
`--dsw-alias-text-primary` are undeclared, so they resolve to the light-mode
literals in their fallback slots — the defect this section was moved off. A
styles test now rejects any `--dsw-*` name the token sheet does not declare,
so the next editor to name one fails instead of shipping a light-only
surface.
The keystroke buffer is now per capacity field rather than per row, since a
row holds two of them.
2026-08-04 14:53:17 +08:00
_Kerman
8ed5ca5051
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/client/runtime/tests/session.spec.ts
2026-08-04 14:51:07 +08:00
_Kerman
89c0b1e886
test(web): align turn fixtures with session events
2026-08-04 14:47:04 +08:00
_Kerman
9b50311fd1
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
2026-08-04 14:46:18 +08:00
creatixchu
4e024da35a
Merge origin/master into worktree/composer-caret-binding
2026-08-04 14:44:09 +08:00
imccyu
b9d768b6f2
fix(web): stabilize reasoning stream validation
2026-08-04 14:37:35 +08:00
