feat(agent): add skill-list command and fix pr issues

Author: chenanran555

packages/cli/src/commands.ts

@@ -105,6 +105,7 @@ import {
   managedAgentSessionRun,
   managedAgentSessionSend,
   managedAgentSessionEvents,
+  managedAgentSkillList,
 } from "bailian-cli-commands";
 
 // Full bailian-cli product: every command, exposed under the `bl` binary.
@@ -218,4 +219,5 @@ export const commands: Record<string, AnyCommand> = {
   "managed-agent session run": managedAgentSessionRun,
   "managed-agent session send": managedAgentSessionSend,
   "managed-agent session events": managedAgentSessionEvents,
+  "managed-agent skill-list": managedAgentSkillList,
 };

packages/commands/src/commands/managed-agent/_engine/errors.ts

@@ -38,9 +38,11 @@ function parseSdkResponseBody(raw: string): ApiErrorBody {
  * bl's error handler produces the right exit code and hint formatting.
  * SDK `UserError` → USAGE; SDK `ApiError` (server HTTP error) → GENERAL via
  * `mapApiError` (server message passed through verbatim, with
- * httpStatus/apiCode/requestId metadata for --output json); any other Error →
- * GENERAL (message passed through, per bl's "don't translate server errors"
- * boundary).
+ * httpStatus/apiCode/requestId metadata for --output json); fetch transport
+ * failures (`TypeError: fetch failed`) are rethrown untouched so the runtime
+ * error handler maps them to NETWORK with an errno-specific hint, matching the
+ * native client path; any other Error → GENERAL (message passed through, per
+ * bl's "don't translate server errors" boundary).
  */
 export async function withAgentErrors<T>(fn: () => Promise<T>): Promise<T> {
   try {
@@ -51,6 +53,9 @@ export async function withAgentErrors<T>(fn: () => Promise<T>): Promise<T> {
     if (error instanceof Error && isSdkApiError(error)) {
       throw mapApiError(error.statusCode, parseSdkResponseBody(error.responseBody));
     }
+    // DNS/TCP/TLS failures from the SDK's fetch: keep the original TypeError so
+    // the runtime error handler classifies it as NETWORK (exit 6) + errno hint.
+    if (error instanceof TypeError && error.message === "fetch failed") throw error;
     if (error instanceof Error) throw new BailianError(error.message, ExitCode.GENERAL);
     throw error;
   }

packages/commands/src/commands/managed-agent/skill-list.ts

@@ -0,0 +1,92 @@
+import { defineCommand, detectOutputFormat, type FlagsDef } from "bailian-cli-core";
+import { emitBare, emitResult, formatTable } from "bailian-cli-runtime";
+import { listSkills } from "@openagentpack/sdk";
+import { buildAgentRuntime, CREDENTIALS_NOTE } from "./_engine/config-loader.ts";
+import { withStdoutProtected } from "./_engine/console-capture.ts";
+import { withAgentErrors } from "./_engine/errors.ts";
+
+const SKILL_SOURCES = ["custom", "official", "all"] as const;
+type SkillSource = (typeof SKILL_SOURCES)[number];
+
+const SKILL_LIST_FLAGS = {
+  file: {
+    type: "string",
+    valueHint: "<path>",
+    description: "Config file path (default: agents.yaml)",
+  },
+  source: {
+    type: "string",
+    valueHint: "<source>",
+    description:
+      "Skill catalog: custom (workspace-uploaded, default), official (built-in), or all (both catalogs in one call)",
+  },
+  provider: {
+    type: "string",
+    valueHint: "<name>",
+    description: "Target provider",
+  },
+} satisfies FlagsDef;
+
+export default defineCommand({
+  description: "List skills from the provider's skill catalog",
+  auth: "apiKey",
+  usageArgs: "[--source custom|official|all] [--provider <name>] [--file <path>]",
+  flags: SKILL_LIST_FLAGS,
+  exampleArgs: [
+    "",
+    "--source official",
+    "--source all --output json",
+    "--source custom --provider bailian",
+  ],
+  notes: [
+    ...CREDENTIALS_NOTE,
+    "Providers without a skill listing API (e.g. ark) return an empty list.",
+    "For agent-driven skill selection, use `--source all --output json`: one call returns both catalogs with per-skill `source` and `description` fields to pick from.",
+  ],
+  validate: (f) =>
+    f.source && !SKILL_SOURCES.includes(f.source as SkillSource)
+      ? "--source must be one of: custom, official, all."
+      : undefined,
+  async run(ctx) {
+    const { settings, flags } = ctx;
+    const format = detectOutputFormat(settings.output);
+    const file = flags.file ?? "agents.yaml";
+    const source = (flags.source as SkillSource | undefined) ?? "custom";
+
+    const skills = await withAgentErrors(() =>
+      withStdoutProtected(async () => {
+        const runtime = await buildAgentRuntime(ctx, file);
+        if (source !== "all") {
+          return listSkills(runtime, { provider: flags.provider, source });
+        }
+        // Both catalogs in one call; each entry carries its own `source` field.
+        const [customSkills, officialSkills] = await Promise.all([
+          listSkills(runtime, { provider: flags.provider, source: "custom" }),
+          listSkills(runtime, { provider: flags.provider, source: "official" }),
+        ]);
+        return [...customSkills, ...officialSkills];
+      }),
+    );
+
+    if (format === "json") {
+      emitResult({ source, skills }, format);
+      return;
+    }
+    if (skills.length === 0) {
+      emitBare(source === "all" ? "No skills found." : `No ${source} skills found.`);
+      return;
+    }
+
+    const headers = ["ID", "NAME", "SOURCE", "STATUS", "VERSION", "CREATED"];
+    const rows = skills.map((skill) => [
+      skill.id,
+      skill.name.slice(0, 32),
+      skill.source,
+      skill.status,
+      skill.latest_version ?? "-",
+      skill.created_at ?? "-",
+    ]);
+    for (const line of formatTable(headers, rows)) emitBare(line);
+    emitBare(`\nTotal: ${skills.length} (${source})`);
+  },
+});

packages/commands/src/index.ts

@@ -107,6 +107,7 @@ export { default as managedAgentSessionDelete } from "./commands/managed-agent/s
 export { default as managedAgentSessionRun } from "./commands/managed-agent/session-run.ts";
 export { default as managedAgentSessionSend } from "./commands/managed-agent/session-send.ts";
 export { default as managedAgentSessionEvents } from "./commands/managed-agent/session-events.ts";
+export { default as managedAgentSkillList } from "./commands/managed-agent/skill-list.ts";
 export { default as workspaceInit } from "./commands/workspace/init.ts";
 export { default as pluginInstall } from "./commands/plugin/install.ts";
 export { default as pluginLink } from "./commands/plugin/link.ts";

packages/commands/tests/e2e/managed-agent-auth-chain.e2e.test.ts

@@ -1,8 +1,9 @@
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { createServer } from "node:net";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, describe, expect, test } from "vite-plus/test";
-import { e2eFixturesDir, runCommandE2e } from "./helpers.ts";
+import { e2eFixturesDir, parseStdoutJson, runCommandE2e } from "./helpers.ts";
 import { MANAGED_AGENT_ROUTES } from "./topic-routes.ts";
 
 /**
@@ -44,6 +45,21 @@ function validateArgs(file: string): string[] {
   return ["managed-agent", "validate", "--file", file, "--quiet"];
 }
 
+/** 分配一个刚释放的本地端口，连接必然 ECONNREFUSED，用于网络错误场景。 */
+async function closedPort(): Promise<number> {
+  const server = createServer();
+  try {
+    await new Promise<void>((resolveListen) => server.listen(0, "127.0.0.1", resolveListen));
+    const address = server.address();
+    if (!address || typeof address === "string") {
+      throw new Error("failed to allocate a closed port");
+    }
+    return address.port;
+  } finally {
+    await new Promise<void>((resolveClose) => server.close(() => resolveClose()));
+  }
+}
+
 describe("e2e: managed-agent 凭证链（config 写入 / Profile / logout / 错误映射）", () => {
   test("config.json 写入的 api_key 流入引擎，validate 离线通过", async () => {
     const env = makeConfigEnv({ api_key: "sk-e2e-config-write" });
@@ -96,4 +112,33 @@ describe("e2e: managed-agent 凭证链（config 写入 / Profile / logout / 错
     expect(stderr).toMatch(/agents/i);
     expect(stderr).not.toMatch(/"code":\s*"invalid_type"/);
   });
+
+  test("validate --output json 成功路径 stdout 为单个合法 JSON", async () => {
+    const env = makeConfigEnv({ api_key: "sk-e2e-config-write" });
+    const { stdout, stderr, exitCode } = await runCommandE2e(
+      ROUTES,
+      ["managed-agent", "validate", "--file", AGENTS_YAML, "--output", "json"],
+      env,
+    );
+    expect(exitCode, stderr).toBe(0);
+    const data = parseStdoutJson<{ valid?: boolean; diagnostics?: unknown[] }>(stdout);
+    expect(data.valid).toBe(true);
+    expect(Array.isArray(data.diagnostics)).toBe(true);
+  });
+
+  test("SDK fetch 连不上时映射为 NETWORK (6) + errno hint，不降级成 GENERAL", async () => {
+    const port = await closedPort();
+    const env = makeConfigEnv({
+      api_key: "sk-e2e-network",
+      base_url: `http://127.0.0.1:${port}`,
+    });
+    const { stderr, exitCode } = await runCommandE2e(
+      ROUTES,
+      ["managed-agent", "session", "get", "--session-id", "sess_net", "--file", AGENTS_YAML],
+      env,
+    );
+    expect(exitCode).toBe(6);
+    expect(stderr).toMatch(/Network request failed/i);
+    expect(stderr).toMatch(/ECONNREFUSED|refused/i);
+  });
 });

packages/commands/tests/e2e/managed-agent.e2e.test.ts

@@ -43,6 +43,44 @@ describe("e2e: managed-agent", () => {
     expect(exitCode).toBe(2);
     expect(stderr).toMatch(/--message|Missing required/i);
   });
+
+  test("managed-agent skill-list --help 正常退出", async () => {
+    const { stderr, exitCode } = await runCommandE2e(MANAGED_AGENT_ROUTES, [
+      "managed-agent",
+      "skill-list",
+      "--help",
+    ]);
+    expect(exitCode, stderr).toBe(0);
+    expect(stderr).toMatch(/--source|--provider|--file/i);
+  });
+
+  test("managed-agent skill-list 非法 --source 时退出为用法错误 (2)", async () => {
+    const { stderr, exitCode } = await runCommandE2e(MANAGED_AGENT_ROUTES, [
+      "managed-agent",
+      "skill-list",
+      "--source",
+      "builtin",
+      "--quiet",
+    ]);
+    expect(exitCode).toBe(2);
+    expect(stderr).toMatch(/--source must be one of: custom, official/i);
+  });
+
+  test("managed-agent skill-list --source all 通过参数校验（缺配置文件时才失败）", async () => {
+    const { stderr, exitCode } = await runCommandE2e(MANAGED_AGENT_ROUTES, [
+      "managed-agent",
+      "skill-list",
+      "--source",
+      "all",
+      "--file",
+      "agents.e2e-missing.yaml",
+      "--quiet",
+    ]);
+    // all 是合法值：不应报 --source 用法错误，而是走到配置加载后因文件缺失退出
+    expect(exitCode).toBe(2);
+    expect(stderr).not.toMatch(/--source must be one of/i);
+    expect(stderr).toMatch(/File not found.*agents\.e2e-missing\.yaml/i);
+  });
 });
 
 describe("e2e: managed-agent（--dry-run 短路，不联网不写盘）", () => {

packages/commands/tests/e2e/topic-routes.ts

@@ -164,7 +164,9 @@ export const MANAGED_AGENT_ROUTES: E2eRouteExports = {
   "managed-agent state rm": "managedAgentStateRm",
   "managed-agent state import": "managedAgentStateImport",
   "managed-agent session create": "managedAgentSessionCreate",
+  "managed-agent session get": "managedAgentSessionGet",
   "managed-agent session delete": "managedAgentSessionDelete",
   "managed-agent session run": "managedAgentSessionRun",
   "managed-agent session send": "managedAgentSessionSend",
+  "managed-agent skill-list": "managedAgentSkillList",
 };

packages/commands/tests/engines-contract.test.ts

@@ -0,0 +1,78 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { expect, test } from "vite-plus/test";
+
+/**
+ * 发布契约：最低 Node 版本。
+ * 1) bl 全部发布包的 engines.node 必须一致（版本 bump 一动多动的另一面）。
+ * 2) 外部运行时依赖 @openagentpack/sdk 的 engines 下限不得高于 bl 的下限，
+ *    否则 Node 18/20 用户安装 bailian-cli 会触发 EBADENGINE / engine-strict 失败。
+ *    当前固定的 beta 版本是已知冲突（上游降级已合入，等发版后 bump），用版本号
+ *    白名单做棘轮：一旦升级依赖版本，本检查自动强制生效。
+ */
+
+const repoRoot = join(import.meta.dirname, "..", "..", "..");
+const BL_PACKAGES = ["core", "runtime", "commands", "cli", "kscli"] as const;
+
+/** 上游 engines 降级发版前的已知冲突版本；bump 依赖后请勿把新版本加进来。 */
+const KNOWN_SDK_ENGINE_CONFLICT_VERSIONS = new Set(["0.3.0-beta-8d9edcd-20260722"]);
+
+interface PackageManifest {
+  name: string;
+  version: string;
+  engines?: { node?: string };
+  dependencies?: Record<string, string>;
+}
+
+function readManifest(path: string): PackageManifest {
+  return JSON.parse(readFileSync(path, "utf8")) as PackageManifest;
+}
+
+/** 解析 ">=X.Y.Z" / ">=X" 形式的 engines 下限为可比较的 [major, minor, patch]。 */
+function parseEngineFloor(range: string): [number, number, number] {
+  const matched = /^>=\s*(\d+)(?:\.(\d+))?(?:\.(\d+))?$/.exec(range.trim());
+  if (!matched) throw new Error(`Unsupported engines range: ${range}`);
+  return [Number(matched[1]), Number(matched[2] ?? 0), Number(matched[3] ?? 0)];
+}
+
+function floorLessOrEqual(
+  left: [number, number, number],
+  right: [number, number, number],
+): boolean {
+  for (let index = 0; index < 3; index++) {
+    if (left[index]! !== right[index]!) return left[index]! < right[index]!;
+  }
+  return true;
+}
+
+test("bl 全部发布包 engines.node 一致", () => {
+  const floors = BL_PACKAGES.map((pkg) => {
+    const manifest = readManifest(join(repoRoot, "packages", pkg, "package.json"));
+    return { name: manifest.name, node: manifest.engines?.node };
+  });
+  const [first, ...rest] = floors;
+  expect(first?.node).toMatch(/^>=\d+\.\d+\.\d+$/);
+  for (const entry of rest) {
+    expect(entry.node, `${entry.name} engines.node 与 ${first?.name} 不一致`).toBe(first?.node);
+  }
+});
+
+test("@openagentpack/sdk engines 下限不高于 bl 的最低 Node 版本", () => {
+  const commandsManifest = readManifest(join(repoRoot, "packages", "commands", "package.json"));
+  const blFloor = parseEngineFloor(commandsManifest.engines?.node ?? "");
+
+  const sdkManifest = readManifest(
+    join(repoRoot, "packages", "commands", "node_modules", "@openagentpack", "sdk", "package.json"),
+  );
+  const sdkRange = sdkManifest.engines?.node;
+  if (!sdkRange) return; // 无 engines 声明即不设限,兼容
+
+  if (KNOWN_SDK_ENGINE_CONFLICT_VERSIONS.has(sdkManifest.version)) return;
+
+  const sdkFloor = parseEngineFloor(sdkRange);
+  expect(
+    floorLessOrEqual(sdkFloor, blFloor),
+    `@openagentpack/sdk@${sdkManifest.version} 要求 Node ${sdkRange}，高于 bl 承诺的 ${commandsManifest.engines?.node}；` +
+      "这会让 Node 18/20 用户安装 bailian-cli 失败（EBADENGINE / engine-strict）。",
+  ).toBe(true);
+});

packages/commands/tests/managed-agent-errors.test.ts

@@ -86,3 +86,17 @@ test("plain Error maps to GENERAL with message passed through", async () => {
   expect(mapped.message).toBe("boom");
   expect(mapped.api).toBeUndefined();
 });
+
+test("fetch transport TypeError is rethrown untouched for the runtime NETWORK mapping", async () => {
+  const transportError = new TypeError("fetch failed", {
+    cause: Object.assign(new Error("connect ECONNREFUSED 127.0.0.1:1"), {
+      code: "ECONNREFUSED",
+    }),
+  });
+  try {
+    await withAgentErrors(() => Promise.reject(transportError));
+    throw new Error("expected withAgentErrors to throw");
+  } catch (error) {
+    expect(error).toBe(transportError);
+  }
+});