@aipper/aiws 0.0.21 → 0.0.23

package/README.md

@@ -47,7 +47,7 @@ aiws codex <install-skills|status-skills|uninstall-skills|install-prompts|status
 
 ## Codex（repo skills 优先）
 
-- `aiws init .` 会生成 `.agents/skills/`（随仓库共享），在 Codex 中可显式调用（示例）：`$ws-preflight` / `$ws-plan` / `$ws-dev` / `$ws-review` / `$ws-commit`
+- `aiws init .` 会生成 `.agents/skills/`（随仓库共享），在 Codex 中可显式调用（示例）：`$ws-preflight` / `$ws-plan` / `$p-tasks-plan` / `$ws-handoff` / `$ws-dev` / `$ws-review` / `$ws-commit`
 - 交付收尾（submodules+superproject 分步提交 + 安全合并）：`$ws-deliver`
 - 收尾（安全合并回目标分支）：`$ws-finish`（底层调用 `aiws change finish`，默认 fast-forward）
 - 可选：安装全局 skills 到 `~/.codex/skills/`（或 `$CODEX_HOME/skills`）：

package/package.json

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

package/src/cli.js

@@ -260,6 +260,7 @@ export async function cliMain(argv) {
             hooks: { type: "boolean" },
             "no-switch": { type: "boolean" },
             switch: { type: "boolean" },
+            "allow-dirty": { type: "boolean" },
             worktree: { type: "boolean" },
             "worktree-dir": { type: "string" },
             submodules: { type: "boolean" },
@@ -268,7 +269,7 @@ export async function cliMain(argv) {
           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] [--worktree] [--worktree-dir <path>] [--submodules]",
+                "Usage: aiws change start <change-id> [--title <title>] [--no-design] [--hooks] [--no-switch] [--switch] [--allow-dirty] [--worktree] [--worktree-dir <path>] [--submodules]",
             });
           await changeStartCommand({
             changeId,
@@ -277,6 +278,7 @@ export async function cliMain(argv) {
             enableHooks: options.hooks === true,
             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,
@@ -490,7 +492,7 @@ function printChangeHelp() {
 
 Usage:
   aiws change list
-  aiws change start <change-id> [--title <title>] [--no-design] [--hooks] [--no-switch] [--switch] [--worktree] [--worktree-dir <path>] [--submodules]
+  aiws change start <change-id> [--title <title>] [--no-design] [--hooks] [--no-switch] [--switch] [--allow-dirty] [--worktree] [--worktree-dir <path>]
   aiws change finish [change-id] [--into <branch> | --base <branch>]
   aiws change new <change-id> [--title <title>] [--no-design]
   aiws change status [change-id]
@@ -510,6 +512,7 @@ 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).
+  - start refuses to switch/create worktree with a dirty working tree (unless --allow-dirty).
   - 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.
   - archive runs strict validation and (by default) requires all tasks checked.

package/src/commands/change.js

@@ -1417,7 +1417,7 @@ export async function changeNewCommand(options) {
 /**
  * aiws change start
  *
- * @param {{ changeId: string, title?: string, noDesign: boolean, enableHooks: boolean, noSwitch: boolean, forceSwitch: boolean, worktree: boolean, worktreeDir?: string, submodules: boolean }} options
+ * @param {{ changeId: string, title?: string, noDesign: boolean, enableHooks: boolean, noSwitch: boolean, forceSwitch: boolean, allowDirty?: boolean, worktree: boolean, worktreeDir?: string, submodules: boolean }} options
  */
 export async function changeStartCommand(options) {
   const gitRoot = await resolveGitRoot(process.cwd());
@@ -1429,6 +1429,7 @@ export async function changeStartCommand(options) {
   const startFromBranch = await currentBranch(gitRoot);
   const branch = `change/${changeId}`;
   const branchRef = `refs/heads/${branch}`;
+  const allowDirty = options.allowDirty === true;
 
   if (options.worktree === true && options.noSwitch === true) {
     throw new UserError("change start: cannot combine --worktree with --no-switch");
@@ -1468,6 +1469,24 @@ export async function changeStartCommand(options) {
     console.error("warn: recommended for submodules: aiws change start <change-id> --worktree");
   }
 
+  if (!allowDirty && (effectiveWorktree || !effectiveNoSwitch)) {
+    const clean = await checkGitClean(gitRoot);
+    if (!clean.clean) {
+      const mode = effectiveWorktree ? "worktree" : "switch";
+      throw new UserError(`Refusing to start change with a dirty working tree (${mode} mode).`, {
+        details:
+          `${clean.details}\n\n` +
+          `Why: starting in ${mode} mode changes your checkout context; uncommitted changes may not appear where you expect.\n` +
+          "Fix: commit first, then retry:\n" +
+          "  git add -A && git commit -m \"wip: save before change start\"\n" +
+          "Fix: or stash:\n" +
+          "  git stash\n" +
+          `Alt: prepare artifacts without switching: aiws change start ${changeId} --no-switch\n` +
+          "Alt: proceed anyway (not recommended): add --allow-dirty",
+      });
+    }
+  }
+
   if (effectiveWorktree) {
     const prereq = await checkWorktreePrereqs(gitRoot);
     if (!prereq.ok) {
@@ -1545,12 +1564,30 @@ export async function changeStartCommand(options) {
       await maybeRecordBaseBranch(changeDir, startFromBranch, branch);
     }
 
-    if (options.submodules === true) {
-      const sm = await runCommand("git", ["submodule", "update", "--init", "--recursive"], { cwd: destKey });
-      if (sm.code !== 0) throw new UserError("Failed to init/update submodules in worktree.", { details: sm.stderr || sm.stdout });
-    } else if (hasGitmodules) {
-      console.error("warn: .gitmodules detected; new worktree may have empty submodule dirs.");
-      console.error("warn: consider running in the worktree: git submodule update --init --recursive (or re-run with --submodules)");
+    // Worktree mode: if this repo declares submodules, always initialize them in the new worktree.
+    // --submodules is now implicit (kept for backwards compat but has no effect).
+    if (hasGitmodules) {
+      const hasEntries = await runCommand("git", ["config", "--file", ".gitmodules", "--get-regexp", "^submodule\\..*\\.path$"], { cwd: destKey }).then(
+        (r) => r.code === 0 && String(r.stdout || "").trim().length > 0
+      );
+      if (hasEntries) {
+        console.error("info: .gitmodules detected; initializing submodules in the new worktree.");
+        const sm = await runCommand("git", ["submodule", "update", "--init", "--recursive"], { cwd: destKey });
+        if (sm.code !== 0) throw new UserError("Failed to init/update submodules in worktree.", { details: sm.stderr || sm.stdout });
+
+        // Sanity check: fail fast if anything remains uninitialized or conflicted.
+        const st = await runCommand("git", ["submodule", "status", "--recursive"], { cwd: destKey });
+        const lines = String(st.stdout || "")
+          .split("\n")
+          .map((l) => l.trimEnd())
+          .filter(Boolean);
+        const bad = lines.filter((l) => l.startsWith("-") || l.startsWith("U"));
+        if (bad.length > 0) {
+          throw new UserError("Submodules not fully initialized in worktree.", {
+            details: `${bad.slice(0, 20).join("\n")}${bad.length > 20 ? "\n..." : ""}\n\nHint: run in the worktree:\n  git submodule update --init --recursive`,
+          });
+        }
+      }
     }
 
     if (options.enableHooks) {
@@ -1562,7 +1599,7 @@ export async function changeStartCommand(options) {
       worktree: destKey,
       branch,
       from_branch: startFromBranch || "",
-      submodules: options.submodules === true,
+      submodules: true,
       hooks: options.enableHooks === true,
     });
 

package/src/commands/update.js

@@ -1,3 +1,4 @@
+import fs from "node:fs/promises";
 import path from "node:path";
 import { loadTemplate } from "../spec.js";
 import { loadAiwsPackage } from "../aiws-package.js";
@@ -59,13 +60,32 @@ export async function updateCommand(options) {
     }
   }
 
+  const removeFiles = (update.remove || []).map(normalizeRel);
+
   const backup = new BackupSession({ workspaceRoot, operation: "update" });
   // Backup every file we might touch (including missing, for rollback deletions).
   await backup.recordFile(".aiws/manifest.json", { recordMissing: true });
   for (const f of replaceFiles) await backup.recordFile(f, { recordMissing: true });
   for (const f of Object.keys(managedBlocks)) await backup.recordFile(f, { recordMissing: true });
+  for (const f of removeFiles) await backup.recordFile(f);
   await backup.finalize({ extra: { template_id: tpl.templateId } });
 
+  // Remove deprecated files (backed up above; restorable via `aiws rollback`).
+  let removedCount = 0;
+  for (const rel of removeFiles) {
+    if (!rel) continue;
+    const abs = joinRel(workspaceRoot, rel);
+    if (await pathExists(abs)) {
+      await fs.rm(abs, { force: true });
+      removedCount++;
+      // Remove empty parent directory (safe: rmdir fails on non-empty).
+      try { await fs.rmdir(path.dirname(abs)); } catch { /* non-empty or gone */ }
+    }
+  }
+  if (removedCount > 0) {
+    console.log(`  removed ${removedCount} deprecated file(s)`);
+  }
+
   // Replace files (except manifest, generated later).
   for (const rel of replaceFiles) {
     if (!rel || rel === ".aiws/manifest.json") continue;