ce3a75ecca
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
2026-07-31 00:21:49 +08:00
bf4ff3a696
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 09:20:43 -07:00
bbba57159d
test(web): include policy context in plan review
2026-07-31 00:14:49 +08:00
db24140dad
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
2026-07-31 00:10:48 +08:00
edefdd96b9
Merge remote-tracking branch 'origin/master' into codex/new-task
2026-07-31 00:10:46 +08:00
39072f8c58
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-31 00:07:11 +08:00
307fea8ae9
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
2026-07-31 00:06:29 +08:00
95242698e0
Merge branch 'master' into worktree/command-row-copy
2026-07-31 00:06:04 +08:00
bf11016bc1
Merge remote-tracking branch 'origin/master' into worktree/approval-panel-max-height
2026-07-31 00:05:48 +08:00
f93b134c44
fix: tests
2026-07-31 00:04:45 +08:00
fe59dd3530
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
...
# Conflicts:
# apps/web/tests/scaffold.ts
2026-07-31 00:01:28 +08:00
4ef128cd50
test(web): drop the host-skill context row from the conversation goldens
...
These goldens were recorded on a machine with personal skills under ~/.dsh and
~/.agents, so every one of them pinned a context-injection row a clean runner
cannot produce — which is why the browser lane failed on CI and passed
locally. master's scaffold fix confines skill-local's host-level roots to the
temp world; re-recording against it removes the row and nothing else.
seeded-history keeps its row: that scenario seeds the event itself.
2026-07-31 00:00:31 +08:00
c6c0f5de6a
Merge branch 'master' into worktree/approval-panel-max-height
2026-07-30 23:49:19 +08:00
7c086e40be
Merge branch 'master' into worktree/plan-review-layout
2026-07-30 23:48:19 +08:00
5c4398c96c
Merge branch 'master' into worktree/command-row-copy
2026-07-30 23:45:49 +08:00
57845e02ee
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 23:44:32 +08:00
129ded523c
test(web): keep policy snapshots host-independent
2026-07-30 23:34:14 +08:00
b05b0a80fd
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 23:33:14 +08:00
8c0d626cd5
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
...
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
2026-07-30 23:32:31 +08:00
831d9c4ae3
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
2026-07-30 23:18:05 +08:00
e61054c4d1
test(sandbox-policy): refresh durable context snapshots
2026-07-30 23:17:33 +08:00
d2521a7e61
test(web): refresh queue collapse access golden
2026-07-30 08:09:59 -07:00
04f8b30db1
fix(web): make the welcome notice scan-first
2026-07-30 22:58:52 +08:00
da9f02221e
Merge remote-tracking branch 'origin/master' into worktree-forkweb
2026-07-30 22:53:07 +08:00
b86ce10741
Merge Web queue collapse from master
2026-07-30 22:50:09 +08:00
c2940f620e
Merge Web queue collapse from master
2026-07-30 22:48:45 +08:00
fa67427c39
Merge remote-tracking branch 'origin/master' into feat/gui-full-access-confirmation
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 07:48:33 -07:00
e5ec7e2b64
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
2026-07-30 22:42:52 +08:00
1986de9ac1
fix(web): show plan status only while active
2026-07-30 22:42:25 +08:00
e830ed7939
fix(web-search-card): surface truncation recovery, widen cardless fallback, validate wire shape, fix tail-cap
...
Address the ds-review-bot findings on the search card:
- searchCardModel dropped the result view's `content`, so a capped search's
`Full … stored at: <locator>` recovery footer vanished from the UI (the card
replaces the raw text). Thread it through as `SearchCardModel.recovery` and
render it below the card at all three sites, only when truncated.
- SearchRow's fallback body was gated on `state === 'error'`, so a settled
non-error call with no card (a successful nested run_code sub-dispatch, a
legacy generic result) showed only its summary with content lost. Widen it to
any settled call with `search === null`.
- searchCardModel trusted the `files`/`paths` shape the host wire schema only
string-checks; a malformed known-kind frame would crash SearchBlock. Validate
the full shape and fall to the generic path on mismatch.
- SearchBlock's restored tail file header added a row without consuming a tail
slot, exceeding maxLines by one and overstating the hidden count. Make it
consume a slot so the visible count holds at maxLines and `hidden` stays exact.
Correct the fixture JSDoc (now genuinely exceeds the row cap) and the Agent Note
recovery-text claim, sync the ui-conversation bilingual README with the search
row, and add an assembled keyless snapshot (apps/web/tests/search-card.snapshot.ts)
that pins the grep card's shape from the built bundles.
2026-07-30 22:40:07 +08:00
7d97418d42
test(web): refresh code-mode-round golden for read error state
...
The nested read of a missing file surfaces its error state as 失败 in the
code-dispatch row summary, a consequence of this PR's read-card error
presentation. The golden predated it (never re-recorded while the PR was
conflicting); refreshed keyless via DSH_SNAPSHOT=refresh over the existing
session.jsonl.
2026-07-30 22:33:03 +08:00
afe26c27ab
test(sandbox-policy): refresh merged web evidence
2026-07-30 22:24:07 +08:00
c311400945
Merge updated DeepSeek onboarding base
...
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
2026-07-30 22:19:31 +08:00
bef8db3add
feat(web): add versioned first-run welcome
2026-07-30 22:17:56 +08:00
1a4349be88
test(sandbox-policy): record cache-safe policy context
2026-07-30 22:15:34 +08:00
1102cfc1f3
Merge remote-tracking branch 'origin/master' into worktree/plan-review-layout
2026-07-30 22:10:56 +08:00
e5d7fa4cef
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 21:52:25 +08:00
5b29d04c21
test(web): re-record the goldens for master's context-injection disclosure
...
Merging master swapped the plain "▸ 上下文注入" button for the shared
DisclosureRow, which every conversation golden carrying an injected-context
row renders. The only change in all twelve files is that row.
2026-07-30 21:40:34 +08:00
3b370549a1
feat(client): increment forked session titles
2026-07-30 21:28:17 +08:00
213de9a737
feat(ui-conversation): wire assistant session forks
2026-07-30 21:28:17 +08:00
7d27c92851
test(web): cover row fork in the real app
2026-07-30 21:28:16 +08:00
36f1489398
fix(web): address session fork review findings
2026-07-30 21:28:13 +08:00
7022ab4a75
Merge worktree-llm-dynamic-config (884) into worktree-llm-web-config
2026-07-30 21:19:17 +08:00
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
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
6d416b06c5
fix(client): gate every full access picker
2026-07-30 05:48:33 -07:00
7da7d5784d
Open command menu from composer plus button
2026-07-30 20:42:48 +08:00
d67b80f2fd
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 20:27:47 +08:00
d704a2b782
fix: ci
2026-07-30 20:19:42 +08:00
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
Yichen Jiang