fix: preserve offline dry-run validation before auth

Author: XXPermanentXX

packages/commands/src/commands/mcp/call.ts

@@ -4,9 +4,50 @@ import {
   BailianError,
   bailianMcpPath,
   detectOutputFormat,
+  type FlagsDef,
+  type ParsedFlags,
 } from "bailian-cli-core";
 import { emitResult } from "bailian-cli-runtime";
 
+const CALL_FLAGS = {
+  target: {
+    type: "string",
+    valueHint: "<server.tool>",
+    description:
+      "Server code and tool name joined by a dot, e.g. market-cmapi00073529.SmartStockSelection",
+    required: true,
+  },
+  arg: {
+    type: "array",
+    valueHint: "<kv>",
+    description: "Tool argument (repeatable). Values parsed as JSON if possible, else string.",
+  },
+  json: {
+    type: "string",
+    valueHint: "<obj>",
+    description: "Full arguments object as JSON; merged with --arg (arg wins).",
+  },
+  query: {
+    type: "string",
+    valueHint: "<text>",
+    description: "Shortcut for --arg query=<text> (mirrors many DashScope MCP tools).",
+  },
+  url: {
+    type: "string",
+    valueHint: "<url>",
+    description: "Override the MCP endpoint URL (for non-Bailian servers)",
+  },
+} satisfies FlagsDef;
+type CallFlags = ParsedFlags<typeof CALL_FLAGS>;
+
+function parseTarget(target: string): { serverCode: string; toolName: string } {
+  const dot = target.indexOf(".");
+  if (dot <= 0 || dot === target.length - 1) {
+    throw new UsageError(`target must be <server-code>.<tool>, got "${target}".`);
+  }
+  return { serverCode: target.slice(0, dot), toolName: target.slice(dot + 1) };
+}
+
 function parseArgFlags(raw: string[]): Record<string, unknown> {
   const out: Record<string, unknown> = {};
   for (const item of raw) {
@@ -25,70 +66,52 @@ function parseArgFlags(raw: string[]): Record<string, unknown> {
   return out;
 }
 
+function parseJsonArg(raw: string): Record<string, unknown> {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    throw new UsageError(`--json is not valid JSON — ${(err as Error).message}`);
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new UsageError("--json must decode to an object.");
+  }
+  return parsed as Record<string, unknown>;
+}
+
+function buildToolArgs(flags: CallFlags): Record<string, unknown> {
+  const toolArgs = flags.json ? parseJsonArg(flags.json) : {};
+  Object.assign(toolArgs, parseArgFlags(flags.arg ?? []));
+  if (flags.query !== undefined) toolArgs.query = flags.query;
+  return toolArgs;
+}
+
+function validateCallFlags(flags: CallFlags): string | undefined {
+  try {
+    parseTarget(flags.target);
+    buildToolArgs(flags);
+  } catch (err) {
+    if (err instanceof UsageError) return err.message;
+    throw err;
+  }
+  return undefined;
+}
+
 export default defineCommand({
   description: "Call a tool on an MCP server (tools/call)",
   auth: "apiKey",
   usageArgs: "--target <server.tool> [--arg k=v ...] [--json '{...}'] [--url <url>]",
-  flags: {
-    target: {
-      type: "string",
-      valueHint: "<server.tool>",
-      description:
-        "Server code and tool name joined by a dot, e.g. market-cmapi00073529.SmartStockSelection",
-      required: true,
-    },
-    arg: {
-      type: "array",
-      valueHint: "<kv>",
-      description: "Tool argument (repeatable). Values parsed as JSON if possible, else string.",
-    },
-    json: {
-      type: "string",
-      valueHint: "<obj>",
-      description: "Full arguments object as JSON; merged with --arg (arg wins).",
-    },
-    query: {
-      type: "string",
-      valueHint: "<text>",
-      description: "Shortcut for --arg query=<text> (mirrors many DashScope MCP tools).",
-    },
-    url: {
-      type: "string",
-      valueHint: "<url>",
-      description: "Override the MCP endpoint URL (for non-Bailian servers)",
-    },
-  },
+  flags: CALL_FLAGS,
   exampleArgs: [
     '--target market-cmapi00073529.SmartStockSelection --query "Screen consumer stocks with ROE > 15%"',
     '--target market-cmapi00073529.FinQuery --json \'{"q":"Guizhou Maotai","limit":5}\'',
     "--target market-cmapi00073529.SmartFundSelection --arg riskLevel=R3 --arg minScale=10",
   ],
+  validate: validateCallFlags,
   async run(ctx) {
     const { settings, flags } = ctx;
-    const target = flags.target;
-
-    const dot = target.indexOf(".");
-    if (dot <= 0 || dot === target.length - 1) {
-      throw new UsageError(`target must be <server-code>.<tool>, got "${target}".`);
-    }
-    const serverCode = target.slice(0, dot);
-    const toolName = target.slice(dot + 1);
-
-    let toolArgs: Record<string, unknown> = {};
-    if (flags.json) {
-      let parsed: unknown;
-      try {
-        parsed = JSON.parse(flags.json);
-      } catch (err) {
-        throw new UsageError(`--json is not valid JSON — ${(err as Error).message}`);
-      }
-      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-        throw new UsageError("--json must decode to an object.");
-      }
-      toolArgs = parsed as Record<string, unknown>;
-    }
-    Object.assign(toolArgs, parseArgFlags(flags.arg ?? []));
-    if (flags.query !== undefined) toolArgs.query = flags.query;
+    const { serverCode, toolName } = parseTarget(flags.target);
+    const toolArgs = buildToolArgs(flags);
 
     const url = flags.url || ctx.client.url(bailianMcpPath(serverCode));
     const format = detectOutputFormat(settings.output);

packages/core/src/client/client.ts

@@ -3,7 +3,7 @@ import type { ApiKeyCredential, ConsoleCredential } from "../auth/types.ts";
 import { BailianError } from "../errors/base.ts";
 import { ExitCode } from "../errors/codes.ts";
 import { request, requestJson, type HttpDeps, type RequestOpts } from "./http.ts";
-import { resolveFileUrl } from "../files/upload.ts";
+import { isLocalFile, resolveFileUrl } from "../files/upload.ts";
 import { McpClient } from "./mcp.ts";
 import { callConsoleGateway } from "../console/gateway.ts";
 
@@ -25,9 +25,10 @@ export interface ClientRequestOpts extends Omit<RequestOpts, "url" | "noAuth"> {
 /**
  * A command's network surface: call its methods to reach the API — the
  * credential and base URL are already baked in, so commands never handle tokens
- * or baseUrl. Model methods (`request`/`requestJson`/`uploadFile`/`mcp`) need an
- * api key; `console` needs a console token; calling one without its credential
- * throws.
+ * or baseUrl. Model methods (`request`/`requestJson`/`mcp`) need an api key;
+ * `uploadFile` only needs one for local files, and passes URLs through without
+ * credentials. `console` needs a console token; calling one without its
+ * credential throws.
  */
 export class Client {
   constructor(private readonly deps: ClientDeps) {}
@@ -72,6 +73,7 @@ export class Client {
 
   /** Resolve a file arg: upload a local path to OSS (returns oss:// URL), or pass a URL through. */
   uploadFile(source: string, model: string, opts: { signal?: AbortSignal } = {}): Promise<string> {
+    if (!isLocalFile(source)) return Promise.resolve(source);
     return resolveFileUrl(source, this.requireApi().token, model, opts);
   }