focalapi-cli 0.1.0 → 0.2.0

package/dist/cli.js

@@ -8,6 +8,10 @@ var ApiError = class extends Error {
   code;
   status;
   hint;
+  /** 上游返回的稳定错误代码或类型；不包含密钥等敏感请求信息。 */
+  upstreamCode;
+  /** 可用于向服务方关联日志的请求 ID。 */
+  requestId;
   /** 上游原始响应体（已截断），仅调试用途，打印前需脱敏。 */
   body;
   constructor(code, message, opts) {
@@ -17,6 +21,8 @@ var ApiError = class extends Error {
     this.status = opts?.status;
     this.hint = opts?.hint;
     this.body = opts?.body;
+    this.upstreamCode = opts?.upstreamCode;
+    this.requestId = opts?.requestId;
   }
   toJSON() {
     return {
@@ -24,12 +30,14 @@ var ApiError = class extends Error {
         code: this.code,
         message: this.message,
         ...this.hint ? { hint: this.hint } : {},
-        ...this.status !== void 0 ? { status: this.status } : {}
+        ...this.status !== void 0 ? { status: this.status } : {},
+        ...this.upstreamCode ? { upstream_code: this.upstreamCode } : {},
+        ...this.requestId ? { request_id: this.requestId } : {}
       }
     };
   }
 };
-function refineErrorCode(status, message) {
+function refineErrorCode(status, message, opts) {
   const m = message.toLowerCase();
   if (m.includes("quota") || m.includes("\u989D\u5EA6") || m.includes("insufficient")) {
     return "insufficient_quota";
@@ -38,14 +46,17 @@ function refineErrorCode(status, message) {
     return "model_not_found";
   }
   if (m.includes("key") || m.includes("token") || m.includes("auth")) {
-    return status === 401 || status === 403 ? "invalid_api_key" : "invalid_request";
+    if (status === 401 || status === 403) {
+      return opts?.authFailureIsInvalidApiKey ? "invalid_api_key" : "upstream_auth_failed";
+    }
+    return "invalid_request";
   }
   switch (status) {
     case 400:
       return "invalid_request";
     case 401:
     case 403:
-      return "invalid_api_key";
+      return opts?.authFailureIsInvalidApiKey ? "invalid_api_key" : "authentication_failed";
     case 404:
       return "model_not_found";
     case 429:
@@ -103,6 +114,14 @@ function printError(err, opts) {
       const hint = err.hint;
       if (hint) {
         process.stderr.write(`\u63D0\u793A\uFF1A${hint}
+`);
+      }
+      if (err.upstreamCode) {
+        process.stderr.write(`\u4E0A\u6E38\u4EE3\u7801\uFF1A${err.upstreamCode}
+`);
+      }
+      if (err.requestId) {
+        process.stderr.write(`\u8BF7\u6C42 ID\uFF1A${err.requestId}
 `);
       }
     }
@@ -136,7 +155,7 @@ function displayWidth(s) {
 }
 
 // src/lib/version.ts
-var VERSION = true ? "0.1.0" : "0.0.0-dev";
+var VERSION = true ? "0.2.0" : "0.0.0-dev";
 
 // src/commands/auth.ts
 import { createInterface } from "readline/promises";
@@ -248,7 +267,8 @@ function extractErrorMessage(raw) {
   const obj = parsed;
   const errObj = obj?.error;
   const message = typeof errObj?.message === "string" && errObj.message || typeof obj?.message === "string" && obj.message || JSON.stringify(parsed).slice(0, 500);
-  return { message, body: parsed };
+  const upstreamCode = [errObj?.code, errObj?.type, obj?.code, obj?.type].find((value) => typeof value === "string");
+  return { message, body: parsed, upstreamCode: typeof upstreamCode === "string" ? upstreamCode : void 0 };
 }
 async function request(opts) {
   const res = await rawRequest(opts);
@@ -298,9 +318,10 @@ async function rawRequest(opts) {
   }
   if (!res.ok) {
     const text = await res.text().catch(() => "");
-    const { message, body } = extractErrorMessage(text);
-    const code = refineErrorCode(res.status, message);
-    throw new ApiError(code, message, { status: res.status, body });
+    const { message, body, upstreamCode } = extractErrorMessage(text);
+    const code = refineErrorCode(res.status, message, { authFailureIsInvalidApiKey: opts.authFailureIsInvalidApiKey });
+    const requestId = res.headers.get("x-request-id") ?? res.headers.get("request-id") ?? res.headers.get("x-requestid") ?? void 0;
+    throw new ApiError(code, message, { status: res.status, body, upstreamCode, requestId });
   }
   return res;
 }
@@ -342,7 +363,8 @@ async function fetchTokenUsage(baseUrl, apiKey) {
     baseUrl,
     path: "/api/usage/token/",
     apiKey,
-    timeoutMs: 15e3
+    timeoutMs: 15e3,
+    authFailureIsInvalidApiKey: true
   });
   if (!res.data) {
     throw new ApiError("bad_response", "\u7528\u91CF\u63A5\u53E3\u54CD\u5E94\u7F3A\u5C11 data \u5B57\u6BB5");
@@ -443,42 +465,183 @@ function registerAuth(program) {
   });
 }
 
+// src/lib/model-selection.ts
+var RECOMMENDED_MODELS = {
+  image: [
+    "seedream-5-0-260128",
+    "gpt-image-2",
+    "gemini-3.1-flash-image",
+    "grok-imagine-image-quality",
+    "seedream-4-5-251128"
+  ],
+  video: [
+    "dreamina-seedance-2-5-260628",
+    "veo-3.1-generate-preview",
+    "grok-imagine-video-1.5",
+    "dreamina-seedance-2-0-260128",
+    "veo-3.1-fast-generate-preview"
+  ]
+};
+function parseCreativeCapability(value) {
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "image" || normalized === "video") return normalized;
+  throw new ApiError("invalid_request", `\u4E0D\u652F\u6301\u7684\u521B\u4F5C\u80FD\u529B\uFF1A${value}`, {
+    hint: "\u53EF\u9009\uFF1Aimage | video\u3002"
+  });
+}
+async function resolveCreativeModel(auth, capability) {
+  const endpointType = capability === "image" ? "image-generation" : "video-generation";
+  const listed = await request({
+    baseUrl: auth.baseUrl,
+    path: "/v1/models",
+    apiKey: auth.apiKey
+  });
+  const available = new Map((listed.data ?? []).map((model) => [model.id, model]));
+  const ranked = RECOMMENDED_MODELS[capability].filter((id) => available.has(id));
+  const discovered = (listed.data ?? []).filter((model) => model.supported_endpoint_types?.includes(endpointType)).map((model) => model.id).filter((id) => !ranked.includes(id));
+  const candidates = [...ranked, ...discovered];
+  for (const id of candidates) {
+    const contract = await request({
+      baseUrl: auth.baseUrl,
+      path: `/v1/models/${encodeURIComponent(id)}`,
+      apiKey: auth.apiKey
+    });
+    if (contract.error || !contract.id || !contract.supported_endpoint_types?.includes(endpointType)) {
+      continue;
+    }
+    const alternatives = candidates.filter((candidate) => candidate !== id && available.has(candidate)).slice(0, 4);
+    return {
+      capability,
+      endpoint_type: endpointType,
+      model: contract,
+      selected_by: "focalapi-default",
+      next_command: capability === "image" ? `focalapi gen image "<prompt>" -m ${id} --json` : `focalapi gen video "<prompt>" -m ${id} --no-wait --json`,
+      alternatives
+    };
+  }
+  throw new ApiError("model_not_found", `\u5F53\u524D Key \u6CA1\u6709\u53EF\u76F4\u63A5\u8C03\u7528\u7684${capability === "image" ? "\u56FE\u50CF" : "\u89C6\u9891"}\u751F\u6210\u6A21\u578B`, {
+    hint: "\u8FD0\u884C focalapi models list --json \u67E5\u770B\u5F53\u524D\u6A21\u578B\u6C60\uFF1B\u4E0D\u8981\u731C\u6D4B\u6216\u53CD\u590D\u8BD5\u6A21\u578B ID\u3002"
+  });
+}
+
 // src/commands/models.ts
+function textValue(value) {
+  if (value === null || value === void 0 || value === "") return "-";
+  if (Array.isArray(value)) return value.length === 0 ? "-" : value.map(textValue).join(", ");
+  if (typeof value === "object") return JSON.stringify(value);
+  return String(value);
+}
+function parameterConstraint(parameter) {
+  const constraints = [];
+  if (parameter.required) constraints.push("\u5FC5\u586B");
+  if (parameter.default !== void 0) constraints.push(`\u9ED8\u8BA4 ${String(parameter.default)}`);
+  if (parameter.values?.length) constraints.push(`\u53EF\u9009 ${parameter.values.join(" / ")}`);
+  if (parameter.minimum !== void 0 || parameter.maximum !== void 0) {
+    constraints.push(`${parameter.minimum ?? "-"}\u2013${parameter.maximum ?? "-"}`);
+  }
+  return [parameter.type, ...constraints, parameter.description].join("\uFF1B");
+}
+function printModelDetails(model) {
+  const { supported_params: supportedParams, ...summary } = model;
+  printTable(
+    ["\u5B57\u6BB5", "\u503C"],
+    Object.entries(summary).map(([key, value]) => [key, textValue(value)])
+  );
+  if (Array.isArray(supportedParams) && supportedParams.length > 0) {
+    process.stdout.write("\n\u652F\u6301\u53C2\u6570\n");
+    printTable(
+      ["\u53C2\u6570", "\u7EA6\u675F"],
+      supportedParams.map((parameter) => {
+        const item = parameter;
+        return [item.name, parameterConstraint(item)];
+      })
+    );
+  }
+}
+function filterModels(models, query, endpoint) {
+  const normalizedQuery = query?.trim().toLowerCase();
+  const normalizedEndpoint = endpoint?.trim().toLowerCase();
+  return models.filter((model) => {
+    if (normalizedQuery && !model.id.toLowerCase().includes(normalizedQuery)) return false;
+    return !normalizedEndpoint || (model.supported_endpoint_types ?? []).some((item) => item.toLowerCase() === normalizedEndpoint);
+  });
+}
+function printModelList(models, json) {
+  if (json) {
+    printJson({ data: models });
+    return;
+  }
+  printTable(
+    ["\u6A21\u578B ID", "\u63D0\u4F9B\u65B9", "\u652F\u6301\u7AEF\u70B9"],
+    models.map((model) => [model.id, model.owned_by ?? "-", textValue(model.supported_endpoint_types)])
+  );
+}
+async function fetchModels(g) {
+  const auth = resolveAuth(g);
+  const response = await request({ baseUrl: auth.baseUrl, path: "/v1/models", apiKey: auth.apiKey });
+  return response.data ?? [];
+}
 function registerModels(program) {
   const models = program.command("models").description("\u53EF\u7528\u6A21\u578B\u67E5\u8BE2");
-  models.command("list").description("\u5217\u51FA\u5F53\u524D Key \u53EF\u7528\u7684\u5168\u90E8\u6A21\u578B").option("--filter <keyword>", "\u6309 id \u5173\u952E\u5B57\u8FC7\u6EE4\uFF08\u4E0D\u533A\u5206\u5927\u5C0F\u5199\uFF09").action(async (opts, cmd) => {
+  models.command("resolve").description("\u4E3A\u521B\u4F5C\u4EFB\u52A1\u9009\u62E9\u5F53\u524D Key \u53EF\u7528\u7684\u9ED8\u8BA4\u6A21\u578B\uFF0C\u5E76\u8FD4\u56DE\u5B8C\u6574\u5B9E\u65F6\u5951\u7EA6").argument("<capability>", "\u521B\u4F5C\u80FD\u529B\uFF1Aimage | video").action(async (capability, _opts, cmd) => {
     const g = cmd.optsWithGlobals();
     const auth = resolveAuth(g);
-    const res = await request({ baseUrl: auth.baseUrl, path: "/v1/models", apiKey: auth.apiKey });
-    let list = res.data ?? [];
-    if (opts.filter) {
-      const kw = opts.filter.toLowerCase();
-      list = list.filter((m) => m.id.toLowerCase().includes(kw));
-    }
+    const resolved = await resolveCreativeModel(auth, parseCreativeCapability(capability));
     if (g.json) {
-      printJson({ data: list });
-    } else {
+      printJson(resolved);
+      return;
+    }
+    printTable(
+      ["\u5B57\u6BB5", "\u503C"],
+      [
+        ["\u80FD\u529B", resolved.capability],
+        ["\u6A21\u578B", resolved.model.id],
+        ["\u63D0\u4F9B\u65B9", resolved.model.owned_by ?? "-"],
+        ["\u7AEF\u70B9", resolved.endpoint_type],
+        ["\u4E0B\u4E00\u6B65", resolved.next_command]
+      ]
+    );
+    if (Array.isArray(resolved.model.supported_params) && resolved.model.supported_params.length > 0) {
+      process.stdout.write("\n\u5B9E\u65F6\u53C2\u6570\u5951\u7EA6\n");
       printTable(
-        ["\u6A21\u578B ID", "\u63D0\u4F9B\u65B9"],
-        list.map((m) => [m.id, m.owned_by ?? "-"])
+        ["\u53C2\u6570", "\u7EA6\u675F"],
+        resolved.model.supported_params.map((parameter) => {
+          const item = parameter;
+          return [item.name, parameterConstraint(item)];
+        })
       );
     }
   });
-  models.command("get").description("\u67E5\u770B\u5355\u4E2A\u6A21\u578B\u8BE6\u60C5").argument("<model>", "\u6A21\u578B ID").action(async (model, _opts, cmd) => {
+  models.command("list").description("\u5217\u51FA\u5F53\u524D Key \u53EF\u7528\u7684\u5168\u90E8\u6A21\u578B").option("--filter <keyword>", "\u6309 ID \u5173\u952E\u5B57\u8FC7\u6EE4\uFF08\u4E0D\u533A\u5206\u5927\u5C0F\u5199\uFF09").option("--endpoint <type>", "\u6309\u7AEF\u70B9\u7C7B\u578B\u8FC7\u6EE4\uFF0C\u5982 image-generation").action(async (opts, cmd) => {
+    const g = cmd.optsWithGlobals();
+    printModelList(filterModels(await fetchModels(g), opts.filter, opts.endpoint), Boolean(g.json));
+  });
+  models.command("search").description("\u6309\u5173\u952E\u5B57\u641C\u7D22\u5F53\u524D Key \u53EF\u7528\u7684\u6A21\u578B").argument("<query>", "\u6A21\u578B ID \u5173\u952E\u5B57").option("--endpoint <type>", "\u6309\u7AEF\u70B9\u7C7B\u578B\u8FC7\u6EE4\uFF0C\u5982 video-generation").action(async (query, opts, cmd) => {
+    const g = cmd.optsWithGlobals();
+    printModelList(filterModels(await fetchModels(g), query, opts.endpoint), Boolean(g.json));
+  });
+  models.command("get").description("\u67E5\u770B\u5355\u4E2A\u6A21\u578B\u8BE6\u60C5\u4E0E\u5B9E\u65F6\u53C2\u6570\u5951\u7EA6").argument("<model>", "\u6A21\u578B ID").action(async (model, _opts, cmd) => {
     const g = cmd.optsWithGlobals();
     const auth = resolveAuth(g);
-    const res = await request({
+    const response = await request({
       baseUrl: auth.baseUrl,
       path: `/v1/models/${encodeURIComponent(model)}`,
       apiKey: auth.apiKey
     });
+    if (response.error) {
+      throw new ApiError(
+        "invalid_request",
+        response.error.message ?? `\u6A21\u578B ${model} \u4E0D\u53EF\u7528`,
+        { hint: "\u8FD0\u884C focalapi models list --json\uFF0C\u4F7F\u7528\u5217\u8868\u4E2D\u7684\u6A21\u578B ID\u3002" }
+      );
+    }
+    if (!response.id) {
+      throw new ApiError("bad_response", `\u6A21\u578B ${model} \u7684\u5951\u7EA6\u54CD\u5E94\u7F3A\u5C11 id`, { body: response });
+    }
     if (g.json) {
-      printJson(res);
+      printJson(response);
     } else {
-      printTable(
-        ["\u5B57\u6BB5", "\u503C"],
-        Object.entries(res).map(([k, v]) => [k, typeof v === "object" ? JSON.stringify(v) : String(v)])
-      );
+      printModelDetails(response);
     }
   });
 }
@@ -551,7 +714,7 @@ function extractText(content) {
   return "";
 }
 function registerChat(program) {
-  program.command("chat").description("\u5BF9\u8BDD\u4E0E\u591A\u6A21\u6001\u63A8\u7406\uFF08/v1/chat/completions\uFF09").argument("[prompt...]", "\u63D0\u793A\u8BCD\uFF1B\u7701\u7565\u4E14 stdin \u4E3A\u7BA1\u9053\u65F6\u4ECE stdin \u8BFB\u53D6").option("-m, --model <model>", "\u6A21\u578B ID\uFF08\u6216\u8BBE FOCALAPI_MODEL\uFF09").option("--system <text>", "system \u63D0\u793A\u8BCD").option("--input <file...>", "\u8F93\u5165\u6587\u4EF6\uFF08\u56FE\u7247\u8F6C data URL\uFF0C\u5982 --input @photo.jpg\uFF1B@ \u524D\u7F00\u53EF\u9009\uFF09").option("--max-tokens <n>", "max_tokens", (v) => Number.parseInt(v, 10)).option("--stream", "\u5F3A\u5236\u6D41\u5F0F\u8F93\u51FA").option("--no-stream", "\u5F3A\u5236\u975E\u6D41\u5F0F").action(
+  program.command("chat").description("\u8865\u5145\u6587\u672C\u8F85\u52A9\uFF08\u6A21\u578B\u5FC5\u987B\u6765\u81EA\u5F53\u524D Key \u7684\u5B9E\u65F6\u5217\u8868\uFF09").argument("[prompt...]", "\u63D0\u793A\u8BCD\uFF1B\u7701\u7565\u4E14 stdin \u4E3A\u7BA1\u9053\u65F6\u4ECE stdin \u8BFB\u53D6").option("-m, --model <model>", "\u6A21\u578B ID\uFF08\u6216\u8BBE FOCALAPI_MODEL\uFF09").option("--system <text>", "system \u63D0\u793A\u8BCD").option("--input <file...>", "\u8F93\u5165\u6587\u4EF6\uFF08\u56FE\u7247\u8F6C data URL\uFF0C\u5982 --input @photo.jpg\uFF1B@ \u524D\u7F00\u53EF\u9009\uFF09").option("--max-tokens <n>", "max_tokens", (v) => Number.parseInt(v, 10)).option("--stream", "\u5F3A\u5236\u6D41\u5F0F\u8F93\u51FA").option("--no-stream", "\u5F3A\u5236\u975E\u6D41\u5F0F").action(
     async (promptParts, opts, cmd) => {
       const g = cmd.optsWithGlobals();
       const auth = resolveAuth(g);
@@ -724,6 +887,350 @@ import { join as join3, resolve as resolve2 } from "path";
 import { pipeline as pipeline2 } from "stream/promises";
 import { Readable as Readable2 } from "stream";
 
+// src/lib/model-capabilities.ts
+var SEEDREAM_OUTPUT_FORMATS = ["png", "jpeg"];
+var SEEDREAM_OPTIMIZE_PROMPT_MODES = ["auto", "enabled", "disabled"];
+var GROK_IMAGE_ASPECT_RATIOS = [
+  "auto",
+  "1:1",
+  "2:3",
+  "3:2",
+  "3:4",
+  "4:3",
+  "9:16",
+  "16:9",
+  "9:19.5",
+  "19.5:9",
+  "1:2",
+  "2:1",
+  "1:3",
+  "3:1"
+];
+var IMAGE_CONSTRAINTS = {
+  "gpt-image-2": {
+    defaultSize: "1024x1024",
+    maxN: 8,
+    maxReferenceImages: 16,
+    minMegapixels: 0.65536,
+    maxMegapixels: 8.2944,
+    minEdge: 1024,
+    maxEdge: 3840,
+    edgeMultiple: 16,
+    maxAspectRatio: 3,
+    qualities: ["low", "medium", "high"],
+    backgrounds: ["auto", "opaque"]
+  },
+  "seedream-4-0-250828": {
+    defaultSize: "1k",
+    sizeTiers: ["1k", "2k", "4k"],
+    maxN: 10,
+    maxReferenceImages: 10,
+    maxTotalImages: 15,
+    minMegapixels: 0.92,
+    maxMegapixels: 16.777216,
+    supportsWatermark: true,
+    outputFormats: SEEDREAM_OUTPUT_FORMATS,
+    optimizePromptModes: SEEDREAM_OPTIMIZE_PROMPT_MODES
+  },
+  "seedream-4-5-251128": {
+    defaultSize: "2k",
+    sizeTiers: ["2k", "4k"],
+    maxN: 10,
+    maxReferenceImages: 10,
+    maxTotalImages: 15,
+    minMegapixels: 3.6864,
+    maxMegapixels: 16.777216,
+    supportsWatermark: true,
+    outputFormats: SEEDREAM_OUTPUT_FORMATS,
+    optimizePromptModes: SEEDREAM_OPTIMIZE_PROMPT_MODES
+  },
+  "dola-seedream-5-0-pro-260628": {
+    defaultSize: "1k",
+    sizeTiers: ["1k", "1.5k", "2k"],
+    maxN: 1,
+    maxReferenceImages: 10,
+    minMegapixels: 0.92,
+    maxMegapixels: 4.194304,
+    supportsWatermark: true,
+    outputFormats: SEEDREAM_OUTPUT_FORMATS,
+    optimizePromptModes: SEEDREAM_OPTIMIZE_PROMPT_MODES
+  },
+  "seedream-5-0-260128": {
+    defaultSize: "2k",
+    sizeTiers: ["2k", "3k", "4k"],
+    maxN: 14,
+    maxReferenceImages: 14,
+    maxTotalImages: 15,
+    minMegapixels: 3.6864,
+    maxMegapixels: 16.777216,
+    supportsWatermark: true,
+    outputFormats: SEEDREAM_OUTPUT_FORMATS,
+    optimizePromptModes: SEEDREAM_OPTIMIZE_PROMPT_MODES
+  },
+  "grok-imagine-image-quality": {
+    defaultSize: "1024x1024",
+    maxN: 10,
+    maxReferenceImages: 3,
+    aspectRatios: GROK_IMAGE_ASPECT_RATIOS,
+    resolutions: ["1k", "2k"],
+    supportsSeed: true
+  },
+  "grok-imagine-image": {
+    defaultSize: "1024x1024",
+    maxN: 10,
+    maxReferenceImages: 3,
+    aspectRatios: GROK_IMAGE_ASPECT_RATIOS,
+    resolutions: ["1k", "2k"],
+    supportsSeed: true
+  }
+};
+var SEEDANCE_RATIOS = ["adaptive", "16:9", "4:3", "1:1", "3:4", "9:16", "21:9"];
+var GROK_VIDEO_ASPECT_RATIOS = ["auto", "16:9", "4:3", "3:2", "1:1", "2:3", "3:4", "9:16"];
+var VIDEO_CONSTRAINTS = {
+  "veo-3.1-generate-preview": {
+    resolutions: ["720p", "1080p", "4k"],
+    ratios: ["16:9", "9:16"],
+    minSeconds: 4,
+    maxSeconds: 8,
+    allowedSeconds: [4, 6, 8],
+    requiredSecondsByResolution: { "1080p": 8, "4k": 8 },
+    supportsSeed: true
+  },
+  "veo-3.1-fast-generate-preview": {
+    resolutions: ["720p", "1080p", "4k"],
+    ratios: ["16:9", "9:16"],
+    minSeconds: 4,
+    maxSeconds: 8,
+    allowedSeconds: [4, 6, 8],
+    requiredSecondsByResolution: { "1080p": 8, "4k": 8 },
+    supportsSeed: true
+  },
+  "veo-3.1-lite-generate-preview": {
+    resolutions: ["720p", "1080p"],
+    ratios: ["16:9", "9:16"],
+    minSeconds: 4,
+    maxSeconds: 8,
+    allowedSeconds: [4, 6, 8],
+    requiredSecondsByResolution: { "1080p": 8 },
+    supportsSeed: true
+  },
+  "dreamina-seedance-2-0-260128": {
+    resolutions: ["480p", "720p", "1080p", "4k"],
+    ratios: SEEDANCE_RATIOS,
+    minSeconds: 4,
+    maxSeconds: 15,
+    supportsPriority: true
+  },
+  "dreamina-seedance-2-0-fast-260128": {
+    resolutions: ["480p", "720p"],
+    ratios: SEEDANCE_RATIOS,
+    minSeconds: 4,
+    maxSeconds: 15,
+    supportsPriority: true
+  },
+  "dreamina-seedance-2-0-mini-260615": {
+    resolutions: ["480p", "720p"],
+    ratios: SEEDANCE_RATIOS,
+    minSeconds: 4,
+    maxSeconds: 15,
+    supportsPriority: true
+  },
+  "dreamina-seedance-2-5-260628": {
+    resolutions: ["480p", "720p"],
+    ratios: SEEDANCE_RATIOS,
+    minSeconds: 4,
+    maxSeconds: 30
+  },
+  "grok-imagine-video": {
+    resolutions: ["480p", "720p", "1080p"],
+    aspectRatios: GROK_VIDEO_ASPECT_RATIOS,
+    minSeconds: 1,
+    maxSeconds: 15,
+    supportsSeed: true
+  },
+  "grok-imagine-video-1.5": {
+    resolutions: ["480p", "720p", "1080p"],
+    aspectRatios: GROK_VIDEO_ASPECT_RATIOS,
+    minSeconds: 1,
+    maxSeconds: 15,
+    supportsSeed: true
+  }
+};
+var COMMON_GEMINI_RATIOS = ["auto", "1:1", "2:3", "3:2", "3:4", "4:3", "4:5", "5:4", "9:16", "16:9", "21:9"];
+var GEMINI_IMAGE_CONSTRAINTS = {
+  "gemini-2.5-flash-image": { aspectRatios: COMMON_GEMINI_RATIOS, supportsSampling: false },
+  "gemini-3-pro-image": { aspectRatios: COMMON_GEMINI_RATIOS, imageSizes: ["1K", "2K", "4K"], supportsSampling: false },
+  "gemini-3.1-flash-image": { aspectRatios: COMMON_GEMINI_RATIOS, imageSizes: ["1K", "2K", "4K"], supportsSampling: false },
+  "gemini-3.1-flash-lite-image": {
+    aspectRatios: [...COMMON_GEMINI_RATIOS, "1:4", "4:1", "1:8", "8:1"],
+    imageSizes: ["1K"],
+    supportsSampling: true
+  }
+};
+function parseSize(size, model) {
+  const match = /^(\d+)x(\d+)$/i.exec(size.trim());
+  if (!match) {
+    throw new ApiError("invalid_request", `${model} size must be a supported tier or WIDTHxHEIGHT (received: ${size})`);
+  }
+  return { width: Number(match[1]), height: Number(match[2]) };
+}
+function megapixels(width, height) {
+  return width * height / 1e6;
+}
+function formatMegapixels(value) {
+  return value.toFixed(2).replace(/\.00$/, "");
+}
+function validateOptionalChoice(model, name, value, supported) {
+  if (!value) return;
+  if (!supported) {
+    throw new ApiError("invalid_request", `${model} does not support ${name}`);
+  }
+  if (!supported.includes(value.toLowerCase())) {
+    throw new ApiError("invalid_request", `${model} ${name} must be one of ${supported.join(", ")} (received: ${value})`);
+  }
+}
+function validateImageGeneration(model, input) {
+  if (input.responseFormat && input.responseFormat !== "url" && input.responseFormat !== "b64_json") {
+    throw new ApiError("invalid_request", `response_format must be url or b64_json (received: ${input.responseFormat})`);
+  }
+  const constraint = IMAGE_CONSTRAINTS[model.trim()];
+  if (!constraint) return;
+  if (input.n < 1 || input.n > constraint.maxN) {
+    throw new ApiError("invalid_request", `${model} n must be 1-${constraint.maxN} (received: ${input.n})`);
+  }
+  if (input.imageCount !== void 0 && constraint.maxReferenceImages !== void 0 && input.imageCount > constraint.maxReferenceImages) {
+    throw new ApiError("invalid_request", `${model} supports at most ${constraint.maxReferenceImages} reference images`);
+  }
+  if (input.imageCount !== void 0 && constraint.maxTotalImages !== void 0 && input.imageCount + input.n > constraint.maxTotalImages) {
+    throw new ApiError("invalid_request", `${model} supports at most ${constraint.maxTotalImages} input plus generated images`);
+  }
+  if (input.hasMask && model === "gpt-image-2" && input.imageCount !== 1) {
+    throw new ApiError("invalid_request", "gpt-image-2 mask requires exactly one reference image");
+  }
+  validateOptionalChoice(model, "quality", input.quality, constraint.qualities);
+  validateOptionalChoice(model, "background", input.background, constraint.backgrounds);
+  validateOptionalChoice(model, "aspect_ratio", input.aspectRatio, constraint.aspectRatios);
+  validateOptionalChoice(model, "resolution", input.resolution, constraint.resolutions);
+  validateOptionalChoice(model, "output_format", input.outputFormat, constraint.outputFormats);
+  validateOptionalChoice(model, "optimize_prompt", input.optimizePrompt, constraint.optimizePromptModes);
+  if (input.seed !== void 0) {
+    if (!constraint.supportsSeed) {
+      throw new ApiError("invalid_request", `${model} does not support seed`);
+    }
+    if (!Number.isInteger(input.seed) || input.seed < 0) {
+      throw new ApiError("invalid_request", "seed must be a non-negative integer");
+    }
+  }
+  if (input.watermark !== void 0 && !constraint.supportsWatermark) {
+    throw new ApiError("invalid_request", `${model} does not support watermark`);
+  }
+  const suppliedSize = input.size ?? constraint.defaultSize;
+  if (constraint.sizeTiers?.includes(suppliedSize.toLowerCase())) return;
+  if (constraint.sizeTiers && !/^\d+x\d+$/i.test(suppliedSize)) {
+    throw new ApiError("invalid_request", `${model} size must be one of ${constraint.sizeTiers.join(", ")} or WIDTHxHEIGHT (received: ${suppliedSize})`);
+  }
+  const { width, height } = parseSize(suppliedSize, model);
+  const pixels = megapixels(width, height);
+  if (constraint.minEdge && (width < constraint.minEdge || height < constraint.minEdge) || constraint.maxEdge && (width > constraint.maxEdge || height > constraint.maxEdge) || constraint.edgeMultiple && (width % constraint.edgeMultiple !== 0 || height % constraint.edgeMultiple !== 0) || constraint.minMegapixels && pixels < constraint.minMegapixels || constraint.maxMegapixels && pixels > constraint.maxMegapixels) {
+    const edge = constraint.minEdge && constraint.maxEdge ? `${constraint.minEdge}-${constraint.maxEdge}px per edge` : "";
+    const step = constraint.edgeMultiple ? `, edge multiples of ${constraint.edgeMultiple}` : "";
+    const mp = constraint.minMegapixels && constraint.maxMegapixels ? `, ${formatMegapixels(constraint.minMegapixels)}-${formatMegapixels(constraint.maxMegapixels)} MP` : "";
+    throw new ApiError("invalid_request", `${model} does not support size=${width}x${height}; supported: ${edge}${step}${mp}`);
+  }
+  if (constraint.maxAspectRatio) {
+    const ratio = Math.max(width, height) / Math.min(width, height);
+    if (ratio > constraint.maxAspectRatio) {
+      throw new ApiError("invalid_request", `${model} longest-to-shortest edge ratio must not exceed ${constraint.maxAspectRatio}:1 (received: ${width}x${height})`);
+    }
+  }
+}
+function validateGeminiImageGeneration(model, input) {
+  const constraint = GEMINI_IMAGE_CONSTRAINTS[model.trim()];
+  if (!constraint) {
+    throw new ApiError("invalid_request", `${model} is not a supported Gemini image model; run focalapi models get ${model} first`);
+  }
+  if (input.aspectRatio && !constraint.aspectRatios.includes(input.aspectRatio)) {
+    throw new ApiError("invalid_request", `${model} aspectRatio must be one of ${constraint.aspectRatios.join(", ")} (received: ${input.aspectRatio})`);
+  }
+  if (input.imageSize && !constraint.imageSizes?.includes(input.imageSize.toUpperCase())) {
+    const supported = constraint.imageSizes?.join(", ") ?? "none";
+    throw new ApiError("invalid_request", `${model} imageSize must be one of ${supported} (received: ${input.imageSize})`);
+  }
+  if (input.seed !== void 0 && (!Number.isInteger(input.seed) || input.seed < 0)) {
+    throw new ApiError("invalid_request", "seed must be a non-negative integer");
+  }
+  if (!constraint.supportsSampling && (input.thinkingLevel || input.temperature !== void 0 || input.topP !== void 0)) {
+    throw new ApiError("invalid_request", `${model} supports thinkingLevel, temperature, and topP only on gemini-3.1-flash-lite-image`);
+  }
+  if (input.thinkingLevel && !["MINIMAL", "HIGH"].includes(input.thinkingLevel.toUpperCase())) {
+    throw new ApiError("invalid_request", "thinkingLevel must be MINIMAL or HIGH");
+  }
+  if (input.temperature !== void 0 && (!Number.isFinite(input.temperature) || input.temperature < 0 || input.temperature > 2)) {
+    throw new ApiError("invalid_request", "temperature must be between 0 and 2");
+  }
+  if (input.topP !== void 0 && (!Number.isFinite(input.topP) || input.topP < 0 || input.topP > 1)) {
+    throw new ApiError("invalid_request", "topP must be between 0 and 1");
+  }
+}
+function validateVideoGeneration(model, input) {
+  const constraint = VIDEO_CONSTRAINTS[model.trim()];
+  if (!constraint) return;
+  if (input.seconds !== void 0 && (input.seconds < constraint.minSeconds || input.seconds > constraint.maxSeconds)) {
+    throw new ApiError("invalid_request", `${model} seconds must be ${constraint.minSeconds}-${constraint.maxSeconds} (received: ${input.seconds})`);
+  }
+  if (input.seconds !== void 0 && constraint.allowedSeconds && !constraint.allowedSeconds.includes(input.seconds)) {
+    throw new ApiError("invalid_request", `${model} seconds must be one of ${constraint.allowedSeconds.join(", ")} (received: ${input.seconds})`);
+  }
+  if (input.resolution && !constraint.resolutions.includes(input.resolution.toLowerCase())) {
+    throw new ApiError("invalid_request", `${model} resolution must be one of ${constraint.resolutions.join(", ")} (received: ${input.resolution})`);
+  }
+  if (input.seconds !== void 0 && input.resolution) {
+    const required = constraint.requiredSecondsByResolution?.[input.resolution.toLowerCase()];
+    if (required !== void 0 && input.seconds !== required) {
+      throw new ApiError("invalid_request", `${model} resolution ${input.resolution} requires ${required} seconds`);
+    }
+  }
+  if (input.ratio) {
+    if (!constraint.ratios) {
+      throw new ApiError("invalid_request", `${model} uses --aspect-ratio instead of --ratio`);
+    }
+    if (!constraint.ratios.includes(input.ratio)) {
+      throw new ApiError("invalid_request", `${model} ratio must be one of ${constraint.ratios.join(", ")} (received: ${input.ratio})`);
+    }
+  }
+  if (input.aspectRatio) {
+    if (!constraint.aspectRatios) {
+      throw new ApiError("invalid_request", `${model} uses --ratio instead of --aspect-ratio`);
+    }
+    if (!constraint.aspectRatios.includes(input.aspectRatio)) {
+      throw new ApiError("invalid_request", `${model} aspect_ratio must be one of ${constraint.aspectRatios.join(", ")} (received: ${input.aspectRatio})`);
+    }
+  }
+  if (input.seed !== void 0) {
+    if (!constraint.supportsSeed) {
+      throw new ApiError("invalid_request", `${model} does not support seed`);
+    }
+    if (!Number.isInteger(input.seed) || input.seed < 0) {
+      throw new ApiError("invalid_request", "seed must be a non-negative integer");
+    }
+  }
+  if (input.priority !== void 0 && !constraint.supportsPriority) {
+    throw new ApiError("invalid_request", `${model} does not support priority`);
+  }
+  if (input.priority !== void 0 && (input.priority < 0 || input.priority > 9)) {
+    throw new ApiError("invalid_request", `${model} priority must be 0-9 (received: ${input.priority})`);
+  }
+  if (input.serviceTier && input.serviceTier !== "default") {
+    throw new ApiError("invalid_request", `${model} service_tier must be default (received: ${input.serviceTier})`);
+  }
+  if (input.executionExpiresAfter !== void 0 && (input.executionExpiresAfter < 3600 || input.executionExpiresAfter > 259200)) {
+    throw new ApiError("invalid_request", `${model} execution_expires_after must be 3600-259200 (received: ${input.executionExpiresAfter})`);
+  }
+  if (input.safetyIdentifier !== void 0 && !/^[\x21-\x7e]{1,64}$/.test(input.safetyIdentifier)) {
+    throw new ApiError("invalid_request", `${model} safety_identifier must contain 1-64 printable ASCII characters`);
+  }
+}
+
 // src/lib/tasks.ts
 import { createWriteStream } from "fs";
 import { mkdir } from "fs/promises";
@@ -767,11 +1274,21 @@ function extractProgress(body) {
   return void 0;
 }
 async function fetchTask(baseUrl, apiKey, taskId) {
-  const raw = await request({
-    baseUrl,
-    path: `/v1/video/generations/${encodeURIComponent(taskId)}`,
-    apiKey
-  });
+  let raw;
+  try {
+    raw = await request({
+      baseUrl,
+      path: `/v1/video/generations/${encodeURIComponent(taskId)}`,
+      apiKey
+    });
+  } catch (err) {
+    if (!(err instanceof ApiError) || err.status !== 404) throw err;
+    raw = await request({
+      baseUrl,
+      path: `/v1/images/generations/${encodeURIComponent(taskId)}`,
+      apiKey
+    });
+  }
   const obj = raw;
   const rawStatus = String(obj?.status ?? obj?.data?.status ?? "");
   return {
@@ -843,9 +1360,34 @@ function clampInt(value, min, max, name) {
   }
   return value;
 }
+function parseBooleanOption(value, name) {
+  switch (value.trim().toLowerCase()) {
+    case "true":
+      return true;
+    case "false":
+      return false;
+    default:
+      throw new ApiError("invalid_request", `--${name} must be true or false (received: ${value})`);
+  }
+}
+async function withProgress(label, operation) {
+  const startedAt = Date.now();
+  info(`${label}\u2026`);
+  const timer = setInterval(() => {
+    const elapsedSeconds = Math.max(1, Math.floor((Date.now() - startedAt) / 1e3));
+    info(`${label}\uFF0C\u5DF2\u7B49\u5F85 ${elapsedSeconds} \u79D2\u2026`);
+  }, 1e4);
+  timer.unref();
+  try {
+    return await operation();
+  } finally {
+    clearInterval(timer);
+  }
+}
 async function saveImageItem(item, dir, base, apiKey) {
   if (item.b64_json) {
-    const filePath = join3(dir, `${base}.png`);
+    const ext = item.mime_type?.includes("jpeg") ? ".jpg" : item.mime_type?.includes("webp") ? ".webp" : ".png";
+    const filePath = join3(dir, `${base}${ext}`);
     await writeFile(filePath, Buffer.from(item.b64_json, "base64"));
     return filePath;
   }
@@ -864,21 +1406,128 @@ async function saveImageItem(item, dir, base, apiKey) {
   }
   throw new ApiError("bad_response", "\u56FE\u50CF\u7ED3\u679C\u65E2\u6CA1\u6709 url \u4E5F\u6CA1\u6709 b64_json");
 }
+function parseGenerationConfig(raw) {
+  if (!raw) return {};
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed === null || Array.isArray(parsed) || typeof parsed !== "object") {
+      throw new Error("not an object");
+    }
+    return parsed;
+  } catch {
+    throw new ApiError("invalid_request", "--config \u5FC5\u987B\u662F\u5408\u6CD5\u7684 generationConfig JSON \u5BF9\u8C61\u3002");
+  }
+}
+function parseJsonArray(raw, option) {
+  try {
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed)) throw new Error("not an array");
+    return parsed;
+  } catch {
+    throw new ApiError("invalid_request", `--${option} must be a JSON array`);
+  }
+}
+function parseGeminiResponseModalities(raw) {
+  const modalities = raw.split(",").map((value) => value.trim().toUpperCase()).filter(Boolean);
+  const unique = new Set(modalities);
+  if (unique.size !== modalities.length || !unique.has("IMAGE") || [...unique].some((value) => value !== "IMAGE" && value !== "TEXT")) {
+    throw new ApiError("invalid_request", "--response-modalities must be IMAGE or IMAGE,TEXT");
+  }
+  return unique.has("TEXT") ? ["IMAGE", "TEXT"] : ["IMAGE"];
+}
+function geminiImagePart(source) {
+  const dataUri = /^data:([^;,]+);base64,([a-z0-9+/=\r\n]+)$/i.exec(source.trim());
+  if (dataUri) {
+    const [, mimeType = "", data = ""] = dataUri;
+    return { inlineData: { mimeType, data: data.replace(/[\r\n]/g, "") } };
+  }
+  return { fileData: { fileUri: source } };
+}
+function geminiOmniImageInput(source) {
+  const dataUri = /^data:([^;,]+);base64,([a-z0-9+/=\r\n]+)$/i.exec(source.trim());
+  if (!dataUri) {
+    throw new ApiError("invalid_request", "--image for Gemini Omni must be a base64 data URI");
+  }
+  const [, mimeType = "", data = ""] = dataUri;
+  return { type: "image", mime_type: mimeType, data: data.replace(/[\r\n]/g, "") };
+}
+function extractGeminiOmniVideo(response) {
+  for (const step of response.steps ?? []) {
+    for (const content of step.content ?? []) {
+      if (content.type === "video" && content.data) {
+        return { data: content.data, mimeType: content.mime_type };
+      }
+    }
+  }
+  return void 0;
+}
+function extractGeminiImageItems(response) {
+  return (response.candidates ?? []).flatMap(
+    (candidate) => (candidate.content?.parts ?? []).flatMap(
+      (part) => part.inlineData?.data ? [{ b64_json: part.inlineData.data, mime_type: part.inlineData.mimeType }] : []
+    )
+  );
+}
 function registerGen(program) {
   const gen = program.command("gen").description("\u56FE\u50CF / \u89C6\u9891\u751F\u6210");
-  gen.command("image").description("\u751F\u6210\u56FE\u50CF\uFF08\u540C\u6B65\u8FD4\u56DE\uFF0C\u4EA7\u7269\u81EA\u52A8\u4E0B\u8F7D\u5230\u672C\u5730\uFF09").argument("<prompt...>", "\u63D0\u793A\u8BCD").requiredOption("-m, --model <model>", "\u56FE\u50CF\u6A21\u578B ID\uFF08focalapi models list \u67E5\u770B\uFF09").option("--size <size>", "\u5C3A\u5BF8\uFF0C\u5982 1024x1024").option("--n <count>", "\u5F20\u6570\uFF081\u2013128\uFF09", (v) => Number.parseInt(v, 10), 1).option("-o, --out <dir>", "\u8F93\u51FA\u76EE\u5F55", DEFAULT_OUT_DIR).action(async (promptParts, opts, cmd) => {
+  gen.command("image").description("\u751F\u6210\u56FE\u50CF\uFF08\u7701\u7565 --model \u65F6\u81EA\u52A8\u9009\u62E9\u5F53\u524D\u53EF\u7528\u9ED8\u8BA4\u6A21\u578B\uFF09").argument("<prompt...>", "\u63D0\u793A\u8BCD").option("-m, --model <model>", "\u56FE\u50CF\u6A21\u578B ID\uFF1B\u7701\u7565\u65F6\u7531 focalapi \u81EA\u52A8\u9009\u62E9").option("--size <size>", "\u5C3A\u5BF8\uFF0C\u5982 1024x1024").option("--aspect-ratio <ratio>", "\u539F\u751F\u753B\u9762\u6BD4\u4F8B\uFF08\u4EC5 Grok \u56FE\u50CF\u6A21\u578B\uFF09\uFF0C\u5982 16:9").option("--resolution <resolution>", "\u539F\u751F\u8F93\u51FA\u6863\u4F4D\uFF08\u4EC5 Grok \u56FE\u50CF\u6A21\u578B\uFF09\uFF0C\u5982 1k\u30012k").option("--seed <n>", "\u968F\u673A\u79CD\u5B50\uFF08\u4EC5 Grok \u56FE\u50CF\u6A21\u578B\uFF0C\u975E\u8D1F\u6574\u6570\uFF09", (v) => Number.parseInt(v, 10)).option("--quality <quality>", "\u56FE\u50CF\u8D28\u91CF\u6863\u4F4D\uFF08\u4EC5\u652F\u6301\u8BE5\u53C2\u6570\u7684\u6A21\u578B\u751F\u6548\uFF09").option("--background <background>", "\u80CC\u666F\u6A21\u5F0F\uFF08\u4EC5 gpt-image-2 \u652F\u6301 auto/opaque\uFF09").option("--watermark <boolean>", "\u662F\u5426\u6DFB\u52A0\u6C34\u5370\uFF08\u4EC5 Seedream\uFF0Ctrue \u6216 false\uFF09", (v) => parseBooleanOption(v, "watermark")).option("--output-format <format>", "\u8F93\u51FA\u683C\u5F0F\uFF08\u4EC5 Seedream\uFF1Apng \u6216 jpeg\uFF09").option("--optimize-prompt <mode>", "\u63D0\u793A\u8BCD\u4F18\u5316\uFF08\u4EC5 Seedream\uFF1Aauto\u3001enabled \u6216 disabled\uFF09").option("--image <url...>", "\u53C2\u8003\u56FE\u6216\u7F16\u8F91\u56FE URL\uFF0C\u53EF\u591A\u4E2A").option("--mask <url>", "\u7F16\u8F91 mask URL\uFF08gpt-image-2 \u9700\u8981\u5355\u5F20\u53C2\u8003\u56FE\uFF09").option("--response-format <format>", "\u56FE\u50CF\u54CD\u5E94\u683C\u5F0F\uFF1Aurl \u6216 b64_json").option("--n <count>", "\u5F20\u6570\uFF081\u2013128\uFF09", (v) => Number.parseInt(v, 10), 1).option("--no-wait", "\u63D0\u4EA4\u540E\u7ACB\u5373\u8FD4\u56DE task_id\uFF0C\u4E0D\u7B49\u5F85\u56FE\u50CF\u751F\u6210\u5B8C\u6210").option("-o, --out <dir>", "\u8F93\u51FA\u76EE\u5F55", DEFAULT_OUT_DIR).action(async (promptParts, opts, cmd) => {
     const g = cmd.optsWithGlobals();
     const auth = resolveAuth(g);
+    const model = opts.model ?? (await resolveCreativeModel(auth, "image")).model.id;
+    if (!opts.model && !g.json) info(`\u5DF2\u81EA\u52A8\u9009\u62E9\u56FE\u50CF\u6A21\u578B\uFF1A${model}`);
     const n = clampInt(opts.n, 1, MAX_IMAGE_N, "n");
-    const body = { model: opts.model, prompt: promptParts.join(" "), n };
+    validateImageGeneration(model, {
+      n,
+      size: opts.size,
+      quality: opts.quality,
+      background: opts.background,
+      aspectRatio: opts.aspectRatio,
+      resolution: opts.resolution,
+      seed: opts.seed,
+      watermark: opts.watermark,
+      outputFormat: opts.outputFormat,
+      optimizePrompt: opts.optimizePrompt,
+      responseFormat: opts.responseFormat,
+      imageCount: opts.image?.length,
+      hasMask: Boolean(opts.mask)
+    });
+    if (opts.wait === false && opts.responseFormat === "b64_json") {
+      throw new ApiError("invalid_request", "--response-format b64_json cannot be used with --no-wait; use url");
+    }
+    const body = { model, prompt: promptParts.join(" "), n };
     if (opts.size) body.size = opts.size;
-    const res = await request({
+    if (opts.aspectRatio) body.aspect_ratio = opts.aspectRatio;
+    if (opts.resolution) body.resolution = opts.resolution.toLowerCase();
+    if (opts.seed !== void 0) body.seed = opts.seed;
+    if (opts.quality) body.quality = opts.quality;
+    if (opts.background) body.background = opts.background;
+    if (opts.watermark !== void 0) body.watermark = opts.watermark;
+    if (opts.outputFormat) body.output_format = opts.outputFormat.toLowerCase();
+    if (opts.optimizePrompt) body.optimize_prompt_options = { thinking: opts.optimizePrompt.toLowerCase() };
+    if (opts.image) body.image = opts.image;
+    if (opts.mask) body.mask = opts.mask;
+    if (opts.responseFormat) body.response_format = opts.responseFormat;
+    const res = await withProgress(opts.wait === false ? "\u6B63\u5728\u63D0\u4EA4\u56FE\u50CF\u4EFB\u52A1" : "\u6B63\u5728\u751F\u6210\u56FE\u50CF", () => request({
       baseUrl: auth.baseUrl,
       path: "/v1/images/generations",
       apiKey: auth.apiKey,
       body,
+      headers: opts.wait === false ? { Prefer: "respond-async" } : void 0,
       timeoutMs: 6e5
-    });
+    }));
+    if (opts.wait === false) {
+      const taskId = extractTaskId(res);
+      if (!taskId) {
+        throw new ApiError("bad_response", "\u5F02\u6B65\u56FE\u50CF\u4EFB\u52A1\u54CD\u5E94\u4E2D\u672A\u627E\u5230 task_id", { body: res });
+      }
+      if (g.json) {
+        printJson({ model, task_id: taskId, status: res.status ?? "queued", submitted: true, next_command: `focalapi task status ${taskId} --json` });
+      } else {
+        process.stdout.write(taskId + "\n");
+        info(`\u4EFB\u52A1\u5DF2\u63D0\u4EA4\u3002\u67E5\u8BE2\uFF1Afocalapi task status ${taskId}`);
+      }
+      return;
+    }
     const items = res.data ?? [];
     if (items.length === 0) {
       throw new ApiError("bad_response", "\u56FE\u50CF\u751F\u6210\u54CD\u5E94\u4E3A\u7A7A", { body: res });
@@ -891,34 +1540,163 @@ function registerGen(program) {
       files.push(await saveImageItem(item, dir, `image-${ts}-${i + 1}`, auth.apiKey));
     }
     if (g.json) {
-      printJson({ files, count: files.length });
+      printJson({ model, files, count: files.length });
     } else {
       for (const f of files) info(`\u2713 ${f}`);
     }
   });
-  gen.command("video").description("\u751F\u6210\u89C6\u9891\uFF08\u4EFB\u52A1\u5236\uFF1A\u9ED8\u8BA4\u8F6E\u8BE2\u81F3\u5B8C\u6210\u5E76\u4E0B\u8F7D\uFF1B--no-wait \u53EA\u53D6 task_id\uFF09").argument("<prompt...>", "\u63D0\u793A\u8BCD").requiredOption("-m, --model <model>", "\u89C6\u9891\u6A21\u578B ID\uFF08focalapi models list \u67E5\u770B\uFF09").option("--seconds <n>", "\u65F6\u957F\u79D2\u6570\uFF081\u20133600\uFF09", (v) => Number.parseInt(v, 10)).option("--size <size>", "\u5206\u8FA8\u7387\uFF0C\u5982 1280x720").option("--no-wait", "\u63D0\u4EA4\u540E\u7ACB\u5373\u8FD4\u56DE task_id\uFF0C\u4E0D\u7B49\u5F85\u5B8C\u6210").option("--poll-interval <ms>", "\u8F6E\u8BE2\u95F4\u9694\u6BEB\u79D2", (v) => Number.parseInt(v, 10), 5e3).option("--timeout <minutes>", "\u6700\u957F\u7B49\u5F85\u5206\u949F", (v) => Number.parseInt(v, 10), 30).option("-o, --out <dir>", "\u8F93\u51FA\u76EE\u5F55", DEFAULT_OUT_DIR).action(
+  gen.command("gemini-image").description("\u4F7F\u7528 Gemini \u539F\u751F generateContent \u63A5\u53E3\u751F\u6210\u56FE\u50CF").argument("<prompt...>", "\u63D0\u793A\u8BCD").requiredOption("-m, --model <model>", "Gemini \u56FE\u50CF\u6A21\u578B ID\uFF1B\u5148\u7528 focalapi models get \u786E\u8BA4").option("--aspect-ratio <ratio>", "\u753B\u9762\u6BD4\u4F8B\uFF0C\u4F8B\u5982 1:1\u300116:9\u3001auto").option("--image-size <size>", "\u8F93\u51FA\u5C3A\u5BF8\uFF0C\u4F8B\u5982 1K\u30012K\u30014K").option("--response-modalities <modalities>", "\u8F93\u51FA\u7C7B\u578B\uFF1AIMAGE \u6216 IMAGE,TEXT\uFF1B\u672A\u4F20\u65F6\u7531\u670D\u52A1\u7AEF\u9ED8\u8BA4 IMAGE,TEXT").option("--config <json>", "\u9644\u52A0 Gemini generationConfig JSON\uFF1B\u547D\u4EE4\u56FA\u5B9A responseFormat.image \u548C\u5355\u5019\u9009").option("-o, --out <dir>", "\u8F93\u51FA\u76EE\u5F55", DEFAULT_OUT_DIR).option("--image <url...>", "Gemini reference image URL or data URI; repeatable").option("--system <text>", "Gemini systemInstruction text").option("--seed <n>", "Non-negative Gemini generation seed", (v) => Number.parseInt(v, 10)).option("--thinking-level <level>", "Nano Banana 2 Lite: MINIMAL or HIGH").option("--temperature <n>", "Nano Banana 2 Lite: 0 through 2", (v) => Number.parseFloat(v)).option("--top-p <n>", "Nano Banana 2 Lite: 0 through 1", (v) => Number.parseFloat(v)).action(async (promptParts, opts, cmd) => {
+    const g = cmd.optsWithGlobals();
+    const auth = resolveAuth(g);
+    validateGeminiImageGeneration(opts.model, {
+      aspectRatio: opts.aspectRatio,
+      imageSize: opts.imageSize,
+      seed: opts.seed,
+      thinkingLevel: opts.thinkingLevel,
+      temperature: opts.temperature,
+      topP: opts.topP
+    });
+    const suppliedConfig = parseGenerationConfig(opts.config);
+    const suppliedResponseFormat = suppliedConfig.responseFormat;
+    const suppliedImageConfig = suppliedResponseFormat !== null && typeof suppliedResponseFormat === "object" && !Array.isArray(suppliedResponseFormat) ? suppliedResponseFormat.image : void 0;
+    const imageConfig = {
+      ...suppliedImageConfig !== null && typeof suppliedImageConfig === "object" && !Array.isArray(suppliedImageConfig) ? suppliedImageConfig : {},
+      ...opts.aspectRatio ? { aspectRatio: opts.aspectRatio } : {},
+      ...opts.imageSize ? { imageSize: opts.imageSize.toUpperCase() } : {}
+    };
+    const generationConfig = {
+      ...suppliedConfig,
+      candidateCount: 1,
+      responseFormat: { image: imageConfig },
+      ...opts.responseModalities ? { responseModalities: parseGeminiResponseModalities(opts.responseModalities) } : {},
+      ...opts.seed !== void 0 ? { seed: opts.seed } : {},
+      ...opts.thinkingLevel ? { thinkingConfig: { ...suppliedConfig.thinkingConfig ?? {}, thinkingLevel: opts.thinkingLevel.toUpperCase() } } : {},
+      ...opts.temperature !== void 0 ? { temperature: opts.temperature } : {},
+      ...opts.topP !== void 0 ? { topP: opts.topP } : {}
+    };
+    const res = await withProgress("\u6B63\u5728\u751F\u6210 Gemini \u56FE\u50CF", () => request({
+      baseUrl: auth.baseUrl,
+      path: `/v1beta/models/${encodeURIComponent(opts.model)}:generateContent`,
+      apiKey: auth.apiKey,
+      body: {
+        contents: [{ role: "user", parts: [{ text: promptParts.join(" ") }, ...(opts.image ?? []).map(geminiImagePart)] }],
+        ...opts.system ? { systemInstruction: { parts: [{ text: opts.system }] } } : {},
+        generationConfig
+      },
+      timeoutMs: 6e5
+    }));
+    const items = extractGeminiImageItems(res);
+    if (items.length === 0) {
+      throw new ApiError("bad_response", "Gemini \u56FE\u50CF\u54CD\u5E94\u4E2D\u672A\u627E\u5230 inlineData \u56FE\u50CF\u3002", { body: res });
+    }
+    const dir = resolve2(opts.out);
+    await mkdir2(dir, { recursive: true });
+    const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
+    const files = [];
+    for (const [i, item] of items.entries()) {
+      files.push(await saveImageItem(item, dir, `gemini-image-${ts}-${i + 1}`, auth.apiKey));
+    }
+    if (g.json) {
+      printJson({ files, count: files.length });
+    } else {
+      for (const file of files) info(`\u2713 ${file}`);
+    }
+  });
+  gen.command("omni-video").description("\u4F7F\u7528 Gemini Omni Flash \u539F\u751F Interactions API \u751F\u6210\u6216\u7F16\u8F91\u89C6\u9891").argument("<prompt...>", "\u63D0\u793A\u8BCD").option("--image <data-uri...>", "\u56FE\u751F\u89C6\u9891\u53C2\u8003\u56FE\uFF1B\u4EC5\u652F\u6301 base64 data URI\uFF0C\u53EF\u591A\u4E2A").option("--previous-interaction-id <id>", "\u4E0A\u4E00\u6B21\u4EA4\u4E92 ID\uFF0C\u7528\u4E8E\u8FDE\u7EED\u89C6\u9891\u7F16\u8F91").option("--aspect-ratio <ratio>", "\u753B\u9762\u6BD4\u4F8B\uFF1A16:9 \u6216 9:16").option("--task <task>", "\u89C6\u9891\u4EFB\u52A1\uFF1Atext_to_video\u3001image_to_video\u3001reference_to_video \u6216 edit").option("-o, --out <dir>", "\u8F93\u51FA\u76EE\u5F55", DEFAULT_OUT_DIR).action(async (promptParts, opts, cmd) => {
+    const g = cmd.optsWithGlobals();
+    const auth = resolveAuth(g);
+    if (opts.aspectRatio && !["16:9", "9:16"].includes(opts.aspectRatio)) {
+      throw new ApiError("invalid_request", "--aspect-ratio must be 16:9 or 9:16");
+    }
+    if (opts.task && !["text_to_video", "image_to_video", "reference_to_video", "edit"].includes(opts.task)) {
+      throw new ApiError("invalid_request", "--task must be text_to_video, image_to_video, reference_to_video, or edit");
+    }
+    const prompt = promptParts.join(" ");
+    const imageInputs = (opts.image ?? []).map(geminiOmniImageInput);
+    const input = imageInputs.length === 0 ? prompt : [...imageInputs, { type: "text", text: prompt }];
+    const res = await withProgress("\u6B63\u5728\u751F\u6210 Gemini Omni \u89C6\u9891", () => request({
+      baseUrl: auth.baseUrl,
+      path: "/v1beta/interactions",
+      apiKey: auth.apiKey,
+      body: {
+        model: "gemini-omni-flash-preview",
+        input,
+        ...opts.previousInteractionId ? { previous_interaction_id: opts.previousInteractionId } : {},
+        ...opts.aspectRatio ? { response_format: { type: "video", aspect_ratio: opts.aspectRatio } } : {},
+        ...opts.task ? { generation_config: { video_config: { task: opts.task } } } : {}
+      },
+      timeoutMs: 6e5
+    }));
+    const video = extractGeminiOmniVideo(res);
+    if (!video) {
+      throw new ApiError("bad_response", "Gemini Omni \u54CD\u5E94\u4E2D\u672A\u627E\u5230\u89C6\u9891\u6570\u636E", { body: res });
+    }
+    const dir = resolve2(opts.out);
+    await mkdir2(dir, { recursive: true });
+    const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
+    const extension = video.mimeType?.includes("webm") ? ".webm" : ".mp4";
+    const file = join3(dir, `gemini-omni-${timestamp}${extension}`);
+    await writeFile(file, Buffer.from(video.data, "base64"));
+    if (g.json) {
+      printJson({ interaction_id: res.id, file });
+    } else {
+      info(`\u2713 ${file}`);
+      if (res.id) info(`\u4EA4\u4E92 ID\uFF1A${res.id}`);
+    }
+  });
+  gen.command("video").description("\u751F\u6210\u89C6\u9891\uFF08\u7701\u7565 --model \u65F6\u81EA\u52A8\u9009\u62E9\u5F53\u524D\u53EF\u7528\u9ED8\u8BA4\u6A21\u578B\uFF09").argument("<prompt...>", "\u63D0\u793A\u8BCD").option("-m, --model <model>", "\u89C6\u9891\u6A21\u578B ID\uFF1B\u7701\u7565\u65F6\u7531 focalapi \u81EA\u52A8\u9009\u62E9").option("--seconds <n>", "\u65F6\u957F\u79D2\u6570\uFF1B\u7CBE\u786E\u8303\u56F4\u8FD0\u884C focalapi models get <model> \u67E5\u770B", (v) => Number.parseInt(v, 10)).option("--size <size>", "\u5206\u8FA8\u7387\uFF0C\u5982 1280x720").option("--resolution <resolution>", "\u539F\u751F\u8F93\u51FA\u5206\u8FA8\u7387\uFF0C\u5982 480p\u3001720p\u30011080p\u30014k").option("--ratio <ratio>", "\u539F\u751F\u5BBD\u9AD8\u6BD4\uFF0C\u5982 16:9\u30019:16\u3001adaptive").option("--aspect-ratio <ratio>", "Grok \u89C6\u9891\u539F\u751F\u753B\u9762\u6BD4\u4F8B\uFF0C\u5982 16:9\u30019:16\u3001auto").option("--seed <n>", "Grok \u89C6\u9891\u968F\u673A\u79CD\u5B50\uFF08\u975E\u8D1F\u6574\u6570\uFF09", (v) => Number.parseInt(v, 10)).option("--image <url...>", "\u56FE\u751F\u89C6\u9891\u7684\u6E90\u56FE\u50CF URL\uFF0C\u53EF\u591A\u4E2A").option("--generate-audio <boolean>", "\u662F\u5426\u751F\u6210\u97F3\u9891\uFF08\u53EA\u63A5\u53D7 true \u6216 false\uFF09", (v) => parseBooleanOption(v, "generate-audio")).option("--watermark <boolean>", "\u662F\u5426\u6DFB\u52A0\u6C34\u5370\uFF08\u53EA\u63A5\u53D7 true \u6216 false\uFF09", (v) => parseBooleanOption(v, "watermark")).option("--service-tier <tier>", "\u670D\u52A1\u5C42\u7EA7\uFF08Seedance 2.0 \u9ED8\u8BA4 default\uFF09").option("--priority <n>", "\u4EFB\u52A1\u4F18\u5148\u7EA7\uFF08\u4EC5 Seedance 2.0 \u7CFB\u5217\uFF09", (v) => Number.parseInt(v, 10)).option("--callback-url <url>", "\u4EFB\u52A1\u5B8C\u6210\u56DE\u8C03 URL").option("--return-last-frame <boolean>", "\u662F\u5426\u8FD4\u56DE\u6700\u540E\u4E00\u5E27\uFF08\u53EA\u63A5\u53D7 true \u6216 false\uFF09", (v) => parseBooleanOption(v, "return-last-frame")).option("--execution-expires-after <seconds>", "\u4EFB\u52A1\u8FC7\u671F\u79D2\u6570\uFF083600\u2013259200\uFF09", (v) => Number.parseInt(v, 10)).option("--safety-identifier <identifier>", "Seedance \u5B89\u5168\u6807\u8BC6\u7B26\uFF081\u201364 \u4E2A\u53EF\u6253\u5370 ASCII \u5B57\u7B26\uFF09").option("--no-wait", "\u63D0\u4EA4\u540E\u7ACB\u5373\u8FD4\u56DE task_id\uFF0C\u4E0D\u7B49\u5F85\u5B8C\u6210").option("--poll-interval <ms>", "\u8F6E\u8BE2\u95F4\u9694\u6BEB\u79D2", (v) => Number.parseInt(v, 10), 5e3).option("--timeout <minutes>", "\u6700\u957F\u7B49\u5F85\u5206\u949F", (v) => Number.parseInt(v, 10), 30).option("-o, --out <dir>", "\u8F93\u51FA\u76EE\u5F55", DEFAULT_OUT_DIR).option("--content <json>", "Ark-compatible content JSON array; overrides prompt/image facade fields").action(
     async (promptParts, opts, cmd) => {
       const g = cmd.optsWithGlobals();
       const auth = resolveAuth(g);
-      const body = { model: opts.model, prompt: promptParts.join(" ") };
+      const model = opts.model ?? (await resolveCreativeModel(auth, "video")).model.id;
+      if (!opts.model && !g.json) info(`\u5DF2\u81EA\u52A8\u9009\u62E9\u89C6\u9891\u6A21\u578B\uFF1A${model}`);
+      const body = { model, prompt: promptParts.join(" ") };
+      const metadata = {};
       if (opts.seconds !== void 0) {
-        body.seconds = String(clampInt(opts.seconds, 1, MAX_TASK_DURATION_SECONDS, "seconds"));
+        const seconds = clampInt(opts.seconds, 1, MAX_TASK_DURATION_SECONDS, "seconds");
+        body.duration = seconds;
       }
       if (opts.size) body.size = opts.size;
-      const created = await request({
+      if (opts.image) body.images = opts.image;
+      if (opts.resolution) metadata.resolution = opts.resolution.toLowerCase();
+      if (opts.ratio) metadata.ratio = opts.ratio;
+      if (opts.aspectRatio) metadata.ratio = opts.aspectRatio;
+      if (opts.seed !== void 0) metadata.seed = opts.seed;
+      if (opts.generateAudio !== void 0) metadata.generate_audio = opts.generateAudio;
+      if (opts.watermark !== void 0) metadata.watermark = opts.watermark;
+      if (opts.serviceTier) metadata.service_tier = opts.serviceTier;
+      if (opts.priority !== void 0) metadata.priority = opts.priority;
+      if (opts.callbackUrl) metadata.callback_url = opts.callbackUrl;
+      if (opts.returnLastFrame !== void 0) metadata.return_last_frame = opts.returnLastFrame;
+      if (opts.executionExpiresAfter !== void 0) metadata.execution_expires_after = opts.executionExpiresAfter;
+      if (opts.safetyIdentifier) metadata.safety_identifier = opts.safetyIdentifier;
+      if (opts.content) metadata.content = parseJsonArray(opts.content, "content");
+      validateVideoGeneration(model, {
+        seconds: opts.seconds,
+        resolution: opts.resolution,
+        ratio: opts.ratio,
+        aspectRatio: opts.aspectRatio,
+        seed: opts.seed,
+        serviceTier: opts.serviceTier,
+        priority: opts.priority,
+        executionExpiresAfter: opts.executionExpiresAfter,
+        safetyIdentifier: opts.safetyIdentifier
+      });
+      if (Object.keys(metadata).length > 0) body.metadata = metadata;
+      const created = await withProgress("\u6B63\u5728\u63D0\u4EA4\u89C6\u9891\u4EFB\u52A1", () => request({
         baseUrl: auth.baseUrl,
         path: "/v1/video/generations",
         apiKey: auth.apiKey,
         body,
         timeoutMs: 12e4
-      });
+      }));
       const taskId = extractTaskId(created);
       if (!taskId) {
         throw new ApiError("bad_response", "\u89C6\u9891\u4EFB\u52A1\u54CD\u5E94\u4E2D\u672A\u627E\u5230 task_id", { body: created });
       }
       if (opts.wait === false) {
         if (g.json) {
-          printJson({ task_id: taskId, submitted: true });
+          printJson({ model, task_id: taskId, submitted: true, next_command: `focalapi task status ${taskId} --json` });
         } else {
           process.stdout.write(taskId + "\n");
           info(`\u4EFB\u52A1\u5DF2\u63D0\u4EA4\u3002\u7EED\u53D6\uFF1Afocalapi task status ${taskId} / focalapi task download ${taskId}`);
@@ -937,7 +1715,7 @@ function registerGen(program) {
       });
       const filePath = await downloadTaskContent(auth.baseUrl, auth.apiKey, taskId, opts.out);
       if (g.json) {
-        printJson({ task_id: taskId, status: final.status, file: filePath });
+        printJson({ model, task_id: taskId, status: final.status, file: filePath });
       } else {
         info(`\u2713 ${filePath}`);
       }
@@ -980,63 +1758,6 @@ function registerTask(program) {
   });
 }
 
-// src/commands/search.ts
-import { readFileSync as readFileSync3 } from "fs";
-function extractResults(raw) {
-  if (!raw || typeof raw !== "object") return [];
-  const obj = raw;
-  const candidates = [obj.results, obj.data, obj.items, obj.output];
-  for (const c of candidates) {
-    if (!Array.isArray(c)) continue;
-    const out = [];
-    for (const item of c) {
-      if (!item || typeof item !== "object") continue;
-      const it = item;
-      const url = typeof it.url === "string" ? it.url : typeof it.link === "string" ? it.link : "";
-      const title = typeof it.title === "string" ? it.title : url;
-      const snippet = typeof it.snippet === "string" ? it.snippet : typeof it.content === "string" ? it.content.slice(0, 200) : void 0;
-      if (url || title) out.push({ title, url, ...snippet ? { snippet } : {} });
-    }
-    if (out.length > 0) return out;
-  }
-  return [];
-}
-function registerSearch(program) {
-  program.command("search").description("\u8054\u7F51\u641C\u7D22\uFF08/v1/alpha/search\uFF0Calpha \u7EA7\u63A5\u53E3\uFF09").argument("<query...>", "\u641C\u7D22\u5185\u5BB9").requiredOption("-m, --model <model>", "\u641C\u7D22\u6A21\u578B ID\uFF08focalapi models list --filter search \u67E5\u770B\uFF09").option("--raw <json|@file>", "\u5B8C\u6574\u81EA\u5B9A\u4E49\u8BF7\u6C42\u4F53\uFF08JSON \u5B57\u7B26\u4E32\u6216 @\u6587\u4EF6\uFF09\uFF0C\u4E0E query \u5408\u5E76").action(async (queryParts, opts, cmd) => {
-    const g = cmd.optsWithGlobals();
-    const auth = resolveAuth(g);
-    let body = { model: opts.model, query: queryParts.join(" ") };
-    if (opts.raw) {
-      const text = opts.raw.startsWith("@") ? readFileSync3(opts.raw.slice(1), "utf-8") : opts.raw;
-      try {
-        body = { ...JSON.parse(text), model: opts.model };
-      } catch {
-        throw new ApiError("invalid_request", "--raw \u4E0D\u662F\u5408\u6CD5 JSON");
-      }
-    }
-    const res = await request({
-      baseUrl: auth.baseUrl,
-      path: "/v1/alpha/search",
-      apiKey: auth.apiKey,
-      body,
-      timeoutMs: 12e4
-    });
-    if (g.json) {
-      printJson(res);
-      return;
-    }
-    const results = extractResults(res);
-    if (results.length === 0) {
-      printJson(res);
-      return;
-    }
-    printTable(
-      ["#", "\u6807\u9898", "\u94FE\u63A5"],
-      results.map((r, i) => [String(i + 1), r.title.slice(0, 60), r.url])
-    );
-  });
-}
-
 // src/commands/audio.ts
 import { writeFile as writeFile2 } from "fs/promises";
 import { resolve as resolve3 } from "path";
@@ -1087,77 +1808,15 @@ function registerAudio(program) {
   });
 }
 
-// src/commands/embed.ts
-function registerEmbed(program) {
-  program.command("embed").description("\u6587\u672C\u5411\u91CF\u5316\uFF08/v1/embeddings\uFF09").argument("[text...]", "\u6587\u672C\uFF1B\u7701\u7565\u4E14 stdin \u4E3A\u7BA1\u9053\u65F6\u4ECE stdin \u8BFB\u53D6").requiredOption("-m, --model <model>", "\u5411\u91CF\u6A21\u578B ID").option("--input <file>", "\u4ECE\u6587\u4EF6\u8BFB\u53D6\u6587\u672C\uFF08@ \u524D\u7F00\u53EF\u9009\uFF09").action(async (textParts, opts, cmd) => {
-    const g = cmd.optsWithGlobals();
-    const auth = resolveAuth(g);
-    let text = textParts.join(" ").trim();
-    if (opts.input) {
-      text = readInputFile(opts.input.replace(/^@/, "")).data.toString("utf-8");
-    } else if (!text && !process.stdin.isTTY) {
-      text = await readStdin();
-    }
-    if (!text) {
-      throw new ApiError("invalid_request", "\u7F3A\u5C11\u5F85\u5411\u91CF\u5316\u6587\u672C", {
-        hint: 'focalapi embed "\u6587\u672C" -m <model>\uFF0C\u6216 focalapi embed -m <model> --input @file.txt\u3002'
-      });
-    }
-    const res = await request({
-      baseUrl: auth.baseUrl,
-      path: "/v1/embeddings",
-      apiKey: auth.apiKey,
-      body: { model: opts.model, input: text },
-      timeoutMs: 12e4
-    });
-    if (g.json) {
-      printJson(res);
-    } else {
-      const vec = res.data?.[0]?.embedding ?? [];
-      info(`\u7EF4\u5EA6\uFF1A${vec.length}\uFF1Btokens\uFF1A${res.usage?.total_tokens ?? "-"}`);
-      info("\u5B8C\u6574\u5411\u91CF\u8BF7\u7528 --json \u8F93\u51FA\u3002");
-    }
-  });
-}
-
-// src/commands/rerank.ts
-import { readFileSync as readFileSync4 } from "fs";
-function registerRerank(program) {
-  program.command("rerank").description("\u6309\u67E5\u8BE2\u5BF9\u6587\u6863\u91CD\u6392\u5E8F\uFF08/v1/rerank\uFF09").requiredOption("-m, --model <model>", "rerank \u6A21\u578B ID").requiredOption("--query <text>", "\u67E5\u8BE2").requiredOption("--docs <json|@file>", "\u6587\u6863\u6570\u7EC4\uFF08JSON \u5B57\u7B26\u4E32\u6216 @file.json\uFF09").option("--top-n <n>", "\u53EA\u8FD4\u56DE\u524D N \u6761", (v) => Number.parseInt(v, 10)).action(async (opts, cmd) => {
-    const g = cmd.optsWithGlobals();
-    const auth = resolveAuth(g);
-    const text = opts.docs.startsWith("@") ? readFileSync4(opts.docs.slice(1), "utf-8") : opts.docs;
-    let documents;
-    try {
-      documents = JSON.parse(text);
-    } catch {
-      throw new ApiError("invalid_request", "--docs \u4E0D\u662F\u5408\u6CD5 JSON \u6570\u7EC4");
-    }
-    if (!Array.isArray(documents) || documents.length === 0) {
-      throw new ApiError("invalid_request", "--docs \u5FC5\u987B\u662F\u975E\u7A7A JSON \u6570\u7EC4");
-    }
-    const body = { model: opts.model, query: opts.query, documents };
-    if (opts.topN !== void 0) body.top_n = opts.topN;
-    const res = await request({
-      baseUrl: auth.baseUrl,
-      path: "/v1/rerank",
-      apiKey: auth.apiKey,
-      body,
-      timeoutMs: 12e4
-    });
-    if (g.json) {
-      printJson(res);
-      return;
-    }
-    const rows = (res.results ?? []).map((r) => {
-      const doc = typeof r.document === "string" ? r.document : r.document?.text ?? "";
-      return [String(r.index ?? "-"), String(r.relevance_score ?? "-"), doc.slice(0, 60)];
-    });
-    printTable(["\u539F\u6587\u6863\u5E8F\u53F7", "\u76F8\u5173\u5EA6", "\u6587\u6863\u9884\u89C8"], rows);
-  });
-}
-
 // src/commands/usage.ts
+function formatBillingUsage(billing) {
+  const value = billing.total_usage;
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value.toLocaleString("zh-CN", { maximumFractionDigits: 4 });
+  }
+  if (typeof value === "string" && value.trim() !== "") return value;
+  return "-";
+}
 function defaultStartDate() {
   const now = /* @__PURE__ */ new Date();
   return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-01`;
@@ -1191,226 +1850,441 @@ function registerUsage(program) {
         ["\u5DF2\u7528", String(token.total_used)],
         ["\u5269\u4F59", token.unlimited_quota ? "\u65E0\u9650" : String(token.total_available)],
         ["\u8FC7\u671F\u65F6\u95F4", token.expires_at > 0 ? new Date(token.expires_at * 1e3).toLocaleString() : "\u6C38\u4E0D\u8FC7\u671F"],
-        [`\u5468\u671F\u7528\u91CF\uFF08${start} ~ ${end}\uFF09`, JSON.stringify(billing)]
+        [`\u5468\u671F\u7528\u91CF\uFF08${start} ~ ${end}\uFF09`, formatBillingUsage(billing)],
+        ["\u8D26\u5355\u5BF9\u8C61", typeof billing.object === "string" ? billing.object : "-"]
       ]
     );
   });
 }
 
 // src/commands/connect.ts
-import { cpSync, existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync5, readdirSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
+import { createHash, randomUUID } from "crypto";
+import {
+  cpSync,
+  existsSync as existsSync2,
+  lstatSync,
+  mkdirSync as mkdirSync2,
+  readFileSync as readFileSync3,
+  readdirSync,
+  readlinkSync,
+  renameSync,
+  rmSync,
+  writeFileSync as writeFileSync2
+} from "fs";
 import { homedir as homedir2, platform } from "os";
-import { dirname, join as join4 } from "path";
+import { dirname, join as join4, relative, resolve as resolve4 } from "path";
 import { fileURLToPath } from "url";
-var MANIFEST_NAME = ".focalapi-connect-manifest.json";
+var MANIFEST_NAME = ".focalapi-managed-skills.json";
+var LEGACY_MANIFEST_NAME = ".focalapi-connect-manifest.json";
+var AGENTS = [
+  { id: "adal", name: "ADAL", skillsPath: [".adal", "skills"] },
+  { id: "amp", name: "Amp", skillsPath: [".config", "agents", "skills"], detectPaths: [[".amp"], [".config", "amp"]] },
+  { id: "antigravity", name: "Antigravity", skillsPath: [".gemini", "antigravity", "skills"] },
+  { id: "augment", name: "Augment", skillsPath: [".augment", "skills"] },
+  { id: "bob", name: "Bob", skillsPath: [".bob", "skills"] },
+  { id: "claude-code", name: "Claude Code", skillsPath: [".claude", "skills"] },
+  { id: "cline", name: "Cline", skillsPath: [".agents", "skills"], detectPaths: [[".cline"]] },
+  { id: "codebuddy", name: "CodeBuddy", skillsPath: [".codebuddy", "skills"] },
+  { id: "codex", name: "Codex", skillsPath: [".agents", "skills"], detectPaths: [[".codex"]] },
+  { id: "command-code", name: "Command Code", skillsPath: [".commandcode", "skills"] },
+  { id: "continue", name: "Continue", skillsPath: [".continue", "skills"] },
+  { id: "cortex", name: "Snowflake Cortex", skillsPath: [".snowflake", "cortex", "skills"] },
+  { id: "crush", name: "Crush", skillsPath: [".config", "crush", "skills"] },
+  { id: "cursor", name: "Cursor", skillsPath: [".cursor", "skills"] },
+  { id: "deepagents", name: "Deep Agents", skillsPath: [".deepagents", "agent", "skills"] },
+  { id: "droid", name: "Factory Droid", skillsPath: [".factory", "skills"] },
+  { id: "firebender", name: "Firebender", skillsPath: [".firebender", "skills"] },
+  { id: "gemini-cli", name: "Gemini CLI", skillsPath: [".gemini", "skills"] },
+  { id: "github-copilot", name: "GitHub Copilot", skillsPath: [".copilot", "skills"] },
+  { id: "goose", name: "Goose", skillsPath: [".config", "goose", "skills"] },
+  { id: "iflow-cli", name: "iFlow CLI", skillsPath: [".iflow", "skills"] },
+  { id: "junie", name: "Junie", skillsPath: [".junie", "skills"] },
+  { id: "kilo", name: "Kilo Code", skillsPath: [".kilocode", "skills"] },
+  { id: "kimi-cli", name: "Kimi CLI", skillsPath: [".config", "agents", "skills"], detectPaths: [[".kimi"], [".config", "kimi"]] },
+  { id: "kiro-cli", name: "Kiro CLI", skillsPath: [".kiro", "skills"] },
+  { id: "kode", name: "Kode", skillsPath: [".kode", "skills"] },
+  { id: "mcpjam", name: "MCPJam", skillsPath: [".mcpjam", "skills"] },
+  { id: "mistral-vibe", name: "Mistral Vibe", skillsPath: [".vibe", "skills"] },
+  { id: "mux", name: "Mux", skillsPath: [".mux", "skills"] },
+  { id: "neovate", name: "Neovate", skillsPath: [".neovate", "skills"] },
+  { id: "openclaw", name: "OpenClaw", skillsPath: [".openclaw", "skills"] },
+  { id: "opencode", name: "OpenCode", skillsPath: [".config", "opencode", "skills"] },
+  { id: "openhands", name: "OpenHands", skillsPath: [".openhands", "skills"] },
+  { id: "pi", name: "Pi", skillsPath: [".agents", "skills"], detectPaths: [[".pi", "agent"]] },
+  { id: "pochi", name: "Pochi", skillsPath: [".pochi", "skills"] },
+  { id: "qoder", name: "Qoder", skillsPath: [".qoder", "skills"] },
+  { id: "qwen-code", name: "Qwen Code", skillsPath: [".qwen", "skills"] },
+  { id: "roo", name: "Roo Code", skillsPath: [".roo", "skills"] },
+  { id: "trae", name: "Trae", skillsPath: [".trae", "skills"] },
+  { id: "trae-cn", name: "Trae CN", skillsPath: [".trae-cn", "skills"] },
+  { id: "warp", name: "Warp", skillsPath: [".agents", "skills"], detectPaths: [[".warp"]] },
+  { id: "windsurf", name: "Windsurf", skillsPath: [".codeium", "windsurf", "skills"] },
+  { id: "zencoder", name: "Zencoder", skillsPath: [".zencoder", "skills"] }
+];
 function homeDir() {
   return normalizeHomePath(process.env.FOCALAPI_HOME ?? homedir2());
 }
 function getTargets() {
   const home = homeDir();
-  const claudeRoot = join4(home, ".claude");
-  const codexRoot = join4(home, ".codex");
-  const opencodeRoot = join4(home, ".config", "opencode");
-  const hermesRoot = platform() === "win32" ? join4(home, "AppData", "Local", "hermes") : join4(home, ".config", "hermes");
-  return [
-    {
-      id: "claude-code",
-      name: "Claude Code",
-      skillsDir: join4(claudeRoot, "skills"),
-      detected: existsSync2(claudeRoot),
-      providerHint: [
-        "Claude Code provider \u914D\u7F6E\uFF08\u624B\u52A8\uFF09\uFF1A",
-        "  \u5728 ~/.claude/settings.json \u7684 env \u6BB5\u52A0\u5165\uFF1A",
-        '    "ANTHROPIC_BASE_URL": "https://api.focalapi.com",',
-        '    "ANTHROPIC_AUTH_TOKEN": "<\u4F60\u7684 sk- key>"',
-        "  \uFF08focalapi \u5DF2\u517C\u5BB9 /v1/messages \u534F\u8BAE\uFF09"
-      ].join("\n")
-    },
-    {
-      id: "codex",
-      name: "Codex",
-      skillsDir: join4(codexRoot, "skills"),
-      detected: existsSync2(codexRoot),
-      providerHint: [
-        "Codex provider \u914D\u7F6E\uFF08\u624B\u52A8\uFF09\uFF1A",
-        "  \u5728 ~/.codex/config.toml \u52A0\u5165\uFF1A",
-        "    [model_providers.focalapi]",
-        '    name = "focalapi"',
-        '    base_url = "https://api.focalapi.com/v1"',
-        '    env_key = "FOCALAPI_API_KEY"',
-        "  \uFF08focalapi \u5DF2\u517C\u5BB9 /v1/responses \u4E0E /v1/chat/completions\uFF09"
-      ].join("\n")
-    },
-    {
-      id: "opencode",
-      name: "OpenCode",
-      skillsDir: join4(opencodeRoot, "skills"),
-      detected: existsSync2(opencodeRoot),
-      providerHint: [
-        "OpenCode provider \u914D\u7F6E\uFF08\u624B\u52A8\uFF09\uFF1A",
-        "  \u5728 opencode.json \u7684 provider \u6BB5\u52A0\u5165 openai-compatible \u63D0\u4F9B\u5546\uFF0C",
-        '  baseURL = "https://api.focalapi.com/v1"\uFF0CapiKey \u6307\u5411\u4F60\u7684 sk- key\u3002'
-      ].join("\n")
-    },
-    {
-      id: "hermes",
-      name: "Hermes",
-      skillsDir: join4(hermesRoot, "skills"),
-      detected: existsSync2(hermesRoot),
-      providerHint: [
-        "Hermes \u914D\u7F6E\uFF08\u624B\u52A8\uFF09\uFF1A",
-        "  \u6280\u80FD\u5DF2\u88C5\u5165\u9ED8\u8BA4 profile \u7684 skills \u76EE\u5F55\uFF1B\u975E\u9ED8\u8BA4 profile \u8BF7\u628A\u6280\u80FD\u76EE\u5F55\u590D\u5236\u5230",
-        "  hermes/profiles/<name>/skills/\u3002provider \u5728 config.yaml \u52A0 openai-compatible",
-        '  \u63D0\u4F9B\u5546\uFF0Cbase_url = "https://api.focalapi.com/v1"\u3002'
-      ].join("\n")
-    }
-  ];
+  const definitions = [...AGENTS];
+  definitions.push({
+    id: "hermes",
+    name: "Hermes",
+    skillsPath: platform() === "win32" ? ["AppData", "Local", "hermes", "skills"] : [".config", "hermes", "skills"]
+  });
+  return definitions.map((agent) => {
+    const skillsDir = join4(home, ...agent.skillsPath);
+    const detectPaths = agent.detectPaths ?? [agent.skillsPath.slice(0, -1)];
+    return {
+      id: agent.id,
+      name: agent.name,
+      skillsDir,
+      detected: detectPaths.some((parts) => existsSync2(join4(home, ...parts)))
+    };
+  });
 }
 function bundledSkillsDir() {
-  if (process.env.FOCALAPI_SKILLS_DIR) {
-    return process.env.FOCALAPI_SKILLS_DIR;
-  }
+  if (process.env.FOCALAPI_SKILLS_DIR) return normalizeHomePath(process.env.FOCALAPI_SKILLS_DIR);
   const here = dirname(fileURLToPath(import.meta.url));
   const candidates = [join4(here, "..", "skills"), join4(here, "..", "..", "skills")];
   for (const dir of candidates) {
-    if (existsSync2(join4(dir, "focalapi", "SKILL.md"))) {
-      return dir;
-    }
+    if (existsSync2(join4(dir, "focalapi", "SKILL.md"))) return dir;
   }
-  throw new ApiError("internal_error", "\u672A\u627E\u5230\u5185\u7F6E skills \u76EE\u5F55\uFF08focalapi/SKILL.md \u7F3A\u5931\uFF09");
+  throw new ApiError("internal_error", "\u672A\u627E\u5230\u5185\u7F6E Skills\uFF08focalapi/SKILL.md \u7F3A\u5931\uFF09");
 }
 function listBundledSkills(srcDir) {
   const dir = srcDir ?? bundledSkillsDir();
-  return readdirSync(dir, { withFileTypes: true }).filter((d) => d.isDirectory() && d.name.startsWith("focalapi") && existsSync2(join4(dir, d.name, "SKILL.md"))).map((d) => d.name).sort();
+  return readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.startsWith("focalapi") && existsSync2(join4(dir, entry.name, "SKILL.md"))).map((entry) => entry.name).sort();
 }
 function manifestPath(skillsDir) {
   return join4(skillsDir, MANIFEST_NAME);
 }
 function readManifest(skillsDir) {
-  const path = manifestPath(skillsDir);
-  if (!existsSync2(path)) return void 0;
+  for (const name of [MANIFEST_NAME, LEGACY_MANIFEST_NAME]) {
+    const path = join4(skillsDir, name);
+    if (!existsSync2(path)) continue;
+    try {
+      const manifest = JSON.parse(readFileSync3(path, "utf8"));
+      if (manifest.tool === "focalapi-cli" && Array.isArray(manifest.skills)) return manifest;
+    } catch {
+    }
+  }
+  return void 0;
+}
+function digestDirectory(root) {
+  const hash = createHash("sha256");
+  const walk = (dir) => {
+    const entries = readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    for (const entry of entries) {
+      const path = join4(dir, entry.name);
+      const name = relative(root, path).replaceAll("\\", "/");
+      const stat = lstatSync(path);
+      if (stat.isSymbolicLink()) {
+        hash.update(`link\0${name}\0${readlinkSync(path)}\0`);
+      } else if (stat.isDirectory()) {
+        hash.update(`dir\0${name}\0`);
+        walk(path);
+      } else if (stat.isFile()) {
+        hash.update(`file\0${name}\0`);
+        hash.update(readFileSync3(path));
+        hash.update("\0");
+      }
+    }
+  };
+  walk(root);
+  return hash.digest("hex");
+}
+function isAuthConfigured() {
+  if (process.env.FOCALAPI_API_KEY) return true;
   try {
-    return JSON.parse(readFileSync5(path, "utf-8"));
+    return Object.values(loadConfig().profiles).some((profile) => Boolean(profile.apiKey));
   } catch {
-    return void 0;
+    return false;
   }
 }
-function installTo(target, skills, srcDir) {
-  mkdirSync2(target.skillsDir, { recursive: true });
-  for (const skill of skills) {
-    cpSync(join4(srcDir, skill), join4(target.skillsDir, skill), { recursive: true });
+function groupTargets(targets) {
+  const grouped = /* @__PURE__ */ new Map();
+  for (const target of targets) {
+    const key = resolve4(target.skillsDir).toLowerCase();
+    grouped.set(key, [...grouped.get(key) ?? [], target]);
   }
-  const manifest = {
-    tool: "focalapi-cli",
-    version: VERSION,
-    installedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    skills
-  };
-  writeFileSync2(manifestPath(target.skillsDir), JSON.stringify(manifest, null, 2) + "\n", "utf-8");
-  return manifest;
+  return [...grouped.values()].map((agents) => ({ agents, skillsDir: agents[0].skillsDir }));
 }
-function uninstallFrom(target) {
-  const manifest = readManifest(target.skillsDir);
-  if (!manifest) {
-    return { removed: [], hadManifest: false };
+function installTo(skillsDir, agents, skills, srcDir) {
+  const sourceRoot = resolve4(srcDir).toLowerCase();
+  if (resolve4(skillsDir).toLowerCase() === sourceRoot) {
+    throw new ApiError("invalid_request", "\u5B89\u88C5\u76EE\u6807\u4E0D\u80FD\u662F focalapi-cli \u81EA\u5E26 Skills \u6E90\u76EE\u5F55");
   }
+  mkdirSync2(skillsDir, { recursive: true });
+  const oldManifest = readManifest(skillsDir);
+  const transactionRoot = join4(skillsDir, `.focalapi-install-${randomUUID()}`);
+  const stageRoot = join4(transactionRoot, "stage");
+  const backupRoot = join4(transactionRoot, "backup");
+  mkdirSync2(stageRoot, { recursive: true });
+  mkdirSync2(backupRoot, { recursive: true });
+  const digests = {};
+  const touched = [];
+  let oldManifestBackup;
+  let oldLegacyManifestBackup;
+  try {
+    for (const skill of skills) {
+      const staged = join4(stageRoot, skill);
+      cpSync(join4(srcDir, skill), staged, { recursive: true, force: true });
+      digests[skill] = digestDirectory(staged);
+    }
+    const currentManifest = manifestPath(skillsDir);
+    if (existsSync2(currentManifest)) {
+      oldManifestBackup = join4(backupRoot, MANIFEST_NAME);
+      renameSync(currentManifest, oldManifestBackup);
+    }
+    const legacyManifest = join4(skillsDir, LEGACY_MANIFEST_NAME);
+    if (existsSync2(legacyManifest)) {
+      oldLegacyManifestBackup = join4(backupRoot, LEGACY_MANIFEST_NAME);
+      renameSync(legacyManifest, oldLegacyManifestBackup);
+    }
+    for (const skill of skills) {
+      const destination = join4(skillsDir, skill);
+      const backup = join4(backupRoot, skill);
+      if (existsSync2(destination)) {
+        renameSync(destination, backup);
+        touched.push({ destination, backup });
+      } else {
+        touched.push({ destination });
+      }
+      renameSync(join4(stageRoot, skill), destination);
+    }
+    for (const retired of oldManifest?.skills ?? []) {
+      if (skills.includes(retired) || !retired.startsWith("focalapi")) continue;
+      const destination = join4(skillsDir, retired);
+      const expected = oldManifest?.digests?.[retired];
+      if (!expected || !existsSync2(destination) || digestDirectory(destination) !== expected) continue;
+      const backup = join4(backupRoot, `retired-${retired}`);
+      renameSync(destination, backup);
+      touched.push({ destination, backup });
+    }
+    const manifest = {
+      tool: "focalapi-cli",
+      schema: 2,
+      version: VERSION,
+      installedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      agents,
+      skills,
+      digests
+    };
+    const stagedManifest = join4(transactionRoot, MANIFEST_NAME);
+    writeFileSync2(stagedManifest, JSON.stringify(manifest, null, 2) + "\n", "utf8");
+    renameSync(stagedManifest, currentManifest);
+  } catch (error) {
+    rmSync(manifestPath(skillsDir), { force: true });
+    for (const item of touched.reverse()) {
+      rmSync(item.destination, { recursive: true, force: true });
+      if (item.backup && existsSync2(item.backup)) renameSync(item.backup, item.destination);
+    }
+    if (oldManifestBackup && existsSync2(oldManifestBackup)) renameSync(oldManifestBackup, manifestPath(skillsDir));
+    if (oldLegacyManifestBackup && existsSync2(oldLegacyManifestBackup)) {
+      renameSync(oldLegacyManifestBackup, join4(skillsDir, LEGACY_MANIFEST_NAME));
+    }
+    throw error;
+  } finally {
+    rmSync(transactionRoot, { recursive: true, force: true });
+  }
+  return { agents, skillsDir, skills, version: VERSION };
+}
+function uninstallFrom(skillsDir, srcDir) {
+  const manifest = readManifest(skillsDir);
+  if (!manifest) return { removed: [], preserved: [], hadManifest: false };
   const removed = [];
-  for (const skill of manifest.skills) {
-    const dir = join4(target.skillsDir, skill);
-    if (skill.startsWith("focalapi") && existsSync2(dir)) {
-      rmSync(dir, { recursive: true, force: true });
-      removed.push(skill);
+  const preserved = [];
+  for (const skill of manifest.skills ?? []) {
+    if (!skill.startsWith("focalapi")) continue;
+    const dir = join4(skillsDir, skill);
+    if (!existsSync2(dir)) continue;
+    const expected = manifest.digests?.[skill] ?? (existsSync2(join4(srcDir, skill)) ? digestDirectory(join4(srcDir, skill)) : void 0);
+    if (!expected || digestDirectory(dir) !== expected) {
+      preserved.push(skill);
+      continue;
+    }
+    rmSync(dir, { recursive: true, force: true });
+    removed.push(skill);
+  }
+  rmSync(manifestPath(skillsDir), { force: true });
+  rmSync(join4(skillsDir, LEGACY_MANIFEST_NAME), { force: true });
+  return { removed, preserved, hadManifest: true };
+}
+function verifyTarget(skillsDir) {
+  const manifest = readManifest(skillsDir);
+  if (!manifest) return { installed: false, valid: false, missing: [], modified: [] };
+  const missing = [];
+  const modified = [];
+  for (const skill of manifest.skills ?? []) {
+    const dir = join4(skillsDir, skill);
+    if (!existsSync2(dir)) {
+      missing.push(skill);
+      continue;
     }
+    const expected = manifest.digests?.[skill];
+    if (!expected || digestDirectory(dir) !== expected) modified.push(skill);
+  }
+  return {
+    installed: true,
+    valid: missing.length === 0 && modified.length === 0,
+    version: manifest.version,
+    missing,
+    modified
+  };
+}
+function customTarget(path) {
+  const skillsDir = resolve4(normalizeHomePath(path));
+  if (dirname(skillsDir) === skillsDir || skillsDir.toLowerCase() === resolve4(homeDir()).toLowerCase()) {
+    throw new ApiError("invalid_request", "--path \u5FC5\u987B\u6307\u5411\u5177\u4F53\u7684 Skills \u76EE\u5F55\uFF0C\u4E0D\u80FD\u662F\u78C1\u76D8\u6839\u76EE\u5F55\u6216\u7528\u6237\u4E3B\u76EE\u5F55");
   }
-  rmSync(manifestPath(target.skillsDir), { force: true });
-  return { removed, hadManifest: true };
+  return {
+    id: "custom",
+    name: "Custom Skills Directory",
+    skillsDir,
+    detected: true
+  };
 }
-function resolveTargets(targetIds, g) {
+function resolveTargets(targetIds, path, g) {
+  if (path) {
+    if (targetIds.length > 0) {
+      throw new ApiError("invalid_request", "--path \u4E0E Agent ID \u4E0D\u80FD\u540C\u65F6\u4F7F\u7528");
+    }
+    return [customTarget(path)];
+  }
   const all = getTargets();
-  if (targetIds && targetIds.length > 0) {
-    const unknown = targetIds.filter((id) => !all.some((t) => t.id === id));
+  if (targetIds.length > 0) {
+    const unknown = targetIds.filter((id) => !all.some((target) => target.id === id));
     if (unknown.length > 0) {
       throw new ApiError("invalid_request", `\u672A\u77E5 Agent\uFF1A${unknown.join(", ")}`, {
-        hint: `\u53EF\u9009\uFF1A${all.map((t) => t.id).join(" | ")}\u3002`
+        hint: `\u53EF\u9009\uFF1A${all.map((target) => target.id).join(" | ")}\uFF1B\u672A\u77E5 Agent \u53EF\u4F7F\u7528 --path <skills-dir>\u3002`
       });
     }
-    return all.filter((t) => targetIds.includes(t.id));
+    return all.filter((target) => targetIds.includes(target.id));
   }
-  const detected = all.filter((t) => t.detected);
+  const detected = all.filter((target) => target.detected);
   if (detected.length === 0) {
-    throw new ApiError("invalid_request", "\u672A\u68C0\u6D4B\u5230\u4EFB\u4F55\u672C\u673A Agent", {
-      hint: `\u652F\u6301\uFF1A${all.map((t) => `${t.id}\uFF08${t.name}\uFF09`).join("\u3001")}\u3002\u53EF\u5148\u663E\u5F0F\u6307\u5B9A\uFF1Afocalapi connect install <agent>\u3002`
+    throw new ApiError("invalid_request", "\u672A\u68C0\u6D4B\u5230\u672C\u673A Agent", {
+      hint: "\u8FD0\u884C focalapi connect list \u67E5\u770B\u652F\u6301\u5217\u8868\uFF0C\u6216\u4F7F\u7528 focalapi connect install --path <skills-dir>\u3002"
     });
   }
-  if (!g.json) {
-    info(`\u68C0\u6D4B\u5230 ${detected.length} \u4E2A Agent\uFF1A${detected.map((t) => t.name).join("\u3001")}`);
-  }
+  if (!g.json) info(`\u68C0\u6D4B\u5230 ${detected.length} \u4E2A Agent\uFF0C\u5C06\u6309 ${groupTargets(detected).length} \u4E2A\u6280\u80FD\u76EE\u5F55\u5B89\u88C5\u3002`);
   return detected;
 }
+function installCommand(targetIds, path, g) {
+  const targets = resolveTargets(targetIds, path, g);
+  const srcDir = bundledSkillsDir();
+  const skills = listBundledSkills(srcDir);
+  const results = groupTargets(targets).map((group) => installTo(
+    group.skillsDir,
+    group.agents.map((agent) => agent.id),
+    skills,
+    srcDir
+  ));
+  const authConfigured = isAuthConfigured();
+  const nextSteps = [
+    ...!authConfigured ? ["focalapi auth login --key <sk-...>"] : [],
+    "\u91CD\u542F Agent \u4F1A\u8BDD",
+    "\u76F4\u63A5\u63CF\u8FF0\u521B\u4F5C\u4EFB\u52A1\uFF0C\u4F8B\u5982\u201C\u751F\u6210\u4E00\u5F20\u4EA7\u54C1\u4E3B\u89C6\u89C9\u201D"
+  ];
+  if (g.json) {
+    printJson({
+      installed: results,
+      auth_configured: authConfigured,
+      ready: authConfigured,
+      restart_required: true,
+      next_steps: nextSteps
+    });
+    return;
+  }
+  for (const result of results) {
+    info(`\u2713 ${result.agents.join(" / ")}\uFF1A${result.skills.length} \u4E2A Skills \u5DF2\u88C5\u5165 ${result.skillsDir}`);
+  }
+  info(authConfigured ? "\u63A5\u5165\u5DF2\u95ED\u73AF\uFF1A\u91CD\u542F Agent \u540E\uFF0C\u76F4\u63A5\u63CF\u8FF0\u56FE\u7247\u6216\u89C6\u9891\u4EFB\u52A1\u5373\u53EF\uFF1B\u65E0\u9700\u70B9\u540D focalapi \u6216\u5148\u8BD5\u6A21\u578B\u3002" : "Skills \u5DF2\u5B89\u88C5\uFF1B\u8FD8\u9700\u8FD0\u884C focalapi auth login --key <sk-...>\uFF0C\u7136\u540E\u91CD\u542F Agent\u3002");
+}
 function registerConnect(program) {
-  const connect = program.command("connect").description("\u628A focalapi \u80FD\u529B\u6CE8\u5165\u672C\u673A AI Agent\uFF08skills \u5B89\u88C5/\u5378\u8F7D\uFF09");
-  connect.command("list").description("\u5217\u51FA\u652F\u6301\u7684 Agent \u53CA\u68C0\u6D4B/\u5B89\u88C5\u72B6\u6001").action(async (_opts, cmd) => {
+  const connect = program.command("connect").description("\u8BA9\u672C\u673A AI Agent \u81EA\u52A8\u8C03\u7528 focalapi \u521B\u4F5C\u6A21\u578B\uFF08\u4E0D\u6539 Agent \u7684\u4E3B\u6A21\u578B/provider\uFF09").option("--path <skills-dir>", "\u5B89\u88C5\u5230\u6307\u5B9A Skills \u76EE\u5F55\uFF0C\u4E0D\u626B\u63CF\u5168\u5C40 Agent").action(async (opts, cmd) => {
+    installCommand([], opts.path, cmd.optsWithGlobals());
+  });
+  connect.command("list").description("\u5217\u51FA\u652F\u6301\u7684 Agent \u53CA\u68C0\u6D4B/\u5B89\u88C5\u72B6\u6001\uFF08\u53EA\u8BFB\uFF09").action(async (_opts, cmd) => {
     const g = cmd.optsWithGlobals();
-    const rows = getTargets().map((t) => {
-      const manifest = readManifest(t.skillsDir);
+    const rows = getTargets().map((target) => {
+      const status = verifyTarget(target.skillsDir);
       return {
-        id: t.id,
-        name: t.name,
-        detected: t.detected,
-        skillsDir: t.skillsDir,
-        installed: manifest ? `${manifest.skills.length} \u4E2A\u6280\u80FD\uFF08v${manifest.version}\uFF09` : ""
+        id: target.id,
+        name: target.name,
+        detected: target.detected,
+        skills_dir: target.skillsDir,
+        installed: status.installed,
+        valid: status.valid,
+        version: status.version
       };
     });
     if (g.json) {
-      printJson({ agents: rows });
+      printJson({ supported: rows.length, agents: rows });
     } else {
       printTable(
-        ["Agent", "ID", "\u68C0\u6D4B\u5230", "\u5DF2\u5B89\u88C5", "\u6280\u80FD\u76EE\u5F55"],
-        rows.map((r) => [r.name, r.id, r.detected ? "\u2713" : "-", r.installed || "-", r.skillsDir])
+        ["Agent", "ID", "\u68C0\u6D4B\u5230", "\u5B89\u88C5\u72B6\u6001", "\u6280\u80FD\u76EE\u5F55"],
+        rows.map((row) => [
+          row.name,
+          row.id,
+          row.detected ? "\u2713" : "-",
+          row.valid ? `\u2713 v${row.version}` : row.installed ? "\u9700\u4FEE\u590D" : "-",
+          row.skills_dir
+        ])
       );
     }
   });
-  connect.command("install").description("\u5411\u6307\u5B9A\uFF08\u6216\u5168\u90E8\u5DF2\u68C0\u6D4B\u5230\u7684\uFF09Agent \u5B89\u88C5 focalapi \u6280\u80FD\u5305").argument("[targets...]", `Agent ID\uFF0C\u5982 claude-code codex\uFF1B\u7701\u7565=\u5168\u90E8\u5DF2\u68C0\u6D4B\u5230\u7684`).action(async (targetIds, _opts, cmd) => {
+  connect.command("install").description("\u4E8B\u52A1\u5F0F\u5B89\u88C5/\u4FEE\u590D Skills\uFF1B\u7701\u7565 Agent ID \u65F6\u5904\u7406\u5168\u90E8\u5DF2\u68C0\u6D4B\u5230\u7684 Agent").argument("[targets...]", "Agent ID\uFF0C\u5982 claude-code codex").option("--path <skills-dir>", "\u5B89\u88C5\u5230\u6307\u5B9A Skills \u76EE\u5F55\uFF0C\u4E0D\u626B\u63CF\u5168\u5C40 Agent").action(async (targetIds, opts, cmd) => {
+    installCommand(targetIds, opts.path ?? cmd.parent?.opts().path, cmd.optsWithGlobals());
+  });
+  connect.command("verify").description("\u9A8C\u8BC1 Skills \u5B8C\u6574\u6027\u3001\u8BA4\u8BC1\u5C31\u7EEA\u72B6\u6001\u4E0E\u9700\u8981\u91CD\u542F\u7684 Agent").argument("[targets...]", "Agent ID\uFF1B\u7701\u7565=\u5168\u90E8\u5DF2\u68C0\u6D4B\u5230\u7684").option("--path <skills-dir>", "\u9A8C\u8BC1\u6307\u5B9A Skills \u76EE\u5F55").action(async (targetIds, opts, cmd) => {
     const g = cmd.optsWithGlobals();
-    const targets = resolveTargets(targetIds, g);
-    const srcDir = bundledSkillsDir();
-    const skills = listBundledSkills(srcDir);
-    const results = targets.map((t) => ({ target: t, manifest: installTo(t, skills, srcDir) }));
+    const targets = resolveTargets(targetIds, opts.path ?? cmd.parent?.opts().path, g);
+    const rows = groupTargets(targets).map((group) => ({
+      agents: group.agents.map((agent) => agent.id),
+      skills_dir: group.skillsDir,
+      ...verifyTarget(group.skillsDir)
+    }));
+    const authConfigured = isAuthConfigured();
+    const valid = rows.every((row) => row.valid);
+    const result = {
+      valid,
+      auth_configured: authConfigured,
+      ready: valid && authConfigured,
+      targets: rows,
+      next_steps: [
+        ...!valid ? ["focalapi connect install"] : [],
+        ...!authConfigured ? ["focalapi auth login --key <sk-...>"] : [],
+        ...valid && authConfigured ? ["\u91CD\u542F Agent \u4F1A\u8BDD\u540E\u76F4\u63A5\u63CF\u8FF0\u521B\u4F5C\u4EFB\u52A1"] : []
+      ]
+    };
     if (g.json) {
-      printJson({
-        installed: results.map((r) => ({ agent: r.target.id, skillsDir: r.target.skillsDir, skills: r.manifest.skills }))
-      });
-      return;
-    }
-    for (const { target, manifest } of results) {
-      info(`\u2713 ${target.name}\uFF1A${manifest.skills.length} \u4E2A\u6280\u80FD\u5DF2\u88C5\u5165 ${target.skillsDir}`);
-    }
-    info("");
-    info("\u6280\u80FD\u5DF2\u5C31\u7EEA\u3002\u8981\u8BA9 Agent \u76F4\u63A5\u4EE5 focalapi \u4E3A\u6A21\u578B\u540E\u7AEF\uFF0C\u8FD8\u9700\u914D\u7F6E provider\uFF08v1 \u8BF7\u624B\u52A8\uFF09\uFF1A");
-    for (const { target } of results) {
-      info("");
-      info(target.providerHint);
+      printJson(result);
+    } else {
+      printTable(
+        ["Agent", "Skills", "\u8BA4\u8BC1", "\u5C31\u7EEA"],
+        rows.map((row) => [row.agents.join(" / "), row.valid ? "\u2713" : "\u9700\u4FEE\u590D", authConfigured ? "\u2713" : "\u672A\u914D\u7F6E", row.valid && authConfigured ? "\u2713" : "-"])
+      );
+      for (const step of result.next_steps) info(`\u4E0B\u4E00\u6B65\uFF1A${step}`);
     }
-    info("");
-    info("\u5B8C\u6210\u540E\u91CD\u542F Agent \u4F1A\u8BDD\uFF0C\u5373\u53EF\u7528\u81EA\u7136\u8BED\u8A00\u8BA9\u5B83\u8C03\u7528 focalapi\uFF08\u5982\u300C\u7528 focalapi \u753B\u4E00\u5F20\u2026\u2026\u300D\uFF09\u3002");
-    info("\u5378\u8F7D\uFF1Afocalapi connect uninstall");
+    if (!result.ready) process.exitCode = 1;
   });
-  connect.command("uninstall").description("\u6309 manifest \u7CBE\u786E\u5378\u8F7D\u6CE8\u5165\u7684\u6280\u80FD\uFF08\u4E0D\u78B0\u5176\u4ED6\u6587\u4EF6\uFF09").argument("[targets...]", "Agent ID\uFF1B\u7701\u7565=\u5168\u90E8\u5DF2\u68C0\u6D4B\u5230\u7684").action(async (targetIds, _opts, cmd) => {
+  connect.command("uninstall").description("\u5378\u8F7D\u672A\u88AB\u7528\u6237\u4FEE\u6539\u7684\u6258\u7BA1 Skills\uFF1B\u5176\u4ED6\u6587\u4EF6\u4E00\u5F8B\u4FDD\u7559").argument("[targets...]", "Agent ID\uFF1B\u7701\u7565=\u5168\u90E8\u5DF2\u68C0\u6D4B\u5230\u7684").option("--path <skills-dir>", "\u4ECE\u6307\u5B9A Skills \u76EE\u5F55\u5378\u8F7D").action(async (targetIds, opts, cmd) => {
     const g = cmd.optsWithGlobals();
-    const targets = resolveTargets(targetIds, g);
-    const results = targets.map((t) => ({ target: t, ...uninstallFrom(t) }));
+    const targets = resolveTargets(targetIds, opts.path ?? cmd.parent?.opts().path, g);
+    const srcDir = bundledSkillsDir();
+    const results = groupTargets(targets).map((group) => ({
+      agents: group.agents.map((agent) => agent.id),
+      skills_dir: group.skillsDir,
+      ...uninstallFrom(group.skillsDir, srcDir)
+    }));
     if (g.json) {
-      printJson({
-        uninstalled: results.map((r) => ({ agent: r.target.id, removed: r.removed, hadManifest: r.hadManifest }))
-      });
+      printJson({ uninstalled: results });
       return;
     }
-    for (const r of results) {
-      if (!r.hadManifest) {
-        info(`- ${r.target.name}\uFF1A\u65E0 focalapi \u5B89\u88C5\u8BB0\u5F55\uFF0C\u8DF3\u8FC7`);
-      } else {
-        info(`\u2713 ${r.target.name}\uFF1A\u5DF2\u79FB\u9664 ${r.removed.length} \u4E2A\u6280\u80FD`);
-      }
+    for (const result of results) {
+      info(`\u2713 ${result.agents.join(" / ")}\uFF1A\u79FB\u9664 ${result.removed.length} \u4E2A\uFF0C\u4FDD\u7559\u7528\u6237\u4FEE\u6539 ${result.preserved.length} \u4E2A`);
     }
   });
 }
@@ -1513,16 +2387,13 @@ function registerRequest(program) {
 // src/cli.ts
 function buildProgram() {
   const program = new Command();
-  program.name("focalapi").description("\u8FDE\u63A5 focalapi \u4E0E AI Agent \u7684\u547D\u4EE4\u884C\u5DE5\u5177\uFF1A\u5BF9\u8BDD\u3001\u56FE\u50CF\u3001\u89C6\u9891\u3001\u641C\u7D22\u3001\u97F3\u9891\u3001\u7528\u91CF\uFF0C\u4E00\u6761\u547D\u4EE4\u76F4\u8FBE").version(VERSION, "-v, --version", "\u663E\u793A\u7248\u672C\u53F7").option("--json", "\u4EE5 JSON \u8F93\u51FA\uFF08\u9762\u5411 Agent \u4E0E\u811A\u672C\uFF0Cstdout \u7EAF\u51C0\uFF09").option("--base-url <url>", "\u8986\u76D6 API \u5730\u5740\uFF08\u9ED8\u8BA4 https://api.focalapi.com\uFF0C\u53EF\u7528 FOCALAPI_BASE_URL\uFF09").option("--key <key>", "\u8986\u76D6 API Key\uFF08\u53EF\u7528 FOCALAPI_API_KEY\uFF09").option("--profile <name>", "\u4F7F\u7528\u6307\u5B9A\u914D\u7F6E\u6863\u6848");
+  program.name("focalapi").description("\u8BA9 AI Agent \u76F4\u63A5\u8C03\u7528 focalapi \u521B\u4F5C\u6A21\u578B\uFF1A\u81EA\u52A8\u9009\u6A21\u3001\u751F\u6210\u3001\u4EFB\u52A1\u7EED\u53D6\u4E0E\u7528\u91CF\u8BCA\u65AD").version(VERSION, "-v, --version", "\u663E\u793A\u7248\u672C\u53F7").option("--json", "\u4EE5 JSON \u8F93\u51FA\uFF08\u9762\u5411 Agent \u4E0E\u811A\u672C\uFF0Cstdout \u7EAF\u51C0\uFF09").option("--base-url <url>", "\u8986\u76D6 API \u5730\u5740\uFF08\u9ED8\u8BA4 https://api.focalapi.com\uFF0C\u53EF\u7528 FOCALAPI_BASE_URL\uFF09").option("--key <key>", "\u8986\u76D6 API Key\uFF08\u53EF\u7528 FOCALAPI_API_KEY\uFF09").option("--profile <name>", "\u4F7F\u7528\u6307\u5B9A\u914D\u7F6E\u6863\u6848");
   registerAuth(program);
   registerModels(program);
   registerChat(program);
   registerGen(program);
   registerTask(program);
-  registerSearch(program);
   registerAudio(program);
-  registerEmbed(program);
-  registerRerank(program);
   registerUsage(program);
   registerDoctor(program);
   registerConnect(program);
@@ -1531,10 +2402,11 @@ function buildProgram() {
   return program;
 }
 async function main(argv = process.argv) {
+  process.exitCode = 0;
   const program = buildProgram();
   try {
     await program.parseAsync(argv);
-    return 0;
+    return typeof process.exitCode === "number" ? process.exitCode : 0;
   } catch (err) {
     let json = false;
     try {