Tianyi Cui
2d3338a03b
Merge latest master into codex/migrate-to-oxlint
2026-07-29 22:39:06 +08:00
Tianyi Cui
e91ef39f5a
fix: preserve lint migration contracts
2026-07-29 22:38:20 +08:00
imccyu
20c446e033
Merge branch 'master' into worktree-renameweb
2026-07-29 22:28:34 +08:00
imccyu
98a23fc88c
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:20:09 +08:00
Tianyi Cui
637c5c9b7b
Merge remote-tracking branch 'origin/master' into worktree/fix-agent-loop-scheduler-quiescence
2026-07-29 22:10:52 +08:00
imccyu
fd356b92c8
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:10:39 +08:00
Tianyi Cui
1a21fc3a06
fix(agent-loop): quiesce scheduler failures
2026-07-29 22:10:26 +08:00
Tianyi Cui
5fb4bd66d7
Merge latest master into codex/migrate-to-oxlint
2026-07-29 22:01:25 +08:00
imccyu
32c3d1e17f
Merge remote-tracking branch 'origin/master' into worktree-renameweb
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/test-runtime/src/sessions.ts
2026-07-29 21:45:29 +08:00
Tianyi Cui
d70cfed4e8
Merge master into fix/subprocess-password-scrub
2026-07-29 21:40:50 +08:00
imccyu
354aeae35a
fix: docs
2026-07-29 21:40:45 +08:00
imccyu
f4bc0a4a86
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:40:28 +08:00
Tianyi Cui
e1984cbfd9
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr885-20260729
2026-07-29 21:40:13 +08:00
Tianyi Cui
a5446e3160
Merge master into fix/subprocess-password-scrub
...
# Conflicts:
# packages/lsp/lsp-local/README.i18n.yaml
# packages/subprocess/subprocess-local/README.i18n.yaml
# packages/subprocess/subprocess-local/README.zh.md
2026-07-29 21:38:24 +08:00
Tianyi Cui
32aaa8983e
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr885-20260729
...
# Conflicts:
# docs/development.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-primitives/src/markdown/CodeBlock.tsx
# scripts/snapshots/translation-prompt-v4/request-response.expected.json
2026-07-29 21:37:43 +08:00
imccyu
f2aa63f756
Merge branch 'master' into worktree-renameweb
2026-07-29 21:25:14 +08:00
imccyu
76b4563380
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:23:13 +08:00
imccyu
bf8db964d4
Merge branch 'master' into xtr/trajectory-inspection-ui
2026-07-29 21:20:38 +08:00
imccyu
8dca750c8e
Merge branch 'master' into trajectory-history-source
2026-07-29 21:12:31 +08:00
Tianyi Cui
4926fa18ec
Merge commit 'refs/codex/pr758/live-master' into HEAD
2026-07-29 21:01:55 +08:00
imccyu
6e8ad4b382
Merge remote-tracking branch 'origin/master' into worktree-renameweb
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.zh.md
# packages/session-title/session-title/README.i18n.yaml
# packages/session-title/session-title/README.zh.md
2026-07-29 20:58:22 +08:00
imccyu
b23c3d596a
Merge remote-tracking branch 'origin/master' into trajectory-history-source
2026-07-29 20:58:04 +08:00
Tianyi Cui
b060b6f5f6
Merge commit 'refs/codex/pr758/master' into HEAD
...
# Conflicts:
# packages/context/README.i18n.yaml
# packages/context/README.zh.md
2026-07-29 20:55:09 +08:00
Tianyi Cui
4368c2d40c
Merge branch 'master' into fix/translation-brief-uncommitted-pair
2026-07-29 20:54:30 +08:00
Yif
e8c265a337
docs: regenerate cordis catalog and doc graphs for shifted source lines
2026-07-29 20:46:30 +08:00
imccyu
37a75aa85e
docs: regenerate catalogs for the rename JSDoc and invariant companion
...
gen-cordis-catalog/gen-cordis-api pick up the SessionTitleService rename
JSDoc and line shifts; gen-doc-graphs picks up the session-title invariant
companion's session/event edge.
2026-07-29 20:20:27 +08:00
imccyu
c8374e916f
fix(session-title): typed rename rejection, provenance invariant, contract docs
...
SessionTitleInvalidError narrows the one rename failure that blames the
input; the fallback-unpin append extracts to appendFallback beside
ensureFallback's guarded twin; a deferred-provider test proves rename
supersedes ACTIVE generation; the invariant companion enforces
messageSeqs-empty iff user-source on every appended session/title event
(tsconfig gains the session-title invariant path); SessionTitleEventData
field docs state the third source kind and the empty-seqs rule, mirrored
into the bilingual core-data-structures page; the note qualifies the
refresh unpin as conditional on a derivable replacement.
2026-07-29 20:10:42 +08:00
imccyu
a6eba044b2
docs: regenerate cordis catalog for the shifted session-title source line
...
gen-cordis-catalog embeds source line anchors; the switch extraction and the
ignore annotation moved SessionTitleService, so the services page was stale
against the committed code.
2026-07-29 19:09:31 +08:00
imccyu
abbcacf42a
feat(session-title): user rename pins the title against automatic generation
...
sessionTitle.rename appends a user-source session/title event; onUserMessage
skips scheduling while a user title stands, and an explicit refresh is the
deliberate unpin (provider regeneration, or a re-derived fallback when no
provider is registered).
2026-07-29 18:59:09 +08:00
j-xiang
ed4a6fd026
docs(i18n): address automated review
2026-07-29 17:46:06 +08:00
_Kerman
859452d807
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
...
# Conflicts:
# 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/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
# packages/client/runtime/src/client/contract/session.ts
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 17:31:33 +08:00
j-xiang
94b2862e12
Merge remote-tracking branch 'origin/master' into xjt/readme-proofreading-batch-1
2026-07-29 15:47:00 +08:00
j-xiang
599e6edc87
docs(i18n): record proofread README pairs
2026-07-29 15:30:44 +08:00
j-xiang
333b4bcd30
docs(i18n): proofread README translations 1-20
2026-07-29 15:29:24 +08:00
j-xiang
46e1e86c76
docs(i18n): bind reviewed README terminology
2026-07-29 15:29:03 +08:00
imccyu
4da1026956
Merge branch 'master' into xtr/dsh-source-launch-tsx-esm
2026-07-29 15:29:00 +08:00
Tianyi Cui
2e7ac0d7f2
Merge branch 'master' into agent/fix-copied-worktree-hooks
2026-07-29 14:55:36 +08:00
Turtle
711efc0a8e
Merge remote-tracking branch 'origin/master' into codex/migrate-to-oxlint
2026-07-29 14:32:21 +08:00
Turtle
95a995968b
refactor: migrate linting to Oxlint
2026-07-29 14:32:11 +08:00
kingwl
d0393106cc
docs: regenerate module graph for the dsh-llm declarations
...
verify-module-graph caught that the plan-mode/tool-tasks dependency fix
was not reflected in the generated graph.
2026-07-29 13:51:57 +08:00
Hypatia May
173a1a8319
fix(dev-infra): migrate copied worktree hooks
2026-07-29 13:38:55 +08:00
imccyu
5c432955ed
Merge remote-tracking branch 'origin/master' into web-permission-sandbox-merge-master
2026-07-29 11:16:49 +08:00
_Kerman
69aa58d31b
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
2026-07-29 11:14:05 +08:00
Turtle
44a657c149
fix(tmux-context): contain executor rejection as a warning, correct suppression claim
...
Review round on #758 .
bash.run() only promises to resolve for nonzero exits, timeouts, and aborts,
and bash.resolve() can reject on policy grounds, so either could escape the
serial agent/step listener and abort the model turn — contradicting the
plugin's documented failed-query no-op contract. Contain both and log a
warning instead; the location is optional context.
The Agent Note claimed an unchanged location suppresses the query. It does
not: only the interval floor is checked before the query, while change
suppression compares state the query returned. Corrected in both languages
and re-recorded the i18n pairs.
2026-07-29 11:11:17 +08:00
imccyu
8d0249d392
Merge branch 'feat/directory-picker' into feat/workspace-directory-browser
2026-07-29 10:42:19 +08:00
imccyu
ecc447daf5
Merge branch 'doc/host-client-group-readmes' into feat/directory-picker
2026-07-29 10:42:13 +08:00
imccyu
fa64ad39cb
Merge branch 'master' into doc/host-client-group-readmes
2026-07-29 10:42:00 +08:00
ZiyaZhang
2630de8bd6
Merge remote-tracking branch 'upstream/master' into fix/subprocess-password-scrub
...
# Conflicts:
# docs/module-graph.md
2026-07-28 19:14:40 -07:00
Turtle
d0548e0ac9
docs: regenerate TUI catalogs
2026-07-29 10:01:39 +08:00
_Kerman
c60d3f2aaa
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
...
# Conflicts:
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
2026-07-29 09:48:24 +08:00
