@intelligo-dev/cli 1.0.0-beta.13 → 1.0.0-beta.15

package/dist/registry-items.js

@@ -3,11 +3,10 @@
  * is, what else it needs installed first, and the commands that install
  * a selection into a fresh app.
  *
- * Installing is the shadcn CLI's job, not this package's — the items
- * are shadcn-schema JSON served at intelligo.dev/r, and the scaffold's
- * components.json already names that registry as `@intelligo`. What the
- * CLI adds is the order: an item that imports a sibling's files
- * (requires.json `items`) has to land after it.
+ * Installing goes through `intelligo sync` (commands/sync.ts): one
+ * `shadcn add` per item from the registry bundled with this CLI, in the
+ * order requires.json `items` implies — an item that imports a
+ * sibling's files lands after it.
  */
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
@@ -56,8 +55,16 @@ export function detectPackageManager(userAgent = process.env.npm_config_user_age
     const name = userAgent?.split("/")[0];
     return name === "npm" || name === "yarn" || name === "bun" ? name : "pnpm";
 }
-export function formatCommand(c) {
-    return [c.command, ...c.args].join(" ");
+/**
+ * The command as a reader pastes it from `from` (the app's directory):
+ * a command that runs elsewhere is wrapped in a `cd`.
+ */
+export function formatCommand(c, from) {
+    const line = [c.command, ...c.args].join(" ");
+    if (!c.cwd || !from || path.resolve(c.cwd) === path.resolve(from)) {
+        return line;
+    }
+    return `(cd ${path.relative(from, c.cwd) || "."} && ${line})`;
 }
 const EXEC = {
     pnpm: ["pnpm", "exec"],
@@ -69,35 +76,112 @@ const EXEC = {
 export function hasLocalShadcn(appRoot) {
     return existsSync(path.join(appRoot, "node_modules", ".bin", "shadcn"));
 }
+/** The `packages:` globs of a pnpm-workspace.yaml (`!` exclusions kept). */
+export function workspaceGlobs(yaml) {
+    const globs = [];
+    let inPackages = false;
+    for (const raw of yaml.split(/\r?\n/)) {
+        const line = raw.replace(/\s+#.*$/, "");
+        const key = /^packages\s*:\s*(.*)$/.exec(line);
+        if (key) {
+            const flow = /^\[(.*)\]$/.exec(key[1].trim());
+            if (flow) {
+                for (const g of flow[1].split(",")) {
+                    const glob = g.trim().replace(/^["']|["']$/g, "");
+                    if (glob)
+                        globs.push(glob);
+                }
+            }
+            else
+                inPackages = true;
+            continue;
+        }
+        if (!inPackages)
+            continue;
+        const entry = /^\s+-\s*(.+?)\s*$/.exec(line);
+        if (entry)
+            globs.push(entry[1].replace(/^["']|["']$/g, ""));
+        else if (/^\S/.test(line))
+            inPackages = false;
+    }
+    return globs;
+}
+function globToRegExp(glob) {
+    const pattern = glob
+        .replace(/^\.\//, "")
+        .replace(/\/+$/, "")
+        .split(/(\*\*|\*|\?)/)
+        .map((part) => part === "**"
+        ? ".*"
+        : part === "*"
+            ? "[^/]*"
+            : part === "?"
+                ? "[^/]"
+                : part.replace(/[.+^${}()|[\]\\]/g, "\\$&"))
+        .join("");
+    return new RegExp(`^${pattern}$`);
+}
 /**
- * The commands that put `items` into the app at `appRoot`: install the
- * dependencies when shadcn is not there yet (the scaffold declares it),
- * then the design-system base, then the items in dependency order.
- * `--overwrite` because the base replaces the scaffold's globals.css,
- * and items that share a file agree on it — the same flags the
- * reference app is regenerated with.
+ * The root of the pnpm workspace that has `appRoot` as a member, if
+ * any: the nearest pnpm-workspace.yaml above the app, when one of its
+ * `packages` globs matches the app's path and no `!` glob excludes it.
+ * Installing from there updates the workspace's one lockfile instead of
+ * starting a nested one in the app.
+ */
+export function findWorkspaceRoot(appRoot) {
+    const app = path.resolve(appRoot);
+    let dir = path.dirname(app);
+    for (;;) {
+        const file = path.join(dir, "pnpm-workspace.yaml");
+        if (existsSync(file)) {
+            const rel = path.relative(dir, app).split(path.sep).join("/");
+            const globs = workspaceGlobs(readFileSync(file, "utf8"));
+            const included = globs
+                .filter((g) => !g.startsWith("!"))
+                .some((g) => globToRegExp(g).test(rel));
+            const excluded = globs
+                .filter((g) => g.startsWith("!"))
+                .some((g) => globToRegExp(g.slice(1)).test(rel));
+            return included && !excluded ? dir : null;
+        }
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            return null;
+        dir = parent;
+    }
+}
+/** The design-system base, installed before any page. */
+const BASE = "intelligo";
+/**
+ * How `items` get into the app at `appRoot`: the dependencies first
+ * when shadcn is missing, then `intelligo sync` of the base and every
+ * item — one `shadcn add` per item in dependency order, from the
+ * registry bundled with this CLI, with `--force` because a fresh
+ * scaffold's files (globals.css, the theme provider) are the registry's
+ * to replace. Null when nothing was picked.
  */
 export function installPlan(items, options) {
     if (items.length === 0)
-        return [];
-    const [command, ...exec] = EXEC[options.packageManager];
-    const add = (names) => ({
-        command: command,
-        args: [
-            ...exec,
-            "shadcn",
-            "add",
-            ...names.map((n) => `@intelligo/${n}`),
-            "--yes",
-            "--overwrite",
-        ],
-    });
-    return [
-        ...(hasLocalShadcn(options.appRoot)
-            ? []
-            : [{ command: options.packageManager, args: ["install"] }]),
-        add(["intelligo"]),
-        add([...items]),
-    ];
+        return null;
+    const packageManager = options.workspaceRoot
+        ? "pnpm"
+        : options.packageManager;
+    const [command, ...exec] = EXEC[packageManager];
+    const synced = [BASE, ...items.filter((n) => n !== BASE)];
+    return {
+        install: hasLocalShadcn(options.appRoot)
+            ? null
+            : {
+                command: packageManager,
+                args: ["install"],
+                cwd: options.workspaceRoot ?? options.appRoot,
+            },
+        items: synced,
+        sync: {
+            command: command,
+            args: [...exec, "intelligo", "sync", ...synced, "--force"],
+            cwd: options.appRoot,
+        },
+    };
 }
 //# sourceMappingURL=registry-items.js.map

package/dist/registry-items.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry-items.js","sourceRoot":"","sources":["../src/registry-items.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"registry-items.js","sourceRoot":"","sources":["../src/registry-items.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intelligo-dev/cli",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.15",
   "description": "The Intelligo CLI: scaffold an AI SaaS app, generate owned source, and check its migrations and upgrades.",
   "keywords": [
     "intelligo",

package/src/args.ts

@@ -0,0 +1,25 @@
+/**
+ * The flags a command accepts. A flag it does not know is an error
+ * rather than ignored: `sync --chek` must not apply, and `add --all`
+ * must not look as if it did something.
+ */
+
+export function unknownFlags(
+  args: readonly string[],
+  allowed: readonly string[]
+): string[] {
+  return args.filter((arg) => arg.startsWith("-") && !allowed.includes(arg));
+}
+
+export function wantsHelp(args: readonly string[]): boolean {
+  return args.includes("--help") || args.includes("-h");
+}
+
+/** `a,b c` → `["a", "b", "c"]`: items as `create --items` takes them, or space-separated. */
+export function itemNames(args: readonly string[]): string[] {
+  return args
+    .filter((arg) => !arg.startsWith("-"))
+    .flatMap((arg) => arg.split(","))
+    .map((name) => name.trim())
+    .filter(Boolean);
+}

package/src/bin.ts

@@ -35,13 +35,26 @@ import {
   applyMigrations,
   formatApplyResult,
 } from "./commands/migrate.js";
+import {
+  formatSyncReport,
+  installedFrameworkVersion,
+  selectItems,
+  syncApply,
+  syncCheck,
+  syncCheckExitCode,
+  type SyncContext,
+} from "./commands/sync.js";
 import {
   formatUpgradeReport,
   upgradeCheck,
   upgradeCheckExitCode,
 } from "./commands/upgrade-check.js";
 
+import { itemNames, unknownFlags, wantsHelp } from "./args.js";
 import { loadAppEnv } from "./env-files.js";
+import { workspaceRootVariable } from "./commands/create.js";
+import { resolveRegistryDir } from "./registry-bundle.js";
+import { findWorkspaceRoot, readRegistryCatalogue } from "./registry-items.js";
 import { MIGRATION_LOCATIONS, resolveMigrationsDir } from "./migrations-dir.js";
 
 /**
@@ -74,7 +87,7 @@ function usage(): string {
     "intelligo <command>",
     "",
     "  create [dir]      Scaffold an app, then install the registry pages you pick",
-    "                    (--items a,b | --all, --yes, --no-install)",
+    "                    (--items a,b | --all, --yes, --no-install, --name <name>)",
     "  doctor            Report configuration and migration-chain problems",
     "  migrate           Apply the framework's migration chain to DATABASE_URL",
     "  migrate --check   Compare the framework's migrations to a database",
@@ -82,6 +95,10 @@ function usage(): string {
     "                    fresh | ahead | unmanaged | legacy)",
     "  add <feature>     Generate consumer-owned source (--force to overwrite)",
     "  upgrade --check   Show what a template upgrade would change",
+    "  sync [items…]     Install registry pages from this release's registry",
+    "                    (names space- or comma-separated),",
+    "                    keeping seams and merging messages (--force replaces",
+    "                    hand-edited files; --check only reports, exit 1 on drift)",
     "",
   ].join("\n");
 }
@@ -164,17 +181,72 @@ async function runMigrate(
   }
 }
 
+function flagsOk(
+  command: string,
+  args: readonly string[],
+  allowed: readonly string[]
+): boolean {
+  const unknown = unknownFlags(args, allowed);
+  if (unknown.length === 0) return true;
+  console.error(
+    `intelligo ${command}: unknown argument ${unknown.join(" ")}` +
+      (allowed.length ? ` (it takes ${allowed.join(", ")}).` : ".")
+  );
+  return false;
+}
+
+function runAdd(rest: readonly string[]): number {
+  if (!flagsOk("add", rest, ["--force"])) return 2;
+  const feature = rest.find((a) => !a.startsWith("--"));
+  if (!feature) {
+    const catalogue = readCatalogue(TEMPLATES_DIR);
+    console.error("Usage: intelligo add <feature>\n");
+    for (const [name, spec] of Object.entries(catalogue)) {
+      console.error(`  ${name.padEnd(16)} ${spec.description}`);
+    }
+    return 1;
+  }
+  if (feature === "pnpm-standalone" && findWorkspaceRoot(process.cwd())) {
+    console.error(
+      "intelligo add pnpm-standalone: this app is a member of a pnpm workspace, and a " +
+        "workspace file of its own would take it out; the workspace root's settings apply."
+    );
+    return 1;
+  }
+  const result = addFeature(feature, {
+    appRoot: process.cwd(),
+    templatesDir: TEMPLATES_DIR,
+    frameworkVersion: FRAMEWORK_VERSION,
+    force: rest.includes("--force"),
+    // Computed, not recorded: an app made before the variable existed
+    // has no value for it.
+    variables:
+      feature === "app-scaffold"
+        ? workspaceRootVariable(process.cwd())
+        : undefined,
+  });
+  console.log(formatAddResult(result));
+  return addExitCode(result);
+}
+
 async function main(): Promise<number> {
   const [, , command = "help", ...rest] = process.argv;
 
+  if (wantsHelp(rest)) {
+    console.log(usage());
+    return 0;
+  }
+
   // The commands that read the app's configuration see what the app
-  // itself would: its .env.local and .env, under anything the shell set.
+  // itself would: its .env.local and .env, then the pnpm workspace
+  // root's, under anything the shell set.
   if (command === "doctor" || command === "migrate" || command === "upgrade") {
     loadAppEnv(process.cwd());
   }
 
   switch (command) {
     case "doctor": {
+      if (!flagsOk("doctor", rest, [])) return 2;
       const results = runChecks();
       console.log(formatResults(results));
       return exitCodeFor(results);
@@ -203,32 +275,24 @@ async function main(): Promise<number> {
       // command that converses.
       const { parseCreateFlags, runCreate } =
         await import("./commands/create-flow.js");
-      return runCreate(parseCreateFlags(rest), {
-        templatesDir: TEMPLATES_DIR,
-        frameworkVersion: FRAMEWORK_VERSION,
-        interactive: Boolean(process.stdin.isTTY && process.stdout.isTTY),
-      });
-    }
-    case "add": {
-      const feature = rest.find((a) => !a.startsWith("--"));
-      if (!feature) {
-        const catalogue = readCatalogue(TEMPLATES_DIR);
-        console.error("Usage: intelligo add <feature>\n");
-        for (const [name, spec] of Object.entries(catalogue)) {
-          console.error(`  ${name.padEnd(16)} ${spec.description}`);
-        }
-        return 1;
+      const flags = parseCreateFlags(rest);
+      if (flags.unknown.length > 0) {
+        console.error(
+          `intelligo create: unknown argument ${flags.unknown.join(" ")}.\n`
+        );
+        console.error(usage());
+        return 2;
       }
-      const result = addFeature(feature, {
-        appRoot: process.cwd(),
+      return runCreate(flags, {
         templatesDir: TEMPLATES_DIR,
         frameworkVersion: FRAMEWORK_VERSION,
-        force: rest.includes("--force"),
+        interactive: Boolean(process.stdin.isTTY && process.stdout.isTTY),
       });
-      console.log(formatAddResult(result));
-      return addExitCode(result);
     }
+    case "add":
+      return runAdd(rest);
     case "upgrade": {
+      if (!flagsOk("upgrade", rest, ["--check"])) return 2;
       if (!rest.includes("--check")) {
         console.error("Only `upgrade --check` is implemented.");
         console.error(
@@ -245,7 +309,45 @@ async function main(): Promise<number> {
       console.log(formatUpgradeReport(report));
       return upgradeCheckExitCode(report);
     }
+    case "sync": {
+      if (!flagsOk("sync", rest, ["--check", "--force"])) return 2;
+      const registryDir = resolveRegistryDir(TEMPLATES_DIR);
+      if (!registryDir) {
+        console.error(
+          "This CLI has no bundled registry — in the framework repository, run `pnpm registry:build` first."
+        );
+        return 1;
+      }
+      const context: SyncContext = {
+        appRoot: process.cwd(),
+        registryDir,
+        requires: readRegistryCatalogue(TEMPLATES_DIR).requires,
+        frameworkVersion: FRAMEWORK_VERSION,
+      };
+      const installed = installedFrameworkVersion(context.appRoot);
+      if (installed && installed !== FRAMEWORK_VERSION) {
+        console.error(
+          `! @intelligo-dev/core is ${installed} but this CLI carries the ${FRAMEWORK_VERSION} registry — ` +
+            "run the CLI of the same version (`pnpm exec intelligo`), or pages and packages will disagree."
+        );
+      }
+      const selection = selectItems(itemNames(rest), context);
+      if (!selection.ok) {
+        console.error(selection.message);
+        return 1;
+      }
+      if (rest.includes("--check")) {
+        const report = syncCheck(selection.items, context);
+        console.log(formatSyncReport(report));
+        return syncCheckExitCode(report);
+      }
+      return syncApply(selection.items, context, {
+        force: rest.includes("--force"),
+      });
+    }
     case "help":
+    case "--help":
+    case "-h":
       console.log(usage());
       return 0;
     default:

package/src/commands/add.ts

@@ -30,6 +30,8 @@ export type TemplateFeature = {
   deprecated?: string;
   files: TemplateFile[];
   cron?: TemplateCron;
+  /** What the developer still does by hand once the files are written. */
+  nextSteps?: string[];
 };
 export type TemplateCatalogue = Record<string, TemplateFeature>;
 
@@ -54,6 +56,8 @@ export type AddResult = {
    * app has a vercel.json without it, which is the consumer's to edit.
    */
   cron?: TemplateCron & { status: "written" | "present" | "manual" };
+  /** The catalogue's steps left to the developer, printed after the files. */
+  nextSteps?: string[];
 };
 
 export type AddOptions = {
@@ -81,6 +85,9 @@ export function substitute(
   );
 }
 
+/** A `__NAME__` placeholder the variables did not fill. */
+const PLACEHOLDER = /__[A-Z][A-Z0-9_]*__/;
+
 const VERCEL_CONFIG = "vercel.json";
 
 /**
@@ -137,16 +144,39 @@ export function addFeature(feature: string, options: AddOptions): AddResult {
     skippedUnknown: [],
   };
   if (spec.deprecated) result.deprecated = spec.deprecated;
+  if (spec.nextSteps?.length) result.nextSteps = spec.nextSteps;
   const recorded: GeneratedFile[] = [];
+  const handedOver = new Set(previous?.handedOver ?? []);
+
+  // Re-generating a feature substitutes what it was generated with, so
+  // `add app-scaffold` in an app `create` made takes the app's own name;
+  // values passed now fill in or replace them.
+  const variables =
+    previous?.variables || options.variables
+      ? { ...previous?.variables, ...options.variables }
+      : undefined;
 
+  // Checked before anything is written, so a refusal leaves no half-made
+  // feature behind.
   for (const file of spec.files) {
+    const unfilled = substitute(
+      readFileSync(path.join(options.templatesDir, file.template), "utf8"),
+      variables
+    ).match(PLACEHOLDER);
+    if (unfilled) {
+      throw new Error(
+        `${feature} needs a value for ${unfilled[0]} that only \`intelligo create\` supplies — ` +
+          "run `intelligo create <directory>`, or `intelligo create .` in an empty one."
+      );
+    }
+  }
+
+  for (const file of spec.files) {
+    // A registry item replaced it; `intelligo sync` keeps it now.
+    if (handedOver.has(file.target)) continue;
     const source = path.join(options.templatesDir, file.template);
     const target = path.join(options.appRoot, file.target);
-    const contents = substitute(
-      readFileSync(source, "utf8"),
-      options.variables
-    );
-
+    const contents = substitute(readFileSync(source, "utf8"), variables);
     if (existsSync(target) && !options.force) {
       const current = hashContents(readFileSync(target, "utf8"));
       const known = previousByPath.get(file.target);
@@ -182,13 +212,7 @@ export function addFeature(feature: string, options: AddOptions): AddResult {
 
   writeManifest(
     options.appRoot,
-    recordFeature(
-      manifest,
-      feature,
-      spec.templateVersion,
-      recorded,
-      options.variables
-    )
+    recordFeature(manifest, feature, spec.templateVersion, recorded, variables)
   );
 
   return result;
@@ -212,6 +236,9 @@ export function formatAddResult(r: AddResult): string {
   )
     lines.push("  nothing to do");
   if (r.cron) lines.push(...cronNextSteps(r.cron));
+  if (r.nextSteps?.length) {
+    lines.push("", "  Next:", ...r.nextSteps.map((step) => `  - ${step}`));
+  }
   return lines.join("\n");
 }