@actiondock/cli 2.5.0 → 2.6.0

package/dist/commands/generate.js

@@ -1,5 +1,5 @@
 import { findProjectRoot, writeActionTypes } from "@actiondock/core";
-import { ArgumentError, ExecutionError } from "../errors.js";
+import { ExecutionError, notInProjectError } from "../errors.js";
 import { renderResult } from "../renderer.js";
 import { getEffectiveOptions } from "../utils/index.js";
 /**
@@ -16,12 +16,11 @@ export function registerGenerateCommands(program, context) {
         .command("types")
         .description("Generate .actiondock/generated/actions.d.ts from actiondock.json schema")
         .option("--json", "Output as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .action(async (rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         const root = findProjectRoot();
         if (!root) {
-            throw new ArgumentError("Not in an ActionDock project (actiondock.json not found)");
+            throw notInProjectError();
         }
         try {
             const { filePath, digest } = writeActionTypes(root);
@@ -32,7 +31,6 @@ export function registerGenerateCommands(program, context) {
             };
             renderResult(result, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => `[OK] Generated action types at ${filePath}\nManifest digest: ${digest}`,
                 context,
             });

package/dist/commands/index.js

@@ -45,8 +45,8 @@ export const CLI_VERSION = readCliVersion();
 /**
  * 递归注入全局通用选项。
  *
- * 输出纪律契约：--json/--envelope 对所有命令统一注入；已实现 renderResult
- * 数据输出的命令会消费它们，未实现机器输出的命令（init、link、test、new、
+ * 输出纪律契约：--json 对所有命令统一注入；已实现 renderResult
+ * 数据输出的命令会消费它，未实现机器输出的命令（init、link、test、new、
  * serve、mcp 等）将其作为无操作标志忽略，不影响人类输出行为。
  * 错误信封由顶层 main 的 renderError 统一兜底，与命令实现解耦。
  */
@@ -55,9 +55,6 @@ function applyCommonOptions(cmd) {
     if (!hasOpt("json")) {
         cmd.option("--json", "Output as JSON");
     }
-    if (!hasOpt("envelope")) {
-        cmd.option("--envelope", "Wrap JSON output in standard envelope");
-    }
     if (!hasOpt("dataDir") && !hasOpt("data-dir")) {
         cmd.option("--data-dir <path>", "Custom database storage directory");
     }

package/dist/commands/info.js

@@ -1,8 +1,8 @@
-import { fetchRemoteInfo, filterWithFallbackInfo, getRegistryStatus, resolvePackageRoot, resolveTarget, } from "@actiondock/core";
-import { ArgumentError, ExecutionError } from "../errors.js";
+import { fetchRemoteInfo, filterWithFallbackInfo, getRegistryStatus, resolvePackageRoot, } from "@actiondock/core";
+import { ExecutionError, NO_PROJECT_NO_LINKED_MESSAGE, packageNotFoundError } from "../errors.js";
 import { projectDetailToJson, renderAggregatedPackages, renderProjectDetail, renderRegistryTree, renderResult, } from "../renderer.js";
 import { getProjectDetailInfo, scanLocalAggregatedPackages } from "../services/index.js";
-import { applyTargetOptions, getEffectiveOptions, resolveFallbackStrategy, resolveIntent } from "../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, resolveFallbackStrategy, resolveIntent, resolveTargetFromOptions, } from "../utils/index.js";
 /**
  * 将远端信息响应归一为本地工程详情视图。
  */
@@ -29,7 +29,6 @@ function remoteInfoToDetail(remoteInfo) {
 function renderProjectDetailOutput(detail, options) {
     renderResult(projectDetailToJson(detail), {
         json: options.json,
-        envelope: options.envelope,
         humanFormatter: () => renderProjectDetail(detail),
         context: options.context,
     });
@@ -51,20 +50,14 @@ export function registerInfoCommand(program, context) {
         .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")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .option("--data-dir <path>", "Custom database storage directory")
         .action(async (patterns = [], rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         const effectiveIntent = resolveIntent(options.intent, patterns);
         const { isMachine, shouldFallback } = resolveFallbackStrategy(options);
-        const outOpts = { json: options.json, envelope: options.envelope, context };
+        const outOpts = { json: options.json, context };
         // 远端服务目标分支
-        const target = resolveTarget({
-            profile: options.profile,
-            server: options.server,
-            token: options.token,
-            insecure: options.insecure,
-        }, context?.customHome);
+        const target = resolveTargetFromOptions(options, context);
         if (target.type === "remote") {
             const remoteInfo = await fetchRemoteInfo(target.serverUrl, target.token, {
                 intent: effectiveIntent,
@@ -104,7 +97,6 @@ export function registerInfoCommand(program, context) {
             const status = getRegistryStatus(context?.customHome);
             renderResult(status, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => renderRegistryTree(status),
                 context,
             });
@@ -118,7 +110,7 @@ export function registerInfoCommand(program, context) {
                 renderProjectDetailOutput(detail, outOpts);
                 return;
             }
-            throw new ArgumentError(`Package '${options.package}' not found in linked packages or path`);
+            throw packageNotFoundError(options.package);
         }
         // 扫描本地候选包（当前工程根目录 + 全局已链接包）
         const { currentRoot, aggregated } = scanLocalAggregatedPackages(context);
@@ -132,7 +124,7 @@ export function registerInfoCommand(program, context) {
             if (aggregated.length === 0) {
                 renderResult({ linkedPackages: [] }, {
                     ...outOpts,
-                    humanFormatter: () => "No ActionDock project in current directory, and no packages linked.\nRun 'ad link' inside an Action package to register it.",
+                    humanFormatter: () => `${NO_PROJECT_NO_LINKED_MESSAGE}\nRun 'ad link' inside an Action package to register it.`,
                 });
                 return;
             }

package/dist/commands/list.js

@@ -1,5 +1,5 @@
 import { filterWithFallbackInfo } from "@actiondock/core";
-import { ArgumentError } from "../errors.js";
+import { packageNotFoundError } from "../errors.js";
 import { renderActionList, renderResult } from "../renderer.js";
 import { applyTargetOptions, getEffectiveOptions, resolveFallbackStrategy, resolveIntent, resolveLocalPackageRoot, withTarget, } from "../utils/index.js";
 /**
@@ -18,7 +18,6 @@ export function attachListCommand(parent, context) {
         .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 as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .option("--data-dir <path>", "Custom database storage directory")
         .action(async (patterns = [], rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
@@ -27,7 +26,7 @@ export function attachListCommand(parent, context) {
         // 目标拓扑解析（仅 local 分支需要包寻址）
         const targetPackageRoot = resolveLocalPackageRoot(options.package);
         if (options.package && !targetPackageRoot) {
-            throw new ArgumentError(`Package '${options.package}' not found in linked packages or path`);
+            throw packageNotFoundError(options.package);
         }
         // 通过 Target 门面统一获取 Action 列表
         await withTarget(options, context, async (target, resolved) => {
@@ -56,7 +55,7 @@ export function attachListCommand(parent, context) {
             });
             const filterRes = filterWithFallbackInfo(rawList, effectiveIntent, [(a) => a.id, (a) => a.description], shouldFallback);
             if (filterRes.isFallback && isMachine) {
-                renderResult({ items: filterRes.items, isFallback: true, matchedCount: 0 }, { json: options.json, envelope: options.envelope, context });
+                renderResult({ items: filterRes.items, isFallback: true, matchedCount: 0 }, { json: options.json, context });
                 return;
             }
             const title = resolved.type === "remote"
@@ -66,7 +65,6 @@ export function attachListCommand(parent, context) {
                     : "Available Actions";
             renderResult(filterRes.items, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => renderActionList(filterRes.items, title, filterRes.isFallback, effectiveIntent),
                 context,
             });

package/dist/commands/mcp.js

@@ -1,7 +1,8 @@
 import { resolve } from "node:path";
 import { findProjectRoot, formatHostForUrl, loadProjectConfig, parseDuration } from "@actiondock/core";
+import { createNodePlatform } from "@actiondock/runtime-node";
 import { ArgumentError, ExecutionError } from "../errors.js";
-import { writeStdout } from "../renderer.js";
+import { writeStderr, writeStdout } from "../renderer.js";
 import { getEffectiveOptions, parseByteSize, parseListOption } from "../utils/index.js";
 /**
  * 注册 mcp 命令（STDIO 与 HTTP 传输服务模式）。
@@ -17,7 +18,7 @@ export function registerMcpCommands(program, context) {
         .option("--package <package-id>", "Specific linked package ID(s) to serve (can be specified multiple times or comma-separated)", parseListOption, [])
         .option("--all", "Serve all linked packages from global registry")
         .option("--timeout <duration>", "Execution timeout (e.g. 30s, 5m, 500ms)")
-        .option("--allow-insecure-http", "Allow insecure HTTP connections with auth token (INSECURE)")
+        .option("--data-dir <path>", "Custom database storage directory")
         .action(async (rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         let timeoutMs;
@@ -41,6 +42,8 @@ export function registerMcpCommands(program, context) {
                 packageIds,
                 all,
                 timeoutMs,
+                customHome: context?.customHome,
+                dataDir: options.dataDir || context?.dataDir,
             });
         }
         catch (err) {
@@ -63,6 +66,7 @@ export function registerMcpCommands(program, context) {
         .option("--package <package-id>", "Specific linked package ID(s) to serve (can be specified multiple times or comma-separated)", parseListOption, [])
         .option("--all", "Serve all linked packages from global registry")
         .option("--timeout <duration>", "Execution timeout (e.g. 30s, 5m, 500ms)")
+        .option("--data-dir <path>", "Custom database storage directory")
         .action(async (rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         const port = parseInt(options.port, 10) || 5178;
@@ -132,6 +136,11 @@ export function registerMcpCommands(program, context) {
             }
         }
         try {
+            const platform = createNodePlatform({
+                customHome: context?.customHome,
+                dataDir: options.dataDir || context?.dataDir,
+                rootDir: projectRoots?.[0],
+            });
             const { startMcpHttpServer } = await import("@actiondock/mcp");
             const server = await startMcpHttpServer({
                 port,
@@ -146,6 +155,9 @@ export function registerMcpCommands(program, context) {
                 packageIds,
                 all,
                 timeoutMs,
+                customHome: context?.customHome,
+                dataDir: options.dataDir || context?.dataDir,
+                platform,
             });
             const displayHost = formatHostForUrl(host);
             const actualMcpHost = formatHostForUrl(host === "0.0.0.0" ? "127.0.0.1" : host);
@@ -161,7 +173,15 @@ export function registerMcpCommands(program, context) {
             writeStdout(`Press Ctrl+C to terminate.\n`, context);
             const stopSignalHandler = () => {
                 writeStdout("\nStopping MCP HTTP server...", context);
-                server.stop();
+                Promise.resolve(server.stop())
+                    .catch((err) => {
+                    // 停止失败必须可见：写入 stderr 一行并标记失败退出码
+                    writeStderr(`[ERROR] Failed to stop MCP HTTP server gracefully: ${err instanceof Error ? err.message : String(err)}`, context);
+                    process.exitCode = 1;
+                })
+                    .finally(() => {
+                    process.exit(typeof process.exitCode === "number" ? process.exitCode : 0);
+                });
             };
             process.once("SIGINT", stopSignalHandler);
             process.once("SIGTERM", stopSignalHandler);

package/dist/commands/pack.js

@@ -1,5 +1,5 @@
 import { findProjectRoot, resolvePackageRoot } from "@actiondock/core";
-import { ExecutionError } from "../errors.js";
+import { ExecutionError, notInProjectError, packageNotFoundError } from "../errors.js";
 import { renderResult, writeStdout } from "../renderer.js";
 import { getEffectiveOptions } from "../utils/index.js";
 export function registerPackCommand(program, context) {
@@ -17,11 +17,11 @@ export function registerPackCommand(program, context) {
             : findProjectRoot();
         if (!root) {
             if (options.package) {
-                throw new ExecutionError(`Package '${options.package}' not found in linked packages or path`);
+                throw packageNotFoundError(options.package);
             }
-            throw new ExecutionError("Not in an ActionDock project (actiondock.json not found).\nPlease specify -P, --package <id> or cd into a project directory.");
+            throw notInProjectError("Please specify -P, --package <id> or cd into a project directory.");
         }
-        const isMachine = Boolean(options.json || options.envelope);
+        const isMachine = Boolean(options.json);
         if (!isMachine && !options.dryRun) {
             writeStdout("Packing Action package...");
         }
@@ -39,7 +39,6 @@ export function registerPackCommand(program, context) {
         }
         renderResult(result, {
             json: isMachine,
-            envelope: options.envelope,
             humanFormatter: () => {
                 const lines = [];
                 if (options.dryRun) {

package/dist/commands/playbook.js

@@ -1,9 +1,9 @@
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, relative, resolve } from "node:path";
-import { assertPathWithinRoot, fetchRemotePlaybooks, fetchRemotePlaybookShow, filterWithFallbackInfo, findProjectRoot, listLinkedPackages, loadActions, loadManifest, loadPlaybooks, loadProjectConfig, resolveActionProject, resolvePackageRoot, resolvePlaybookProject, resolveTarget, saveManifest, } from "@actiondock/core";
-import { ArgumentError, CliError, ExecutionError } from "../errors.js";
+import { assertPathWithinRoot, fetchRemotePlaybooks, fetchRemotePlaybookShow, filterWithFallbackInfo, findProjectRoot, listLinkedPackages, loadActions, loadManifest, loadPlaybooks, loadProjectConfig, resolveActionProject, resolvePackageRoot, resolvePlaybookProject, saveManifest, } from "@actiondock/core";
+import { ArgumentError, CliError, ExecutionError, NO_PROJECT_NO_LINKED_MESSAGE, notInProjectError, packageNotFoundError, } from "../errors.js";
 import { renderPlaybookDetail, renderPlaybookList, renderResult, writeStdout, } from "../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, resolveIntent } from "../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, resolveIntent, resolveTargetFromOptions, } from "../utils/index.js";
 /**
  * 注册 Playbook 命令集合（list, show, validate, create）。
  *
@@ -22,20 +22,13 @@ export function registerPlaybookCommands(program, context) {
         .option("-P, --package <id>", "Target package ID or path"))
         .option("--no-fallback", "Disable fallback to full list when no items match intent")
         .option("--json", "Output as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .action(async (patterns = [], rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         const effectiveIntent = resolveIntent(options.intent, patterns);
         const shouldFallback = options.fallback !== false;
-        const isMachine = Boolean(options.json || options.envelope);
+        const isMachine = Boolean(options.json);
         // 1. 远端服务分支
-        const target = resolveTarget({
-            profile: options.profile,
-            server: options.server,
-            token: options.token,
-            insecure: options.insecure,
-            allowInsecureHttp: options.allowInsecureHttp,
-        }, context?.customHome);
+        const target = resolveTargetFromOptions(options, context);
         if (target.type === "remote") {
             const remotePbs = await fetchRemotePlaybooks(target.serverUrl, target.token, {
                 intent: effectiveIntent,
@@ -45,7 +38,6 @@ export function registerPlaybookCommands(program, context) {
             });
             renderResult(remotePbs, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => renderPlaybookList(remotePbs, `Playbooks on remote server ${target.serverUrl}${target.profileName ? ` (Profile: ${target.profileName})` : ""}`, false, effectiveIntent),
                 context,
             });
@@ -56,7 +48,7 @@ export function registerPlaybookCommands(program, context) {
         if (options.package) {
             targetRoot = resolvePackageRoot(options.package);
             if (!targetRoot) {
-                throw new ArgumentError(`Package '${options.package}' not found in linked packages or path`);
+                throw packageNotFoundError(options.package);
             }
         }
         else {
@@ -72,12 +64,11 @@ export function registerPlaybookCommands(program, context) {
             }));
             const filterRes = filterWithFallbackInfo(rawList, effectiveIntent, [(p) => p.id, (p) => p.description], shouldFallback);
             if (filterRes.isFallback && isMachine) {
-                renderResult({ items: filterRes.items, isFallback: true, matchedCount: 0 }, { json: options.json, envelope: options.envelope, context });
+                renderResult({ items: filterRes.items, isFallback: true, matchedCount: 0 }, { json: options.json, context });
                 return;
             }
             renderResult(filterRes.items, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => renderPlaybookList(filterRes.items, `Playbooks in ${config.id} (${targetRoot})`, filterRes.isFallback, effectiveIntent),
                 context,
             });
@@ -88,8 +79,7 @@ export function registerPlaybookCommands(program, context) {
         if (linkedList.length === 0) {
             renderResult([], {
                 json: options.json,
-                envelope: options.envelope,
-                humanFormatter: () => "No ActionDock project in current directory, and no packages linked.",
+                humanFormatter: () => NO_PROJECT_NO_LINKED_MESSAGE,
                 context,
             });
             return;
@@ -143,12 +133,11 @@ export function registerPlaybookCommands(program, context) {
             }
         }
         if (isFallback && isMachine) {
-            renderResult({ packages: filteredPackages, isFallback: true, matchedCount: 0 }, { json: options.json, envelope: options.envelope, context });
+            renderResult({ packages: filteredPackages, isFallback: true, matchedCount: 0 }, { json: options.json, context });
             return;
         }
         renderResult(filteredPackages, {
             json: options.json,
-            envelope: options.envelope,
             humanFormatter: () => {
                 const lines = ["Linked Playbooks:\n"];
                 for (const pkg of filteredPackages) {
@@ -168,20 +157,13 @@ export function registerPlaybookCommands(program, context) {
         .description("Show playbook content and metadata")
         .option("-P, --package <id>", "Target package ID or path"))
         .option("--json", "Output as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .action(async (id, rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         if (!id) {
             throw new ArgumentError("Playbook ID is required for show");
         }
         // 1. 远端服务分支
-        const target = resolveTarget({
-            profile: options.profile,
-            server: options.server,
-            token: options.token,
-            insecure: options.insecure,
-            allowInsecureHttp: options.allowInsecureHttp,
-        }, context?.customHome);
+        const target = resolveTargetFromOptions(options, context);
         if (target.type === "remote") {
             const detail = await fetchRemotePlaybookShow(target.serverUrl, id, target.token, {
                 allowInsecureHttp: Boolean(options.allowInsecureHttp),
@@ -189,7 +171,6 @@ export function registerPlaybookCommands(program, context) {
             });
             renderResult(detail, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => renderPlaybookDetail(detail),
                 context,
             });
@@ -200,7 +181,7 @@ export function registerPlaybookCommands(program, context) {
         if (options.package && !id.includes("/")) {
             const pkgRoot = resolvePackageRoot(options.package);
             if (!pkgRoot) {
-                throw new ArgumentError(`Package '${options.package}' not found in linked packages or path`);
+                throw packageNotFoundError(options.package);
             }
             showTarget = `${options.package}/${id}`;
         }
@@ -222,7 +203,6 @@ export function registerPlaybookCommands(program, context) {
         };
         renderResult(detail, {
             json: options.json,
-            envelope: options.envelope,
             humanFormatter: () => renderPlaybookDetail(detail),
             context,
         });
@@ -233,14 +213,13 @@ export function registerPlaybookCommands(program, context) {
         .description("Validate playbook format and action references (in current project or linked packages)")
         .option("-P, --package <id>", "Target package ID or path")
         .option("--json", "Output as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .action(async (id, rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         let root = null;
         if (options.package) {
             root = resolvePackageRoot(options.package);
             if (!root) {
-                throw new ArgumentError(`Package '${options.package}' not found in linked packages or path`);
+                throw packageNotFoundError(options.package);
             }
         }
         else {
@@ -278,7 +257,7 @@ export function registerPlaybookCommands(program, context) {
         else {
             const linkedList = listLinkedPackages(context?.customHome);
             if (linkedList.length === 0) {
-                throw new ArgumentError("Not in an ActionDock project, and no packages linked.");
+                throw new ArgumentError(`${NO_PROJECT_NO_LINKED_MESSAGE} Please run 'ad link' inside a package first.`);
             }
             for (const pkg of linkedList) {
                 if (!existsSync(pkg.path))
@@ -342,7 +321,6 @@ export function registerPlaybookCommands(program, context) {
         const allValid = results.every((r) => r.valid);
         renderResult({ valid: allValid, results }, {
             json: options.json,
-            envelope: options.envelope,
             humanFormatter: () => {
                 const lines = [];
                 for (const r of results) {
@@ -378,7 +356,7 @@ export function registerPlaybookCommands(program, context) {
 export function handlePlaybookCreate(id, options, context) {
     const root = findProjectRoot();
     if (!root) {
-        throw new ExecutionError("Not in an ActionDock project (actiondock.json not found)");
+        throw notInProjectError();
     }
     try {
         const config = loadProjectConfig(root);

package/dist/commands/profile.js

@@ -1,6 +1,6 @@
 import { addProfile, checkRemoteHealth, filterWithFallbackInfo, getProfile, listProfiles, loadProfiles, maskSecretValue, removeProfile, resolveProfileToken, resolveTarget, toSnakeUpperCase, updateProfile, useProfile, } from "@actiondock/core";
 import { ArgumentError, CliError, ExecutionError, } from "../errors.js";
-import { renderResult, writeStdout } from "../renderer.js";
+import { renderResult, writeStderr, writeStdout } from "../renderer.js";
 import { getEffectiveOptions, resolveFallbackStrategy, resolveIntent } from "../utils/index.js";
 export function registerProfileCommands(program) {
     const profileCmd = program
@@ -15,7 +15,6 @@ export function registerProfileCommands(program) {
         .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 as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .action((patterns, rawOptions, cmd) => {
         try {
             const options = getEffectiveOptions(rawOptions, cmd);
@@ -39,12 +38,11 @@ export function registerProfileCommands(program) {
             });
             const filterRes = filterWithFallbackInfo(enriched, effectiveIntent, [(p) => p.name, (p) => p.serverUrl, (p) => p.description, (p) => p.tokenSource, (p) => (p.insecure ? "insecure" : "")], shouldFallback);
             if (filterRes.isFallback && isMachine) {
-                renderResult({ items: filterRes.items, isFallback: true, matchedCount: 0 }, { json: options.json, envelope: options.envelope });
+                renderResult({ items: filterRes.items, isFallback: true, matchedCount: 0 }, { json: options.json });
                 return;
             }
             renderResult(filterRes.items, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => {
                     const lines = ["ActionDock Execution Profiles:\n"];
                     if (filterRes.isFallback && effectiveIntent) {
@@ -95,7 +93,7 @@ export function registerProfileCommands(program) {
         .action((name, options) => {
         try {
             if (options.token) {
-                console.warn("Warning: storing tokens directly in profiles.json is deprecated. Use --token-env or standard environment variables (e.g. ACTIONDOCK_<PROFILE>_TOKEN) instead.");
+                writeStderr("Warning: storing tokens directly in profiles.json is deprecated. Use --token-env or standard environment variables (e.g. ACTIONDOCK_<PROFILE>_TOKEN) instead.");
             }
             addProfile(name, {
                 serverUrl: options.server,
@@ -123,7 +121,7 @@ export function registerProfileCommands(program) {
         .action((name, options) => {
         try {
             if (options.token) {
-                console.warn("Warning: storing tokens directly in profiles.json is deprecated. Use --token-env or standard environment variables (e.g. ACTIONDOCK_<PROFILE>_TOKEN) instead.");
+                writeStderr("Warning: storing tokens directly in profiles.json is deprecated. Use --token-env or standard environment variables (e.g. ACTIONDOCK_<PROFILE>_TOKEN) instead.");
             }
             let insecure;
             if (options.insecure === true) {
@@ -164,7 +162,6 @@ export function registerProfileCommands(program) {
         .description("Display details of a profile (defaults to active profile)")
         .option("--reveal, --show-secrets", "Reveal plain text values for tokens")
         .option("--json", "Output as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .action((name, rawOptions, cmd) => {
         try {
             const options = getEffectiveOptions(rawOptions, cmd);
@@ -192,7 +189,6 @@ export function registerProfileCommands(program) {
             };
             renderResult(data, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => {
                     const lines = [];
                     lines.push(`Profile:      ${data.name}${data.isCurrent ? " (Active)" : ""}`);
@@ -261,7 +257,6 @@ export function registerProfileCommands(program) {
         .option("-k, --insecure", "Allow insecure TLS connections (skip TLS certificate validation)")
         .option("--allow-insecure-http", "Allow insecure HTTP connections with auth token")
         .option("--json", "Output as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .action(async (name, rawOptions, cmd) => {
         try {
             const options = getEffectiveOptions(rawOptions, cmd);
@@ -273,7 +268,6 @@ export function registerProfileCommands(program) {
             if (target.type === "local") {
                 renderResult({ ok: true, type: "local", message: "Local execution" }, {
                     json: options.json,
-                    envelope: options.envelope,
                     humanFormatter: () => `Target profile '${target.profileName || "local"}' is local (runs in local runtime).`,
                 });
                 return;
@@ -284,7 +278,6 @@ export function registerProfileCommands(program) {
             });
             renderResult(health, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => {
                     if (health.ok) {
                         return `[OK] Connected to ${target.serverUrl} (${health.latencyMs}ms) - Version: ${health.version}, Status: ${health.status}`;

package/dist/commands/remove.js

@@ -1,8 +1,8 @@
 import { resolve } from "node:path";
 import { beginTransaction, findProjectRoot, getInstallCommand, loadLockfile, loadManifest, saveLockfile, saveManifest, } from "@actiondock/core";
-import { ArgumentError, ExecutionError } from "../errors.js";
-import { renderResult } from "../renderer.js";
-import { getEffectiveOptions, spawnAsync } from "../utils/index.js";
+import { ArgumentError, ExecutionError, notInProjectError } from "../errors.js";
+import { renderResult, writeStderr } from "../renderer.js";
+import { assertSafePackageSpec, getEffectiveOptions, spawnAsync } from "../utils/index.js";
 /**
  * 注册 ad remove 依赖移除命令。
  * 遵循规范：移除依赖并更新锁文件，保留该包的历史存储数据，检查反向引用防止误删。
@@ -13,12 +13,11 @@ export function registerRemoveCommand(program, context) {
         .description("Remove an Action package dependency and update actiondock.lock.json")
         .option("-P, --package <path>", "Target project directory path")
         .option("--json", "Output as JSON")
-        .option("--envelope", "Wrap JSON output in standard envelope")
         .action(async (packageIdentifier, rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         const root = options.package ? resolve(options.package) : findProjectRoot();
         if (!root) {
-            throw new ArgumentError("Not in an ActionDock project (actiondock.json not found).\nPlease specify -P, --package <path> or cd into a project directory.");
+            throw notInProjectError("Please specify -P, --package <path> or cd into a project directory.");
         }
         const manifest = loadManifest(root);
         if (!manifest) {
@@ -86,7 +85,8 @@ export function registerRemoveCommand(program, context) {
                 delete lockfile.packages[targetPackageId];
                 saveLockfile(root, lockfile);
             }
-            // 调用包管理器执行卸载
+            // 调用包管理器执行卸载（说明符白名单校验，消除 win32 shell 拼接注入面）
+            assertSafePackageSpec(npmPackageName);
             const installCmd = getInstallCommand(root);
             const pm = installCmd[0];
             const args = pm === "bun" ? ["remove", npmPackageName] : ["uninstall", npmPackageName, "--ignore-scripts"];
@@ -94,18 +94,22 @@ export function registerRemoveCommand(program, context) {
                 cwd: root,
                 stdio: "pipe",
             });
-            // 卸载失败不阻断事务提交（与原同步实现一致：忽略退出码）
-            void uninstallProc;
+            // 卸载失败不阻断事务提交，但必须可见：非零退出码输出 WARN 并在结果中标记
+            const uninstallFailed = uninstallProc.status !== 0;
+            if (uninstallFailed) {
+                const errMsg = uninstallProc.stderr || uninstallProc.stdout || "unknown error";
+                writeStderr(`[WARN] Package manager '${pm}' reported failure while uninstalling '${npmPackageName}' (exit code ${uninstallProc.status ?? "null"}): ${errMsg.trim().split("\n").pop() || ""}`, context);
+            }
             // 提交事务
             await tx.commit();
             const resultPayload = {
                 packageId: targetPackageId,
                 npmPackage: npmPackageName,
                 retainedNamespace: targetPackageId,
+                ...(uninstallFailed ? { uninstallFailed: true } : {}),
             };
             renderResult(resultPayload, {
                 json: options.json,
-                envelope: options.envelope,
                 humanFormatter: () => `Successfully removed '${resultPayload.packageId}'.\n[INFO] Retained configuration and state namespace for package '${resultPayload.packageId}'.`,
                 context,
             });

package/dist/commands/run.d.ts

@@ -1,5 +1,13 @@
+import type { ExecutionResult } from "@actiondock/sdk";
 import { Command } from "commander";
 import type { CliContext } from "../types.js";
+/**
+ * 以原始纯文本形式渲染 Action 执行终态结果（默认纯文本模式）。
+ *
+ * 设计契约：
+ * 1. stdout: 仅承载业务有效载荷（payload）。保持原生排版、未转义多行与真实换行，供用户阅读或下游管道直接消费。
+ */
+export declare function renderRawExecutionResult(targetRef: string, result: ExecutionResult, context?: CliContext): void;
 /**
  * 统一执行 Action 核心逻辑（使用 ActionDockTarget 门面）。
  */