@tinycld/bootstrap 1.0.1 → 1.1.1

package/dist/bootstrap-tooling.js

@@ -1,65 +1,174 @@
 import { spawnSync } from 'node:child_process';
-import { existsSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
+import { dirname, join, relative } from 'node:path';
+import { fileURLToPath } from 'node:url';
 // All feature members that exist in the ecosystem. The workspace manifest lists
 // ALL of them (npm tolerates absent dirs), so a partial checkout still installs.
 // But --tooling CLONES only app+core+requested — we do NOT force-clone all.
 const ALL_FEATURES = ['contacts', 'mail', 'calendar', 'drive', 'calc', 'text', 'google-takeout-import'];
-// Always cloned by tooling mode (the minimum viable workspace). package-scripts
-// ships inside the workspace meta-repo itself, so it is never cloned.
-const ALWAYS_CLONE = ['app', 'core'];
-// Listed in the manifest workspaces array (everything that could exist).
-const ALL_MEMBERS = ['app', 'core', 'package-scripts', ...ALL_FEATURES];
+// app + core are always cloned by tooling mode (the minimum viable workspace);
+// the clone set in bootstrapTooling seeds them directly (pinnable via
+// appRef/coreRef). package-scripts (the tinycld-pkg CLI) now lives INSIDE the
+// app member at app/package-scripts, so it arrives with the app clone and is
+// never cloned separately.
+// Listed in the manifest workspaces array (everything that could exist). The
+// nested member path app/package-scripts is a valid npm workspace entry.
+const ALL_MEMBERS = ['app', 'app/package-scripts', 'core', ...ALL_FEATURES];
 /**
- * Write a workspace-root package.json + .npmrc into `dir`. The workspaces array
- * ALWAYS lists every possible member — npm ignores entries whose dirs are
- * absent, so a partial checkout (app+core+one feature) installs fine, and
- * cloning more features later needs no manifest edit.
+ * Write (or merge into) a workspace-root package.json + .npmrc in `dir`.
+ *
+ * When `dir/package.json` already exists (e.g. provided by the workspace clone),
+ * we preserve its fields and only enforce the two things bootstrap owns:
+ * the complete `workspaces` list (so later --with clones need no manifest edit)
+ * and the `postinstall` script. All other fields — devDependencies, engines,
+ * volta, extra scripts, etc. — survive as-is.
+ *
+ * When no package.json exists yet (workspace clone was skipped), the full
+ * generated defaults are written, matching the previous behaviour.
+ *
+ * The workspaces array ALWAYS lists every possible member — npm ignores entries
+ * whose dirs are absent, so a partial checkout installs fine.
+ *
+ * .npmrc is written only when one does not already exist, for the same reason.
  */
 export function writeWorkspaceManifest(dir) {
+    const pkgPath = join(dir, 'package.json');
+    let existing = {};
+    if (existsSync(pkgPath)) {
+        try {
+            existing = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+        }
+        catch {
+            // Unparseable existing file — start from defaults
+        }
+    }
+    const existingScripts = typeof existing.scripts === 'object' && existing.scripts !== null
+        ? existing.scripts
+        : {};
     const pkg = {
         name: '@tinycld/workspace',
         version: '0.0.0',
         private: true,
         type: 'module',
+        ...existing,
+        // Always enforce the canonical workspaces list and postinstall script.
         workspaces: [...ALL_MEMBERS],
         scripts: {
+            ...existingScripts,
             postinstall: 'cd app && npm run packages:generate && npm run assets:copy-pdfjs',
         },
     };
-    writeFileSync(join(dir, 'package.json'), `${JSON.stringify(pkg, null, 4)}\n`);
-    writeFileSync(join(dir, '.npmrc'), 'legacy-peer-deps=true\n');
+    writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 4)}\n`);
+    const npmrcPath = join(dir, '.npmrc');
+    if (!existsSync(npmrcPath)) {
+        writeFileSync(npmrcPath, 'legacy-peer-deps=true\n');
+    }
+}
+/**
+ * Resolve the workspace-template dir relative to this module. Published builds
+ * have `dist/bootstrap-tooling.js` next to `templates/`; dev has
+ * `src/bootstrap-tooling.ts` under the same parent. Both → `../templates/workspace`.
+ */
+function resolveWorkspaceTemplateDir() {
+    const here = dirname(fileURLToPath(import.meta.url));
+    return join(here, '..', 'templates', 'workspace');
+}
+/**
+ * Copy the workspace-root scaffolding (tinycld.packages.ts, vitest.config.ts,
+ * tests/ stubs) from bootstrap's templates/workspace/ into `dir`. These files
+ * are pure scaffolding the workspace ROOT needs but that no longer lives in a
+ * committed workspace repo — bootstrap is their source of truth.
+ *
+ * Never overwrites an existing file: a real workspace checkout, or a CI lane
+ * that supplied its own copy, keeps what it has (same non-destructive ethos as
+ * the member clones). Returns the relative paths actually written.
+ */
+export function copyWorkspaceTemplate(dir, templateDir = resolveWorkspaceTemplateDir()) {
+    if (!existsSync(templateDir))
+        return [];
+    const written = [];
+    const walk = (src) => {
+        for (const entry of readdirSync(src)) {
+            const srcPath = join(src, entry);
+            const rel = relative(templateDir, srcPath);
+            const dstPath = join(dir, rel);
+            if (statSync(srcPath).isDirectory()) {
+                walk(srcPath);
+                continue;
+            }
+            if (existsSync(dstPath))
+                continue; // never overwrite
+            mkdirSync(dirname(dstPath), { recursive: true });
+            cpSync(srcPath, dstPath);
+            written.push(rel);
+        }
+    };
+    walk(templateDir);
+    return written;
 }
-function realClone(url, dest) {
-    const r = spawnSync('git', ['clone', '--depth', '1', url, dest], { stdio: 'inherit' });
+/** Split a member spec `name@ref` into its parts. No `@` → no ref (clone HEAD). */
+function splitRef(spec) {
+    const at = spec.indexOf('@');
+    if (at === -1)
+        return { name: spec };
+    return { name: spec.slice(0, at), ref: spec.slice(at + 1) || undefined };
+}
+function realClone(url, dest, ref) {
+    const args = ['clone', '--depth', '1'];
+    if (ref)
+        args.push('--branch', ref);
+    args.push(url, dest);
+    const r = spawnSync('git', args, { stdio: 'inherit' });
     return r.status === 0;
 }
 /**
- * Assemble a workspace skeleton at opts.root: write the (full) manifest, then
- * clone ONLY app + core + the explicitly-requested feature members (skipping any
- * already present — e.g. a CI-checked-out member). Unknown member names throw.
- * Returns the members that ended up present. Does NOT run npm install (the
- * caller / CI controls that, since it may want a clean `npm ci`).
+ * Assemble a workspace skeleton at opts.root: write the canonical root manifest
+ * (writeWorkspaceManifest) + lay down the root scaffolding (copyWorkspaceTemplate:
+ * tinycld.packages.ts, vitest.config.ts, tests/ stubs, version files), then clone
+ * ONLY app + core + the explicitly-requested feature members (skipping any
+ * already present — e.g. a CI-checked-out member). There is NO workspace
+ * meta-repo clone: bootstrap is the source of all root scaffolding.
+ * Unknown member names throw. Returns the members that ended up present. Does
+ * NOT run npm install (the caller / CI controls that, since it may want a
+ * clean `npm ci`).
  */
 export function bootstrapTooling(opts) {
-    const requested = opts.members ?? [];
-    const unknown = requested.filter((m) => !ALL_FEATURES.includes(m));
+    // Each requested member may be `name` or `name@ref`. Validate the NAME part.
+    const requested = (opts.members ?? []).map(splitRef);
+    const unknown = requested.filter((m) => !ALL_FEATURES.includes(m.name));
     if (unknown.length > 0) {
-        throw new Error(`Unknown feature member(s): ${unknown.join(', ')}. Known: ${ALL_FEATURES.join(', ')}`);
+        throw new Error(`Unknown feature member(s): ${unknown.map((m) => m.name).join(', ')}. Known: ${ALL_FEATURES.join(', ')}`);
     }
     const repoBase = opts.repoBase ?? 'git@github.com:tinycld';
     const clone = opts.clone ?? realClone;
-    writeWorkspaceManifest(opts.root);
-    const toClone = Array.from(new Set([...ALWAYS_CLONE, ...requested]));
     const present = [];
-    for (const m of toClone) {
-        const dest = join(opts.root, m);
+    // Write the canonical root manifest (workspaces list + postinstall), then
+    // lay down the root scaffolding bootstrap owns (tinycld.packages.ts,
+    // vitest.config.ts, tests/ stubs, .node-version, .go-version). Both are
+    // non-destructive: anything already present (a real workspace checkout, or
+    // a CI lane that supplied its own) is left as-is.
+    writeWorkspaceManifest(opts.root);
+    copyWorkspaceTemplate(opts.root);
+    // Build the clone set keyed by member NAME so a member passed both bare and
+    // with an @ref dedupes to one clone (the ref-bearing entry wins). app+core
+    // are always cloned and pinnable via appRef/coreRef.
+    const refByName = new Map();
+    refByName.set('app', opts.appRef);
+    refByName.set('core', opts.coreRef);
+    for (const { name, ref } of requested) {
+        // A later ref overrides an earlier bare entry; a bare entry never clears
+        // an existing ref.
+        if (ref !== undefined || !refByName.has(name))
+            refByName.set(name, ref);
+    }
+    for (const [name, ref] of refByName) {
+        const dest = join(opts.root, name);
         if (existsSync(join(dest, '.git')) || existsSync(join(dest, 'package.json'))) {
-            present.push(m);
+            present.push(name);
             continue;
         }
-        if (clone(`${repoBase}/${m}.git`, dest))
-            present.push(m);
+        if (clone(`${repoBase}/${name}.git`, dest, ref))
+            present.push(name);
     }
     return present;
 }

package/dist/bootstrap-tooling.js.map

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

package/dist/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { realpathSync } from 'node:fs';
-import { dirname, relative } from 'node:path';
+import { dirname, join, relative } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { intro, outro } from '@clack/prompts';
 import pc from 'picocolors';
@@ -12,12 +12,34 @@ import { offerLinkPackage } from "./link-package.js";
 import { runPrompts } from "./prompts.js";
 export function runToolingMode(opts) {
     const root = opts.root ?? process.cwd();
+    // app + core are always-cloned members, not features, so they can't ride the
+    // `members` list through bootstrapTooling's feature validation. Accept them
+    // in the SAME `--with name@ref` surface for a uniform pinned invocation
+    // (`--with app@v1 --with core@v2 --with mail@v3`) by peeling app@ref/core@ref
+    // out of `members` into appRef/coreRef. An explicit opts.appRef/coreRef wins.
+    let appRef = opts.appRef;
+    let coreRef = opts.coreRef;
+    const features = [];
+    for (const spec of opts.members ?? []) {
+        const at = spec.indexOf('@');
+        const name = at === -1 ? spec : spec.slice(0, at);
+        const ref = at === -1 ? undefined : spec.slice(at + 1) || undefined;
+        if (name === 'app')
+            appRef = appRef ?? ref;
+        else if (name === 'core')
+            coreRef = coreRef ?? ref;
+        else
+            features.push(spec);
+    }
     // Honor TINYCLD_REPO_BASE (CI sets it to an HTTPS base since runners have no
     // SSH key). Listed first so an explicit opts.repoBase still wins via spread;
     // when neither is set, bootstrapTooling falls back to its SSH default.
     const present = bootstrapTooling({
         repoBase: process.env.TINYCLD_REPO_BASE,
         ...opts,
+        members: features,
+        appRef,
+        coreRef,
         root,
     });
     // Mandatory members must clone — a missing app/core means a broken workspace.
@@ -51,31 +73,33 @@ async function main() {
     }
     const answers = await runPrompts(args);
     copyTemplate(resolveTemplatesRoot(import.meta.url), answers);
+    // The package lives at `<workspaceDir>/<slug>`, so its parent is the
+    // workspace dir in both attach (cwd) and bootstrap (wrapper) modes.
     const linked = await offerLinkPackage({
-        packageName: answers.slug,
-        targetDir: answers.targetDir,
+        slug: answers.slug,
+        workspaceDir: dirname(answers.targetDir),
         mode: resolveLinkMode(args),
     });
     const relTarget = relative(process.cwd(), answers.targetDir) || answers.targetDir;
     outro(pc.green(`Scaffolded ${pc.bold(answers.slug)} at ${pc.bold(relTarget)}`));
     // Re-derive the layout from the resolved target so the next-steps output
     // matches whatever path the user actually ended up at (default detection,
-    // explicit --target, or interactive override). The wrapper's parent dir
-    // names where `cd ../tinycld` lands.
+    // explicit --target, or interactive override). It decides whether to print
+    // the bootstrap "self-contained workspace" note.
     const layout = detectLayoutFromTarget(answers.targetDir, answers.slug);
     printNextSteps({ slug: answers.slug, relTarget, linked, layout });
 }
 function detectLayoutFromTarget(targetDir, slug) {
-    // If cwd has a tinycld/ child (workspace mode) and target is a sibling of
-    // that tinycld, we're in attach mode. Otherwise the scaffolder created a
-    // wrapper under cwd and dropped tinycld inside it (bootstrap mode).
+    // If cwd is itself a workspace root and target is a direct child of it,
+    // we're in attach mode. Otherwise the scaffolder created a wrapper under
+    // cwd and the workspace meta-repo gets cloned inside it (bootstrap mode).
     const detected = detectLayout(slug);
     if (detected.mode === 'attach' && targetDir === detected.targetDir)
         return 'attach';
     if (detected.mode === 'bootstrap' && targetDir === detected.targetDir)
         return 'bootstrap';
     // User passed an explicit --target. Infer from the on-disk shape: if the
-    // parent of targetDir has a `tinycld` child, treat as attach.
+    // parent of targetDir is itself a workspace root, treat as attach.
     const parent = dirname(targetDir);
     const looksAttached = detectLayout(slug, parent).mode === 'attach';
     return looksAttached ? 'attach' : 'bootstrap';
@@ -92,11 +116,15 @@ function resolveLinkMode(args) {
 function printNextSteps({ slug, relTarget, linked, layout }) {
     const lines = ['', pc.bold('Next steps:'), ''];
     let step = 1;
+    // The workspace root, relative to cwd. In bootstrap mode the package sits at
+    // `<wrapper>/<slug>`, so the wrapper (`dirname(relTarget)`) is the workspace
+    // root. In attach mode cwd already IS the workspace root, so it's `.`.
+    const wsRoot = dirname(relTarget) || '.';
     if (layout === 'bootstrap') {
-        // Highlight that the scaffolder also dropped a tinycld checkout
-        // alongside the new package. New users may not realize they just
-        // got a self-contained workspace.
-        lines.push(pc.dim(`  Scaffolded a self-contained workspace alongside the package.\n  The tinycld app shell lives at ./${dirname(relTarget)}/tinycld/.\n`));
+        // The meta-repo was cloned into the wrapper, so the wrapper itself is the
+        // workspace root and the new package is a member directory inside it.
+        // New users may not realize they just got a self-contained workspace.
+        lines.push(pc.dim(`  Scaffolded a self-contained tinycld workspace.\n  The workspace root is ./${wsRoot}/ and your package is ./${relTarget}/.\n  The app member (Expo + PocketBase) is ./${wsRoot}/app/.\n`));
     }
     lines.push(`  ${pc.dim(`# ${step++}. Initialize git and push to GitHub`)}`);
     lines.push(`  cd ${relTarget}`);
@@ -106,18 +134,24 @@ function printNextSteps({ slug, relTarget, linked, layout }) {
     lines.push(`  gh repo create tinycld/${slug} --public --source=. --push`);
     lines.push('');
     if (!linked) {
-        lines.push(`  ${pc.dim(`# ${step++}. Link into the tinycld app shell`)}`);
-        lines.push('  cd ../tinycld');
-        lines.push(`  npm run packages:link ../${slug}`);
+        // Linking is now a workspace-root `npm install`: the package dir already
+        // exists; add it to the root package.json `workspaces` if it isn't a
+        // member yet, then install — npm symlinks it and the postinstall runs
+        // the generator.
+        lines.push(`  ${pc.dim(`# ${step++}. Link into the workspace (add as a member, then install)`)}`);
+        if (wsRoot !== '.')
+            lines.push(`  cd ${wsRoot}`);
+        lines.push(`  # ensure "${slug}" is in this package.json's "workspaces" array, then:`);
+        lines.push('  npm install');
         lines.push('');
     }
-    lines.push(`  ${pc.dim(`# ${step++}. Verify (biome + tsc run from the app shell and cover the linked package)`)}`);
-    if (linked)
-        lines.push('  cd ../tinycld');
-    lines.push('  npm run checks');
+    lines.push(`  ${pc.dim(`# ${step++}. Verify the package (biome + tsc, scoped to this member)`)}`);
+    lines.push(`  cd ${join(wsRoot, slug)}`);
+    lines.push('  npx tinycld-pkg check');
     lines.push('');
     lines.push(`  ${pc.dim(`# ${step++}. Run the app (Expo + PocketBase, single-port dev proxy)`)}`);
-    lines.push('  npm run start');
+    lines.push(`  cd ${join(wsRoot, 'app')}`);
+    lines.push('  npm run dev');
     lines.push('');
     console.log(lines.join('\n'));
 }

package/dist/index.js.map

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

package/dist/layout.js

@@ -1,37 +1,24 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join, resolve } from 'node:path';
-const APP_DIR_NAME = 'tinycld';
 export function detectLayout(slug, cwd = process.cwd()) {
-    const candidateApp = join(cwd, APP_DIR_NAME);
-    if (looksLikeAppShell(candidateApp)) {
-        return {
-            mode: 'attach',
-            targetDir: resolve(cwd, slug),
-            appDir: candidateApp,
-        };
+    if (looksLikeWorkspaceRoot(cwd)) {
+        return { mode: 'attach', targetDir: resolve(cwd, slug), workspaceDir: cwd };
     }
-    const wrapperDir = resolve(cwd, `${APP_DIR_NAME}-${slug}`);
+    const wrapperDir = resolve(cwd, `tinycld-${slug}`);
     return {
         mode: 'bootstrap',
         targetDir: join(wrapperDir, slug),
-        appDir: join(wrapperDir, APP_DIR_NAME),
+        workspaceDir: wrapperDir,
         wrapperDir,
     };
 }
-/**
- * A directory "looks like" the tinycld app shell when it has a package.json
- * declaring `name: "tinycld"`. The bare directory check would false-match any
- * unrelated `tinycld` directory; the package.json check is fast (one read of
- * a file we'd be reading anyway) and unambiguous now that the app shell's
- * package.json `name` field has been renamed from "@tinycld/app" to "tinycld".
- */
-export function looksLikeAppShell(dir) {
+/** A directory is a workspace root when its package.json name is "@tinycld/workspace". */
+export function looksLikeWorkspaceRoot(dir) {
     const pkgPath = join(dir, 'package.json');
     if (!existsSync(pkgPath))
         return false;
     try {
-        const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-        return pkg?.name === 'tinycld';
+        return JSON.parse(readFileSync(pkgPath, 'utf-8'))?.name === '@tinycld/workspace';
     }
     catch {
         return false;

package/dist/layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.js","sourceRoot":"","sources":["../src/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAuBzC,MAAM,YAAY,GAAG,SAAS,CAAA;AAE9B,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,MAAc,OAAO,CAAC,GAAG,EAAE;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;IAC5C,IAAI,iBAAiB,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,OAAO;YACH,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC;YAC7B,MAAM,EAAE,YAAY;SACvB,CAAA;IACL,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,YAAY,IAAI,IAAI,EAAE,CAAC,CAAA;IAC1D,OAAO;QACH,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC;QACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC;QACtC,UAAU;KACb,CAAA;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAW;IACzC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAA;IACtC,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;QACtD,OAAO,GAAG,EAAE,IAAI,KAAK,SAAS,CAAA;IAClC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC"}
+{"version":3,"file":"layout.js","sourceRoot":"","sources":["../src/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAgBzC,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,MAAc,OAAO,CAAC,GAAG,EAAE;IAClE,IAAI,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAA;IAC/E,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,WAAW,IAAI,EAAE,CAAC,CAAA;IAClD,OAAO;QACH,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC;QACjC,YAAY,EAAE,UAAU;QACxB,UAAU;KACb,CAAA;AACL,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAA;IACtC,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,IAAI,KAAK,oBAAoB,CAAA;IACpF,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC"}

package/dist/link-package.js

@@ -1,85 +1,101 @@
 import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
-import { dirname, join, relative } from 'node:path';
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { confirm, isCancel, log, spinner } from '@clack/prompts';
 import pc from 'picocolors';
-const APP_REPO_URL = 'git@github.com:tinycld/tinycld.git';
-const APP_DIR_NAME = 'tinycld';
+import { bootstrapTooling } from "./bootstrap-tooling.js";
+import { looksLikeWorkspaceRoot } from "./layout.js";
 /**
- * Returns true if the user chose to link (even if a subprocess failed —
- * the error is already logged, and we don't want to follow up with
- * "here are the manual steps" when the user already expressed intent).
- * Returns false only if linking was declined or skipped.
+ * Add `slug` to `<workspaceDir>/package.json` `workspaces[]` if it isn't already
+ * there. Idempotent, and a no-op when there's no package.json yet.
+ */
+export function ensureMember(workspaceDir, slug) {
+    const pkgPath = join(workspaceDir, 'package.json');
+    if (!existsSync(pkgPath))
+        return;
+    const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+    pkg.workspaces = Array.isArray(pkg.workspaces) ? pkg.workspaces : [];
+    if (!pkg.workspaces.includes(slug)) {
+        pkg.workspaces.push(slug);
+        writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 4)}\n`);
+    }
+}
+/**
+ * Offer to link the freshly-scaffolded package into the TinyCld workspace.
+ *
+ * "Linking" in the workspace layout means: make the package a workspace member
+ * (its dir name appears in the root `package.json` `workspaces[]`) and run
+ * `npm install` at the workspace root — npm creates the `node_modules/@tinycld/*`
+ * symlink and the root `postinstall` runs the generator.
+ *
+ * Two shapes, distinguished by whether `workspaceDir` is already a workspace root:
+ *   - attach: `workspaceDir` is already an assembled workspace root (its
+ *     package.json name is `@tinycld/workspace`). No assembly — just ensure the
+ *     member and install. The existing root package.json is left untouched.
+ *   - bootstrap: `workspaceDir` is a fresh wrapper that only contains the
+ *     scaffolded `<slug>/` so far. Assemble the workspace *around* it —
+ *     `bootstrapTooling` generates the root scaffolding and clones app + core
+ *     (no workspace meta-repo) — then ensure the new member and install. The
+ *     `postinstall` (`cd app && …`) only succeeds once `app/` exists, which is
+ *     why we assemble before installing.
  *
- * Linking happens against the tinycld **app shell** (sibling repo
- * `tinycld/tinycld`), which owns `packages:link` and bundles `@tinycld/core`
- * at `packages/@tinycld/core/`. This package's tsconfig
- * (`"@tinycld/core/*": ["../tinycld/packages/@tinycld/core/*"]`) and its Go
- * server's `replace tinycld.org/core => ../../tinycld/packages/@tinycld/core/server`
- * directive both resolve into the bundled core inside the app shell.
+ * Returns true if the user chose to link (even if a subprocess failed — the
+ * error is already logged, and we don't want to follow up with manual steps
+ * when the user already expressed intent). Returns false only when linking was
+ * declined or skipped.
  */
-export async function offerLinkPackage({ packageName, targetDir, mode }) {
+export async function offerLinkPackage({ slug, workspaceDir, mode, assemble = realAssemble, install = realInstall, }) {
     if (mode === 'skip')
         return false;
-    const parentDir = dirname(targetDir);
-    const appDir = join(parentDir, APP_DIR_NAME);
-    const appExists = existsSync(appDir);
+    // A wrapper that isn't yet a workspace root needs app + core assembled in.
+    const needsClone = !looksLikeWorkspaceRoot(workspaceDir);
     if (mode === 'prompt') {
-        const prompt = appExists
-            ? `Link ${pc.bold(packageName)} into ${pc.bold(APP_DIR_NAME)} now?`
-            : `Clone ${pc.bold(APP_DIR_NAME)} (shallow) and link ${pc.bold(packageName)} into it now?`;
-        const answer = await confirm({ message: prompt, initialValue: true });
+        const message = needsClone
+            ? `Assemble the tinycld workspace (app + core) and link ${pc.bold(slug)} now?`
+            : `Link ${pc.bold(slug)} into the workspace now?`;
+        const answer = await confirm({ message, initialValue: true });
         if (isCancel(answer) || answer !== true)
             return false;
     }
-    if (!appExists) {
-        if (!cloneRepo(APP_REPO_URL, appDir))
+    if (needsClone) {
+        const s = spinner();
+        s.start('Assembling the tinycld workspace (app + core)');
+        try {
+            assemble(workspaceDir);
+        }
+        catch (err) {
+            s.stop(pc.red('Workspace assembly failed'), 1);
+            log.error(err instanceof Error ? err.message : String(err));
             return true;
+        }
+        s.stop('Assembled the tinycld workspace');
     }
-    else {
-        log.info(`Using existing ${APP_DIR_NAME} at ${appDir}`);
-    }
-    const install = spinner();
-    install.start(`Installing ${APP_DIR_NAME} dependencies (npm install)`);
-    const inst = spawnSync('npm', ['install'], { cwd: appDir, stdio: 'pipe', encoding: 'utf8' });
-    if (inst.status !== 0) {
-        install.stop(pc.red('npm install failed'), 1);
-        log.error(inst.stderr.trim() || 'npm install exited non-zero');
-        return true;
-    }
-    install.stop(`Installed ${APP_DIR_NAME} dependencies`);
-    // packages:link in tinycld takes a sibling-directory locator and reads
-    // the package name from the sibling's package.json. Pass a path relative
-    // to the app shell so the symlink target stays portable.
-    const link = spinner();
-    link.start(`Linking ${packageName}`);
-    const locator = relative(appDir, targetDir) || targetDir;
-    const linkResult = spawnSync('npm', ['run', 'packages:link', locator], {
-        cwd: appDir,
-        stdio: 'pipe',
-        encoding: 'utf8',
-    });
-    if (linkResult.status !== 0) {
-        link.stop(pc.red('Link failed'), 1);
-        log.error(linkResult.stderr.trim() || 'packages:link exited non-zero');
+    ensureMember(workspaceDir, slug);
+    const i = spinner();
+    i.start('Installing workspace (npm install)');
+    if (!install(workspaceDir)) {
+        i.stop(pc.red('npm install failed'), 1);
         return true;
     }
-    link.stop(`Linked ${packageName} into ${APP_DIR_NAME}`);
+    i.stop('Installed workspace');
+    log.success(`Linked ${pc.bold(slug)} into the workspace`);
     return true;
 }
-function cloneRepo(url, dest) {
-    const s = spinner();
-    s.start(`Cloning ${url} into ${dest}`);
-    const result = spawnSync('git', ['clone', '--depth', '1', url, dest], {
-        stdio: 'pipe',
-        encoding: 'utf8',
-    });
-    if (result.status !== 0) {
-        s.stop(pc.red('Clone failed'), 1);
-        log.error(result.stderr.trim() || 'git clone exited non-zero');
+/**
+ * Assemble the workspace skeleton at `dir`: write the workspace manifest and
+ * clone app + core (honoring `TINYCLD_REPO_BASE` for keyless/HTTPS envs).
+ * `bootstrapTooling` is synchronous and throws on failure (unknown member, etc.);
+ * `offerLinkPackage` wraps the call so the error surfaces in the spinner.
+ */
+function realAssemble(dir) {
+    bootstrapTooling({ root: dir, repoBase: process.env.TINYCLD_REPO_BASE });
+}
+function realInstall(cwd) {
+    const r = spawnSync('npm', ['install'], { cwd, stdio: 'pipe', encoding: 'utf8' });
+    if (r.status !== 0) {
+        log.error(r.stderr?.trim() || 'npm install exited non-zero');
         return false;
     }
-    s.stop(`Cloned ${dest}`);
     return true;
 }
 //# sourceMappingURL=link-package.js.map