@nolto/cli 0.9.0 → 0.10.0

package/README.md

@@ -45,7 +45,7 @@ nolto whoami               # Show resolved auth/config state and project count
 ```bash
 nolto link <projectId>     # Write or update nolto.json at the repository root
 nolto link --show          # Show the current binding, source, and repository identity
-nolto link --rebind        # Rebind the project to this repository (owner only)
+nolto link --rebind [--yes] # Rebind the project to this repository (owner only)
 nolto link --unlink        # Remove projectId from nolto.json
 ```
 
@@ -53,8 +53,11 @@ Commit `nolto.json` so everyone working in the repository targets the same Nolto
 project. A Nolto project is bound to the first repository identity it syncs from.
 The identity is the normalized `origin` remote, or a machine ID plus path when no
 remote is available. Syncing from a different repository fails with
-`409 repo_mismatch`. An owner can run `nolto link --rebind` in the correct
-repository to change the binding, at most once every seven days.
+`409 repo_mismatch`. Before rebinding, run `nolto link --show` and confirm that
+the project ID is intended for this repository. An owner can then run
+`nolto link --rebind` in the correct repository to change the binding, at most
+once every seven days. The command shows the project name and asks for
+confirmation; pass `--yes` (`-y`) to skip the prompt.
 
 CLI versions older than 0.8.0 do not send a repository identity and receive
 `426`; run `nolto update` before syncing.

package/dist/index.js

@@ -56,7 +56,7 @@ function mapHttpStatusToCliError(status, opts = {}) {
     return new CliError(
       opts.serverMessage ?? "This project is bound to a different repository.",
       2,
-      "Owner: run `nolto link --rebind` inside the repository that should own this project.",
+      "Check that nolto.json points to the project for this repository (nolto link --show). Owner: run `nolto link --rebind` inside the repository that should own this project.",
       status
     );
   }
@@ -374,7 +374,7 @@ function createHttpClient(opts) {
 import { Command } from "commander";
 
 // src/commands/init.ts
-import readline from "readline/promises";
+import readline2 from "readline/promises";
 import { createRequire } from "module";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import os3 from "os";
@@ -382,6 +382,7 @@ import path9 from "path";
 import fs from "fs";
 
 // src/commands/link.ts
+import readline from "readline/promises";
 import os2 from "os";
 import path5 from "path";
 import { statSync as statSync2 } from "fs";
@@ -819,14 +820,51 @@ async function handleShow(deps, projectBindingPath, mode2) {
     }
   }
 }
-async function handleRebind(deps, projectId, root, mode2) {
+async function handleRebind(deps, projectId, root, mode2, yes) {
   if (!UUID_RE.test(projectId)) {
     throw new CliError(
       `Invalid project ID: "${projectId}". Must be a UUID (e.g. 00000000-0000-0000-0000-000000000001).`,
       2
     );
   }
+  const result = await deps.http.get("/api/projects");
+  const projects = Array.isArray(result.projects) ? result.projects : [];
+  const project = projects.find((candidate) => candidate.id === projectId);
+  if (project == null) {
+    throw new CliError(
+      `Project ${projectId} is not in your accessible projects. Check nolto.json (nolto link --show) before rebinding.`,
+      2
+    );
+  }
   const repoIdentity = await makeRepoIdentityResolver(deps)(root);
+  if (mode2 !== "json") {
+    process.stdout.write(`Project   : ${project.name} (${project.id})
+`);
+    process.stdout.write(`Bound to  : ${project.repoIdentity ?? "not bound"}
+`);
+    process.stdout.write(`Rebind to : ${repoIdentity.kind}:${repoIdentity.value}
+`);
+  }
+  if (!yes) {
+    if (mode2 === "json") {
+      throw new CliError(
+        "--rebind requires confirmation. Pass --yes to skip the prompt in --json mode.",
+        2
+      );
+    }
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    let confirmed = false;
+    try {
+      const answer = await rl.question(`Rebind "${project.name}" to this repository? [y/N] `);
+      confirmed = answer.trim().toLowerCase() === "y";
+    } finally {
+      rl.close();
+    }
+    if (!confirmed) {
+      process.stdout.write("Aborted.\n");
+      return;
+    }
+  }
   await deps.http.post(`/api/projects/${projectId}/repo-binding`, { repoIdentity });
   if (mode2 === "json") {
     printResult({ rebound: true, projectId, repoIdentity }, mode2);
@@ -945,7 +983,7 @@ Commit nolto.json to share the binding with your team.
 function register(program, deps) {
   const cmd = program.command("link [projectId]").description(
     "Bind this repository to a Nolto project.\nWrites nolto.json at the repo root. Commit it to share the binding with your team.\n\nExamples:\n  nolto link <uuid>      Write / update nolto.json\n  nolto link --show      Show the current binding\n  nolto link --rebind    Rebind the project to this repository\n  nolto link --unlink    Remove the projectId from nolto.json"
-  ).option("--show", "Show the current repo binding (path + projectId + source)").option("--rebind", "Rebind the project to this repository (owner only, once per 7 days)").option("--unlink", "Remove the projectId key from nolto.json");
+  ).option("--show", "Show the current repo binding (path + projectId + source)").option("--rebind", "Rebind the project to this repository (owner only, once per 7 days)").option("-y, --yes", "Skip the rebind confirmation prompt").option("--unlink", "Remove the projectId key from nolto.json");
   cmd.action(async (projectId) => {
     const { output } = deps;
     const projectBindingPath = deps.repoBinding?.path ?? deps.projectBindingPath ?? null;
@@ -973,7 +1011,7 @@ function register(program, deps) {
       }
       const startDir = resolveStartDir(process.env, process.cwd());
       const root = findRepoRoot(startDir).root;
-      await handleRebind(deps, effectiveProjectId, root, mode2);
+      await handleRebind(deps, effectiveProjectId, root, mode2, cmd.opts()["yes"] === true);
       return;
     }
     if (projectId == null || projectId.trim().length === 0) {
@@ -1203,10 +1241,27 @@ async function pickProject(rl, http, projects, promptText) {
   }
   return void 0;
 }
+async function selectRepoProject(rl, http, projects, defaultProjectId) {
+  const defaultProject = defaultProjectId == null ? void 0 : projects.find((project) => project.id === defaultProjectId);
+  if (defaultProject != null) {
+    const useDefault = await rl.question(
+      `Use "${defaultProject.name}" (${defaultProject.id}) for this repository? [Y/n] `
+    );
+    if (useDefault.trim().toLowerCase() !== "n") {
+      return defaultProject;
+    }
+  }
+  return pickProject(
+    rl,
+    http,
+    projects,
+    "Project number for this repository, 'c' to create new (or Enter to skip): "
+  );
+}
 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;
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
     try {
       let configureGlobal = opts.force === true;
       if (!configureGlobal) {
@@ -1262,6 +1317,9 @@ function register2(program, deps) {
         );
         defaultProjectId = selected?.id;
         defaultProjectName = selected?.name;
+        if (selected != null && !projects.some((project) => project.id === selected.id)) {
+          projects = [...projects, selected];
+        }
         await saveConfigFile(configPath, {
           token,
           baseUrl: baseUrl !== DEFAULT_BASE_URL ? baseUrl : void 0,
@@ -1298,19 +1356,35 @@ Saved ${configPath}
         return;
       }
       const existingBinding = deps.repoBinding?.error == null ? deps.repoBinding?.binding ?? null : null;
-      let repoProject = existingBinding != null ? { id: existingBinding.projectId, name: path9.basename(root) } : defaultProjectId != null ? { id: defaultProjectId, name: defaultProjectName ?? path9.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 : [];
+      const repoHttp = http ?? deps.http;
+      if (projects == null) {
+        const result = await repoHttp.get("/api/projects");
+        projects = Array.isArray(result.projects) ? result.projects : [];
+      }
+      let keepExistingBinding = false;
+      let repoProject;
+      if (existingBinding != null) {
+        const boundProject = projects.find(
+          (project) => project.id === existingBinding.projectId
+        );
+        if (boundProject != null) {
+          process.stdout.write(
+            `Existing binding: nolto.json \u2192 "${boundProject.name}" (${boundProject.id})
+`
+          );
+        } else {
+          process.stderr.write(
+            `Warning: nolto.json points to project ${existingBinding.projectId}, which is not in your accessible projects.
+`
+          );
         }
-        repoProject = await pickProject(
-          rl,
-          http,
-          projects,
-          "Project number for this repository, 'c' to create new (or Enter to skip): "
+        const keep = await rl.question(
+          boundProject != null ? "Keep this binding? [Y/n] " : "Keep this binding? [y/N] "
         );
+        keepExistingBinding = boundProject != null ? keep.trim().toLowerCase() !== "n" : keep.trim().toLowerCase() === "y";
+        repoProject = keepExistingBinding ? boundProject ?? { id: existingBinding.projectId, name: path9.basename(root) } : await selectRepoProject(rl, repoHttp, projects, defaultProjectId);
+      } else {
+        repoProject = await selectRepoProject(rl, repoHttp, projects, defaultProjectId);
       }
       if (repoProject == null) {
         process.stdout.write("Skipped repo setup (no project selected).\n");
@@ -1323,8 +1397,8 @@ Set up this repository (${root}) for roadmap sync? [Y/n] `);
         return;
       }
       const bindingPath = deps.repoBinding?.path ?? path9.join(root, "nolto.json");
-      if (existingBinding != null) {
-        process.stdout.write(`binding:        kept ${bindingPath} (${existingBinding.projectId})
+      if (keepExistingBinding) {
+        process.stdout.write(`binding:        kept ${bindingPath} (${repoProject.id})
 `);
       } else {
         if (deps.repoBinding?.error != null) {
@@ -1407,7 +1481,7 @@ async function promptHidden(rl, prompt) {
 }
 
 // src/commands/login.ts
-import readline2 from "readline/promises";
+import readline3 from "readline/promises";
 
 // src/login-poll.ts
 async function pollUntilToken(opts) {
@@ -1473,7 +1547,7 @@ function register3(program, deps) {
         } catch {
         }
         if (existing?.token) {
-          const rl = readline2.createInterface({
+          const rl = readline3.createInterface({
             input: process.stdin,
             output: process.stdout
           });

package/package.json

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