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

package/dist/commands/sync.js

@@ -0,0 +1,392 @@
+/**
+ * `intelligo sync [items…] [--check] [--force]`
+ *
+ * Keeps an app's installed registry pages exactly what the framework
+ * ships. Installing stays the shadcn CLI's job — every item goes in with
+ * `shadcn add <item> --yes --overwrite` — and this command adds what
+ * shadcn cannot know:
+ *
+ * - the version: items come from the registry bundled with this CLI, so
+ *   they match the `@intelligo-dev/*` packages of the same release;
+ * - the order: an item that imports a sibling's files lands after it
+ *   (requires.json `items`);
+ * - the seams: files an item ships once for the deployment to own
+ *   (requires.json `seams`) are put back after the install, and message
+ *   files are merged key by key, the app's copy winning;
+ * - the record: intelligo.manifest.json keeps each installed file's
+ *   hash, so `--check` can tell a file edited by hand from one a newer
+ *   registry replaced. Scaffold files an install replaces (globals.css,
+ *   the theme provider) leave the `app-scaffold` record for this one,
+ *   so `upgrade --check` stops calling them customized.
+ *
+ * `--check` installs nothing and exits 1 when any installed file is
+ * missing, edited or behind the registry — the gate CI runs.
+ */
+import { spawn } from "node:child_process";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { createServer } from "node:http";
+import path from "node:path";
+import { emptyManifest, handOver, hashContents, readManifest, writeManifest, } from "../manifest.js";
+import { asInstalled, hasRegistryItem, installedPath, readRegistryItem, registryClosure, } from "../registry-bundle.js";
+import { withDependencies } from "../registry-items.js";
+import { isMessages, localeEntries, mergeMessages, missingMessageKeys, } from "./sync-messages.js";
+import { SCAFFOLD_FEATURE, snapshotScaffold } from "./sync-scaffold.js";
+export { appLocales, mergeMessages, missingMessageKeys, } from "./sync-messages.js";
+export { SCAFFOLD_FEATURE, scaffoldHandover } from "./sync-scaffold.js";
+/** The design-system base: no marker file, installed before any page. */
+export const BASE_ITEM = "intelligo";
+const FAILING = new Set([
+    "outdated",
+    "edited",
+    "differs",
+    "missing",
+    "messages-behind",
+    "locale-behind",
+]);
+/**
+ * The items to sync: the ones named, else the ones the manifest
+ * recorded. With neither, nothing is guessed — a page at an item's
+ * marker path may be the product's own (a custom dashboard), and a sync
+ * would replace it — so the message lists what looks installed and asks
+ * for names.
+ */
+export function selectItems(names, context) {
+    const unknown = names.filter((n) => n === "registry" || !hasRegistryItem(context.registryDir, n));
+    if (unknown.length > 0) {
+        return {
+            ok: false,
+            message: `Unknown registry item(s): ${unknown.join(", ")}. Available: ${[
+                BASE_ITEM,
+                ...Object.keys(context.requires.items),
+            ].join(", ")}`,
+        };
+    }
+    if (names.length > 0)
+        return { ok: true, items: [...names] };
+    const recorded = readManifest(context.appRoot)?.registry?.items;
+    if (recorded && recorded.length > 0)
+        return { ok: true, items: recorded };
+    const looksInstalled = Object.entries(context.requires.items)
+        .filter(([, item]) => existsSync(path.join(context.appRoot, item.marker)))
+        .map(([name]) => name);
+    return {
+        ok: false,
+        message: [
+            "No synced items are recorded in intelligo.manifest.json yet.",
+            "Name the items this app installs from the registry, once:",
+            "",
+            `  intelligo sync ${[BASE_ITEM, ...looksInstalled].join(" ")}`,
+            "",
+            "(these are the items whose files are present — leave out any whose",
+            "path your product uses for a page of its own)",
+        ].join("\n"),
+    };
+}
+/** Blocks in requires.json order, the design-system base first. */
+export function installOrder(items, requires) {
+    const blocks = items.filter((n) => n in requires.items);
+    const others = items.filter((n) => !(n in requires.items));
+    const ordered = withDependencies(blocks, requires);
+    return [
+        ...others.filter((n) => n === BASE_ITEM),
+        ...others.filter((n) => n !== BASE_ITEM),
+        ...ordered,
+    ];
+}
+function shippedFiles(context, items) {
+    const closure = registryClosure(context.registryDir, items);
+    const byTarget = new Map();
+    for (const name of closure) {
+        const item = readRegistryItem(context.registryDir, name);
+        for (const file of item.files ?? []) {
+            const target = installedPath(item, file);
+            if (!target || file.content === undefined)
+                continue;
+            byTarget.set(target, { item: name, target, content: file.content });
+        }
+    }
+    return { closure, files: [...byTarget.values()] };
+}
+/** Compare the app against the bundled registry; writes nothing. */
+export function syncCheck(items, context) {
+    const { closure, files } = shippedFiles(context, items);
+    const seams = context.requires.seams ?? {};
+    const manifest = readManifest(context.appRoot);
+    const recorded = manifest?.registry?.files ?? {};
+    // What the scaffold wrote, by hash: a file it wrote and nobody edited
+    // is the registry's to replace, not someone's work.
+    const scaffolded = new Map((manifest?.features[SCAFFOLD_FEATURE]?.files ?? []).map((f) => [
+        f.path,
+        f.hash,
+    ]));
+    const entries = files.map(({ item, target, content }) => {
+        const abs = path.join(context.appRoot, target);
+        if (!existsSync(abs))
+            return { item, path: target, state: "missing" };
+        if (target in seams)
+            return { item, path: target, state: "seam" };
+        const local = readFileSync(abs, "utf8");
+        if (isMessages(target)) {
+            const missingKeys = missingMessageKeys(JSON.parse(content), JSON.parse(local));
+            return missingKeys.length > 0
+                ? { item, path: target, state: "messages-behind", missingKeys }
+                : { item, path: target, state: "current" };
+        }
+        if (asInstalled(local) === asInstalled(content)) {
+            return { item, path: target, state: "current" };
+        }
+        const hash = recorded[target];
+        if (hash === undefined) {
+            return {
+                item,
+                path: target,
+                state: scaffolded.get(target) === hashContents(local)
+                    ? "outdated"
+                    : "differs",
+            };
+        }
+        return {
+            item,
+            path: target,
+            state: hashContents(asInstalled(local)) === hash ? "outdated" : "edited",
+        };
+    });
+    entries.push(...localeEntries(context.appRoot, files));
+    return { version: context.frameworkVersion, items: closure, entries };
+}
+export function syncCheckExitCode(report) {
+    return report.entries.some((e) => FAILING.has(e.state)) ? 1 : 0;
+}
+export function formatSyncReport(report) {
+    const counts = new Map();
+    for (const e of report.entries) {
+        counts.set(e.state, (counts.get(e.state) ?? 0) + 1);
+    }
+    const lines = [
+        `Registry ${report.version}: ${report.items.length} item(s), ${report.entries.length} file(s) — ` +
+            [...counts].map(([state, n]) => `${n} ${state}`).join(", "),
+    ];
+    const HINT = {
+        outdated: "a newer registry version — `intelligo sync` replaces it",
+        edited: "edited by hand — move the change into a seam, or ask for one upstream",
+        differs: "not what the registry ships, and never synced",
+        missing: "not installed",
+        "messages-behind": "lacks registry keys — `intelligo sync` adds them",
+        "locale-behind": "lacks keys the app's English copy has — translate them; sync never writes another locale",
+    };
+    for (const state of FAILING) {
+        const group = report.entries.filter((e) => e.state === state);
+        if (group.length === 0)
+            continue;
+        lines.push("", `${state} (${HINT[state]}):`);
+        for (const e of group) {
+            const keys = e.missingKeys
+                ? ` — ${e.missingKeys.slice(0, 5).join(", ")}${e.missingKeys.length > 5 ? `, +${e.missingKeys.length - 5}` : ""}`
+                : "";
+            lines.push(`  ${e.path}  [${e.item}]${keys}`);
+        }
+    }
+    if (!report.entries.some((e) => FAILING.has(e.state))) {
+        lines.push("✓ every installed file is the registry's, seams aside");
+    }
+    return lines.join("\n");
+}
+/** The package version the app resolves for `@intelligo-dev/core`, if any. */
+export function installedFrameworkVersion(appRoot) {
+    const manifest = path.join(appRoot, "node_modules", "@intelligo-dev", "core", "package.json");
+    if (!existsSync(manifest))
+        return null;
+    return JSON.parse(readFileSync(manifest, "utf8"))
+        .version;
+}
+function serveRegistry(dir) {
+    return new Promise((resolve, reject) => {
+        const server = createServer((req, res) => {
+            const name = decodeURIComponent((req.url ?? "").split("?")[0]).replace(/^\//, "");
+            const file = path.join(dir, name);
+            if (!/^[a-z0-9-]+\.json$/.test(name) || !existsSync(file)) {
+                res.writeHead(404);
+                res.end();
+                return;
+            }
+            res.writeHead(200, { "content-type": "application/json" });
+            res.end(readFileSync(file));
+        });
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", () => {
+            const { port } = server.address();
+            resolve({ server, url: `http://127.0.0.1:${port}` });
+        });
+    });
+}
+function run(command, args, cwd) {
+    return new Promise((resolve) => {
+        const child = spawn(command, args, {
+            cwd,
+            // pnpm, npx and friends are .cmd shims on Windows.
+            shell: process.platform === "win32",
+            env: process.env,
+        });
+        let output = "";
+        child.stdout.on("data", (d) => (output += String(d)));
+        child.stderr.on("data", (d) => (output += String(d)));
+        child.on("close", (code) => resolve({ code: code ?? 1, output }));
+        child.on("error", (error) => resolve({ code: 1, output: `${output}${error.message}` }));
+    });
+}
+/** Put the kept seams back, and merge kept messages over the registry's. */
+function restoreKept(appRoot, kept, shipped) {
+    for (const [target, content] of kept) {
+        const abs = path.join(appRoot, target);
+        mkdirSync(path.dirname(abs), { recursive: true });
+        if (isMessages(target) && shipped.has(target)) {
+            const merged = mergeMessages(JSON.parse(shipped.get(target)), JSON.parse(content));
+            writeFileSync(abs, `${JSON.stringify(merged, null, 2)}\n`);
+        }
+        else {
+            writeFileSync(abs, content);
+        }
+    }
+}
+/**
+ * Write the synced items and each installed file's hash (seams and
+ * message files aside) into the manifest.
+ */
+function recordSync(context, names, after, { manifest }) {
+    const files = {};
+    for (const e of after.entries) {
+        if (e.state === "seam" || e.state === "missing" || isMessages(e.path)) {
+            continue;
+        }
+        files[e.path] = hashContents(asInstalled(readFileSync(path.join(context.appRoot, e.path), "utf8")));
+    }
+    const recordedItems = new Set([
+        ...(manifest.registry?.items ?? []),
+        ...names,
+    ]);
+    writeManifest(context.appRoot, {
+        ...manifest,
+        registry: {
+            version: context.frameworkVersion,
+            items: installOrder([...recordedItems], context.requires),
+            files: { ...manifest.registry?.files, ...files },
+        },
+    });
+}
+/**
+ * Record `names` as items this app keeps in sync before any is
+ * installed, so a bare `intelligo sync` installs them after an install
+ * that did not run or did not finish.
+ */
+export function recordItems(names, context) {
+    const manifest = readManifest(context.appRoot) ?? emptyManifest(context.frameworkVersion);
+    const items = new Set([...(manifest.registry?.items ?? []), ...names]);
+    writeManifest(context.appRoot, {
+        ...manifest,
+        registry: {
+            version: manifest.registry?.version ?? context.frameworkVersion,
+            items: installOrder([...items], context.requires),
+            files: manifest.registry?.files ?? {},
+        },
+    });
+}
+/**
+ * Install `items` from the bundled registry, keep the seams, merge the
+ * messages and record what was written. Refuses to overwrite a file
+ * edited by hand unless `force` — the edit belongs in a seam, and the
+ * refusal says which files.
+ */
+export async function syncApply(names, context, options = {}) {
+    const log = options.log ?? console.log;
+    const { appRoot } = context;
+    const shadcn = path.join(appRoot, "node_modules", ".bin", "shadcn");
+    if (!existsSync(shadcn)) {
+        log("shadcn is not installed in this app — add it as a devDependency (the scaffold declares it) and install.");
+        return 1;
+    }
+    const componentsPath = path.join(appRoot, "components.json");
+    if (!existsSync(componentsPath)) {
+        log("No components.json — run from the app's root.");
+        return 1;
+    }
+    const items = installOrder(names, context.requires);
+    const before = syncCheck(items, context);
+    const shippedTargets = new Set(shippedFiles(context, items).files.map((f) => f.target));
+    const edited = before.entries.filter((e) => e.state === "edited" || e.state === "differs");
+    if (edited.length > 0 && !options.force) {
+        log([
+            `${edited.length} installed file(s) differ from the registry and would be overwritten:`,
+            ...edited.map((e) => `  ${e.path}  [${e.item}]`),
+            "",
+            "Move what the change does into a seam (lib/*-config, messages/), then re-run",
+            "with --force to replace these files with the registry's.",
+        ].join("\n"));
+        return 1;
+    }
+    // What the install must not lose: the app's seams and message files.
+    const seams = context.requires.seams ?? {};
+    const kept = new Map();
+    for (const e of before.entries) {
+        if (e.state === "missing" || !shippedTargets.has(e.path))
+            continue;
+        if (e.path in seams || isMessages(e.path)) {
+            kept.set(e.path, readFileSync(path.join(appRoot, e.path), "utf8"));
+        }
+    }
+    const componentsBefore = JSON.parse(readFileSync(componentsPath, "utf8"));
+    // The scaffold's files as they are now, to see which the install replaces.
+    const scaffold = snapshotScaffold(appRoot);
+    const originalRegistry = componentsBefore.registries?.["@intelligo"];
+    const { server, url } = await serveRegistry(context.registryDir);
+    const setRegistry = (value) => {
+        // Read fresh: the base item rewrites components.json's style fields,
+        // and those changes are the point — only the registry URL is ours.
+        const current = JSON.parse(readFileSync(componentsPath, "utf8"));
+        const registries = { ...current.registries };
+        if (value === undefined)
+            delete registries["@intelligo"];
+        else
+            registries["@intelligo"] = value;
+        const next = { ...current, registries };
+        if (Object.keys(registries).length === 0)
+            delete next.registries;
+        writeFileSync(componentsPath, `${JSON.stringify(next, null, 2)}\n`);
+    };
+    let failed = null;
+    try {
+        setRegistry(`${url}/{name}.json`);
+        for (const item of items) {
+            log(`› shadcn add ${item}`);
+            const result = await run(shadcn, ["add", `${url}/${item}.json`, "--yes", "--overwrite"], appRoot);
+            if (result.code !== 0) {
+                failed = { item, output: result.output };
+                break;
+            }
+        }
+    }
+    finally {
+        setRegistry(originalRegistry);
+        server.close();
+    }
+    // Seams back as they were; messages merged over the registry's.
+    const shipped = new Map(shippedFiles(context, items).files.map((f) => [f.target, f.content]));
+    restoreKept(appRoot, kept, shipped);
+    if (failed) {
+        log(`shadcn add ${failed.item} failed:\n${failed.output.trim().split("\n").slice(-20).join("\n")}`);
+        return 1;
+    }
+    // Record what is on disk now, so the next check can tell an edit.
+    const after = syncCheck(items, context);
+    recordSync(context, names, after, {
+        manifest: handOver(readManifest(appRoot) ?? emptyManifest(context.frameworkVersion), SCAFFOLD_FEATURE, scaffold.handedOver({
+            shipped: new Set(shipped.keys()),
+            seams,
+            css: items.includes(BASE_ITEM)
+                ? (componentsBefore.tailwind?.css ?? null)
+                : null,
+        })),
+    });
+    log(formatSyncReport(after));
+    return syncCheckExitCode(after);
+}
+//# sourceMappingURL=sync.js.map

package/dist/commands/sync.js.map

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

package/dist/commands/upgrade-check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-check.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade-check.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;OAQG;IACH,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,KAAK,CAAC;CAC/E,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,KAAK,EAAE,WAAW,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa,CAkExE;AAaD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CA2B5D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CAE7D"}
+{"version":3,"file":"upgrade-check.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade-check.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;OAQG;IACH,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,KAAK,CAAC;CAC/E,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,KAAK,EAAE,WAAW,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa,CAqExE;AAaD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CA2B5D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CAE7D"}

package/dist/commands/upgrade-check.js

@@ -27,7 +27,10 @@ export function upgradeCheck(options) {
         if (spec)
             report.templateVersion[feature] = spec.templateVersion;
         const targetToTemplate = new Map((spec?.files ?? []).map((f) => [f.target, f.template]));
-        for (const target of newFiles(spec, entry.files)) {
+        for (const target of newFiles(spec, [
+            ...entry.files,
+            ...(entry.handedOver ?? []).map((handed) => ({ path: handed })),
+        ])) {
             report.items.push({ feature, path: target, state: "new" });
         }
         for (const file of entry.files) {

package/dist/commands/upgrade-check.js.map

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

package/dist/env-files.d.ts

@@ -8,5 +8,16 @@
  * quickstart says to do — would fail with "DATABASE_URL is required".
  */
 export declare const ENV_FILES: readonly [".env.local", ".env"];
+/**
+ * Loads the app's env files into `env`, then — when the app is a member
+ * of a pnpm workspace — the workspace root's, for an app whose
+ * `next.config` falls back to the repository root's `.env`. Precedence,
+ * highest first: the shell, the app's `.env.local`, the app's `.env`,
+ * the root's `.env.local`, the root's `.env`. A variable already set is
+ * never overridden.
+ *
+ * Returns the files it read, relative to `root` (`.env.local`,
+ * `../../.env`).
+ */
 export declare function loadAppEnv(root: string, env?: NodeJS.ProcessEnv): string[];
 //# sourceMappingURL=env-files.d.ts.map

package/dist/env-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-files.d.ts","sourceRoot":"","sources":["../src/env-files.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AACH,eAAO,MAAM,SAAS,iCAAkC,CAAC;AAEzD,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,EAAE,CAYV"}
+{"version":3,"file":"env-files.d.ts","sourceRoot":"","sources":["../src/env-files.ts"],"names":[],"mappings":"AAMA;;;;;;;;GAQG;AACH,eAAO,MAAM,SAAS,iCAAkC,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,EAAE,CAoBV"}

package/dist/env-files.js

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { parseEnv } from "node:util";
+import { findWorkspaceRoot } from "./registry-items.js";
 /**
  * The env files a Next.js app reads, in the order it reads them: an
  * earlier file wins, and a variable already set in the shell wins over
@@ -11,18 +12,36 @@ import { parseEnv } from "node:util";
  * quickstart says to do — would fail with "DATABASE_URL is required".
  */
 export const ENV_FILES = [".env.local", ".env"];
+/**
+ * Loads the app's env files into `env`, then — when the app is a member
+ * of a pnpm workspace — the workspace root's, for an app whose
+ * `next.config` falls back to the repository root's `.env`. Precedence,
+ * highest first: the shell, the app's `.env.local`, the app's `.env`,
+ * the root's `.env.local`, the root's `.env`. A variable already set is
+ * never overridden.
+ *
+ * Returns the files it read, relative to `root` (`.env.local`,
+ * `../../.env`).
+ */
 export function loadAppEnv(root, env = process.env) {
+    const dirs = [root];
+    const workspaceRoot = findWorkspaceRoot(root);
+    if (workspaceRoot && path.resolve(workspaceRoot) !== path.resolve(root)) {
+        dirs.push(workspaceRoot);
+    }
     const loaded = [];
-    for (const name of ENV_FILES) {
-        const file = path.join(root, name);
-        if (!existsSync(file))
-            continue;
-        const values = parseEnv(readFileSync(file, "utf8"));
-        for (const [key, value] of Object.entries(values)) {
-            if (env[key] === undefined)
-                env[key] = value;
+    for (const dir of dirs) {
+        for (const name of ENV_FILES) {
+            const file = path.join(dir, name);
+            if (!existsSync(file))
+                continue;
+            const values = parseEnv(readFileSync(file, "utf8"));
+            for (const [key, value] of Object.entries(values)) {
+                if (env[key] === undefined)
+                    env[key] = value;
+            }
+            loaded.push(path.relative(root, file));
         }
-        loaded.push(name);
     }
     return loaded;
 }

package/dist/env-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"env-files.js","sourceRoot":"","sources":["../src/env-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,MAAM,CAAU,CAAC;AAEzD,MAAM,UAAU,UAAU,CACxB,IAAY,EACZ,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS;QAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACpD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC/C,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"env-files.js","sourceRoot":"","sources":["../src/env-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,MAAM,CAAU,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,UAAU,CACxB,IAAY,EACZ,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IACpB,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,aAAa,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,SAAS;YAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACpD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClD,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS;oBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC/C,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/manifest.d.ts

@@ -32,11 +32,33 @@ export type FeatureEntry = {
      * would make every substituted file look permanently outdated.
      */
     variables?: Record<string, string>;
+    /**
+     * Files this feature wrote that a registry install has since replaced
+     * (the scaffold's globals.css once the design-system base lands):
+     * `intelligo sync` owns them now, so `upgrade --check` neither
+     * compares them nor offers them as new, and `add` does not write them
+     * back.
+     */
+    handedOver?: string[];
+};
+/**
+ * Registry items `intelligo sync` installed: which items the app keeps
+ * in sync, the framework version they came from, and — per installed
+ * file that is not a seam or a message file — the hash of the file as
+ * written (after shadcn's normalisation, see `asInstalled`). A file
+ * whose hash still matches was not edited since, so a newer registry
+ * may replace it; one that differs was edited by hand.
+ */
+export type RegistryEntry = {
+    version: string;
+    items: string[];
+    files: Record<string, string>;
 };
 export type Manifest = {
     schemaVersion: 1;
     frameworkVersion: string;
     features: Record<string, FeatureEntry>;
+    registry?: RegistryEntry;
 };
 export declare function hashContents(contents: string): string;
 export declare function emptyManifest(frameworkVersion: string): Manifest;
@@ -49,4 +71,9 @@ export declare function writeManifest(appRoot: string, manifest: Manifest): void
  * actually on disk.
  */
 export declare function recordFeature(manifest: Manifest, feature: string, templateVersion: string, files: GeneratedFile[], variables?: Record<string, string>): Manifest;
+/**
+ * Move `paths` out of a feature's generated files into its `handedOver`
+ * list. A no-op for a feature the manifest does not record.
+ */
+export declare function handOver(manifest: Manifest, feature: string, paths: readonly string[]): Manifest;
 //# sourceMappingURL=manifest.d.ts.map

package/dist/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,eAAO,MAAM,aAAa,4BAA4B,CAAC;AAEvD,MAAM,MAAM,aAAa,GAAG;IAC1B,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,aAAa,EAAE,CAAC,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CACxC,CAAC;AAEF,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,aAAa,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,CAEhE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAI7D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAKvE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,aAAa,EAAE,EACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,QAAQ,CAUV"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,eAAO,MAAM,aAAa,4BAA4B,CAAC;AAEvD,MAAM,MAAM,aAAa,GAAG;IAC1B,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,aAAa,EAAE,CAAC,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B,CAAC;AAEF,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,aAAa,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,CAEhE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAI7D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAKvE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,aAAa,EAAE,EACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,QAAQ,CAcV;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,MAAM,EAAE,GACvB,QAAQ,CAiBV"}

package/dist/manifest.js

@@ -41,13 +41,40 @@ export function writeManifest(appRoot, manifest) {
  * actually on disk.
  */
 export function recordFeature(manifest, feature, templateVersion, files, variables) {
+    const handedOver = manifest.features[feature]?.handedOver;
     return {
         ...manifest,
         features: {
             ...manifest.features,
-            [feature]: variables
-                ? { templateVersion, files, variables }
-                : { templateVersion, files },
+            [feature]: {
+                templateVersion,
+                files,
+                ...(variables ? { variables } : {}),
+                ...(handedOver?.length ? { handedOver } : {}),
+            },
+        },
+    };
+}
+/**
+ * Move `paths` out of a feature's generated files into its `handedOver`
+ * list. A no-op for a feature the manifest does not record.
+ */
+export function handOver(manifest, feature, paths) {
+    const entry = manifest.features[feature];
+    if (!entry || paths.length === 0)
+        return manifest;
+    const moved = new Set(paths);
+    return {
+        ...manifest,
+        features: {
+            ...manifest.features,
+            [feature]: {
+                ...entry,
+                files: entry.files.filter((f) => !moved.has(f.path)),
+                handedOver: [
+                    ...new Set([...(entry.handedOver ?? []), ...paths]),
+                ].sort(),
+            },
         },
     };
 }