castle-web-cli 0.4.38 → 0.4.40

package/dist/index.js

@@ -135,14 +135,6 @@ async function main() {
         case 'login':
             await login();
             break;
-        case 'build-archives': {
-            // Dev/publish tool: generate the prebuilt per-kit deck archives that
-            // `init` extracts in published mode. Run after `npm run build -w cli`.
-            const { buildKitArchives } = await import('./buildArchive.js');
-            const only = getFlagValue('--kit');
-            buildKitArchives(only ? [only] : undefined);
-            break;
-        }
         default:
             usage();
     }

package/dist/init.d.ts

@@ -1,22 +1,4 @@
-export declare const PUBLISHED_SDK_VERSION = "0.4.4";
-export declare const KIT_COPY_EXCLUDE: Set<string>;
-export declare const ARCHIVE_NAME = "published-deck.tgz";
-export declare function getKitArchivePath(kit: string): string;
-export declare function copyKitSource(kitDir: string, dest: string, extraExclude?: Set<string>): void;
-export declare function rewriteKitPackageJson(pkg: {
-    name?: string;
-    dependencies?: Record<string, string>;
-    scripts?: Record<string, string>;
-}, name: string, refs: ReturnType<typeof resolveScaffoldRefs>): void;
-declare function resolveScaffoldRefs(): {
-    workspaceMode: boolean;
-    sdkRef: string;
-    cliCommand: string;
-    cliDistAbs: string | null;
-    sdkPathPosix: string | null;
-};
 export declare function init(dir: string, opts?: {
     kit?: string;
     serve?: boolean;
 }): Promise<void>;
-export {};

package/dist/init.js

@@ -1,4 +1,4 @@
-import { execFileSync, execSync } from 'child_process';
+import { execSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { COMMON_INSTRUCTIONS } from './commonInstructions.js';
@@ -35,62 +35,10 @@ const DEFAULT_KIT = 'basic-2d';
 // Registry version of castle-web-sdk to inject when scaffolding from a
 // globally-installed castle-web (not from inside the workspace). Bumped
 // alongside cli/sdk version bumps.
-export const PUBLISHED_SDK_VERSION = '0.4.4';
+const PUBLISHED_SDK_VERSION = '0.4.4';
 // Never copied into a fresh deck: build/dependency junk, and castle.json (a
 // fresh deck has no deckId until its first save-deck).
-export const KIT_COPY_EXCLUDE = new Set(['node_modules', '.castle', 'dist', '.git', 'castle.json']);
-// A globally-installed castle-web ships one prebuilt, ready-to-serve archive
-// per kit (kit source + installed node_modules + published-mode package.json),
-// gzipped. `init` in published mode extracts it instead of cp + `npm install`.
-// Lives inside each bundled kit dir (cli/kits/<kit>/), generated by
-// `build-archives` (see buildArchive.ts). Workspace mode never uses it.
-export const ARCHIVE_NAME = 'published-deck.tgz';
-export function getKitArchivePath(kit) {
-    return path.join(getKitsDir(), kit, ARCHIVE_NAME);
-}
-// Copy a framework kit into `dest`, dropping build/dependency junk + castle.json
-// (and any caller-supplied extra names, e.g. a stale archive). Shared by the
-// live scaffold and archive generation so the two stay in sync.
-export function copyKitSource(kitDir, dest, extraExclude) {
-    fs.cpSync(kitDir, dest, {
-        recursive: true,
-        // Keep symlinks verbatim so the kit's AGENTS.md -> CLAUDE.md stays a link.
-        verbatimSymlinks: true,
-        filter: (src) => src === kitDir ||
-            (!KIT_COPY_EXCLUDE.has(path.basename(src)) && !extraExclude?.has(path.basename(src))),
-    });
-}
-// Rewrite a kit's package.json (in place) so the scaffolded deck references the
-// sdk + cli per the resolved mode. Workspace mode points at the local checkout
-// (file: sdk + node <abs cli dist>); published mode points at the registry sdk
-// + the `castle-web` binary. Shared by the live scaffold and archive generation.
-export function rewriteKitPackageJson(pkg, name, refs) {
-    pkg.name = name;
-    const { workspaceMode, sdkRef, cliDistAbs, sdkPathPosix } = refs;
-    if (pkg.dependencies &&
-        typeof pkg.dependencies['castle-web-sdk'] === 'string' &&
-        pkg.dependencies['castle-web-sdk'].startsWith('file:')) {
-        pkg.dependencies['castle-web-sdk'] = sdkRef;
-    }
-    if (!pkg.scripts)
-        return;
-    for (const k of Object.keys(pkg.scripts)) {
-        if (typeof pkg.scripts[k] !== 'string')
-            continue;
-        if (workspaceMode) {
-            pkg.scripts[k] = pkg.scripts[k]
-                .replace(/\.\.\/\.\.\/cli\/dist/g, cliDistAbs)
-                .replace(/\.\.\/\.\.\/sdk/g, sdkPathPosix);
-        }
-        else {
-            // Globally-installed: route through the `castle-web` binary on PATH.
-            pkg.scripts[k] = pkg.scripts[k]
-                .replace(/node\s+\.\.\/\.\.\/cli\/dist\/index\.js/g, 'castle-web')
-                .replace(/await import\((['"])\.\.\/\.\.\/cli\/dist\/bundle\.js\1\)/g, "await import('castle-web-cli/dist/bundle.js')")
-                .replace(/\.\.\/\.\.\/sdk/g, '');
-        }
-    }
-}
+const KIT_COPY_EXCLUDE = new Set(['node_modules', '.castle', 'dist', '.git', 'castle.json']);
 // Resolve how a scaffolded deck should reference the sdk + cli. Both the bare
 // and kit scaffold paths go through here so they stay in sync.
 //   workspace mode (sdk/ sits next to cli/, i.e. running from a checkout):
@@ -179,42 +127,8 @@ function scaffoldBare(projectDir) {
     ensureAgentsSymlink(projectDir);
     fs.writeFileSync(path.join(projectDir, 'package.json'), JSON.stringify(makePackageJson(projectDir), null, 2) + '\n');
 }
-// Finalize a deck whose files are already on disk (mirroring scaffoldFromKit's
-// tail): ensure a CLAUDE.md, append the cli-owned common guidance, and create
-// the AGENTS.md symlink. Used by both the cp path and the archive-extract path.
-function finalizeDeckDocs(projectDir) {
-    // Every deck needs a CLAUDE.md so coding agents know how castle-web works.
-    // Keep the kit's own if it ships one; otherwise generate from the upstream.
-    const claudePath = path.join(projectDir, 'CLAUDE.md');
-    if (!fs.existsSync(claudePath)) {
-        fs.writeFileSync(claudePath, makeClaudeMd());
-    }
-    appendCommonInstructions(projectDir);
-    ensureAgentsSymlink(projectDir);
-}
-// Published fast path: extract the prebuilt, ready-to-serve archive into the
-// deck dir (no cp, no `npm install`). The archive carries the kit source +
-// installed node_modules + a published-mode package.json with a generic name;
-// rename it to the deck dir, then run the shared doc finalization.
-function extractKitArchive(archivePath, projectDir) {
-    fs.mkdirSync(projectDir, { recursive: true });
-    execFileSync('tar', ['-xzf', archivePath, '-C', projectDir], { stdio: 'inherit' });
-    const pkgPath = path.join(projectDir, 'package.json');
-    if (fs.existsSync(pkgPath)) {
-        try {
-            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-            pkg.name = path.basename(projectDir);
-            fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
-        }
-        catch {
-            // archived an unparseable package.json — leave it for the user to fix
-        }
-    }
-    finalizeDeckDocs(projectDir);
-}
 // Copy a framework kit from kits/<kit>/ into the new deck dir, dropping
-// build/dependency junk and castle.json. Returns whether deps are already
-// installed (true only on the published archive-extract fast path).
+// build/dependency junk and castle.json.
 function scaffoldFromKit(kit, projectDir) {
     const kitDir = path.join(getKitsDir(), kit);
     if (!fs.existsSync(kitDir) || !fs.statSync(kitDir).isDirectory()) {
@@ -236,17 +150,12 @@ function scaffoldFromKit(kit, projectDir) {
         console.error('Or use `--kit none` for a bare code-only deck.');
         process.exit(1);
     }
-    // Published mode (globally-installed castle-web, no sibling sdk/) extracts a
-    // prebuilt archive when one ships for this kit -- skipping cp + `npm install`.
-    // Workspace mode always does the live cp so local sdk edits stay live.
-    const refs = resolveScaffoldRefs();
-    const archivePath = getKitArchivePath(kit);
-    if (!refs.workspaceMode && fs.existsSync(archivePath)) {
-        console.log('Extracting prebuilt deck (deps included)...');
-        extractKitArchive(archivePath, projectDir);
-        return { depsInstalled: true };
-    }
-    copyKitSource(kitDir, projectDir);
+    fs.cpSync(kitDir, projectDir, {
+        recursive: true,
+        // Keep symlinks verbatim so the kit's AGENTS.md -> CLAUDE.md stays a link.
+        verbatimSymlinks: true,
+        filter: (src) => src === kitDir || !KIT_COPY_EXCLUDE.has(path.basename(src)),
+    });
     // The kit's package.json carries the kit's name; rename it to the deck dir.
     // Kit-relative refs to `../../sdk` and `../../cli/dist` only resolve when the
     // deck lives at castle-experimental-web/decks/<name>/. Rewrite both to
@@ -256,15 +165,81 @@ function scaffoldFromKit(kit, projectDir) {
     if (fs.existsSync(pkgPath)) {
         try {
             const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-            rewriteKitPackageJson(pkg, path.basename(projectDir), refs);
+            pkg.name = path.basename(projectDir);
+            // Local-dev paths (`file:../../sdk` / `node ../../cli/dist/index.js`) only
+            // work when the deck lives inside the castle-experimental-web workspace.
+            // For a deck scaffolded from a globally-installed castle-web, rewrite to
+            // the published packages instead. Same workspace-vs-published resolution
+            // the bare scaffold path uses.
+            const { workspaceMode, sdkRef, cliDistAbs, sdkPathPosix } = resolveScaffoldRefs();
+            if (pkg.dependencies &&
+                typeof pkg.dependencies['castle-web-sdk'] === 'string' &&
+                pkg.dependencies['castle-web-sdk'].startsWith('file:')) {
+                pkg.dependencies['castle-web-sdk'] = sdkRef;
+            }
+            if (pkg.scripts) {
+                for (const k of Object.keys(pkg.scripts)) {
+                    if (typeof pkg.scripts[k] !== 'string')
+                        continue;
+                    if (workspaceMode) {
+                        pkg.scripts[k] = pkg.scripts[k]
+                            .replace(/\.\.\/\.\.\/cli\/dist/g, cliDistAbs)
+                            .replace(/\.\.\/\.\.\/sdk/g, sdkPathPosix);
+                    }
+                    else {
+                        // Globally-installed: route through the `castle-web` binary on PATH.
+                        pkg.scripts[k] = pkg.scripts[k]
+                            .replace(/node\s+\.\.\/\.\.\/cli\/dist\/index\.js/g, 'castle-web')
+                            .replace(/await import\((['"])\.\.\/\.\.\/cli\/dist\/bundle\.js\1\)/g, "await import('castle-web-cli/dist/bundle.js')")
+                            .replace(/\.\.\/\.\.\/sdk/g, '');
+                    }
+                }
+            }
             fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
         }
         catch {
             // kit shipped an unparseable package.json — leave it for the user to fix
         }
     }
-    finalizeDeckDocs(projectDir);
-    return { depsInstalled: false };
+    // Every deck needs a CLAUDE.md so coding agents know how castle-web works.
+    // Keep the kit's own if it ships one; otherwise generate from the upstream.
+    const claudePath = path.join(projectDir, 'CLAUDE.md');
+    if (!fs.existsSync(claudePath)) {
+        fs.writeFileSync(claudePath, makeClaudeMd());
+    }
+    appendCommonInstructions(projectDir);
+    ensureAgentsSymlink(projectDir);
+}
+function hasPnpm() {
+    try {
+        execSync('pnpm --version', { stdio: 'ignore' });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+// Install the scaffolded deck's deps. Prefer pnpm -- in the e2b template a pnpm
+// store is baked in, so this is near-instant (hardlinks from the store, no
+// download). Fall back to npm when pnpm isn't on PATH (e.g. a laptop that never
+// installed it). --prefer-offline uses the store/cache first; --ignore-scripts
+// skips dep build scripts (pnpm 10 gates them and exits non-zero otherwise, and
+// the deck's deps are all prebuilt pure JS that don't need them).
+function installDeps(projectDir) {
+    if (hasPnpm()) {
+        console.log('Installing deps (pnpm)...');
+        execSync('pnpm install --prefer-offline --ignore-scripts', {
+            cwd: projectDir,
+            stdio: 'inherit',
+        });
+    }
+    else {
+        console.log('Installing deps (npm)...');
+        execSync('npm install --no-audit --no-fund --loglevel=error', {
+            cwd: projectDir,
+            stdio: 'inherit',
+        });
+    }
 }
 export async function init(dir, opts = {}) {
     const projectDir = path.resolve(dir);
@@ -274,37 +249,27 @@ export async function init(dir, opts = {}) {
     }
     const kit = opts.kit ?? DEFAULT_KIT;
     const bare = kit === 'none' || kit === 'bare';
-    // depsInstalled is true only when the published archive fast-path ran, which
-    // already ships node_modules -- so we can skip `npm install` below.
-    let depsInstalled = false;
     if (bare) {
         scaffoldBare(projectDir);
     }
     else {
-        ({ depsInstalled } = scaffoldFromKit(kit, projectDir));
+        scaffoldFromKit(kit, projectDir);
     }
     console.log(`Created project in ${projectDir}/${bare ? '' : ` (from kit "${kit}")`}`);
-    // Auto-run npm install + serve so the page is up the moment the
-    // agent / user starts editing. Pass --no-serve to skip.
+    // Always install deps so the deck is ready to serve/edit immediately.
+    // `--no-serve` only skips the serve step below (callers like the cloud
+    // launcher run their own serve, but still want deps in place).
+    console.log('');
+    let installed = false;
+    try {
+        installDeps(projectDir);
+        installed = true;
+    }
+    catch {
+        console.error('dependency install failed; re-run `pnpm install` (or `npm install`) in the deck.');
+    }
     const autoServe = opts.serve !== false;
-    if (autoServe) {
-        console.log('');
-        if (!depsInstalled) {
-            console.log('Installing deps + serving (pass --no-serve to skip)...');
-            try {
-                execSync('npm install --no-audit --no-fund --loglevel=error', {
-                    cwd: projectDir,
-                    stdio: 'inherit',
-                });
-            }
-            catch {
-                console.error('npm install failed; skipping serve. Re-run yourself with `npm install && castle-web serve .` (& in your shell to background it).');
-                return;
-            }
-        }
-        else {
-            console.log('Serving (deps prebuilt)...');
-        }
+    if (autoServe && installed) {
         // Call serve() with detach so init returns once the server is up. serve()
         // handles the background spawn internally; init doesn't shell out.
         // Bind all interfaces by default so a tailnet / LAN browser can reach
@@ -320,7 +285,7 @@ export async function init(dir, opts = {}) {
     console.log('');
     console.log('Next steps:');
     console.log(`  cd ${dir}`);
-    if (!depsInstalled)
-        console.log('  npm install');
+    if (!installed)
+        console.log('  pnpm install   # or: npm install');
     console.log('  castle-web serve .   # & in your shell to background it');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "castle-web-cli",
-  "version": "0.4.38",
+  "version": "0.4.40",
   "type": "module",
   "bin": {
     "castle-web": "./dist/index.js"