@aipper/aiws-spec 0.0.24 → 0.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +22 -0
- package/docs/aiws-bootstrap-routing-design.md +138 -0
- package/docs/aiws-governance-positioning.md +69 -0
- package/docs/cli-interface.md +91 -6
- package/docs/collaboration-artifacts.md +62 -0
- package/docs/opencode-omo-adapter.md +135 -0
- package/docs/opencode-omo-validation-checklist.md +90 -0
- package/docs/spec-contract.md +30 -22
- package/docs/superpowers-collaboration-adoption.md +92 -0
- package/docs/workflow-delegation-contracts.json +274 -0
- package/docs/workflow-delegation-contracts.md +248 -0
- package/docs/workflow-delegation-contracts.schema.json +176 -0
- package/docs/workflow-governance-rules.json +294 -0
- package/docs/workflow-governance-rules.md +63 -0
- package/docs/workflow-governance-rules.schema.json +182 -0
- package/docs/workflow-review-gates.json +72 -0
- package/docs/workflow-review-gates.md +36 -0
- package/docs/workflow-review-gates.schema.json +67 -0
- package/docs/workflow-router-rules.json +196 -0
- package/docs/workflow-router-rules.md +83 -0
- package/docs/workflow-router-rules.schema.json +119 -0
- package/docs/workflow-stage-contracts.json +148 -0
- package/docs/workflow-stage-contracts.md +70 -0
- package/docs/workflow-stage-contracts.schema.json +98 -0
- package/package.json +1 -1
- package/templates/workspace/.agents/skills/using-aiws/SKILL.md +87 -0
- package/templates/workspace/.agents/skills/ws-commit/SKILL.md +27 -1
- package/templates/workspace/.agents/skills/ws-delegate/SKILL.md +75 -0
- package/templates/workspace/.agents/skills/ws-deliver/SKILL.md +25 -4
- package/templates/workspace/.agents/skills/ws-dev/SKILL.md +35 -6
- package/templates/workspace/.agents/skills/ws-dev-lite/SKILL.md +58 -0
- package/templates/workspace/.agents/skills/ws-finish/SKILL.md +25 -12
- package/templates/workspace/.agents/skills/ws-frontend-design/SKILL.md +126 -0
- package/templates/workspace/.agents/skills/ws-handoff/SKILL.md +25 -4
- package/templates/workspace/.agents/skills/ws-plan/SKILL.md +25 -1
- package/templates/workspace/.agents/skills/ws-plan-verify/SKILL.md +20 -0
- package/templates/workspace/.agents/skills/ws-preflight/SKILL.md +23 -0
- package/templates/workspace/.agents/skills/ws-quality-review/SKILL.md +56 -0
- package/templates/workspace/.agents/skills/ws-review/SKILL.md +24 -0
- package/templates/workspace/.agents/skills/ws-spec-review/SKILL.md +57 -0
- package/templates/workspace/.agents/skills/ws-verify-before-complete/SKILL.md +59 -0
- package/templates/workspace/.aiws/manifest.json +2 -6
- package/templates/workspace/.claude/commands/using-aiws.md +25 -0
- package/templates/workspace/.claude/commands/ws-dev-lite.md +31 -0
- package/templates/workspace/.claude/commands/ws-finish.md +1 -1
- package/templates/workspace/.claude/commands/ws-handoff.md +3 -2
- package/templates/workspace/.claude/commands/ws-quality-review.md +24 -0
- package/templates/workspace/.claude/commands/ws-review.md +2 -2
- package/templates/workspace/.claude/commands/ws-spec-review.md +24 -0
- package/templates/workspace/.claude/commands/ws-verify-before-complete.md +24 -0
- package/templates/workspace/.claude/skills/p-aiws-change-archive/SKILL.md +24 -0
- package/templates/workspace/.claude/skills/p-aiws-change-finish/SKILL.md +24 -0
- package/templates/workspace/.claude/skills/p-aiws-change-list/SKILL.md +18 -0
- package/templates/workspace/.claude/skills/p-aiws-change-new/SKILL.md +26 -0
- package/templates/workspace/.claude/skills/p-aiws-change-next/SKILL.md +19 -0
- package/templates/workspace/.claude/skills/p-aiws-change-start/SKILL.md +33 -0
- package/templates/workspace/.claude/skills/p-aiws-change-status/SKILL.md +19 -0
- package/templates/workspace/.claude/skills/p-aiws-change-sync/SKILL.md +19 -0
- package/templates/workspace/.claude/skills/p-aiws-change-templates-init/SKILL.md +18 -0
- package/templates/workspace/.claude/skills/p-aiws-change-templates-which/SKILL.md +18 -0
- package/templates/workspace/.claude/skills/p-aiws-change-validate/SKILL.md +23 -0
- package/templates/workspace/.claude/skills/p-aiws-hooks-install/SKILL.md +30 -0
- package/templates/workspace/.claude/skills/p-aiws-hooks-status/SKILL.md +18 -0
- package/templates/workspace/.claude/skills/p-aiws-init/SKILL.md +27 -0
- package/templates/workspace/.claude/skills/p-aiws-rollback/SKILL.md +18 -0
- package/templates/workspace/.claude/skills/p-aiws-update/SKILL.md +26 -0
- package/templates/workspace/.claude/skills/p-aiws-validate/SKILL.md +22 -0
- package/templates/workspace/.claude/skills/p-tasks-plan/SKILL.md +37 -0
- package/templates/workspace/.claude/skills/using-aiws/SKILL.md +87 -0
- package/templates/workspace/.claude/skills/ws-analyze/SKILL.md +26 -0
- package/templates/workspace/.claude/skills/ws-bugfix/SKILL.md +111 -0
- package/templates/workspace/.claude/skills/ws-commit/SKILL.md +130 -0
- package/templates/workspace/.claude/skills/ws-deliver/SKILL.md +230 -0
- package/templates/workspace/.claude/skills/ws-dev/SKILL.md +168 -0
- package/templates/workspace/.claude/skills/ws-dev-lite/SKILL.md +58 -0
- package/templates/workspace/.claude/skills/ws-finish/SKILL.md +209 -0
- package/templates/workspace/.claude/skills/ws-frontend-design/SKILL.md +126 -0
- package/templates/workspace/.claude/skills/ws-handoff/SKILL.md +52 -0
- package/templates/workspace/.claude/skills/ws-migrate/SKILL.md +54 -0
- package/templates/workspace/.claude/skills/ws-plan/SKILL.md +138 -0
- package/templates/workspace/.claude/skills/ws-plan-verify/SKILL.md +61 -0
- package/templates/workspace/.claude/skills/ws-preflight/SKILL.md +55 -0
- package/templates/workspace/.claude/skills/ws-pull/SKILL.md +119 -0
- package/templates/workspace/.claude/skills/ws-push/SKILL.md +110 -0
- package/templates/workspace/.claude/skills/ws-quality-review/SKILL.md +56 -0
- package/templates/workspace/.claude/skills/ws-req-change/SKILL.md +41 -0
- package/templates/workspace/.claude/skills/ws-req-contract-sync/SKILL.md +17 -0
- package/templates/workspace/.claude/skills/ws-req-contract-validate/SKILL.md +12 -0
- package/templates/workspace/.claude/skills/ws-req-flow-sync/SKILL.md +28 -0
- package/templates/workspace/.claude/skills/ws-req-review/SKILL.md +32 -0
- package/templates/workspace/.claude/skills/ws-review/SKILL.md +50 -0
- package/templates/workspace/.claude/skills/ws-rule/SKILL.md +23 -0
- package/templates/workspace/.claude/skills/ws-spec-review/SKILL.md +57 -0
- package/templates/workspace/.claude/skills/ws-submodule-setup/SKILL.md +65 -0
- package/templates/workspace/.claude/skills/ws-verify-before-complete/SKILL.md +59 -0
- package/templates/workspace/.githooks/commit-msg +10 -0
- package/templates/workspace/.opencode/command/using-aiws.md +30 -0
- package/templates/workspace/.opencode/command/ws-delegate.md +33 -0
- package/templates/workspace/.opencode/command/ws-dev-lite.md +34 -0
- package/templates/workspace/.opencode/command/ws-finish.md +1 -1
- package/templates/workspace/.opencode/command/ws-handoff.md +4 -3
- package/templates/workspace/.opencode/command/ws-plan.md +3 -0
- package/templates/workspace/.opencode/command/ws-preflight.md +4 -0
- package/templates/workspace/.opencode/command/ws-quality-review.md +30 -0
- package/templates/workspace/.opencode/command/ws-review.md +5 -2
- package/templates/workspace/.opencode/command/ws-spec-review.md +30 -0
- package/templates/workspace/.opencode/command/ws-verify-before-complete.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-archive.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-finish.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-list.md +26 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-new.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-next.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-start.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-status.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-sync.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-templates-init.md +26 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-templates-which.md +26 -0
- package/templates/workspace/.opencode/commands/p-aiws-change-validate.md +27 -0
- package/templates/workspace/.opencode/commands/p-aiws-hooks-install.md +26 -0
- package/templates/workspace/.opencode/commands/p-aiws-hooks-status.md +26 -0
- package/templates/workspace/.opencode/commands/p-aiws-init.md +23 -0
- package/templates/workspace/.opencode/commands/p-aiws-rollback.md +16 -0
- package/templates/workspace/.opencode/commands/p-aiws-update.md +22 -0
- package/templates/workspace/.opencode/commands/p-aiws-validate.md +17 -0
- package/templates/workspace/.opencode/commands/using-aiws.md +30 -0
- package/templates/workspace/.opencode/commands/ws-analyze.md +30 -0
- package/templates/workspace/.opencode/commands/ws-bugfix.md +35 -0
- package/templates/workspace/.opencode/commands/ws-commit.md +70 -0
- package/templates/workspace/.opencode/commands/ws-delegate.md +33 -0
- package/templates/workspace/{.iflow/commands/ws-deliver.toml → .opencode/commands/ws-deliver.md} +13 -13
- package/templates/workspace/.opencode/commands/ws-dev-lite.md +34 -0
- package/templates/workspace/.opencode/commands/ws-dev.md +36 -0
- package/templates/workspace/{.iflow/commands/ws-finish.toml → .opencode/commands/ws-finish.md} +46 -29
- package/templates/workspace/.opencode/commands/ws-handoff.md +26 -0
- package/templates/workspace/.opencode/commands/ws-migrate.md +25 -0
- package/templates/workspace/.opencode/commands/ws-plan-verify.md +28 -0
- package/templates/workspace/.opencode/commands/ws-plan.md +27 -0
- package/templates/workspace/.opencode/commands/ws-preflight.md +34 -0
- package/templates/workspace/.opencode/commands/ws-pull.md +87 -0
- package/templates/workspace/.opencode/commands/ws-push.md +93 -0
- package/templates/workspace/.opencode/commands/ws-quality-review.md +30 -0
- package/templates/workspace/.opencode/commands/ws-req-change.md +45 -0
- package/templates/workspace/.opencode/commands/ws-req-contract-sync.md +21 -0
- package/templates/workspace/.opencode/commands/ws-req-contract-validate.md +16 -0
- package/templates/workspace/.opencode/commands/ws-req-flow-sync.md +23 -0
- package/templates/workspace/.opencode/commands/ws-req-review.md +36 -0
- package/templates/workspace/.opencode/commands/ws-review.md +33 -0
- package/templates/workspace/.opencode/commands/ws-rule.md +27 -0
- package/templates/workspace/.opencode/commands/ws-spec-review.md +30 -0
- package/templates/workspace/.opencode/commands/ws-submodule-setup.md +57 -0
- package/templates/workspace/.opencode/commands/ws-verify-before-complete.md +27 -0
- package/templates/workspace/.opencode/oh-my-opencode.json.example +17 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-archive/SKILL.md +24 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-finish/SKILL.md +24 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-list/SKILL.md +18 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-new/SKILL.md +26 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-next/SKILL.md +19 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-start/SKILL.md +33 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-status/SKILL.md +19 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-sync/SKILL.md +19 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-templates-init/SKILL.md +18 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-templates-which/SKILL.md +18 -0
- package/templates/workspace/.opencode/skills/p-aiws-change-validate/SKILL.md +23 -0
- package/templates/workspace/.opencode/skills/p-aiws-hooks-install/SKILL.md +30 -0
- package/templates/workspace/.opencode/skills/p-aiws-hooks-status/SKILL.md +18 -0
- package/templates/workspace/.opencode/skills/p-aiws-init/SKILL.md +27 -0
- package/templates/workspace/.opencode/skills/p-aiws-rollback/SKILL.md +18 -0
- package/templates/workspace/.opencode/skills/p-aiws-update/SKILL.md +26 -0
- package/templates/workspace/.opencode/skills/p-aiws-validate/SKILL.md +22 -0
- package/templates/workspace/.opencode/skills/p-tasks-plan/SKILL.md +37 -0
- package/templates/workspace/.opencode/skills/using-aiws/SKILL.md +91 -0
- package/templates/workspace/.opencode/skills/ws-analyze/SKILL.md +26 -0
- package/templates/workspace/.opencode/skills/ws-bugfix/SKILL.md +111 -0
- package/templates/workspace/.opencode/skills/ws-commit/SKILL.md +130 -0
- package/templates/workspace/.opencode/skills/ws-delegate/SKILL.md +63 -0
- package/templates/workspace/.opencode/skills/ws-deliver/SKILL.md +230 -0
- package/templates/workspace/.opencode/skills/ws-dev/SKILL.md +168 -0
- package/templates/workspace/.opencode/skills/ws-dev-lite/SKILL.md +58 -0
- package/templates/workspace/.opencode/skills/ws-finish/SKILL.md +209 -0
- package/templates/workspace/.opencode/skills/ws-frontend-design/SKILL.md +126 -0
- package/templates/workspace/.opencode/skills/ws-handoff/SKILL.md +52 -0
- package/templates/workspace/.opencode/skills/ws-migrate/SKILL.md +54 -0
- package/templates/workspace/.opencode/skills/ws-plan/SKILL.md +148 -0
- package/templates/workspace/.opencode/skills/ws-plan-verify/SKILL.md +61 -0
- package/templates/workspace/.opencode/skills/ws-preflight/SKILL.md +60 -0
- package/templates/workspace/.opencode/skills/ws-pull/SKILL.md +119 -0
- package/templates/workspace/.opencode/skills/ws-push/SKILL.md +110 -0
- package/templates/workspace/.opencode/skills/ws-quality-review/SKILL.md +63 -0
- package/templates/workspace/.opencode/skills/ws-req-change/SKILL.md +41 -0
- package/templates/workspace/.opencode/skills/ws-req-contract-sync/SKILL.md +17 -0
- package/templates/workspace/.opencode/skills/ws-req-contract-validate/SKILL.md +12 -0
- package/templates/workspace/.opencode/skills/ws-req-flow-sync/SKILL.md +28 -0
- package/templates/workspace/.opencode/skills/ws-req-review/SKILL.md +32 -0
- package/templates/workspace/.opencode/skills/ws-review/SKILL.md +57 -0
- package/templates/workspace/.opencode/skills/ws-rule/SKILL.md +23 -0
- package/templates/workspace/.opencode/skills/ws-spec-review/SKILL.md +64 -0
- package/templates/workspace/.opencode/skills/ws-submodule-setup/SKILL.md +65 -0
- package/templates/workspace/.opencode/skills/ws-verify-before-complete/SKILL.md +59 -0
- package/templates/workspace/AGENTS.md +74 -30
- package/templates/workspace/AI_PROJECT.md +1 -1
- package/templates/workspace/AI_WORKSPACE.md +1 -1
- package/templates/workspace/changes/README.md +25 -4
- package/templates/workspace/changes/templates/proposal.md +15 -0
- package/templates/workspace/changes/templates/tasks.md +9 -2
- package/templates/workspace/manifest.json +340 -82
- package/templates/workspace/memory-bank/README.md +1 -2
- package/templates/workspace/tools/ws_change_check.py +26 -4
- package/templates/workspace/.iflow/agents/feature-reviewer.md +0 -27
- package/templates/workspace/.iflow/agents/requirements-analyst.md +0 -24
- package/templates/workspace/.iflow/agents/server-commit-manager.md +0 -28
- package/templates/workspace/.iflow/agents/server-fix-implementer.md +0 -31
- package/templates/workspace/.iflow/agents/server-test-planner.md +0 -28
- package/templates/workspace/.iflow/agents/server-test-triager.md +0 -30
- package/templates/workspace/.iflow/commands/aiws-init.toml +0 -24
- package/templates/workspace/.iflow/commands/aiws-rollback.toml +0 -18
- package/templates/workspace/.iflow/commands/aiws-update.toml +0 -23
- package/templates/workspace/.iflow/commands/aiws-validate.toml +0 -18
- package/templates/workspace/.iflow/commands/server-commit.toml +0 -27
- package/templates/workspace/.iflow/commands/server-drain.toml +0 -99
- package/templates/workspace/.iflow/commands/server-fix-and-commit.toml +0 -27
- package/templates/workspace/.iflow/commands/server-fix.toml +0 -65
- package/templates/workspace/.iflow/commands/server-test-plan.toml +0 -62
- package/templates/workspace/.iflow/commands/server-test.toml +0 -58
- package/templates/workspace/.iflow/commands/server-triage.toml +0 -38
- package/templates/workspace/.iflow/commands/server_test-plan.toml +0 -12
- package/templates/workspace/.iflow/commands/server_test.toml +0 -12
- package/templates/workspace/.iflow/commands/ws-analyze.toml +0 -33
- package/templates/workspace/.iflow/commands/ws-commit.toml +0 -46
- package/templates/workspace/.iflow/commands/ws-contract-check.toml +0 -69
- package/templates/workspace/.iflow/commands/ws-dev.toml +0 -34
- package/templates/workspace/.iflow/commands/ws-doctor.toml +0 -141
- package/templates/workspace/.iflow/commands/ws-env-doctor.toml +0 -74
- package/templates/workspace/.iflow/commands/ws-feature-deliver.toml +0 -44
- package/templates/workspace/.iflow/commands/ws-feature-plan.toml +0 -47
- package/templates/workspace/.iflow/commands/ws-init.toml +0 -53
- package/templates/workspace/.iflow/commands/ws-memory-bank-init.toml +0 -100
- package/templates/workspace/.iflow/commands/ws-migrate.toml +0 -59
- package/templates/workspace/.iflow/commands/ws-preflight.toml +0 -30
- package/templates/workspace/.iflow/commands/ws-pull.toml +0 -47
- package/templates/workspace/.iflow/commands/ws-push.toml +0 -40
- package/templates/workspace/.iflow/commands/ws-req-change.toml +0 -64
- package/templates/workspace/.iflow/commands/ws-req-contract-sync.toml +0 -25
- package/templates/workspace/.iflow/commands/ws-req-contract-validate.toml +0 -16
- package/templates/workspace/.iflow/commands/ws-req-flow-sync.toml +0 -36
- package/templates/workspace/.iflow/commands/ws-req-review.toml +0 -56
- package/templates/workspace/.iflow/commands/ws-review.toml +0 -33
- package/templates/workspace/.iflow/commands/ws-rule.toml +0 -43
- package/templates/workspace/.iflow/commands/ws-submodule-setup.toml +0 -32
- package/templates/workspace/tools/iflow_watchdog.sh +0 -138
- package/templates/workspace/tools/install_iflow_watchdog_systemd_user.sh +0 -118
- package/templates/workspace/tools/systemd/iflow-watchdog@.service +0 -16
- package/templates/workspace/tools/systemd/iflow-watchdog@.timer +0 -11
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: ws-bugfix
|
|
3
|
+
description: 缺陷修复(通过禅道 MCP 拉取 bug 与附件,下载图片证据,汇总到 issues/fix_bus_issues.csv,并绑定到 changes/<change-id>/)
|
|
4
|
+
---
|
|
5
|
+
|
|
6
|
+
用中文输出(命令/路径/代码标识符保持原样不翻译)。
|
|
7
|
+
|
|
8
|
+
目标:
|
|
9
|
+
- 用禅道 MCP 拉取 bug 详情与附件(尤其图片)
|
|
10
|
+
- 把证据落盘到 `changes/<change-id>/bug/`(避免只停留在对话)
|
|
11
|
+
- 把修复任务汇总/更新到 `issues/fix_bus_issues.csv`
|
|
12
|
+
- 与 `ws-dev` / `aiws change` 流程绑定,确保可追溯、可验证
|
|
13
|
+
|
|
14
|
+
非目标(强制):
|
|
15
|
+
- 不自动 commit / push
|
|
16
|
+
- 不写入任何 secrets(token、cookie、内网地址)
|
|
17
|
+
- 不在无法复现时直接改代码(先产出阻塞信息)
|
|
18
|
+
|
|
19
|
+
前置:
|
|
20
|
+
1) 先运行 `$ws-preflight`。
|
|
21
|
+
2) 准备 `change-id`(建议:`bug-<bug-id>` 或 `bugfix-<bug-id>-<slug>`)。
|
|
22
|
+
3) 建立 change 上下文(推荐先于任何落盘):
|
|
23
|
+
- 若当前还不在 `change/<change-id>` 分支 / worktree,先调用 `aiws change start`
|
|
24
|
+
- 工作区必须先干净;否则不要先写 `changes/<change-id>/bug/` 或 `issues/fix_bus_issues.csv`,避免后续切 worktree 时工件留在原工作区
|
|
25
|
+
- 仓库已有提交:优先 `--worktree`
|
|
26
|
+
- superproject + submodule:优先 `--worktree --submodules`
|
|
27
|
+
- 仓库尚无提交 / 不满足 worktree 前置条件:回退 `--no-switch`
|
|
28
|
+
```bash
|
|
29
|
+
if [[ -n "$(git status --porcelain)" ]]; then
|
|
30
|
+
echo "error: working tree dirty before ws-bugfix creates change context"
|
|
31
|
+
exit 2
|
|
32
|
+
fi
|
|
33
|
+
|
|
34
|
+
if git rev-parse --verify HEAD >/dev/null 2>&1; then
|
|
35
|
+
if [[ -f .gitmodules ]] && git config --file .gitmodules --get-regexp '^submodule\\..*\\.path$' >/dev/null 2>&1; then
|
|
36
|
+
aiws change start <change-id> --hooks --worktree --submodules
|
|
37
|
+
else
|
|
38
|
+
aiws change start <change-id> --hooks --worktree
|
|
39
|
+
fi
|
|
40
|
+
else
|
|
41
|
+
aiws change start <change-id> --hooks --no-switch
|
|
42
|
+
fi
|
|
43
|
+
```
|
|
44
|
+
- 若上一步创建了 worktree:后续 bug 证据、CSV 更新、`$ws-dev` 修复都必须在该 worktree 中继续;不要回原工作区重复创建 change
|
|
45
|
+
- 若该 change 涉及 submodule:
|
|
46
|
+
- 优先复用 `$ws-dev` 的 `submodules.targets` 生成/确认流程
|
|
47
|
+
- detached HEAD 时默认建议取 `.gitmodules` 声明的分支
|
|
48
|
+
- 已附着在某个本地分支时默认建议取当前分支
|
|
49
|
+
- 以上都只是建议值,最终必须显式写入 `changes/<change-id>/submodules.targets`
|
|
50
|
+
|
|
51
|
+
建议流程(按顺序):
|
|
52
|
+
|
|
53
|
+
## 1) 通过禅道 MCP 拉取 bug
|
|
54
|
+
- 使用当前会话中已启用的 zentao MCP 工具获取:
|
|
55
|
+
- `bug_id`、标题、优先级/严重级、模块、状态、指派人
|
|
56
|
+
- 重现步骤、期望结果、实际结果
|
|
57
|
+
- 附件列表(含图片 URL/文件名)
|
|
58
|
+
- 若当前环境没有 zentao MCP 工具:立即停止并提示用户先配置,不要猜数据。
|
|
59
|
+
|
|
60
|
+
## 2) 证据落盘(强制)
|
|
61
|
+
在当前 active change 上下文的 `changes/<change-id>/bug/` 下落盘:
|
|
62
|
+
- `zentao-bug-<bug-id>.json`:原始字段快照(避免信息丢失)
|
|
63
|
+
- `zentao-bug-<bug-id>.md`:人类可读摘要(复现步骤/期望/实际/风险)
|
|
64
|
+
- `images/<bug-id>/...`:下载的图片附件(保留原扩展名)
|
|
65
|
+
|
|
66
|
+
建议目录:
|
|
67
|
+
```text
|
|
68
|
+
changes/<change-id>/bug/
|
|
69
|
+
zentao-bug-<bug-id>.json
|
|
70
|
+
zentao-bug-<bug-id>.md
|
|
71
|
+
images/<bug-id>/
|
|
72
|
+
```
|
|
73
|
+
|
|
74
|
+
## 3) 汇总到 issues/fix_bus_issues.csv(upsert)
|
|
75
|
+
- 目标文件:当前 active change 上下文中的 `issues/fix_bus_issues.csv`
|
|
76
|
+
- 若文件不存在,先创建表头:
|
|
77
|
+
```csv
|
|
78
|
+
Bug_ID,Title,Severity,Module,Status,Assigned_To,Change_ID,Image_Count,Image_Paths,Evidence_Path,Verify_Command,Fix_Status,Updated_At,Notes
|
|
79
|
+
```
|
|
80
|
+
- 以 `Bug_ID` 为主键 upsert:
|
|
81
|
+
- 已存在:更新状态/证据/图片路径
|
|
82
|
+
- 不存在:新增一行
|
|
83
|
+
|
|
84
|
+
字段约束:
|
|
85
|
+
- `Change_ID`:必须等于当前 `change-id`
|
|
86
|
+
- `Evidence_Path`:指向 `changes/<change-id>/bug/zentao-bug-<bug-id>.md`
|
|
87
|
+
- `Image_Paths`:多个路径用 `;` 分隔
|
|
88
|
+
- `Fix_Status`:`TODO|DOING|DONE|BLOCKED`
|
|
89
|
+
|
|
90
|
+
## 4) 修复执行与回填
|
|
91
|
+
- 进入 `$ws-dev` 做最小改动修复;若 `ws-bugfix` 创建了 worktree,则必须在该 worktree 中继续。
|
|
92
|
+
- 完成后回填 `issues/fix_bus_issues.csv`:
|
|
93
|
+
- `Fix_Status`
|
|
94
|
+
- `Verify_Command`
|
|
95
|
+
- `Updated_At`
|
|
96
|
+
- `Notes`(必要时写阻塞原因)
|
|
97
|
+
|
|
98
|
+
## 5) 验证与交付
|
|
99
|
+
```bash
|
|
100
|
+
aiws change validate <change-id> --strict
|
|
101
|
+
aiws validate . --stamp
|
|
102
|
+
```
|
|
103
|
+
- 需要提交时走 `$ws-commit`。
|
|
104
|
+
- 需要收尾合并时走 `$ws-finish`(或在 superproject + submodule 场景走 `$ws-deliver`)。
|
|
105
|
+
|
|
106
|
+
输出要求:
|
|
107
|
+
- `Change_ID:` `<change-id>`
|
|
108
|
+
- `Change context:` `<当前分支或 worktree 路径>`
|
|
109
|
+
- `CSV:` `issues/fix_bus_issues.csv` 中对应 `Bug_ID` 行的关键字段
|
|
110
|
+
- `Evidence:` `changes/<change-id>/bug/zentao-bug-<bug-id>.md` + 图片目录
|
|
111
|
+
- `Verify:` 实际运行命令与结果(未运行不声称已运行)
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: ws-commit
|
|
3
|
+
description: 提交(当前分支可直提;submodule 感知;先审计/门禁再 commit)
|
|
4
|
+
---
|
|
5
|
+
|
|
6
|
+
用中文输出(命令/路径/代码标识符保持原样不翻译)。
|
|
7
|
+
|
|
8
|
+
目标:
|
|
9
|
+
- 支持在**当前分支直接提交**(不要求必须先切 `change/<change-id>`)
|
|
10
|
+
- 提交前审计与证据落盘(`$ws-review`)
|
|
11
|
+
- 提交前门禁校验与证据落盘(`aiws validate . --stamp`)
|
|
12
|
+
- 最后执行 `git commit`(commit 前必须让用户确认 message;不使用 `--no-verify` 绕过 hooks)
|
|
13
|
+
- 若仓库含 submodule:提交前识别并提示正确顺序(先 submodule,再 superproject)
|
|
14
|
+
- 若你经常遇到 submodule detached:建议日常拉取使用 `$ws-pull`(尽量把 submodule “挂回分支”且不改变 gitlink commit)
|
|
15
|
+
|
|
16
|
+
安全约束(强制):
|
|
17
|
+
- 不自动 `git add -A`(避免误提交);只在用户明确指示时才执行 staging 命令
|
|
18
|
+
- 不自动 push
|
|
19
|
+
- 不写入任何 secrets
|
|
20
|
+
- 检测到 submodule 有未提交改动时,不允许直接提交 superproject(先处理 submodule)
|
|
21
|
+
- commit message 优先使用中文(命令/路径/代码标识符保持原样不翻译);格式建议:`<类型>: <简述>`(例如 `修复: 登录页空指针`、`功能: 新增 submodule targets 校验`、`重构: 提取共享脚本`)
|
|
22
|
+
- 若启用了 `.githooks/commit-msg`:默认按仓库角色区分
|
|
23
|
+
- superproject / root 仓库(存在 `.gitmodules`)默认允许自由 commit message
|
|
24
|
+
- submodule / 普通仓库默认提示优先中文
|
|
25
|
+
- 只有在 `git config aiws.commitMessagePolicy strict` 时才会拒绝全英文首行(`Merge/Revert/fixup!/squash!` 例外)
|
|
26
|
+
|
|
27
|
+
阶段定位:
|
|
28
|
+
- commit gate;负责在提交前收敛 review、validate 和 message 确认,不允许跳过 hooks。
|
|
29
|
+
|
|
30
|
+
必需输入:
|
|
31
|
+
- 当前分支与 staged diff
|
|
32
|
+
- `$ws-review` 生成的审计证据
|
|
33
|
+
- `aiws validate . --stamp` 生成的校验证据
|
|
34
|
+
- 用户确认后的 commit message
|
|
35
|
+
|
|
36
|
+
必需输出:
|
|
37
|
+
- `证据(Evidence):` review 文件路径 + validate stamp 路径
|
|
38
|
+
- `上下文(Context):` 当前分支、submodule 检测结果、阻断原因(若有)
|
|
39
|
+
- `提交信息(Commit):` 最终提交信息
|
|
40
|
+
|
|
41
|
+
阻断条件:
|
|
42
|
+
- 没有 staged changes
|
|
43
|
+
- submodule 工作区不干净或 detached 处理不完整
|
|
44
|
+
- 用户未确认 commit message
|
|
45
|
+
- validate 失败
|
|
46
|
+
|
|
47
|
+
完成判定:
|
|
48
|
+
- 提交已完成,证据路径明确,且没有通过 `--no-verify` 绕过门禁。
|
|
49
|
+
|
|
50
|
+
执行步骤(建议):
|
|
51
|
+
1) 运行 `$ws-preflight`(确保真值文件就绪)。
|
|
52
|
+
2) 运行 `$ws-review`(优先生成审计证据:`changes/<change-id>/review/codex-review.md`;无 `change-id` 时回退 `.agentdocs/tmp/review/codex-review.md`)。
|
|
53
|
+
3) 运行门禁校验并写 stamp:
|
|
54
|
+
```bash
|
|
55
|
+
if [[ -x "./node_modules/.bin/aiws" ]]; then
|
|
56
|
+
./node_modules/.bin/aiws validate . --stamp
|
|
57
|
+
elif command -v aiws >/dev/null 2>&1; then
|
|
58
|
+
aiws validate . --stamp
|
|
59
|
+
else
|
|
60
|
+
npx @aipper/aiws validate . --stamp
|
|
61
|
+
fi
|
|
62
|
+
```
|
|
63
|
+
4) 输出当前提交上下文(必须输出给用户确认):
|
|
64
|
+
```bash
|
|
65
|
+
git branch --show-current
|
|
66
|
+
git status --porcelain
|
|
67
|
+
```
|
|
68
|
+
5) 检测是否存在 submodule(有则进入 submodule 感知模式):
|
|
69
|
+
```bash
|
|
70
|
+
if [[ -f .gitmodules ]]; then
|
|
71
|
+
git config --file .gitmodules --get-regexp '^submodule\..*\.path$' || true
|
|
72
|
+
else
|
|
73
|
+
echo "[info] no .gitmodules"
|
|
74
|
+
fi
|
|
75
|
+
```
|
|
76
|
+
6) 若存在 submodule,逐个检查子仓库工作区是否干净:
|
|
77
|
+
```bash
|
|
78
|
+
while read -r _ sub_path; do
|
|
79
|
+
[[ -z "${sub_path:-}" ]] && continue
|
|
80
|
+
echo "== submodule: ${sub_path} =="
|
|
81
|
+
git -C "${sub_path}" rev-parse --abbrev-ref HEAD 2>/dev/null || true
|
|
82
|
+
git -C "${sub_path}" status --porcelain || true
|
|
83
|
+
done < <(git config --file .gitmodules --get-regexp '^submodule\..*\.path$' 2>/dev/null || true)
|
|
84
|
+
```
|
|
85
|
+
判定规则(强制):
|
|
86
|
+
- 任一 submodule `git status --porcelain` 非空:停止 superproject commit,先在对应 submodule 完成 commit,再回到 superproject 更新并提交 gitlink。
|
|
87
|
+
- 若该 submodule 当前为 detached HEAD:先按 `.gitmodules` 的目标分支挂到 `aiws/pin/<target_branch>`;不要直接切 `change/<change-id>` / `main` / `master` 来“解 detached”。
|
|
88
|
+
处理指引(detached submodule):
|
|
89
|
+
```bash
|
|
90
|
+
cur_branch="$(git branch --show-current)"
|
|
91
|
+
change_id="$(echo "${cur_branch}" | sed -n 's|^change/||p')"
|
|
92
|
+
targets="changes/${change_id}/submodules.targets"
|
|
93
|
+
|
|
94
|
+
source tools/ws_resolve_sub_target.sh
|
|
95
|
+
ws_resolve_sub_target "${sub_path}" "${sub_name}" "${targets}" "${cur_branch}" || exit 2
|
|
96
|
+
target_branch="${_resolved_branch}"
|
|
97
|
+
remote="${_resolved_remote}"
|
|
98
|
+
|
|
99
|
+
git -C "${sub_path}" fetch "${remote}" --prune
|
|
100
|
+
if ! git -C "${sub_path}" show-ref --verify --quiet "refs/remotes/${remote}/${target_branch}"; then
|
|
101
|
+
echo "error: missing ${remote}/${target_branch} for submodule path=${sub_path}"
|
|
102
|
+
exit 2
|
|
103
|
+
fi
|
|
104
|
+
git -C "${sub_path}" checkout -B "aiws/pin/${target_branch}" HEAD
|
|
105
|
+
git -C "${sub_path}" branch --set-upstream-to "${remote}/${target_branch}" "aiws/pin/${target_branch}" >/dev/null 2>&1 || true
|
|
106
|
+
```
|
|
107
|
+
7) 检查当前 staging 内容(必须输出给用户确认):
|
|
108
|
+
```bash
|
|
109
|
+
git status --porcelain
|
|
110
|
+
git diff --staged --submodule=short
|
|
111
|
+
```
|
|
112
|
+
8) 若没有 staged changes:停止并提示用户先明确要提交哪些文件(例如 `git add -p` 或 `git add <path>`)。
|
|
113
|
+
9) 生成中文 commit message 草案(格式:`<类型>: <简述>`),输出给用户确认后再执行。
|
|
114
|
+
- 类型参考:`功能` / `修复` / `重构` / `文档` / `测试` / `构建` / `杂项`
|
|
115
|
+
- 简述用一句话概括本次改动的"为什么"而非"改了什么"
|
|
116
|
+
- 命令/路径/代码标识符保持原样不翻译
|
|
117
|
+
- 若用户给出全英文 message:优先改写成中文;若用户明确要求保留英文,也可以提交(但 strict 模式下会被 hook 拒绝)
|
|
118
|
+
10) 执行提交(不带 `--no-verify`):
|
|
119
|
+
```bash
|
|
120
|
+
git commit -m "<message>"
|
|
121
|
+
```
|
|
122
|
+
11) 输出提交结果(可选):
|
|
123
|
+
```bash
|
|
124
|
+
git show --stat --oneline -1
|
|
125
|
+
```
|
|
126
|
+
|
|
127
|
+
输出要求:
|
|
128
|
+
- `证据(Evidence):` `changes/<change-id>/review/codex-review.md`(无 `change-id` 时回退 `.agentdocs/tmp/review/codex-review.md`) + `.agentdocs/tmp/aiws-validate/*.json`
|
|
129
|
+
- `上下文(Context):` 当前分支 + 是否检测到 submodule + 若阻断则给出阻断原因
|
|
130
|
+
- `提交信息(Commit):` 最终使用的 commit message(仅当用户确认后)
|
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: ws-deliver
|
|
3
|
+
description: 交付(submodules + superproject 分步提交,并安全合并回目标分支)
|
|
4
|
+
---
|
|
5
|
+
|
|
6
|
+
用中文输出(命令/路径/代码标识符保持原样不翻译)。
|
|
7
|
+
|
|
8
|
+
目标:
|
|
9
|
+
- 适配 superproject + submodule(数量不固定)的交付收尾:
|
|
10
|
+
1) 先逐个提交 submodule(每个 repo 单独确认 commit message)
|
|
11
|
+
2) 再提交 superproject(包含 submodule gitlink 指针更新 + 变更工件/代码)
|
|
12
|
+
3) 最后 fast-forward 合并回目标分支(复用 `aiws change finish`,减少手动 merge 出错)
|
|
13
|
+
|
|
14
|
+
非目标(强制):
|
|
15
|
+
- 不自动 `git add -A`(避免误提交)
|
|
16
|
+
- 不自动 push
|
|
17
|
+
- 不自动删除分支
|
|
18
|
+
|
|
19
|
+
前置(强制):
|
|
20
|
+
1) 先运行 `$ws-preflight`。
|
|
21
|
+
2) 确认当前处于 change 分支(推荐):`change/<change-id>`(也支持 `changes/`、`ws/`、`ws-change/`)。
|
|
22
|
+
- 若不在 change 分支:要求用户先切换到 `change/<change-id>`(或在命令里显式提供 `<change-id>`)。
|
|
23
|
+
3) 任何自动提交都必须在提交前输出:
|
|
24
|
+
- 该 repo 的 `git status --porcelain`
|
|
25
|
+
- 该 repo 的 `git diff --staged`
|
|
26
|
+
并让用户确认 commit message(每个 repo 单独确认)。
|
|
27
|
+
|
|
28
|
+
阶段定位:
|
|
29
|
+
- delivery 阶段;负责在多 repo / submodule 场景下完成顺序提交、证据收敛和最终合并前准备。
|
|
30
|
+
|
|
31
|
+
必需输入:
|
|
32
|
+
- 当前 `change/<change-id>` 上下文
|
|
33
|
+
- 若存在 submodule:`.gitmodules` + `changes/<change-id>/submodules.targets`
|
|
34
|
+
- 各 repo 当前状态与 staged diff
|
|
35
|
+
|
|
36
|
+
必需输出:
|
|
37
|
+
- `Submodules:` 每个 submodule 的提交摘要
|
|
38
|
+
- `Superproject:` 主仓库提交摘要
|
|
39
|
+
- `Evidence:` validate stamp 与持久证据路径
|
|
40
|
+
- `Next:` 进入 `$ws-finish` 或 `aiws change finish`
|
|
41
|
+
|
|
42
|
+
阻断条件:
|
|
43
|
+
- 不在正确的 change 上下文
|
|
44
|
+
- submodule branch / targets 真值不完整
|
|
45
|
+
- 任一 repo 未确认 commit message 或存在未处理冲突
|
|
46
|
+
|
|
47
|
+
完成判定:
|
|
48
|
+
- submodule 与 superproject 提交都已完成,证据已收敛,且可以安全进入 finish 阶段。
|
|
49
|
+
|
|
50
|
+
建议流程(按顺序):
|
|
51
|
+
|
|
52
|
+
## 0) submodule branch 真值检查(减少 detached 与人为差异)
|
|
53
|
+
如果存在 `.gitmodules` 但缺少 `submodule.<name>.branch`,先运行 `$ws-submodule-setup` 并提交 `.gitmodules`,否则后续 `aiws validate .` 会失败,且 `ws-pull/ws-finish` 无法确定性工作。
|
|
54
|
+
> 说明:若同一 superproject 分支内存在多渠道 submodule 目标分支的交付需求,可在 `changes/<change-id>/submodules.targets` 额外声明本次 change 的目标分支;交付时会优先使用该文件(不改变 `.gitmodules` 的团队默认真值)。
|
|
55
|
+
> 生成该文件时,可以按当前状态做默认预填,但必须显式说明来源并让用户确认:detached HEAD 默认建议取 `.gitmodules` 声明分支;已附着在某个本地分支时默认建议取当前分支;finish/push 最终只认 `submodules.targets`。
|
|
56
|
+
```bash
|
|
57
|
+
if [[ -f .gitmodules ]]; then
|
|
58
|
+
missing=0
|
|
59
|
+
while read -r key sub_path; do
|
|
60
|
+
name="${key#submodule.}"; name="${name%.path}"
|
|
61
|
+
b="$(git config --file .gitmodules --get "submodule.${name}.branch" 2>/dev/null || true)"
|
|
62
|
+
if [[ -z "${b:-}" ]]; then
|
|
63
|
+
echo "error: missing .gitmodules submodule.${name}.branch (path=${sub_path})"
|
|
64
|
+
missing=1
|
|
65
|
+
fi
|
|
66
|
+
done < <(git config --file .gitmodules --get-regexp '^submodule\\..*\\.path$' 2>/dev/null || true)
|
|
67
|
+
if [[ "$missing" -ne 0 ]]; then
|
|
68
|
+
echo "hint: run $ws-submodule-setup (and commit .gitmodules), then retry"
|
|
69
|
+
exit 2
|
|
70
|
+
fi
|
|
71
|
+
|
|
72
|
+
# 强约束:当 .gitmodules 声明 submodules 时,要求本次 change 存在 submodules.targets 且覆盖所有 submodule path
|
|
73
|
+
if git config --file .gitmodules --get-regexp '^submodule\\..*\\.path$' >/dev/null 2>&1; then
|
|
74
|
+
change_id="$(git branch --show-current | sed -n 's|^change/||p')"
|
|
75
|
+
targets="changes/${change_id}/submodules.targets"
|
|
76
|
+
if [[ ! -f "${targets}" ]]; then
|
|
77
|
+
echo "error: missing ${targets} (required when .gitmodules declares submodules)"
|
|
78
|
+
exit 2
|
|
79
|
+
fi
|
|
80
|
+
t_missing=0
|
|
81
|
+
while read -r _ sub_path; do
|
|
82
|
+
[[ -z "${sub_path:-}" ]] && continue
|
|
83
|
+
if ! awk -v p="${sub_path}" '$1==p && $0 !~ /^[[:space:]]*#/ && $2!="" { found=1 } END { exit(found?0:1) }' "${targets}" 2>/dev/null; then
|
|
84
|
+
echo "error: ${targets} missing entry for submodule path=${sub_path}"
|
|
85
|
+
t_missing=1
|
|
86
|
+
fi
|
|
87
|
+
done < <(git config --file .gitmodules --get-regexp '^submodule\\..*\\.path$' 2>/dev/null || true)
|
|
88
|
+
if [[ "${t_missing}" -ne 0 ]]; then
|
|
89
|
+
echo "hint: fill ${targets} as: <path> <target_branch> [remote]"
|
|
90
|
+
exit 2
|
|
91
|
+
fi
|
|
92
|
+
fi
|
|
93
|
+
fi
|
|
94
|
+
```
|
|
95
|
+
|
|
96
|
+
## A) 发现 submodules 清单(数量不固定)
|
|
97
|
+
在 superproject 根目录执行:
|
|
98
|
+
```bash
|
|
99
|
+
git submodule status --recursive
|
|
100
|
+
```
|
|
101
|
+
如果没有 submodule:跳到 C)。
|
|
102
|
+
|
|
103
|
+
## B) 逐个提交 submodules(先 submodule,后 superproject)
|
|
104
|
+
对每个 submodule path(可递归)重复以下步骤(建议按 `git submodule status --recursive` 顺序):
|
|
105
|
+
1) 定位并检查状态:
|
|
106
|
+
```bash
|
|
107
|
+
sub_path="<path>"
|
|
108
|
+
git -C "$sub_path" branch --show-current
|
|
109
|
+
git -C "$sub_path" status --porcelain
|
|
110
|
+
```
|
|
111
|
+
2) 先确定该 submodule 的目标分支来源,并显式说明给用户:
|
|
112
|
+
- `branch --show-current` 非空:默认建议用当前分支
|
|
113
|
+
- `branch --show-current` 为空(detached HEAD):默认建议用 `.gitmodules` 的 `submodule.<name>.branch`
|
|
114
|
+
- 若建议值与 `changes/<change-id>/submodules.targets` 已落盘值不一致:以 `submodules.targets` 为准,并先提示差异
|
|
115
|
+
3) 若 submodule 处于 detached HEAD(`branch --show-current` 为空):
|
|
116
|
+
- 说明:这通常是因为 superproject 的 gitlink checkout(例如 `git submodule update`)导致 detached。
|
|
117
|
+
- 不要直接切 `change/<change-id>` / `main` / `master` 来解 detached。
|
|
118
|
+
- 若你要在该 submodule 里提交:先按目标分支挂到 pin 分支 `aiws/pin/<target-branch>`,再在其上提交:
|
|
119
|
+
- 目标分支真值优先级:`changes/<change-id>/submodules.targets`(若存在)> `.gitmodules submodule.<name>.branch`
|
|
120
|
+
```bash
|
|
121
|
+
change_id="<change-id>"
|
|
122
|
+
targets="changes/${change_id}/submodules.targets"
|
|
123
|
+
sub_name="$(git config --file .gitmodules --get-regexp '^submodule\\..*\\.path$' 2>/dev/null | awk -v p="${sub_path}" '$2==p { name=$1; sub(/^submodule\\./,"",name); sub(/\\.path$/,"",name); print name; exit }')"
|
|
124
|
+
base_branch="$(python3 - <<'PY'
|
|
125
|
+
import json, pathlib
|
|
126
|
+
change_id = "<change-id>"
|
|
127
|
+
meta = pathlib.Path("changes") / change_id / ".ws-change.json"
|
|
128
|
+
data = json.loads(meta.read_text(encoding="utf-8"))
|
|
129
|
+
print((data.get("base_branch") or "").strip())
|
|
130
|
+
PY
|
|
131
|
+
)"
|
|
132
|
+
test -n "${sub_name}"
|
|
133
|
+
test -n "${base_branch}"
|
|
134
|
+
|
|
135
|
+
source tools/ws_resolve_sub_target.sh
|
|
136
|
+
ws_resolve_sub_target "${sub_path}" "${sub_name}" "${targets}" "${base_branch}" || exit 2
|
|
137
|
+
target_branch="${_resolved_branch}"
|
|
138
|
+
remote="${_resolved_remote}"
|
|
139
|
+
|
|
140
|
+
git -C "$sub_path" fetch "${remote}" --prune
|
|
141
|
+
if ! git -C "$sub_path" show-ref --verify --quiet "refs/remotes/${remote}/${target_branch}"; then
|
|
142
|
+
echo "error: missing ${remote}/${target_branch} for submodule path=${sub_path}"
|
|
143
|
+
exit 2
|
|
144
|
+
fi
|
|
145
|
+
git -C "$sub_path" checkout -B "aiws/pin/${target_branch}" HEAD
|
|
146
|
+
git -C "$sub_path" branch --set-upstream-to "${remote}/${target_branch}" "aiws/pin/${target_branch}" >/dev/null 2>&1 || true
|
|
147
|
+
```
|
|
148
|
+
- 若 `origin/<target-branch>` 不存在,或用户明确不想使用 pin 分支:停止,解释风险(提交可能不可追溯/难以推送)。
|
|
149
|
+
4) 选择性 staging(默认用 `-p` 更安全):
|
|
150
|
+
```bash
|
|
151
|
+
git -C "$sub_path" add -p
|
|
152
|
+
git -C "$sub_path" diff --staged --stat
|
|
153
|
+
git -C "$sub_path" diff --staged
|
|
154
|
+
```
|
|
155
|
+
5) AI 生成该 submodule 的 commit message(标题+可选 body),并让用户确认(每个 repo 单独确认)。
|
|
156
|
+
6) 执行提交(不带 `--no-verify`):
|
|
157
|
+
```bash
|
|
158
|
+
git -C "$sub_path" commit -m "<message>"
|
|
159
|
+
```
|
|
160
|
+
7) 若该 submodule 没有 staged changes:跳过(不要硬提交空 commit)。
|
|
161
|
+
|
|
162
|
+
## C) 提交 superproject(更新 gitlinks + 自身改动 + changes 工件)
|
|
163
|
+
1) 先检查 submodule 指针差异(gitlinks):
|
|
164
|
+
```bash
|
|
165
|
+
git diff --submodule
|
|
166
|
+
```
|
|
167
|
+
2) 选择性 staging:
|
|
168
|
+
- 先 stage 发生指针变化的 submodule 路径(明确列出):
|
|
169
|
+
```bash
|
|
170
|
+
git add <submodule-path-1> <submodule-path-2>
|
|
171
|
+
```
|
|
172
|
+
- 再 stage superproject 自身改动(默认 `-p`):
|
|
173
|
+
```bash
|
|
174
|
+
git add -p
|
|
175
|
+
git diff --staged --stat
|
|
176
|
+
git diff --staged
|
|
177
|
+
```
|
|
178
|
+
3) AI 生成 superproject 的 commit message(应包含 `bump submodule <name> -> <sha>` 等关键信息),并让用户确认。
|
|
179
|
+
4) 提交:
|
|
180
|
+
```bash
|
|
181
|
+
git commit -m "<message>"
|
|
182
|
+
```
|
|
183
|
+
|
|
184
|
+
## D) 门禁与证据(推荐)
|
|
185
|
+
```bash
|
|
186
|
+
if [[ -x "./node_modules/.bin/aiws" ]]; then
|
|
187
|
+
./node_modules/.bin/aiws validate . --stamp
|
|
188
|
+
elif command -v aiws >/dev/null 2>&1; then
|
|
189
|
+
aiws validate . --stamp
|
|
190
|
+
else
|
|
191
|
+
npx @aipper/aiws validate . --stamp
|
|
192
|
+
fi
|
|
193
|
+
```
|
|
194
|
+
|
|
195
|
+
## D2) 生成持久证据并回填 Evidence_Path(强烈建议)
|
|
196
|
+
> 说明:`.agentdocs/tmp/...` 默认 gitignored;交付前建议把关键结果落到 `changes/<change-id>/evidence/...` 并回填 `proposal.md`/`plan` 的 `Evidence_Path`,避免后续评审/二次会话读不到证据。
|
|
197
|
+
```bash
|
|
198
|
+
change_id="<change-id>"
|
|
199
|
+
if [[ -x "./node_modules/.bin/aiws" ]]; then
|
|
200
|
+
./node_modules/.bin/aiws change evidence "${change_id}"
|
|
201
|
+
elif command -v aiws >/dev/null 2>&1; then
|
|
202
|
+
aiws change evidence "${change_id}"
|
|
203
|
+
else
|
|
204
|
+
npx @aipper/aiws change evidence "${change_id}"
|
|
205
|
+
fi
|
|
206
|
+
```
|
|
207
|
+
|
|
208
|
+
## D3) 生成状态快照(可选,建议)
|
|
209
|
+
```bash
|
|
210
|
+
aiws change state "${change_id}" --write
|
|
211
|
+
```
|
|
212
|
+
|
|
213
|
+
## E) 安全合并回目标分支(fast-forward)
|
|
214
|
+
优先使用 `$ws-finish`(底层调用 `aiws change finish`,并在 push 成功后清理对应 change worktree)。
|
|
215
|
+
|
|
216
|
+
若需要显式指定目标分支:
|
|
217
|
+
```bash
|
|
218
|
+
aiws change finish <change-id> --into <base-branch>
|
|
219
|
+
```
|
|
220
|
+
|
|
221
|
+
## F) 归档说明
|
|
222
|
+
- 标准链路下不需要再单独执行 `aiws change archive <change-id>`。
|
|
223
|
+
- 进入 `$ws-finish` 并使用 `aiws change finish --push` 时,会自动完成 archive + handoff。
|
|
224
|
+
|
|
225
|
+
输出要求:
|
|
226
|
+
- `Submodules:` 每个 submodule 的分支/提交摘要(repo → commit sha → message)
|
|
227
|
+
- `Superproject:` 提交摘要
|
|
228
|
+
- `Merge:` `aiws change finish` 的输出(into/from)
|
|
229
|
+
- `Worktree cleanup:` 若存在独立 change worktree,输出清理结果(removed/skipped + reason)
|
|
230
|
+
- `Evidence:` `.agentdocs/tmp/aiws-validate/*.json`(若使用 --stamp)
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: ws-dev
|
|
3
|
+
description: 开发(按需求实现并验证;适用于任何需要修改代码/配置的任务)
|
|
4
|
+
---
|
|
5
|
+
|
|
6
|
+
用中文输出(命令/路径/代码标识符保持原样不翻译)。
|
|
7
|
+
|
|
8
|
+
目标:在 AIWS 约束下完成一个可回放、可验证的小步交付。
|
|
9
|
+
|
|
10
|
+
阶段定位:
|
|
11
|
+
- implementation 阶段;负责在既定计划/需求绑定下完成最小实现与验证。
|
|
12
|
+
|
|
13
|
+
必需输入:
|
|
14
|
+
- 真值文件:`AI_PROJECT.md` / `REQUIREMENTS.md` / `AI_WORKSPACE.md`
|
|
15
|
+
- 当前任务的归因目标(`Req_ID` 或 `Problem_ID`)
|
|
16
|
+
- 若为 medium/complex:已通过 `$ws-plan` / `$ws-plan-verify` 的计划
|
|
17
|
+
- 当前 `change/<change-id>` 上下文或等价变更归因
|
|
18
|
+
|
|
19
|
+
必需输出:
|
|
20
|
+
- `变更文件(Changed):` 实际改动清单
|
|
21
|
+
- `验证(Verify):` 实际运行的命令与结果说明
|
|
22
|
+
- `证据(Evidence):` `plan/...`、`changes/<change-id>/...`、`.agentdocs/tmp/...` 等证据路径
|
|
23
|
+
- `Next:` 若准备提交,建议 `$ws-review` 或 `$ws-commit`
|
|
24
|
+
|
|
25
|
+
阻断条件:
|
|
26
|
+
- 无法把改动归因到 `REQUIREMENTS.md` 或问题单
|
|
27
|
+
- 没有可复现验证入口
|
|
28
|
+
- 需要创建 change 上下文但当前工作区状态不允许安全切换
|
|
29
|
+
|
|
30
|
+
完成判定:
|
|
31
|
+
- 改动已落盘、验证已执行或明确未执行原因、证据路径可回放,并可进入 review/commit 阶段。
|
|
32
|
+
|
|
33
|
+
建议流程:
|
|
34
|
+
1) 先做 preflight:定位项目根目录,读取 `AI_PROJECT.md` / `REQUIREMENTS.md` / `AI_WORKSPACE.md`,输出约束摘要。
|
|
35
|
+
- 若是中大型任务:建议先用 `$ws-plan` 生成 `plan/` 工件,再进入实现(便于可回放与对齐验证入口)。
|
|
36
|
+
- 若已有 `plan/` 工件:先执行 `$ws-plan-verify`;通过后再进入实现(防止计划过长/跑偏)。
|
|
37
|
+
- 若 `$ws-plan` 刚创建了 `change/<change-id>` worktree:后续实现必须在该 worktree 中继续;不要回到原工作区重复 `aiws change start ...`
|
|
38
|
+
2) 建立变更归因(推荐):
|
|
39
|
+
- ⚠️ 若你准备执行 `aiws change start ... --switch/--worktree` 或手工 `git switch ...` 改变 checkout 上下文,先确认工作区状态:`git status --porcelain`。否则切分支/创建 worktree 后,未提交改动可能看起来丢了(worktree 只从 `HEAD` checkout,未提交内容会留在原目录)。
|
|
40
|
+
- 若当前目录已经是 `change/<change-id>` worktree(例如由 `$ws-plan` 创建):直接在这里继续,不要再创建第二个 worktree,也不要回原工作区写代码。
|
|
41
|
+
- 若 `git status --porcelain` 非空仅因为上一轮 `$ws-plan` / `aiws change new|sync` 生成了 `plan/...`、`changes/<change-id>/proposal.md`、`tasks.md`、`design.md`、`submodules.targets`,这是预期行为,不等于流程出错。处理方式:
|
|
42
|
+
- 已经在 `change/<change-id>` 分支:直接继续实现,并把这些文件作为计划/证据工件保留。
|
|
43
|
+
- 还没进入 `change/<change-id>`:先运行 `aiws change start <change-id> --hooks --no-switch` 建立 change 上下文;若你仍要 `--switch/--worktree`,先提交这些规划工件,再切换上下文。
|
|
44
|
+
- 强制(当你准备执行 `aiws change start ... --worktree/--switch` 创建新 change 时):先同步线上代码(含 submodules),避免基线过旧导致的 rebase/冲突与别人已更新但本地没拉的协作摩擦。
|
|
45
|
+
- 若你已经在 `change/<change-id>` 上继续开发:不要在此处强制 pull(避免把远端变动拉进变更分支);改为按需 `git fetch`/rebase,并保持门禁与验证可复现。
|
|
46
|
+
- 在 AI 工具中运行:`$ws-pull`(推荐;会在工作区不干净时阻断)
|
|
47
|
+
- 或等价手工(必须工作区干净;失败则停止并人工处理):
|
|
48
|
+
```bash
|
|
49
|
+
cur="$(git branch --show-current)"
|
|
50
|
+
if [[ "${cur}" =~ ^(change|changes|ws|ws-change)/ ]]; then
|
|
51
|
+
echo "info: already on change branch (${cur}); skip pull here"
|
|
52
|
+
else
|
|
53
|
+
git status --porcelain
|
|
54
|
+
git pull --ff-only
|
|
55
|
+
if [[ -f .gitmodules ]]; then
|
|
56
|
+
git submodule sync --recursive
|
|
57
|
+
git submodule update --init --recursive
|
|
58
|
+
fi
|
|
59
|
+
fi
|
|
60
|
+
```
|
|
61
|
+
- 推荐更安全(默认):`aiws change start <change-id> --hooks --no-switch`(只创建分支/工件 + 启用 hooks;不切分支)
|
|
62
|
+
- 准备进入实现时:若当前已在 `change/<change-id>` 直接继续;若需切换到该分支,先确认除规划工件外无额外未提交改动,再执行:`git switch change/<change-id>`
|
|
63
|
+
- 若你明确要一键切分支(不推荐,且 dirty 会被拦截):`aiws change start <change-id> --hooks --switch`
|
|
64
|
+
- superproject + submodule(推荐):`aiws change start <change-id> --hooks --worktree --submodules`(创建独立 worktree;当前目录分支保持不变;会在新 worktree 内初始化 submodules;若忘了 `--submodules` 也会强制初始化)
|
|
65
|
+
- 若后续需要在 detached submodule 内提交:先挂到 `aiws/pin/<target-branch>`;不要直接切 `change/<change-id>` / `main` / `master`
|
|
66
|
+
- 若仓库存在 submodule(`.gitmodules` 声明了 submodule 条目):进入编码前必须准备好 `changes/<change-id>/submodules.targets`,并把每个 submodule 挂到对应的 `aiws/pin/<target_branch>`(必要时切到 `<remote>/<target_branch>`;这可能会改变 superproject 的 gitlink 指针,属于预期的选渠道行为;缺失该文件会被门禁阻断)
|
|
67
|
+
- 允许用当前 submodule 状态来做默认预填,但必须显式说明来源,并最终落盘到 `submodules.targets`:
|
|
68
|
+
- detached HEAD:默认建议取 `.gitmodules` 中声明的 `submodule.<name>.branch`
|
|
69
|
+
- 已附着在某个本地分支:默认建议取该 submodule 的当前分支名
|
|
70
|
+
- 上述两条都只是建议值,不是运行时真值;真正的 finish/push 只认 `changes/<change-id>/submodules.targets`
|
|
71
|
+
```bash
|
|
72
|
+
change_id="<change-id>"
|
|
73
|
+
targets="changes/${change_id}/submodules.targets"
|
|
74
|
+
has_submodules=0
|
|
75
|
+
if [[ -f .gitmodules ]]; then
|
|
76
|
+
if git config --file .gitmodules --get-regexp '^submodule\\..*\\.path$' >/dev/null 2>&1; then
|
|
77
|
+
has_submodules=1
|
|
78
|
+
fi
|
|
79
|
+
fi
|
|
80
|
+
if [[ "${has_submodules}" -eq 1 && ! -f "${targets}" ]]; then
|
|
81
|
+
echo "error: missing ${targets} (required when .gitmodules declares submodules)"
|
|
82
|
+
echo "hint: create it first; defaults may be inferred, but the final truth must be written explicitly"
|
|
83
|
+
exit 2
|
|
84
|
+
fi
|
|
85
|
+
|
|
86
|
+
if [[ -f "${targets}" ]]; then
|
|
87
|
+
echo "info: applying submodule targets: ${targets}"
|
|
88
|
+
while read -r sub_path target_branch remote; do
|
|
89
|
+
[[ -z "${sub_path:-}" ]] && continue
|
|
90
|
+
[[ "${sub_path}" == \#* ]] && continue
|
|
91
|
+
[[ -z "${target_branch:-}" ]] && { echo "error: missing target_branch for path=${sub_path}"; exit 2; }
|
|
92
|
+
remote="${remote:-origin}"
|
|
93
|
+
|
|
94
|
+
echo "== submodule: ${sub_path} target=${remote}/${target_branch} =="
|
|
95
|
+
if [[ -n "$(git -C "${sub_path}" status --porcelain 2>/dev/null)" ]]; then
|
|
96
|
+
echo "error: submodule dirty: ${sub_path} (commit/stash first)"
|
|
97
|
+
exit 2
|
|
98
|
+
fi
|
|
99
|
+
git -C "${sub_path}" fetch "${remote}" --prune
|
|
100
|
+
# 选渠道:默认切到远端目标分支,并用 pin 分支承载本地提交(避免 detached)
|
|
101
|
+
git -C "${sub_path}" checkout -B "aiws/pin/${target_branch}" "${remote}/${target_branch}"
|
|
102
|
+
git -C "${sub_path}" branch --set-upstream-to "${remote}/${target_branch}" "aiws/pin/${target_branch}" >/dev/null 2>&1 || true
|
|
103
|
+
git -C "${sub_path}" status -sb
|
|
104
|
+
done < "${targets}"
|
|
105
|
+
|
|
106
|
+
# 检查 superproject 的 gitlink 是否发生变化(预期:若切了不同渠道,会看到差异)
|
|
107
|
+
git diff --submodule
|
|
108
|
+
fi
|
|
109
|
+
```
|
|
110
|
+
- 若你还没写 `submodules.targets`,可按下面方式先生成建议值,再人工确认后落盘:
|
|
111
|
+
```bash
|
|
112
|
+
change_id="<change-id>"
|
|
113
|
+
targets="changes/${change_id}/submodules.targets"
|
|
114
|
+
: > "${targets}"
|
|
115
|
+
|
|
116
|
+
git config --file .gitmodules --get-regexp '^submodule\\..*\\.path$' 2>/dev/null | while read -r key sub_path; do
|
|
117
|
+
name="${key#submodule.}"; name="${name%.path}"
|
|
118
|
+
current_branch="$(git -C "${sub_path}" branch --show-current 2>/dev/null || true)"
|
|
119
|
+
declared_branch="$(git config --file .gitmodules --get "submodule.${name}.branch" 2>/dev/null || true)"
|
|
120
|
+
|
|
121
|
+
if [[ -n "${current_branch}" ]]; then
|
|
122
|
+
inferred_branch="${current_branch}"
|
|
123
|
+
inferred_from="current branch"
|
|
124
|
+
else
|
|
125
|
+
inferred_branch="${declared_branch}"
|
|
126
|
+
inferred_from=".gitmodules"
|
|
127
|
+
fi
|
|
128
|
+
|
|
129
|
+
if [[ -z "${inferred_branch}" ]]; then
|
|
130
|
+
echo "error: cannot infer target branch for ${sub_path}; set it manually"
|
|
131
|
+
exit 2
|
|
132
|
+
fi
|
|
133
|
+
|
|
134
|
+
printf "%s %s\n" "${sub_path}" "${inferred_branch}" >> "${targets}"
|
|
135
|
+
echo "info: ${sub_path} -> ${inferred_branch} (inferred from ${inferred_from}; remote defaults to origin unless you edit ${targets})"
|
|
136
|
+
done
|
|
137
|
+
|
|
138
|
+
echo "review required: ${targets}"
|
|
139
|
+
cat "${targets}"
|
|
140
|
+
```
|
|
141
|
+
- 若你明确要在 superproject 直接切分支:`aiws change start <change-id> --hooks --switch`(仅在存在 `.gitmodules` 时有意义;会尝试让 submodules 工作区跟随 superproject 指针)
|
|
142
|
+
- 或手工:`git switch -c change/<change-id>`,并创建 `changes/<change-id>/proposal.md` 与 `changes/<change-id>/tasks.md`(参考 `changes/README.md`)
|
|
143
|
+
3) 若需要外部 / 子 agent 协作:
|
|
144
|
+
- 分析结论落盘到 `changes/<change-id>/analysis/`
|
|
145
|
+
- patch 草案落盘到 `changes/<change-id>/patches/`
|
|
146
|
+
- 不要把 `patches/` 当成“已应用代码”;主 agent 必须先审查再决定是否采用
|
|
147
|
+
- 若采用了委托结果,后续在 `ws-review` 或 `changes/<change-id>/review/` 中收敛最终结论
|
|
148
|
+
4) 如涉及需求调整:先做需求评审(可用 `$ws-req-review`)→ 用户确认后再做需求落盘(可用 `$ws-req-change`)(避免需求漂移)。
|
|
149
|
+
5) 实施最小改动:任何改动都要能归因到 `REQUIREMENTS.md`(验收)或 `issues/problem-issues.csv`(问题)。
|
|
150
|
+
6) 运行 `AI_WORKSPACE.md` 里声明的验证命令;未运行不声称已运行。
|
|
151
|
+
7) 多步任务(≥2 步):使用 `update_plan` 工具跟踪 `pending → in_progress → completed`,每完成一步立即更新(不要事后批量更新)。
|
|
152
|
+
8) 提交前强制门禁(commit/push hooks 也会阻断):
|
|
153
|
+
```bash
|
|
154
|
+
if [[ -x "./node_modules/.bin/aiws" ]]; then
|
|
155
|
+
./node_modules/.bin/aiws validate .
|
|
156
|
+
elif command -v aiws >/dev/null 2>&1; then
|
|
157
|
+
aiws validate .
|
|
158
|
+
else
|
|
159
|
+
npx @aipper/aiws validate .
|
|
160
|
+
fi
|
|
161
|
+
```
|
|
162
|
+
9) 若使用了协同工件,交付前建议执行 `aiws change evidence <change-id>`,把 review / validate / collaboration summary 收敛到 `changes/<change-id>/evidence/`。
|
|
163
|
+
10) 交付收尾(推荐,减少手动 merge 出错):运行 `$ws-finish`(底层调用 `aiws change finish`,默认 fast-forward 安全合并回目标分支)。
|
|
164
|
+
|
|
165
|
+
输出要求:
|
|
166
|
+
- `变更文件(Changed):` 文件清单
|
|
167
|
+
- `验证(Verify):` 实际运行的命令 + 期望结果
|
|
168
|
+
- `证据(Evidence):` 证据路径(例如 `changes/<change-id>/review/...`、`plan/...`、`.agentdocs/tmp/aiws-validate/...` 或 `changes/<change-id>/...`)
|