_Kerman
eaa497d735
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-19-package-owned-invariant-service.i18n.yaml
# examples/acp-agent/tests/snapshots/fs-glob-sampling/session.jsonl
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/src/components/dialogs.ts
# packages/ui/tui/tests/tui.spec.ts
2026-08-04 10:52:45 +08:00
_Kerman
d4794ed991
Merge branch 'master' into xtr/react-loop-simplification
2026-08-03 21:31:57 +08:00
Huanqi Cao
0ee198d70e
Merge remote-tracking branch 'origin/master' into feat/ripgrep-packaged-binary
2026-08-03 20:19:49 +08:00
_Kerman
fa79008c75
test(web): wait on the request marker button, not the hairline row
...
The boundary marker row is a 0-height hairline except at the table tail;
the marker button is absolutely positioned and visible anywhere, so the
terminal-marker e2e waits on the button. Also refresh the
cordis-inspect-jsdoc fixture to the typed error reason (LlmFailure).
2026-08-03 19:37:52 +08:00
_Kerman
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
imccyu
33b52502f4
Merge branch 'master' into agent/fix-remote-welcome-onboarding
2026-08-03 18:37:37 +08:00
imccyu
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
kingwl
6585847144
fix(web): preserve subagent catalog styling
2026-08-03 18:24:25 +08:00
imccyu
e47ad8e393
Merge remote-tracking branch 'origin/master' into agent/fix-remote-welcome-onboarding
2026-08-03 18:19:24 +08:00
kingwl
70ad82ef00
Merge remote-tracking branch 'origin/master' into codex/fix-subagent-catalog-padding
2026-08-03 18:08:15 +08:00
_Kerman
ce60304648
chore(ci): regenerate stale catalogs and re-record translation pairs
...
- gen-cordis-catalog / gen-persistence-catalog / gen-doc-graphs after the
error-reason and steering/message changes (line anchors and event
producer/consumer graph drifted).
- verify-translation-pairing --write --all: every bilingual pair touched
by the PR (agent notes, session/core docs, READMEs) plus the merge.
- queue-actions preserved golden re-recorded against the rebuilt client
(branch disabled on non-completed-turn tails is back in effect).
2026-08-03 18:06:14 +08:00
imccyu
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
kingwl
5baa86b97f
fix(web): align subagent catalog spacing
2026-08-03 17:22:51 +08:00
_Kerman
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
imccyu
553fb9a119
fix: test
2026-08-03 17:17:41 +08:00
_Kerman
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
imccyu
a3d897359f
test(web): refresh Markdown image golden for the fork-eligibility gate
2026-08-03 17:11:36 +08:00
imccyu
a8670bdec3
Merge remote-tracking branch 'origin/master' into mergebot/pr965
2026-08-03 17:04:00 +08:00
Turtle
4c8b47f3c6
test(web): refresh markdown image golden
2026-08-03 17:00:33 +08:00
imccyu
070f371370
Merge branch 'master' into worktree/fix-multi-select-custom-answer
2026-08-03 16:55:48 +08:00
imccyu
d1dbff66e0
Merge remote-tracking branch 'origin/master' into fix/session-waiting-approval
2026-08-03 16:51:18 +08:00
Ziya
aaa2102246
Merge branch 'master' into agent/fix-remote-welcome-onboarding
2026-08-03 04:49:00 -04:00
Yichen Jiang
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
imccyu
4fd3ef5797
Merge branch 'master' into worktree/fix-multi-select-custom-answer
2026-08-03 16:30:35 +08:00
Yichen Jiang
886c39d302
test(web): refresh Markdown image snapshot
2026-08-03 16:21:02 +08:00
kingwl
c5050f018e
fix(web): keep ineligible message forks disabled
2026-08-03 16:19:49 +08:00
Yichen Jiang
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
Yichen Jiang
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
_Kerman
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
kingwl
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
Wenlu Wang
6a3caea277
Merge pull request #1160 from deepseek-harness/codex/subagent-token-metrics
...
Show subagent token metrics
2026-08-03 15:35:17 +08:00
imccyu
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
kingwl
d5583210d4
tighten branchless subagent catalog layout
2026-08-03 15:19:53 +08:00
ZiyaZhang
59d923395a
fix(web): document remote welcome constraints
2026-08-03 00:14:35 -07:00
ZiyaZhang
e63df333a1
test(web): normalize abort snapshot date
2026-08-02 23:45:47 -07:00
Wenlu Wang
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
Ziya
b6b642fae4
Merge branch 'master' into agent/web-bash-error-expand
2026-08-03 02:30:36 -04:00
imccyu
8527ce23ae
Merge pull request #1169 from deepseek-harness/worktree/directory-picker-path-editor
...
fix(directory-picker-browse): advertise the path editor and walk the panes with the draft
2026-08-03 14:30:34 +08:00
kingwl
a75b323e2e
merge fractional duration normalization
2026-08-03 14:15:45 +08:00
kingwl
a9ed7c2e98
fix fractional duration normalization
2026-08-03 14:14:48 +08:00
ZiyaZhang
0a4ad25ce7
fix(web): expand aborted Bash rows
2026-08-02 23:06:00 -07:00
_Kerman
667960182a
test(web): normalize detailed local clocks
2026-08-03 14:02:46 +08:00
_Kerman
5534431d42
fix(ui-trajectory): own composer overlay geometry
2026-08-03 14:02:40 +08:00
creatixchu
95826603cb
review(web): poll the pane-arity assertions in the path-editor e2e
...
A bare count can observe a landing mid-commit on a loaded runner, and the
arity is the invariant this scenario exists to pin.
2026-08-03 13:57:20 +08:00
_Kerman
74cd2e4bd9
feat(ui-trajectory): enrich timeline timing interactions
2026-08-03 13:48:03 +08:00
kingwl
583d532bc3
merge compact duration display
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.i18n.yaml
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.md
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.zh.md
# apps/web/tests/snapshots/subagent-conversation/tree.expected.md
# packages/client/ui-subagent/README.i18n.yaml
# packages/client/ui-subagent/README.md
# packages/client/ui-subagent/README.zh.md
# packages/client/ui-subagent/src/client/SubagentCatalogAction.tsx
# packages/client/ui-subagent/tests/conversation-ui.spec.tsx
2026-08-03 13:31:19 +08:00
creatixchu
2ceed380dd
fix(directory-picker-browse): keep the typed level in the last pane
...
Skipping the draft-following scan whenever ANY pane happened to list the
directory was the cheaper rule and the wrong one: erasing a segment left the
level being typed on the LEFT, with its own child pane still standing to its
right, so the two panes stopped reading as "where I am, and where I came
from".
The pane arity is now the invariant the editor maintains — the last pane lists
the level the path names, its parent sits beside it, and only a display root
lists alone. Only that last pane's own tail costs no scan; every other
directory part re-lands.
2026-08-03 13:27:45 +08:00
kingwl
255cd90c6e
compact long subagent durations
2026-08-03 13:23:40 +08:00
_Kerman
f4a2e0d10a
fix(agent): align consumers with inbox lifecycle
2026-08-03 13:14:24 +08:00
creatixchu
c58b07833e
fix(directory-picker-browse): land the draft-following walk two-pane
...
The draft-following scan replaced the panes with one wide level, so typing a
path collapsed the dialog's Miller view — the thing the dialog is. It now
lands through the same selection-anchored landing every navigation uses:
target and parent legs as one frame, the target re-selected in its parent
level, its children on the right. Typing a path moves the Miller view exactly
as a crumb jump does.
One landing shape, two callers: `land(path, {closeEditor, announce})` is what
`navigate` and the draft-following scan share. A submitted path closes the
editor and announces failures; the speculative scan keeps both to itself and
re-parks the focus its swap dropped.
A level a pane already lists still needs no scan at all — the filter alone
answers the draft — so erasing back into the parent's own path keeps both
panes and only moves the filter.
2026-08-03 13:08:31 +08:00
