imccyu
03936cb320
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# packages/client/ui-question/package.json
# packages/client/ui-question/src/client/QuestionComposer.tsx
# packages/client/ui-question/src/client/contract/slots.ts
# packages/client/ui-question/src/client/index.ts
# packages/client/ui-question/src/client/locales.ts
# packages/client/ui-question/tests/browser-plugin.spec.ts
# packages/client/ui-question/tests/question-composer.spec.tsx
2026-07-30 15:01:10 +08:00
imccyu
1db976210f
Merge pull request #928 from deepseek-harness/worktree/short-default-labels
...
fix(ui): shorten default reasoning labels
2026-07-30 13:22:05 +08:00
imccyu
1b84126f70
Merge branch 'master' into worktree/short-default-labels
2026-07-30 13:08:34 +08:00
imccyu
c66cf04ebf
Merge pull request #937 from deepseek-harness/fix/input-ui
...
Web composer stats detail row and input-zone polish
2026-07-30 13:08:25 +08:00
imccyu
432a64ef2f
Merge branch 'master' into worktree/short-default-labels
2026-07-30 12:56:11 +08:00
imccyu
01324f9167
Merge branch 'master' into fix/input-ui
2026-07-30 12:55:57 +08:00
Ziya
818a504901
Merge pull request #831 from deepseek-harness/fix/workspace-instruction-frame-metadata
...
fix(workspace-context): escape instruction frame metadata
2026-07-30 00:35:48 -04:00
Tianyi Cui
cea5e868ff
Merge remote-tracking branch 'origin/master' into worktree/retarget-pr831-20260729
2026-07-30 12:21:14 +08:00
imccyu
b44318b03d
Merge branch 'master' into fix/input-ui
2026-07-30 12:20:01 +08:00
Tianyi Cui
e29a4d7083
Merge pull request #844 from deepseek-harness/codex/experimental-plugin-group-note
...
docs: add experimental and internal package group
2026-07-30 12:18:56 +08:00
Tianyi Cui
d37b192aa9
Merge branch 'master' into fix/workspace-instruction-frame-metadata
2026-07-30 12:16:41 +08:00
Tianyi Cui
3ecd4a569a
test(skill-local): cover root unlink rewatch
2026-07-30 12:02:21 +08:00
imccyu
6e99027917
Merge remote-tracking branch 'origin/master' into mergebot/pr937
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/queue/QueueDock.module.css
2026-07-30 11:59:59 +08:00
Tianyi Cui
3f195f1dd1
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
2026-07-30 11:57:55 +08:00
imccyu
1642b8f7d2
Merge pull request #925 from deepseek-harness/codex/web-queue-actions
...
feat(agent): add addressable queue operations
2026-07-30 11:47:21 +08:00
Tianyi Cui
c0474d5289
Merge branch 'master' into codex/experimental-plugin-group-note
2026-07-30 11:46:04 +08:00
Tianyi Cui
ecb43469af
Merge branch 'master' into fix/workspace-instruction-frame-metadata
2026-07-30 11:45:00 +08:00
kingwl
ad1bb84425
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 11:38:54 +08:00
imccyu
6b93f85fac
Merge pull request #924 from deepseek-harness/fix/ui-action-display
...
fix: chat agent message actions display
2026-07-30 11:31:41 +08:00
imccyu
a9813a2801
Merge branch 'master' into codex/web-queue-actions
2026-07-30 11:20:57 +08:00
07akioni
b92c6bcc66
Merge branch 'master' into fix/ui-action-display
2026-07-30 11:15:35 +08:00
imccyu
60620ec36c
Green the jsdom lane for the composer-seat ResizeObserver and new StatsLine format
...
The seat's height publisher needs a ResizeObserver stub in every spec that
renders ConversationRoot (jsdom has none), and the two branch-tail StatsLine
assertions move to the grouped detail-row output.
2026-07-30 11:09:03 +08:00
Tianyi Cui
b9e240bbef
Merge pull request #828 from deepseek-harness/fix/hook-matcher-validation
...
fix(hooks): reject invalid matcher regexes
2026-07-30 11:08:42 +08:00
Tianyi Cui
c38a7c3a89
Merge branch 'master' into fix/hook-matcher-validation
2026-07-30 10:57:24 +08:00
Yichen Jiang
c7c37d64a4
Merge remote-tracking branch 'origin/worktree/short-default-labels' into worktree/short-default-labels
2026-07-30 10:52:26 +08:00
imccyu
b94df7348f
Merge branch 'master' into codex/web-queue-actions
2026-07-30 10:50:34 +08:00
Yichen Jiang
fb4b8f3973
Merge remote-tracking branch 'origin/master' into worktree/short-default-labels
...
# Conflicts:
# packages/client/ui-model/src/client/ModelSelect.tsx
# packages/client/ui-model/tests/model-select.spec.tsx
2026-07-30 10:47:35 +08:00
imccyu
c56e52d8e3
Merge pull request #920 from deepseek-harness/worktree-locale
...
feat(client): typed locale standard seat and first adopters
2026-07-30 10:38:39 +08:00
Yif
04f6dfdc29
Web composer stats detail row and input-zone polish
...
Stats line moves into the InputBar's new footer slot (sharing the card's
width column) and expands to the design's grouped detail row: turns/steps,
LLM and tool wall time, cache hit, and input/output token split, all
derived client-side from the snapshot. The composer stack owns one 8px
rhythm, the seat fades the transcript through a fixed 36px gradient band,
back-to-bottom follows a live --dsh-composer-height, and goal/todo strips
share one 752px tip-fill column.
2026-07-30 10:22:44 +08:00
Yichen Jiang
7c63629e38
Merge branch 'master' into worktree/short-default-labels
2026-07-30 10:15:57 +08:00
kingwl
ff570ea04c
test(agent): refresh inbox action snapshot
2026-07-30 04:20:20 +08:00
kingwl
112b0fbad1
fix(web): address queue review feedback
2026-07-30 04:12:38 +08:00
kingwl
ebbcfdd03b
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# packages/core/agent-loop/src/agent.ts
2026-07-30 03:33:41 +08:00
kingwl
7ce330f0e4
refactor(agent): scope queue actions to edit and remove
2026-07-30 01:58:51 +08:00
imccyu
606b6aa78c
Merge remote-tracking branch 'origin/master' into worktree-locale
...
# Conflicts:
# packages/client/ui-slots/src/index.ts
2026-07-30 01:53:28 +08:00
imccyu
93fc1e2ab8
Merge branch 'master' into feat/ask-question-gui
2026-07-30 01:46:05 +08:00
imccyu
622450192d
fix(client): mark the parallel register overloads for the clone gate
...
The two overload declarations differ only in the inject share; folding them
would lose per-overload inference of I, so the duplication is deliberate.
2026-07-30 01:40:10 +08:00
Tianyi Cui
c8cdc42418
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
2026-07-30 01:38:34 +08:00
Tianyi Cui
78cf5de686
Merge origin/master into fix/hook-matcher-validation
2026-07-30 01:38:18 +08:00
imccyu
3c8cd4eca3
fix(web): repair merge tails — todo-row selector and composer handler clone
...
The #921 selector change and the duplication gate both first ran against
this branch after the merge made it MERGEABLE: assembly-surfaces still
queried the retired data-sample="todo-row" hook (the composed TodoRow
carries ToolRow's data-tool attribute instead), and the redesigned
QuestionComposer duplicated the custom-draft onChange/onKeyDown pair
across its inline input and optionless textarea. The spec now anchors on
data-tool="todo_write", and the composer shares one draftCustom /
continueFromCustom handler pair (Enter continues, Shift+Enter stays a
newline, IME composition stays inert).
2026-07-30 01:34:56 +08:00
Tianyi Cui
2a53806275
Merge pull request #885 from deepseek-harness/codex/migrate-to-oxlint
...
refactor: migrate linting to Oxlint
2026-07-30 01:33:20 +08:00
Tianyi Cui
401afde164
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
...
# Conflicts:
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
2026-07-30 01:32:41 +08:00
Tianyi Cui
7ba061446d
docs(acp-snapshot): widen posix-only contract
2026-07-30 01:27:52 +08:00
imccyu
e56c0699a9
Merge branch 'master' into codex/web-queue-actions
2026-07-30 01:21:13 +08:00
Tianyi Cui
4582e1425c
Merge commit 'refs/codex/pr885/master-20260730' into worktree/retarget-pr885-20260729
...
# Conflicts:
# eslint.config.mjs
2026-07-30 01:18:28 +08:00
Tianyi Cui
014e39203e
Merge commit '3a1b995e4fc3eb9acd6324c4b581f7aeb110b8be' into worktree/retarget-pr828-20260729
2026-07-30 01:18:18 +08:00
imccyu
643f9be33f
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# apps/web/tests/todo-display.snapshot.ts
# docs/event-producer-consumer.md
2026-07-30 01:16:46 +08:00
Tianyi Cui
4c15041fc9
test(hooks): normalize matcher snapshot workdirs
2026-07-30 01:16:37 +08:00
Tianyi Cui
b7dbb25c08
docs: clarify release tooling exclusion
2026-07-30 01:14:25 +08:00
imccyu
d00d1009f7
Merge remote-tracking branch 'origin/master' into worktree-locale
...
# Conflicts:
# docs/module-graph.md
# packages/client/locale/README.i18n.yaml
# packages/client/locale/README.zh.md
2026-07-30 01:10:57 +08:00