Turtle
20e51abd4e
feat: rename experimental-meta/-upgrade to meta/upgrade behind --experimental gate
2026-07-31 23:37:53 +08:00
Tianyi Cui
e1c6fc3db4
Merge pull request #1032 from deepseek-harness/xtr/trajectory-timeline-polish
...
fix(trajectory): polish timeline timing and layering
2026-07-31 20:25:08 +08:00
Turtle
60a0bcd358
feat(cli): mark meta and upgrade commands experimental
2026-07-31 20:16:19 +08:00
_Kerman
dd98d15b1d
Merge remote-tracking branch 'github/master' into xtr/trajectory-timeline-polish
...
# Conflicts:
# packages/client/ui-trajectory/src/client/timeline.ts
# packages/client/ui-trajectory/tests/views.spec.tsx
2026-07-31 20:01:16 +08:00
Tianyi Cui
d64b032311
Merge pull request #1082 from deepseek-harness/worktree/fix-web-duplicate-folder-names-20260731
...
fix(workspace): allow same-basename folders in Web
2026-07-31 19:37:38 +08:00
hypatiamay
dcc9e50f84
Merge pull request #1026 from deepseek-harness/feat/compaction-progress-visibility
...
feat(tui): show live compaction progress
2026-07-31 19:17:43 +08:00
Tianyi Cui
678ad97f9a
Allow same-basename Workspace paths
2026-07-31 18:37:34 +08:00
Tianyi Cui
20cb7e7360
Merge latest master into manual compaction
2026-07-31 17:58:30 +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
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
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
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
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
Tianyi Cui
1352c4ecd2
Merge remote-tracking branch 'origin/master' into worktree/pr962-mergeable-20260731
2026-07-31 16:03:36 +08:00
Wenlu Wang
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
Shigma
ea93cf85f1
docs: add cordis paper
2026-07-31 15:54:36 +08:00
imccyu
abc77e707e
Merge remote-tracking branch 'origin/feat/manual-compact-single-lock' into feat/compaction-progress-visibility
2026-07-31 15:51:17 +08:00
imccyu
b2cd3d26da
Merge remote-tracking branch 'origin/fix/web-transcript-projection' into feat/manual-compact-single-lock
2026-07-31 15:50:54 +08:00
imccyu
9ca02b4fc8
Merge remote-tracking branch 'origin/master' into fix/web-transcript-projection
2026-07-31 15:48:26 +08:00
NI0317
ee404357a4
Merge origin/master into codex/sandbox-policy-context
2026-07-31 15:46:42 +08:00
Tianyi Cui
7906c1032f
Merge pinned master into status bar token metrics
2026-07-31 15:41:52 +08:00
Hypatia May
b14c9daed2
Merge branch 'feat/manual-compact-single-lock' into feat/compaction-progress-visibility
2026-07-31 15:37:06 +08:00
Hypatia May
1114a80a45
Merge branch 'fix/web-transcript-projection' into feat/manual-compact-single-lock
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
2026-07-31 15:36:49 +08:00
Hypatia May
d67de808b0
Merge remote-tracking branch 'origin/master' into fix/web-transcript-projection
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 15:32:36 +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
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
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
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