Tianyi Cui
ec1f08d3ba
Merge branch 'master' into worktree/ci-independent-consumer-build
2026-07-30 21:07:14 +08:00
Hypatia May
350ab5d962
Merge latest origin/master into codex/status-bar-token-metrics
...
Build-review integration round 3.
2026-07-30 21:06:28 +08:00
Chinesezjc
ca19468ae2
Merge remote-tracking branch 'origin/master' into feat/read-presenter
2026-07-30 21:05:17 +08:00
Yichen Jiang
95824545a6
Merge origin/master into worktree/deepseek-max-tokens-defaults
2026-07-30 21:04:10 +08:00
Yichen Jiang
daf70f3660
feat(llm-deepseek): configure max token defaults
2026-07-30 21:04:00 +08:00
ZiyaZhang
e517e75344
Merge remote-tracking branch 'origin/master' into feat/gui-full-access-confirmation
2026-07-30 06:01:56 -07:00
ZiyaZhang
8d4bf5ae41
chore(docs): refresh generated graph records
2026-07-30 06:01:47 -07:00
Hypatia May
2e68e08644
test(web): isolate direct smoke skill homes
...
Build-review integration round 2.
2026-07-30 20:58:34 +08:00
Tianyi Cui
21e8af2b3a
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
...
# Conflicts:
# packages/fs/tool-fs-search/README.i18n.yaml
# packages/fs/tool-fs-search/README.zh.md
2026-07-30 20:56:27 +08:00
07akioni
8030aacf84
Merge branch 'master' into fix/turn-actions
2026-07-30 20:56:11 +08:00
Yichen Jiang
b6130b178d
Merge remote-tracking branch 'origin/worktree-llm-web-config' into worktree/onboarding-deepseek-config
...
# Conflicts:
# packages/client/ui-models/README.i18n.yaml
# packages/client/ui-models/README.md
# packages/client/ui-models/README.zh.md
# packages/client/ui-models/src/client/store.ts
# packages/client/ui-models/tests/components.spec.tsx
2026-07-30 20:55:12 +08:00
imccyu
a07f7ab551
Merge branch 'master' into codex/queue-collapse
2026-07-30 20:52:12 +08:00
Hypatia May
acca880015
Merge latest origin/master into fix/human-transcript-projection
...
Build-review integration round 2.
2026-07-30 20:51:45 +08:00
Hypatia May
538f23678a
Merge origin/master into codex/status-bar-token-metrics
...
Build-review integration round 1; isolate Web snapshots from user skill homes.
2026-07-30 20:51:38 +08:00
Tianyi Cui
bec424b9f3
Merge latest master into worktree-config-settings-seam
2026-07-30 20:51:34 +08:00
ZiyaZhang
6d416b06c5
fix(client): gate every full access picker
2026-07-30 05:48:33 -07:00
Chinesezjc
689dcfe7d5
fix(web-presenter): dim-Markdown web fallback, memoize fetch conversion, strip note residue
...
Route a `web` result card's raw-content fallback through the TUI's dim
Markdown path (render() only recognized `card: 'generic'` as markdown
content, so web fallback rendered as bare undimmed text).
Memoize renderFetchOutput per (result, maxOutputChars) so the registry's
twin output.render / output.presentationMeta calls on the same frozen
result run one HTML->markdown conversion instead of two.
Remove the trailing `</content>`/`</invoke>` protocol residue from both
sides of the web-result-card Agent Note and re-record the pairing.
2026-07-30 20:48:19 +08:00
creatixchu
af73535b6a
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 20:48:06 +08:00
CreatixChu
5335d61d11
Merge pull request #943 from deepseek-harness/feat/directory-picker-quiet-navigation
...
feat(directory-picker-browse): quiet navigation — one-frame landings and a slow-scan loading pill
2026-07-30 20:47:36 +08:00
Hypatia May
c6e06e289e
Merge origin/master into fix/human-transcript-projection
...
Build-review integration round 1.
2026-07-30 20:45:39 +08:00
kingwl
2e466dc649
Merge remote-tracking branch 'origin/master' into codex/new-task
2026-07-30 20:44:36 +08:00
imccyu
2ed4d982e7
Merge branch 'master' into feat/gui-full-access-confirmation
2026-07-30 20:43:02 +08:00
kingwl
7da7d5784d
Open command menu from composer plus button
2026-07-30 20:42:48 +08:00
Chinesezjc
224a9d5f09
fix(client-web): reject unknown web kind, lock fixture to contract, observe web card in boot smoke
...
- webCardModel returns null for an unknown web `kind` (wire from a newer host)
instead of drawing it as a malformed fetch, matching the unknown-`card` and
terminal-model wire-boundary default.
- Fixture WEB_SEARCH_RESULT/WEB_FETCH_RESULT and the source type derive from the
contract's ToolResultView via Extract, so a new contract field fails at the
type level rather than drifting silently.
- built-boot smoke asserts the web_search/web_fetch turns render their keyed
WebRow cards, giving the registration and wire projection an assembled check.
- DetailsPanel comment no longer claims the card omits content for search.
- ui-primitives README inline-Chinese limitation now lists WebBlock's controls.
2026-07-30 20:42:29 +08:00
Yichen Jiang
f5d21af60b
test(ui-models): cover the failure paths, and share the one message reader
...
The per-file coverage gate caught three uncovered paths in the error handling
this round added: the page banner for a failed row removal, the editor card's
transport-rejection catch, and `store.fail` itself.
Two of them are one click each — Remove with a rejecting write, Apply with a
rejecting write — so they are covered through the UI rather than by calling
the helpers directly. The third was a duplicated `error instanceof Error ?
error.message : String(error)` in two files; it becomes one exported
`messageOf`, which removes the branch from both call sites and gives the
fallback arm a home a direct unit test can reach (the lint rule forbids
rejecting a promise with a non-Error, so a rejection cannot exercise it).
2026-07-30 20:36:38 +08:00
07akioni
55375a3280
Merge origin/master into fix/turn-actions
...
Keep master's describe.skip on cordis-catalog contract suites (CI typert cost cut).
2026-07-30 20:35:44 +08:00
Chinesezjc
0ae52fbb9f
fix(fs): guard langFromPath against Object.prototype extension keys
...
A filename whose extension is an Object.prototype key (foo.constructor,
foo.__proto__) resolved to the inherited member through the plain-object index,
so a function reached the read card's lang hint and failed the tool-output JSON
validation, failing an otherwise successful read. Look the extension up as an
own property only. Added rejection tests, converted the zh Note headings to the
all-English sibling convention, and named the parallel-file-reads terminal
golden as the TUI-unchanged evidence in the Testing section (both languages).
2026-07-30 20:32:51 +08:00
Yichen Jiang
af7dd4e340
Merge branch 'worktree-llm-dynamic-config' into worktree-llm-web-config
2026-07-30 20:29:45 +08:00
Yichen Jiang
a56678e115
Merge remote worktree-config-settings-seam
2026-07-30 20:28:53 +08:00
Yichen Jiang
ff5b65bb62
Merge latest master into worktree-config-settings-seam
...
# Conflicts:
# packages/typert/generator/tests/cordis-catalog-contract.spec.ts
2026-07-30 20:28:25 +08:00
imccyu
4b50c4112b
Merge branch 'master' into worktree/chat-ui-polish
2026-07-30 20:27:52 +08:00
imccyu
d67b80f2fd
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 20:27:47 +08:00
Tianyi Cui
780a601635
Merge latest master into worktree-config-settings-seam
...
# Conflicts:
# packages/typert/generator/tests/cordis-catalog-contract.spec.ts
2026-07-30 20:26:36 +08:00
Chinesezjc
917e114b68
docs: re-record ui-conversation README pairing after master merge
2026-07-30 20:25:19 +08:00
Chinesezjc
ce4773d884
Merge remote-tracking branch 'origin/master' into feat/web-web-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 20:25:14 +08:00
Yichen Jiang
990d1bbc35
fix(cli): declare the config-plane providers the shared base config mounts
...
The master merge moved the TUI composition into `apps/cli/config/base.cordis.yml`
and I carried the `settings-local` / `credentials-local` rows across without
adding them to the resolver manifest. Bare specifiers in an app config resolve
through that manifest's dependencies, so the whole tree failed to boot:
dsh: plugin(s) failed to load: @deepseek-ai/dsh-settings-local,
@deepseek-ai/dsh-credentials-local
which took every TUI PTY smoke with it. `verify-cordis-config` did not catch
it, so the boot smoke was the first signal.
2026-07-30 20:25:13 +08:00
Chinesezjc
b76a551e10
docs: re-record ui-conversation README pairing after master merge
2026-07-30 20:25:05 +08:00
Chinesezjc
5134147d63
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
2026-07-30 20:24:47 +08:00
Wenlu Wang
9dc5b4f58d
Merge branch 'master' into codex/queue-collapse
2026-07-30 20:24:12 +08:00
creatixchu
0ea0aef41a
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 20:23:11 +08:00
Chinesezjc
74060dfb86
Merge remote-tracking branch 'origin/master' into feat/search-presenter
2026-07-30 20:22:51 +08:00
Chinesezjc
83c93bb18f
Merge remote-tracking branch 'origin/master' into feat/web-presenter
2026-07-30 20:22:51 +08:00
Chinesezjc
22ff54dda4
Merge remote-tracking branch 'origin/master' into feat/read-presenter
2026-07-30 20:22:51 +08:00
creatixchu
b6fc6328f3
Merge remote-tracking branch 'origin/master' into feat/directory-picker-quiet-navigation
2026-07-30 20:22:35 +08:00
Tianyi Cui
bdc21717c0
Merge branch 'master' into worktree/fix-macos-web-replay
2026-07-30 20:22:12 +08:00
Tianyi Cui
2fb90a744e
Merge pull request #929 from deepseek-harness/worktree-optgate
...
perf(scripts): gen-doc-graphs and typert gen
2026-07-30 20:21:18 +08:00
07akioni
d704a2b782
fix: ci
2026-07-30 20:19:42 +08:00
Yichen Jiang
3957ce007a
Merge branch 'worktree-llm-dynamic-config' into worktree-llm-web-config
...
# Conflicts:
# apps/cli/cordis.yml
# apps/cli/package.json
# apps/cli/tests/tui-keyless-smoke.e2e.ts
# apps/web/tests/details-session-lifecycle.e2e.ts
# 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/question-composer/answered.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/mid-steer.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/user/guide/config.i18n.yaml
# docs/user/guide/config.md
# docs/user/guide/config.zh.md
# docs/user/guide/index.i18n.yaml
# docs/user/guide/index.md
# docs/user/guide/index.zh.md
# examples/acp-agent/tests/snapshots/subagent-fork/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/cordis-agent/cordis.yml
# examples/cordis-agent/tests/cordis-tools.e2e.ts
# examples/headless-agent/tests/semantic-checkpoint-snapshots/tool-outcome-unknown/session.expected.jsonl
# examples/headless-agent/tests/subagent-inheritance-snapshots/parent-override/parent.expected.jsonl
# examples/tui-agent/code-mode.cordis.yml
# examples/tui-agent/cordis.yml
# packages/examples/tui-demo/README.md
# packages/examples/tui-demo/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# packages/pty/tool-bash-persistent/README.i18n.yaml
# packages/ui/tui/tests/snapshots/status-diagnostics-narrow.expected.txt
# packages/ui/tui/tests/snapshots/status-diagnostics.expected.txt
# pnpm-lock.yaml
# scripts/snapshots/python-sdk-single-exe/advanced/result.json
# scripts/snapshots/python-sdk-single-exe/advanced/session.1.jsonl
# scripts/snapshots/python-sdk-single-exe/advanced/session.2.jsonl
# scripts/snapshots/python-sdk-single-exe/advanced/session.jsonl
2026-07-30 20:15:40 +08:00
kingwl
29d8ca5ee5
Merge remote-tracking branch 'origin/master' into codex/queue-collapse
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 20:11:46 +08:00
Yichen Jiang
5b9c088fb7
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 20:09:37 +08:00
