castle-web-cli 0.4.17 → 0.4.19

package/dist/init.js

@@ -39,8 +39,27 @@ const PUBLISHED_SDK_VERSION = '0.4.3';
 // Never copied into a fresh deck: build/dependency junk, and castle.json (a
 // fresh deck has no deckId until its first save-deck).
 const KIT_COPY_EXCLUDE = new Set(['node_modules', '.castle', 'dist', '.git', 'castle.json']);
-function relativeFromProject(projectDir, target) {
-    return toPosixPath(path.relative(projectDir, target));
+// 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):
+//     sdk -> file: absolute path to sdk/, scripts -> `node <abs cli dist>/index.js`
+//   published mode (globally-installed castle-web, no sibling sdk/):
+//     sdk -> registry `^${PUBLISHED_SDK_VERSION}`, scripts -> the `castle-web` binary
+function resolveScaffoldRefs() {
+    const sdkPath = getSdkPackagePath();
+    // "Workspace mode" = the cli is running from a castle-experimental-web
+    // checkout (sdk/ exists next to cli/). Otherwise we're a globally-installed
+    // npm package and need the published refs + `castle-web` binary.
+    const workspaceMode = fs.existsSync(sdkPath);
+    const sdkPathPosix = workspaceMode ? toPosixPath(sdkPath) : null;
+    const cliDistAbs = workspaceMode ? toPosixPath(path.dirname(getCliEntryPath())) : null;
+    return {
+        workspaceMode,
+        sdkRef: workspaceMode ? `file:${sdkPathPosix}` : `^${PUBLISHED_SDK_VERSION}`,
+        cliCommand: workspaceMode ? `node ${toPosixPath(getCliEntryPath())}` : 'castle-web',
+        cliDistAbs,
+        sdkPathPosix,
+    };
 }
 function makeClaudeMd() {
     // Inline the upstream CLAUDE.md content. An @-import works inside the
@@ -72,19 +91,18 @@ function tryMakeAgentsSymlink(agentsPath) {
     }
 }
 function makePackageJson(projectDir) {
-    const cliEntry = relativeFromProject(projectDir, getCliEntryPath());
-    const sdkPackage = relativeFromProject(projectDir, getSdkPackagePath());
+    const { sdkRef, cliCommand } = resolveScaffoldRefs();
     return {
         name: path.basename(projectDir),
         private: true,
         type: 'module',
         scripts: {
-            restart: `node ${cliEntry} restart .`,
-            screenshot: `node ${cliEntry} screenshot .`,
-            'save-deck': `node ${cliEntry} save-deck .`,
+            restart: `${cliCommand} restart .`,
+            screenshot: `${cliCommand} screenshot .`,
+            'save-deck': `${cliCommand} save-deck .`,
         },
         dependencies: {
-            'castle-web-sdk': `file:${sdkPackage}`,
+            'castle-web-sdk': sdkRef,
         },
     };
 }
@@ -151,16 +169,9 @@ function scaffoldFromKit(kit, 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.
-            const sdkPath = getSdkPackagePath();
-            // "Workspace mode" = the cli is running from a castle-experimental-web
-            // checkout (sdk/ exists next to cli/). Otherwise we're a globally-
-            // installed npm package and need to use the published refs + binary.
-            const workspaceMode = fs.existsSync(sdkPath);
-            const sdkRef = workspaceMode ? `file:${toPosixPath(sdkPath)}` : `^${PUBLISHED_SDK_VERSION}`;
-            const cliDistAbs = workspaceMode
-                ? toPosixPath(path.dirname(getCliEntryPath()))
-                : null;
+            // 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:')) {
@@ -170,10 +181,10 @@ function scaffoldFromKit(kit, projectDir) {
                 for (const k of Object.keys(pkg.scripts)) {
                     if (typeof pkg.scripts[k] !== 'string')
                         continue;
-                    if (cliDistAbs) {
+                    if (workspaceMode) {
                         pkg.scripts[k] = pkg.scripts[k]
                             .replace(/\.\.\/\.\.\/cli\/dist/g, cliDistAbs)
-                            .replace(/\.\.\/\.\.\/sdk/g, toPosixPath(sdkPath));
+                            .replace(/\.\.\/\.\.\/sdk/g, sdkPathPosix);
                     }
                     else {
                         // Globally-installed: route through the `castle-web` binary on PATH.

package/package.json

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