@aipper/aiws 0.0.27 → 0.0.29

package/README.md

@@ -12,7 +12,7 @@
 - `aiws change ...`：变更工件工作流
 - `aiws dashboard serve`：本地 change/dashboard API
 - `aiws hooks install/status`
-- `aiws opencode status`
+- `aiws opencode status/supervise`
 - `aiws codex install-skills/status-skills/uninstall-skills`
 
 支持工具：
@@ -55,6 +55,8 @@ AI 工具内：
 - simple/local 单点修复：`$ws-dev-lite`
 - 常规实现：`$ws-dev`
 - 中大型任务：`$ws-plan` → `$ws-plan-verify` → `$ws-dev`
+- OpenCode/oMo 自动 bootstrap：`/ws-auto`
+- OpenCode/oMo 自主协作实验：`/ws-autonomy`
 - 提交前：`$ws-review` / `$ws-commit`
 - 交付前：`$ws-deliver` / `$ws-finish`
 
@@ -75,7 +77,7 @@ aiws validate [path] [--stamp]
 aiws rollback [path] <timestamp|latest>
 
 aiws change new <change-id> [--no-design]
-aiws change start <change-id> [--switch|--no-switch|--worktree]
+aiws change start <change-id> [--switch|--no-switch]
 aiws change status [change-id]
 aiws change next [change-id]
 aiws change sync [change-id]
@@ -87,6 +89,8 @@ aiws dashboard serve [--host 127.0.0.1] [--port 3456]
 aiws hooks install [path]
 aiws hooks status [path]
 aiws opencode status [path]
+aiws opencode auto [path] [--session <name>] [--window <name>] [--once] [--poll-ms <ms>] [--no-update]
+aiws opencode supervise [path] [--session <name>] [--window <name>] [--once] [--poll-ms <ms>]
 aiws codex install-skills
 aiws codex status-skills
 aiws codex uninstall-skills
@@ -116,6 +120,18 @@ aiws codex uninstall-skills
 
 目标是统一 workflow 入口，不保证工具自动发现或自动加载。
 
+OpenCode/oMo 补充：
+- `.opencode/oh-my-opencode.json.example` 提供 autonomy 示例配置（`prompt_append` / `backgroundTasks` / `experimental.auto_resume`）
+- 同一份 oMo 示例配置还会声明 approval whitelist policy（只读命令 + evidence 写路径；宿主权限保持 `manual-only`）
+- `.claude/settings.json.example` 提供 hook 兼容层示例
+- `.opencode/helpers/approval-whitelist-check.sh` 把 whitelist policy 转成 `allow/deny/manual` 判定，并落审计日志
+- `.opencode/helpers/approval-whitelist-run.sh` 在 `allow` 时执行简单命令，并落执行摘要
+- `.opencode/helpers/approval-whitelist-watchdog.sh` 轮询队列并调用 runner，适合外部蜂群/守护进程接入
+- `/ws-auto` 会先触发 `aiws opencode auto .`：必要时刷新托管内容，再按条件确保 watchdog 已在 tmux 中运行
+- `aiws opencode auto .` 会在需要时自动执行 `aiws update .`；若 oMo 已启用且 tmux 可用，再继续启动 watchdog
+- `aiws opencode supervise .` 会显式确保 tmux 中已有一个 watchdog window；若当前不在 tmux，则会为该工作区起一个 detached session
+- `.opencode/helpers/tmux-swarm-scan.sh` / `tmux-swarm-rescue.sh` 提供可选的 tmux 巡检与安全救援 helper
+
 ## 运行要求
 
 - Node.js >= 20

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@aipper/aiws",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "AI Workspace CLI (init/update/validate) for Claude Code / OpenCode / Codex.",
   "type": "module",
   "bin": {
     "aiws": "./bin/aiws.js"
   },
   "dependencies": {
-    "@aipper/aiws-spec": "0.0.27"
+    "@aipper/aiws-spec": "0.0.29"
   },
   "files": [
     "bin",

package/src/cli.js

@@ -2,6 +2,16 @@ import { readFileSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { UserError } from "./errors.js";
+import { wsPullCommand } from "./commands/ws-pull.js";
+import { wsPushCommand } from "./commands/ws-push.js";
+import { wsMigrateCommand } from "./commands/ws-migrate.js";
+import { wsSubmoduleSetupCommand } from "./commands/ws-submodule-setup.js";
+import { wsCommitCommand } from "./commands/ws-commit.js";
+import { wsPlanVerifyCommand } from "./commands/ws-plan-verify.js";
+import { wsVerifyBeforeCompleteCommand } from "./commands/ws-verify-before-complete.js";
+import { wsHandoffCommand } from "./commands/ws-handoff.js";
+import { wsFinishCommand } from "./commands/ws-finish.js";
+import { wsDeliverCommand } from "./commands/ws-deliver.js";
 import { initCommand } from "./commands/init.js";
 import { updateCommand } from "./commands/update.js";
 import { validateCommand } from "./commands/validate.js";
@@ -14,6 +24,8 @@ import { codexStatusSkillsCommand } from "./commands/codex-status-skills.js";
 import { codexUninstallSkillsCommand } from "./commands/codex-uninstall-skills.js";
 import { hooksInstallCommand } from "./commands/hooks-install.js";
 import { hooksStatusCommand } from "./commands/hooks-status.js";
+import { opencodeAutoCommand } from "./commands/opencode-auto.js";
+import { opencodeSuperviseCommand } from "./commands/opencode-supervise.js";
 import { opencodeStatusCommand } from "./commands/opencode-status.js";
 import { dashboardServeCommand } from "./commands/dashboard.js";
 import {
@@ -260,6 +272,42 @@ export async function cliMain(argv) {
           await opencodeStatusCommand({ targetPath });
           return 0;
         }
+        case "auto": {
+          const { positionals, options } = parseArgs(args, {
+            session: { type: "string" },
+            window: { type: "string" },
+            once: { type: "boolean" },
+            "poll-ms": { type: "string" },
+            "no-update": { type: "boolean" },
+          });
+          const targetPath = positionals[0] ?? ".";
+          await opencodeAutoCommand({
+            targetPath,
+            sessionName: options.session,
+            windowName: options.window,
+            once: options.once === true,
+            pollMs: options["poll-ms"],
+            noUpdate: options["no-update"] === true,
+          });
+          return 0;
+        }
+        case "supervise": {
+          const { positionals, options } = parseArgs(args, {
+            session: { type: "string" },
+            window: { type: "string" },
+            once: { type: "boolean" },
+            "poll-ms": { type: "string" },
+          });
+          const targetPath = positionals[0] ?? ".";
+          await opencodeSuperviseCommand({
+            targetPath,
+            sessionName: options.session,
+            windowName: options.window,
+            once: options.once === true,
+            pollMs: options["poll-ms"],
+          });
+          return 0;
+        }
         default:
           throw new UserError(`Unknown opencode subcommand: ${sub}`, { details: "Use `aiws opencode --help` to see available subcommands." });
       }
@@ -283,15 +331,12 @@ export async function cliMain(argv) {
             "no-switch": { type: "boolean" },
             switch: { type: "boolean" },
             "allow-dirty": { type: "boolean" },
-            worktree: { type: "boolean" },
-            "worktree-dir": { type: "string" },
-            submodules: { type: "boolean" },
           });
           const changeId = positionals[0] ?? "";
           if (!changeId)
             throw new UserError("change start requires <change-id>", {
               details:
-                "Usage: aiws change start <change-id> [--title <title>] [--no-design] [--hooks] [--no-switch] [--switch] [--allow-dirty] [--worktree] [--worktree-dir <path>] [--submodules]",
+                "Usage: aiws change start <change-id> [--title <title>] [--no-design] [--hooks] [--no-switch] [--switch] [--allow-dirty]",
             });
           await changeStartCommand({
             changeId,
@@ -301,9 +346,6 @@ export async function cliMain(argv) {
             noSwitch: options["no-switch"] === true,
             forceSwitch: options.switch === true,
             allowDirty: options["allow-dirty"] === true,
-            worktree: options.worktree === true,
-            worktreeDir: options["worktree-dir"],
-            submodules: options.submodules === true,
           });
           return 0;
         }
@@ -439,6 +481,65 @@ export async function cliMain(argv) {
       }
       throw new UserError(`Unknown metrics subcommand: ${sub}`, { details: "Use `aiws metrics --help` to see available subcommands." });
     }
+    case "pull":
+      await wsPullCommand({ cwd: args[0] || "." });
+      return 0;
+    case "push": {
+      const { positionals, options } = parseArgs(args, { remote: { type: "string" } });
+      await wsPushCommand({ cwd: positionals[0] || ".", remote: options.remote || "origin" });
+      return 0;
+    }
+    case "migrate":
+      await wsMigrateCommand({ cwd: args[0] || "." });
+      return 0;
+    case "submodule-setup": {
+      const { positionals, options } = parseArgs(args, { branch: { type: "string" } });
+      await wsSubmoduleSetupCommand({ cwd: positionals[0] || ".", branch: options.branch || "main" });
+      return 0;
+    }
+    case "commit": {
+      const { positionals, options } = parseArgs(args, { message: { type: "string" }, m: { type: "string" } });
+      const message = options.message || options.m;
+      await wsCommitCommand({ cwd: positionals[0] || ".", message });
+      return 0;
+    }
+    case "plan-verify":
+      await wsPlanVerifyCommand({ cwd: args[0] || "." });
+      return 0;
+    case "verify-bc":
+      await wsVerifyBeforeCompleteCommand({ cwd: args[0] || "." });
+      return 0;
+    case "handoff":
+      await wsHandoffCommand({ cwd: args[0] || "." });
+      return 0;
+    case "finish": {
+      const { positionals, options } = parseArgs(args, {
+        into: { type: "string" },
+        push: { type: "boolean" },
+        remote: { type: "string" },
+      });
+      await wsFinishCommand({
+        cwd: ".",
+        changeId: positionals[0],
+        into: options.into,
+        push: options.push === true,
+        remote: options.remote || "origin",
+      });
+      return 0;
+    }
+    case "deliver": {
+      const { positionals, options } = parseArgs(args, {
+        message: { type: "string" },
+        m: { type: "string" },
+      });
+      const message = options.message || options.m;
+      await wsDeliverCommand({
+        cwd: ".",
+        changeId: positionals[0],
+        message,
+      });
+      return 0;
+    }
     default:
       throw new UserError(`Unknown command: ${cmd}`, { details: "Use --help to see available commands." });
   }
@@ -452,6 +553,16 @@ Usage:
   aiws update [path]
   aiws validate [path] [--stamp]
   aiws rollback [path] <timestamp|latest>
+  aiws pull [path]
+  aiws push [path] [--remote <name>]
+  aiws migrate [path]
+  aiws commit [path] [-m <message>]
+  aiws plan-verify [path]
+  aiws verify-bc [path]
+  aiws handoff [path]
+  aiws submodule-setup [path] [--branch <name>]
+  aiws finish [change-id] [--into <branch>] [--push] [--remote <name>]
+  aiws deliver [change-id] [-m <message>]
   aiws change <subcommand>
   aiws metrics <subcommand>
   aiws dashboard <subcommand>
@@ -507,10 +618,14 @@ function printOpenCodeHelp() {
 
 Usage:
   aiws opencode status [path]
+  aiws opencode auto [path] [--session <name>] [--window <name>] [--once] [--poll-ms <ms>] [--no-update]
+  aiws opencode supervise [path] [--session <name>] [--window <name>] [--once] [--poll-ms <ms>]
 
 Notes:
   - Detects project-local .opencode/ and oh-my-opencode (oMo) config.
+  - auto can refresh managed OpenCode autonomy files via \`aiws update .\` when needed, then ensure watchdog is running in tmux.
   - Helps verify whether AIWS OpenCode skills should prefer oMo agents or fallback to standard-opencode.
+  - supervise explicitly ensures the approval watchdog is running in tmux; it does not auto-approve host permissions.
 `);
 }
 
@@ -534,7 +649,7 @@ function printChangeHelp() {
 
 Usage:
   aiws change list
-  aiws change start <change-id> [--title <title>] [--no-design] [--hooks] [--no-switch] [--switch] [--allow-dirty] [--worktree] [--worktree-dir <path>]
+  aiws change start <change-id> [--title <title>] [--no-design] [--hooks] [--no-switch] [--switch] [--allow-dirty]
   aiws change finish [change-id] [--into <branch> | --base <branch>] [--push] [--remote <name>]
   aiws change new <change-id> [--title <title>] [--no-design]
   aiws change status [change-id]
@@ -554,10 +669,8 @@ Notes:
   - Execution quality gate first: aiws change validate [change-id] --strict
     (equivalent to running $ws-plan-verify in AI tools).
   - status/next now prioritize quality-gate guidance before coding ($ws-dev-lite / $ws-dev).
-  - start refuses to switch/create worktree with a dirty working tree (unless --allow-dirty).
-  - finish --push is submodule-aware: when .gitmodules exists it pushes submodules first, then the target branch, then safely cleans the separate change worktree if possible.
-  - If .gitmodules exists and you didn't specify --switch/--no-switch/--worktree,
-    start will prefer --worktree (fallback: --no-switch) to avoid switching the superproject branch.
+  - start refuses to switch branches with a dirty working tree (unless --allow-dirty).
+  - finish --push is submodule-aware: when .gitmodules exists it pushes submodules first, then the target branch.
   - archive runs strict validation and (by default) requires all tasks checked.
   - archive --force also bypasses truth drift gating (not recommended).
 `);

package/src/commands/change-advice.js

@@ -1,23 +1,3 @@
-import path from "node:path";
-
-/**
- * @param {string} gitRoot
- * @param {string} changeId
- * @param {{
- *   listGitWorktrees: (gitRoot: string) => Promise<Array<{ worktree: string, branch: string }>>
- * }} deps
- */
-export async function resolveChangeWorktreeHint(gitRoot, changeId, deps) {
-  try {
-    const worktrees = await deps.listGitWorktrees(gitRoot);
-    const changeRef = `refs/heads/change/${changeId}`;
-    const changeWorktree = worktrees.find((worktree) => String(worktree.branch || "") === changeRef)?.worktree || "";
-    return changeWorktree && path.resolve(changeWorktree) !== path.resolve(gitRoot) ? changeWorktree : "";
-  } catch {
-    return "";
-  }
-}
-
 /**
  * @param {string} gitRoot
  * @param {string} changeId
@@ -25,7 +5,6 @@ export async function resolveChangeWorktreeHint(gitRoot, changeId, deps) {
  *   computeChangeStatus: (gitRoot: string, changeId: string) => Promise<any>,
  *   currentBranch: (gitRoot: string) => Promise<string>,
  *   inferChangeIdFromBranch: (branch: string) => string,
- *   listGitWorktrees: (gitRoot: string) => Promise<Array<{ worktree: string, branch: string }>>,
  *   changeDirAbs: (gitRoot: string, changeId: string) => string,
  *   governanceGuidanceLines: (status: any) => Promise<string[]>,
  *   scopeGateFailureAction: (changeId: string) => string,
@@ -60,12 +39,6 @@ export async function computeChangeNextAdvice(gitRoot, changeId, deps) {
     advice.actions.push(`当前分支为 \`${branch}\`（非 change 分支）：建议 \`aiws change start ${changeId} --hooks --switch\` 或 \`git switch change/${changeId}\``);
   }
 
-  const changeWorktree = await resolveChangeWorktreeHint(gitRoot, changeId, deps);
-  if (changeWorktree) {
-    advice.actions.push(`change/${changeId} 分支在另一个 worktree：\`cd ${changeWorktree}\`（建议在该目录执行开发/交付相关命令）`);
-    advice.prohibitions.push("不要在当前 worktree 继续写代码（很可能不在 change 分支上）");
-  }
-
   if (status.metaState !== "ok") advice.actions.push(`补齐元信息并建立真值基线：\`aiws change sync ${changeId}\``);
   if (status.driftFiles.length > 0) {
     advice.actions.push("真值/合同已变化：先对齐 `AI_PROJECT.md` / `AI_WORKSPACE.md` / `REQUIREMENTS.md` 与 proposal/tasks");
@@ -106,6 +79,14 @@ export async function computeChangeNextAdvice(gitRoot, changeId, deps) {
   if (status.blockersStrict.length === 0 && status.tasks.unchecked > 0) {
     advice.actions.push("质量门通过后继续开发：simple/local 单点修复优先 `$ws-dev-lite`；否则 `$ws-dev`");
   }
+  if (
+    status.blockersStrict.length === 0 &&
+    status.tasks.unchecked === 0 &&
+    Number(status?.reviewSignals?.effectiveCount || 0) > 0 &&
+    Number(status?.reviewGates?.summary?.dualReviewMissingCount || 0) > 0
+  ) {
+    advice.actions.push("已有通用 review，但 dual review gate 未完成：继续补齐 `$ws-spec-review` / `$ws-quality-review`，不要把 `codex-review.md` 当成 finish gate");
+  }
   if ((status.collaboration?.counts?.analysis || 0) > 0 && (status.collaboration?.counts?.review || 0) === 0) {
     advice.actions.push("已有委托分析但还没有 review 汇总结论：建议在 `changes/<id>/review/` 落盘结论后再交付");
   }

package/src/commands/change-finish.js

@@ -22,61 +22,6 @@ export async function resolvePushTarget(gitRoot, branch, preferredRemote, deps)
   return { remote, remoteBranch, refspec, trackedRemote, trackedMergeRef };
 }
 
-/**
- * @param {string} gitRoot
- * @param {string} worktreePath
- * @param {{
- *   checkGitClean: (gitRoot: string) => Promise<{ clean: true } | { clean: false, details: string }>,
- *   listGitWorktrees: (gitRoot: string) => Promise<Array<{ worktree: string, locked: boolean, lockReason: string }>>,
- *   pathExists: (path: string) => Promise<boolean>,
- *   runCommand: typeof import("../exec.js").runCommand,
- *   UserError: typeof import("../errors.js").UserError
- * }} deps
- */
-export async function cleanupWorktreePath(gitRoot, worktreePath, deps) {
-  const abs = path.resolve(worktreePath);
-  if (abs === path.resolve(gitRoot)) {
-    return { status: "skipped", reason: "current_worktree", worktree: abs };
-  }
-
-  const worktrees = await deps.listGitWorktrees(gitRoot);
-  const worktreeEntry = worktrees.find((worktree) => path.resolve(worktree.worktree) === abs);
-  if (worktreeEntry?.locked) {
-    return { status: "skipped", reason: "locked", worktree: abs, details: worktreeEntry.lockReason };
-  }
-
-  if (!(await deps.pathExists(abs))) {
-    const prune = await deps.runCommand("git", ["worktree", "prune"], { cwd: gitRoot });
-    if (prune.code !== 0) {
-      throw new deps.UserError("Failed to prune stale git worktree metadata.", { details: prune.stderr || prune.stdout });
-    }
-    return { status: "pruned-missing", worktree: abs };
-  }
-
-  const clean = await deps.checkGitClean(abs);
-  if (!clean.clean) {
-    return { status: "skipped", reason: "dirty", worktree: abs, details: clean.details };
-  }
-
-  let rm = await deps.runCommand("git", ["worktree", "remove", abs], { cwd: gitRoot });
-  if (rm.code !== 0) {
-    const out = `${rm.stderr || ""}\n${rm.stdout || ""}`;
-    if (out.includes("working trees containing submodules cannot be moved or removed")) {
-      rm = await deps.runCommand("git", ["worktree", "remove", "--force", abs], { cwd: gitRoot });
-    }
-  }
-  if (rm.code !== 0) {
-    throw new deps.UserError("Failed to remove change worktree.", { details: rm.stderr || rm.stdout });
-  }
-
-  const prune = await deps.runCommand("git", ["worktree", "prune"], { cwd: gitRoot });
-  if (prune.code !== 0) {
-    throw new deps.UserError("Failed to prune git worktree metadata after remove.", { details: prune.stderr || prune.stdout });
-  }
-
-  return { status: "removed", worktree: abs };
-}
-
 /**
  * @param {string} gitRoot
  * @param {{ pathExists: (path: string) => Promise<boolean>, runCommand: typeof import("../exec.js").runCommand }} deps
@@ -194,14 +139,14 @@ async function ensureRevisionAvailable(targetRepoPath, sha, fallbackRepoPath, de
     });
   }
   if (!(await gitHasRevision(fallback, sha, deps))) {
-    throw new deps.UserError("Required submodule commit is missing in both target and change worktrees.", {
-      details: `target_repo: ${targetRepoPath}\nchange_repo: ${fallback}\ncommit: ${sha}`,
+    throw new deps.UserError("Required submodule commit is missing in both target and fallback repos.", {
+      details: `target_repo: ${targetRepoPath}\nfallback_repo: ${fallback}\ncommit: ${sha}`,
     });
   }
   const fetch = await deps.runCommand("git", ["-C", targetRepoPath, "fetch", fallback, sha], { cwd: targetRepoPath });
   if (fetch.code !== 0 || !(await gitHasRevision(targetRepoPath, sha, deps))) {
-    throw new deps.UserError("Failed to import submodule commit from change worktree.", {
-      details: `target_repo: ${targetRepoPath}\nchange_repo: ${fallback}\ncommit: ${sha}\n\n${fetch.stderr || fetch.stdout}`,
+    throw new deps.UserError("Failed to import submodule commit from fallback repo.", {
+      details: `target_repo: ${targetRepoPath}\nfallback_repo: ${fallback}\ncommit: ${sha}\n\n${fetch.stderr || fetch.stdout}`,
     });
   }
 }
@@ -260,7 +205,6 @@ async function pushSubmoduleBranch(repoPath, remote, branch, sha, deps) {
  * @param {string} gitRoot
  * @param {string} changeId
  * @param {string} baseBranch
- * @param {string | undefined} changeWorktreePath
  * @param {{
  *   pathExists: (path: string) => Promise<boolean>,
  *   readText: (path: string) => Promise<string>,
@@ -268,7 +212,7 @@ async function pushSubmoduleBranch(repoPath, remote, branch, sha, deps) {
  *   UserError: typeof import("../errors.js").UserError
  * }} deps
  */
-export async function pushSubmodulesForFinish(gitRoot, changeId, baseBranch, changeWorktreePath, deps) {
+export async function pushSubmodulesForFinish(gitRoot, changeId, baseBranch, deps) {
   const subs = await listSubmodulesFromGitmodules(gitRoot, deps);
   if (subs.length === 0) return { processed: 0 };
 
@@ -316,24 +260,19 @@ export async function pushSubmodulesForFinish(gitRoot, changeId, baseBranch, cha
 
   for (const spec of specs) {
     const targetRepoPath = path.join(gitRoot, spec.path);
-    const changeRepoPath = changeWorktreePath ? path.join(changeWorktreePath, spec.path) : "";
-    const targetRepoReady = await isGitRepository(targetRepoPath, deps);
-    const changeRepoReady = changeRepoPath ? await isGitRepository(changeRepoPath, deps) : false;
-    if (!targetRepoReady && !changeRepoReady) {
-      throw new deps.UserError("Submodule repository is not initialized in either target or change worktree.", {
-        details: `path: ${spec.path}\nHint: initialize submodules before finish, or keep using worktree mode for changes involving submodules.`,
+    if (!(await isGitRepository(targetRepoPath, deps))) {
+      throw new deps.UserError("Submodule repository is not initialized.", {
+        details: `path: ${spec.path}\nHint: initialize submodules before finish.`,
       });
     }
 
-    const sourceRepoPath =
-      (targetRepoReady && (await gitHasRevision(targetRepoPath, spec.sha, deps))) ? targetRepoPath : changeRepoReady ? changeRepoPath : targetRepoPath;
-    if (!(await gitHasRevision(sourceRepoPath, spec.sha, deps))) {
+    if (!(await gitHasRevision(targetRepoPath, spec.sha, deps))) {
       throw new deps.UserError("Merged submodule gitlink commit is not available locally.", {
-        details: `path: ${spec.path}\ncommit: ${spec.sha}\nsource_repo: ${sourceRepoPath}`,
+        details: `path: ${spec.path}\ncommit: ${spec.sha}`,
       });
     }
 
-    const pushResult = await pushSubmoduleBranch(sourceRepoPath, spec.remote, spec.branch, spec.sha, deps);
+    const pushResult = await pushSubmoduleBranch(targetRepoPath, spec.remote, spec.branch, spec.sha, deps);
     console.log(
       `submodule push: ${spec.path} (${spec.remote} ${spec.branch}${pushResult.status === "pushed" ? ` <= ${spec.sha}` : ", already contained"})`,
     );
@@ -341,7 +280,7 @@ export async function pushSubmodulesForFinish(gitRoot, changeId, baseBranch, cha
 
   const sync = await deps.runCommand("git", ["submodule", "update", "--init", "--recursive"], { cwd: gitRoot });
   if (sync.code !== 0) {
-    throw new deps.UserError("Submodule push succeeded, but failed to sync target worktree submodules.", {
+    throw new deps.UserError("Submodule push succeeded, but failed to sync submodules in target repo.", {
       details: sync.stderr || sync.stdout,
     });
   }
@@ -351,16 +290,16 @@ export async function pushSubmodulesForFinish(gitRoot, changeId, baseBranch, cha
     if (!(await isGitRepository(targetRepoPath, deps))) {
       throw new deps.UserError("Submodule repo missing after sync.", { details: `path: ${spec.path}` });
     }
-    await ensureRevisionAvailable(targetRepoPath, spec.sha, changeWorktreePath ? path.join(changeWorktreePath, spec.path) : "", deps);
+    await ensureRevisionAvailable(targetRepoPath, spec.sha, "", deps);
     const fetch = await deps.runCommand("git", ["-C", targetRepoPath, "fetch", spec.remote, "--prune"], { cwd: targetRepoPath });
     if (fetch.code !== 0) {
-      throw new deps.UserError("Failed to refresh target worktree submodule remote.", {
+      throw new deps.UserError("Failed to refresh target submodule remote.", {
         details: `path: ${spec.path}\nremote: ${spec.remote}\n\n${fetch.stderr || fetch.stdout}`,
       });
     }
     const checkout = await deps.runCommand("git", ["-C", targetRepoPath, "checkout", "-B", spec.pinBranch, spec.sha], { cwd: targetRepoPath });
     if (checkout.code !== 0) {
-      throw new deps.UserError("Failed to attach target worktree submodule to pin branch.", {
+      throw new deps.UserError("Failed to attach target submodule to pin branch.", {
         details: `path: ${spec.path}\npin_branch: ${spec.pinBranch}\ncommit: ${spec.sha}\n\n${checkout.stderr || checkout.stdout}`,
       });
     }
@@ -379,7 +318,6 @@ export async function pushSubmodulesForFinish(gitRoot, changeId, baseBranch, cha
  *   assertValidChangeId: (changeId: string) => void,
  *   checkGitClean: (gitRoot: string) => Promise<{ clean: true } | { clean: false, details: string }>,
  *   currentBranch: (gitRoot: string) => Promise<string>,
- *   listGitWorktrees: (gitRoot: string) => Promise<Array<{ worktree: string, branch: string }>>,
  *   pathExists: (path: string) => Promise<boolean>,
  *   readText: (path: string) => Promise<string>,
  *   resolveChangeId: (gitRoot: string, changeId: string | undefined, options: { command: string }) => Promise<string>,
@@ -465,20 +403,11 @@ export async function resolveFinishContext(gitRoot, options, deps) {
     throw new deps.UserError("change finish: target branch cannot be the change branch.", { details: `target=${into}` });
   }
 
-  const worktrees = await deps.listGitWorktrees(gitRoot);
   const intoRef = `refs/heads/${into}`;
-  const intoWt = worktrees.find((worktree) => String(worktree.branch || "") === intoRef);
-  if (intoWt && path.resolve(intoWt.worktree) !== path.resolve(gitRoot)) {
-    throw new deps.UserError("Target branch is checked out in another worktree.", {
-      details: `branch: ${into}\nworktree: ${intoWt.worktree}\n\nHint: run finish in that worktree:\n  cd ${intoWt.worktree}\n  aiws change finish ${changeId}`,
-    });
-  }
-
   const hasIntoBranch = await deps.runCommand("git", ["show-ref", "--verify", "--quiet", intoRef], { cwd: gitRoot }).then((result) => result.code === 0);
   if (!hasIntoBranch) {
     throw new deps.UserError("Target branch does not exist.", { details: `branch: ${into}` });
   }
 
-  const changeWt = worktrees.find((worktree) => String(worktree.branch || "") === changeBranchRef);
-  return { changeId, changeBranch, changeBranchRef, into, cur, worktrees, changeWt };
+  return { changeId, changeBranch, changeBranchRef, into, cur };
 }

package/src/commands/change-next-command.js

@@ -118,7 +118,11 @@ export async function renderChangeNextOutput(input, deps) {
   } else {
     for (const recommendation of advice.recommended) lines.push(`- ${recommendation}`);
   }
-  lines.push("- 审计与证据（推荐）：在 AI 工具内运行 `/ws-review`（或按 AI_PROJECT.md 手工审计）");
+  if (Number(status?.reviewSignals?.effectiveCount || 0) === 0) {
+    lines.push("- 审计与证据（推荐）：在 AI 工具内运行 `/ws-review`（或按 AI_PROJECT.md 手工审计）");
+  } else if (Number(status?.reviewGates?.summary?.dualReviewMissingCount || 0) > 0) {
+    lines.push("- 已有通用 review，但 dual review gate 未齐：继续补 `$ws-spec-review` / `$ws-quality-review`，不要把 `codex-review.md` 当成 finish gate");
+  }
   const recommendedStage = String(status.governance?.recommendedStage || "");
   if (recommendedStage === "ws-finish") {
     lines.push(`- 收尾：\`aiws change finish ${changeId} --push\`（成功后会自动归档并生成 handoff）`);

package/src/commands/change-review-gates.js

@@ -51,6 +51,17 @@ function persistentEvidencePath(gitRoot, changeId, fileName) {
   return path.join(gitRoot, "changes", changeId, "evidence", fileName);
 }
 
+/**
+ * @param {string} gitRoot
+ * @param {string} changeId
+ */
+async function hasGenericReviewSignal(gitRoot, changeId) {
+  const persistentCodexReview = persistentReviewPath(gitRoot, changeId, "codex-review.md");
+  if (await pathExists(persistentCodexReview)) return true;
+  const tmpCodexReview = tmpReviewFallbackPath(gitRoot, "codex-review.md");
+  return await pathExists(tmpCodexReview);
+}
+
 /**
  * @param {string} gitRoot
  * @param {string} changeId
@@ -177,6 +188,7 @@ export async function collectReviewSignals(gitRoot, changeId, context, collabora
 export async function collectReviewGates(gitRoot, changeId, context) {
   const spec = await loadWorkflowReviewGates();
   const canAttributeTmpFallback = await canAttributeTmpReviewFallback(gitRoot, changeId, context);
+  const genericReviewSignal = canAttributeTmpFallback ? await hasGenericReviewSignal(gitRoot, changeId) : await pathExists(persistentReviewPath(gitRoot, changeId, "codex-review.md"));
 
   /** @type {Array<any>} */
   const gates = [];
@@ -239,6 +251,8 @@ export async function collectReviewGates(gitRoot, changeId, context) {
   if (!qualityReview?.ready) finishGateMissingIds.push("quality_review");
   if (!validateStamp.ready) finishGateMissingIds.push("validate_stamp");
   if (!verifyBeforeComplete?.ready) finishGateMissingIds.push("verify_before_complete");
+  const genericReviewOnly = genericReviewSignal && dualReviewMissingIds.length === 2;
+  const dualReviewPending = dualReviewMissingIds.length > 0;
 
   return {
     source: spec.source,
@@ -252,6 +266,8 @@ export async function collectReviewGates(gitRoot, changeId, context) {
     summary: {
       gateCount: gates.length,
       gateReadyCount: gates.filter((gate) => gate.ready).length,
+      genericReviewOnly,
+      dualReviewPending,
       dualReviewReady: dualReviewMissingIds.length === 0,
       dualReviewMissingIds,
       dualReviewMissingCount: dualReviewMissingIds.length,

package/src/commands/change-start.js

@@ -1,25 +1,5 @@
 import path from "node:path";
 
-/**
- * @param {string} gitRoot
- * @param {{
- *   hasHeadCommit: (gitRoot: string) => Promise<boolean>,
- *   runCommand: typeof import("../exec.js").runCommand
- * }} deps
- * @returns {Promise<{ ok: true } | { ok: false, reason: "no_commit" | "missing_truth", missing?: string[] }>}
- */
-export async function checkWorktreePrereqs(gitRoot, deps) {
-  if (!(await deps.hasHeadCommit(gitRoot))) return { ok: false, reason: "no_commit" };
-  /** @type {string[]} */
-  const missingInHead = [];
-  for (const rel of ["AI_PROJECT.md", "AI_WORKSPACE.md", "REQUIREMENTS.md"]) {
-    const ok = await deps.runCommand("git", ["cat-file", "-e", `HEAD:${rel}`], { cwd: gitRoot }).then((result) => result.code === 0);
-    if (!ok) missingInHead.push(rel);
-  }
-  if (missingInHead.length > 0) return { ok: false, reason: "missing_truth", missing: missingInHead };
-  return { ok: true };
-}
-
 /**
  * @param {string} changeDir
  * @param {string} baseBranch
@@ -52,21 +32,6 @@ export async function maybeRecordBaseBranch(changeDir, baseBranch, changeBranch,
   await deps.writeText(metaPath, JSON.stringify(meta, null, 2) + "\n");
 }
 
-/**
- * @param {string} gitRoot
- * @param {string | undefined} worktreeDir
- * @param {string} changeId
- */
-export function resolveDefaultWorktreeDir(gitRoot, worktreeDir, changeId) {
-  const parent = path.dirname(gitRoot);
-  const raw = String(worktreeDir || "").trim();
-  if (raw) {
-    return path.isAbsolute(raw) ? raw : path.resolve(parent, raw);
-  }
-  const repoName = path.basename(gitRoot);
-  return path.resolve(parent, `${repoName}-${changeId}`);
-}
-
 /**
  * @param {string} gitRoot
  * @param {{ branch: string, hasBranch: boolean, hasGitmodules: boolean }} options