4e8afe3c8a
Merge remote-tracking branch 'origin/master' into feat/web-cards-toolrow
2026-07-31 16:45:57 +08:00
c263dcdd42
Merge pull request #962 from deepseek-harness/codex/sandbox-policy-context
...
feat(sandbox-policy): expose current file policy to models
2026-07-31 16:39:47 +08:00
25130dfa82
Merge pull request #985 from deepseek-harness/feat/web-read-card
...
feat(web): render read tool output as a line-numbered code card
2026-07-31 16:37:24 +08:00
b2e01e5ba9
test(web-cards): update card specs and snapshots for collapsed ToolRow
...
Rewrite the read/search/web/diff card spec suites for the collapsed-by-default
ToolRow composition: each row now needs the conversation `t`, and the card is
absent from the DOM until the row's [data-expandable] toggle is clicked. Refresh
the built-boot and search-card assembled snapshots (they expand the row before
shaping the card) and the code-mode-round golden. Fix a fixture turn-number
collision the 985/986 merge introduced (grep reused turn 67, already the
multi-hunk edit's, so both shared one callId) by renumbering search/web/todo to
68-72. Document the refactor's behavior in the ui-conversation README (both
languages) and add the Agent Note.
2026-07-31 16:34:16 +08:00
6005fc93ca
Merge remote-tracking branch 'origin/feat/web-search-card' into feat/web-cards-toolrow
2026-07-31 16:05:48 +08:00
1352c4ecd2
Merge remote-tracking branch 'origin/master' into worktree/pr962-mergeable-20260731
2026-07-31 16:03:36 +08:00
9e11f438f3
Merge pull request #1035 from deepseek-harness/codex/web-default-search
...
feat(web): enable default search
2026-07-31 16:01:26 +08:00
810a2a571c
Merge pull request #1022 from deepseek-harness/codex/compact-english-checkpoint
...
fix(compact): stabilize checkpoint language
2026-07-31 15:57:49 +08:00
a285e292c8
Merge origin/master into codex/sandbox-policy-context
2026-07-31 15:57:10 +08:00
a7139b651c
Merge remote-tracking branch 'origin/master' into feat/web-search-card
...
# 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/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.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/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 15:55:40 +08:00
bbb94f18ec
Merge remote-tracking branch 'origin/master' into feat/web-read-card
2026-07-31 15:55:39 +08:00
3ee8b6c1d6
Merge remote-tracking branch 'origin/feat/web-read-card' into feat/web-cards-toolrow
2026-07-31 15:49:31 +08:00
ee404357a4
Merge origin/master into codex/sandbox-policy-context
2026-07-31 15:46:42 +08:00
a3b65f7e9c
Merge branch 'master' into worktree-infdev01
2026-07-31 15:30:42 +08:00
d4250e927c
doc: record the duplicated home-resolution expression and its extraction trigger
2026-07-31 15:27:42 +08:00
c08e8d00f7
Merge origin/master into codex/web-default-search
...
# Conflicts:
# apps/web/tests/scaffold.ts
2026-07-31 15:26:29 +08:00
b2146d6298
Merge branch 'master' into pr/adapter-registration-race
2026-07-31 15:24:43 +08:00
1c58d8daeb
Merge pull request #974 from deepseek-harness/feat/search-presenter
...
feat(fs): add a search render-intent card for grep and glob results
2026-07-31 15:24:22 +08:00
81e5ee7e3e
Merge branch 'master' into pr/adapter-registration-race
2026-07-31 15:22:35 +08:00
1beb38554e
fix(review): align runtime-context diagnostics and docs
2026-07-31 15:19:59 +08:00
fa7ea5c01c
doc: storage-root note tracks the shipped $DSH_HOME/storages overlay anchor
2026-07-31 15:18:02 +08:00
732c9e6d95
fix(tui): release the adapter-registration listener on channel detach
...
Review follow-up: the llm/adapters-updated listener's disposer was
discarded, leaving it firing (harmlessly, behind isDisposed()) between
TUI shutdown and fiber disposal, asymmetric with the sibling channel
listeners. The controller now exposes detach(), and the channel's
detachListeners() calls it on both the dispose() and startup-failure
paths.
2026-07-31 15:11:24 +08:00
1b2f05d438
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
2026-07-31 15:04:11 +08:00
3da219461c
Merge origin/master into codex/sandbox-policy-context
2026-07-31 15:03:11 +08:00
95c238a74f
Merge remote-tracking branch 'origin/master' into mergebot/pr1016
2026-07-31 14:51:15 +08:00
ef01e2e9af
Merge pull request #1046 from deepseek-harness/worktree-infdev01
...
Shared anonymous user id from $DSH_HOME/.userid, reported as OTel Resource user.id
2026-07-31 14:49:00 +08:00
b155051d48
Merge remote-tracking branch 'origin/master' into feat/web-read-card
...
# Conflicts:
# 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/tests/chat-apply.spec.tsx
# packages/client/ui-primitives/src/index.ts
2026-07-31 14:46:41 +08:00
4c01550833
Merge remote-tracking branch 'origin/master' into mergebot/pr1016
2026-07-31 14:43:03 +08:00
62275b6cd6
Merge remote-tracking branch 'origin/master' into feat/search-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
# 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 14:40:29 +08:00
a2c5f7dc0a
Merge remote-tracking branch 'origin/master' into worktree/composer-scroll-sync
2026-07-31 14:32:14 +08:00
538488506f
Merge pull request #973 from deepseek-harness/feat/read-presenter
...
feat(fs): add a read render-intent card for the read tool result
2026-07-31 14:30:31 +08:00
ec5399e074
doc: agent note for the telemetry anonymous user id
2026-07-31 14:28:03 +08:00
22d6b1ed81
Merge remote-tracking branch 'origin/master' into worktree/composer-scroll-sync
2026-07-31 14:26:51 +08:00
86355f5d41
Merge remote-tracking branch 'origin/master' into codex/compact-english-checkpoint
2026-07-31 14:13:42 +08:00
9ed87a6dba
refactor(client): archivedSessionIds public face becomes a plain array
...
Public snapshot state stays in the store engine's plain-data vocabulary
(immer drafts reject Sets without the MapSet plugin, which stays off):
manager/service/contract carry readonly SessionId[] in Host order, and
the tree derivations build their own transient Set — the
expandedProjects pattern. Membership-unchanged installs still keep the
array reference for Object.is short-circuits.
2026-07-31 14:08:13 +08:00
d3e8f17a54
fix: review follow-ups for the session archive set
...
- WorkspaceRegistry.archiveSession no longer wraps persistence-listing
failures as WorkspaceUnknownSessionError: only a definite miss (live
lookup, header index, then a fresh list) maps to session-not-found;
storage faults propagate as internal errors, with a negative test.
- The archived-current sweep moves from the unary path into the
projection: any install path (local echo, another tab's frame, a
reconnect baseline) clears a selection that landed in the archive set.
- An archive set installed while workspace.list is in flight supersedes
the stale baseline's set instead of being rolled back by it.
- The workspace-management e2e anchors the archived row by its session
actions button and asserts the single-stray fixture assumption loudly.
- Drop the stale touchSession rows from the workspace READMEs (the
method was removed with its Agent Note).
2026-07-31 14:08:13 +08:00
3b86c288d6
docs: catalogs and Agent Note for the session archive set
2026-07-31 14:08:13 +08:00
dec1950b6a
Merge remote-tracking branch 'origin/master' into worktree/composer-scroll-sync
2026-07-31 14:07:04 +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
fe7ae124b7
Merge remote-tracking branch 'origin/master' into feat/read-presenter
2026-07-31 13:55:00 +08:00
da541c10a7
docs: align runtime-context contracts
2026-07-31 13:49:41 +08:00
e088cfa59d
refactor(sandbox-policy): remove capability family registries
2026-07-31 13:49:41 +08:00
676fee485a
Merge remote-tracking branch 'origin/master' into worktree/composer-scroll-sync
2026-07-31 13:46:05 +08:00
cff0e5d9a4
Merge master into codex/sandbox-policy-context
2026-07-31 13:45:37 +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
cf4027afe8
Merge remote-tracking branch 'origin/master' into feature/gui-first-run-welcome
...
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
2026-07-31 13:41:17 +08:00
c77932b267
Merge remote-tracking branch 'origin/feat/search-presenter' into feat/web-search-card
...
# 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.module.css
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-conversation/tests/chat-apply.spec.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 13:32:49 +08:00
4535782742
Merge master into codex/sandbox-policy-context
2026-07-31 13:31:13 +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
48152a7a1d
merge master and address permission settings review
2026-07-31 13:24:30 +08:00
Chinesezjc