@aipper/aiws 0.0.11 → 0.0.14

package/package.json

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

package/src/commands/codex-install-skills.js

@@ -1,3 +1,4 @@
+import fs from "node:fs/promises";
 import path from "node:path";
 import { loadTemplate } from "../spec.js";
 import { UserError } from "../errors.js";
@@ -16,6 +17,11 @@ export async function codexInstallSkillsCommand(options) {
   const skillsDir = resolveCodexSkillsDir(options.skillsDir);
   const dryRun = options.dryRun === true;
   if (!dryRun) await ensureDir(skillsDir);
+  const skillsDirIsSymlink = await fs
+    .lstat(skillsDir)
+    .then((st) => st.isSymbolicLink())
+    .catch(() => false);
+  const skillsDirReal = skillsDirIsSymlink ? await fs.realpath(skillsDir).catch(() => skillsDir) : skillsDir;
 
   const skillFiles = await listTemplateCodexSkills(tpl);
 
@@ -60,9 +66,9 @@ export async function codexInstallSkillsCommand(options) {
     }
   }
 
-  console.log(`${dryRun ? "✓ (dry-run)" : "✓"} aiws codex install-skills: ${skillsDir}`);
+  const header = skillsDirIsSymlink && skillsDirReal !== skillsDir ? `${skillsDir} -> ${skillsDirReal}` : skillsDir;
+  console.log(`${dryRun ? "✓ (dry-run)" : "✓"} aiws codex install-skills: ${header}`);
   if (created.length > 0) console.log(`created: ${created.join(", ")}`);
   if (updated.length > 0) console.log(`updated: ${updated.join(", ")}`);
   if (overwritten.length > 0) console.log(`overwritten: ${overwritten.join(", ")}`);
 }
-

package/src/commands/codex-status-skills.js

@@ -1,3 +1,4 @@
+import fs from "node:fs/promises";
 import path from "node:path";
 import { loadTemplate } from "../spec.js";
 import { normalizeNewlines } from "../hash.js";
@@ -13,6 +14,11 @@ export async function codexStatusSkillsCommand(options) {
   const tpl = await loadTemplate(templateId);
 
   const skillsDir = resolveCodexSkillsDir(options.skillsDir);
+  const skillsDirIsSymlink = await fs
+    .lstat(skillsDir)
+    .then((st) => st.isSymbolicLink())
+    .catch(() => false);
+  const skillsDirReal = skillsDirIsSymlink ? await fs.realpath(skillsDir).catch(() => skillsDir) : skillsDir;
   const skillFiles = await listTemplateCodexSkills(tpl);
 
   /** @type {Array<{ name: string, status: "ok" | "missing" | "unmanaged" | "outdated" }>} */
@@ -42,13 +48,16 @@ export async function codexStatusSkillsCommand(options) {
     /** @type {{ ok: number, missing: number, unmanaged: number, outdated: number }} */ ({ ok: 0, missing: 0, unmanaged: 0, outdated: 0 }),
   );
 
-  console.log(`✓ aiws codex status-skills: ${skillsDir}`);
+  const header = skillsDirIsSymlink && skillsDirReal !== skillsDir ? `${skillsDir} -> ${skillsDirReal}` : skillsDir;
+  console.log(`✓ aiws codex status-skills: ${header}`);
   console.log(`ok=${counts.ok} missing=${counts.missing} unmanaged=${counts.unmanaged} outdated=${counts.outdated}`);
   for (const r of rows) {
     console.log(`${r.status}\t${r.name}`);
   }
+  if (counts.ok === 0 && counts.missing === rows.length && skillsDirIsSymlink) {
+    console.log("Note: skills dir is a symlink; if you installed to a different dir, pass --dir (or set CODEX_HOME).");
+  }
   if (counts.missing > 0 || counts.outdated > 0) {
     console.log("Next: aiws codex install-skills");
   }
 }
-

package/src/commands/validate.js

@@ -8,6 +8,70 @@ import { runCommand } from "../exec.js";
 import { expandManifestEntries } from "../template.js";
 import { loadAiwsPackage } from "../aiws-package.js";
 
+/**
+ * Enforce deterministic submodule branch policy:
+ * - If `.gitmodules` exists and declares submodules, each submodule must declare `submodule.<name>.branch`.
+ * - This avoids guessing which branch to attach/push for workflows like ws-pull/ws-finish.
+ *
+ * @param {string} workspaceRoot
+ */
+async function validateSubmoduleBranchPolicy(workspaceRoot) {
+  const gitmodules = path.join(workspaceRoot, ".gitmodules");
+  if (!(await pathExists(gitmodules))) return;
+
+  const list = await runCommand("git", ["config", "--file", ".gitmodules", "--get-regexp", "^submodule\\..*\\.path$"], {
+    cwd: workspaceRoot,
+  });
+  if (list.code !== 0) {
+    // `.gitmodules` exists but no submodule path entries: treat as ok.
+    return;
+  }
+
+  /** @type {Array<{ name: string, path: string }>} */
+  const subs = [];
+  for (const line of String(list.stdout || "").split("\n")) {
+    const t = line.trim();
+    if (!t) continue;
+    const idx = t.indexOf(" ");
+    if (idx <= 0) continue;
+    const key = t.slice(0, idx).trim();
+    const subPath = t.slice(idx + 1).trim();
+    const m = key.match(/^submodule\.([^.]+)\.path$/);
+    if (!m) continue;
+    const name = m[1] || "";
+    if (!name || !subPath) continue;
+    subs.push({ name, path: subPath });
+  }
+  if (subs.length === 0) return;
+
+  /** @type {Array<{ name: string, path: string }>} */
+  const missing = [];
+  for (const s of subs) {
+    const br = await runCommand("git", ["config", "--file", ".gitmodules", "--get", `submodule.${s.name}.branch`], {
+      cwd: workspaceRoot,
+    });
+    if (br.code !== 0 || !String(br.stdout || "").trim()) {
+      missing.push(s);
+    }
+  }
+
+  if (missing.length > 0) {
+    const lines = missing.map((m) => `- ${m.name} (${m.path}): missing submodule.${m.name}.branch`);
+    const hints = missing
+      .slice(0, 8)
+      .map((m) => `git submodule set-branch --branch main ${m.path}`)
+      .join("\n");
+    throw new UserError("Submodule branch policy failed: missing `.gitmodules` branch config.", {
+      details:
+        `${lines.join("\n")}\n\n` +
+        "Fix:\n" +
+        "- Run `ws-submodule-setup` (recommended), or set per submodule:\n" +
+        `${hints}\n\n` +
+        "Then commit `.gitmodules` in the superproject.",
+    });
+  }
+}
+
 /**
  * @param {string | undefined} v
  */
@@ -100,6 +164,9 @@ export async function validateCommand(options) {
     // Drift detection.
     await validateDrift({ workspaceRoot, storedManifest: stored, templateManifest: tpl.manifest });
 
+    // Submodule branch policy (deterministic workflow; avoids guessing target branches).
+    await validateSubmoduleBranchPolicy(workspaceRoot);
+
     // python3 gate.
     const py = await runCommand("python3", ["--version"], { cwd: workspaceRoot });
     if (py.code !== 0) {