a1b0e97162
Merge remote-tracking branch 'origin/master' into worktree-session-hover-menu-fix
2026-07-31 17:32:52 +08:00
6cab262f00
Merge commit 'refs/codex/pr956/master-live' into worktree/retarget-pr956-current-20260731
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.zh.md
2026-07-31 17:25:49 +08:00
4e3d059dd4
Merge remote-tracking branch 'origin/master' into worktree/locale-browser-default
2026-07-31 17:23:39 +08:00
885f1ed1ac
refactor(config): centralize DSH home paths
2026-07-31 16:49:55 +08:00
0c9e529f74
feat(tui): hidden mode folds a turn's assistant steps into one message
...
The Ctrl+O hidden phase keeps one Assistant header per turn: the first
step with visible text/reasoning owns it, later steps render as
headerless continuations, and bodiless (tool-only) steps render
nothing. Leaving hidden restores per-step headers. Pure TUI
presentation; the session log is unchanged.
2026-07-31 16:12:05 +08:00
7906c1032f
Merge pinned master into status bar token metrics
2026-07-31 15:41:52 +08:00
8714952c85
feat(web): copy values from hover cards
2026-07-31 15:38:22 +08:00
cb754a0319
feat(locale): derive the initial Settings language from the browser
...
A first visit resolved to Chinese regardless of the browser: LocaleService
read `dsh.locale` and fell straight back to `zh` when nothing was stored,
ignoring the languages the browser already states it reads.
The initial locale now resolves through three ordered sources — the persisted
preference, then `navigator` (first entry of the ordered language list whose
primary subtag names a shipped locale, so `zh-Hans-CN` -> zh and `en-GB` ->
en), then `FALLBACK_LOCALE`. An explicit choice still wins and nothing writes
the detected locale back to storage, so "has the user chosen?" stays a
question only the stored value answers.
Specs asserting the shipped Chinese copy now state the browser they assume:
the web e2e scenarios open their page with `locale: ZH_BROWSER_LOCALE`, and
package specs pin it through the new `pinBrowserLanguages` test helper.
`settings-chrome.e2e.ts` gains an English-browser scenario as the
assembled-app proof.
2026-07-31 15:26:46 +08:00
935578ed98
feat(web): accept K and M suffixes in the context window field
...
The catalog's context window is now a text field that reads a decimal K or M
suffix — 1M is 1000K, matching how model capacities are quoted — and stores
the plain token count, so settings.yaml and the adapter are unchanged.
A stored count reads back in the shortest form that round-trips: 1000000 as
1M, 256000 as 256K, and 131072 written out, because it is not a whole number
of thousands. The field holds the typed text while its row has focus, since
re-deriving it from the parsed count on every keystroke would rewrite 1000
to 1K mid-word; text that does not parse stays on screen so the save-time
rejection names a row the user can still see and correct.
2026-07-31 14:36:16 +08:00
2701862bf1
Merge remote-tracking branch 'origin/master' into worktree/custom-deepseek-models
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-30-web-config-plane.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-30-web-config-plane.md
# .agents/notes/implemented/architecture/2026-07-30-web-config-plane.zh.md
# apps/web/tests/snapshots/message-actions/ui.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# 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/ModelsSection.module.css
# packages/client/ui-models/src/client/ModelsSection.tsx
# packages/client/ui-models/tests/components.spec.tsx
# packages/host/apiproxy/README.i18n.yaml
2026-07-31 14:36:00 +08:00
6a31f5bf2a
Merge finalized Web transcript parent
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-30-session-end-seed-log-boundary.i18n.yaml
2026-07-31 14:11:40 +08:00
a332f2f333
feat(web): configure custom DeepSeek models
2026-07-31 14:08:59 +08:00
74398e87f6
Merge latest master into Web transcript
2026-07-31 14:07:24 +08:00
6acdb6631d
Merge pull request #1036 from deepseek-harness/worktree/permission-default-settings
...
feat(permission): configure new-session defaults in Web settings
2026-07-31 14:05:00 +08:00
0592da73ea
Merge finalized Web transcript parent
2026-07-31 13:56:32 +08:00
bb3c0d127d
Merge latest master into Web transcript
2026-07-31 13:50:34 +08:00
75f2489ba1
Merge pull request #1031 from deepseek-harness/worktree/fix-models-settings
...
fix(web): improve Models settings presentation and safety
2026-07-31 13:44:11 +08:00
98f48fd83a
Merge finalized Web transcript parent
...
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-trajectory/README.i18n.yaml
# packages/client/ui-trajectory/README.zh.md
2026-07-31 13:42:47 +08:00
cb60e1759a
Merge remote-tracking branch 'origin/master' into worktree/permission-default-settings
...
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
2026-07-31 13:27:43 +08:00
378c3ac364
Merge latest master into Web transcript
2026-07-31 13:24:51 +08:00
48152a7a1d
merge master and address permission settings review
2026-07-31 13:24:30 +08:00
9aa867b6ea
Merge branch 'master' into fix/command-execute-transport-timeout
2026-07-31 13:18:12 +08:00
bb3d6a0de8
Merge latest master into Web transcript
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/index.ts
# packages/client/runtime/src/client/sessions/conversation.ts
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.module.css
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/chat/chat-flow.ts
# packages/client/ui-conversation/tests/chat-branch-tails.spec.tsx
2026-07-31 13:12:37 +08:00
322950487e
fix(apiproxy): let commands outlive unary deadline
2026-07-31 11:51:49 +08:00
8405e86c2e
Merge updated master into Web transcript
2026-07-31 11:41:11 +08:00
dafdf4a852
Merge newer master into status bar token metrics
2026-07-31 11:40:06 +08:00
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
ef722cc14a
Merge latest master into Web transcript
2026-07-31 11:39:49 +08:00
ba66ade9f4
Merge latest master into status bar token metrics
2026-07-31 11:36:11 +08:00
049e64b002
Merge remote-tracking branch 'origin/master' into worktree/fix-models-settings
2026-07-31 11:32:17 +08:00
788b9eb986
fix(web): hide provider liveness badges
2026-07-31 11:32:10 +08:00
a632934ad7
Merge branch 'master' into worktree/pr884-simplify
2026-07-31 11:19:00 +08:00
61edbe400f
Merge remote-tracking branch 'origin/master' into worktree/fix-models-settings
2026-07-31 11:14:25 +08:00
311aca3663
fix(web): improve models settings safety and contrast
2026-07-31 11:14:07 +08:00
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
e9096c891c
Merge latest master into worktree/pr884-simplify
2026-07-31 11:00:07 +08:00
3a99cf7446
Merge current master into status bar projection
2026-07-31 10:56:34 +08:00
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
7a463dbe44
Merge branch 'master' of https://github.com/deepseek-harness/deepseek-harness into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-17-dedicated-full-screen-tui-front-door.i18n.yaml
# docs/architecture.i18n.yaml
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/core.md
# docs/core-data-structures/core.zh.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/llm-streaming.md
# docs/core-data-structures/llm-streaming.zh.md
# docs/core-data-structures/session.i18n.yaml
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent-loop/src/agent.ts
# packages/core/agent/README.i18n.yaml
# packages/core/session/README.i18n.yaml
# packages/core/session/src/types.ts
# packages/llm/llm/README.i18n.yaml
# packages/llm/llm/README.md
# packages/llm/llm/README.zh.md
# packages/llm/llm/src/index.ts
# packages/llm/llm/tests/service.spec.ts
# packages/sdk/sdk-client/README.i18n.yaml
# packages/sdk/sdk-protocol/README.i18n.yaml
# packages/sdk/sdk-protocol/README.md
# packages/sdk/sdk-protocol/README.zh.md
# packages/subagent/subagent-dsh-sdk/README.i18n.yaml
# packages/ui/jsonrpc/README.i18n.yaml
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/README.zh.md
# packages/ui/tui/src/index.ts
# python/sdk/README.i18n.yaml
# scripts/gen-cordis-catalog.ts
2026-07-31 10:16:14 +08:00
01e64c6350
Merge finalized Web transcript parent
2026-07-31 09:46:32 +08:00
ff8c5600f4
Merge pinned master into status bar projection
2026-07-31 09:28:52 +08:00
074f0e4393
Merge pinned master into Web transcript
2026-07-31 09:18:45 +08:00
9433259f05
Merge remote-tracking branch 'origin/master' into mergebot/pr1005
...
# Conflicts:
# docs/module-graph.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-plan/README.i18n.yaml
# packages/client/ui-plan/README.md
# packages/client/ui-plan/README.zh.md
# packages/client/ui-plan/src/client/PlanModeControl.tsx
# packages/client/ui-plan/src/client/index.ts
# packages/client/ui-plan/tests/browser-plugin.spec.ts
# packages/client/ui-plan/tests/plan-mode-control.spec.tsx
2026-07-31 03:47:24 +08:00
05d73d6571
fix(app-boot): await only failed activation fibers
2026-07-31 03:20:20 +08:00
c92a6c3b76
fix(app-boot): preserve published loader composition
2026-07-31 03:20:20 +08:00
296cb1c35f
fix: app-boot report plugin error detail
2026-07-31 03:02:45 +08:00
4517aa349c
fix: client module loader report package resolve info
2026-07-31 03:02:45 +08:00
1e10966ef6
wip
...
fix: docs
2026-07-31 02:13:53 +08:00
4e7e99d748
Merge remote-tracking branch 'origin/master' into mergebot/pr1005
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 01:58:09 +08:00
464a57d3ca
Merge commit 'refs/codex/pr1006/master' into worktree/pr1006-merge-20260731
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/headless-agent/cordis.yml
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/README.zh.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-deepseek/src/index.ts
# packages/llm/llm-deepseek/tests/adapter.spec.ts
# packages/llm/llm/README.i18n.yaml
# packages/llm/llm/README.md
# packages/llm/llm/README.zh.md
# packages/subagent/subagent-dsh-sdk/README.i18n.yaml
# packages/ui/jsonrpc/README.i18n.yaml
2026-07-31 01:55:19 +08:00
creatixchu