@mondaydotcomorg/z2h-cli 0.24.0 → 0.24.2

package/dist/commands/__tests__/generate-z2h-token.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=generate-z2h-token.test.d.ts.map

package/dist/commands/__tests__/generate-z2h-token.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-z2h-token.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/generate-z2h-token.test.ts"],"names":[],"mappings":""}

package/dist/commands/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../src/commands/create-workspace.ts"],"names":[],"mappings":"AASA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CA0C5D"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAaA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuC5D"}

package/dist/commands/create-workspace.js

@@ -13,37 +13,35 @@ const _interopDefault = e => e && e.__esModule ? e : { default: e };
 
 const path__default = /*#__PURE__*/_interopDefault(path);
 
+async function isPopulated(dir) {
+    return (await fs.pathExists(dir)) && (await fs.readdir(dir)).length > 0;
+}
 async function createWorkspaceCommand() {
     const home = util_workspace.getWorkspaceHome();
     const templatesDir = util_templates.getTemplatesDir();
     const wsTemplatesDir = path__default.default.join(templatesDir, 'workspace');
-    if (await fs.pathExists(home)) {
-        const entries = await fs.readdir(home);
-        if (entries.length > 0) {
-            util_logger.output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
-                ok: true,
-                workspace: home,
-            });
-            return;
-        }
+    await fs.ensureDir(home);
+    const scaffolded = await util_workspace.isZ2hWorkspace(home);
+    if (!scaffolded) {
+        util_logger.info(`setting up your Z2H workspace`);
+        const pkgRaw = await promises.readFile(path__default.default.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
+        await Promise.all([
+            fs.writeFile(path__default.default.join(home, 'package.json'), pkgRaw),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'gitignore'), path__default.default.join(home, '.gitignore')),
+            fs.writeFile(path__default.default.join(home, '.yarnrc.yml'), util_npm_brokerConfig.workspaceYarnrcContents()),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'nx.json'), path__default.default.join(home, 'nx.json')),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'yarnlock'), path__default.default.join(home, 'yarn.lock')),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'nvmrc'), path__default.default.join(home, '.nvmrc')),
+            fs.writeFile(path__default.default.join(home, '.npmrc'), util_npm_brokerConfig.workspaceNpmrcContents()),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'README.md'), path__default.default.join(home, 'README.md')),
+            fs.copy(path__default.default.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'), path__default.default.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')),
+        ]);
     }
-    else {
-        await fs.ensureDir(home);
+    const hasWorkspaceNodeModules = await isPopulated(path__default.default.join(home, 'node_modules'));
+    if (!scaffolded || !hasWorkspaceNodeModules) {
+        util_logger.info(`installing workspace dependencies — this may take a minute`);
+        await util_npm_install.runYarnInstall({ cwd: home });
     }
-    const pkgRaw = await promises.readFile(path__default.default.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
-    await Promise.all([
-        fs.writeFile(path__default.default.join(home, 'package.json'), pkgRaw),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'gitignore'), path__default.default.join(home, '.gitignore')),
-        fs.writeFile(path__default.default.join(home, '.yarnrc.yml'), util_npm_brokerConfig.workspaceYarnrcContents()),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'nx.json'), path__default.default.join(home, 'nx.json')),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'yarnlock'), path__default.default.join(home, 'yarn.lock')),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'nvmrc'), path__default.default.join(home, '.nvmrc')),
-        fs.writeFile(path__default.default.join(home, '.npmrc'), util_npm_brokerConfig.workspaceNpmrcContents()),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'README.md'), path__default.default.join(home, 'README.md')),
-        fs.copy(path__default.default.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'), path__default.default.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')),
-    ]);
-    util_logger.info(`setting up your Z2H workspace — this may take a minute...`);
-    await util_npm_install.runYarnInstall({ cwd: home });
     util_logger.output(`Your workspace is ready! 🚀 Apps will live at ${home}`, {
         ok: true,
         workspace: home,

package/dist/commands/generate-z2h-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-z2h-token.d.ts","sourceRoot":"","sources":["../../src/commands/generate-z2h-token.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,yDAAyD,CAAC;AAC7F,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,MAAM,WAAW,uBAAuB;IACtC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAwDD,wBAAsB,uBAAuB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B/F"}
+{"version":3,"file":"generate-z2h-token.d.ts","sourceRoot":"","sources":["../../src/commands/generate-z2h-token.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,yDAAyD,CAAC;AAC7F,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,MAAM,WAAW,uBAAuB;IACtC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAwED,wBAAsB,uBAAuB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B/F"}

package/dist/commands/generate-z2h-token.js

@@ -15,6 +15,9 @@ const DEFAULT_TOKEN_PAGE_URL = 'https://bigbrain.me/bigbrain-vibe/generate-z2h-t
 const LOOPBACK_TIMEOUT_MS = 120_000;
 async function promptForToken() {
     const rl = readline__default.default.createInterface({ input: node_process.stdin, output: node_process.stdout });
+    // Raw mode disables ISIG, so Ctrl-C never becomes a signal here. readline delivers the
+    // ^C byte as this event, and with no listener it only pauses. Exit code 130 is 128+SIGINT.
+    rl.on('SIGINT', () => process.exit(130));
     try {
         const raw = await rl.question('Paste your token here, then press Enter:\n> ');
         return raw.trim();
@@ -51,13 +54,23 @@ async function runLoopbackFlow(pageUrl) {
         util_logger.warn('could not auto-open the browser. please visit the URL above manually.');
     }
     util_logger.info('waiting for the page to send the token (Ctrl+C to fall back to manual paste)…');
+    // A SIGINT listener suppresses Node's default termination while it is attached. That is
+    // what turns the Ctrl+C offered above into the manual-paste fallback instead of a killed
+    // CLI. The finally below detaches it, so it covers only this wait.
+    let stopListening = () => { };
+    const cancelled = new Promise(resolve => {
+        const onSigint = () => resolve(null);
+        process.once('SIGINT', onSigint);
+        stopListening = () => process.removeListener('SIGINT', onSigint);
+    });
+    // `close()` below rejects a still-pending wait. Swallow it here so the loser of the race
+    // never becomes an unhandled rejection, which Node turns into a crash.
+    const arrived = loopback.waitForToken(LOOPBACK_TIMEOUT_MS).catch(() => null);
     try {
-        return await loopback.waitForToken(LOOPBACK_TIMEOUT_MS);
-    }
-    catch {
-        return null;
+        return await Promise.race([arrived, cancelled]);
     }
     finally {
+        stopListening();
         loopback.close();
     }
 }

package/dist/commands/tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../src/commands/tag.ts"],"names":[],"mappings":"AAMA,OAAO,EAML,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,UAAU;IACzB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAgCD;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA0ClH;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B5F"}
+{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../src/commands/tag.ts"],"names":[],"mappings":"AAMA,OAAO,EAML,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,UAAU;IACzB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAgCD;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA6ClH;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B5F"}

package/dist/commands/tag.js

@@ -46,6 +46,9 @@ async function resolveAppSlug(appArg) {
  */
 async function promptForTags(appSlug, catalog, current) {
     const rl = readline__default.default.createInterface({ input: node_process.stdin, output: node_process.stdout });
+    // Raw mode disables ISIG, so Ctrl-C never becomes a signal here. readline delivers the
+    // ^C byte as this event, and with no listener it only pauses. Exit code 130 is 128+SIGINT.
+    rl.on('SIGINT', () => process.exit(130));
     const selected = [];
     try {
         util_logger.info(`Tagging "${appSlug}".`);

package/dist/esm/commands/__tests__/generate-z2h-token.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=generate-z2h-token.test.d.ts.map

package/dist/esm/commands/__tests__/generate-z2h-token.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-z2h-token.test.d.ts","sourceRoot":"","sources":["../../../../src/commands/__tests__/generate-z2h-token.test.ts"],"names":[],"mappings":""}

package/dist/esm/commands/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/create-workspace.ts"],"names":[],"mappings":"AASA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CA0C5D"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAaA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuC5D"}

package/dist/esm/commands/create-workspace.mjs

@@ -1,43 +1,41 @@
 import path from 'node:path';
 import { readFile } from 'node:fs/promises';
-import { pathExists, readdir, ensureDir, writeFile, copy } from 'fs-extra';
-import { output, info } from '../util/logger.mjs';
-import { getWorkspaceHome } from '../util/workspace.mjs';
+import { ensureDir, writeFile, copy, pathExists, readdir } from 'fs-extra';
+import { info, output } from '../util/logger.mjs';
+import { getWorkspaceHome, isZ2hWorkspace } from '../util/workspace.mjs';
 import { getTemplatesDir } from '../util/templates.mjs';
 import { runYarnInstall } from '../util/npm/install.mjs';
 import { workspaceYarnrcContents, workspaceNpmrcContents } from '../util/npm/broker-config.mjs';
 
+async function isPopulated(dir) {
+    return (await pathExists(dir)) && (await readdir(dir)).length > 0;
+}
 async function createWorkspaceCommand() {
     const home = getWorkspaceHome();
     const templatesDir = getTemplatesDir();
     const wsTemplatesDir = path.join(templatesDir, 'workspace');
-    if (await pathExists(home)) {
-        const entries = await readdir(home);
-        if (entries.length > 0) {
-            output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
-                ok: true,
-                workspace: home,
-            });
-            return;
-        }
+    await ensureDir(home);
+    const scaffolded = await isZ2hWorkspace(home);
+    if (!scaffolded) {
+        info(`setting up your Z2H workspace`);
+        const pkgRaw = await readFile(path.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
+        await Promise.all([
+            writeFile(path.join(home, 'package.json'), pkgRaw),
+            copy(path.join(wsTemplatesDir, 'gitignore'), path.join(home, '.gitignore')),
+            writeFile(path.join(home, '.yarnrc.yml'), workspaceYarnrcContents()),
+            copy(path.join(wsTemplatesDir, 'nx.json'), path.join(home, 'nx.json')),
+            copy(path.join(wsTemplatesDir, 'yarnlock'), path.join(home, 'yarn.lock')),
+            copy(path.join(wsTemplatesDir, 'nvmrc'), path.join(home, '.nvmrc')),
+            writeFile(path.join(home, '.npmrc'), workspaceNpmrcContents()),
+            copy(path.join(wsTemplatesDir, 'README.md'), path.join(home, 'README.md')),
+            copy(path.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'), path.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')),
+        ]);
     }
-    else {
-        await ensureDir(home);
+    const hasWorkspaceNodeModules = await isPopulated(path.join(home, 'node_modules'));
+    if (!scaffolded || !hasWorkspaceNodeModules) {
+        info(`installing workspace dependencies — this may take a minute`);
+        await runYarnInstall({ cwd: home });
     }
-    const pkgRaw = await readFile(path.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
-    await Promise.all([
-        writeFile(path.join(home, 'package.json'), pkgRaw),
-        copy(path.join(wsTemplatesDir, 'gitignore'), path.join(home, '.gitignore')),
-        writeFile(path.join(home, '.yarnrc.yml'), workspaceYarnrcContents()),
-        copy(path.join(wsTemplatesDir, 'nx.json'), path.join(home, 'nx.json')),
-        copy(path.join(wsTemplatesDir, 'yarnlock'), path.join(home, 'yarn.lock')),
-        copy(path.join(wsTemplatesDir, 'nvmrc'), path.join(home, '.nvmrc')),
-        writeFile(path.join(home, '.npmrc'), workspaceNpmrcContents()),
-        copy(path.join(wsTemplatesDir, 'README.md'), path.join(home, 'README.md')),
-        copy(path.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'), path.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')),
-    ]);
-    info(`setting up your Z2H workspace — this may take a minute...`);
-    await runYarnInstall({ cwd: home });
     output(`Your workspace is ready! 🚀 Apps will live at ${home}`, {
         ok: true,
         workspace: home,

package/dist/esm/commands/generate-z2h-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-z2h-token.d.ts","sourceRoot":"","sources":["../../../src/commands/generate-z2h-token.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,yDAAyD,CAAC;AAC7F,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,MAAM,WAAW,uBAAuB;IACtC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAwDD,wBAAsB,uBAAuB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B/F"}
+{"version":3,"file":"generate-z2h-token.d.ts","sourceRoot":"","sources":["../../../src/commands/generate-z2h-token.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,yDAAyD,CAAC;AAC7F,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,MAAM,WAAW,uBAAuB;IACtC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAwED,wBAAsB,uBAAuB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B/F"}

package/dist/esm/commands/generate-z2h-token.mjs

@@ -9,6 +9,9 @@ const DEFAULT_TOKEN_PAGE_URL = 'https://bigbrain.me/bigbrain-vibe/generate-z2h-t
 const LOOPBACK_TIMEOUT_MS = 120_000;
 async function promptForToken() {
     const rl = readline.createInterface({ input: stdin, output: stdout });
+    // Raw mode disables ISIG, so Ctrl-C never becomes a signal here. readline delivers the
+    // ^C byte as this event, and with no listener it only pauses. Exit code 130 is 128+SIGINT.
+    rl.on('SIGINT', () => process.exit(130));
     try {
         const raw = await rl.question('Paste your token here, then press Enter:\n> ');
         return raw.trim();
@@ -45,13 +48,23 @@ async function runLoopbackFlow(pageUrl) {
         warn('could not auto-open the browser. please visit the URL above manually.');
     }
     info('waiting for the page to send the token (Ctrl+C to fall back to manual paste)…');
+    // A SIGINT listener suppresses Node's default termination while it is attached. That is
+    // what turns the Ctrl+C offered above into the manual-paste fallback instead of a killed
+    // CLI. The finally below detaches it, so it covers only this wait.
+    let stopListening = () => { };
+    const cancelled = new Promise(resolve => {
+        const onSigint = () => resolve(null);
+        process.once('SIGINT', onSigint);
+        stopListening = () => process.removeListener('SIGINT', onSigint);
+    });
+    // `close()` below rejects a still-pending wait. Swallow it here so the loser of the race
+    // never becomes an unhandled rejection, which Node turns into a crash.
+    const arrived = loopback.waitForToken(LOOPBACK_TIMEOUT_MS).catch(() => null);
     try {
-        return await loopback.waitForToken(LOOPBACK_TIMEOUT_MS);
-    }
-    catch {
-        return null;
+        return await Promise.race([arrived, cancelled]);
     }
     finally {
+        stopListening();
         loopback.close();
     }
 }

package/dist/esm/commands/tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../../src/commands/tag.ts"],"names":[],"mappings":"AAMA,OAAO,EAML,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,UAAU;IACzB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAgCD;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA0ClH;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B5F"}
+{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../../src/commands/tag.ts"],"names":[],"mappings":"AAMA,OAAO,EAML,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,UAAU;IACzB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAgCD;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA6ClH;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B5F"}

package/dist/esm/commands/tag.mjs

@@ -40,6 +40,9 @@ async function resolveAppSlug(appArg) {
  */
 async function promptForTags(appSlug, catalog, current) {
     const rl = readline.createInterface({ input: stdin, output: stdout });
+    // Raw mode disables ISIG, so Ctrl-C never becomes a signal here. readline delivers the
+    // ^C byte as this event, and with no listener it only pauses. Exit code 130 is 128+SIGINT.
+    rl.on('SIGINT', () => process.exit(130));
     const selected = [];
     try {
         info(`Tagging "${appSlug}".`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondaydotcomorg/z2h-cli",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "bin": "./bin/z2h-cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/commands/__tests__/create-workspace.test.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import os from 'node:os';
-import { mkdtemp, rm, writeJson, readJson, ensureDir, pathExists } from 'fs-extra';
+import { mkdtemp, rm, outputJson, readJson, ensureDir, pathExists } from 'fs-extra';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { runYarnInstall } from '../../util/npm/install';
@@ -51,14 +51,35 @@ describe('create-workspace', () => {
     expect(runYarnInstall).toHaveBeenCalledWith(expect.objectContaining({ cwd: tmp }));
   });
 
-  it('skips gracefully if the target dir is non-empty', async () => {
+  it('scaffolds and installs even if the target dir has unrelated files (e.g. a mounted empty node_modules)', async () => {
     await ensureDir(tmp);
-    await writeJson(path.join(tmp, 'somefile.json'), { hello: 'world' });
+    await ensureDir(path.join(tmp, 'node_modules'));
+
+    await createWorkspaceCommand();
+
+    expect(await pathExists(path.join(tmp, 'package.json'))).toBe(true);
+    expect(runYarnInstall).toHaveBeenCalledWith(expect.objectContaining({ cwd: tmp }));
+  });
+
+  it('skips install if package.json exists and node_modules is populated', async () => {
+    await createWorkspaceCommand();
+    vi.mocked(runYarnInstall).mockClear();
+    await outputJson(path.join(tmp, 'node_modules', 'some-dep', 'package.json'), { name: 'some-dep' });
+
+    await createWorkspaceCommand();
 
-    await expect(createWorkspaceCommand()).resolves.toBeUndefined();
     expect(runYarnInstall).not.toHaveBeenCalled();
   });
 
+  it('reinstalls if package.json exists but node_modules is empty (e.g. wiped by an ephemeral mount)', async () => {
+    await createWorkspaceCommand();
+    vi.mocked(runYarnInstall).mockClear();
+
+    await createWorkspaceCommand();
+
+    expect(runYarnInstall).toHaveBeenCalledWith(expect.objectContaining({ cwd: tmp }));
+  });
+
   it('does not include z2h-cli in workspace devDeps (managed globally)', async () => {
     await createWorkspaceCommand();
 

package/src/commands/__tests__/generate-z2h-token.test.ts

@@ -0,0 +1,140 @@
+import readline from 'node:readline/promises';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { generateZ2HTokenCommand } from '../generate-z2h-token';
+import { startLoopbackServer } from '../../util/auth/loopback-server';
+import { writeZthAuth } from '../../util/auth/write-auth';
+import { openInBrowser } from '../../util/open-browser';
+import { setOutputMode } from '../../util/logger';
+
+vi.mock('node:readline/promises', () => ({
+  default: { createInterface: vi.fn() },
+}));
+vi.mock('../../util/auth/loopback-server', () => ({ startLoopbackServer: vi.fn() }));
+vi.mock('../../util/auth/write-auth', async importOriginal => ({
+  ...(await importOriginal<typeof import('../../util/auth/write-auth')>()),
+  writeZthAuth: vi.fn().mockResolvedValue({ filePath: '/tmp/auth.json' }),
+}));
+vi.mock('../../util/open-browser', () => ({ openInBrowser: vi.fn().mockResolvedValue(undefined) }));
+
+const PASTED_TOKEN = 'aaa.bbb.ccc';
+
+/**
+ * Mirrors the real LoopbackHandle contract: `close()` rejects a wait that never
+ * received a token. A race that leaves that rejection unhandled crashes the process
+ * under Node's default unhandled-rejection policy, so the fake must reproduce it.
+ */
+function fakeLoopback() {
+  let rejectPending: ((err: Error) => void) | null = null;
+  const close = vi.fn(() => {
+    rejectPending?.(new Error('Loopback server closed before token arrived'));
+    rejectPending = null;
+  });
+  return {
+    callbackUrl: 'http://127.0.0.1:1234/token',
+    waitForToken: vi.fn(
+      () =>
+        new Promise<string>((_res, rej) => {
+          rejectPending = rej;
+        })
+    ),
+    close,
+  };
+}
+
+describe('generate-z2h-token: Ctrl+C falls back to manual paste', () => {
+  let question: ReturnType<typeof vi.fn>;
+  let rlClose: ReturnType<typeof vi.fn>;
+  let rlOn: ReturnType<typeof vi.fn>;
+  const unhandled: unknown[] = [];
+  const onUnhandled = (err: unknown) => unhandled.push(err);
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    unhandled.length = 0;
+    process.on('unhandledRejection', onUnhandled);
+    setOutputMode('json');
+    question = vi.fn().mockResolvedValue(PASTED_TOKEN);
+    rlClose = vi.fn();
+    rlOn = vi.fn();
+    vi.mocked(readline.createInterface).mockReturnValue({
+      question,
+      close: rlClose,
+      on: rlOn,
+    } as unknown as ReturnType<typeof readline.createInterface>);
+    vi.mocked(startLoopbackServer).mockResolvedValue(fakeLoopback());
+    vi.mocked(writeZthAuth).mockResolvedValue({ filePath: '/tmp/auth.json' });
+    vi.mocked(openInBrowser).mockResolvedValue(undefined);
+    vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+  });
+
+  afterEach(() => {
+    process.removeListener('unhandledRejection', onUnhandled);
+    setOutputMode('human');
+    vi.mocked(process.stdout.write).mockRestore();
+  });
+
+  it('cancels the loopback wait on SIGINT and saves the pasted token instead', async () => {
+    const done = generateZ2HTokenCommand();
+    // Let runLoopbackFlow reach its wait and attach the listener before interrupting.
+    await vi.waitFor(() => expect(process.listenerCount('SIGINT')).toBeGreaterThan(0));
+    process.emit('SIGINT');
+
+    await done;
+
+    expect(question).toHaveBeenCalledOnce();
+    expect(writeZthAuth).toHaveBeenCalledWith({ token: PASTED_TOKEN });
+  });
+
+  it('detaches its SIGINT listener so a later Ctrl+C is not swallowed', async () => {
+    const before = process.listenerCount('SIGINT');
+    const done = generateZ2HTokenCommand();
+    await vi.waitFor(() => expect(process.listenerCount('SIGINT')).toBe(before + 1));
+    process.emit('SIGINT');
+    await done;
+
+    expect(process.listenerCount('SIGINT')).toBe(before);
+  });
+
+  it('never leaves the losing race branch as an unhandled rejection', async () => {
+    const done = generateZ2HTokenCommand();
+    await vi.waitFor(() => expect(process.listenerCount('SIGINT')).toBeGreaterThan(0));
+    process.emit('SIGINT');
+    await done;
+    // close() rejected the pending wait; that rejection must already be swallowed.
+    await new Promise(r => setImmediate(r));
+
+    expect(unhandled).toEqual([]);
+  });
+
+  it('still uses the loopback token when one arrives before any Ctrl+C', async () => {
+    const handle = fakeLoopback();
+    handle.waitForToken.mockResolvedValue('xxx.yyy.zzz');
+    vi.mocked(startLoopbackServer).mockResolvedValue(handle);
+
+    await generateZ2HTokenCommand();
+
+    expect(question).not.toHaveBeenCalled();
+    expect(writeZthAuth).toHaveBeenCalledWith({ token: 'xxx.yyy.zzz' });
+  });
+
+  it('--no-browser skips the loopback entirely and prompts straight away', async () => {
+    await generateZ2HTokenCommand({ noBrowser: true });
+
+    expect(startLoopbackServer).not.toHaveBeenCalled();
+    expect(openInBrowser).not.toHaveBeenCalled();
+    expect(question).toHaveBeenCalledOnce();
+  });
+
+  // Raw mode swallows Ctrl-C unless the interface itself listens, so the prompt must
+  // register a handler or the CLI hangs there with no way out.
+  it('makes Ctrl-C exit the paste prompt instead of pausing it', async () => {
+    await generateZ2HTokenCommand({ noBrowser: true });
+
+    expect(rlOn).toHaveBeenCalledWith('SIGINT', expect.any(Function));
+    const exit = vi.spyOn(process, 'exit').mockImplementation((() => undefined) as never);
+    rlOn.mock.calls.find(([event]) => event === 'SIGINT')?.[1]();
+    expect(exit).toHaveBeenCalledWith(130);
+    exit.mockRestore();
+  });
+});

package/src/commands/create-workspace.ts

@@ -2,48 +2,49 @@ import path from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { ensureDir, writeFile, pathExists, readdir, copy } from 'fs-extra';
 import { info, output } from '../util/logger';
-import { getWorkspaceHome } from '../util/workspace';
+import { getWorkspaceHome, isZ2hWorkspace } from '../util/workspace';
 import { getTemplatesDir } from '../util/templates';
 import { runYarnInstall } from '../util/npm/install';
 import { workspaceNpmrcContents, workspaceYarnrcContents } from '../util/npm/broker-config';
 
+async function isPopulated(dir: string): Promise<boolean> {
+  return (await pathExists(dir)) && (await readdir(dir)).length > 0;
+}
+
 export async function createWorkspaceCommand(): Promise<void> {
   const home = getWorkspaceHome();
   const templatesDir = getTemplatesDir();
   const wsTemplatesDir = path.join(templatesDir, 'workspace');
 
-  if (await pathExists(home)) {
-    const entries = await readdir(home);
-    if (entries.length > 0) {
-      output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
-        ok: true,
-        workspace: home,
-      });
-      return;
-    }
-  } else {
-    await ensureDir(home);
+  await ensureDir(home);
+
+  const scaffolded = await isZ2hWorkspace(home);
+
+  if (!scaffolded) {
+    info(`setting up your Z2H workspace`);
+    const pkgRaw = await readFile(path.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
+
+    await Promise.all([
+      writeFile(path.join(home, 'package.json'), pkgRaw),
+      copy(path.join(wsTemplatesDir, 'gitignore'), path.join(home, '.gitignore')),
+      writeFile(path.join(home, '.yarnrc.yml'), workspaceYarnrcContents()),
+      copy(path.join(wsTemplatesDir, 'nx.json'), path.join(home, 'nx.json')),
+      copy(path.join(wsTemplatesDir, 'yarnlock'), path.join(home, 'yarn.lock')),
+      copy(path.join(wsTemplatesDir, 'nvmrc'), path.join(home, '.nvmrc')),
+      writeFile(path.join(home, '.npmrc'), workspaceNpmrcContents()),
+      copy(path.join(wsTemplatesDir, 'README.md'), path.join(home, 'README.md')),
+      copy(
+        path.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'),
+        path.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')
+      ),
+    ]);
   }
 
-  const pkgRaw = await readFile(path.join(wsTemplatesDir, 'package.json.tmpl'), 'utf8');
-
-  await Promise.all([
-    writeFile(path.join(home, 'package.json'), pkgRaw),
-    copy(path.join(wsTemplatesDir, 'gitignore'), path.join(home, '.gitignore')),
-    writeFile(path.join(home, '.yarnrc.yml'), workspaceYarnrcContents()),
-    copy(path.join(wsTemplatesDir, 'nx.json'), path.join(home, 'nx.json')),
-    copy(path.join(wsTemplatesDir, 'yarnlock'), path.join(home, 'yarn.lock')),
-    copy(path.join(wsTemplatesDir, 'nvmrc'), path.join(home, '.nvmrc')),
-    writeFile(path.join(home, '.npmrc'), workspaceNpmrcContents()),
-    copy(path.join(wsTemplatesDir, 'README.md'), path.join(home, 'README.md')),
-    copy(
-      path.join(wsTemplatesDir, 'yarn-releases', 'yarn-4.5.1.cjs'),
-      path.join(home, '.yarn', 'releases', 'yarn-4.5.1.cjs')
-    ),
-  ]);
-
-  info(`setting up your Z2H workspace — this may take a minute...`);
-  await runYarnInstall({ cwd: home });
+  const hasWorkspaceNodeModules = await isPopulated(path.join(home, 'node_modules'));
+  if (!scaffolded || !hasWorkspaceNodeModules) {
+    info(`installing workspace dependencies — this may take a minute`);
+    await runYarnInstall({ cwd: home });
+  }
 
   output(`Your workspace is ready! 🚀 Apps will live at ${home}`, {
     ok: true,

package/src/commands/generate-z2h-token.ts

@@ -22,6 +22,9 @@ export interface GenerateZ2HTokenOptions {
 
 async function promptForToken(): Promise<string> {
   const rl = readline.createInterface({ input: stdin, output: stdout });
+  // Raw mode disables ISIG, so Ctrl-C never becomes a signal here. readline delivers the
+  // ^C byte as this event, and with no listener it only pauses. Exit code 130 is 128+SIGINT.
+  rl.on('SIGINT', () => process.exit(130));
   try {
     const raw = await rl.question('Paste your token here, then press Enter:\n> ');
     return raw.trim();
@@ -65,11 +68,24 @@ async function runLoopbackFlow(pageUrl: string): Promise<string | null> {
 
   info('waiting for the page to send the token (Ctrl+C to fall back to manual paste)…');
 
+  // A SIGINT listener suppresses Node's default termination while it is attached. That is
+  // what turns the Ctrl+C offered above into the manual-paste fallback instead of a killed
+  // CLI. The finally below detaches it, so it covers only this wait.
+  let stopListening = (): void => {};
+  const cancelled = new Promise<null>(resolve => {
+    const onSigint = (): void => resolve(null);
+    process.once('SIGINT', onSigint);
+    stopListening = () => process.removeListener('SIGINT', onSigint);
+  });
+
+  // `close()` below rejects a still-pending wait. Swallow it here so the loser of the race
+  // never becomes an unhandled rejection, which Node turns into a crash.
+  const arrived = loopback.waitForToken(LOOPBACK_TIMEOUT_MS).catch(() => null);
+
   try {
-    return await loopback.waitForToken(LOOPBACK_TIMEOUT_MS);
-  } catch {
-    return null;
+    return await Promise.race([arrived, cancelled]);
   } finally {
+    stopListening();
     loopback.close();
   }
 }

package/src/commands/tag.ts

@@ -56,6 +56,9 @@ async function resolveAppSlug(appArg?: string): Promise<string> {
  */
 export async function promptForTags(appSlug: string, catalog: CatalogEntry[], current: AppTag[]): Promise<string[]> {
   const rl = readline.createInterface({ input: stdin, output: stdout });
+  // Raw mode disables ISIG, so Ctrl-C never becomes a signal here. readline delivers the
+  // ^C byte as this event, and with no listener it only pauses. Exit code 130 is 128+SIGINT.
+  rl.on('SIGINT', () => process.exit(130));
   const selected: string[] = [];
   try {
     info(`Tagging "${appSlug}".`);