From 215beff7e2d8b96a95ff071f20dccb00155e54ee Mon Sep 17 00:00:00 2001 From: weichen Date: Sat, 3 Oct 2026 16:28:03 +0000 Subject: [PATCH 1/7] Record the task card for feature-runstate-shell --- .task/feature-runstate-shell.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .task/feature-runstate-shell.md diff --git a/.task/feature-runstate-shell.md b/.task/feature-runstate-shell.md new file mode 100644 index 00000000..112de211 --- /dev/null +++ b/.task/feature-runstate-shell.md @@ -0,0 +1,25 @@ +# feature/runstate-shell 任务卡 + +任务主记录：；状态：进行中；owner：weichen + +## 基线与授权 + +- 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= 64d4f115c8e61e124d7272ed68068675475e9518 +- 工作区：/home/weichen/projects/Agent-System-Dev-wt-feature-runstate-shell（worktree）；分支：feature/runstate-shell +- 授权与交付终点：<本次允许的动作与终点；未授权事项写明> + +## 目标与非目标 + +<预期结果、受影响入口/模块/契约；明确不做什么。> + +## 同步记录 + +| 节点 | sync_base_sha | tested_head_sha | checked_at | +|---|---|---|---| +| 启动 | 64d4f115c8e61e124d7272ed68068675475e9518 | 64d4f115c8e61e124d7272ed68068675475e9518 | 2026-10-03T16:28:03Z | + +## 结果与验证（完成后填写） + +- 结果： +- 验证： +- 影响与剩余项： From 91c1b68891b86d17d0cc0409818370e2deae555a Mon Sep 17 00:00:00 2001 From: weichen Date: Sat, 3 Oct 2026 16:36:02 +0000 Subject: [PATCH 2/7] Pin the shell run state across frontend and backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why: The composer phase and the SSE retry interval have to land together so a reconnect shows 重连中 and still receives the missed events. Evidence: frontend dcf9b6b, backend 7bef7a4. Impact: No change to permissions, models, or the already merged live-bubble fix. Refs: feature/runstate-shell Co-authored-by: Cursor --- .task/feature-runstate-shell.md | 11 ++++++----- modules/backend | 2 +- modules/frontend | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.task/feature-runstate-shell.md b/.task/feature-runstate-shell.md index 112de211..d9c74d22 100644 --- a/.task/feature-runstate-shell.md +++ b/.task/feature-runstate-shell.md @@ -6,11 +6,12 @@ - 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= 64d4f115c8e61e124d7272ed68068675475e9518 - 工作区：/home/weichen/projects/Agent-System-Dev-wt-feature-runstate-shell（worktree）；分支：feature/runstate-shell -- 授权与交付终点：<本次允许的动作与终点；未授权事项写明> +- 授权与交付终点：改 frontend 与 backend，钉 Dev 的 gitlink，经 PR 合入 main 后在本 worktree 运行 task-finish。未授权：core 契约、权限模式、文件回滚、代码编排、发版、改写历史。 ## 目标与非目标 -<预期结果、受影响入口/模块/契约；明确不做什么。> +- 目标：运行态只有 sending、running、settling、idle 一个来源；输入框、停止、取消和排队发送都读它；事件监听按契约穷举；SSE 开头带 retry，溢出后重连能补齐；断线显示「重连中」。 +- 非目标：重做已合入的流式气泡修复；权限卡；文件回滚。 ## 同步记录 @@ -20,6 +21,6 @@ ## 结果与验证（完成后填写） -- 结果： -- 验证： -- 影响与剩余项： +- 结果：frontend dcf9b6b，backend 7bef7a4。运行态来自 runstate.ts。SSE 流以 retry: 1000 开头。 +- 验证：待 make test 与 make build。 +- 影响与剩余项：不改变默认权限和模型路由。断线时头部显示「重连中」。 diff --git a/modules/backend b/modules/backend index b2dc9a7e..7bef7a4f 160000 --- a/modules/backend +++ b/modules/backend @@ -1 +1 @@ -Subproject commit b2dc9a7e0bde2bb8b3cf530ad9f1458e4c5936d2 +Subproject commit 7bef7a4f9462fbb976f6bd9b544079a6ef10b030 diff --git a/modules/frontend b/modules/frontend index d5f59f18..dcf9b6b8 160000 --- a/modules/frontend +++ b/modules/frontend @@ -1 +1 @@ -Subproject commit d5f59f1811268d099a6c354a29542809e640d4fe +Subproject commit dcf9b6b8475d25a609d13616e23759e94f17cd97 From c0b8cf20d0f799432042c905cfaf7441875c0942 Mon Sep 17 00:00:00 2001 From: weichen Date: Sat, 3 Oct 2026 16:37:40 +0000 Subject: [PATCH 3/7] Pin the frontend shell phase type usage Why: The conversation screen has to import the phase type so the unused-export ratchet stays at the baseline. Evidence: frontend 5961b6e, knip 43. Impact: No other pin moves. Refs: feature/runstate-shell Co-authored-by: Cursor --- modules/frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/frontend b/modules/frontend index dcf9b6b8..5961b6e9 160000 --- a/modules/frontend +++ b/modules/frontend @@ -1 +1 @@ -Subproject commit dcf9b6b8475d25a609d13616e23759e94f17cd97 +Subproject commit 5961b6e9bdb91d3d27be505d357bfb4f6b4c18d0 From f726762a8dcd73082b63341fa3d783c4d645d981 Mon Sep 17 00:00:00 2001 From: weichen Date: Sat, 3 Oct 2026 16:41:02 +0000 Subject: [PATCH 4/7] Record the runstate verification on the task card MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why: Acceptance needs the pin SHAs, the test evidence, and the mock composer check on the card. Evidence: make test and make build passed on c0b8cf2. The mock composer switched to 排队 and back to 发送. Impact: No code change. Refs: feature/runstate-shell Co-authored-by: Cursor --- .task/feature-runstate-shell.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.task/feature-runstate-shell.md b/.task/feature-runstate-shell.md index d9c74d22..ac5f2a50 100644 --- a/.task/feature-runstate-shell.md +++ b/.task/feature-runstate-shell.md @@ -21,6 +21,6 @@ ## 结果与验证（完成后填写） -- 结果：frontend dcf9b6b，backend 7bef7a4。运行态来自 runstate.ts。SSE 流以 retry: 1000 开头。 -- 验证：待 make test 与 make build。 +- 结果：frontend 5961b6e，backend 7bef7a4。运行态来自 runstate.ts。SSE 流以 retry: 1000 开头。 +- 验证：`make test` 与 `make build` 通过（版本串含 frontend=5961b6e、backend=7bef7a4）。临时 mock 实例上发送「你好」后按钮变为「排队」，结束后回到「发送」，并出现 mock 回复。 - 影响与剩余项：不改变默认权限和模型路由。断线时头部显示「重连中」。 From adc003e2a0dd363debf04bf65649f2aaa851eb80 Mon Sep 17 00:00:00 2001 From: weichen Date: Sat, 3 Oct 2026 16:41:03 +0000 Subject: [PATCH 5/7] Record the sync checkpoint --- .task/feature-runstate-shell.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.task/feature-runstate-shell.md b/.task/feature-runstate-shell.md index ac5f2a50..cbe8ae08 100644 --- a/.task/feature-runstate-shell.md +++ b/.task/feature-runstate-shell.md @@ -24,3 +24,4 @@ - 结果：frontend 5961b6e，backend 7bef7a4。运行态来自 runstate.ts。SSE 流以 retry: 1000 开头。 - 验证：`make test` 与 `make build` 通过（版本串含 frontend=5961b6e、backend=7bef7a4）。临时 mock 实例上发送「你好」后按钮变为「排队」，结束后回到「发送」，并出现 mock 回复。 - 影响与剩余项：不改变默认权限和模型路由。断线时头部显示「重连中」。 +| 同步前验收 | 64d4f115c8e61e124d7272ed68068675475e9518 | f726762a8dcd73082b63341fa3d783c4d645d981 | 2026-10-03T16:41:03Z | From 31e973081b938d5551fb2194a906fbbe3d2ab5e2 Mon Sep 17 00:00:00 2001 From: weichen Date: Sat, 3 Oct 2026 16:41:18 +0000 Subject: [PATCH 6/7] Record the sync checkpoint --- .task/feature-runstate-shell.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.task/feature-runstate-shell.md b/.task/feature-runstate-shell.md index cbe8ae08..96b45a29 100644 --- a/.task/feature-runstate-shell.md +++ b/.task/feature-runstate-shell.md @@ -25,3 +25,4 @@ - 验证：`make test` 与 `make build` 通过（版本串含 frontend=5961b6e、backend=7bef7a4）。临时 mock 实例上发送「你好」后按钮变为「排队」，结束后回到「发送」，并出现 mock 回复。 - 影响与剩余项：不改变默认权限和模型路由。断线时头部显示「重连中」。 | 同步前验收 | 64d4f115c8e61e124d7272ed68068675475e9518 | f726762a8dcd73082b63341fa3d783c4d645d981 | 2026-10-03T16:41:03Z | +| 同步前验收 | 64d4f115c8e61e124d7272ed68068675475e9518 | adc003e2a0dd363debf04bf65649f2aaa851eb80 | 2026-10-03T16:41:18Z | From 7168d435ba1b4446e92a531a6bbce095ddfa2dc5 Mon Sep 17 00:00:00 2001 From: weichen Date: Sat, 3 Oct 2026 16:41:19 +0000 Subject: [PATCH 7/7] Record the sync checkpoint --- .task/feature-runstate-shell.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.task/feature-runstate-shell.md b/.task/feature-runstate-shell.md index 96b45a29..4bfec4f3 100644 --- a/.task/feature-runstate-shell.md +++ b/.task/feature-runstate-shell.md @@ -26,3 +26,4 @@ - 影响与剩余项：不改变默认权限和模型路由。断线时头部显示「重连中」。 | 同步前验收 | 64d4f115c8e61e124d7272ed68068675475e9518 | f726762a8dcd73082b63341fa3d783c4d645d981 | 2026-10-03T16:41:03Z | | 同步前验收 | 64d4f115c8e61e124d7272ed68068675475e9518 | adc003e2a0dd363debf04bf65649f2aaa851eb80 | 2026-10-03T16:41:18Z | +| 同步前验收 | 64d4f115c8e61e124d7272ed68068675475e9518 | 31e973081b938d5551fb2194a906fbbe3d2ab5e2 | 2026-10-03T16:41:19Z |