kingwl
4dfbb52106
Merge remote-tracking branch 'origin/master' into codex/fix-tui-diff-context-counts
...
# Conflicts:
# packages/ui/tui/src/components/transcript.ts
2026-07-31 15:27:24 +08:00
kingwl
c08e8d00f7
Merge origin/master into codex/web-default-search
...
# Conflicts:
# apps/web/tests/scaffold.ts
2026-07-31 15:26:29 +08:00
Tianyi Cui
b2146d6298
Merge branch 'master' into pr/adapter-registration-race
2026-07-31 15:24:43 +08:00
Chinesezjc
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
Tianyi Cui
81e5ee7e3e
Merge branch 'master' into pr/adapter-registration-race
2026-07-31 15:22:35 +08:00
NI0317
1beb38554e
fix(review): align runtime-context diagnostics and docs
2026-07-31 15:19:59 +08:00
creatixchu
47b3f082ba
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
2026-07-31 15:04:58 +08:00
NI0317
1b2f05d438
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
2026-07-31 15:04:11 +08:00
NI0317
3da219461c
Merge origin/master into codex/sandbox-policy-context
2026-07-31 15:03:11 +08:00
creatixchu
1a9039cdb4
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
2026-07-31 14:51:31 +08:00
imccyu
95c238a74f
Merge remote-tracking branch 'origin/master' into mergebot/pr1016
2026-07-31 14:51:15 +08:00
imccyu
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
imccyu
4c01550833
Merge remote-tracking branch 'origin/master' into mergebot/pr1016
2026-07-31 14:43:03 +08:00
Chinesezjc
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
Tianyi Cui
57e56915de
Merge latest manual compaction parent into compaction progress
2026-07-31 14:40:12 +08:00
Tianyi Cui
e371311203
Merge latest Web transcript parent into manual compaction
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/runtime/README.i18n.yaml
2026-07-31 14:39:20 +08:00
_Kerman
c2ff9ddec8
fix(agent-loop): scope blocked admission cleanup
2026-07-31 14:35:58 +08:00
imccyu
ec3761f66e
fix: ci
2026-07-31 14:33:39 +08:00
Tianyi Cui
3dc2a449e5
Merge latest master into web transcript projection
2026-07-31 14:32:03 +08:00
Tianyi Cui
5c394b1743
Merge latest master into web transcript projection
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
2026-07-31 14:31:14 +08:00
Chinesezjc
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
imccyu
bff581ffb3
feat(telemetry): anonymous user id from $DSH_HOME/.userid, reported as OTel Resource user.id
...
session-telemetry-otel owns the identity as its own module (src/user-id.ts):
getOrCreateAnonymousUserId() returns the bare UUID line in $DSH_HOME/.userid,
minting a random UUID v4 on first use — synchronous IO with a process-lifetime
memo keyed by resolved path, an exclusive-create (wx) settle for concurrent
first launches, best-effort on read-only homes, and deletion resetting the
identity on the next launch by design.
The backend carries the id as the Resource's user.id (the OTel semconv user
attribute), once per export batch alongside service.name/service.version.
The identity belongs to the OTel feed alone; the dsh-sdk launcher telemetry
keeps its own separate store.
2026-07-31 14:28:03 +08:00
Tianyi Cui
009657dc32
Merge finalized manual compaction parent
2026-07-31 14:20:36 +08:00
Ziya
cbd74eb2ae
Merge branch 'master' into docs/third-party-notices
2026-07-31 02:12:35 -04:00
Tianyi Cui
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
imccyu
5fc2645afc
docs: regenerate the cordis catalog for the archiveSession contract change
2026-07-31 14:08:13 +08:00
imccyu
3b86c288d6
docs: catalogs and Agent Note for the session archive set
2026-07-31 14:08:13 +08:00
Tianyi Cui
74398e87f6
Merge latest master into Web transcript
2026-07-31 14:07:24 +08:00
Ziya
bdf59193d5
Merge branch 'master' into docs/third-party-notices
2026-07-31 01:59:04 -04:00
Tianyi Cui
1a8621527c
docs: refresh event producer graph
2026-07-31 13:49:41 +08:00
Tianyi Cui
da541c10a7
docs: align runtime-context contracts
2026-07-31 13:49:41 +08:00
Tianyi Cui
e088cfa59d
refactor(sandbox-policy): remove capability family registries
2026-07-31 13:49:41 +08:00
Tianyi Cui
7a92f23ad4
Merge finalized manual compaction parent
2026-07-31 13:44:34 +08:00
creatixchu
1f0b5b1ebf
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# apps/web/tests/built-boot.snapshot.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/sessions/conversation.ts
# 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/host/apiproxy/README.i18n.yaml
2026-07-31 13:43:10 +08:00
Tianyi Cui
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
Yichen Jiang
48152a7a1d
merge master and address permission settings review
2026-07-31 13:24:30 +08:00
Tianyi Cui
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
NI0317
c171ce2944
Merge remote-tracking branch 'origin/master' into feature/gui-first-run-welcome
2026-07-31 13:10:06 +08:00
Chinesezjc
59abbb5964
Merge remote-tracking branch 'origin/master' into feat/search-presenter
2026-07-31 13:04:53 +08:00
Tianyi Cui
fbf28700af
Merge master into codex/sandbox-policy-context
...
# Conflicts:
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tsconfig.json
# tsconfig.host.json
2026-07-31 13:04:21 +08:00
Chinesezjc
a2fa8ccbcf
Merge remote-tracking branch 'origin/master' into feat/read-presenter
2026-07-31 13:03:05 +08:00
kingwl
5759c287a2
fix(web): narrow default search review scope
2026-07-31 12:58:50 +08:00
kingwl
81ff2894ca
fix(tui): bound diff rendering work
2026-07-31 12:58:30 +08:00
kingwl
902926c7bb
feat(web): enable default search and fetch
2026-07-31 12:58:06 +08:00
NI0317
85d1c5e2ad
Merge remote-tracking branch 'origin/master' into feature/gui-first-run-welcome
...
# Conflicts:
# packages/client/ui-settings-general/src/client/index.ts
# packages/client/ui-settings-general/src/client/locales.ts
# packages/client/ui-settings-general/tests/apply.spec.ts
# packages/client/ui-settings/README.i18n.yaml
# packages/client/ui-settings/README.md
# packages/client/ui-settings/README.zh.md
# packages/client/ui-settings/src/client/index.ts
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
2026-07-31 12:48:39 +08:00
Yichen Jiang
ee74b5b07a
feat(permission): add new-session default setting
2026-07-31 12:48:19 +08:00
imccyu
5afdb5c235
Merge remote-tracking branch 'origin/master' into mergebot/pr998
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 12:23:03 +08:00
Ziya
a5476afa08
Merge branch 'master' into docs/third-party-notices
2026-07-30 23:57:28 -04:00
Chinesezjc
17bb02190b
fix(fs): regenerate doc graphs and refresh glob-sampling golden after merge
...
The master merge left docs/event-producer-consumer.md stale (regenerated) and
the master-introduced fs-glob-sampling scenario now carries the search-card
`meta` this branch projects from glob (refreshed golden).
2026-07-31 11:50:10 +08:00
Hypatia May
949b9fba8d
feat(tui): add transcript compaction progress marker
2026-07-31 11:46:43 +08:00
kingwl
Tianyi Cui
Chinesezjc
NI0317
creatixchu
imccyu
_Kerman
Ziya
Yichen Jiang
Hypatia May