intentdocs 0.12.1 → 0.12.2

package/dist/{chunk-SDXDVNNP.js → chunk-2NSRHMTH.js}

@@ -13,7 +13,7 @@ import {
 import {
   hasConfig,
   requireConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   choose,
   closePrompt

package/dist/{chunk-5GATVQEI.js → chunk-2VM54R5K.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-KPQ42YE6.js";
 import {
   requireConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   closePrompt,
   confirm,

package/dist/{chunk-Q6BSSJK5.js → chunk-7ONMS2RJ.js}

@@ -5,7 +5,7 @@ import {
   checkoutConfig,
   hasConfig,
   writeConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   ask,
   closePrompt,
@@ -196,7 +196,7 @@ async function scope(projectId) {
     "  Configure your AI tool (Claude Code / Cursor) with intentdocs agent workflows?"
   );
   if (wantSetup) {
-    const { setup } = await import("./setup-W4PKG6GB.js");
+    const { setup } = await import("./setup-5ZNAOKQK.js");
     await setup();
     return;
   }

package/dist/{chunk-RGFGTIIH.js → chunk-HWMSGXLQ.js}

@@ -442,6 +442,14 @@ function newFeature(key, remote) {
   return `${[head, ...scenarios].join("\n\n")}
 `;
 }
+function freeKeys(prefix, used, count) {
+  let top = 0;
+  for (const key of used) {
+    const m = new RegExp(`^${prefix}-(\\d+)$`).exec(key);
+    if (m) top = Math.max(top, Number(m[1]));
+  }
+  return Array.from({ length: count }, (_, i) => `${prefix}-${top + 1 + i}`);
+}
 
 // src/lib/config.ts
 import { readFileSync as readFileSync2, writeFileSync, mkdirSync, existsSync as existsSync2 } from "fs";
@@ -526,6 +534,7 @@ export {
   classify,
   renderFeature,
   newFeature,
+  freeKeys,
   checkoutConfig,
   hasConfig,
   readConfig,

package/dist/{pull-MDI63WI7.js → chunk-JDK3RCQU.js}

@@ -5,6 +5,7 @@ import {
   classify,
   featureFiles,
   findIntentDir,
+  freeKeys,
   newFeature,
   parseFeature,
   readIntentFolder,
@@ -15,15 +16,13 @@ import {
   specOfPushStory,
   specOfStory,
   writeSyncBase
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   choose,
   closePrompt,
   confirm,
   isInteractive
 } from "./chunk-WRRUCCVZ.js";
-import "./chunk-XZE2XP6O.js";
-import "./chunk-UYTVTYNB.js";
 
 // src/commands/pull.ts
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs";
@@ -254,6 +253,8 @@ function planUnits(deps, response, base, nextBase, outcome) {
       });
     }
   }
+  const synced = Object.keys(base.stories).length > 0;
+  const numberTaken = (key, mine, theirs) => synced && !(key in base.stories) && specOfPushStory(mine).title !== theirs.title;
   const live = response.stories.filter((s) => s.key);
   outcome.cancelled = live.filter((s) => s.cancelled_at && files.has(s.key)).map((s) => s.key);
   for (const story of live.filter((s) => !s.cancelled_at)) {
@@ -261,7 +262,9 @@ function planUnits(deps, response, base, nextBase, outcome) {
     const theirs = specOfStory(story, storymap.activities ?? []);
     const mine = local.get(key);
     const path = files.get(key);
-    if (mine && path) {
+    if (mine && path && numberTaken(key, mine, theirs)) {
+      outcome.numberTaken.push(key);
+    } else if (mine && path) {
       const kind = classify(specOfPushStory(mine), theirs, base.stories[key]);
       if (kind === null) nextBase.stories[key] = theirs;
       else if (kind === "local") outcome.localOnly.push(key);
@@ -320,7 +323,7 @@ function planUnits(deps, response, base, nextBase, outcome) {
   }
   const statusChanges = [];
   const notMoved = [];
-  for (const s of live.filter((s2) => !s2.cancelled_at && STATUSES.has(s2.status) && state.stories?.[s2.key])) {
+  for (const s of live.filter((s2) => !s2.cancelled_at && STATUSES.has(s2.status) && state.stories?.[s2.key] && !outcome.numberTaken.includes(s2.key))) {
     const key = s.key;
     const mine = state.stories[key].status ?? "todo";
     const was = base.statuses[key];
@@ -345,7 +348,7 @@ function planUnits(deps, response, base, nextBase, outcome) {
       }
     });
   }
-  for (const story of live.filter((s) => !s.cancelled_at && s.agent_plan && files.has(s.key) && local.has(s.key))) {
+  for (const story of live.filter((s) => !s.cancelled_at && s.agent_plan && files.has(s.key) && local.has(s.key) && !outcome.numberTaken.includes(s.key))) {
     const key = story.key;
     const plan = story.agent_plan;
     if ((base.plans[key] ?? 0) >= plan.version) continue;
@@ -369,11 +372,23 @@ function planUnits(deps, response, base, nextBase, outcome) {
   }
   return units;
 }
+function numberTakenAdvice(keys, used) {
+  const prefix = keys[0].replace(/-\d+$/, "");
+  const next = freeKeys(prefix, used, keys.length);
+  return [
+    `
+${keys.join(", ")} ${keys.length === 1 ? "is" : "are"} used by a different story in intentdocs, made since this folder last synced. Neither was changed.`,
+    "  1. Give the folder's " + (keys.length === 1 ? "story a number" : "stories numbers") + " that isn't taken: " + keys.map((k, i) => `${k} \u2192 ${next[i]}`).join(", ") + ".",
+    "     Change it in the feature file's tag, storymap.yaml, state.yaml and any plans/<key>.v*.md.",
+    "  2. Run `intentdocs pull` to bring intentdocs' " + keys.join(", ") + " into the folder.",
+    "  3. Run `intentdocs push` to send the renumbered " + (keys.length === 1 ? "story" : "stories") + "."
+  ];
+}
 async function runPull(deps) {
   const response = await deps.listStories();
   const base = deps.readSyncBase();
   const nextBase = structuredClone(base);
-  const outcome = { units: [], written: [], localOnly: [], cancelled: [], statusNotMoved: [] };
+  const outcome = { units: [], written: [], localOnly: [], cancelled: [], statusNotMoved: [], numberTaken: [] };
   outcome.units = planUnits(deps, response, base, nextBase, outcome);
   const disk = new Files(deps.readFile);
   for (const unit of outcome.units) {
@@ -394,11 +409,15 @@ Changed only in the repo, so nothing to pull: ${outcome.localOnly.join(", ")}. \
     deps.log(`
 intentdocs hasn't moved these since the last sync, so their status here is kept: ${outcome.statusNotMoved.join(", ")}.`);
   if (outcome.cancelled.length) deps.log(`Cancelled in intentdocs, left as they are here: ${outcome.cancelled.join(", ")}.`);
+  if (outcome.numberTaken.length) {
+    const used = [...response.stories.map((s) => s.key ?? ""), ...featureFiles(findIntentDir(deps.cwd)).keys()];
+    for (const line of numberTakenAdvice(outcome.numberTaken, used)) deps.log(line);
+  }
   const safe = outcome.units.filter((u) => u.kind === "web");
   const risky = outcome.units.filter((u) => u.kind !== "web");
   const apply = /* @__PURE__ */ new Set();
   if (outcome.units.length === 0) {
-    if (!outcome.localOnly.length && !outcome.statusNotMoved.length) deps.log("\nThe repo already matches intentdocs.");
+    if (!outcome.localOnly.length && !outcome.statusNotMoved.length && !outcome.numberTaken.length) deps.log("\nThe repo already matches intentdocs.");
   } else if (deps.yes) {
     for (const u of safe) apply.add(u);
     if (risky.length) deps.log(`
@@ -469,8 +488,10 @@ async function pull(opts = {}) {
     closePrompt();
   }
 }
+
 export {
   PullError,
-  pull,
-  runPull
+  numberTakenAdvice,
+  runPull,
+  pull
 };

package/dist/{ci-CWPLSRCQ.js → ci-LG4NM2DU.js}

@@ -1,8 +1,8 @@
 import {
   ci
-} from "./chunk-5GATVQEI.js";
+} from "./chunk-2VM54R5K.js";
 import "./chunk-KPQ42YE6.js";
-import "./chunk-RGFGTIIH.js";
+import "./chunk-HWMSGXLQ.js";
 import "./chunk-WRRUCCVZ.js";
 import "./chunk-XZE2XP6O.js";
 import "./chunk-UYTVTYNB.js";

package/dist/{complexity-HLJTXY55.js → complexity-6XVLG3EH.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-KTGQO3AE.js";
 import {
   requireConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import "./chunk-XZE2XP6O.js";
 import "./chunk-UYTVTYNB.js";
 

package/dist/{import-prd-FQI4J45M.js → import-prd-DTO5LTWA.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-KTGQO3AE.js";
 import {
   requireConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   closePrompt,
   confirm

package/dist/index.js

@@ -1,4 +1,8 @@
 #!/usr/bin/env node
+import {
+  login,
+  logout
+} from "./chunk-64I7RLP3.js";
 import {
   appendToNotes
 } from "./chunk-GFKZ5CRL.js";
@@ -8,11 +12,11 @@ import {
 } from "./chunk-UQDMUKLP.js";
 import {
   ci
-} from "./chunk-5GATVQEI.js";
+} from "./chunk-2VM54R5K.js";
 import {
   setup,
   sync
-} from "./chunk-SDXDVNNP.js";
+} from "./chunk-2NSRHMTH.js";
 import {
   criterionPriority,
   criterionStatusLabel,
@@ -31,11 +35,7 @@ import {
 } from "./chunk-KPQ42YE6.js";
 import {
   scope
-} from "./chunk-Q6BSSJK5.js";
-import {
-  login,
-  logout
-} from "./chunk-64I7RLP3.js";
+} from "./chunk-7ONMS2RJ.js";
 import {
   amendDecision,
   apiFetch,
@@ -57,7 +57,7 @@ import {
   readConfig,
   requireConfig,
   writeConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   ask,
   closePrompt,
@@ -304,7 +304,7 @@ Connecting to "${map2.title}"${project.workspace ? ` in ${project.workspace.name
     await offerAllowList((q) => ask2(rl, q));
     const setUpCi = await ask2(rl, "  Set up CI test reporting now? It creates a key and adds the workflow. (y/N): ");
     if (/^y(es)?$/i.test(setUpCi.trim())) {
-      const { ci: ci2 } = await import("./ci-CWPLSRCQ.js");
+      const { ci: ci2 } = await import("./ci-LG4NM2DU.js");
       await ci2();
     } else {
       console.log("  You can run `npx intentdocs ci` any time to turn it on.\n");
@@ -1663,7 +1663,7 @@ async function start() {
     closePrompt();
     return;
   }
-  const { scope: scope2 } = await import("./scope-ORIFXV4P.js");
+  const { scope: scope2 } = await import("./scope-PFHPW6Y6.js");
   await scope2(projectId);
 }
 
@@ -3048,10 +3048,10 @@ program.command("projects").description("List the projects your token can reach
   import("./projects-AYAYVFKL.js").then((m) => void m.projects());
 });
 program.command("push").description("Upload this repo's nikOS intent/ folder: log in, create the project, and link the repo").action(() => {
-  import("./push-7LJ654MJ.js").then((m) => m.push());
+  import("./push-62T2TMKN.js").then((m) => m.push());
 });
 program.command("pull").description("Show web edits to this repo's feature files as a diff, then write the ones you agree to").option("-y, --yes", "write web changes without asking (never settles a story changed on both sides)").action((opts) => {
-  import("./pull-MDI63WI7.js").then((m) => m.pull(opts));
+  import("./pull-6GAAR6NP.js").then((m) => m.pull(opts));
 });
 program.command("init [token]").description("Connect this project to a intentdocs story map").action((token) => void init(token));
 program.command("sync").description("Refresh INTENT.md from the live story map").option("--context", "Refresh only the CLAUDE.md/AGENTS.md context file (not stories)").action((opts) => void sync(opts));
@@ -3066,36 +3066,36 @@ program.command("done <id>").description("Mark a story as done (accepts its key
 program.command("stop <id>").description("Stop development of an in-progress story (resets to todo, signals agents to stop; accepts its key or an ID prefix)").action((id) => void stop(id));
 program.command("add <title>").description("Create a new story").option("-a, --activity <activity>", "Activity to add the story under").option("-p, --priority <priority>", "Priority: must, should, could", "should").option("-e, --effort <effort>", "Effort: S, M, L, XL", "M").action((title, opts) => void add(title, opts));
 var decide = program.command("decide [title]").description("Log an architectural or product decision").option("-d, --description <desc>", "Decision description").option("-c, --category <cat>", "Category: architecture, product, technical, trade-off", "technical").option("-s, --story <id>", "Link to a story (its key like PB-42, or an ID prefix)").action((title, opts) => {
-  import("./log-VTIAG4PC.js").then((m) => void m.logDecision(title, opts));
+  import("./log-ELEPANI3.js").then((m) => void m.logDecision(title, opts));
 });
 decide.command("list").description("List logged decisions (id, category, title)").action(() => {
-  import("./log-VTIAG4PC.js").then((m) => void m.listLoggedDecisions());
+  import("./log-ELEPANI3.js").then((m) => void m.listLoggedDecisions());
 });
 decide.command("amend <id>").description("Amend a logged decision's title, description, or category (accepts an ID prefix)").option("-t, --title <title>", "New title").option("-d, --description <desc>", "New description").option("-c, --category <cat>", "New category: architecture, product, technical, trade-off").action((id, opts) => {
-  import("./log-VTIAG4PC.js").then((m) => void m.amendDecision(id, opts));
+  import("./log-ELEPANI3.js").then((m) => void m.amendDecision(id, opts));
 });
 decide.command("delete <id>").alias("retract").description("Retract a logged decision \u2014 soft-deleted and audited, not removed (accepts an ID prefix)").option("-r, --reason <reason>", "Why this decision is being retracted").option("-y, --yes", "Skip the confirmation prompt (required when there's no TTY)").action((id, opts) => {
-  import("./log-VTIAG4PC.js").then((m) => void m.deleteDecision(id, opts));
+  import("./log-ELEPANI3.js").then((m) => void m.deleteDecision(id, opts));
 });
 program.command("note <storyId> [note]").description("Add an implementation note to a story (appended to its notes)").action((storyId, note) => {
-  import("./log-VTIAG4PC.js").then((m) => void m.logNote(storyId, note));
+  import("./log-ELEPANI3.js").then((m) => void m.logNote(storyId, note));
 });
 program.command("example").description("Add a few-shot reference pattern (before/after code) to the project").action(() => void example());
 program.command("complexity [storyId]").description("Analyze story complexity with AI \u2014 scores, risks, effort estimates").action((id) => {
-  import("./complexity-HLJTXY55.js").then((m) => void m.complexity(id));
+  import("./complexity-6XVLG3EH.js").then((m) => void m.complexity(id));
 });
 program.command("research [query]").description("Research a topic with AI using your project context").action((query) => {
-  import("./research-L27DLYXC.js").then((m) => void m.research(query));
+  import("./research-XMUAQOVB.js").then((m) => void m.research(query));
 });
 program.command("import [file]").description("Import a PRD or spec into your story map as stories (reads standard input when no file is given; needs --yes then)").option("-y, --yes", "Import without asking for confirmation (required when reading from standard input)").action((file, opts) => {
-  import("./import-prd-FQI4J45M.js").then((m) => void m.importPrd(file, opts));
+  import("./import-prd-DTO5LTWA.js").then((m) => void m.importPrd(file, opts));
 });
 var map = program.command("map").description("Import or extract story maps from codebases");
 map.command("extract").description("Output a prompt for your coding agent to extract a story map from an existing codebase").action(() => {
-  import("./map-extract-4C44YGGD.js").then((m) => void m.mapExtract());
+  import("./map-extract-MUGIIXTP.js").then((m) => void m.mapExtract());
 });
 map.command("import <file>").description("Import a storymap.json file generated by your coding agent").option("--yes", "Skip confirmation prompt").action((file, opts) => {
-  import("./map-import-TSSDU766.js").then((m) => void m.mapImport(file, opts));
+  import("./map-import-TDBELC77.js").then((m) => void m.mapImport(file, opts));
 });
 map.command("schema").description("Print the JSON Schema for storymap.json").action(() => {
   import("./map-schema-5BEIJM2J.js").then((m) => void m.mapSchema());

package/dist/{log-VTIAG4PC.js → log-ELEPANI3.js}

@@ -17,7 +17,7 @@ import {
 } from "./chunk-KTGQO3AE.js";
 import {
   requireConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   ask,
   closePrompt,

package/dist/{map-extract-4C44YGGD.js → map-extract-MUGIIXTP.js}

@@ -1,6 +1,6 @@
 import {
   requireConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import "./chunk-UYTVTYNB.js";
 
 // src/commands/map-extract.ts

package/dist/{map-import-TSSDU766.js → map-import-TDBELC77.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-KTGQO3AE.js";
 import {
   requireConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   closePrompt,
   confirm

package/dist/pull-6GAAR6NP.js

@@ -0,0 +1,17 @@
+import {
+  PullError,
+  numberTakenAdvice,
+  pull,
+  runPull
+} from "./chunk-JDK3RCQU.js";
+import "./chunk-KTGQO3AE.js";
+import "./chunk-HWMSGXLQ.js";
+import "./chunk-WRRUCCVZ.js";
+import "./chunk-XZE2XP6O.js";
+import "./chunk-UYTVTYNB.js";
+export {
+  PullError,
+  numberTakenAdvice,
+  pull,
+  runPull
+};

package/dist/{push-7LJ654MJ.js → push-62T2TMKN.js}

@@ -2,17 +2,23 @@ import {
   login
 } from "./chunk-64I7RLP3.js";
 import {
-  checkoutMismatch
+  numberTakenAdvice
+} from "./chunk-JDK3RCQU.js";
+import {
+  checkoutMismatch,
+  listStories
 } from "./chunk-KTGQO3AE.js";
 import {
   checkoutConfig,
+  featureFiles,
+  findIntentDir,
   readConfig,
   readIntentFolder,
   readSyncBase,
   specOfPushStory,
   writeConfig,
   writeSyncBase
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   choose,
   closePrompt,
@@ -36,12 +42,13 @@ var PUSH_ENDPOINTS = {
   projectMaps: (projectId) => `/api/cli/projects/${encodeURIComponent(projectId)}/maps`
 };
 var PushApiError = class extends Error {
-  constructor(message, status, code = null, problems = [], projectId = null) {
+  constructor(message, status, code = null, problems = [], projectId = null, keys = []) {
     super(message);
     this.status = status;
     this.code = code;
     this.problems = problems;
     this.projectId = projectId;
+    this.keys = keys;
     this.name = "PushApiError";
   }
 };
@@ -56,7 +63,8 @@ async function call(fetcher, path, init, what) {
       res.status,
       typeof body.error === "string" ? body.error : null,
       Array.isArray(body.problems) ? body.problems : [],
-      body.project_id ?? null
+      body.project_id ?? null,
+      Array.isArray(body.keys) ? body.keys.filter((k) => typeof k === "string") : []
     );
   }
   return await res.json();
@@ -169,6 +177,13 @@ function openBrowser(url) {
   const cmd = process.platform === "darwin" ? `open "${url}"` : process.platform === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
   exec(cmd);
 }
+async function numberTakenSteps(keys, localKeys, remoteKeys) {
+  const remote = await remoteKeys().catch(() => []);
+  return [
+    ...numberTakenAdvice(keys, [...keys, ...localKeys, ...remote]).slice(1),
+    "  Changes to stories intentdocs already had may have been saved; pushing again is safe."
+  ];
+}
 async function push() {
   const deps = {
     cwd: process.cwd(),
@@ -201,6 +216,11 @@ async function push() {
     if (err instanceof PushError) {
       console.error(`\u2717 ${err.message}`);
       for (const d of err.details) console.error(`  - ${d}`);
+    } else if (err instanceof PushApiError && err.code === "NUMBER_TAKEN" && err.keys.length) {
+      console.error(`\u2717 ${err.message}`);
+      const config = readConfig();
+      const remote = async () => config?.mapId ? (await listStories(config)).stories.map((s) => s.key ?? "") : [];
+      for (const line of await numberTakenSteps(err.keys, featureFiles(findIntentDir(deps.cwd)).keys(), remote)) console.error(line);
     } else if (err instanceof PushApiError) {
       console.error(`\u2717 ${err.message}`);
       for (const p of err.problems) console.error(`  - ${p}`);
@@ -214,6 +234,7 @@ async function push() {
 }
 export {
   PushError,
+  numberTakenSteps,
   push,
   pushNotes,
   runPush

package/dist/{research-L27DLYXC.js → research-XMUAQOVB.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-KTGQO3AE.js";
 import {
   requireConfig
-} from "./chunk-RGFGTIIH.js";
+} from "./chunk-HWMSGXLQ.js";
 import {
   ask,
   closePrompt

package/dist/{scope-ORIFXV4P.js → scope-PFHPW6Y6.js}

@@ -1,9 +1,9 @@
 import {
   connectCheckout,
   scope
-} from "./chunk-Q6BSSJK5.js";
+} from "./chunk-7ONMS2RJ.js";
 import "./chunk-KTGQO3AE.js";
-import "./chunk-RGFGTIIH.js";
+import "./chunk-HWMSGXLQ.js";
 import "./chunk-WRRUCCVZ.js";
 import "./chunk-XZE2XP6O.js";
 import "./chunk-UYTVTYNB.js";

package/dist/{setup-W4PKG6GB.js → setup-5ZNAOKQK.js}

@@ -1,11 +1,11 @@
 import {
   setup
-} from "./chunk-SDXDVNNP.js";
+} from "./chunk-2NSRHMTH.js";
 import "./chunk-BNEU6TLJ.js";
 import "./chunk-LQTPZL2Y.js";
 import "./chunk-KPQ42YE6.js";
 import "./chunk-KTGQO3AE.js";
-import "./chunk-RGFGTIIH.js";
+import "./chunk-HWMSGXLQ.js";
 import "./chunk-WRRUCCVZ.js";
 import "./chunk-XZE2XP6O.js";
 import "./chunk-UYTVTYNB.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intentdocs",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "CLI for intentdocs.com — intent-driven development: connect your codebase to your product specs",
   "bin": {
     "intentdocs": "bin/intentdocs.js",