3770d947cf
docs(web): correct welcome acknowledgement contract
2026-08-03 18:43:18 +08:00
8ee811e8d9
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/ui/tui/README.i18n.yaml
2026-08-03 18:39:58 +08:00
33b52502f4
Merge branch 'master' into agent/fix-remote-welcome-onboarding
2026-08-03 18:37:37 +08:00
fc5ee9f786
refactor(client): expose loopback state through connection
2026-08-03 18:35:26 +08:00
49ede3ebf3
Merge pull request #1333 from deepseek-harness/codex/fix-subagent-catalog-padding
...
fix(web): align subagent catalog spacing with Figma
2026-08-03 18:34:24 +08:00
6585847144
fix(web): preserve subagent catalog styling
2026-08-03 18:24:25 +08:00
e47ad8e393
Merge remote-tracking branch 'origin/master' into agent/fix-remote-welcome-onboarding
2026-08-03 18:19:24 +08:00
2b02202ba1
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-08-03 18:18:25 +08:00
7f7c86c512
Merge pull request #1174 from deepseek-harness/xtr/trajectory-marker-tooltip-fixes
...
Fix trajectory request markers and disclosure affordances
2026-08-03 18:17:06 +08:00
70ad82ef00
Merge remote-tracking branch 'origin/master' into codex/fix-subagent-catalog-padding
2026-08-03 18:08:15 +08:00
ae5ee37591
Merge remote-tracking branch 'origin/master' into mergebot/pr927-r3
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/src/components/dialogs.ts
2026-08-03 17:57:50 +08:00
5884a44e6b
docs(ui): clarify approval wait ownership
2026-08-03 02:43:27 -07:00
5baa86b97f
fix(web): align subagent catalog spacing
2026-08-03 17:22:51 +08:00
6ae82e390e
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-08-03 17:22:27 +08:00
6b79907ffd
Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer
2026-08-03 17:19:53 +08:00
5d9a4d80e4
Merge branch 'master' into fix/session-waiting-approval
2026-08-03 05:16:42 -04:00
734c3d1f65
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# apps/cli/tests/snapshots/queued-manual-compact/terminal.expected.txt
# apps/web/tests/snapshots/queue-actions/preserved.expected.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/tests/snapshots/untrusted-controls.expected.txt
2026-08-03 17:15:34 +08:00
a8670bdec3
Merge remote-tracking branch 'origin/master' into mergebot/pr965
2026-08-03 17:04:00 +08:00
070f371370
Merge branch 'master' into worktree/fix-multi-select-custom-answer
2026-08-03 16:55:48 +08:00
d1dbff66e0
Merge remote-tracking branch 'origin/master' into fix/session-waiting-approval
2026-08-03 16:51:18 +08:00
2c78041878
Merge remote-tracking branch 'origin/master' into codex/pr-1037-resolution
...
# Conflicts:
# docs/config-catalog.md
# packages/ui/tui/README.i18n.yaml
2026-08-03 16:49:58 +08:00
4edb828364
Merge remote-tracking branch 'origin/master' into codex/pr-1037-resolution
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-08-03 16:49:18 +08:00
aaa2102246
Merge branch 'master' into agent/fix-remote-welcome-onboarding
2026-08-03 04:49:00 -04:00
1d3a807e49
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
2026-08-03 16:48:14 +08:00
3009bc5312
Merge pull request #1003 from deepseek-harness/worktree/web-remote-markdown-images
...
feat(web): render remote Markdown images
2026-08-03 16:41:00 +08:00
19f2c45bb0
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
2026-08-03 16:38:12 +08:00
140fdef85e
docs(client-web): sync the web card contracts to the scrolling source list
...
The READMEs of ui-primitives and ui-conversation still documented the
removed maxSources prop, DEFAULT_WEB_MAX_SOURCES, CHAT_WEB_MAX_SOURCES,
and the head/tail collapse; the 2026-07-30 frontend note described the
same as current behavior. Restate all of them as the fixed-height scroll
container and cross-link the two notes both ways.
Bound the model-visible/card-visible correspondence: spill-policy's
tools/post-execute replaces an oversized result's content while leaving
presentationMeta whole, so the card's contract is the view it receives,
not the model's context.
Narrow the unit test's name and header comment to what jsdom establishes
(one <ol>, no expand control); jsdom does not resolve CSS Modules layout,
so the scroll geometry belongs to an assembled browser case.
2026-08-03 16:35:37 +08:00
a597763393
fix(session): type turn/end error as one structured failure
...
TurnEndReasonMap.error now carries a single `error: LlmFailure` field:
an LlmError keeps its structured facts, any other error flattens to
errorChain text under the UNKNOWN code. Consumers read message/code
directly instead of defending against an unknown union — this also fixes
errorChain() rendering structured failures as '[object Object]' in the
TUI and ACP error paths. Document the turn-stopping contract: a
concludesTurn result never short-circuits already-submitted next-step
work (same-step additionalContexts or racing steering still runs), data
decides.
2026-08-03 16:33:23 +08:00
4fd3ef5797
Merge branch 'master' into worktree/fix-multi-select-custom-answer
2026-08-03 16:30:35 +08:00
b5f9fcdea4
fix(ui-trajectory): clarify assistant request timing
2026-08-03 16:24:26 +08:00
9c261516ce
fix(ui-trajectory): preserve thinking label
2026-08-03 16:22:03 +08:00
e0b70508a1
Merge remote-tracking branch 'origin/master' into worktree/custom-deepseek-models
...
# Conflicts:
# apps/web/tests/snapshots/message-actions/ui.expected.md
# apps/web/tests/snapshots/seeded-history/command-row.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# packages/client/ui-model/README.i18n.yaml
# packages/client/ui-model/README.md
# packages/client/ui-model/README.zh.md
# packages/client/ui-model/tests/model-select.spec.tsx
# packages/host/apiproxy/README.i18n.yaml
2026-08-03 16:20:55 +08:00
c5050f018e
fix(web): keep ineligible message forks disabled
2026-08-03 16:19:49 +08:00
c2b0cc7b51
fix(ui-trajectory): clarify collapsed thinking controls
2026-08-03 16:19:41 +08:00
3c160e137d
fix(apiproxy): stop projecting injected context as user steering
...
next-step items now split by origin: user-origin messages keep the
'steering' placement, while agent.inject context (approval notices, task
completion notices, attached snapshots) carries a new 'context' placement
that no surface renders until it is claimed as a durable user/message
context card. Widen the placement unions on the wire and in the client
runtime, add a projection test case, and document the split in the
apiproxy/ui-conversation READMEs and the web-steer chrome agent note.
2026-08-03 16:15:07 +08:00
61cba0cda2
Merge remote-tracking branch 'origin/master' into worktree/web-remote-markdown-images
...
# Conflicts:
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/README.md
# packages/client/ui-primitives/README.zh.md
# packages/client/ui-primitives/src/markdown/MarkdownText.tsx
# packages/client/ui-primitives/tests/markdown.spec.tsx
2026-08-03 16:09:51 +08:00
109d5b5e1c
Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer
...
# Conflicts:
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/question-composer/session.jsonl
# docs/core-data-structures/user-interaction.i18n.yaml
# packages/client/ui-question/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/ui/tui/README.i18n.yaml
# packages/ui/user-interaction/README.i18n.yaml
2026-08-03 16:09:17 +08:00
cb2f01f48c
refactor(agent-loop): drop the steering/message session event
...
Steer, inject, and followup now land as durable user/message events on the
session surface; the steering/message event type and its ConversationNode
kind are removed from the client projection. Update tests, docs, generated
catalogs, and agent notes to match, and align the steering e2e fixture and
prompt inventory assertions with the durable user/message landing.
2026-08-03 16:04:26 +08:00
c43eaaec82
Merge remote-tracking branch 'origin/master' into codex/pr-1150-disabled
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
2026-08-03 16:02:33 +08:00
57219ab060
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
2026-08-03 15:41:09 +08:00
a2ec6cefc2
fix(client-web): scroll the web_search source card instead of collapsing
...
Replace the WebBlock search card's head/tail collapse and expand button
with a fixed-height scroll container that lists every source the tool
returned. The model-facing side is unchanged: the seam still caps sources
at searchMaxResults and the truncated indicator stays, so model-visible
and frontend-visible sources remain identical.
Remove CHAT_WEB_MAX_SOURCES and DEFAULT_WEB_MAX_SOURCES: with scroll, the
chat row and details panel show the same full list.
2026-08-03 15:38:26 +08:00
6a3caea277
Merge pull request #1160 from deepseek-harness/codex/subagent-token-metrics
...
Show subagent token metrics
2026-08-03 15:35:17 +08:00
7bb9b85543
Merge branch 'master' into xtr/trajectory-marker-tooltip-fixes
2026-08-03 15:32:49 +08:00
0e05bb81a3
fix(ui-trajectory): offset recovered request boundaries
2026-08-03 15:31:36 +08:00
2d31ec5fee
Merge pull request #1173 from deepseek-harness/agent/web-bash-error-expand
...
fix(web): expand aborted Bash rows
2026-08-03 15:30:52 +08:00
d5583210d4
tighten branchless subagent catalog layout
2026-08-03 15:19:53 +08:00
59d923395a
fix(web): document remote welcome constraints
2026-08-03 00:14:35 -07:00
ad6858b6d3
fix(ui-trajectory): limit role tooltips to compact icons
2026-08-03 15:02:05 +08:00
a533cb6ce4
fix(ui-trajectory): distinguish overlapping request markers
2026-08-03 15:01:35 +08:00
8e820bbbf5
Merge pull request #1159 from deepseek-harness/codex/subagent-token-duration
...
Fix subagent active duration tracking
2026-08-03 14:45:29 +08:00
imccyu