@astryxdesign/cli 0.1.7 → 0.1.8-canary.0c4d8d7

package/src/commands/build-theme.mjs

@@ -8,8 +8,8 @@
  * - An updated JS module that references the built className
  *
  * Usage:
- *   npx astryx theme build ./src/themes/ocean.ts
- *   npx astryx theme build ./src/themes/ocean.ts --out ./dist/ocean.css
+ *   astryx theme build ./src/themes/ocean.ts
+ *   astryx theme build ./src/themes/ocean.ts --out ./dist/ocean.css
  */
 
 import * as fs from 'node:fs';
@@ -17,16 +17,15 @@ import * as path from 'node:path';
 import {pathToFileURL, fileURLToPath} from 'node:url';
 import {spawn} from 'node:child_process';
 import {createJiti} from 'jiti';
-import {getRunPrefix} from '../utils/package-manager.mjs';
+import {getCliInvocation} from '../utils/package-manager.mjs';
 import {
   sanitizeName,
   PathSafetyError,
-  isNonInteractive,
 } from '../utils/path-safety.mjs';
 import {jsonOut, humanLog} from '../lib/json.mjs';
 import {cliError} from '../lib/cli-error.mjs';
 import {ERROR_CODES} from '../lib/error-codes.mjs';
-import {themeAdd, listThemes} from '../api/theme-add.mjs';
+import {themeAdd} from '../api/theme-add.mjs';
 
 // Import shared theme processing from core. `astryx theme build` MUST produce the
 // exact same CSS as the `<Theme>` runtime, so it has exactly one generation
@@ -500,7 +499,7 @@ function generateBuiltModule(themeDef, iconInfo) {
     .join('\n');
 
   return `${iconImport}/**
- * ${themeDef.name} theme — built by \`${getRunPrefix()} astryx theme build\`
+ * ${themeDef.name} theme — built by \`${getCliInvocation()} theme build\`
  * Import the CSS file alongside this module:
  *
  *   import { ${toIdentifier(themeDef.name)}Theme } from './${themeDef.name}';
@@ -1130,7 +1129,7 @@ Or with a <link> tag:
         if (t.description) humanLog(`    ${t.description}`);
       }
       humanLog('\nUsage:');
-      humanLog('  astryx theme add <slug> [target-path]   Scaffold a theme file you own\n');
+      humanLog(`  ${getCliInvocation()} theme add <slug> [target-path]   Scaffold a theme file you own\n`);
     });
 
   theme
@@ -1141,32 +1140,9 @@ Or with a <link> tag:
     .action(async (slug, targetPath, options) => {
       const json = program.opts().json || false;
 
-      // Only prompt with a real TTY on stdin — a piped/redirected stdin would
-      // make clack hang. Non-interactive callers fall through to the API's
-      // ERR_FILE_EXISTS guard.
-      const interactive =
-        !json && !isNonInteractive({json}) && Boolean(process.stdin.isTTY);
-      if (slug && !options.list && !options.overwrite && interactive) {
-        const collision = await detectThemeCollision(slug, targetPath);
-        if (collision) {
-          const rel = path.relative(process.cwd(), collision) || collision;
-          const p = await import('@clack/prompts');
-          const confirmed = await p.confirm({
-            message: `Overwrite existing file ${rel}?`,
-            initialValue: false,
-          });
-          if (p.isCancel(confirmed)) {
-            p.cancel('Cancelled.');
-            return;
-          }
-          if (!confirmed) {
-            humanLog('Aborted. Re-run with --overwrite to replace the file.');
-            return;
-          }
-          options.overwrite = true;
-        }
-      }
-
+      // The CLI is non-interactive: never prompt to confirm an overwrite.
+      // Existing files require an explicit --overwrite; otherwise themeAdd's
+      // ERR_FILE_EXISTS guard rejects the write.
       let result;
       try {
         result = await themeAdd(slug, {
@@ -1191,7 +1167,7 @@ Or with a <link> tag:
           if (t.description) humanLog(`    ${t.description}`);
         }
         humanLog('\nUsage:');
-        humanLog('  astryx theme add <slug> [target-path]   Scaffold a theme file you own\n');
+        humanLog(`  ${getCliInvocation()} theme add <slug> [target-path]   Scaffold a theme file you own\n`);
         return;
       }
 
@@ -1219,40 +1195,3 @@ This is your copy of the ${displayName} theme — edit ${entry} to make it your
     });
 }
 
-/**
- * First existing file that scaffolding <slug> into <targetPath> would clobber,
- * or null. Used to prompt before invoking the API; the API re-validates and
- * owns any authoritative error.
- *
- * @param {string} slug
- * @param {string} [targetPath]
- * @returns {Promise<string|null>}
- */
-async function detectThemeCollision(slug, targetPath) {
-  let themes;
-  try {
-    themes = listThemes();
-  } catch {
-    return null;
-  }
-  const match = themes.find(t => t.slug.toLowerCase() === slug.toLowerCase());
-  if (!match) return null;
-
-  const rawTarget = targetPath || path.join('src', 'themes', match.slug);
-  let resolvedDir;
-  try {
-    // Fail soft (null) on traversal; the API surfaces the real error.
-    const {assertWithin} = await import('../utils/path-safety.mjs');
-    resolvedDir = assertWithin(rawTarget, process.cwd(), {
-      label: 'theme target path',
-    });
-  } catch {
-    return null;
-  }
-
-  for (const name of match.files) {
-    const dest = path.join(resolvedDir, name);
-    if (fs.existsSync(dest)) return dest;
-  }
-  return null;
-}

package/src/commands/build.mjs

@@ -15,7 +15,7 @@
  * the whole CLI, use `astryx search <query>` instead.
  */
 
-import {getRunPrefix} from '../utils/package-manager.mjs';
+import {getCliInvocation, formatCliCommand} from '../utils/package-manager.mjs';
 import {jsonOut, humanLog} from '../lib/json.mjs';
 import {cliError} from '../lib/cli-error.mjs';
 import {search as searchApi} from '../api/search.mjs';
@@ -47,25 +47,25 @@ function printPlaybook(run) {
     'How to build a page with Astryx',
     '',
     "1. Find a starting point for what you're building:",
-    `     ${run} astryx build "<what you're building>"`,
+    `     ${run} build "<what you're building>"`,
     '   → returns the closest [page] template, the [block]s that cover parts,',
     '     and the [component]s to fill the gaps, with a "Compose:" suggestion.',
     '',
     '2. If a [page] template matches → scaffold it and adapt:',
-    `     ${run} astryx template <name> [path]`,
+    `     ${run} template <name> [path]`,
     '',
     '3. If nothing matches exactly → compose:',
-    `     ${run} astryx template <name> --skeleton   # study a close page's layout`,
-    `     ${run} astryx template <BlockName>         # drop in each block from the kit`,
-    `     ${run} astryx component <Name>             # fill remaining gaps (read props)`,
+    `     ${run} template <name> --skeleton   # study a close page's layout`,
+    `     ${run} template <BlockName>         # drop in each block from the kit`,
+    `     ${run} component <Name>             # fill remaining gaps (read props)`,
     '',
     '4. Rules (keep it on-system):',
     '   - No <div>/raw HTML for layout — use VStack/HStack/Grid/Stack/Card etc.',
-    '   - No style={{}} — use component props; design tokens via `astryx docs tokens`.',
+    `   - No style={{}} — use component props; design tokens via \`${run} docs tokens\`.`,
     '   - Wrap the app in <Theme theme={...}> and import core reset.css + astryx.css.',
     '',
-    `Tip: \`${run} astryx build "<idea>"\` is the fastest way in. For a neutral`,
-    `lookup of any component/doc/template, use \`${run} astryx search <query>\`.`,
+    `Tip: \`${run} build "<idea>"\` is the fastest way in. For a neutral`,
+    `lookup of any component/doc/template, use \`${run} search <query>\`.`,
     '',
   ];
   for (const l of lines) humanLog(l);
@@ -79,7 +79,7 @@ export function registerBuild(program) {
     .option('--limit <n>', 'Max candidates to draw from (default 60)')
     .option('--detail', 'Verbose output (include import paths and match reason)')
     .action(async (query, options) => {
-      const run = getRunPrefix();
+      const run = getCliInvocation();
       const json = program.opts().json || false;
 
       // No query → print the playbook (the "how to build" skill).
@@ -115,7 +115,7 @@ export function registerBuild(program) {
       if (results.length === 0) {
         humanLog('');
         humanLog(`No matches for "${q}".`);
-        humanLog(`Try a broader term, or browse: ${run} astryx component --list`);
+        humanLog(`Try a broader term, or browse: ${run} component --list`);
         humanLog('');
         return;
       }
@@ -138,7 +138,7 @@ export function registerBuild(program) {
         humanLog('');
         humanLog(`  [${label}] ${display}`);
         if (r.description) humanLog(`          ${r.description}`);
-        humanLog(`          → ${run} ${r.command}`);
+        humanLog(`          → ${formatCliCommand(r.command)}`);
         if (options.detail) {
           if (r.import) humanLog(`          import: ${r.import}`);
           humanLog(`          match: ${r.reason} (score ${r.score})`);
@@ -151,9 +151,9 @@ export function registerBuild(program) {
       // START — the single recommended path.
       humanLog('');
       if (directMatch) {
-        humanLog(`START → Scaffold the \`${pages[0].name}\` page template, then adapt: ${run} astryx template ${pages[0].name} ./src/App.tsx`);
+        humanLog(`START → Scaffold the \`${pages[0].name}\` page template, then adapt: ${run} template ${pages[0].name} ./src/App.tsx`);
       } else if (pages.length) {
-        humanLog(`START → No exact page template. Use \`${pages[0].name}\` as a layout reference (${run} astryx template ${pages[0].name} --skeleton) and compose the pieces below.`);
+        humanLog(`START → No exact page template. Use \`${pages[0].name}\` as a layout reference (${run} template ${pages[0].name} --skeleton) and compose the pieces below.`);
       } else {
         humanLog(`START → No page template fits. Frame with AppShell and compose the blocks + components below.`);
       }
@@ -168,7 +168,7 @@ export function registerBuild(program) {
       // FRAME — always (the page shell).
       humanLog('');
       humanLog(`FRAME — page shell (always): ${FRAME.join(', ')}`);
-      humanLog(`          full-page → AppShell; or Layout + SideNav/TopNav. ${run} astryx component AppShell`);
+      humanLog(`          full-page → AppShell; or Layout + SideNav/TopNav. ${run} component AppShell`);
 
       // BLOCKS — idea-specific composed patterns.
       if (blocks.length) {

package/src/commands/cli-postinstall.test.mjs

@@ -0,0 +1,42 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file Guardrail tests for the @astryxdesign/cli postinstall nudge (layer 2).
+ *
+ * Tests the pure decision matrix (shouldNudge) — nudges for a real dependency
+ * install when not set up; stays quiet in the monorepo/source, during npx's
+ * transient fetch (path _npx or npm_command=exec), and once set up.
+ */
+
+import {describe, it, expect} from 'vitest';
+import {shouldNudge} from '../../scripts/postinstall.mjs';
+
+const DEP = '/proj/node_modules/@astryxdesign/cli/scripts/postinstall.mjs'; // real dep install
+const NPX = '/Users/x/.npm/_npx/a1b2/node_modules/@astryxdesign/cli/scripts/postinstall.mjs';
+const REPO = '/repo/packages/cli/scripts/postinstall.mjs'; // monorepo/source
+
+describe('cli postinstall — shouldNudge', () => {
+  it('nudges for a real dependency install when not set up', () => {
+    expect(shouldNudge({scriptPath: DEP, npmCommand: 'install', isSetUp: false})).toBe(true);
+  });
+
+  it('quiet in the monorepo/source (not under node_modules)', () => {
+    expect(shouldNudge({scriptPath: REPO, npmCommand: 'install', isSetUp: false})).toBe(false);
+  });
+
+  it('quiet during npx transient install (path contains _npx)', () => {
+    expect(shouldNudge({scriptPath: NPX, npmCommand: 'install', isSetUp: false})).toBe(false);
+  });
+
+  it('quiet during npx (npm_command=exec) — avoids double-nudge before init', () => {
+    expect(shouldNudge({scriptPath: DEP, npmCommand: 'exec', isSetUp: false})).toBe(false);
+  });
+
+  it('quiet once the project is already set up', () => {
+    expect(shouldNudge({scriptPath: DEP, npmCommand: 'install', isSetUp: true})).toBe(false);
+  });
+
+  it('quiet with no script path (defensive)', () => {
+    expect(shouldNudge({})).toBe(false);
+  });
+});

package/src/commands/component/index.mjs

@@ -18,7 +18,7 @@ import {
   formatBriefAll,
 } from '../../lib/component-format.mjs';
 import {resolveTheme} from '../../lib/resolve-theme.mjs';
-import {getRunPrefix} from '../../utils/package-manager.mjs';
+import {getCliInvocation} from '../../utils/package-manager.mjs';
 import {jsonOut, humanLog} from '../../lib/json.mjs';
 import {cliError} from '../../lib/cli-error.mjs';
 import {ERROR_CODES} from '../../lib/error-codes.mjs';
@@ -39,7 +39,7 @@ export function registerComponent(program) {
     .option('--blocks', 'List example blocks: showcase, examples, and related')
     .option('--package <name>', 'Scope lookup to an external package (e.g. @acme/xds-widgets)')
     .action(async (name, options) => {
-      const run = getRunPrefix();
+      const run = getCliInvocation();
       const zh = program.opts().zh || false;
       const dense = program.opts().dense || false;
       const lang = program.opts().lang || null;
@@ -142,7 +142,7 @@ export function registerComponent(program) {
             }
             humanLog('');
             humanLog(`Import from the path shown (e.g. import {Button} from '@astryxdesign/core/Button')`);
-            humanLog(`Usage: ${run} astryx component <name>`);
+            humanLog(`Usage: ${run} component <name>`);
             humanLog('');
           }
           break;
@@ -165,7 +165,7 @@ export function registerComponent(program) {
             humanLog('');
           }
           humanLog(`Import from the path shown (e.g. import {Button} from '@astryxdesign/core/Button')`);
-          humanLog(`Usage: ${run} astryx component <name>`);
+          humanLog(`Usage: ${run} component <name>`);
           humanLog('');
           break;
         }

package/src/commands/discover.mjs

@@ -14,6 +14,7 @@ import {formatFull, formatBrief, formatCompact} from '../lib/component-format.mj
 import {jsonOut, humanLog} from '../lib/json.mjs';
 import {cliError} from '../lib/cli-error.mjs';
 import {discover as discoverApi} from '../api/discover.mjs';
+import {getCliInvocation} from '../utils/package-manager.mjs';
 
 export function registerDiscover(program) {
   program
@@ -25,6 +26,7 @@ export function registerDiscover(program) {
       const json = program.opts().json || false;
       const lang = program.opts().lang || null;
       const zh = program.opts().zh || false;
+      const run = getCliInvocation();
 
       let result;
       try {
@@ -80,9 +82,9 @@ export function registerDiscover(program) {
               humanLog('');
             }
             humanLog('Usage:');
-            humanLog('  astryx discover <package>            Browse a package');
-            humanLog('  astryx discover <package>/Component  View component docs');
-            humanLog('  astryx discover <search>             Search all packages');
+            humanLog(`  ${run} discover <package>            Browse a package`);
+            humanLog(`  ${run} discover <package>/Component  View component docs`);
+            humanLog(`  ${run} discover <search>             Search all packages`);
             humanLog('');
           }
           break;
@@ -99,7 +101,7 @@ export function registerDiscover(program) {
           humanLog('');
           for (const comp of result.data.components) humanLog('  ' + comp);
           humanLog('');
-          humanLog('Usage: astryx discover ' + result.data.name + '/<ComponentName>');
+          humanLog(`Usage: ${run} discover ` + result.data.name + '/<ComponentName>');
           humanLog('');
           break;
         }
@@ -122,7 +124,7 @@ export function registerDiscover(program) {
           humanLog('Found ' + result.data.matches.length + ' matches for "' + result.data.query + '":');
           humanLog('');
           for (const m of result.data.matches) {
-            humanLog('  astryx discover ' + m.package + '/' + m.component);
+            humanLog(`  ${run} discover ` + m.package + '/' + m.component);
           }
           humanLog('');
           break;

package/src/commands/docs.mjs

@@ -12,7 +12,7 @@
  *   astryx docs <topic> <section>        Print one section
  */
 
-import {getRunPrefix} from '../utils/package-manager.mjs';
+import {getCliInvocation} from '../utils/package-manager.mjs';
 import {jsonOut, humanLog} from '../lib/json.mjs';
 import {cliError} from '../lib/cli-error.mjs';
 import {docs as docsApi} from '../api/docs.mjs';
@@ -105,7 +105,7 @@ export function registerDocs(program) {
     .command('docs [topic] [section]')
     .description('Print reference docs')
     .action(async (topic, section) => {
-      const run = getRunPrefix();
+      const run = getCliInvocation();
       const lang = program.opts().lang || null;
       const zh = program.opts().zh || false;
       const dense = program.opts().dense || false;
@@ -130,8 +130,8 @@ export function registerDocs(program) {
           for (const entry of result.data) {
             humanLog(`  ${entry.topic.padEnd(14)} ${entry.description}`);
           }
-          humanLog(`\nUsage: ${run} astryx docs <topic>`);
-          humanLog(`       ${run} astryx docs <topic> <section>\n`);
+          humanLog(`\nUsage: ${run} docs <topic>`);
+          humanLog(`       ${run} docs <topic> <section>\n`);
           break;
         }
 

package/src/commands/hook/index.mjs

@@ -12,7 +12,7 @@ import {
   formatHookBrief,
   formatHookParams,
 } from '../../lib/hook-format.mjs';
-import {getRunPrefix} from '../../utils/package-manager.mjs';
+import {getCliInvocation} from '../../utils/package-manager.mjs';
 import {jsonOut, humanLog} from '../../lib/json.mjs';
 import {cliError} from '../../lib/cli-error.mjs';
 import {ERROR_CODES} from '../../lib/error-codes.mjs';
@@ -27,7 +27,7 @@ export function registerHook(program) {
     .option('--category <category>', 'List hooks in a specific category')
     .option('--params', 'Print only the parameters table')
     .action(async (name, options) => {
-      const run = getRunPrefix();
+      const run = getCliInvocation();
       const zh = program.opts().zh || false;
       const lang = program.opts().lang || null;
       const detailSource = program.getOptionValueSource('detail');
@@ -76,7 +76,7 @@ export function registerHook(program) {
               for (const h of hookNames) humanLog(`  ${h}`);
             }
             humanLog('');
-            humanLog(`Usage: ${run} astryx hook <name>`);
+            humanLog(`Usage: ${run} hook <name>`);
             humanLog('');
           }
           break;
@@ -93,7 +93,7 @@ export function registerHook(program) {
             }
             humanLog('');
           }
-          humanLog(`Usage: ${run} astryx hook <name>`);
+          humanLog(`Usage: ${run} hook <name>`);
           humanLog('');
           break;
         }