@actiondock/cli 2.0.9 → 2.0.10

package/src/commands/info.ts

@@ -5,13 +5,14 @@ import {
   findProjectRoot,
   getRegistryStatus,
   listLinkedPackages,
-  loadActions,
+  loadManifest,
   loadPlaybooks,
   loadProjectConfig,
   resolvePackageRoot,
   resolveTarget,
 } from "@actiondock/core";
 import { Command } from "commander";
+import { ArgumentError, CliError, ExecutionError, getEffectiveOptions, renderResult } from "@actiondock/runtime-cli";
 import { resolveIntent } from "../utils/filter";
 
 interface AggregatedPackage {
@@ -29,7 +30,16 @@ interface AggregatedPackage {
 
 async function getProjectDetailInfo(root: string) {
   const config = loadProjectConfig(root);
-  const actions = await loadActions(root, config.actionsDir);
+  const manifest = loadManifest(root);
+  const actionsMap = new Map<string, { id: string; description?: string }>();
+  if (manifest?.actions) {
+    for (const [id, item] of Object.entries(manifest.actions)) {
+      actionsMap.set(id, {
+        id,
+        description: item.description,
+      });
+    }
+  }
   const playbooks = loadPlaybooks(root, config.playbooksDir);
 
   return {
@@ -40,13 +50,13 @@ async function getProjectDetailInfo(root: string) {
     projectRoot: root,
     actionsDir: config.actionsDir || "actions",
     playbooksDir: config.playbooksDir || "playbooks",
-    actionsCount: actions.size,
+    actionsCount: actionsMap.size,
     playbooksCount: playbooks.size,
-    actions: Array.from(actions.keys()),
+    actions: Array.from(actionsMap.keys()),
     playbooks: Array.from(playbooks.keys()),
     configDeclared: config.config ? Object.keys(config.config) : [],
     configDef: config.config,
-    actionsMap: actions,
+    actionsMap,
     playbooksMap: playbooks,
   };
 }
@@ -184,15 +194,21 @@ export function registerInfoCommand(program: Command): void {
     .option("-p, --profile <name>", "Query against a specific profile")
     .option("-s, --server <url>", "Remote server URL")
     .option("-t, --token <token>", "Auth token for remote server")
+    .option("--fallback", "Enable fallback to full list when no items match intent")
     .option(
       "--no-fallback",
       "Disable fallback to full list when no items match intent"
     )
     .option("--json", "Output information as JSON")
-    .action(async (patterns: string[] = [], options: any) => {
+    .option("--envelope", "Wrap JSON output in standard envelope")
+    .option("--data-dir <path>", "Custom database storage directory")
+    .action(async (patterns: string[] = [], rawOptions: any, cmd: any) => {
       try {
+        const options = getEffectiveOptions(rawOptions, cmd);
         const effectiveIntent = resolveIntent(options.intent, patterns);
-        const shouldFallback = options.fallback !== false;
+        const isMachine = Boolean(options.json || options.envelope);
+        const fallbackExplicit = options.fallback === true || (Array.isArray(process.argv) && process.argv.includes("--fallback"));
+        const shouldFallback = isMachine ? fallbackExplicit : options.fallback !== false;
 
         const target = resolveTarget({
           profile: options.profile,
@@ -212,8 +228,8 @@ export function registerInfoCommand(program: Command): void {
             }
           );
 
-          if (options.json) {
-            console.log(JSON.stringify(remoteInfo, null, 2));
+          if (isMachine) {
+            renderResult(remoteInfo, { json: options.json, envelope: options.envelope });
             return;
           }
 
@@ -304,8 +320,8 @@ export function registerInfoCommand(program: Command): void {
         // Local Tree
         if (options.tree) {
           const status = getRegistryStatus();
-          if (options.json) {
-            console.log(JSON.stringify(status, null, 2));
+          if (isMachine) {
+            renderResult(status, { json: options.json, envelope: options.envelope });
           } else {
             printRegistryTree(status);
           }
@@ -317,17 +333,16 @@ export function registerInfoCommand(program: Command): void {
           const directRoot = resolvePackageRoot(options.package);
           if (directRoot) {
             const detail = await getProjectDetailInfo(directRoot);
-            if (options.json) {
-              console.log(JSON.stringify(projectDetailToJson(detail), null, 2));
+            if (isMachine) {
+              renderResult(projectDetailToJson(detail), { json: options.json, envelope: options.envelope });
             } else {
               printProjectDetail(detail);
             }
             return;
           }
-          console.error(
-            `Error: Package '${options.package}' not found in linked packages or path`
+          throw new ArgumentError(
+            `Package '${options.package}' not found in linked packages or path`
           );
-          process.exit(1);
         }
 
         // 3. Collect local candidate packages (current project + linked packages)
@@ -339,7 +354,8 @@ export function registerInfoCommand(program: Command): void {
         if (currentRoot) {
           try {
             const config = loadProjectConfig(currentRoot);
-            const actions = await loadActions(currentRoot, config.actionsDir);
+            const manifest = loadManifest(currentRoot);
+            const manifestActionIds = manifest?.actions ? Object.keys(manifest.actions) : [];
             const playbooks = loadPlaybooks(currentRoot, config.playbooksDir);
             aggregated.push({
               id: config.id,
@@ -347,9 +363,9 @@ export function registerInfoCommand(program: Command): void {
               version: config.version,
               description: config.description,
               path: currentRoot,
-              actionsCount: actions.size,
+              actionsCount: manifestActionIds.length,
               playbooksCount: playbooks.size,
-              actions: Array.from(actions.keys()),
+              actions: manifestActionIds,
               playbooks: Array.from(playbooks.keys()),
               configDeclared: config.config ? Object.keys(config.config) : [],
             });
@@ -364,7 +380,8 @@ export function registerInfoCommand(program: Command): void {
           if (seenPaths.has(pkg.path)) continue;
           try {
             const config = loadProjectConfig(pkg.path);
-            const actions = await loadActions(pkg.path, config.actionsDir);
+            const manifest = loadManifest(pkg.path);
+            const manifestActionIds = manifest?.actions ? Object.keys(manifest.actions) : [];
             const playbooks = loadPlaybooks(pkg.path, config.playbooksDir);
 
             aggregated.push({
@@ -373,9 +390,9 @@ export function registerInfoCommand(program: Command): void {
               version: config.version,
               description: config.description,
               path: pkg.path,
-              actionsCount: actions.size,
+              actionsCount: manifestActionIds.length,
               playbooksCount: playbooks.size,
-              actions: Array.from(actions.keys()),
+              actions: manifestActionIds,
               playbooks: Array.from(playbooks.keys()),
               configDeclared: config.config ? Object.keys(config.config) : [],
             });
@@ -389,8 +406,8 @@ export function registerInfoCommand(program: Command): void {
         if (!effectiveIntent) {
           if (currentRoot) {
             const detail = await getProjectDetailInfo(currentRoot);
-            if (options.json) {
-              console.log(JSON.stringify(projectDetailToJson(detail), null, 2));
+            if (isMachine) {
+              renderResult(projectDetailToJson(detail), { json: options.json, envelope: options.envelope });
             } else {
               printProjectDetail(detail);
             }
@@ -398,19 +415,21 @@ export function registerInfoCommand(program: Command): void {
           }
 
           if (aggregated.length === 0) {
+            if (isMachine) {
+              renderResult({ linkedPackages: [] }, { json: options.json, envelope: options.envelope });
+              return;
+            }
             console.log(
               "No ActionDock project in current directory, and no packages linked."
             );
             console.log(
-              "Run 'ad link' inside an Action package to register it."
+              "Run 'ad link' inside an Action package or specify a target package."
             );
             return;
           }
 
-          if (options.json) {
-            console.log(
-              JSON.stringify({ linkedPackages: aggregated }, null, 2)
-            );
+          if (isMachine) {
+            renderResult({ linkedPackages: aggregated }, { json: options.json, envelope: options.envelope });
           } else {
             printAggregatedPackages(aggregated);
           }
@@ -423,8 +442,8 @@ export function registerInfoCommand(program: Command): void {
           const directRoot = resolvePackageRoot(patterns[0]);
           if (directRoot) {
             const detail = await getProjectDetailInfo(directRoot);
-            if (options.json) {
-              console.log(JSON.stringify(projectDetailToJson(detail), null, 2));
+            if (isMachine) {
+              renderResult(projectDetailToJson(detail), { json: options.json, envelope: options.envelope });
             } else {
               printProjectDetail(detail);
             }
@@ -433,10 +452,13 @@ export function registerInfoCommand(program: Command): void {
         }
 
         if (aggregated.length === 0) {
-          console.error(
-            `Error: No ActionDock project or linked packages available to match '${effectiveIntent}'`
+          if (isMachine) {
+            renderResult({ linkedPackages: [], matchedCount: 0, isFallback: false }, { json: options.json, envelope: options.envelope });
+            return;
+          }
+          throw new ExecutionError(
+            `No ActionDock project or linked packages available to match '${effectiveIntent}'`
           );
-          process.exit(1);
         }
 
         // 5.2 Intent filtering across candidate packages
@@ -456,61 +478,58 @@ export function registerInfoCommand(program: Command): void {
 
         // Subcase A: 0 items matched
         if (filterRes.matchedCount === 0) {
-          if (!shouldFallback) {
-            if (options.json) {
-              console.log(JSON.stringify({ linkedPackages: [] }, null, 2));
-            } else {
-              console.error(
-                `Error: No packages matched intent '${effectiveIntent}'`
-              );
+          if (!filterRes.isFallback) {
+            if (isMachine) {
+              renderResult({ linkedPackages: [], matchedCount: 0, isFallback: false }, { json: options.json, envelope: options.envelope });
+              return;
             }
-            process.exit(1);
+            throw new ExecutionError(
+              `No packages matched intent '${effectiveIntent}'`
+            );
           }
 
           // Fallback enabled: display all packages with a notice
-          if (options.json) {
-            console.log(
-              JSON.stringify(
-                { linkedPackages: filterRes.items, isFallback: true },
-                null,
-                2
-              )
+          if (isMachine) {
+            renderResult(
+              { linkedPackages: filterRes.items, isFallback: true, matchedCount: 0 },
+              { json: options.json, envelope: options.envelope }
             );
-          } else {
-            console.log(
-              `(No linked packages matched intent '${effectiveIntent}', showing all packages)\n`
-            );
-            printAggregatedPackages(filterRes.items);
+            return;
           }
+          console.log(
+            `(No linked packages matched intent '${effectiveIntent}', showing all packages)\n`
+          );
+          printAggregatedPackages(filterRes.items);
           return;
         }
 
-        // Subcase B: Exactly 1 item matched -> Display its full project detail
-        if (filterRes.matchedCount === 1 && !filterRes.isFallback) {
+        // Subcase B: Matched items in machine mode
+        if (isMachine) {
+          renderResult(
+            { linkedPackages: filterRes.items, matchedCount: filterRes.matchedCount, isFallback: false },
+            { json: options.json, envelope: options.envelope }
+          );
+          return;
+        }
+
+        // Subcase C: Exactly 1 item matched in human terminal mode -> Display full project detail
+        if (filterRes.matchedCount === 1) {
           const matchedPkg = filterRes.items[0];
           const detail = await getProjectDetailInfo(matchedPkg.path);
-          if (options.json) {
-            console.log(JSON.stringify(projectDetailToJson(detail), null, 2));
-          } else {
-            printProjectDetail(detail);
-          }
+          printProjectDetail(detail);
           return;
         }
 
-        // Subcase C: Multiple items matched -> Display filtered summary list
-        if (options.json) {
-          console.log(
-            JSON.stringify({ linkedPackages: filterRes.items }, null, 2)
-          );
-        } else {
-          printAggregatedPackages(filterRes.items, {
-            header: `ActionDock Linked Packages (${filterRes.matchedCount} matches for '${effectiveIntent}'):\n`,
-            showTip: true,
-          });
-        }
+        // Subcase D: Multiple items matched in human terminal mode -> Display filtered summary list
+        printAggregatedPackages(filterRes.items, {
+          header: `ActionDock Linked Packages (${filterRes.matchedCount} matches for '${effectiveIntent}'):\n`,
+          showTip: true,
+        });
       } catch (err: any) {
-        console.error(`Error: ${err.message}`);
-        process.exit(1);
+        if (err instanceof CliError) {
+          throw err;
+        }
+        throw new ExecutionError(err.message);
       }
     });
 }

package/src/commands/init.ts

@@ -1,4 +1,5 @@
 import { initProject } from "@actiondock/core";
+import { ExecutionError } from "@actiondock/runtime-cli";
 import { Command } from "commander";
 
 export function registerInitCommand(program: Command): void {
@@ -17,8 +18,7 @@ export function registerInitCommand(program: Command): void {
         });
         console.log(`Successfully initialized ActionDock project in ${dir}`);
       } catch (err: any) {
-        console.error(`Error: ${err.message}`);
-        process.exit(1);
+        throw new ExecutionError(err.message);
       }
     });
 }

package/src/commands/link.ts

@@ -3,6 +3,7 @@ import {
   pruneRegistry,
   unlinkPackage,
 } from "@actiondock/core";
+import { ExecutionError } from "@actiondock/runtime-cli";
 import { Command } from "commander";
 
 export function registerLinkCommands(program: Command): void {
@@ -27,8 +28,7 @@ export function registerLinkCommands(program: Command): void {
           console.log(`[OK] Linked package '${result.id}' (v${result.version}) from ${result.path}`);
         }
       } catch (err: any) {
-        console.error(`Error: ${err.message}`);
-        process.exit(1);
+        throw new ExecutionError(err.message);
       }
     });
 
@@ -67,8 +67,7 @@ export function registerLinkCommands(program: Command): void {
           console.log(`Package or workspace '${identifier || process.cwd()}' was not linked in registry`);
         }
       } catch (err: any) {
-        console.error(`Error: ${err.message}`);
-        process.exit(1);
+        throw new ExecutionError(err.message);
       }
     });
 }

package/src/commands/mcp.ts

@@ -2,6 +2,7 @@ import { resolve } from "node:path";
 import { findProjectRoot, loadProjectConfig } from "@actiondock/core";
 import { startMcpHttpServer, startMcpStdio } from "@actiondock/mcp";
 import { Command } from "commander";
+import { ExecutionError } from "@actiondock/runtime-cli";
 import { parseByteSize } from "../utils/bytes";
 import { parseDuration } from "../utils/duration";
 
@@ -35,8 +36,7 @@ export function registerMcpCommands(program: Command): void {
         try {
           timeoutMs = parseDuration(options.timeout);
         } catch (err: any) {
-          process.stderr.write(`Error: ${err.message}\n`);
-          process.exit(1);
+          throw new ExecutionError(err.message);
         }
       }
 
@@ -56,8 +56,7 @@ export function registerMcpCommands(program: Command): void {
           timeoutMs,
         });
       } catch (err: any) {
-        process.stderr.write(`Failed to start MCP STDIO server: ${err.message}\n`);
-        process.exit(1);
+        throw new ExecutionError(`Failed to start MCP STDIO server: ${err.message}`);
       }
     });
 
@@ -106,8 +105,7 @@ export function registerMcpCommands(program: Command): void {
         try {
           maxBodyBytes = parseByteSize(options.maxBody);
         } catch (err: any) {
-          console.error(`Error: ${err.message}`);
-          process.exit(1);
+          throw new ExecutionError(err.message);
         }
       }
 
@@ -116,8 +114,7 @@ export function registerMcpCommands(program: Command): void {
         try {
           timeoutMs = parseDuration(options.timeout);
         } catch (err: any) {
-          console.error(`Error: ${err.message}`);
-          process.exit(1);
+          throw new ExecutionError(err.message);
         }
       }
 
@@ -192,8 +189,7 @@ export function registerMcpCommands(program: Command): void {
           process.exit(0);
         });
       } catch (err: any) {
-        console.error(`Failed to start ActionDock MCP HTTP server: ${err.message}`);
-        process.exit(1);
+        throw new ExecutionError(`Failed to start ActionDock MCP HTTP server: ${err.message}`);
       }
     });
 }