@actiondock/cli 2.12.0 → 2.14.0

package/dist/commands/state.js

@@ -1,11 +1,11 @@
 import { decodeStateKey, } from "@actiondock/sdk";
-import { loadProjectConfig, } from "@actiondock/core";
+import { loadProjectConfig, inspectLocalPackageDirectory, } from "@actiondock/core";
 import { filterWithFallbackInfo, } from "@actiondock/core/project";
 import { listLinkedPackages, } from "@actiondock/core/registry";
 import { existsSync } from "node:fs";
 import { ArgumentError, ExecutionError, NO_PROJECT_NO_LINKED_MESSAGE } from "../errors.js";
 import { renderResult, renderStateList, writeStderr, writeStdout } from "../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, getTargetRoot, remoteTargetLabel, requirePackageRoot, resolveFallbackStrategy, resolveIntent, resolveLocalPackageRoot, resolveTargetFromOptions, withService, } from "../utils/index.js";
+import { applyTargetOptions, assertNotCompositeSkill, getEffectiveOptions, getTargetRoot, remoteTargetLabel, requirePackageRoot, resolveFallbackStrategy, resolveIntent, resolveLocalPackageRoot, resolveTargetFromOptions, withService, } from "../utils/index.js";
 /**
  * 统一预解码状态键寻址（get、set、delete 共享的单一事实源）。
  *
@@ -57,6 +57,22 @@ function resolveStateScope(resolved, options, rawKey) {
             localRoot: undefined,
         };
     }
+    assertNotCompositeSkill(options.package);
+    // 本地单包技能目录优先处理
+    if (options.package) {
+        const localSkill = inspectLocalPackageDirectory(options.package);
+        if (localSkill?.type === "single") {
+            const pkg = localSkill.packages[0];
+            return {
+                packageId: pkg.packageId,
+                scopeSuffix: `in package '${pkg.packageId}'`,
+                deleteSuffix: `from package '${pkg.packageId}'`,
+                effectiveKey: rawKey || "",
+                projConfig: pkg.projectConfig,
+                localRoot: pkg.packageRoot,
+            };
+        }
+    }
     // 本地项目模式：getTargetRoot 会从键中剥离 pkg/ 前缀，寻址基于解耦后的裸键
     const { root, key: effectiveKey } = getTargetRoot(options.package, rawKey);
     const projConfig = loadProjectConfig(root);
@@ -175,6 +191,7 @@ export function registerStateCommands(program, context) {
                 return;
             }
             // 本地工程与链接包模式：按目标根目录决策输出范围
+            assertNotCompositeSkill(options.package);
             const targetRoot = options.package
                 ? requirePackageRoot(options.package).root
                 : resolveLocalPackageRoot();

package/dist/commands/validate.js

@@ -1,4 +1,4 @@
-import { checkGeneratedTypes, GENERATED_TYPES_OUTDATED_CODE, loadActions, } from "@actiondock/core/project";
+import { checkGeneratedTypes, GENERATED_TYPES_OUTDATED_CODE, loadActions, analyzeActionOutputContract, } from "@actiondock/core/project";
 import { ArgumentError, ExecutionError } from "../errors.js";
 import { renderActionValidation, renderResult } from "../renderer.js";
 import { getEffectiveOptions, requirePackageRoot } from "../utils/index.js";
@@ -49,10 +49,22 @@ export function attachValidateCommand(parent, context) {
             if (outSchema && typeof outSchema !== "object") {
                 errors.push("Invalid outputSchema object");
             }
+            const annotations = item.spec?.annotations ?? item.act?.annotations;
+            const contractAnalysis = analyzeActionOutputContract({
+                annotations,
+                outputSchema: outSchema,
+            });
+            if (contractAnalysis.errors.length > 0) {
+                for (const err of contractAnalysis.errors) {
+                    errors.push(err);
+                }
+            }
+            const warnings = contractAnalysis.warnings.slice();
             results.push({
                 id: item.id,
                 valid: errors.length === 0,
                 errors,
+                ...(warnings.length > 0 ? { warnings } : {}),
             });
         }
         const allValid = results.every((r) => r.valid);

package/dist/renderers/action.d.ts

@@ -1,5 +1,5 @@
-import type { ActionSpec } from "@actiondock/core";
-import { buildActionDescribePayload } from "@actiondock/core/project";
+import { formatActionDetail, type FormatActionDetailOptions } from "@actiondock/core/project";
+export { formatActionDetail, type FormatActionDetailOptions, };
 /**
  * 解析 Action 注解中的默认正文输出字段声明。
  *
@@ -7,7 +7,7 @@ import { buildActionDescribePayload } from "@actiondock/core/project";
  * - 注解键名固定为 actiondock.cli，值必须为非空非数组对象。
  * - 正文字段键名为 textField，值必须为非空字符串。
  * - 无相关注解或未声明 textField 时返回 undefined。
- * - 注解存在但类型非法时抛出 ExecutionError。
+ * - 注解存在但类型非法时抛出 ExecutionError (INVALID_ANNOTATION)。
  */
 export declare function resolveActionDefaultTextField(annotations?: Record<string, unknown>): string | undefined;
 /**
@@ -35,30 +35,9 @@ export declare function renderActionList(items: Array<{
     description: string;
     packageId?: string;
 }>, title?: string, isFallback?: boolean, intent?: string): string;
-/**
- * 格式化渲染 Action 详情人类可读文本。
- *
- * @param input Action 描述载荷或 Action 规范
- * @returns 格式化后的说明文本
- */
-export declare function formatActionDetail(input: ReturnType<typeof buildActionDescribePayload> | (Partial<ActionSpec> & {
-    id: string;
-}) | {
-    id: string;
-    packageId?: string;
-    projectRoot?: string;
-    description?: string;
-    inputSchema?: unknown;
-    outputSchema?: unknown;
-    tags?: string[];
-    annotations?: Record<string, unknown>;
-    uses?: string[];
-    entry?: string;
-    [key: string]: any;
-}): string;
 /**
  * 格式化渲染 Action 详情（编码顾问 Encoding Advisor）。
- * 统一复用 formatActionDetail 实现。
+ * 统一复用核心 formatActionDetail 实现。
  */
 export declare function renderActionDetail(action: {
     id: string;
@@ -75,4 +54,5 @@ export declare function renderActionValidation(results: Array<{
     id: string;
     valid: boolean;
     errors: string[];
+    warnings?: string[];
 }>): string;

package/dist/renderers/action.js

@@ -1,4 +1,5 @@
-import { buildActionDescribePayload, ACTION_DESCRIBE_SYNTAX_REFERENCE, } from "@actiondock/core/project";
+import { inspectActionTextFieldAnnotation, formatActionDetail, } from "@actiondock/core/project";
+export { formatActionDetail, };
 import { ExecutionError } from "../errors.js";
 /**
  * 解析 Action 注解中的默认正文输出字段声明。
@@ -7,33 +8,14 @@ import { ExecutionError } from "../errors.js";
  * - 注解键名固定为 actiondock.cli，值必须为非空非数组对象。
  * - 正文字段键名为 textField，值必须为非空字符串。
  * - 无相关注解或未声明 textField 时返回 undefined。
- * - 注解存在但类型非法时抛出 ExecutionError。
+ * - 注解存在但类型非法时抛出 ExecutionError (INVALID_ANNOTATION)。
  */
 export function resolveActionDefaultTextField(annotations) {
-    if (!annotations || typeof annotations !== "object") {
-        return undefined;
+    const inspection = inspectActionTextFieldAnnotation(annotations);
+    if (!inspection.valid) {
+        throw new ExecutionError(inspection.error, undefined, "INVALID_ANNOTATION");
     }
-    if (!Object.hasOwn(annotations, "actiondock.cli")) {
-        return undefined;
-    }
-    const cli = annotations["actiondock.cli"];
-    if (cli === undefined) {
-        return undefined;
-    }
-    if (typeof cli !== "object" || cli === null || Array.isArray(cli)) {
-        throw new ExecutionError(`Invalid 'actiondock.cli' annotation: expected an object, but received ${cli === null ? "null" : Array.isArray(cli) ? "an array" : typeof cli}.`, undefined, "INVALID_ANNOTATION");
-    }
-    if (!Object.hasOwn(cli, "textField") || cli.textField === undefined) {
-        return undefined;
-    }
-    const textField = cli.textField;
-    if (typeof textField !== "string") {
-        throw new ExecutionError(`Invalid 'actiondock.cli.textField' annotation: expected a string, but received ${textField === null ? "null" : Array.isArray(textField) ? "an array" : typeof textField}.`, undefined, "INVALID_ANNOTATION");
-    }
-    if (textField.trim() === "") {
-        throw new ExecutionError("Invalid 'actiondock.cli.textField' annotation: cannot be an empty string.", undefined, "INVALID_ANNOTATION");
-    }
-    return textField;
+    return inspection.textField;
 }
 /**
  * 从 Action 执行数据中抽取指定自有顶层正文字段及剩余元数据。
@@ -94,78 +76,9 @@ export function renderActionList(items, title = "Actions", isFallback = false, i
     lines.push("\nTip: For composite or multi-step tasks, check 'ad playbook list' for standard operating procedures.");
     return lines.join("\n");
 }
-/**
- * 格式化渲染 Action 详情人类可读文本。
- *
- * @param input Action 描述载荷或 Action 规范
- * @returns 格式化后的说明文本
- */
-export function formatActionDetail(input) {
-    const payload = "inputAdvice" in input && input.inputAdvice
-        ? input
-        : buildActionDescribePayload(input);
-    const lines = [];
-    lines.push(`Action: ${payload.id}`);
-    if (payload.packageId) {
-        lines.push(`Package: ${payload.packageId}`);
-    }
-    if (payload.description) {
-        lines.push(`Description: ${payload.description}`);
-    }
-    if (payload.tags && payload.tags.length > 0) {
-        lines.push(`Tags: ${payload.tags.join(", ")}`);
-    }
-    if (payload.uses && payload.uses.length > 0) {
-        lines.push(`Uses: ${payload.uses.join(", ")}`);
-    }
-    if (payload.entry) {
-        lines.push(`Entry: ${payload.entry}`);
-    }
-    if (payload.inputSchema !== undefined) {
-        lines.push("");
-        lines.push("Input Schema:");
-        lines.push(typeof payload.inputSchema === "string"
-            ? payload.inputSchema
-            : JSON.stringify(payload.inputSchema, null, 2));
-    }
-    if (payload.outputSchema !== undefined) {
-        lines.push("");
-        lines.push("Output Schema:");
-        lines.push(typeof payload.outputSchema === "string"
-            ? payload.outputSchema
-            : JSON.stringify(payload.outputSchema, null, 2));
-    }
-    lines.push("");
-    lines.push(`Recommended Input: ${payload.inputAdvice.recommendedMode}`);
-    if (payload.inputAdvice.reason) {
-        lines.push(`Reason: ${payload.inputAdvice.reason}`);
-    }
-    const hasAssignments = Boolean(payload.inputAdvice.assignments &&
-        Object.keys(payload.inputAdvice.assignments).length > 0);
-    if (hasAssignments) {
-        lines.push("");
-        lines.push("Assignments:");
-        for (const [key, op] of Object.entries(payload.inputAdvice.assignments)) {
-            lines.push(`  ${key}${op}`);
-        }
-    }
-    if (payload.inputAdvice.recommendedMode === "flat" || hasAssignments) {
-        lines.push("");
-        lines.push("Syntax Reference:");
-        lines.push(...(payload.syntaxReference || ACTION_DESCRIBE_SYNTAX_REFERENCE));
-    }
-    if (payload.inputAdvice.issues && payload.inputAdvice.issues.length > 0) {
-        lines.push("");
-        lines.push("Issues:");
-        for (const issue of payload.inputAdvice.issues) {
-            lines.push(`  - ${issue.path}: ${issue.code}`);
-        }
-    }
-    return lines.join("\n");
-}
 /**
  * 格式化渲染 Action 详情（编码顾问 Encoding Advisor）。
- * 统一复用 formatActionDetail 实现。
+ * 统一复用核心 formatActionDetail 实现。
  */
 export function renderActionDetail(action) {
     return formatActionDetail(action);
@@ -177,10 +90,19 @@ export function renderActionValidation(results) {
     const lines = [];
     for (const r of results) {
         if (r.valid) {
-            lines.push(`[OK] ${r.id}: Valid`);
+            if (r.warnings && r.warnings.length > 0) {
+                lines.push(`[OK] ${r.id}: Valid (warnings: ${r.warnings.join("; ")})`);
+            }
+            else {
+                lines.push(`[OK] ${r.id}: Valid`);
+            }
         }
         else {
-            lines.push(`[FAIL] ${r.id}: ${r.errors.join(", ")}`);
+            let msg = `[FAIL] ${r.id}: ${r.errors.join(", ")}`;
+            if (r.warnings && r.warnings.length > 0) {
+                msg += ` (warnings: ${r.warnings.join("; ")})`;
+            }
+            lines.push(msg);
         }
     }
     return lines.join("\n");

package/dist/utils/index.d.ts

@@ -4,4 +4,3 @@ export * from "./spawn.js";
 export * from "./cert.js";
 export * from "./input.js";
 export * from "./server-launch.js";
-export * from "./warning.js";

package/dist/utils/index.js

@@ -4,4 +4,3 @@ export * from "./spawn.js";
 export * from "./cert.js";
 export * from "./input.js";
 export * from "./server-launch.js";
-export * from "./warning.js";

package/dist/utils/target.d.ts

@@ -1,4 +1,4 @@
-import { type ActionDockService } from "@actiondock/core";
+import { loadProjectConfig, type ActionDockService, type LocalSkillDirectory } from "@actiondock/core";
 import { type ResolvedTarget } from "@actiondock/core/profile";
 import type { Command } from "commander";
 import type { CliContext } from "../types.js";
@@ -33,14 +33,68 @@ export interface TargetResolutionOptions {
 /**
  * 目标拓扑解析单一入口：从命令选项视图解析远端/本地目标拓扑信息。
  *
- * 收拢全部解析字段（profile/server/token/insecure/allowInsecureHttp），
- * 消除命令间逐字段内联复制导致的漂移（如漏传 allowInsecureHttp）。
+ * 显式路径与包标识符分类规则：
+ * - 显式路径形态（以 .、/、~ 开头或包含非 scoped 分隔符）：
+ *   严格作为本地技能或包目录解析；禁止与显式远端选项（--server 或非 local 的 --profile）组合，违规抛出 ArgumentError；
+ *   不受隐式 Profile 或 ACTIONDOCK_SERVER_URL 环境变量改变目标，本地执行优先；
+ *   若本地目录不存在或不合法，抛出 packageNotFoundError；
+ * - 纯词法包标识符（如 pkg.a、@scope/pkg）：
+ *   若存在远端目标（显式 --server、非 local profile 或默认远端环境），严格作为远端包标识解析，绝不因本地 cwd 存在同名目录而劫持为本地执行；
+ *   若无远端目标，正常按本地目标解析。
  *
  * @param options 命令选项视图（支持直接传入 Commander 解析后的 options 对象）
  * @param context CLI 上下文
  * @returns 解析后的目标拓扑信息（仅信息解析，不创建 Service 实例）
  */
 export declare function resolveTargetFromOptions(options: TargetResolutionOptions, context?: CliContext): ResolvedTarget;
+/**
+ * 命令目标与动作引用解析结果。
+ */
+export interface CommandTargetResolution {
+    /** 目标拓扑信息 */
+    resolved: ResolvedTarget;
+    /** 是否为远端目标 */
+    isRemote: boolean;
+    /** 本地封闭技能目录视图（非本地技能目录时为 null） */
+    localSkill: LocalSkillDirectory | null;
+    /** 本地包根目录路径（远端分支为 undefined，未找到为 undefined） */
+    targetPackageRoot?: string;
+    /** 统一计算目标 Action 引用的辅助函数 */
+    resolveActionRef: (actionId: string) => string;
+}
+/**
+ * 统一解析 CLI 命令的目标拓扑与包作用域（run, describe, list 等命令的单一事实源）。
+ *
+ * 保证：
+ * - 优先判定目标拓扑；
+ * - 远端目标（remote）完全隔离：不执行任何本地目录探测、清单加载或包根寻址；
+ * - 远端目标动作引用保持原始词法包 ID 拼接（${options.package}/${actionId}），绝不被本地同名目录或清单 ID 篡改；
+ * - 本地目标按本地封闭技能目录或工程包严格解析，不存在时透明抛出 packageNotFoundError。
+ */
+export declare function resolveCommandTarget(options: TargetResolutionOptions, context?: CliContext): CommandTargetResolution;
+/**
+ * 配置与状态管理目标作用域。
+ */
+export interface TargetPackageScope {
+    /** 解析后的目标拓扑 */
+    resolved: ResolvedTarget;
+    /** 是否为远端目标 */
+    isRemote: boolean;
+    /** 目标包标识（远端为 options.package 原值，本地为工程配置 id 或 "global"） */
+    packageId: string;
+    /** 本地工程根目录（远端分支为 undefined） */
+    root?: string;
+    /** 本地工程配置（远端分支为 undefined） */
+    projConfig?: ReturnType<typeof loadProjectConfig>;
+}
+/**
+ * 校验并拒绝复合技能目录用于配置或状态管理命令（单一事实源）。
+ */
+export declare function assertNotCompositeSkill(packageOption?: string): void;
+/**
+ * 统一解析配置与状态命令的目标作用域（支持单包技能目录、本地工程、远端服务与 --profile local）。
+ */
+export declare function resolveTargetPackageScope(options: TargetResolutionOptions, context?: CliContext): TargetPackageScope;
 /**
  * 高阶服务执行辅助：统一封装「目标解析 → Service 创建 → 业务回调 → try/finally close」样板。
  *

package/dist/utils/target.js

@@ -1,7 +1,7 @@
-import { connectActionDock, createActionDock, createNodePlatform, findProjectRoot, } from "@actiondock/core";
+import { connectActionDock, createActionDock, createNodePlatform, findProjectRoot, inspectLocalPackageDirectory, isExplicitPath, loadProjectConfig, } from "@actiondock/core";
 import { resolvePackageRoot, } from "@actiondock/core/registry";
 import { resolveTarget, } from "@actiondock/core/profile";
-import { ArgumentError } from "../errors.js";
+import { ArgumentError, packageNotFoundError } from "../errors.js";
 /**
  * 统一为 Commander 命令节点挂载目标环境解析相关选项（单一事实源）。
  * 包括：-p/--profile, -s/--server, -t/--token, -k/--insecure, --allow-insecure-http。
@@ -20,14 +20,36 @@ export function applyTargetOptions(command) {
 /**
  * 目标拓扑解析单一入口：从命令选项视图解析远端/本地目标拓扑信息。
  *
- * 收拢全部解析字段（profile/server/token/insecure/allowInsecureHttp），
- * 消除命令间逐字段内联复制导致的漂移（如漏传 allowInsecureHttp）。
+ * 显式路径与包标识符分类规则：
+ * - 显式路径形态（以 .、/、~ 开头或包含非 scoped 分隔符）：
+ *   严格作为本地技能或包目录解析；禁止与显式远端选项（--server 或非 local 的 --profile）组合，违规抛出 ArgumentError；
+ *   不受隐式 Profile 或 ACTIONDOCK_SERVER_URL 环境变量改变目标，本地执行优先；
+ *   若本地目录不存在或不合法，抛出 packageNotFoundError；
+ * - 纯词法包标识符（如 pkg.a、@scope/pkg）：
+ *   若存在远端目标（显式 --server、非 local profile 或默认远端环境），严格作为远端包标识解析，绝不因本地 cwd 存在同名目录而劫持为本地执行；
+ *   若无远端目标，正常按本地目标解析。
  *
  * @param options 命令选项视图（支持直接传入 Commander 解析后的 options 对象）
  * @param context CLI 上下文
  * @returns 解析后的目标拓扑信息（仅信息解析，不创建 Service 实例）
  */
 export function resolveTargetFromOptions(options, context) {
+    const isExplicit = options.package ? isExplicitPath(options.package) : false;
+    if (isExplicit) {
+        const hasExplicitServer = Boolean(options.server && options.server.trim());
+        const hasExplicitProfile = Boolean(options.profile && options.profile.trim() && options.profile.trim() !== "local");
+        if (hasExplicitServer || hasExplicitProfile) {
+            throw new ArgumentError("Cannot combine local package/skill directory with remote target options (--server or --profile). Specify a package ID for remote targets, or remove remote target options for local directory execution.");
+        }
+        const localSkill = inspectLocalPackageDirectory(options.package);
+        if (!localSkill) {
+            throw packageNotFoundError(options.package);
+        }
+        return {
+            type: "local",
+            profileName: "local",
+        };
+    }
     return resolveTarget({
         profile: options.profile,
         server: options.server,
@@ -36,6 +58,143 @@ export function resolveTargetFromOptions(options, context) {
         allowInsecureHttp: options.allowInsecureHttp,
     }, context?.customHome);
 }
+/**
+ * 统一解析 CLI 命令的目标拓扑与包作用域（run, describe, list 等命令的单一事实源）。
+ *
+ * 保证：
+ * - 优先判定目标拓扑；
+ * - 远端目标（remote）完全隔离：不执行任何本地目录探测、清单加载或包根寻址；
+ * - 远端目标动作引用保持原始词法包 ID 拼接（${options.package}/${actionId}），绝不被本地同名目录或清单 ID 篡改；
+ * - 本地目标按本地封闭技能目录或工程包严格解析，不存在时透明抛出 packageNotFoundError。
+ */
+export function resolveCommandTarget(options, context) {
+    const resolved = resolveTargetFromOptions(options, context);
+    if (resolved.type === "remote") {
+        return {
+            resolved,
+            isRemote: true,
+            localSkill: null,
+            targetPackageRoot: undefined,
+            resolveActionRef: (actionId) => {
+                if (options.package && !actionId.includes("/")) {
+                    return `${options.package}/${actionId}`;
+                }
+                return actionId;
+            },
+        };
+    }
+    // 本地分支
+    const localSkill = options.package ? inspectLocalPackageDirectory(options.package) : null;
+    const targetPackageRoot = localSkill
+        ? localSkill.root
+        : options.package
+            ? resolveLocalPackageRoot(options.package)
+            : findProjectRoot();
+    if (options.package && !targetPackageRoot) {
+        throw packageNotFoundError(options.package);
+    }
+    return {
+        resolved,
+        isRemote: false,
+        localSkill,
+        targetPackageRoot: targetPackageRoot || undefined,
+        resolveActionRef: (actionId) => {
+            if (!options.package)
+                return actionId;
+            if (localSkill) {
+                if (localSkill.type === "single" && !actionId.includes("/")) {
+                    return `${localSkill.packages[0].packageId}/${actionId}`;
+                }
+                // 复合技能短名不拼目录名，保持 actionId 供 Host resolveAction 裁决唯一匹配或多包歧义
+                return actionId;
+            }
+            if (!actionId.includes("/")) {
+                return `${options.package}/${actionId}`;
+            }
+            return actionId;
+        },
+    };
+}
+/**
+ * 校验并拒绝复合技能目录用于配置或状态管理命令（单一事实源）。
+ */
+export function assertNotCompositeSkill(packageOption) {
+    if (!packageOption)
+        return;
+    const localSkill = inspectLocalPackageDirectory(packageOption);
+    if (localSkill?.type === "composite") {
+        throw new ArgumentError("Multi-package entries do not support config/state management; configure actions using --config and --data-dir.");
+    }
+}
+/**
+ * 统一解析配置与状态命令的目标作用域（支持单包技能目录、本地工程、远端服务与 --profile local）。
+ */
+export function resolveTargetPackageScope(options, context) {
+    // 1. 目标拓扑解析
+    const resolved = resolveTargetFromOptions(options, context);
+    // 2. 远端分支：直接消费 options.package，不触碰本地文件系统
+    if (resolved.type === "remote") {
+        return {
+            resolved,
+            isRemote: true,
+            packageId: options.package || "",
+            root: undefined,
+            projConfig: undefined,
+        };
+    }
+    // 3. 复合技能目录守卫（单一事实源）仅在本地分支生效
+    assertNotCompositeSkill(options.package);
+    // 4. 本地分支：统一解析单包目录、工程包或全局作用域
+    if (options.package) {
+        const localSkill = inspectLocalPackageDirectory(options.package);
+        if (localSkill?.type === "single") {
+            const pkg = localSkill.packages[0];
+            return {
+                resolved,
+                isRemote: false,
+                packageId: pkg.packageId,
+                root: pkg.packageRoot,
+                projConfig: pkg.projectConfig,
+            };
+        }
+        const root = resolveLocalPackageRoot(options.package);
+        if (!root) {
+            throw packageNotFoundError(options.package);
+        }
+        const projConfig = loadProjectConfig(root);
+        return {
+            resolved,
+            isRemote: false,
+            packageId: projConfig.id,
+            root,
+            projConfig,
+        };
+    }
+    // 未指定 -P：当前目录工程探测
+    const root = findProjectRoot();
+    if (root) {
+        try {
+            const projConfig = loadProjectConfig(root);
+            return {
+                resolved,
+                isRemote: false,
+                packageId: projConfig.id,
+                root,
+                projConfig,
+            };
+        }
+        catch {
+            // 当前目录配置损坏时仍允许全局操作
+        }
+    }
+    return {
+        resolved,
+        isRemote: false,
+        packageId: "global",
+        root: undefined,
+        projConfig: undefined,
+    };
+}
 /**
  * 高阶服务执行辅助：统一封装「目标解析 → Service 创建 → 业务回调 → try/finally close」样板。
  *
@@ -56,10 +215,13 @@ export async function withService(options, context, fn, localOptions) {
     if (localOptions?.requireRemote && resolved.type === "local") {
         throw new ArgumentError("'ad runs cancel' is only supported for remote execution targets. Use --profile <name> or --server <url>.");
     }
+    const localSkill = resolved.type === "local" && options.package
+        ? inspectLocalPackageDirectory(options.package)
+        : null;
     // localRoot 仅在 local 分支求值，避免远端模式下触发包寻址副作用
-    const localRoot = resolved.type === "local"
+    const localRoot = resolved.type === "local" && !localSkill
         ? (typeof localOptions?.localRoot === "function" ? localOptions.localRoot() : localOptions?.localRoot) ??
-            findProjectRoot() ??
+            (options.package ? resolveLocalPackageRoot(options.package) : findProjectRoot()) ??
             undefined
         : undefined;
     const recoverOrphans = localOptions?.recoverOrphans ?? (localOptions?.ownDataDir === true);
@@ -70,20 +232,38 @@ export async function withService(options, context, fn, localOptions) {
             insecure: resolved.insecure,
             allowInsecureHttp: resolved.allowInsecureHttp ?? options.allowInsecureHttp,
         })
-        : await createActionDock({
-            type: "local",
-            projectRoot: localRoot,
-            customHome: context?.customHome,
-            dataDir: options.dataDir || context?.dataDir,
-            platform: createNodePlatform({
+        : localSkill
+            ? await createActionDock({
+                type: "local",
+                packages: localSkill.packages.map((pkg) => ({
+                    packageRoot: pkg.packageRoot,
+                    projectConfig: pkg.projectConfig,
+                    dataDir: options.dataDir || context?.dataDir,
+                })),
+                customHome: context?.customHome,
+                dataDir: options.dataDir || context?.dataDir,
+                platform: createNodePlatform({
+                    customHome: context?.customHome,
+                    dataDir: options.dataDir || context?.dataDir,
+                }),
+                autoLoadCurrentProject: false,
+                scanLinkedPackages: false,
+                recoverOrphans,
+            })
+            : await createActionDock({
+                type: "local",
+                projectRoot: localRoot,
                 customHome: context?.customHome,
                 dataDir: options.dataDir || context?.dataDir,
-            }),
-            ...(localOptions?.scanLinkedPackages !== undefined
-                ? { scanLinkedPackages: localOptions.scanLinkedPackages }
-                : undefined),
-            recoverOrphans,
-        });
+                platform: createNodePlatform({
+                    customHome: context?.customHome,
+                    dataDir: options.dataDir || context?.dataDir,
+                }),
+                ...(localOptions?.scanLinkedPackages !== undefined
+                    ? { scanLinkedPackages: localOptions.scanLinkedPackages }
+                    : undefined),
+                recoverOrphans,
+            });
     try {
         await fn(service, resolved);
     }
@@ -97,6 +277,10 @@ export async function withService(options, context, fn, localOptions) {
  */
 export function resolveLocalPackageRoot(pkgId) {
     if (pkgId) {
+        const localSkill = inspectLocalPackageDirectory(pkgId);
+        if (localSkill) {
+            return localSkill.root;
+        }
         return resolvePackageRoot(pkgId);
     }
     return findProjectRoot();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actiondock/cli",
-  "version": "2.12.0",
+  "version": "2.14.0",
   "description": "ActionDock CLI facade for developing, testing, building, and exporting standalone Agent Actions and Skills",
   "type": "module",
   "bin": {
@@ -34,10 +34,10 @@
     "test": "node ../../scripts/run-tests.ts"
   },
   "dependencies": {
-    "@actiondock/builder": "^2.12.0",
-    "@actiondock/core": "^2.12.0",
-    "@actiondock/mcp": "^2.12.0",
-    "@actiondock/sdk": "^2.12.0",
+    "@actiondock/builder": "^2.14.0",
+    "@actiondock/core": "^2.14.0",
+    "@actiondock/mcp": "^2.14.0",
+    "@actiondock/sdk": "^2.14.0",
     "commander": "^13.1.0",
     "selfsigned": "^5.5.0"
   },

package/dist/utils/warning.d.ts

@@ -1,4 +0,0 @@
-/**
- * 实验性特性警告静默函数（统一对齐 @actiondock/core/warning 单一事实源）。
- */
-export { suppressExperimentalWarnings } from "@actiondock/core/warning";

package/dist/utils/warning.js

@@ -1,4 +0,0 @@
-/**
- * 实验性特性警告静默函数（统一对齐 @actiondock/core/warning 单一事实源）。
- */
-export { suppressExperimentalWarnings } from "@actiondock/core/warning";