e4e78e7a31
Merge remote-tracking branch 'origin/master' into mergebot/pr981
2026-07-31 00:22:36 +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
f332ebab16
Merge branch 'master' into worktree/approval-panel-max-height
2026-07-30 23:57:47 +08:00
236fd794f9
Merge branch 'master' into worktree/plan-review-layout
2026-07-30 23:57:20 +08:00
6842a2826f
Merge branch 'master' into worktree/command-row-copy
2026-07-30 23:52:49 +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
7cc784388b
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 23:40:25 +08:00
493c49aeab
Merge pull request #1012 from deepseek-harness/fix/tui-prompt-source-resolution
...
fix(cli): resolve @deepseek-ai/dsh-tui/prompt in the source plane
2026-07-30 23:38:13 +08:00
284ec8095e
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 23:29:15 +08:00
38a7c823d7
Merge branch 'master' into feature/directory-listing-tool
2026-07-30 23:17:12 +08:00
da9f02221e
Merge remote-tracking branch 'origin/master' into worktree-forkweb
2026-07-30 22:53:07 +08:00
233486691f
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 22:42:42 +08:00
16a287d726
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:41:07 +08:00
dc5f270ae2
Merge branch 'master' into codex/queue-collapse
2026-07-30 22:18:44 +08:00
95293e58b6
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 22:14:28 +08:00
b5f5a01dcb
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:14:08 +08:00
f2bbc0f453
Merge branch 'master' into worktree-forkweb
2026-07-30 22:12:50 +08:00
1102cfc1f3
Merge remote-tracking branch 'origin/master' into worktree/plan-review-layout
2026-07-30 22:10:56 +08:00
dea8f31273
Merge branch 'master' into worktree/fix-macos-web-replay
...
# Conflicts:
# .agents/notes/implemented/testing/2026-07-24-web-gui-browser-e2e-lane.i18n.yaml
2026-07-30 22:00:50 +08:00
6f2e8fb6aa
Merge branch 'master' into worktree-forkweb
2026-07-30 21:53:03 +08:00
0670cb5af8
Merge branch 'master' into codex/queue-collapse
2026-07-30 21:51:49 +08:00
97d79e3ee0
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 21:49:33 +08:00
b43e392be7
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
2026-07-30 21:49:30 +08:00
37116d0b0a
test(scripts): gate source-plane resolution of configured plugins
...
verify-cordis-config now requires every configured specifier of a local
workspace package to resolve through the tsconfig.base.json paths facade
to a .ts/.tsx source file. A failed resolution or a .d.ts hit (the exports
fallback into built lib/types) fails the gate, so a missing paths mapping
is a red gate instead of a clean-tree-only startup crash masked by built
trees in CI. Removing the dsh-tui/prompt mapping reproduces the failure.
Agent Note records the decision and alternatives.
2026-07-30 21:47:13 +08:00
a1c8fa06a0
Merge branch 'master' into codex/queue-collapse
2026-07-30 21:46:37 +08:00
26f0dc1aef
Merge branch 'master' into worktree/ci-independent-consumer-build
2026-07-30 21:44:31 +08:00
ddc4adb7a3
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 21:42:30 +08:00
ec9ff784fa
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
2026-07-30 21:41:25 +08:00
99db7e8fc3
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
2026-07-30 21:35:08 +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
2f8f47e500
feat(ui-workspace): flatten session fork rows
2026-07-30 21:28:17 +08:00
36f1489398
fix(web): address session fork review findings
2026-07-30 21:28:13 +08:00
8d864c9549
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 21:22:28 +08:00
81e5eb9800
Merge latest master into worktree-config-settings-seam
2026-07-30 21:21:35 +08:00
6777e4fab9
fix(fs-search): make glob sampling an explicit choice
2026-07-30 21:14:03 +08:00
ec1f08d3ba
Merge branch 'master' into worktree/ci-independent-consumer-build
2026-07-30 21:07:14 +08:00
21e8af2b3a
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
...
# Conflicts:
# packages/fs/tool-fs-search/README.i18n.yaml
# packages/fs/tool-fs-search/README.zh.md
2026-07-30 20:56:27 +08:00
a07f7ab551
Merge branch 'master' into codex/queue-collapse
2026-07-30 20:52:12 +08:00
acca880015
Merge latest origin/master into fix/human-transcript-projection
...
Build-review integration round 2.
2026-07-30 20:51:45 +08:00
bec424b9f3
Merge latest master into worktree-config-settings-seam
2026-07-30 20:51:34 +08:00
c6e06e289e
Merge origin/master into fix/human-transcript-projection
...
Build-review integration round 1.
2026-07-30 20:45:39 +08:00
ff5b65bb62
Merge latest master into worktree-config-settings-seam
...
# Conflicts:
# packages/typert/generator/tests/cordis-catalog-contract.spec.ts
2026-07-30 20:28:25 +08:00
9dc5b4f58d
Merge branch 'master' into codex/queue-collapse
2026-07-30 20:24:12 +08:00
0ea0aef41a
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 20:23:11 +08:00
b6fc6328f3
Merge remote-tracking branch 'origin/master' into feat/directory-picker-quiet-navigation
2026-07-30 20:22:35 +08:00
bdc21717c0
Merge branch 'master' into worktree/fix-macos-web-replay
2026-07-30 20:22:12 +08:00
imccyu