This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
- **目标**:`cmd_start` 在分支名校验后新增守护——本地或远端存在同名分支且已包含于 `origin/main` 时拒绝启动(exit 非零),提示「沿用原分支或换新 slug」。
|
||||
- **背景**:2026-10-05 EXT-1 复核轮实测,合入后再 `task-start` 同名分支会从新 main 长出第二段历史、空卡覆盖已合入任务卡(两轮证据差点丢失,靠 git show 恢复);旧逻辑只校验本地分支能否创建,不查是否刚合入。
|
||||
- **非目标**:不改 precheck/task-sync/finish 等其他子命令;不做「恢复原卡」的自动修复(拒绝即可,恢复留给人工);不引入新依赖。
|
||||
- **范围变更(2026-10-05 12:33)**:本卡功能负例的证据命令含 `||`,暴露 `cmd_sync` 证据扫描按裸 `|` 切行、把转义碎片当 HEAD 传给 `git diff` 致 fatal 128 杀死 sync 的潜在缺陷(task-sync 门禁被卡死,卡内 12:30–12:32 五次中毒复现)——**同 PR 一并修复**(非十六进制单元格跳过,WARN 语义不变)。
|
||||
|
||||
## 同步记录
|
||||
|
||||
@@ -28,9 +29,9 @@
|
||||
|
||||
## 结果与验证(完成后填写)
|
||||
|
||||
- 结果:
|
||||
- 验证:<结论摘要 PASS/FAIL/SKIP/NOT_RUN 逐项;逐条证据由 make evidence 写入上方证据表>
|
||||
- 影响与剩余项:
|
||||
- 结果:cmd_start 守护 + cmd_sync 证据扫描加固均落地(见范围变更)。守护:已合入同名分支拒绝启动、提示沿用原分支或换新 slug,负例实测无 worktree 副作用;扫描:含 `\|\|` 转义行的卡片上 sync 正常完成、WARN 语义不变。
|
||||
- 验证:bash -n PASS;功能负例 PASS(exit≠0 断言,无副作用);sync 修复验证 PASS(exit 0);make test 全链 PASS(修复前 94f8d47 与最终 HEAD 两轮,exit 0);权威源为 CI 在 PR HEAD 的 make test+make build(GATE)。
|
||||
- 影响与剩余项:仅 scripts/task.sh 两处;下游建仓(Agent-System-RDM)将复制修复后的版本。
|
||||
| 2026-10-05T12:28:53Z | `bash -n scripts/task.sh` | 94f8d4760b | 0 | SELF | e3b0c44298fc1c14 |
|
||||
|
||||
<!-- evidence:run 2026-10-05T12:28:53Z -->
|
||||
@@ -121,3 +122,30 @@ $ bash -n scripts/task.sh && bash scripts/task.sh sync >/dev/null 2>&1 && echo '
|
||||
[exit 0 | HEAD 9a3ebe6539 | sha256:2a3457acb8b31495] 输出尾部 15 行:
|
||||
sync survives escaped-pipe evidence row
|
||||
```
|
||||
| 2026-10-05T12:33:22Z | `make test` | de75f1ede9 | 0 | SELF | 9a4f394d8e0f5c60 |
|
||||
|
||||
<!-- evidence:run 2026-10-05T12:33:22Z -->
|
||||
```
|
||||
$ make test
|
||||
[exit 0 | HEAD de75f1ede9 | sha256:9a4f394d8e0f5c60] 输出尾部 20 行:
|
||||
✓ test/collapsible.test.tsx (5 tests) 79ms
|
||||
✓ test/ui.test.tsx (6 tests) 70ms
|
||||
✓ test/tabstrip.test.tsx (3 tests) 79ms
|
||||
✓ test/file-preview.test.tsx (9 tests) 84ms
|
||||
✓ test/overlay-host.test.tsx (6 tests) 79ms
|
||||
✓ test/inbox.test.tsx (13 tests) 90ms
|
||||
✓ test/inline-confirm.test.tsx (7 tests) 106ms
|
||||
✓ test/card-anchor.test.tsx (4 tests) 107ms
|
||||
✓ test/capability.test.tsx (14 tests) 157ms
|
||||
|
||||
Test Files 14 passed (14)
|
||||
Tests 103 passed (103)
|
||||
Start at 12:33:50
|
||||
Duration 651ms (transform 432ms, setup 0ms, import 1.42s, tests 993ms, environment 3.42s)
|
||||
|
||||
knip unused exports 55 <= 55
|
||||
cd deps/agent-command && go vet ./... && go test -count=1 ./...
|
||||
ok agent-command 0.002s
|
||||
ok agent-command/conformance 0.002s
|
||||
make[1]: Leaving directory '/home/weichen/projects/Agent-System-Dev-wt-feature-task-start-merged-guard'
|
||||
```
|
||||
|
||||
Reference in New Issue
Block a user