@nolto/cli 0.8.0 → 0.8.1

package/README.md

@@ -21,6 +21,8 @@ nolto init
 `nolto init` configures authentication, selects or creates a project, writes the
 repo-local `nolto.json` binding, installs the bundled `roadmap-progress` skill,
 and creates `.nolto/roadmaps/<slug>.json` when needed.
+Re-running it inside a repository keeps the saved token and only sets up that
+repository; use `--force` to reconfigure the global settings.
 
 For browser-based authentication without the rest of the repository setup:
 
@@ -68,10 +70,13 @@ nolto watch --install-service      # Install the Linux systemd user service
 `sync` reads every `.nolto/roadmaps/*.json` file in filename order, uses each
 filename stem as its slug, validates schema v2, follows any linked plan Markdown
 paths, and sends an idempotent full upsert to the bound project. A legacy
-`.roadmap/roadmap.json` is migrated automatically when no canonical roadmap exists.
+`.roadmap/roadmap.json` is migrated by `nolto sync` when no canonical roadmap
+exists; `nolto watch` only warns and never migrates.
 
 `watch` uses the repository registry maintained by `nolto init`. Missing registered
 repositories are skipped with a warning.
+The CLI warns when an installed `roadmap-progress` skill version differs from the
+CLI version; run `nolto init` in that repository to refresh it.
 
 ## Configuration
 

package/dist/index.js

@@ -377,10 +377,12 @@ import { Command } from "commander";
 import readline from "readline/promises";
 import { createRequire } from "module";
 import { fileURLToPath as fileURLToPath2 } from "url";
+import os3 from "os";
 import path8 from "path";
 import fs from "fs";
 
 // src/commands/link.ts
+import os2 from "os";
 import path5 from "path";
 import { statSync as statSync2 } from "fs";
 
@@ -771,6 +773,9 @@ function findRepoRoot(startDir, hasGit = dirHasGit) {
   }
   return { root: startDir, foundGit: false };
 }
+function isHomeDirectory(dir, home = os2.homedir()) {
+  return path5.resolve(dir) === path5.resolve(home);
+}
 async function handleShow(deps, projectBindingPath, mode2) {
   const startDir = resolveStartDir(process.env, process.cwd());
   const root = findRepoRoot(startDir).root;
@@ -906,12 +911,17 @@ Proceeding anyway \u2014 verify the ID is correct.
   await writeRepoBinding(root, projectId);
   const writtenPath = path5.join(root, "nolto.json");
   let registryAdded = false;
-  try {
-    registryAdded = (await addRepoToRegistry(getRegistryPath(process.env), root)).added;
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`Warning: could not update watch registry: ${message}
+  if (isHomeDirectory(root)) {
+    process.stderr.write(`Warning: refusing to add home directory ${root} to the watch registry.
+`);
+  } else {
+    try {
+      registryAdded = (await addRepoToRegistry(getRegistryPath(process.env), root)).added;
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      process.stderr.write(`Warning: could not update watch registry: ${message}
 `);
+    }
   }
   if (mode2 === "json") {
     printResult({
@@ -1004,6 +1014,30 @@ function resolveSkillSourceDir() {
   throw new Error("Bundled roadmap-progress skill not found. Reinstall @nolto/cli.");
 }
 var VERSION_MARKER = ".nolto-skill-version";
+async function checkSkillVersionDrift(repoRoot, cliVersion) {
+  const skillDirs = [
+    path6.join(repoRoot, ".claude", "skills", "roadmap-progress"),
+    path6.join(repoRoot, ".agents", "skills", "roadmap-progress")
+  ];
+  const drifted = [];
+  for (const dir of skillDirs) {
+    if (!existsSync(dir)) continue;
+    let installed;
+    try {
+      const marker = (await readFile4(path6.join(dir, VERSION_MARKER), "utf8")).trim();
+      installed = marker.length > 0 ? marker : null;
+    } catch {
+      installed = null;
+    }
+    if (installed !== cliVersion) drifted.push({ dir, installed });
+  }
+  return drifted;
+}
+function formatSkillVersionDriftWarning(repoRoot, cliVersion, drifted) {
+  const dirs = drifted.map(({ dir }) => path6.relative(repoRoot, dir).split(path6.sep).join("/")).join(", ");
+  const installed = [...new Set(drifted.map((entry) => entry.installed ?? "unknown"))].join(", ");
+  return `roadmap-progress skill is outdated in ${dirs} (installed ${installed}, CLI ${cliVersion}). Run \`nolto init\` in this repo to update it.`;
+}
 async function installSkill(args) {
   const targetDir = path6.join(args.skillsParentDir, "roadmap-progress");
   const markerPath = path6.join(targetDir, VERSION_MARKER);
@@ -1090,161 +1124,212 @@ function getCliVersion() {
   }
   return "0.0.0";
 }
+async function pickProject(rl, http, projects, promptText) {
+  if (projects.length > 0) {
+    process.stdout.write("\nProjects:\n");
+    projects.forEach((project, index) => {
+      process.stdout.write(`  (${index + 1}) ${project.name} \u2014 ${project.id}
+`);
+    });
+  } else {
+    process.stdout.write("\nNo projects yet.\n");
+  }
+  const pick = await rl.question(promptText);
+  const trimmedPick = pick.trim().toLowerCase();
+  if (trimmedPick === "c") {
+    const name = await rl.question("New project name: ");
+    if (name.trim().length === 0) {
+      throw new CliError("Project name is required.", 2);
+    }
+    const created = await http.post(
+      "/api/projects",
+      { name: name.trim() }
+    );
+    if (created.project?.id == null) {
+      throw new CliError("Project API did not return a project id.", 2);
+    }
+    const project = {
+      id: created.project.id,
+      name: created.project.name ?? name.trim()
+    };
+    process.stdout.write(`Created project ${project.name} (${project.id})
+`);
+    return project;
+  }
+  const num = parseInt(trimmedPick, 10);
+  if (!isNaN(num) && num >= 1 && num <= projects.length) {
+    return projects[num - 1];
+  }
+  return void 0;
+}
 function register2(program, deps) {
   program.command("init").description("Interactive setup: configure token, base URL, and default project.").option("--force", "Overwrite existing config without prompting").action(async (opts) => {
     const configPath = deps.configPath;
-    if (!opts.force) {
-      let existing = null;
-      try {
-        existing = await loadConfigFile(configPath);
-      } catch {
-      }
-      if (existing != null) {
-        const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
-        try {
-          const answer = await rl2.question(`Config already exists at ${configPath}. Overwrite? [y/N] `);
-          if (answer.trim().toLowerCase() !== "y") {
-            process.stdout.write("Cancelled.\n");
-            return;
-          }
-        } finally {
-          rl2.close();
-        }
-      }
-    }
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    let token = "";
     try {
-      const rawUrl = await rl.question(`Base URL [${DEFAULT_BASE_URL}]: `);
-      const baseUrl = rawUrl.trim() || DEFAULT_BASE_URL;
-      const currentToken = deps.settings.token;
-      const tokenPrompt = currentToken != null ? "API token [press Enter to keep current token]: " : "API token: ";
-      const enteredToken = await promptHidden(rl, tokenPrompt);
-      token = enteredToken.length > 0 ? enteredToken : currentToken ?? "";
-      if (token.length === 0) {
-        throw new CliError("Token is required.", 2);
-      }
-      const http = createHttpClient({
-        baseUrl,
-        token,
-        version: getCliVersion()
-      });
-      let projects = [];
-      try {
-        const result = await http.get("/api/projects");
-        projects = Array.isArray(result.projects) ? result.projects : [];
-      } catch (err) {
-        if (err instanceof CliError && err.exitCode === 3) {
-          throw new CliError(`Token rejected by ${baseUrl}`, 3, "Check that your token is valid and has not been revoked.");
+      let configureGlobal = opts.force === true;
+      if (!configureGlobal) {
+        let existing = null;
+        try {
+          existing = await loadConfigFile(configPath);
+        } catch {
+        }
+        if (existing == null || deps.settings.token == null) {
+          configureGlobal = true;
+        } else {
+          const answer = await rl.question(
+            `Config already exists at ${configPath}. Reconfigure token and base URL? [y/N] `
+          );
+          configureGlobal = answer.trim().toLowerCase() === "y";
         }
-        throw err;
       }
-      let defaultProjectId;
+      let token = deps.settings.token ?? "";
+      let baseUrl = deps.settings.baseUrl;
+      let defaultProjectId = deps.settings.defaultProjectId;
       let defaultProjectName;
-      if (projects.length > 0) {
-        process.stdout.write("\nProjects:\n");
-        projects.forEach((p, i) => {
-          process.stdout.write(`  (${i + 1}) ${p.name} \u2014 ${p.id}
-`);
+      let http;
+      let projects;
+      if (configureGlobal) {
+        const rawUrl = await rl.question(`Base URL [${DEFAULT_BASE_URL}]: `);
+        baseUrl = rawUrl.trim() || DEFAULT_BASE_URL;
+        const currentToken = deps.settings.token;
+        const tokenPrompt = currentToken != null ? "API token [press Enter to keep current token]: " : "API token: ";
+        const enteredToken = await promptHidden(rl, tokenPrompt);
+        token = enteredToken.length > 0 ? enteredToken : currentToken ?? "";
+        if (token.length === 0) {
+          throw new CliError("Token is required.", 2);
+        }
+        http = createHttpClient({
+          baseUrl,
+          token,
+          version: getCliVersion()
         });
-      } else {
-        process.stdout.write("\nNo projects yet.\n");
-      }
-      const pick = await rl.question("Default project number, 'c' to create new (or Enter to skip): ");
-      const trimmedPick = pick.trim().toLowerCase();
-      if (trimmedPick === "c") {
-        const name = await rl.question("New project name: ");
-        if (name.trim().length === 0) {
-          throw new CliError("Project name is required.", 2);
+        try {
+          const result = await http.get("/api/projects");
+          projects = Array.isArray(result.projects) ? result.projects : [];
+        } catch (err) {
+          if (err instanceof CliError && err.exitCode === 3) {
+            throw new CliError(`Token rejected by ${baseUrl}`, 3, "Check that your token is valid and has not been revoked.");
+          }
+          throw err;
         }
-        const created = await http.post(
-          "/api/projects",
-          { name: name.trim() }
+        const selected = await pickProject(
+          rl,
+          http,
+          projects,
+          "Default project number, 'c' to create new (or Enter to skip): "
         );
-        if (created.project?.id == null) {
-          throw new CliError("Project API did not return a project id.", 2);
-        }
-        defaultProjectId = created.project.id;
-        defaultProjectName = created.project.name ?? name.trim();
-        process.stdout.write(`Created project ${defaultProjectName} (${defaultProjectId})
-`);
-      } else {
-        const num = parseInt(trimmedPick, 10);
-        if (!isNaN(num) && num >= 1 && num <= projects.length) {
-          defaultProjectId = projects[num - 1].id;
-          defaultProjectName = projects[num - 1].name;
-        }
-      }
-      await saveConfigFile(configPath, {
-        token,
-        baseUrl: baseUrl !== DEFAULT_BASE_URL ? baseUrl : void 0,
-        defaultProjectId
-      });
-      const projectDisplay = defaultProjectId != null ? `${defaultProjectName ?? ""} (${defaultProjectId})` : "not set";
-      process.stdout.write(`
+        defaultProjectId = selected?.id;
+        defaultProjectName = selected?.name;
+        await saveConfigFile(configPath, {
+          token,
+          baseUrl: baseUrl !== DEFAULT_BASE_URL ? baseUrl : void 0,
+          defaultProjectId
+        });
+        const projectDisplay = defaultProjectId != null ? `${defaultProjectName ?? ""} (${defaultProjectId})` : "not set";
+        process.stdout.write(`
 Saved ${configPath}
 `);
-      process.stdout.write(`baseUrl:          ${baseUrl}
+        process.stdout.write(`baseUrl:          ${baseUrl}
 `);
-      process.stdout.write(`token:            ${maskToken(token)}  (verified)
+        process.stdout.write(`token:            ${maskToken(token)}  (verified)
 `);
-      process.stdout.write(`defaultProject:   ${projectDisplay}
+        process.stdout.write(`defaultProject:   ${projectDisplay}
 `);
-      if (defaultProjectId != null) {
-        const startDir = resolveStartDir(process.env, process.cwd());
-        const { root, foundGit } = findRepoRoot(startDir);
-        if (foundGit) {
-          const setup = await rl.question(`
+      } else {
+        const projectDisplay = defaultProjectId ?? "not set";
+        process.stdout.write(
+          `Using existing config: baseUrl=${baseUrl}, token=${maskToken(token)}, defaultProject=${projectDisplay}
+`
+        );
+      }
+      const startDir = resolveStartDir(process.env, process.cwd());
+      const { root, foundGit } = findRepoRoot(startDir);
+      if (!foundGit) {
+        process.stdout.write("\nNo git repository found here \u2014 skipped repo setup. Run `nolto init` inside a repo to set up roadmap sync.\n");
+        return;
+      }
+      if (isHomeDirectory(root)) {
+        process.stderr.write(
+          `Refusing to set up your home directory as a repository root (found ${path8.join(os3.homedir(), ".git")}). Run nolto init inside a project repository.
+`
+        );
+        return;
+      }
+      const existingBinding = deps.repoBinding?.error == null ? deps.repoBinding?.binding ?? null : null;
+      let repoProject = existingBinding != null ? { id: existingBinding.projectId, name: path8.basename(root) } : defaultProjectId != null ? { id: defaultProjectId, name: defaultProjectName ?? path8.basename(root) } : void 0;
+      if (repoProject == null) {
+        http ??= createHttpClient({ baseUrl, token, version: getCliVersion() });
+        if (projects == null) {
+          const result = await http.get("/api/projects");
+          projects = Array.isArray(result.projects) ? result.projects : [];
+        }
+        repoProject = await pickProject(
+          rl,
+          http,
+          projects,
+          "Project number for this repository, 'c' to create new (or Enter to skip): "
+        );
+      }
+      if (repoProject == null) {
+        process.stdout.write("Skipped repo setup (no project selected).\n");
+        return;
+      }
+      const setup = await rl.question(`
 Set up this repository (${root}) for roadmap sync? [Y/n] `);
-          if (setup.trim().toLowerCase() !== "n") {
-            if (deps.repoBinding?.error != null) {
-              process.stderr.write(
-                `Warning: existing nolto.json is invalid (${deps.repoBinding.error.message}). Overwriting it to repair.
+      if (setup.trim().toLowerCase() === "n") {
+        process.stdout.write("Skipped repo setup.\n");
+        return;
+      }
+      const bindingPath = deps.repoBinding?.path ?? path8.join(root, "nolto.json");
+      if (existingBinding != null) {
+        process.stdout.write(`binding:        kept ${bindingPath} (${existingBinding.projectId})
+`);
+      } else {
+        if (deps.repoBinding?.error != null) {
+          process.stderr.write(
+            `Warning: existing nolto.json is invalid (${deps.repoBinding.error.message}). Overwriting it to repair.
 `
-              );
-            }
-            await writeRepoBinding(root, defaultProjectId);
-            process.stdout.write(`binding:        wrote ${path8.join(root, "nolto.json")}
+          );
+        }
+        await writeRepoBinding(root, repoProject.id);
+        process.stdout.write(`binding:        wrote ${path8.join(root, "nolto.json")}
 `);
-            const sourceDir = resolveSkillSourceDir();
-            const version = getCliVersion();
-            const claudeInstall = await installSkill({
-              skillsParentDir: path8.join(root, ".claude", "skills"),
-              sourceDir,
-              version
-            });
-            process.stdout.write(`skill (claude): ${claudeInstall.action} ${claudeInstall.targetDir}
+      }
+      const sourceDir = resolveSkillSourceDir();
+      const version = getCliVersion();
+      const claudeInstall = await installSkill({
+        skillsParentDir: path8.join(root, ".claude", "skills"),
+        sourceDir,
+        version
+      });
+      process.stdout.write(`skill (claude): ${claudeInstall.action} ${claudeInstall.targetDir}
 `);
-            const usesAgentsTooling = fs.existsSync(path8.join(root, ".agents")) || fs.existsSync(path8.join(root, ".codex")) || fs.existsSync(path8.join(root, "AGENTS.md"));
-            if (usesAgentsTooling) {
-              const agentsInstall = await installSkill({
-                skillsParentDir: path8.join(root, ".agents", "skills"),
-                sourceDir,
-                version
-              });
-              process.stdout.write(`skill (agents): ${agentsInstall.action} ${agentsInstall.targetDir}
+      const usesAgentsTooling = fs.existsSync(path8.join(root, ".agents")) || fs.existsSync(path8.join(root, ".codex")) || fs.existsSync(path8.join(root, "AGENTS.md"));
+      if (usesAgentsTooling) {
+        const agentsInstall = await installSkill({
+          skillsParentDir: path8.join(root, ".agents", "skills"),
+          sourceDir,
+          version
+        });
+        process.stdout.write(`skill (agents): ${agentsInstall.action} ${agentsInstall.targetDir}
 `);
-            }
-            const scaffold = await scaffoldRoadmap({
-              repoRoot: root,
-              projectName: defaultProjectName ?? path8.basename(root)
-            });
-            process.stdout.write(
-              scaffold.created ? `roadmap:        created ${scaffold.path}
+      }
+      const scaffold = await scaffoldRoadmap({
+        repoRoot: root,
+        projectName: repoProject.name
+      });
+      process.stdout.write(
+        scaffold.created ? `roadmap:        created ${scaffold.path}
 ` : `roadmap:        exists ${scaffold.path}
 `
-            );
-            const registryResult = await addRepoToRegistry(getRegistryPath(process.env), root);
-            process.stdout.write(
-              registryResult.added ? `watch registry: added ${root}
+      );
+      const registryResult = await addRepoToRegistry(getRegistryPath(process.env), root);
+      process.stdout.write(
+        registryResult.added ? `watch registry: added ${root}
 ` : `watch registry: already registered
 `
-            );
-          }
-        } else {
-          process.stdout.write("\nNo git repository found here \u2014 skipped repo setup. Run `nolto init` inside a repo to set up roadmap sync.\n");
-        }
-      }
+      );
     } finally {
       rl.close();
     }
@@ -1600,6 +1685,12 @@ async function syncRepo(args, io) {
       );
     }
   } else if (io.fileExists(legacyPath)) {
+    if (args.migrateLegacy !== true) {
+      io.warn(
+        "legacy .roadmap/roadmap.json found \u2014 run `nolto sync` once to migrate it to .nolto/roadmaps/ (watch does not migrate automatically)"
+      );
+      return { results: [], planAbsPaths: [] };
+    }
     const migrationSlug = binding?.roadmapSlug ?? slugifyProjectId(path10.basename(args.root));
     roadmapFiles = [
       await migrateLegacyRoadmap({
@@ -1659,8 +1750,11 @@ function register5(program, deps) {
       throw new CliError("No git repository found. Run inside a repo set up with `nolto init`.", 2);
     }
     const http = deps.http;
+    const warn = (line) => {
+      process.stderr.write("Warning: " + line + "\n");
+    };
     const response = await syncRepo(
-      { root, defaultProjectId: deps.settings.defaultProjectId },
+      { root, defaultProjectId: deps.settings.defaultProjectId, migrateLegacy: true },
       {
         readFile: (p) => readFile5(p, "utf8"),
         fileExists: (p) => existsSync3(p),
@@ -1673,16 +1767,28 @@ function register5(program, deps) {
         repoIdentity: makeRepoIdentityResolver(deps),
         http,
         log: (line) => process.stdout.write(line + "\n"),
-        warn: (line) => process.stderr.write("Warning: " + line + "\n")
+        warn
       }
     );
-    let registryAdded = false;
     try {
-      registryAdded = (await addRepoToRegistry(getRegistryPath(process.env), root)).added;
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      process.stderr.write(`Warning: could not update watch registry: ${message}
+      const drifted = await checkSkillVersionDrift(root, deps.version);
+      if (drifted.length > 0) {
+        warn(formatSkillVersionDriftWarning(root, deps.version, drifted));
+      }
+    } catch {
+    }
+    let registryAdded = false;
+    if (isHomeDirectory(root)) {
+      process.stderr.write(`Warning: refusing to add home directory ${root} to the watch registry.
+`);
+    } else {
+      try {
+        registryAdded = (await addRepoToRegistry(getRegistryPath(process.env), root)).added;
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        process.stderr.write(`Warning: could not update watch registry: ${message}
 `);
+      }
     }
     if (deps.output.mode === "json") {
       const { planAbsPaths: _planAbsPaths, ...publicResponse } = response;
@@ -1804,7 +1910,7 @@ var RepoWatch = class {
 
 // src/service-install.ts
 import path11 from "path";
-import os2 from "os";
+import os4 from "os";
 function buildUnitFile(args) {
   return [
     "[Unit]",
@@ -1823,7 +1929,7 @@ function buildUnitFile(args) {
 }
 function getUnitPath(env) {
   const xdg = env["XDG_CONFIG_HOME"];
-  const base = xdg != null && xdg.length > 0 ? xdg : path11.join(os2.homedir(), ".config");
+  const base = xdg != null && xdg.length > 0 ? xdg : path11.join(os4.homedir(), ".config");
   return path11.join(base, "systemd", "user", "nolto-watch.service");
 }
 async function installServiceWith(deps) {
@@ -1976,10 +2082,15 @@ function register6(program, deps) {
     const startRepo = (root) => {
       const roadmapsPath = path12.join(root, ".nolto", "roadmaps");
       const legacyRoadmapPath = path12.join(root, ".roadmap", "roadmap.json");
+      const warn = (line) => {
+        process.stderr.write(`Warning: [${path12.basename(root)}] ${line}
+`);
+      };
       const watcher = chokidar.watch([roadmapsPath, legacyRoadmapPath], { ignoreInitial: true });
       const repoWatch = new RepoWatch(root, {
         sync: () => syncRepo(
-          { root, defaultProjectId: deps.settings.defaultProjectId },
+          // #316: watch must warn about legacy roadmaps without migrating them.
+          { root, defaultProjectId: deps.settings.defaultProjectId, migrateLegacy: false },
           {
             readFile: (p) => readFile6(p, "utf8"),
             fileExists: (p) => existsSync4(p),
@@ -1993,8 +2104,7 @@ function register6(program, deps) {
             http,
             log: (line) => process.stdout.write(`[${path12.basename(root)}] ${line}
 `),
-            warn: (line) => process.stderr.write(`Warning: [${path12.basename(root)}] ${line}
-`)
+            warn
           }
         ),
         watcher,
@@ -2005,6 +2115,12 @@ function register6(program, deps) {
         warn: (line) => process.stderr.write(line + "\n")
       });
       watcher.on("all", (_event, filePath) => repoWatch.handleEvent(filePath));
+      void checkSkillVersionDrift(root, deps.version).then((drifted) => {
+        if (drifted.length > 0) {
+          warn(formatSkillVersionDriftWarning(root, deps.version, drifted));
+        }
+      }).catch(() => {
+      });
       void repoWatch.flush();
       return { stop: () => watcher.close() };
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nolto/cli",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "CLI for syncing repository roadmaps with Nolto.",
   "license": "MIT",
   "type": "module",