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

package/src/commands/init.mjs

@@ -1,33 +1,33 @@
 // Copyright (c) Meta Platforms, Inc. and affiliates.
 
 /**
- * @file init command — Interactive initialization wizard + feature installer
+ * @file init command — non-interactive setup + feature installer
  *
- * Interactive: `astryx init` walks through all features
- * Non-interactive: `astryx init --features agents,theme,template`
+ * `astryx init` is non-interactive by default: it installs the AGENTS.md/
+ * CLAUDE.md cheat sheet with NO prompts, so it behaves identically for humans,
+ * AI agents, CI, and piped I/O — it never hangs or errors on a missing TTY.
+ * Non-interactive feature install: `astryx init --features agents,theme,template`
  * Re-runnable: safe to run multiple times, idempotent
  *
  * Features:
  *   agents   — Install AGENTS.md/CLAUDE.md cheat sheet for AI coding agents
- *   theme    — Scaffold a custom theme file
+ *   theme    — Point to the theme workflow (`astryx theme`)
  *   template — Copy a starter page template
  */
 
-import * as p from '@clack/prompts';
 import * as path from 'node:path';
 import * as fs from 'node:fs';
 import {CLI_ROOT} from '../utils/paths.mjs';
 import {PathSafetyError} from '../utils/path-safety.mjs';
-import {getRunPrefix} from '../utils/package-manager.mjs';
+import {getCliInvocation} from '../utils/package-manager.mjs';
 import {installAgentDocs, removeAgentDocs} from './agent-docs.mjs';
 import {listTemplates} from './template.mjs';
 import {humanLog} from '../lib/json.mjs';
 import {cliError} from '../lib/cli-error.mjs';
 import {ERROR_CODES} from '../lib/error-codes.mjs';
-import {requireInteractive} from '../utils/interactive.mjs';
 
 const VALID_FEATURES = ['agents', 'theme', 'template'];
-const run = getRunPrefix();
+const run = getCliInvocation();
 
 /**
  * Build the "Next steps" lines printed at the end of `astryx init`.
@@ -40,10 +40,10 @@ const run = getRunPrefix();
  *
  * Exported for testing.
  *
- * @param {string} runPrefix package-manager run prefix (e.g. `npx`)
+ * @param {string} invocation install-aware CLI invocation stem (e.g. `npx astryx`, `pnpm exec astryx`, or `npx @astryxdesign/cli` for one-off runs)
  * @returns {string[]} ordered list of human-facing lines
  */
-export function getNextSteps(runPrefix) {
+export function getNextSteps(invocation) {
   return [
     '',
     '  Next steps:',
@@ -54,23 +54,15 @@ export function getNextSteps(runPrefix) {
     "       import { neutralTheme } from '@astryxdesign/theme-neutral/built'",
     "       import '@astryxdesign/theme-neutral/theme.css'",
     '       <Theme theme={neutralTheme}>...</Theme>',
-    `       For custom themes, run \`${runPrefix} astryx theme build <file>\` to generate the built artifacts.`,
-    `    4. ${runPrefix} astryx --help for all commands`,
+    `       For custom themes, run \`${invocation} theme build <file>\` to generate the built artifacts.`,
+    `    4. ${invocation} --help for all commands`,
     '',
   ];
 }
 
-function isCancel(value) {
-  if (p.isCancel(value)) {
-    p.cancel('Setup cancelled.');
-    process.exit(0);
-  }
-  return value;
-}
-
 // ─── Feature: agents ─────────────────────────────────────────────────────────
 
-function runAgents(targetDir, {interactive = true, agent, agentDocsPath} = {}) {
+function runAgents(targetDir, {agent, agentDocsPath} = {}) {
   try {
     const paths = agentDocsPath
       ? Array.isArray(agentDocsPath)
@@ -79,114 +71,55 @@ function runAgents(targetDir, {interactive = true, agent, agentDocsPath} = {}) {
       : undefined;
     const written = installAgentDocs(targetDir, {agent, paths});
     const summary = written.join(', ');
-    if (interactive) {
-      p.log.success(`AI agent docs installed → ${summary}`);
-    } else {
-      humanLog(`✓ AI agent docs installed → ${summary}`);
-    }
+    humanLog(`✓ AI agent docs installed → ${summary}`);
   } catch (err) {
     // PathSafetyError carries a precise, user-actionable message —
     // surface it instead of the generic "could not install" warning so
     // misconfigured --agent-docs-path values aren't silently swallowed.
     if (err instanceof PathSafetyError) {
-      const msg = `Error: ${err.message}`;
-      if (interactive) {
-        p.log.error(msg);
-      } else {
-        console.error(msg);
-      }
+      console.error(`Error: ${err.message}`);
       process.exitCode = 1;
       return;
     }
-    const msg = `Could not install agent docs. Try again with \`${run} astryx init --features agents\`.`;
-    if (interactive) {
-      p.log.warning(msg);
-    } else {
-      console.error(msg);
-    }
+    console.error(`Could not install agent docs. Try again with \`${run} init --features agents\`.`);
   }
 }
 
 // ─── Feature: theme ──────────────────────────────────────────────────────────
 
-async function runTheme({interactive = true} = {}) {
-  if (!interactive) {
-    humanLog(`✓ Theme scaffolding requires interactive mode. Run \`${run} astryx theme\` instead.`);
-    return;
-  }
-
-  p.note(
-    'Create a custom theme with your brand colors.\n' +
-    `Run \`${run} astryx theme\` for the full theme wizard.\n` +
-    `Run \`${run} astryx theme --list\` to see existing themes.`,
-    'Themes',
-  );
+function runTheme() {
+  humanLog(`✓ For a custom theme, run \`${run} theme\` (browse) or \`${run} theme add <slug>\` (scaffold).`);
 }
 
 // ─── Feature: template ───────────────────────────────────────────────────────
 
-async function runTemplate(targetDir, {interactive = true, templateName} = {}) {
+function runTemplate(targetDir, {templateName} = {}) {
   const templates = listTemplates();
   if (templates.length === 0) return;
 
-  if (!interactive) {
-    if (!templateName) {
-      // Point agents at the build workflow rather than dumping page-template
-      // names — `build` surfaces pages AND blocks AND components for an idea,
-      // and `build` with no args is the full how-to-build playbook.
-      humanLog('✓ To build UI, use these commands:');
-      humanLog('');
-      humanLog(`    ${run} astryx build "<what you're building>"   build a page — kit: closest template + blocks + components`);
-      humanLog(`    ${run} astryx build                            the how-to-build workflow (read this first)`);
-      humanLog(`    ${run} astryx search <query>                   find anything — components, docs, templates, blocks`);
-      humanLog('');
-      return;
-    }
-
-    if (!templates.includes(templateName)) {
-      cliError(`Unknown template "${templateName}". Available: ${templates.join(', ')}`, {code: ERROR_CODES.ERR_UNKNOWN_TEMPLATE});
-      return;
-    }
-
-    const outputDir = path.resolve(targetDir, `./src/pages/${templateName}`);
-    const srcPath = path.join(CLI_ROOT, 'templates', 'pages', templateName, 'page.tsx');
-    fs.mkdirSync(outputDir, {recursive: true});
-    fs.copyFileSync(srcPath, path.join(outputDir, 'page.tsx'));
-    humanLog(`✓ Template created at ${path.relative(targetDir, outputDir)}/page.tsx`);
+  if (!templateName) {
+    // Point agents at the build workflow rather than dumping page-template
+    // names — `build` surfaces pages AND blocks AND components for an idea,
+    // and `build` with no args is the full how-to-build playbook.
+    humanLog('✓ To build UI, use these commands:');
+    humanLog('');
+    humanLog(`    ${run} build "<what you're building>"   build a page — kit: closest template + blocks + components`);
+    humanLog(`    ${run} build                            the how-to-build workflow (read this first)`);
+    humanLog(`    ${run} search <query>                   find anything — components, docs, templates, blocks`);
+    humanLog('');
     return;
   }
 
-  const TEMPLATE_OPTIONS = [
-    {value: 'skip', label: 'Skip — No template'},
-    {value: 'blank', label: 'Blank Page — Minimal scaffold'},
-    {value: 'table', label: 'Table Page — Data table with actions'},
-    {value: 'login', label: 'Login Page — Auth form with inputs'},
-  ];
-
-  const templateChoice = isCancel(
-    await p.select({
-      message: 'Start with a page template?',
-      options: TEMPLATE_OPTIONS,
-    }),
-  );
-
-  if (templateChoice === 'skip') return;
-
-  const targetPath = isCancel(
-    await p.text({
-      message: 'Where should the template be created?',
-      initialValue: `./src/pages/${templateChoice}`,
-      placeholder: `./src/pages/${templateChoice}`,
-    }),
-  );
-
-  const outputDir = path.resolve(targetDir, targetPath);
-  const srcPath = path.join(CLI_ROOT, 'templates', 'pages', templateChoice, 'page.tsx');
+  if (!templates.includes(templateName)) {
+    cliError(`Unknown template "${templateName}". Available: ${templates.join(', ')}`, {code: ERROR_CODES.ERR_UNKNOWN_TEMPLATE});
+    return;
+  }
 
+  const outputDir = path.resolve(targetDir, `./src/pages/${templateName}`);
+  const srcPath = path.join(CLI_ROOT, 'templates', 'pages', templateName, 'page.tsx');
   fs.mkdirSync(outputDir, {recursive: true});
   fs.copyFileSync(srcPath, path.join(outputDir, 'page.tsx'));
-
-  p.log.success(`Template created at ${path.relative(targetDir, outputDir)}/page.tsx`);
+  humanLog(`✓ Template created at ${path.relative(targetDir, outputDir)}/page.tsx`);
 }
 
 // ─── Command ─────────────────────────────────────────────────────────────────
@@ -200,7 +133,7 @@ export function registerInit(program) {
     .option('--remove-agents', 'Remove AI agent docs from all agent doc files')
     .option('--agent <tool>', 'Target AI tool for agent docs: claude, cursor, codex, hermes, all')
     .option('--agent-docs-path <path...>', 'Explicit file path(s) for agent docs')
-    .action(async (options) => {
+    .action((options) => {
       const targetDir = process.cwd();
 
       // Remove mode
@@ -224,62 +157,25 @@ export function registerInit(program) {
 
         for (const feature of features) {
           if (feature === 'agents') runAgents(targetDir, {
-            interactive: false,
             agent: options.agent,
             agentDocsPath: options.agentDocsPath,
           });
-          if (feature === 'theme') await runTheme({interactive: false});
-          if (feature === 'template') await runTemplate(targetDir, {interactive: false});
+          if (feature === 'theme') runTheme();
+          if (feature === 'template') runTemplate(targetDir, {});
         }
         return;
       }
 
-      // Interactive wizard
-      //
-      // Guard: this wizard blocks on prompts. In a non-interactive context
-      // (CI, piped stdin/stdout, no TTY) it would hang forever. Fail fast
-      // with actionable guidance via the shared interactivity contract.
-      requireInteractive({
-        command: 'init',
-        hint: `\`${run} astryx init --all\` or \`--features agents,theme,template\``,
+      // No flags: TTY-free default. `astryx init` installs the AI agent cheat
+      // sheet with NO prompts, so it behaves identically for humans, agents, CI,
+      // and piped I/O — it never hangs or errors on a missing TTY. (A guided
+      // `--interactive` setup may return later as an explicit opt-in.)
+      runAgents(targetDir, {
+        agent: options.agent,
+        agentDocsPath: options.agentDocsPath,
       });
-
-      p.intro('Welcome to the design system');
-
-      p.note(
-        'A design system for building internal tools\nwith 300+ React components.',
-        'About',
-      );
-
-      // Feature: agents
-      const shouldInstallAgents = isCancel(
-        await p.confirm({
-          message: 'Install AI agent support? (adds a design system cheat sheet to AGENTS.md)',
-          initialValue: true,
-        }),
-      );
-
-      if (shouldInstallAgents) {
-        const s = p.spinner();
-        s.start('Installing agent docs');
-        runAgents(targetDir);
-        s.stop('Done');
-      }
-
-      // Feature: swizzle awareness
-      p.note(
-        `You can customize any component with:\n  ${run} astryx swizzle Button\n  ${run} astryx swizzle --list`,
-        'Component Customization',
-      );
-
-      // Feature: template
-      await runTemplate(targetDir);
-
-      // Feature: theme awareness
-      await runTheme();
-
-      // Outro
-      p.outro('Design system initialized!');
+      humanLog('');
+      humanLog(`  Tip: \`${run} init --all\` also points you to the theme and page-building workflows.`);
 
       for (const line of getNextSteps(run)) {
         humanLog(line);

package/src/commands/init.next-steps.test.mjs

@@ -23,7 +23,7 @@ import {describe, it, expect} from 'vitest';
 import {getNextSteps} from './init.mjs';
 
 describe('init Next steps theme guidance', () => {
-  const text = getNextSteps('npx').join('\n');
+  const text = getNextSteps('npx astryx').join('\n');
 
   it('mentions the base CSS imports so the app is not left unstyled', () => {
     expect(text).toContain("'@astryxdesign/core/reset.css'");

package/src/commands/interactive-guard.test.mjs

@@ -1,15 +1,13 @@
 // Copyright (c) Meta Platforms, Inc. and affiliates.
 
 /**
- * @file Subprocess no-hang tests for the interactivity contract.
+ * @file Subprocess no-hang tests for `astryx init`.
  *
- * The wizard command `init` blocks on @clack/prompts. In a
- * non-interactive context it must fail fast (exit 1) instead of hanging.
- * These tests spawn the CLI as a real subprocess with stdin/stdout NOT a TTY
- * (stdio 'ignore'/'pipe'), which is exactly the CI / piped condition. If the
- * guard were missing, spawnSync would hit the timeout (signal SIGTERM,
- * status null) — so asserting `signal === null && status === 1` proves the
- * process exited cleanly rather than hanging.
+ * TTY was removed from the CLI: `init` is non-interactive by default and must
+ * run cleanly (exit 0, writing the agent cheat sheet) instead of hanging on a
+ * prompt. These tests spawn the CLI with stdin/stdout NOT a TTY (the CI / piped
+ * / agent condition). A hang would show as signal SIGTERM + status null; we
+ * assert `signal === null && status === 0` to prove it exits cleanly and works.
  */
 
 import {describe, it, expect, beforeEach, afterEach} from 'vitest';
@@ -42,25 +40,24 @@ afterEach(() => {
   fs.rmSync(tmpDir, {recursive: true, force: true});
 });
 
-describe('init non-interactive safety', () => {
-  it('fails fast (exit 1, no hang) and writes no files', () => {
+describe('init is non-interactive by default (no TTY needed)', () => {
+  it('runs cleanly (exit 0, no hang) and writes agent docs', () => {
     const r = runCli(['init']);
-    expect(r.signal).toBeNull();
-    expect(r.status).toBe(1);
-    expect(fs.readdirSync(tmpDir)).toEqual([]);
+    expect(r.signal).toBeNull(); // did not hang
+    expect(r.status).toBe(0); // succeeded without a TTY
+    expect(fs.readdirSync(tmpDir).length).toBeGreaterThan(0); // wrote the cheat sheet
   });
 
-  it('prints actionable guidance (--all / --features)', () => {
-    const out = (() => {
-      const r = runCli(['init']);
-      return r.stderr + r.stdout;
-    })();
-    expect(out).toMatch(/requires a TTY/i);
-    expect(out).toMatch(/--all/);
-    expect(out).toMatch(/--features/);
+  it('writes an agent-doc file containing the ASTRYX cheat-sheet marker', () => {
+    runCli(['init']);
+    // init injects into existing agent-doc files if present, else creates AGENTS.md
+    const candidates = ['AGENTS.md', 'CLAUDE.md', '.cursorrules', path.join('.claude', 'CLAUDE.md')];
+    const doc = candidates.find(f => fs.existsSync(path.join(tmpDir, f)));
+    expect(doc).toBeTruthy();
+    expect(fs.readFileSync(path.join(tmpDir, doc), 'utf8')).toMatch(/ASTRYX:START/);
   });
 
-  it('still runs --features agents non-interactively (guard does not over-catch)', () => {
+  it('still runs --features agents non-interactively', () => {
     const r = runCli(['init', '--features', 'agents']);
     expect(r.signal).toBeNull();
     expect(r.status).toBe(0);

package/src/commands/json-contract.test.mjs

@@ -45,7 +45,7 @@ function runCli(args, {cwd} = {}) {
 
 function parseJson(stdout) {
   // CLI emits a single JSON document. If anything else snuck onto stdout
-  // (clack output, console.log strings, etc.) JSON.parse will throw —
+  // (log output, console.log strings, etc.) JSON.parse will throw —
   // which is exactly the failure mode we want to catch in tests.
   return JSON.parse(stdout);
 }
@@ -61,7 +61,7 @@ afterEach(() => {
 });
 
 describe('--json contract: rejects before side effects', () => {
-  it('astryx init --json --features agents does not write .claude/CLAUDE.md', () => {
+  it('astryx init --json --features agents does not write agent docs', () => {
     const before = fs.readdirSync(tmpDir);
     expect(before).toEqual([]);
 

package/src/commands/layout.mjs

@@ -20,7 +20,7 @@ import {layoutExpand, layoutCheck, layoutGrammar} from '../api/layout.mjs';
 /** Resolve the expression from arg, --file, or stdin ('-'). */
 async function readExpression(expr, options) {
   if (options.file) return fs.readFileSync(options.file, 'utf-8');
-  if (expr === '-' || (!expr && !process.stdin.isTTY)) {
+  if (expr === '-') {
     const chunks = [];
     for await (const chunk of process.stdin) chunks.push(chunk);
     return Buffer.concat(chunks).toString('utf-8');

package/src/commands/search.mjs

@@ -16,7 +16,7 @@
  *   astryx search button --json          Typed JSON envelope
  */
 
-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, SEARCH_DOMAINS} from '../api/search.mjs';
@@ -63,7 +63,7 @@ export function registerSearch(program) {
       if (json) return jsonOut(result.type, result.data);
 
       // ── Text output ──────────────────────────────────────────────
-      const run = getRunPrefix();
+      const run = getCliInvocation();
       const {query: q, results} = result.data;
 
       // No matches is a valid, successful outcome — clean message, exit 0.
@@ -71,7 +71,7 @@ export function registerSearch(program) {
         humanLog('');
         humanLog(`No results for "${q}".`);
         humanLog('');
-        humanLog(`Try a broader term, or browse: ${run} astryx component --list`);
+        humanLog(`Try a broader term, or browse: ${run} component --list`);
         humanLog('');
         return;
       }
@@ -86,7 +86,7 @@ export function registerSearch(program) {
         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})`);

package/src/commands/setup-nudge.test.mjs

@@ -0,0 +1,108 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file Guardrail tests — the centralized setup check + enforcement layer 3.
+ *
+ * Unit: isAstryxInitialized() detects the Astryx marker across EVERY agent-doc
+ * location (including the previously-missed Hermes files) and legacy XDS blocks.
+ *
+ * Integration: the CLI nudges (stderr) before a command when the project hasn't
+ * run init — INCLUDING in --json mode (agents pass --json, and stderr never
+ * corrupts the stdout JSON envelope). Quiet once set up, outside a project, and
+ * for the installer command itself.
+ */
+
+import {describe, it, expect, beforeEach, afterEach} from 'vitest';
+import {spawnSync} from 'node:child_process';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import {fileURLToPath} from 'node:url';
+import {isAstryxInitialized} from './agent-docs.mjs';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const CLI = path.resolve(__dirname, '..', '..', 'bin', 'astryx.mjs');
+const MARKER = '<!-- ASTRYX:START -->';
+const NUDGE = /finish setup and install the Astryx agent prompt/;
+
+let tmp;
+beforeEach(() => {
+  tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'astryx-setup-nudge-'));
+});
+afterEach(() => {
+  fs.rmSync(tmp, {recursive: true, force: true});
+});
+
+function write(rel, body) {
+  const p = path.join(tmp, rel);
+  fs.mkdirSync(path.dirname(p), {recursive: true});
+  fs.writeFileSync(p, body);
+}
+
+function run(args, cwd = tmp) {
+  return spawnSync(process.execPath, [CLI, ...args], {
+    cwd,
+    encoding: 'utf8',
+    timeout: 30_000,
+    env: {...process.env, FORCE_COLOR: '0'},
+  });
+}
+
+describe('isAstryxInitialized — centralized setup check (one place)', () => {
+  it('is false in an empty project', () => {
+    expect(isAstryxInitialized(tmp)).toBe(false);
+  });
+
+  // Covers EVERY location a preset can write — .hermes.md/HERMES.md were the gap.
+  it.each(['AGENTS.md', 'CLAUDE.md', '.claude/CLAUDE.md', '.cursorrules', '.hermes.md', 'HERMES.md'])(
+    'detects the marker in %s',
+    file => {
+      write(file, `# doc\n${MARKER}\nbody`);
+      expect(isAstryxInitialized(tmp)).toBe(true);
+    },
+  );
+
+  it('detects the legacy XDS marker for back-compat', () => {
+    write('AGENTS.md', '<!-- XDS:START -->');
+    expect(isAstryxInitialized(tmp)).toBe(true);
+  });
+
+  it('is false when a doc file exists WITHOUT the marker', () => {
+    write('AGENTS.md', 'project notes, no astryx block');
+    expect(isAstryxInitialized(tmp)).toBe(false);
+  });
+});
+
+describe('enforcement layer 3 — per-command setup nudge', () => {
+  const asProject = () => write('package.json', '{"name":"t"}');
+
+  it('nudges on stderr after a command when not set up', () => {
+    asProject();
+    const r = run(['docs', 'tokens']);
+    expect(r.stderr).toMatch(NUDGE);
+  });
+
+  it('is suppressed in --json (machine mode stays clean), stdout valid JSON', () => {
+    asProject();
+    const r = run(['--json', 'docs', 'tokens']);
+    // --json is machine output with a clean stdout+stderr contract; the human
+    // nudge must NOT leak into it (json-shim: error envelopes have empty stderr).
+    expect(r.stderr).not.toMatch(NUDGE);
+    expect(() => JSON.parse(r.stdout)).not.toThrow();
+  });
+
+  it('is quiet once set up (marker present)', () => {
+    asProject();
+    write('AGENTS.md', MARKER);
+    expect(run(['docs', 'tokens']).stderr).not.toMatch(NUDGE);
+  });
+
+  it('is quiet outside a project (no package.json)', () => {
+    expect(run(['docs', 'tokens']).stderr).not.toMatch(NUDGE);
+  });
+
+  it('does not nudge for the installer command itself', () => {
+    asProject();
+    expect(run(['init']).stderr).not.toMatch(NUDGE);
+  });
+});

package/src/commands/swizzle.mjs

@@ -15,18 +15,16 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import * as p from '@clack/prompts';
 import {findCoreDir, listComponents} from '../utils/paths.mjs';
 import {
   assertWithin,
   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 {checkGhCli} from '../utils/github.mjs';
-import {getRunPrefix} from '../utils/package-manager.mjs';
+import {getCliInvocation} from '../utils/package-manager.mjs';
 import {Project} from '../lib/project.mjs';
 import {
   CORE_PACKAGE,
@@ -99,14 +97,6 @@ function buildFeedback(component, issuesUrl) {
   return feedback;
 }
 
-function isCancel(value) {
-  if (p.isCancel(value)) {
-    p.cancel('Cancelled.');
-    process.exit(0);
-  }
-  return value;
-}
-
 /**
  * Load the configured integrations + core issues URL for `cwd`, swallowing any
  * config errors so swizzle never hard-fails on a malformed/absent config. An
@@ -190,6 +180,7 @@ export function registerSwizzle(program) {
     .action(async (component, options) => {
       const coreDir = findCoreDir(process.cwd());
       const json = program.opts().json || false;
+      const run = getCliInvocation();
 
       if (!coreDir) {
         cliError(
@@ -207,10 +198,10 @@ export function registerSwizzle(program) {
         for (const name of components) {
           humanLog(`  ${name}`);
         }
-        humanLog(`\nUsage: astryx swizzle <component>\n`);
-        humanLog('Example: astryx swizzle Button');
+        humanLog(`\nUsage: ${run} swizzle <component>\n`);
+        humanLog(`Example: ${run} swizzle Button`);
         humanLog(
-          '         astryx swizzle XDSButton  (XDS prefix also works)\n',
+          `         ${run} swizzle XDSButton  (XDS prefix also works)\n`,
         );
         return;
       }
@@ -314,25 +305,11 @@ export function registerSwizzle(program) {
 
       if (existingFiles.length > 0 && !options.overwrite) {
         const relOutputForMsg = path.relative(process.cwd(), outputDir) || '.';
-        if (json || isNonInteractive({json})) {
-          const msg =
-            `Refusing to overwrite ${existingFiles.length} existing file(s) in ${relOutputForMsg}/. ` +
-            `Re-run with --overwrite (or -f) to replace them.`;
-          cliError(msg, {code: ERROR_CODES.ERR_FILE_EXISTS});
-          return;
-        }
-        const confirmed = isCancel(
-          await p.confirm({
-            message:
-              `Overwrite ${existingFiles.length} existing file(s) in ${relOutputForMsg}/? ` +
-              `(${existingFiles.slice(0, 3).join(', ')}${existingFiles.length > 3 ? ', …' : ''})`,
-            initialValue: false,
-          }),
-        );
-        if (!confirmed) {
-          humanLog('Aborted. Re-run with --overwrite to replace files.');
-          return;
-        }
+        const msg =
+          `Refusing to overwrite ${existingFiles.length} existing file(s) in ${relOutputForMsg}/. ` +
+          `Re-run with --overwrite (or -f) to replace them.`;
+        cliError(msg, {code: ERROR_CODES.ERR_FILE_EXISTS});
+        return;
       }
 
       fs.mkdirSync(outputDir, {recursive: true});
@@ -381,7 +358,7 @@ export function registerSwizzle(program) {
       const feedback = buildFeedback(dirName, owner.issuesUrl);
 
       if (json) {
-        /** @type {Record<string, unknown>} */
+        /** @type {import('../types/swizzle').SwizzleCopyResponse['data']} */
         const payload = {
           component: dirName,
           package: owner.package,
@@ -411,7 +388,7 @@ export function registerSwizzle(program) {
         humanLog(
           '  Without one they render unstyled (no error). See setup per framework:',
         );
-        humanLog(`  ${getRunPrefix()} astryx docs styling`);
+        humanLog(`  ${run} docs styling`);
         humanLog(
           '  Next.js note: the StyleX Babel plugin disables SWC and breaks next/font —',
         );