@actiondock/cli 2.15.0 → 2.16.0

package/dist/commands/config/delete.js

@@ -1,6 +1,8 @@
-import { ArgumentError } from "../../errors.js";
+import { loadProjectConfig, } from "@actiondock/core";
+import { resolvePackageRoot, } from "@actiondock/core/registry";
+import { ArgumentError, packageNotFoundError } from "../../errors.js";
 import { writeStdout } from "../../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, resolveTargetPackageScope, withService, } from "../../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, withService } from "../../utils/index.js";
 /**
  * 注册 config delete 子命令：删除配置项。
  *
@@ -20,22 +22,31 @@ export function registerConfigDeleteCommand(configCmd, context) {
         if (!key) {
             throw new ArgumentError("Configuration key is required");
         }
-        const scope = resolveTargetPackageScope(options, context);
+        const root = resolvePackageRoot(options.package);
         await withService(options, context, async (service, resolved) => {
             if (resolved.type === "remote") {
-                await service.management?.config.delete(scope.packageId, key);
+                await service.management?.config.delete(options.package || "", key);
                 writeStdout(`[OK] Configuration '${key}' deleted from remote server`, context);
                 return;
             }
-            if (options.global || (!scope.root && !options.package)) {
+            if (options.global) {
                 await service.management?.config.delete("global", key);
                 writeStdout(`[OK] Global configuration '${key}' deleted`, context);
                 return;
             }
-            await service.management?.config.delete(scope.packageId, key);
-            writeStdout(`[OK] Configuration '${key}' deleted for package '${scope.packageId}'`, context);
+            if (!root) {
+                if (options.package) {
+                    throw packageNotFoundError(options.package);
+                }
+                await service.management?.config.delete("global", key);
+                writeStdout(`[OK] Global configuration '${key}' deleted`, context);
+                return;
+            }
+            const projConfig = loadProjectConfig(root);
+            await service.management?.config.delete(projConfig.id, key);
+            writeStdout(`[OK] Configuration '${key}' deleted for package '${projConfig.id}'`, context);
         }, 
         // 按实际查询范围打开存储：显式包寻址结果作为本地根目录传递
-        { localRoot: scope.root });
+        { localRoot: root || undefined });
     });
 }

package/dist/commands/config/env.js

@@ -2,7 +2,7 @@ import { resolveEnvValue } from "@actiondock/core";
 import { fetchRemoteConfigEnv } from "@actiondock/core/profile";
 import { isSecretConfigKey, } from "@actiondock/core/project";
 import { renderConfigEnv, renderResult } from "../../renderer.js";
-import { applyTargetOptions, assertNotCompositeSkill, getEffectiveOptions, requirePackageRoot, resolveTargetFromOptions, } from "../../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, requirePackageRoot, resolveTargetFromOptions } from "../../utils/index.js";
 /**
  * 注册 config env 子命令：诊断环境变量对声明配置的满足率。
  *
@@ -18,7 +18,7 @@ export function registerConfigEnvCommand(configCmd, context) {
         .action(async (identifier, rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         const targetPkg = identifier || options.package;
-        // 1. 目标拓扑解析（远端服务分支完全隔离本地文件系统）
+        // 远端服务分支直接查询远端配置环境诊断接口
         const target = resolveTargetFromOptions(options, context);
         if (target.type === "remote") {
             const res = await fetchRemoteConfigEnv(target.serverUrl, target.token, targetPkg, {
@@ -37,7 +37,6 @@ export function registerConfigEnvCommand(configCmd, context) {
             return;
         }
         // 本地项目分支
-        assertNotCompositeSkill(targetPkg);
         const { root, projConfig } = requirePackageRoot(targetPkg, {
             loadConfig: true,
             hint: "Usage: ad config env [package-id] or cd into a project directory.",

package/dist/commands/config/get.js

@@ -1,10 +1,11 @@
 import { fetchRemoteConfig, } from "@actiondock/core/profile";
 import { isSecretConfigKey, maskSecretValue, } from "@actiondock/core/project";
 import { loadProjectConfig, } from "@actiondock/core";
-import { ArgumentError } from "../../errors.js";
+import { resolvePackageRoot, } from "@actiondock/core/registry";
+import { ArgumentError, packageNotFoundError } from "../../errors.js";
 import { renderResult } from "../../renderer.js";
 import { resolveMergedConfigEntry } from "../../services/config-merge.js";
-import { applyTargetOptions, getEffectiveOptions, resolveTargetPackageScope, withService, } from "../../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, resolveTargetFromOptions, withService, } from "../../utils/index.js";
 /**
  * 注册 config get 子命令：查询指定配置键的生效值。
  *
@@ -26,11 +27,12 @@ export function registerConfigGetCommand(configCmd, context) {
             throw new ArgumentError("Configuration key is required");
         }
         const reveal = Boolean(options.reveal || options.showSecrets);
-        const scope = resolveTargetPackageScope(options, context);
-        if (scope.isRemote) {
-            const res = await fetchRemoteConfig(scope.resolved.serverUrl, scope.resolved.token, scope.packageId, {
+        // 远端服务分支不经过 Target 门面，直接查询远端配置接口
+        const target = resolveTargetFromOptions(options, context);
+        if (target.type === "remote") {
+            const res = await fetchRemoteConfig(target.serverUrl, target.token, options.package, {
                 allowInsecureHttp: Boolean(options.allowInsecureHttp),
-                insecure: scope.resolved.insecure,
+                insecure: target.insecure,
             });
             const val = res.values?.[key];
             const isSecret = isSecretConfigKey(key, res.declared?.[key]);
@@ -48,8 +50,13 @@ export function registerConfigGetCommand(configCmd, context) {
             });
             return;
         }
+        // 本地分支
+        const root = resolvePackageRoot(options.package);
         await withService(options, context, async (service) => {
-            if (options.global || !scope.root) {
+            if (options.global || !root) {
+                if (!options.global && options.package && !root) {
+                    throw packageNotFoundError(options.package);
+                }
                 const confView = await service.management?.config.get("global", key);
                 const val = confView?.value;
                 const isSecret = confView?.secret ?? isSecretConfigKey(key);
@@ -67,10 +74,10 @@ export function registerConfigGetCommand(configCmd, context) {
                 });
                 return;
             }
-            const projConfig = scope.projConfig || loadProjectConfig(scope.root);
+            const projConfig = loadProjectConfig(root);
             const declaredItem = projConfig.config?.[key];
             // 合并优先级链单一事实源：项目包级 > 全局持久化 > 环境变量 > 声明默认值
-            const { value: displayValue, source, secret: isSecret } = await resolveMergedConfigEntry(key, scope.packageId, declaredItem, service, reveal);
+            const { value: displayValue, source, secret: isSecret } = await resolveMergedConfigEntry(key, projConfig.id, declaredItem, service, reveal);
             const payload = {
                 key,
                 value: displayValue,
@@ -84,6 +91,6 @@ export function registerConfigGetCommand(configCmd, context) {
             });
         }, 
         // 按实际查询范围打开存储：显式包寻址结果作为本地根目录传递
-        { localRoot: scope.root });
+        { localRoot: root || undefined });
     });
 }

package/dist/commands/config/list.js

@@ -1,9 +1,10 @@
 import { fetchRemoteConfig, } from "@actiondock/core/profile";
 import { loadProjectConfig, } from "@actiondock/core";
 import { filterWithFallbackInfo, isSecretConfigKey, maskSecretValue, } from "@actiondock/core/project";
+import { packageNotFoundError } from "../../errors.js";
 import { renderConfigList, renderResult } from "../../renderer.js";
 import { buildMergedConfigEntries } from "../../services/config-merge.js";
-import { applyTargetOptions, getEffectiveOptions, remoteTargetLabel, resolveFallbackStrategy, resolveIntent, resolveTargetPackageScope, withService, } from "../../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, remoteTargetLabel, resolveFallbackStrategy, resolveIntent, resolveLocalPackageRoot, resolveTargetFromOptions, withService, } from "../../utils/index.js";
 /**
  * 构造单条配置项的展示视图（含掩码决策，reveal 为假且为敏感键时打码）。
  * 掩码决策收敛于命令层，renderer 仅负责值的字符串格式化。
@@ -41,24 +42,29 @@ export function registerConfigListCommand(configCmd, context) {
         const effectiveIntent = resolveIntent(options.intent, patterns);
         const { shouldFallback } = resolveFallbackStrategy(options);
         const reveal = Boolean(options.reveal || options.showSecrets);
-        const scope = resolveTargetPackageScope(options, context);
-        if (scope.isRemote) {
-            const res = await fetchRemoteConfig(scope.resolved.serverUrl, scope.resolved.token, scope.packageId, {
+        // 远端服务分支不经过 Target 门面，直接查询远端配置接口
+        const remoteTargetInfo = resolveTargetFromOptions(options, context);
+        if (remoteTargetInfo.type === "remote") {
+            const res = await fetchRemoteConfig(remoteTargetInfo.serverUrl, remoteTargetInfo.token, options.package, {
                 allowInsecureHttp: Boolean(options.allowInsecureHttp),
-                insecure: scope.resolved.insecure,
+                insecure: remoteTargetInfo.insecure,
             });
             const entries = Object.entries(res.values || {}).map(([k, v]) => toDisplayEntry(k, v, "remote", isSecretConfigKey(k, res.declared?.[k]), reveal, res.declared?.[k]?.description || ""));
             renderResult(entries, {
                 json: options.json,
-                humanFormatter: () => renderConfigList(entries, remoteTargetLabel(scope.resolved), false, effectiveIntent),
+                humanFormatter: () => renderConfigList(entries, remoteTargetLabel(remoteTargetInfo), false, effectiveIntent),
                 context,
             });
             return;
         }
         // 本地分支（通过 Service 门面统一访问）：显式包寻址结果作为本地根目录传递（仅 local 分支求值）
         await withService(options, context, async (service) => {
+            const root = resolveLocalPackageRoot(options.package) || undefined;
             // 全局作用域分支：显式 --global 或无工程回退时仅列举全局配置
-            if (options.global || !scope.root) {
+            if (options.global || !root) {
+                if (!options.global && options.package) {
+                    throw packageNotFoundError(options.package);
+                }
                 const all = (await service.management?.config.list("global")) ?? [];
                 const entries = all.map((item) => toDisplayEntry(item.key, item.value, "global", item.secret || isSecretConfigKey(item.key), reveal));
                 const filterRes = filterWithFallbackInfo(entries, effectiveIntent, [(c) => c.key, (c) => c.value], shouldFallback);
@@ -69,9 +75,9 @@ export function registerConfigListCommand(configCmd, context) {
                 });
                 return;
             }
-            const projConfig = scope.projConfig || loadProjectConfig(scope.root);
+            const projConfig = loadProjectConfig(root);
             // 跨作用域合并视图单一事实源：项目包级 > 全局持久化 > 环境变量 > 声明默认值
-            const merged = await buildMergedConfigEntries(scope.root, service, reveal);
+            const merged = await buildMergedConfigEntries(root, service, reveal);
             const filterRes = filterWithFallbackInfo(merged, effectiveIntent, [(c) => c.key, (c) => c.value, (c) => c.description, (c) => c.source], shouldFallback);
             renderResult(filterRes.items, {
                 json: options.json,
@@ -79,7 +85,7 @@ export function registerConfigListCommand(configCmd, context) {
                 context,
             });
         }, {
-            localRoot: scope.root,
+            localRoot: () => resolveLocalPackageRoot(options.package) || undefined,
         });
     });
 }

package/dist/commands/config/schema.js

@@ -2,7 +2,7 @@ import { isSecretConfigKey, } from "@actiondock/core/project";
 import { notInProjectError } from "../../errors.js";
 import { renderConfigSchema, renderResult } from "../../renderer.js";
 import { buildMergedConfigEntries } from "../../services/config-merge.js";
-import { applyTargetOptions, assertNotCompositeSkill, getEffectiveOptions, requirePackageRoot, withService, } from "../../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, requirePackageRoot, withService } from "../../utils/index.js";
 /**
  * 注册 config schema 子命令：检查声明配置的解析状态。
  *
@@ -25,18 +25,17 @@ export function registerConfigSchemaCommand(configCmd, context) {
         .option("--json", "Output as JSON")
         .action(async (identifier, rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
-        // 远端目标显式拒绝：schema 状态推导依赖本地工程声明与环境变量解析，
-        // 远端作用域无法获得等价视图，静默落到本地会误导调用方
-        if (options.profile || options.server) {
-            throw notInProjectError("'ad config schema' only supports local projects. Remote targets are not supported for schema inspection.");
-        }
         const targetPkg = identifier || options.package;
-        assertNotCompositeSkill(targetPkg);
         const { root, projConfig } = requirePackageRoot(targetPkg, {
             loadConfig: true,
             hint: "Usage: ad config schema [package-id] or cd into a project directory.",
         });
         const declared = projConfig.config || {};
+        // 远端目标显式拒绝：schema 状态推导依赖本地工程声明与环境变量解析，
+        // 远端作用域无法获得等价视图，静默落到本地会误导调用方
+        if (options.profile || options.server) {
+            throw notInProjectError("'ad config schema' only supports local projects. Remote targets are not supported for schema inspection.");
+        }
         // 跨作用域合并视图单一事实源：与 config list 共享同一条优先级链
         await withService(options, context, async (service) => {
             const merged = await buildMergedConfigEntries(root, service, true);

package/dist/commands/config/set.js

@@ -1,7 +1,9 @@
 import { isSecretConfigKey, } from "@actiondock/core/project";
-import { ArgumentError } from "../../errors.js";
+import { loadProjectConfig, } from "@actiondock/core";
+import { resolvePackageRoot, } from "@actiondock/core/registry";
+import { ArgumentError, packageNotFoundError } from "../../errors.js";
 import { writeStdout } from "../../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, resolveTargetPackageScope, withService, } from "../../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, withService } from "../../utils/index.js";
 import { resolveConfigValueInput } from "../../prompt.js";
 /**
  * 注册 config set 子命令：写入配置值（支持标准输入与安全提示）。
@@ -22,8 +24,22 @@ export function registerConfigSetCommand(configCmd, context) {
         if (!key) {
             throw new ArgumentError("Configuration key is required");
         }
-        const scope = resolveTargetPackageScope(options, context);
-        const declaredDef = scope.projConfig?.config?.[key];
+        let root = null;
+        let projConfig = null;
+        let declaredDef;
+        if (!options.global && !options.profile && !options.server) {
+            root = resolvePackageRoot(options.package);
+            if (root) {
+                try {
+                    projConfig = loadProjectConfig(root);
+                    declaredDef = projConfig.config?.[key];
+                }
+                catch (err) {
+                    // 清单损坏时必须让错误可见：静默忽略会导致写入错误的作用域
+                    throw err;
+                }
+            }
+        }
         const isSecret = isSecretConfigKey(key, declaredDef);
         let effectiveValueStr = rawVal;
         if (effectiveValueStr === undefined || options.stdin) {
@@ -44,21 +60,27 @@ export function registerConfigSetCommand(configCmd, context) {
         // 目标解析与写入（远端分支直接写远端作用域，本地分支按全局/项目作用域写入）
         await withService(options, context, async (service, resolved) => {
             if (resolved.type === "remote") {
-                await service.management?.config.set(scope.packageId, key, parsedVal);
+                await service.management?.config.set(options.package || "", key, parsedVal);
                 writeStdout(`[OK] Configuration '${key}' updated on remote server`, context);
                 return;
             }
-            if (options.global || (!scope.root && !options.package)) {
+            if (options.global) {
+                await service.management?.config.set("global", key, parsedVal);
+                writeStdout(`[OK] Global configuration '${key}' updated`, context);
+                return;
+            }
+            if (!root) {
+                if (options.package) {
+                    throw packageNotFoundError(options.package);
+                }
                 await service.management?.config.set("global", key, parsedVal);
-                writeStdout(!scope.root && !options.package
-                    ? `[OK] Global configuration '${key}' updated (no project in current directory)`
-                    : `[OK] Global configuration '${key}' updated`, context);
+                writeStdout(`[OK] Global configuration '${key}' updated (no project in current directory)`, context);
                 return;
             }
-            await service.management?.config.set(scope.packageId, key, parsedVal);
-            writeStdout(`[OK] Configuration '${key}' updated for package '${scope.packageId}'`, context);
+            await service.management?.config.set(projConfig.id, key, parsedVal);
+            writeStdout(`[OK] Configuration '${key}' updated for package '${projConfig.id}'`, context);
         }, 
         // 按实际查询范围打开存储：显式包寻址结果作为本地根目录传递
-        { localRoot: scope.root });
+        { localRoot: root || undefined });
     });
 }

package/dist/commands/describe.js

@@ -1,8 +1,8 @@
 import { ACTION_NOT_FOUND, PACKAGE_NOT_FOUND, NOT_FOUND, } from "@actiondock/core";
 import { buildActionDescribePayload, } from "@actiondock/core/project";
-import { ArgumentError, ExecutionError } from "../errors.js";
+import { ArgumentError, ExecutionError, packageNotFoundError } from "../errors.js";
 import { formatActionDetail, renderResult } from "../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, resolveCommandTarget, withService, } from "../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, resolveLocalPackageRoot, withService, } from "../utils/index.js";
 /**
  * 挂载 describe 子命令至指定 Commander 节点。
  *
@@ -22,9 +22,12 @@ export function attachDescribeCommand(parent, context) {
         if (!id) {
             throw new ArgumentError("Action ID is required for describe");
         }
-        // 目标拓扑与动作引用解析（远端目标完全隔离本地文件系统）
-        const target = resolveCommandTarget(options, context);
-        const targetRef = target.resolveActionRef(id);
+        // 目标拓扑解析（仅 local 分支需要包寻址）
+        const targetPackageRoot = resolveLocalPackageRoot(options.package);
+        if (options.package && !targetPackageRoot) {
+            throw packageNotFoundError(options.package);
+        }
+        const targetRef = id;
         // 通过 Service 门面统一查询 Action 规范
         await withService(options, context, async (service) => {
             let spec;
@@ -47,7 +50,7 @@ export function attachDescribeCommand(parent, context) {
                 humanFormatter: () => formatActionDetail(payload),
                 context,
             });
-        }, { localRoot: target.targetPackageRoot, scanLinkedPackages: !target.localSkill });
+        }, { localRoot: targetPackageRoot || undefined, scanLinkedPackages: true });
     });
 }
 /**

package/dist/commands/info.js

@@ -1,11 +1,10 @@
-import { isExplicitPath, } from "@actiondock/core";
-import { filterWithFallbackInfo, } from "@actiondock/core/project";
 import { fetchRemoteInfo, } from "@actiondock/core/profile";
+import { filterWithFallbackInfo, } from "@actiondock/core/project";
 import { getRegistryStatus, resolvePackageRoot, } from "@actiondock/core/registry";
-import { ArgumentError, ExecutionError, NO_PROJECT_NO_LINKED_MESSAGE, packageNotFoundError } from "../errors.js";
-import { projectDetailToJson, renderAggregatedPackages, renderCompositeSkillDetail, renderProjectDetail, renderRegistryTree, renderResult, } from "../renderer.js";
-import { buildCompositeDetails, filterProjectDetails, getProjectDetailInfo, scanLocalAggregatedPackages, } from "../services/index.js";
-import { applyTargetOptions, getEffectiveOptions, resolveCommandTarget, resolveFallbackStrategy, resolveIntent, } from "../utils/index.js";
+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, resolveTargetFromOptions, } from "../utils/index.js";
 /**
  * 将远端信息响应归一为本地工程详情视图。
  */
@@ -52,49 +51,9 @@ function remoteInfoToDetail(remoteInfo) {
  * 渲染工程详情输出（机器模式输出视图转换结果，人类模式渲染详情）。
  */
 function renderProjectDetailOutput(detail, options) {
-    const { matchedCount, isFallback } = filterProjectDetails([detail], options.effectiveIntent, Boolean(options.shouldFallback));
-    if (matchedCount === 0 && !isFallback) {
-        if (options.isMachine) {
-            renderResult({ root: detail.projectRoot, packages: [], matchedCount: 0, isFallback: false }, options);
-            return;
-        }
-        throw new ExecutionError(`No packages matched intent '${options.effectiveIntent}'`);
-    }
-    renderResult({
-        ...projectDetailToJson(detail),
-        ...(options.effectiveIntent ? { matchedCount, isFallback } : {}),
-    }, {
-        json: options.json,
-        humanFormatter: () => (isFallback ? `(No packages matched intent '${options.effectiveIntent}', showing selected package)\n\n` : "") +
-            renderProjectDetail(detail),
-        context: options.context,
-    });
-}
-/**
- * 渲染复合技能整体输出（机器模式输出聚合结构，人类模式渲染各子包卡片）。
- */
-function renderCompositeSkillOutput(root, details, options) {
-    const outOpts = { json: options.json, context: options.context };
-    const { items: filteredDetails, isFallback, matchedCount } = filterProjectDetails(details, options.effectiveIntent, Boolean(options.shouldFallback));
-    if (options.effectiveIntent && matchedCount === 0 && !isFallback) {
-        if (options.isMachine) {
-            renderResult({ root, packages: [], matchedCount: 0, isFallback: false }, outOpts);
-            return;
-        }
-        throw new ExecutionError(`No packages matched intent '${options.effectiveIntent}' in skill directory`);
-    }
-    if (options.isMachine) {
-        const machineResult = {
-            root,
-            packages: filteredDetails.map(projectDetailToJson),
-            ...(options.effectiveIntent ? { matchedCount, isFallback } : {}),
-        };
-        renderResult(machineResult, outOpts);
-        return;
-    }
-    renderResult(filteredDetails, {
+    renderResult(projectDetailToJson(detail), {
         json: options.json,
-        humanFormatter: () => renderCompositeSkillDetail(root, filteredDetails, isFallback, options.effectiveIntent),
+        humanFormatter: () => renderProjectDetail(detail),
         context: options.context,
     });
 }
@@ -118,25 +77,18 @@ export function registerInfoCommand(program, context) {
         .option("--data-dir <path>", "Custom database storage directory")
         .action(async (patterns = [], rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
-        // 唯一显式路径位置参数属于寻址目标，必须先于远端与树状图分支裁决。
-        if (!options.package && !options.intent && patterns.length === 1 && isExplicitPath(patterns[0])) {
-            options.package = patterns[0];
-            patterns = [];
-        }
         const effectiveIntent = resolveIntent(options.intent, patterns);
         const { isMachine, shouldFallback } = resolveFallbackStrategy(options);
         const outOpts = { json: options.json, context };
-        const detailOpts = { ...outOpts, effectiveIntent, shouldFallback, isMachine };
-        // info 仅查询单包清单，复合目录仍保留封闭集合校验。
-        const target = resolveCommandTarget(options, context, { metadataOnly: true });
         // 远端服务目标分支
-        if (target.isRemote) {
-            const remoteInfo = await fetchRemoteInfo(target.resolved.serverUrl, target.resolved.token, {
+        const target = resolveTargetFromOptions(options, context);
+        if (target.type === "remote") {
+            const remoteInfo = await fetchRemoteInfo(target.serverUrl, target.token, {
                 intent: effectiveIntent,
                 package: options.package,
                 tree: Boolean(options.tree),
                 allowInsecureHttp: Boolean(options.allowInsecureHttp),
-                insecure: target.resolved.insecure,
+                insecure: target.insecure,
             });
             if (isMachine) {
                 renderResult(remoteInfo, outOpts);
@@ -164,11 +116,8 @@ export function registerInfoCommand(program, context) {
             });
             return;
         }
-        // 本地注册表树状图分支（若与显式技能或包组合，给出明确 ArgumentError）
+        // 本地注册表树状图分支
         if (options.tree) {
-            if (options.package || target.localSkill) {
-                throw new ArgumentError("Tree view (--tree) is not supported with explicit skill directories or packages; use 'ad info -P <path>' without --tree.");
-            }
             const status = getRegistryStatus(context?.customHome);
             renderResult(status, {
                 json: options.json,
@@ -177,30 +126,12 @@ export function registerInfoCommand(program, context) {
             });
             return;
         }
-        // 显式复合技能分支
-        if (target.localSkill?.type === "composite") {
-            const details = await buildCompositeDetails(target.localSkill);
-            renderCompositeSkillOutput(target.localSkill.root, details, {
-                json: options.json,
-                context,
-                effectiveIntent,
-                shouldFallback,
-                isMachine,
-            });
-            return;
-        }
-        // 显式单包技能分支
-        if (target.localSkill?.type === "single") {
-            const pkg = target.localSkill.packages[0];
-            const detail = await getProjectDetailInfo(pkg.packageRoot);
-            renderProjectDetailOutput(detail, detailOpts);
-            return;
-        }
-        // 显式指定 Package 参数分支（普通包 ID 或路径）
+        // 显式指定 Package 参数分支
         if (options.package) {
-            if (target.targetPackageRoot) {
-                const detail = await getProjectDetailInfo(target.targetPackageRoot);
-                renderProjectDetailOutput(detail, detailOpts);
+            const directRoot = resolvePackageRoot(options.package);
+            if (directRoot) {
+                const detail = await getProjectDetailInfo(directRoot);
+                renderProjectDetailOutput(detail, outOpts);
                 return;
             }
             throw packageNotFoundError(options.package);
@@ -232,18 +163,8 @@ export function registerInfoCommand(program, context) {
         }
         // 有关键字过滤场景：单一位置参数且非显式 --intent 时优先尝试包寻址
         if (patterns.length === 1 && !options.intent) {
-            const directRoot = resolvePackageRoot(patterns[0], undefined, context?.customHome);
+            const directRoot = resolvePackageRoot(patterns[0]);
             if (directRoot) {
-                const directTarget = resolveCommandTarget({ ...options, package: directRoot }, context, { metadataOnly: true });
-                if (directTarget.localSkill?.type === "composite") {
-                    const details = await buildCompositeDetails(directTarget.localSkill);
-                    renderCompositeSkillOutput(directTarget.localSkill.root, details, {
-                        ...outOpts,
-                        shouldFallback,
-                        isMachine,
-                    });
-                    return;
-                }
                 const detail = await getProjectDetailInfo(directRoot);
                 renderProjectDetailOutput(detail, outOpts);
                 return;

package/dist/commands/list.js

@@ -1,6 +1,7 @@
 import { filterWithFallbackInfo, } from "@actiondock/core/project";
+import { packageNotFoundError } from "../errors.js";
 import { renderActionList, renderResult } from "../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, remoteTargetSuffix, resolveCommandTarget, resolveFallbackStrategy, resolveIntent, withService, } from "../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, remoteTargetSuffix, resolveFallbackStrategy, resolveIntent, resolveLocalPackageRoot, withService, } from "../utils/index.js";
 /**
  * 挂载 list 子命令至指定 Commander 节点。
  *
@@ -22,20 +23,22 @@ export function attachListCommand(parent, context) {
         const options = getEffectiveOptions(rawOptions, cmd);
         const effectiveIntent = resolveIntent(options.intent, patterns);
         const { isMachine, shouldFallback } = resolveFallbackStrategy(options);
-        // 目标拓扑与动作引用解析（远端目标完全隔离本地文件系统）
-        const target = resolveCommandTarget(options, context);
+        // 目标拓扑解析（仅 local 分支需要包寻址）
+        const targetPackageRoot = resolveLocalPackageRoot(options.package);
+        if (options.package && !targetPackageRoot) {
+            throw packageNotFoundError(options.package);
+        }
         // 通过 Service 门面统一获取 Action 列表
         await withService(options, context, async (service, resolved) => {
             let rawSummaries = await service.discovery.listActions();
-            // 若指定了包 ID（非本地技能目录），则按包归属精确过滤（本地与远端统一生效）：
+            // 若指定了目标包但本地未过滤，则按包归属精确过滤：
             // 仅保留全限定名命中目标包前缀、或 packageId 归属目标包的条目；
             // 无法归属到目标包的无前缀短 id 条目不放行，避免他包短 id 混入
-            if (options.package && !target.localSkill) {
+            if (options.package && !options.profile && !options.server) {
                 const targetPkg = options.package;
                 rawSummaries = rawSummaries.filter((s) => {
-                    const pkgId = s.packageId;
-                    if (pkgId) {
-                        return (pkgId === targetPkg ||
+                    if (s.packageId) {
+                        return (s.packageId === targetPkg ||
                             s.id === targetPkg ||
                             s.id.startsWith(`${targetPkg}/`));
                     }
@@ -43,17 +46,14 @@ export function attachListCommand(parent, context) {
                     return s.id === targetPkg || s.id.startsWith(`${targetPkg}/`);
                 });
             }
-            const isCompositeSkill = target.localSkill?.type === "composite";
             const rawList = rawSummaries.map((s) => {
                 let id = s.id;
-                // 复合技能保持完全限定 ID，不剥离包名前缀
-                if (!isCompositeSkill && (target.targetPackageRoot || options.package)) {
-                    const targetPkg = target.localSkill ? target.localSkill.packages[0].packageId : options.package;
-                    const pkgId = targetPkg || s.packageId;
+                if (targetPackageRoot || options.package) {
+                    const pkgId = s.packageId || options.package;
                     if (pkgId && id.startsWith(`${pkgId}/`)) {
                         id = id.slice(pkgId.length + 1);
                     }
-                    else if (target.targetPackageRoot && id.includes("/")) {
+                    else if (targetPackageRoot && id.includes("/")) {
                         id = id.slice(id.indexOf("/") + 1);
                     }
                 }
@@ -80,7 +80,7 @@ export function attachListCommand(parent, context) {
             }
             const title = resolved.type === "remote"
                 ? `Actions ${remoteTargetSuffix(resolved)}`
-                : target.targetPackageRoot
+                : targetPackageRoot
                     ? `Actions in ${options.package || "current project"}`
                     : "Available Actions";
             renderResult(filterRes.items, {
@@ -88,7 +88,7 @@ export function attachListCommand(parent, context) {
                 humanFormatter: () => renderActionList(filterRes.items, title, filterRes.isFallback, effectiveIntent),
                 context,
             });
-        }, { localRoot: target.targetPackageRoot, scanLinkedPackages: !target.localSkill });
+        }, { localRoot: targetPackageRoot || undefined, scanLinkedPackages: true });
     });
 }
 /**