Chinesezjc
2bac6f3062
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 20:04:50 +08:00
Tianyi Cui
08851a1a3e
Merge branch 'master' into turtle1999-patch-1
2026-07-27 19:57:43 +08:00
Chinesezjc
109fe533ba
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 19:45:54 +08:00
Chinesezjc
0701245007
Merge remote-tracking branch 'origin/master' into fix/pty-raw-ready-wait
2026-07-27 19:44:10 +08:00
Tianyi Cui
dd03c88083
Merge commit 'refs/codex-unblock/20260727/pr660-master' into worktree/pr660-merge-20260727
...
# Conflicts:
# scripts/doc-budgets.manifest.json
2026-07-27 19:34:55 +08:00
Chinesezjc
30d9bdfa42
Merge remote-tracking branch 'origin/master' into fix/pty-raw-ready-wait
2026-07-27 19:00:30 +08:00
Chinesezjc
55c7a620af
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 18:57:49 +08:00
Tianyi Cui
961bde6473
test(sdk): keep fresh Yarn installs mutable in CI
...
The live-link E2E intentionally creates a project without a lockfile. Prevent ambient CI=true from making Yarn 4's first install immutable, while preserving the CI environment for every other behavior under test.
2026-07-27 18:48:11 +08:00
Chinesezjc
153157195c
docs(pty): scope the settle boundary to the settled operation
...
The paragraph claimed later child output reaches only the scrollback. Output
after a settle still reaches the scrollback and whichever send is active when
it arrives — appendOutput writes both (session.ts:302-307), and settleActive
clears `active` rather than suppressing delivery. Only the settled operation
stops receiving it, which is what the timing bound protects.
2026-07-27 18:47:23 +08:00
Chinesezjc
56d673c4d7
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 18:45:47 +08:00
Chinesezjc
4f2068ff27
Merge remote-tracking branch 'origin/master' into fix/pty-raw-ready-wait
2026-07-27 18:31:46 +08:00
Chinesezjc
1927d347cd
Merge remote-tracking branch 'origin/master' into fix/pty-raw-ready-wait
...
master already stabilized the raw-mode SIGINT scenario in 65e0ffe03 and
3be090f1d with wider scenario-owned bounds and deliberately delayed child
readiness, so the merge takes master's test implementation. What this branch
keeps is the contract that explains why those bounds are required: the note
paragraph on the settle boundary in PtySendOperation.append, and the
waitForOutput comment recording that raising its deadline alone cannot
recover output the send never collected.
2026-07-27 18:15:47 +08:00
Tianyi Cui
d897dcc7ea
Merge remote-tracking branch 'origin/master' into worktree/pr682-retarget-20260727
...
# Conflicts:
# .agents/notes/rejected/simplification/2026-07-26-dependency-swaps-rejected-by-nih-audit.i18n.yaml
2026-07-27 17:55:56 +08:00
Chinesezjc
b55e2b793a
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 17:51:57 +08:00
Turtle
ac1431e4f5
fix(session-title): improve prompt
...
bad case:
when i start the session with a skill reference, llm returns XML
2026-07-27 17:47:48 +08:00
Tianyi Cui
94d5816142
Merge remote-tracking branch 'origin/master' into worktree-process-service-seam
2026-07-27 17:38:01 +08:00
Chinesezjc
a2e3c1b242
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 17:29:59 +08:00
Chinesezjc
f69124cc4a
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-23-web-todo-display.i18n.yaml
# .agents/notes/implemented/feature/2026-07-23-web-todo-display.md
# .agents/notes/implemented/feature/2026-07-23-web-todo-display.zh.md
# apps/web/tests/todo-display.snapshot.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/src/client/skeleton/TodoPanel.tsx
# packages/client/ui-conversation/tests/todo-panel.spec.tsx
2026-07-27 17:29:44 +08:00
Tianyi Cui
1ee8029bc6
Merge remote-tracking branch 'origin/master' into worktree-process-service-seam
2026-07-27 17:24:20 +08:00
imccyu
e8cbf6cc72
fix: remove orig
2026-07-27 17:22:01 +08:00
imccyu
0052ea49ff
Merge branch 'master' into feature/delete-workspace
2026-07-27 16:59:28 +08:00
Chinesezjc
0236e175aa
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 16:56:49 +08:00
imccyu
cbcb911781
Merge branch 'master' into feat/todo-tool-ui
2026-07-27 16:55:35 +08:00
imccyu
50ec3b1db0
Merge branch 'master' into feat/todo-tool-ui
2026-07-27 16:54:34 +08:00
imccyu
5b81025b58
Merge branch 'master' into feature/delete-workspace
2026-07-27 16:52:24 +08:00
Chinesezjc
8461952f33
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# docs/core-data-structures/session.i18n.yaml
2026-07-27 16:47:26 +08:00
07akioni
87a94b58d2
fix: ci
2026-07-27 16:47:20 +08:00
Tianyi Cui
aa95a3007f
Merge remote-tracking branch 'origin/master' into worktree/pr683-retarget-20260727
2026-07-27 16:40:42 +08:00
Tianyi Cui
21fe97d19d
Merge remote-tracking branch 'origin/master' into worktree-process-service-seam
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
2026-07-27 16:40:07 +08:00
Tianyi Cui
9801a0d102
fix(tool-web): bound HTML conversion work
2026-07-27 16:40:02 +08:00
07akioni
16598f7159
fix: cr
2026-07-27 16:36:36 +08:00
07akioni
900e45b365
feat: optimize todo tool ui
2026-07-27 16:24:30 +08:00
Tianyi Cui
ab25c34ea0
Merge remote-tracking branch 'origin/master' into worktree/fix-ci-timing-flakes-20260727
2026-07-27 16:09:50 +08:00
NI0317
c171ecc60b
Merge remote-tracking branch 'origin/master' into feature/delete-workspace
2026-07-27 16:07:11 +08:00
Tianyi Cui
ae18216199
Merge remote-tracking branch 'origin/master' into worktree/pr683-retarget-20260727
2026-07-27 16:03:33 +08:00
07akioni
62e2551edd
fix: darkmode 滚动条颜色
2026-07-27 16:01:01 +08:00
Tianyi Cui
9b8e6e6548
Merge remote-tracking branch 'origin/master' into worktree/fix-ci-timing-flakes-20260727
2026-07-27 15:58:37 +08:00
imccyu
52985d688d
Merge branch 'master' into markdown-ui
2026-07-27 15:58:13 +08:00
NI0317
dcf06e8272
Merge remote-tracking branch 'origin/master' into feature/delete-workspace
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
2026-07-27 15:54:51 +08:00
Tianyi Cui
77a85f9b1a
Merge remote-tracking branch 'origin/master' into worktree/fix-ci-timing-flakes-20260727
2026-07-27 15:53:08 +08:00
NI0317
4701373fc2
fix(workspace): remove transient duplicate warning
2026-07-27 15:52:35 +08:00
Tianyi Cui
bfdaf7600b
Merge remote-tracking branch 'origin/master' into worktree/pr674-retarget-20260727
...
# Conflicts:
# docs/cookbook/adding-an-llm-adapter.i18n.yaml
# docs/core-data-structures/llm-streaming.i18n.yaml
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm/README.i18n.yaml
2026-07-27 15:48:17 +08:00
imccyu
b8d7938498
Merge branch 'master' into markdown-ui
2026-07-27 15:44:30 +08:00
imccyu
0a7c8a284d
chore
2026-07-27 15:44:10 +08:00
Tianyi Cui
9c53cd7d07
test: stabilize timing-sensitive terminal checks
2026-07-27 15:33:36 +08:00
Tianyi Cui
f6de42a886
Merge remote-tracking branch 'origin/master' into worktree/pr674-retarget-20260727
2026-07-27 15:30:30 +08:00
Yichen Jiang
c3dfed668d
Merge branch 'master' into worktree/llm-reasoning-effort
2026-07-27 15:30:00 +08:00
imccyu
b241d4332c
Merge branch 'master' into markdown-ui
2026-07-27 15:23:13 +08:00
Chinesezjc
07f9959d55
fix(gui): keep the parallel-active count outside the ellipsized hint
...
Both todo one-line surfaces truncate the active hint with overflow: hidden
and text-overflow: ellipsis. A "+N" appended to the first active task's name
therefore sat at the far end of the truncatable text, so a long task name or a
narrow viewport clipped exactly the part that reports the other running tasks,
leaving a parallel plan indistinguishable from a sequential one.
planSummary now returns activeContent and activeExtra as separate fields
instead of one joined activeHint, and each surface renders the count in its own
flex: none span beside the ellipsized name: .activeExtra in the collapsed plan
strip header, .extra in the todo_write row. Putting the count in front of the
name was rejected — the task name is what the reader looks for first.
The parallel-plan cases in todo-panel.spec.tsx now assert the count is a
separate element from the name, and both fail if the two are rejoined. The
assembled web snapshot re-records: the flex gap supplies the visual space, so
the transcript reads "实现 fixture 样本+1" with no space in the text nodes.
2026-07-27 15:07:43 +08:00
NI0317
7bd96af5eb
fix(workspace): make deletion recoverable
2026-07-27 14:37:04 +08:00
