Yichen Jiang
2e07da19e5
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 11:39:58 +08:00
Tianyi Cui
a42260ea62
Merge origin/master into feature/readme-current-capabilities
2026-07-31 11:33:17 +08:00
Ziya
25fd90a561
Merge branch 'master' into feat/gui-full-access-confirmation
2026-07-30 23:32:55 -04:00
Yichen Jiang
049e64b002
Merge remote-tracking branch 'origin/master' into worktree/fix-models-settings
2026-07-31 11:32:17 +08:00
Yichen Jiang
788b9eb986
fix(web): hide provider liveness badges
2026-07-31 11:32:10 +08:00
Tianyi Cui
f6443601c4
Merge pull request #1021 from deepseek-harness/worktree/pr884-simplify
...
fix(atomic-write): preserve contended writer locks
2026-07-31 11:31:17 +08:00
imccyu
aea9cf5e6c
test(web): carry Full access label into plan-active golden
2026-07-31 11:30:08 +08:00
Chinesezjc
6f0405ed84
docs: re-record ui-conversation README pairing after master merge
2026-07-31 11:27:13 +08:00
NI0317
e2373ee562
Merge remote-tracking branch 'origin/feature/readme-current-capabilities' into feature/readme-current-capabilities
2026-07-31 11:26:40 +08:00
Chinesezjc
e4cb667184
Merge remote-tracking branch 'origin/master' into feat/web-web-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 11:26:35 +08:00
Chinesezjc
5a52f33dd1
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 11:26:21 +08:00
Chinesezjc
38bd01af52
Merge remote-tracking branch 'origin/master' into feat/read-presenter
2026-07-31 11:25:44 +08:00
Tianyi Cui
f086650b6f
Merge branch 'master' into feature/readme-current-capabilities
2026-07-31 11:25:19 +08:00
imccyu
37827c461d
Merge remote-tracking branch 'origin/master' into mergebot/pr998
...
# Conflicts:
# apps/web/tests/snapshots/code-mode-round/ui.expected.md
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
# apps/web/tests/snapshots/live-interactions/cancel.expected.md
# apps/web/tests/snapshots/live-interactions/error-auth.expected.md
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tests/snapshots/message-actions/ui.expected.md
# apps/web/tests/snapshots/plan-review/approved.expected.md
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/queue-actions/collapsed.expected.md
# apps/web/tests/snapshots/queue-actions/editing.expected.md
# apps/web/tests/snapshots/queue-actions/ui.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/tests/input-bar.spec.tsx
2026-07-31 11:25:16 +08:00
NI0317
84b52debb1
Merge remote-tracking branch 'origin/master' into feature/readme-current-capabilities
2026-07-31 11:20:05 +08:00
Tianyi Cui
a632934ad7
Merge branch 'master' into worktree/pr884-simplify
2026-07-31 11:19:00 +08:00
NI0317
e9cbfa153a
docs: address README review
2026-07-31 11:18:49 +08:00
ZiyaZhang
45627bd93b
fix(ci): tolerate initializing Lefthook lock
2026-07-30 20:17:04 -07:00
Yichen Jiang
61edbe400f
Merge remote-tracking branch 'origin/master' into worktree/fix-models-settings
2026-07-31 11:14:25 +08:00
Yichen Jiang
311aca3663
fix(web): improve models settings safety and contrast
2026-07-31 11:14:07 +08:00
imccyu
9525cc9db2
Merge pull request #1005 from deepseek-harness/codex/new-task
...
Open command menu from composer plus button
2026-07-31 11:12:26 +08:00
kingwl
28d308b469
Merge remote-tracking branch 'origin/master' into codex/responsive-queue-panel
...
# Conflicts:
# packages/client/ui-conversation/src/client/queue/QueueDock.module.css
# packages/client/ui-conversation/src/client/skeleton/ConversationRoot.module.css
# packages/client/ui-conversation/src/client/skeleton/InputBar.module.css
# packages/client/ui-conversation/src/client/skeleton/TodoPanel.module.css
2026-07-31 11:10:08 +08:00
imccyu
1f2452bfae
docs: add agent note for full-access confirmation
2026-07-31 11:07:59 +08:00
Chinesezjc
40b9ccff20
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
...
# Conflicts:
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
2026-07-31 11:07:52 +08:00
Tianyi Cui
e9096c891c
Merge latest master into worktree/pr884-simplify
2026-07-31 11:00:07 +08:00
NI0317
46515aec6c
Merge remote-tracking branch 'origin/master' into feature/readme-current-capabilities
2026-07-31 11:00:05 +08:00
Chinesezjc
2cad75a217
test(client-ui-conversation): assert localized 输出 section title in web-card panel
...
master's locale rollout renders the details Output section title through
t('details.output') (输出 under the zh seat the test uses). The spec still
asserted the English 'Output' literal and failed. Match the sibling
terminal-card suite's localized assertion.
2026-07-31 10:59:43 +08:00
Chinesezjc
32ab26a30b
fix(tui): route read card content through renderBody's stripped-content path
...
The master merge added a web card whose renderBody content narrow checked
only card === 'generic', so a read card fell through to the raw result
content and rendered the full <path>/<type>/<content> envelope instead of
the envelope-stripped text. Include card === 'read' in that narrow, mirroring
the markdownContent selection in render(); the parallel-file-reads terminal
golden is byte-for-byte unchanged.
2026-07-31 10:58:19 +08:00
Chinesezjc
452ba583d2
test(client-ui-conversation): pass locale seat to web-card GenericToolCard/DetailsPanel renders
...
master's locale rollout made `t` a required prop on GenericToolCardProps and
the details slot; the web-card spec predates it. Supply the makeTranslate seat
the sibling suites use.
2026-07-31 10:54:36 +08:00
Chinesezjc
bf26cfd2ff
docs: re-record ui README pairings after master merge
2026-07-31 10:51:58 +08:00
Ziya
7b95559f18
Merge branch 'master' into feat/gui-full-access-confirmation
2026-07-30 22:51:43 -04:00
Chinesezjc
83f3ed8b91
Merge remote-tracking branch 'origin/master' into feat/web-web-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# 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/index.ts
2026-07-31 10:51:09 +08:00
Chinesezjc
c1f990a066
test(acp): refresh cordis-inspect-jsdoc and workspace-context fixtures post-merge
...
The merge combined ReadResultView (this branch) and WebResultView (master)
into ToolResultView; refresh cordis-inspect-jsdoc for the merged union and
workspace-context for the read window offset now in persisted meta.
2026-07-31 10:45:34 +08:00
Chinesezjc
224e3f85be
docs: re-record ui-conversation README pairing after base merge
2026-07-31 10:43:51 +08:00
Chinesezjc
fa6ba79ddf
Merge remote-tracking branch 'origin/feat/web-presenter' into feat/web-web-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 10:42:43 +08:00
Chinesezjc
83fff705da
Merge remote-tracking branch 'origin/master' into feat/read-presenter
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/tools.i18n.yaml
# docs/core-data-structures/tools.md
# docs/core-data-structures/tools.zh.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.i18n.yaml
# packages/core/tools/README.md
# packages/core/tools/README.zh.md
# packages/core/tools/src/index.ts
# packages/core/tools/src/presentation.ts
# packages/ui/tui/src/components/transcript.ts
2026-07-31 10:42:07 +08:00
Turtle
7239a2201e
Merge pull request #976 from deepseek-harness/fix/nodeboot-dep
...
fix(cli): expose source-launch activation errors
2026-07-31 10:40:43 +08:00
imccyu
c0733ba46b
Merge branch 'master' into fix/nodeboot-dep
2026-07-31 10:34:07 +08:00
imccyu
f850676785
Merge pull request #711 from deepseek-harness/codex/basic-session-search
...
Add basic past-session search
2026-07-31 10:33:53 +08:00
ZiyaZhang
83d6be50aa
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
2026-07-30 19:32:51 -07:00
ZiyaZhang
85b3fcbd19
Merge remote-tracking branch 'origin/feat/gui-full-access-confirmation' into feat/gui-full-access-confirmation
2026-07-30 19:32:27 -07:00
Turtle
1332360d53
Merge pull request #1013 from deepseek-harness/fix/node26-vitest-webstorage
...
fix(test): isolate jsdom storage on Node 26
2026-07-31 10:31:59 +08:00
ZiyaZhang
a189597830
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
...
# Conflicts:
# packages/client/ui-primitives/src/Modal.tsx
# packages/client/ui-primitives/tests/atoms.spec.tsx
2026-07-30 19:30:41 -07:00
Yichen Jiang
11fde7bc1a
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# packages/client/ui-conversation/tests/chat-view.spec.tsx
2026-07-31 10:26:23 +08:00
Turtle
aa39d6c6ed
Merge remote-tracking branch 'origin/master' into fix/node26-vitest-webstorage
...
# Conflicts:
# scripts/run-gates.spec.ts
# vitest.config.ts
2026-07-31 10:26:05 +08:00
imccyu
d6da16b7f3
Merge branch 'master' into codex/basic-session-search
2026-07-31 10:23:52 +08:00
imccyu
ce57438ac0
Merge branch 'master' into codex/new-task
2026-07-31 10:23:14 +08:00
imccyu
5f93edca10
Merge pull request #1008 from deepseek-harness/feat/tool-call-collapse
...
P0 - Unify all tool calls interaction and expand detail view
2026-07-31 10:22:54 +08:00
imccyu
dd19954783
Merge branch 'master' into codex/new-task
2026-07-31 10:20:15 +08:00
Yichen Jiang
d3c6638b6d
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/tests/chat-view.spec.tsx
2026-07-31 10:19:14 +08:00
