b0ee207a2a
Merge remote-tracking branch 'origin/master' into mergebot/pr908
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 22:27:37 +08:00
55ff7761b0
Merge branch 'master' into fix/page-scroll
2026-07-29 22:22:01 +08:00
98a23fc88c
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:20:09 +08:00
2b56d972eb
Merge remote-tracking branch 'origin/master' into mergebot/pr908
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-trajectory/src/client/views.module.css
2026-07-29 22:15:22 +08:00
637c5c9b7b
Merge remote-tracking branch 'origin/master' into worktree/fix-agent-loop-scheduler-quiescence
2026-07-29 22:10:52 +08:00
fd356b92c8
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:10:39 +08:00
1a21fc3a06
fix(agent-loop): quiesce scheduler failures
2026-07-29 22:10:26 +08:00
345b58d1de
Merge commit 'ddeb1cab2dcffcb4bc9f71bd3151c9b3078b5667' into worktree/retarget-pr828-20260729
2026-07-29 22:08:48 +08:00
5fb4bd66d7
Merge latest master into codex/migrate-to-oxlint
2026-07-29 22:01:25 +08:00
bb3e5c8c05
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:59:24 +08:00
d10dde430c
Merge origin/master at ddeb1cab2d into skill catalog hot refresh
2026-07-29 21:55:32 +08:00
80ab0aa548
docs(skill): correct invocation policy field
2026-07-29 21:51:01 +08:00
7b1e8978a9
fix(build): validate packaged spawn helpers
2026-07-29 21:49:21 +08:00
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
16e1734444
Merge origin/master at 90bc53cc64 into skill catalog hot refresh
2026-07-29 21:43:13 +08:00
502e64c00d
Merge origin/master at ecbf75a5e7 into skill catalog hot refresh
2026-07-29 21:42:18 +08:00
a45a187a90
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr828-20260729
2026-07-29 21:42:13 +08:00
d70cfed4e8
Merge master into fix/subprocess-password-scrub
2026-07-29 21:40:50 +08:00
fe61b243d7
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr831-20260729
2026-07-29 21:40:28 +08:00
f4bc0a4a86
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:40:28 +08:00
e1984cbfd9
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr885-20260729
2026-07-29 21:40:13 +08:00
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
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
98e6a0573f
fix(fs): keep one editor path contract
2026-07-29 21:37:12 +08:00
7f711996ff
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr828-20260729
...
# Conflicts:
# packages/hooks/README.i18n.yaml
# packages/hooks/README.zh.md
# packages/hooks/hook-protocol/README.i18n.yaml
# packages/hooks/hook-protocol/README.zh.md
# packages/hooks/hooks-claude/README.i18n.yaml
# packages/hooks/hooks-claude/README.zh.md
# packages/hooks/hooks-codex/README.i18n.yaml
# packages/hooks/hooks-codex/README.zh.md
2026-07-29 21:34:29 +08:00
754e163663
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:26:44 +08:00
44fe621f3f
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr831-20260729
...
# Conflicts:
# packages/context/workspace-context/README.i18n.yaml
# packages/context/workspace-context/README.zh.md
2026-07-29 21:25:44 +08:00
f2aa63f756
Merge branch 'master' into worktree-renameweb
2026-07-29 21:25:14 +08:00
76b4563380
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:23:13 +08:00
ae4a6081be
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:22:07 +08:00
70c6ffda7e
Merge branch 'master' into fix/page-scroll
2026-07-29 21:21:25 +08:00
bf8db964d4
Merge branch 'master' into xtr/trajectory-inspection-ui
2026-07-29 21:20:38 +08:00
52d68a5383
fix(skill): retain candidates across watcher failures
2026-07-29 21:17:27 +08:00
8dca750c8e
Merge branch 'master' into trajectory-history-source
2026-07-29 21:12:31 +08:00
935871e38b
Merge branch 'master' into fix/page-scroll
2026-07-29 21:07:59 +08:00
de4f2a12f0
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:06:24 +08:00
5c0c59847b
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
...
# Conflicts:
# packages/client/ui-skill/README.i18n.yaml
# packages/client/ui-skill/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/skill/skill-local/README.i18n.yaml
# packages/skill/skill-local/README.zh.md
# packages/skill/skill/README.i18n.yaml
# packages/skill/skill/README.zh.md
# packages/skill/tool-skill/README.i18n.yaml
2026-07-29 21:05:09 +08:00
08d097077e
fix: cr
2026-07-29 21:03:40 +08:00
4926fa18ec
Merge commit 'refs/codex/pr758/live-master' into HEAD
2026-07-29 21:01:55 +08:00
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
b23c3d596a
Merge remote-tracking branch 'origin/master' into trajectory-history-source
2026-07-29 20:58:04 +08:00
2a12057345
fix: ci
2026-07-29 20:56:56 +08:00
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
4368c2d40c
Merge branch 'master' into fix/translation-brief-uncommitted-pair
2026-07-29 20:54:30 +08:00
be9042e5a1
docs(client): sync package READMEs and agent notes with the input interaction rework
...
Update the six touched client package README pairs (slash menu ordering,
localized group titles and dismiss, permission label twin, goal pause,
plan hint localization, useAnchoredMaxHeight) and keep the owning agent
notes current: SlashSource.order and the MenuView dismiss/localize/clamp
face in the slash-pipeline note, the pause verb in the goal bar note.
2026-07-29 20:46:29 +08:00
63e1054916
Merge branch 'master' into fix/page-scroll
2026-07-29 20:36:11 +08:00
a4602b959e
feat: optimize chat page scroll area
2026-07-29 20:26:48 +08:00
795bdda223
Merge remote-tracking branch 'origin/master' into xjt/readme-proofreading-batch-1
...
# Conflicts:
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/README.zh.md
2026-07-29 20:21:48 +08:00
ee9ea7e3aa
docs(client): document independent trajectory history
2026-07-29 20:16:13 +08:00
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