Tianyi Cui
20cb7e7360
Merge latest master into manual compaction
2026-07-31 17:58:30 +08:00
creatixchu
be7bf9d426
doc(agent-notes): record the blank-session settling exemption
2026-07-31 17:57:13 +08:00
Tianyi Cui
6e26f9fd83
Merge latest master into manual compaction
...
# Conflicts:
# apps/cli/README.i18n.yaml
# docs/architecture.i18n.yaml
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/compact/compact-basic/README.i18n.yaml
# packages/pty/pty-local/tests/index.spec.ts
2026-07-31 17:57:11 +08:00
Tianyi Cui
43a1c0bd8f
Merge branch 'master' into worktree/core-web-minimal-profile
2026-07-31 17:57:09 +08:00
creatixchu
31e467e744
Merge remote-tracking branch 'origin/master' into worktree-session-hover-menu-fix
...
# Conflicts:
# apps/web/tests/workspace-management.e2e.ts
# packages/client/ui-workspace/README.i18n.yaml
2026-07-31 17:56:06 +08:00
Chinesezjc
bcb474d13e
Merge pull request #1066 from deepseek-harness/feat/web-cards-toolrow
...
refactor(web): collapse every card tool row through one ToolRow
2026-07-31 17:54:38 +08:00
Tianyi Cui
d03927f69b
Merge branch 'master' into worktree/core-web-minimal-profile
2026-07-31 17:52:08 +08:00
Ziya
4814008ca0
Merge pull request #948 from deepseek-harness/docs/third-party-notices
...
docs: add THIRD_PARTY_NOTICES.md disclosing third-party dependencies
2026-07-31 05:51:57 -04:00
Tianyi Cui
a3905519fb
Merge pull request #1068 from deepseek-harness/codex/dsh-home-path
...
refactor(config): centralize DSH home paths
2026-07-31 17:50:41 +08:00
Tianyi Cui
c77f889a2a
Merge branch 'master' into worktree/core-web-minimal-profile
...
# Conflicts:
# apps/cli/README.i18n.yaml
2026-07-31 17:50:21 +08:00
NI0317
c4d88bc25e
Merge latest origin/master into feature/tui-first-run-welcome
...
# Conflicts:
# apps/cli/README.i18n.yaml
2026-07-31 17:49:03 +08:00
NI0317
346d1e4c74
fix(tui): address onboarding review feedback
2026-07-31 17:47:07 +08:00
NI0317
d558cb4fd4
feat(cli): even out the shipped tool rosters across both surfaces
...
The two shipped surfaces offered different tools for no recorded reason:
session checkpoints, tool-result pruning, the goal tools, and Ralph were in
`tui.cordis.yml`; `tool-todo` and web search were in `web.cordis.yml`. Neither
offered session search, a string-replacement editor, or a repeat-tool guard,
though none of the three is surface-specific.
Move the rows that are not surface-specific into `base.cordis.yml` and add
those three. Web search moves there too — the TUI decision the change that
made it a Web default deferred. Both surfaces now assemble the same 27 tools.
This adds only. No row is removed from either surface and no existing row's
configuration is edited: executors, sandbox composition, access defaults,
`tools.mode`, and the workflow tool are exactly what they were. Two rows stay
surface-specific: `tmux-context` (no terminal multiplexer in a browser) and
`session-reference` (its index has one writer owner).
Ship `dsh-mcp-client` as a dependency without a row: the plugin mounts one
server per instance and `command` is required, so a default would name a
third-party server and spawn it outside `ctx.bash` on every launch. The CLI
README carries the YAML for mounting one from a personal config.
2026-07-31 17:45:49 +08:00
Chinesezjc
0be76f5552
Merge remote-tracking branch 'origin/master' into feat/web-cards-toolrow
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 17:45:31 +08:00
Tianyi Cui
2692d2fef7
Merge commit 'refs/codex/pr948/master-current' into worktree/retarget-pr948-current-20260731
...
# Conflicts:
# README.i18n.yaml
# scripts/snapshots/translation-prompt-v4/request-response.expected.json
2026-07-31 17:44:13 +08:00
Turtle
ef201014d0
Merge remote-tracking branch 'origin/master' into codex/dsh-home-path
...
# Conflicts:
# packages/ui/app-boot/README.i18n.yaml
# packages/ui/app-boot/README.md
# packages/ui/app-boot/README.zh.md
# packages/ui/app-boot/src/index.ts
2026-07-31 17:40:48 +08:00
creatixchu
44117cb8f7
Merge remote-tracking branch 'origin/master' into worktree-session-hover-menu-fix
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-30-client-locale-full-rollout.i18n.yaml
2026-07-31 17:39:51 +08:00
Chinesezjc
b93120a280
Merge remote-tracking branch 'origin/master' into feat/web-cards-toolrow
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-conversation/src/client/toolviews/file-mutation-row.tsx
# packages/client/ui-conversation/src/client/toolviews/search-row.tsx
# packages/client/ui-conversation/tests/chat-apply.spec.tsx
# packages/client/ui-primitives/src/index.ts
2026-07-31 17:38:17 +08:00
ZiyaZhang
dc7f3253f6
fix(examples): keep memory configs provider-owned
2026-07-31 02:34:52 -07:00
creatixchu
5ffe1001ae
Merge remote-tracking branch 'origin/master' into worktree/unify-workspace-add
2026-07-31 17:33:19 +08:00
CreatixChu
aba776b179
Merge pull request #1056 from deepseek-harness/worktree/locale-browser-default
...
feat(web): open a fresh browser in the language it asks for
2026-07-31 17:32:52 +08:00
creatixchu
a1b0e97162
Merge remote-tracking branch 'origin/master' into worktree-session-hover-menu-fix
2026-07-31 17:32:52 +08:00
hypatiamay
23766cd34d
Merge pull request #956 from deepseek-harness/fix/web-transcript-projection
...
fix(web): project the human transcript from append-origin events
2026-07-31 17:32:21 +08:00
Tianyi Cui
5210afb8f0
Merge pull request #1055 from deepseek-harness/feature/gui-welcome-copy-v2
...
feat(web): update the versioned internal testing notice
2026-07-31 17:30:44 +08:00
creatixchu
c029f03516
fix(web): reveal the caret when a persisted draft arrives after mount
...
ConversationSession seeds a stored draft in its own mount effect, and a parent's mount effect runs after its children's — so the unlock effect measured an empty mirror and never ran again for the draft that then appeared, leaving a restored long draft showing its head with the caret at its end. The effect now depends on the draft being non-empty; clearing on send and typing the first character flip it too, where both the focus and the reveal are no-ops. Pre-existing (the old geometry did not scroll for a programmatic value change either), fixed here because the reveal now exists.
Also from review: the golden's paste goes back to a block NOT ending in a newline, so the collapsed branch keeps a real engine under it while the standalone case owns the after-newline branch; the shared line-height rule names the reveal as its third consumer.
2026-07-31 17:26:29 +08:00
Tianyi Cui
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
creatixchu
f566ed66a2
Merge remote-tracking branch 'origin/master' into worktree/unify-workspace-add
2026-07-31 17:25:12 +08:00
creatixchu
4e3d059dd4
Merge remote-tracking branch 'origin/master' into worktree/locale-browser-default
2026-07-31 17:23:39 +08:00
Tianyi Cui
ab6d77a12d
Merge remote-tracking branch 'origin/master' into fix/web-transcript-projection
...
# Conflicts:
# apps/web/tests/queue-actions.e2e.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
2026-07-31 17:17:00 +08:00
creatixchu
8b5c3946da
docs: keep the approval-panel cap note current with the composer's scrollport
...
This PR moved the 14-line cap declaration off the auto-grow mirror and onto the box that scrolls the draft, and retargeted the approval scenario's cap probe from the textarea to that box. The sibling note stated both as they were; implemented notes have to state what shipped, in the change that ships it.
2026-07-31 17:15:47 +08:00
NI0317
9f1d9196eb
Merge remote-tracking branch 'origin/master' into feature/gui-welcome-copy-v2
2026-07-31 17:11:41 +08:00
creatixchu
8f67db4676
Merge remote-tracking branch 'origin/master' into worktree/locale-browser-default
2026-07-31 17:11:05 +08:00
Hypatia May
e5232adcf3
Merge remote-tracking branch 'origin/master' into worktree/pr799-merge-20260731-final
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 17:10:25 +08:00
creatixchu
e25683b26d
Merge remote-tracking branch 'origin/master' into worktree-session-hover-menu-fix
...
# Conflicts:
# packages/client/ui-primitives/README.i18n.yaml
2026-07-31 17:09:44 +08:00
Chinesezjc
c6b770e681
Merge pull request #986 from deepseek-harness/feat/web-search-card
...
feat(web): render grep/glob output as a search card
2026-07-31 17:07:21 +08:00
imccyu
499a6e9c85
Merge pull request #1028 from deepseek-harness/pr/dump-config
...
feat(cli): dsh --dump-config / --dump-default-config print the composed config tree
2026-07-31 17:06:55 +08:00
NI0317
978f61f9e7
docs(onboarding): document telemetry opt-out
2026-07-31 17:05:30 +08:00
creatixchu
1008ca865b
fix(web): reveal a caret that sits after a newline, where the engines disagree
...
A caret straight after a newline is on a line with nothing to measure — the shape a trailing-newline draft ends in. chromium returns no client rects at all for the collapsed position (an all-zero box, which sent the reveal upward instead), firefox reports the line above, WebKit the right one. Measure the newline the caret just left and step one line down: all three then land on 649 of 652 with the caret's line at 315 inside the 336px box. The browser case now pastes a newline-terminated block, and fails 'expected 0 to be greater than 0' without the rule.
2026-07-31 17:03:55 +08:00
Hypatia May
1974825381
Merge remote-tracking branch 'origin/master' into worktree/pr799-merge-20260731-final
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 17:02:46 +08:00
Chinesezjc
b38677d41f
Merge remote-tracking branch 'origin/master' into feat/web-search-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 17:01:53 +08:00
creatixchu
541c633c9a
Merge remote-tracking branch 'origin/master' into worktree/locale-browser-default
2026-07-31 17:01:11 +08:00
ZiyaZhang
7e929d3d50
feat(examples): add generic memory MCP overlays
2026-07-31 02:00:14 -07:00
Hypatia May
a23a6bdd15
Merge origin/master into codex/status-bar-token-metrics
...
Resolve the agent-loop import conflict by retaining both durable request context and runtime policy context. Refresh the combined session fixtures and regenerate documentation catalogs. Mark PDF artifacts as binary so staged whitespace checks do not parse PDF bytes as text.
2026-07-31 16:53:03 +08:00
creatixchu
0afa3af1d5
Merge remote-tracking branch 'origin/master' into worktree-session-hover-menu-fix
2026-07-31 16:51:10 +08:00
creatixchu
637c0c3113
Merge remote-tracking branch 'origin/master' into worktree/unify-workspace-add
2026-07-31 16:50:14 +08:00
Turtle
885f1ed1ac
refactor(config): centralize DSH home paths
2026-07-31 16:49:55 +08:00
creatixchu
970b81e485
Merge remote-tracking branch 'origin/master' into worktree/locale-browser-default
2026-07-31 16:49:33 +08:00
Chinesezjc
20b9cd6b36
Merge remote-tracking branch 'origin/master' into feat/web-search-card
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.module.css
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-conversation/tests/chat-apply.spec.tsx
# packages/client/ui-primitives/src/index.ts
2026-07-31 16:49:20 +08:00
creatixchu
6ac8383723
Merge remote-tracking branch 'origin/master' into worktree/hide-message-edit
...
# 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/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/loading.expected.md
# apps/web/tests/snapshots/live-interactions/retry.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/steering/mid-steer.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# apps/web/tests/snapshots/web-search-round/ui.expected.md
2026-07-31 16:47:09 +08:00
Chinesezjc
4e8afe3c8a
Merge remote-tracking branch 'origin/master' into feat/web-cards-toolrow
2026-07-31 16:45:57 +08:00