@emeryld/manager 0.5.0 → 0.5.1

package/dist/create-package/index.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { stdin as input } from 'node:process';
 import { askLine, promptSingleKey } from '../prompts.js';
 import { colors, logGlobal } from '../utils/log.js';
+import { runHelperCli } from '../helper-cli.js';
 import { loadPackages } from '../packages.js';
 import { SCRIPT_DESCRIPTIONS, workspaceRoot, ensureWorkspaceToolingFiles, } from './shared.js';
 import { clientVariant } from './variants/client.js';
@@ -25,6 +26,36 @@ function derivePackageName(targetDir) {
     const base = path.basename(targetDir) || 'rrr-package';
     return base;
 }
+async function promptForContractNameWithHelper(title, options) {
+    let selection;
+    const scripts = options.map((opt) => ({
+        name: opt.label,
+        description: opt.meta ?? '',
+        emoji: '📦',
+        handler: () => {
+            selection = opt.value;
+        },
+    }));
+    scripts.push({
+        name: 'Enter manually',
+        emoji: '⌨️',
+        description: 'Type a contract package name',
+        handler: async () => {
+            const manual = await askLine('Contract package name (e.g. @scope/contract): ');
+            selection = manual.trim() || undefined;
+        },
+    });
+    scripts.push({
+        name: 'Skip (no contract)',
+        emoji: '⏭️',
+        description: 'Continue without a contract dependency',
+        handler: () => {
+            selection = undefined;
+        },
+    });
+    await runHelperCli({ title, scripts, argv: [] });
+    return selection;
+}
 async function promptForContractName() {
     let packages = [];
     try {
@@ -34,39 +65,18 @@ async function promptForContractName() {
         const message = error instanceof Error ? error.message : 'unknown error discovering packages';
         logGlobal(`Could not auto-discover packages (${message}).`, colors.yellow);
     }
-    const candidates = packages
+    const contractOptions = packages
         .filter((pkg) => pkg.relativeDir !== '.')
-        .map((pkg, index) => ({
-        label: `${pkg.name}${pkg.relativeDir ? colors.dim(` (${pkg.relativeDir})`) : ''}`,
+        .map((pkg) => ({
         value: pkg.name,
-        index,
+        label: pkg.name,
+        meta: pkg.relativeDir,
     }));
-    if (candidates.length === 0) {
+    if (contractOptions.length === 0) {
         const manual = await askLine('Contract package name? (Enter to skip, e.g. @scope/contract): ');
         return manual.trim() || undefined;
     }
-    console.log(colors.magenta('Select a contract package (or skip):'));
-    candidates.forEach((opt, idx) => {
-        const prefix = colors.cyan(String(idx + 1).padStart(2, ' '));
-        console.log(`  [${prefix}] ${opt.label}`);
-    });
-    console.log(`  [${colors.cyan('m ')}] Enter manually`);
-    console.log(`  [${colors.cyan('s ')}] Skip (no contract)`);
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-        const choice = (await askLine('Choice: ')).trim().toLowerCase();
-        if (!choice || choice === 's')
-            return undefined;
-        if (choice === 'm') {
-            const manual = await askLine('Contract package name (e.g. @scope/contract): ');
-            return manual.trim() || undefined;
-        }
-        const idx = Number.parseInt(choice, 10);
-        if (Number.isInteger(idx) && idx >= 1 && idx <= candidates.length) {
-            return candidates[idx - 1].value;
-        }
-        console.log(colors.yellow('Enter a number, "m" to type a name, or "s" to skip.'));
-    }
+    return promptForContractNameWithHelper('Select a contract package (or skip)', contractOptions);
 }
 function resolveVariant(key) {
     if (!key)

package/dist/create-package/variants/docker.js

@@ -149,49 +149,21 @@ import { readFile } from 'node:fs/promises'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { Docker } from 'docker-cli-js'
+import { runHelperCli } from '@emeryld/manager/dist/helper-cli.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
-const pkgRaw = await readFile(path.join(__dirname, '..', 'package.json'), 'utf8')
+const pkgRoot = path.join(__dirname, '..')
+const pkgRaw = await readFile(path.join(pkgRoot, 'package.json'), 'utf8')
 const pkg = JSON.parse(pkgRaw) as { name?: string }
 const image = \`\${pkg.name ?? '${pkgName}'}:latest\`
 const container =
-  (pkg.name ?? '${pkgName}').replace(/[^a-z0-9]/gi, '-').replace(/^-+|-+$/g, '') || 'rrr-service'
+  (pkg.name ?? '${pkgName}')
+    .replace(/[^a-z0-9]/gi, '-')
+    .replace(/^-+|-+$/g, '') || 'rrr-service'
 const port = process.env.PORT ?? '3000'
 const docker = new Docker({ spawnOptions: { stdio: 'inherit' } })
 
-async function main() {
-  const [command = 'help'] = process.argv.slice(2)
-  if (command === 'help') return printHelp()
-  if (command === 'build') return docker.command(\`build -t \${image} .\`)
-  if (command === 'up') {
-    await docker.command(\`build -t \${image} .\`)
-    return docker.command(\`run -d --rm -p \${port}:\${port} --name \${container} \${image}\`)
-  }
-  if (command === 'dev') {
-    await docker.command(\`build -t \${image} .\`)
-    await docker.command(\`run -d --rm -p \${port}:\${port} --name \${container} \${image}\`)
-    return docker.command(\`logs -f \${container}\`)
-  }
-  if (command === 'run') {
-    return docker.command(\`run -d --rm -p \${port}:\${port} --name \${container} \${image}\`)
-  }
-  if (command === 'logs') return docker.command(\`logs -f \${container}\`)
-  if (command === 'stop') return docker.command(\`stop \${container}\`)
-  if (command === 'clean') {
-    await safe(() => docker.command(\`stop \${container}\`))
-    await safe(() => docker.command(\`rm -f \${container}\`))
-    return
-  }
-  if (command === 'reset') {
-    await safe(() => docker.command(\`stop \${container}\`))
-    await safe(() => docker.command(\`rm -f \${container}\`))
-    await safe(() => docker.command(\`rmi -f \${image}\`))
-    return
-  }
-  return printHelp()
-}
-
 async function safe(run: () => Promise<unknown>) {
   try {
     await run()
@@ -216,9 +188,82 @@ function printHelp() {
   )
 }
 
-main().catch((error: unknown) => {
-  console.error(error instanceof Error ? error.message : String(error))
-  process.exit(1)
+await runHelperCli({
+  title: 'Docker helper',
+  argv: process.argv.slice(2),
+  scripts: [
+    {
+      name: 'build',
+      emoji: '🔨',
+      description: 'docker build -t image .',
+      handler: () => docker.command(\`build -t \${image} .\`),
+    },
+    {
+      name: 'up',
+      emoji: '⬆️',
+      description: 'Build + run detached',
+      handler: async () => {
+        await docker.command(\`build -t \${image} .\`)
+        await docker.command(\`run -d --rm -p \${port}:\${port} --name \${container} \${image}\`)
+      },
+    },
+    {
+      name: 'dev',
+      emoji: '🛠️',
+      description: 'Build, run, tail logs',
+      handler: async () => {
+        await docker.command(\`build -t \${image} .\`)
+        await docker.command(\`run -d --rm -p \${port}:\${port} --name \${container} \${image}\`)
+        await docker.command(\`logs -f \${container}\`)
+      },
+    },
+    {
+      name: 'run',
+      emoji: '🏃',
+      description: 'Run existing image detached',
+      handler: () =>
+        docker.command(\`run -d --rm -p \${port}:\${port} --name \${container} \${image}\`),
+    },
+    {
+      name: 'logs',
+      emoji: '📜',
+      description: 'Tail docker logs',
+      handler: () => docker.command(\`logs -f \${container}\`),
+    },
+    {
+      name: 'stop',
+      emoji: '🛑',
+      description: 'Stop container',
+      handler: () => docker.command(\`stop \${container}\`),
+    },
+    {
+      name: 'clean',
+      emoji: '🧹',
+      description: 'Stop + remove container',
+      handler: async () => {
+        await safe(() => docker.command(\`stop \${container}\`))
+        await safe(() => docker.command(\`rm -f \${container}\`))
+      },
+    },
+    {
+      name: 'reset',
+      emoji: '♻️',
+      description: 'Clean container and remove image',
+      handler: async () => {
+        await safe(() => docker.command(\`stop \${container}\`))
+        await safe(() => docker.command(\`rm -f \${container}\`))
+        await safe(() => docker.command(\`rmi -f \${image}\`))
+      },
+    },
+    {
+      name: 'help',
+      emoji: 'ℹ️',
+      description: 'Print commands',
+      handler: () => {
+        printHelp()
+      },
+    },
+  ],
 })
 `;
 }

package/dist/menu.js

@@ -4,7 +4,8 @@ import { releaseMultiple, releaseSingle } from './release.js';
 import { getOrderedPackages } from './packages.js';
 import { runHelperCli } from './helper-cli.js';
 import { ensureWorkingTreeCommitted } from './preflight.js';
-export function makeStepEntries(targets, packages, state) {
+import { run } from './utils/run.js';
+function makeManagerStepEntries(targets, packages, state) {
     return [
         {
             name: 'update dependencies',
@@ -84,12 +85,29 @@ export function makeStepEntries(targets, packages, state) {
         },
     ];
 }
+function makePackageScriptEntries(pkg) {
+    const scripts = pkg.json?.scripts ?? {};
+    const entries = [];
+    Object.entries(scripts)
+        .sort(([a], [b]) => a.localeCompare(b))
+        .forEach(([name, command]) => {
+        entries.push({
+            name,
+            emoji: '▶️',
+            description: typeof command === 'string' ? command : '',
+            handler: async () => {
+                await run('pnpm', ['run', name], { cwd: pkg.path });
+            },
+        });
+    });
+    return entries;
+}
 export function buildPackageSelectionMenu(packages, onStepComplete) {
     const ordered = getOrderedPackages(packages);
     const entries = ordered.map((pkg) => ({
-        name: pkg.substitute,
+        name: pkg.name ?? pkg.substitute ?? pkg.dirName,
         emoji: colors[pkg.color]('●'),
-        description: pkg.name ?? pkg.dirName,
+        description: pkg.relativeDir ?? pkg.dirName,
         handler: async () => {
             const step = await runStepLoop([pkg], packages);
             onStepComplete?.(step);
@@ -112,6 +130,46 @@ export function buildPackageSelectionMenu(packages, onStepComplete) {
 // This removes the infinite loop and returns to the step menu after each run.
 export async function runStepLoop(targets, packages) {
     const state = {};
+    // Single package: show combined menu (manager actions + package.json scripts)
+    if (targets.length === 1) {
+        const pkg = targets[0];
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const scriptEntries = makePackageScriptEntries(pkg);
+            const entries = [
+                {
+                    name: 'manager actions',
+                    emoji: globalEmoji,
+                    description: 'update/test/build/publish',
+                    handler: async () => {
+                        const managerEntries = makeManagerStepEntries(targets, packages, state);
+                        await runHelperCli({
+                            title: `Manager actions for ${pkg.name}`,
+                            scripts: managerEntries,
+                            argv: [],
+                        });
+                    },
+                },
+                ...scriptEntries,
+                {
+                    name: 'back',
+                    emoji: '↩️',
+                    description: 'Pick packages again',
+                    handler: () => {
+                        state.lastStep = 'back';
+                    },
+                },
+            ];
+            await runHelperCli({
+                title: `Actions for ${pkg.name}`,
+                scripts: entries,
+                argv: [],
+            });
+            if (state.lastStep === 'back')
+                return state.lastStep;
+            // loop to keep showing menu
+        }
+    }
     // Loop shows the step menu and executes a chosen action once.
     // After the handler completes, show the menu again.
     // Selecting "back" breaks and returns control to the package picker.
@@ -119,7 +177,7 @@ export async function runStepLoop(targets, packages) {
     // eslint-disable-next-line no-constant-condition
     while (true) {
         state.lastStep = undefined;
-        const entries = makeStepEntries(targets, packages, state);
+        const entries = makeManagerStepEntries(targets, packages, state);
         await runHelperCli({
             title: `Actions for ${targets.length === 1 ? targets[0].name : 'selected packages'}`,
             scripts: entries,

package/dist/prompts.js

@@ -1,7 +1,9 @@
 // src/prompts.js
 import readline from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
-export const publishCliState = { autoConfirmAll: false };
+export const publishCliState = {
+    autoDecision: undefined,
+};
 export function promptSingleKey(message, resolver) {
     const supportsRawMode = typeof input.setRawMode === 'function' && input.isTTY;
     if (!supportsRawMode) {
@@ -64,22 +66,26 @@ export async function askLine(question) {
     }
 }
 export async function promptYesNoAll(question) {
-    if (publishCliState.autoConfirmAll) {
-        console.log(`${question} (auto-confirmed via "all")`);
-        return 'yes';
+    if (publishCliState.autoDecision) {
+        console.log(`${question} (auto-${publishCliState.autoDecision} via "all")`);
+        return publishCliState.autoDecision;
     }
-    const result = await promptSingleKey(`${question} (y/n/a): `, (key) => {
-        if (key === 'y')
+    // Allow yes/no + "apply to all" variants: y, ya, n, na
+    // Use readline-style input to capture multi-character tokens consistently.
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const answer = (await askLine(`${question} (y/ya/n/na): `)).toLowerCase();
+        if (answer === 'y')
             return 'yes';
-        if (key === 'n')
+        if (answer === 'ya') {
+            publishCliState.autoDecision = 'yes';
+            return 'yes';
+        }
+        if (answer === 'n')
             return 'no';
-        if (key === 'a')
-            return 'all';
-        return undefined;
-    });
-    if (result === 'all') {
-        publishCliState.autoConfirmAll = true;
-        return 'yes';
+        if (answer === 'na') {
+            publishCliState.autoDecision = 'no';
+            return 'no';
+        }
     }
-    return result;
 }

package/dist/publish.js

@@ -136,7 +136,7 @@ async function main() {
         if (packages.length === 0) {
             throw new Error('No packages with a package.json found in this workspace');
         }
-        publishCliState.autoConfirmAll = true;
+        publishCliState.autoDecision = 'yes';
         if (!parsed.selectionArg) {
             throw new Error('Non-interactive mode requires a package selection: <pkg> or "all".');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emeryld/manager",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Interactive manager for pnpm monorepos (update/test/build/publish).",
   "license": "MIT",
   "type": "module",