@hanzlaa/rcode 3.4.22 → 3.4.23

package/dist/rcode.js

@@ -15188,10 +15188,23 @@ var require_install = __commonJS({
     async function resolveCommitPlanning(opts) {
       if (opts.commitPlanning !== null) return opts.commitPlanning;
       if (opts.noPrompt || opts.global) return false;
-      if (opts.yes || !process.stdin.isTTY) return true;
+      let existingValue = null;
+      try {
+        const cfgPath = path2.join(opts.target, ".rihal", "config.yaml");
+        if (fs2.existsSync(cfgPath)) {
+          const cfg = fs2.readFileSync(cfgPath, "utf8");
+          const m = cfg.match(/^commit_planning:\s*(true|false)\s*$/m);
+          if (m) existingValue = m[1] === "true";
+        }
+      } catch {
+      }
+      if (opts.yes || !process.stdin.isTTY) {
+        return existingValue !== null ? existingValue : true;
+      }
+      const initialValue = existingValue === false ? "gitignore" : "commit";
       const choice = await clack.select({
-        message: "\u{1F4CB} .planning/ holds PRDs, roadmaps, sprints, SUMMARY files. How should they be tracked?",
-        initialValue: "commit",
+        message: existingValue !== null ? "\u{1F4CB} .planning/ tracking \u2014 current setting preserved unless you change it." : "\u{1F4CB} .planning/ holds PRDs, roadmaps, sprints, SUMMARY files. How should they be tracked?",
+        initialValue,
         options: [
           { value: "commit", label: "Commit", hint: "collaborators see the same plans (recommended)" },
           { value: "gitignore", label: "Gitignore", hint: "planning stays local (good for sensitive PRDs)" }
@@ -15312,9 +15325,13 @@ Installs (IDE-specific):
       fs2.mkdirSync(planningDir, { recursive: true });
       const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
       const name = projectName || path2.basename(target);
+      const STUB_BANNER = `<!-- INSTALL STUB \u2014 overwritten by /rihal-new-project. Delete this file or run
+     /rihal-new-project before committing. See https://github.com/hanzlahabib/rihal-code/issues/670 -->
+
+`;
       fs2.writeFileSync(
         projectPath,
-        `# ${name}
+        STUB_BANNER + `# ${name}
 
 **One-line:** Describe what this project is in one sentence.
 
@@ -15331,7 +15348,7 @@ What this project delivers and who it serves.
       );
       fs2.writeFileSync(
         roadmapPath,
-        `# ${name} \u2014 Roadmap
+        STUB_BANNER + `# ${name} \u2014 Roadmap
 
 **Milestone: M1 \u2014 Initial Delivery** (v1.0)
 Started: ${today} \xB7 Current
@@ -15355,7 +15372,7 @@ Ideas and future phases go here.
       );
       fs2.writeFileSync(
         statePath,
-        `# ${name} \u2014 State
+        STUB_BANNER + `# ${name} \u2014 State
 
 **Last updated:** ${today}
 **Milestone:** M1 \u2014 Initial Delivery
@@ -15374,7 +15391,7 @@ _None._
 
 ## Next Action
 
-Say "plan a sprint" or run \`/rihal-sprint-planning\` to break Phase 01 into stories.
+Run \`/rihal-new-project <description>\` to bootstrap, or \`/rihal-sprint-planning\` once a real phase exists.
 `
       );
       const rihalStateJson = path2.join(target, ".rihal", "state.json");
@@ -15382,16 +15399,15 @@ Say "plan a sprint" or run \`/rihal-sprint-planning\` to break Phase 01 into sto
         const now = (/* @__PURE__ */ new Date()).toISOString();
         const state = {
           version: "1",
-          project: name,
+          project: null,
+          _seeded_stub: true,
           created: now,
           updated: now,
-          current_phase: "01",
+          current_phase: null,
           current_plan: 0,
           current_sprint: null,
-          milestone: "M1 \u2014 Initial Delivery",
-          phases: [
-            { id: "01", name: "Setup & Scaffolding", status: "planned" }
-          ],
+          milestone: null,
+          phases: [],
           executions: [],
           decisions: [],
           blockers: [],
@@ -15584,20 +15600,31 @@ ${BLOCK}`);
       }
       return copied;
     }
-    function installSkills(packageRoot, target) {
+    function installSkills(packageRoot, target, options = {}) {
       const skillsSource = path2.join(packageRoot, "rihal/skills");
       const skillsDest = path2.join(target, ".claude/skills");
       const internalDest = path2.join(target, ".rihal/skills");
-      if (!fs2.existsSync(skillsSource)) return 0;
+      if (!fs2.existsSync(skillsSource)) return { count: 0, skippedGlobal: 0 };
       fs2.mkdirSync(skillsDest, { recursive: true });
       fs2.mkdirSync(internalDest, { recursive: true });
+      const globalSkillsDir = path2.join(os.homedir(), ".claude", "skills");
+      const globalRihalSkills = options.skipGlobalDuplicates && fs2.existsSync(globalSkillsDir) ? new Set(fs2.readdirSync(globalSkillsDir).filter((n) => n.startsWith("rihal-"))) : /* @__PURE__ */ new Set();
       let count = 0;
+      let skippedGlobal = 0;
       function isInternalSkill(skillDir) {
         const skillMd = path2.join(skillDir, "SKILL.md");
         if (!fs2.existsSync(skillMd)) return false;
         const text = fs2.readFileSync(skillMd, "utf8");
         return /^internal:\s*true\s*$/m.test(text);
       }
+      function hasLocalOverride(destDir) {
+        if (!fs2.existsSync(destDir)) return false;
+        try {
+          return fs2.readdirSync(destDir).some((f) => f.endsWith(".local.md"));
+        } catch {
+          return false;
+        }
+      }
       function walkForSkills(dir) {
         if (!fs2.existsSync(dir)) return;
         for (const entry of fs2.readdirSync(dir, { withFileTypes: true })) {
@@ -15606,7 +15633,18 @@ ${BLOCK}`);
           const hasSkillMd = fs2.existsSync(path2.join(src, "SKILL.md"));
           if (hasSkillMd) {
             const destName = entry.name.startsWith("rihal-") ? entry.name : `rihal-${entry.name}`;
-            const dest = isInternalSkill(src) ? path2.join(internalDest, destName) : path2.join(skillsDest, destName);
+            const internal = isInternalSkill(src);
+            const dest = internal ? path2.join(internalDest, destName) : path2.join(skillsDest, destName);
+            if (!internal && globalRihalSkills.has(destName) && !hasLocalOverride(dest)) {
+              if (fs2.existsSync(dest)) {
+                try {
+                  fs2.rmSync(dest, { recursive: true, force: true });
+                } catch {
+                }
+              }
+              skippedGlobal++;
+              continue;
+            }
             copyDirRecursive(src, dest);
             count++;
           } else {
@@ -15617,7 +15655,7 @@ ${BLOCK}`);
       for (const bucket of ["agents", "actions", "core"]) {
         walkForSkills(path2.join(skillsSource, bucket));
       }
-      return count;
+      return { count, skippedGlobal };
     }
     function parseFrontmatter(text) {
       if (!text.startsWith("---\n")) return { frontmatter: {}, body: text };
@@ -16001,6 +16039,15 @@ ${BLOCK}`);
         printHelp2();
         return 0;
       }
+      if (opts.reset && !opts.force) {
+        console.log("");
+        console.log("  " + warn("--reset has no effect without --force."));
+        console.log("  " + dim("  --reset wipes config.yaml and state.json. To prevent accidental data loss,"));
+        console.log("  " + dim("  it must be paired with --force. Re-run as:"));
+        console.log("  " + dim("    rcode install --reset --force"));
+        console.log("");
+        return 2;
+      }
       const pkgVersion = readPackageVersion();
       const isInteractive = process.stdin.isTTY && !opts.yes;
       if (isInteractive) printInstallHeader(pkgVersion);
@@ -16273,7 +16320,8 @@ ${BLOCK}`);
         const configDir2 = path2.join(opts.target, ".rihal", "_config");
         ensureDir(configDir2);
         fs2.writeFileSync(path2.join(configDir2, "manifest.yaml"), generateInstallManifest(opts));
-        let skillsInstalled2 = installSkills(PACKAGE_ROOT2, opts.target);
+        const skillsResult2 = installSkills(PACKAGE_ROOT2, opts.target);
+        let skillsInstalled2 = skillsResult2.count;
         try {
           const { main: generateCommandSkills } = require(path2.join(PACKAGE_ROOT2, "cli", "generate-command-skills.cjs"));
           const stubsDir = path2.join(opts.target, ".claude", "skills");
@@ -16353,6 +16401,25 @@ ${BLOCK}`);
       }
       if (!fs2.existsSync(configPath)) {
         fs2.writeFileSync(configPath, generateConfigYaml(opts));
+      } else {
+        try {
+          const before = fs2.readFileSync(configPath, "utf8");
+          const desired = opts.commitPlanning !== false;
+          const re = /^commit_planning:\s*(true|false)\s*$/m;
+          const match = before.match(re);
+          const currentInFile = match ? match[1] === "true" : null;
+          if (match && currentInFile !== desired) {
+            const updated = before.replace(re, `commit_planning: ${desired}`);
+            fs2.writeFileSync(configPath, updated);
+            console.log("  " + dim(`Updated commit_planning in config.yaml (${currentInFile} \u2192 ${desired}) \u2014 closes #685.`));
+          } else if (!match) {
+            const appended = before.replace(/\n*$/, "") + `
+commit_planning: ${desired}
+`;
+            fs2.writeFileSync(configPath, appended);
+          }
+        } catch {
+        }
       }
       try {
         const configText = fs2.readFileSync(configPath, "utf8");
@@ -16392,15 +16459,26 @@ ${BLOCK}`);
         path2.join(configDir, "files-manifest.csv"),
         generateFilesManifest(plan, opts.target, { mergeExistingManifest: !opts.force })
       );
-      let skillsInstalled = installSkills(PACKAGE_ROOT2, opts.target);
+      const skillsResult = installSkills(PACKAGE_ROOT2, opts.target, {
+        skipGlobalDuplicates: isProjectInstall
+      });
+      let skillsInstalled = skillsResult.count;
+      if (skillsResult.skippedGlobal > 0) {
+        console.log("  " + dim(`Skipped ${skillsResult.skippedGlobal} project-level rihal skills (global ones in ~/.claude/skills/ take precedence) \u2014 closes #679.`));
+      }
       try {
         const { main: generateCommandSkills } = require(path2.join(PACKAGE_ROOT2, "cli", "generate-command-skills.cjs"));
         const stubsDir = path2.join(opts.target, ".claude", "skills");
-        const result = generateCommandSkills(PACKAGE_ROOT2, stubsDir, readPackageVersion());
+        const result = generateCommandSkills(PACKAGE_ROOT2, stubsDir, readPackageVersion(), {
+          skipGlobalDuplicates: isProjectInstall
+        });
         if (result.generated > 0) {
           console.log("  " + dim(`${result.generated} sidebar skill stub${result.generated === 1 ? "" : "s"} generated for command discoverability`));
           skillsInstalled += result.generated;
         }
+        if (result.skippedGlobal > 0) {
+          console.log("  " + dim(`Skipped ${result.skippedGlobal} sidebar stub${result.skippedGlobal === 1 ? "" : "s"} that duplicate global ~/.claude/skills/ \u2014 closes #679.`));
+        }
       } catch (err) {
         console.log("  " + dim(`(sidebar stub generation skipped: ${err.message})`));
       }
@@ -17666,7 +17744,7 @@ var require_uninstall = __commonJS({
     function isKnownSkillName(name) {
       return KNOWN_ACTION_SKILLS.includes(name);
     }
-    function planToPathList(plan, cwd) {
+    function planToPathList(plan, cwd, options = {}) {
       const paths = [];
       for (const name of plan.claude.skills) {
         paths.push(path2.join(".claude/skills", name));
@@ -17689,10 +17767,25 @@ var require_uninstall = __commonJS({
       if (plan.agentsMd && fs2.existsSync(path2.join(cwd, "AGENTS.md"))) {
         paths.push("AGENTS.md");
       }
+      if (options.purge) {
+        const rihalDir = path2.join(cwd, ".rihal");
+        if (fs2.existsSync(rihalDir)) {
+          try {
+            for (const entry of fs2.readdirSync(rihalDir)) {
+              if (entry === "backups") continue;
+              paths.push(path2.join(".rihal", entry));
+            }
+          } catch {
+          }
+        }
+        if (fs2.existsSync(path2.join(cwd, ".planning"))) {
+          paths.push(".planning");
+        }
+      }
       return paths;
     }
-    function createBackup(cwd, plan) {
-      const paths = planToPathList(plan, cwd);
+    function createBackup(cwd, plan, options = {}) {
+      const paths = planToPathList(plan, cwd, { purge: options.purge === true });
       if (paths.length === 0) {
         return { ok: false, warning: "nothing to back up" };
       }
@@ -17700,11 +17793,11 @@ var require_uninstall = __commonJS({
       if (tarCheck.status !== 0) {
         return { ok: false, warning: "tar not available on this system" };
       }
-      const backupsDir = path2.join(cwd, ".rihal/backups");
+      const backupsDir = options.purge ? path2.join(cwd, ".rihal-backups") : path2.join(cwd, ".rihal/backups");
       try {
         fs2.mkdirSync(backupsDir, { recursive: true });
       } catch (err) {
-        return { ok: false, warning: `could not create .rihal/backups/: ${err.message}` };
+        return { ok: false, warning: `could not create ${path2.relative(cwd, backupsDir)}/: ${err.message}` };
       }
       const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
       const backupFile = path2.join(backupsDir, `uninstall-${ts}.tgz`);
@@ -17845,9 +17938,12 @@ var require_uninstall = __commonJS({
         }
       }
       console.log();
-      const backup = createBackup(cwd, plan);
+      const backup = createBackup(cwd, plan, { purge: opts.purge === true });
       if (backup.ok) {
         console.log(`   \u{1F4BE} backup created: ${backup.path}`);
+        if (opts.purge) {
+          console.log("      includes .rihal/ and .planning/ (state, decisions, planning artifacts)");
+        }
       } else {
         console.log(`   \u26A0 no backup created (${backup.warning}) \u2014 continuing anyway`);
       }
@@ -17977,7 +18073,7 @@ var require_uninstall = __commonJS({
         if (fs2.existsSync(gitignorePath)) {
           try {
             const before = fs2.readFileSync(gitignorePath, "utf8");
-            const stripped = before.replace(/\n?# >>> rihal-code >>>[\s\S]*?# <<< rihal-code <<<\n?/g, "\n").replace(/\n?# rcode[\s\S]*?(?=\n\n|\n$|$)/g, "\n").replace(/\n{3,}/g, "\n\n");
+            const stripped = before.replace(/\n?# ===== rcode-managed gitignore block[\s\S]*?# ===== end rcode-managed gitignore block =====\n?/g, "\n").replace(/\n?# >>> rihal-code >>>[\s\S]*?# <<< rihal-code <<<\n?/g, "\n").replace(/\n{3,}/g, "\n\n");
             if (stripped !== before) {
               fs2.writeFileSync(gitignorePath, stripped);
               console.log(`   \u2713 stripped rcode block from .gitignore (--purge)`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzlaa/rcode",
-  "version": "3.4.22",
+  "version": "3.4.23",
   "description": "rcode — the memory bank for AI-driven SaaS teams. Persistent project context, distinctive engineering personas, and phase-based workflows. Built by Rihal. Works in Claude Code, Cursor, Gemini, VS Code, and Antigravity.",
   "main": "cli/index.js",
   "bin": {
@@ -15,6 +15,7 @@
     "postinstall": "node cli/postinstall.js",
     "build:cli": "node scripts/build.cjs",
     "build": "node scripts/build.cjs",
+    "prepack": "node scripts/build.cjs",
     "dogfood": "bash scripts/dogfood-check.sh"
   },
   "files": [