@aipper/aiws 0.0.3 → 0.0.4

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@aipper/aiws",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "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.3"
+    "@aipper/aiws-spec": "0.0.4"
   },
   "files": [
     "bin",

package/src/commands/change.js

@@ -123,6 +123,20 @@ async function checkWorktreePrereqs(gitRoot) {
   return { ok: true };
 }
 
+/**
+ * Best-effort detection for "unknown option" errors related to --recurse-submodules.
+ *
+ * We only fall back when the option itself appears in output, to avoid silently
+ * bypassing submodule safety checks when switching fails for real reasons
+ * (e.g. dirty submodules).
+ *
+ * @param {{ stdout: string, stderr: string }} res
+ */
+function outputMentionsRecurseSubmodules(res) {
+  const out = `${res.stderr || ""}\n${res.stdout || ""}`;
+  return out.includes("recurse-submodules");
+}
+
 /**
  * @param {string} changeDir
  * @param {string} baseBranch
@@ -867,15 +881,31 @@ export async function changeStartCommand(options) {
     }
   } else {
     if (hasBranch) {
-      const sw = await runCommand("git", ["switch", branch], { cwd: gitRoot });
+      let sw = await runCommand("git", ["switch", ...(hasGitmodules ? ["--recurse-submodules"] : []), branch], { cwd: gitRoot });
+      if (sw.code !== 0 && hasGitmodules && outputMentionsRecurseSubmodules(sw)) {
+        console.error("warn: git switch does not support --recurse-submodules; switching without it (submodules may be out of sync).");
+        sw = await runCommand("git", ["switch", branch], { cwd: gitRoot });
+      }
       if (sw.code !== 0) {
-        const co = await runCommand("git", ["checkout", branch], { cwd: gitRoot });
+        let co = await runCommand("git", ["checkout", ...(hasGitmodules ? ["--recurse-submodules"] : []), branch], { cwd: gitRoot });
+        if (co.code !== 0 && hasGitmodules && outputMentionsRecurseSubmodules(co)) {
+          console.error("warn: git checkout does not support --recurse-submodules; checking out without it (submodules may be out of sync).");
+          co = await runCommand("git", ["checkout", branch], { cwd: gitRoot });
+        }
         if (co.code !== 0) throw new UserError("Failed to switch branch.", { details: co.stderr || co.stdout });
       }
     } else {
-      const sw = await runCommand("git", ["switch", "-c", branch], { cwd: gitRoot });
+      let sw = await runCommand("git", ["switch", ...(hasGitmodules ? ["--recurse-submodules"] : []), "-c", branch], { cwd: gitRoot });
+      if (sw.code !== 0 && hasGitmodules && outputMentionsRecurseSubmodules(sw)) {
+        console.error("warn: git switch does not support --recurse-submodules; switching without it (submodules may be out of sync).");
+        sw = await runCommand("git", ["switch", "-c", branch], { cwd: gitRoot });
+      }
       if (sw.code !== 0) {
-        const co = await runCommand("git", ["checkout", "-b", branch], { cwd: gitRoot });
+        let co = await runCommand("git", ["checkout", ...(hasGitmodules ? ["--recurse-submodules"] : []), "-b", branch], { cwd: gitRoot });
+        if (co.code !== 0 && hasGitmodules && outputMentionsRecurseSubmodules(co)) {
+          console.error("warn: git checkout does not support --recurse-submodules; checking out without it (submodules may be out of sync).");
+          co = await runCommand("git", ["checkout", "-b", branch], { cwd: gitRoot });
+        }
         if (co.code !== 0) throw new UserError("Failed to create branch.", { details: co.stderr || co.stdout });
       }
     }