@tronsfey/ucli 0.5.2 → 0.5.3

package/dist/index.js

@@ -279,6 +279,155 @@ async function clearOASCache(name) {
   }
 }
 
+// src/lib/yaml.ts
+function toYaml(value, indent = 0) {
+  if (value === null || value === void 0) {
+    return "null";
+  }
+  if (typeof value === "boolean") {
+    return value ? "true" : "false";
+  }
+  if (typeof value === "number") {
+    return String(value);
+  }
+  if (typeof value === "string") {
+    if (needsQuoting(value)) {
+      return JSON.stringify(value);
+    }
+    return value;
+  }
+  if (Array.isArray(value)) {
+    if (value.length === 0) return "[]";
+    const prefix = " ".repeat(indent);
+    return value.map((item) => {
+      const serialised = toYaml(item, indent + 2);
+      if (typeof item === "object" && item !== null && !Array.isArray(item)) {
+        const firstNewline = serialised.indexOf("\n");
+        if (firstNewline === -1) {
+          return `${prefix}- ${serialised.trimStart()}`;
+        }
+        const firstLine = serialised.slice(0, firstNewline);
+        const rest = serialised.slice(firstNewline + 1);
+        return `${prefix}- ${firstLine.trimStart()}
+${rest}`;
+      }
+      return `${prefix}- ${serialised}`;
+    }).join("\n");
+  }
+  if (typeof value === "object") {
+    const entries = Object.entries(value);
+    if (entries.length === 0) return "{}";
+    const prefix = " ".repeat(indent);
+    return entries.map(([key, val]) => {
+      if (val === null || val === void 0) {
+        return `${prefix}${key}: null`;
+      }
+      if (typeof val === "object") {
+        const nested = toYaml(val, indent + 2);
+        return `${prefix}${key}:
+${nested}`;
+      }
+      return `${prefix}${key}: ${toYaml(val, indent)}`;
+    }).join("\n");
+  }
+  return String(value);
+}
+function needsQuoting(s) {
+  if (s === "") return true;
+  if (s === "true" || s === "false" || s === "null") return true;
+  if (/^\d/.test(s)) return true;
+  if (/[:{}\[\],&*#?|<>=!%@`'"\\\n\r\t]/.test(s)) return true;
+  if (s.startsWith(" ") || s.endsWith(" ")) return true;
+  return false;
+}
+
+// src/commands/listoas.ts
+function registerListOas(program2) {
+  program2.command("listoas").description("List all OAS services available in the current group").option("--refresh", "Bypass local cache and fetch fresh from server").option("--format <fmt>", "Output format: table | json | yaml", "table").action(async (opts) => {
+    const cfg = getConfig();
+    const client = new ServerClient(cfg);
+    const useCache = !opts.refresh;
+    let entries = useCache ? await readOASListCache() : null;
+    if (!entries) {
+      entries = await client.listOAS();
+      if (entries.length > 0) {
+        const maxTtl = Math.min(...entries.map((e) => e.cacheTtl));
+        await writeOASListCache(entries, maxTtl);
+      }
+    }
+    const safe = entries.map(({ authConfig, ...rest }) => ({
+      ...rest,
+      authConfig: { type: authConfig["type"] ?? rest.authType }
+    }));
+    if (isJsonOutput()) {
+      outputSuccess(safe);
+      return;
+    }
+    const format = (opts.format ?? "table").toLowerCase();
+    if (entries.length === 0) {
+      console.log("No services registered in this group.");
+      return;
+    }
+    if (format === "json") {
+      console.log(JSON.stringify(safe, null, 2));
+      return;
+    }
+    if (format === "yaml") {
+      console.log(toYaml(safe));
+      return;
+    }
+    const nameWidth = Math.max(10, ...entries.map((e) => e.name.length));
+    console.log(`
+${"SERVICE".padEnd(nameWidth)}  AUTH      DESCRIPTION`);
+    console.log(`${"-".repeat(nameWidth)}  --------  ${"-".repeat(40)}`);
+    for (const e of entries) {
+      const auth = e.authType.padEnd(8);
+      const desc = e.description.length > 60 ? e.description.slice(0, 57) + "..." : e.description;
+      console.log(`${e.name.padEnd(nameWidth)}  ${auth}  ${desc}`);
+    }
+    console.log();
+  });
+}
+
+// src/commands/listmcp.ts
+function registerListMcp(program2) {
+  program2.command("listmcp").description("List all MCP servers available in the current group").option("--format <fmt>", "Output format: table | json | yaml", "table").action(async (opts) => {
+    const cfg = getConfig();
+    const client = new ServerClient(cfg);
+    const entries = await client.listMCP();
+    const safe = entries.map(({ authConfig, ...rest }) => ({
+      ...rest,
+      authConfig: { type: authConfig.type }
+    }));
+    if (isJsonOutput()) {
+      outputSuccess(safe);
+      return;
+    }
+    if (entries.length === 0) {
+      console.log("No MCP servers registered in this group.");
+      return;
+    }
+    const format = (opts.format ?? "table").toLowerCase();
+    if (format === "json") {
+      console.log(JSON.stringify(safe, null, 2));
+      return;
+    }
+    if (format === "yaml") {
+      console.log(toYaml(safe));
+      return;
+    }
+    const nameWidth = Math.max(10, ...entries.map((e) => e.name.length));
+    console.log(`
+${"SERVER".padEnd(nameWidth)}  TRANSPORT  DESCRIPTION`);
+    console.log(`${"-".repeat(nameWidth)}  ---------  ${"-".repeat(40)}`);
+    for (const e of entries) {
+      const desc = e.description.length > 60 ? e.description.slice(0, 57) + "..." : e.description;
+      console.log(`${e.name.padEnd(nameWidth)}  ${e.transport.padEnd(9)}  ${desc}`);
+    }
+    console.log();
+  });
+}
+
 // src/lib/oas-runner.ts
 import { spawn } from "child_process";
 import { createRequire } from "module";
@@ -423,120 +572,52 @@ async function getServiceHelp(entry) {
     child.on("error", reject);
   });
 }
-
-// src/lib/yaml.ts
-function toYaml(value, indent = 0) {
-  if (value === null || value === void 0) {
-    return "null";
-  }
-  if (typeof value === "boolean") {
-    return value ? "true" : "false";
-  }
-  if (typeof value === "number") {
-    return String(value);
-  }
-  if (typeof value === "string") {
-    if (needsQuoting(value)) {
-      return JSON.stringify(value);
-    }
-    return value;
-  }
-  if (Array.isArray(value)) {
-    if (value.length === 0) return "[]";
-    const prefix = " ".repeat(indent);
-    return value.map((item) => {
-      const serialised = toYaml(item, indent + 2);
-      if (typeof item === "object" && item !== null && !Array.isArray(item)) {
-        const firstNewline = serialised.indexOf("\n");
-        if (firstNewline === -1) {
-          return `${prefix}- ${serialised.trimStart()}`;
-        }
-        const firstLine = serialised.slice(0, firstNewline);
-        const rest = serialised.slice(firstNewline + 1);
-        return `${prefix}- ${firstLine.trimStart()}
-${rest}`;
-      }
-      return `${prefix}- ${serialised}`;
-    }).join("\n");
-  }
-  if (typeof value === "object") {
-    const entries = Object.entries(value);
-    if (entries.length === 0) return "{}";
-    const prefix = " ".repeat(indent);
-    return entries.map(([key, val]) => {
-      if (val === null || val === void 0) {
-        return `${prefix}${key}: null`;
-      }
-      if (typeof val === "object") {
-        const nested = toYaml(val, indent + 2);
-        return `${prefix}${key}:
-${nested}`;
-      }
-      return `${prefix}${key}: ${toYaml(val, indent)}`;
-    }).join("\n");
-  }
-  return String(value);
-}
-function needsQuoting(s) {
-  if (s === "") return true;
-  if (s === "true" || s === "false" || s === "null") return true;
-  if (/^\d/.test(s)) return true;
-  if (/[:{}\[\],&*#?|<>=!%@`'"\\\n\r\t]/.test(s)) return true;
-  if (s.startsWith(" ") || s.endsWith(" ")) return true;
-  return false;
+async function getOperationHelp(entry, operationId) {
+  const bin = resolveOpenapi2CliBin();
+  const args = [
+    "run",
+    "--oas",
+    entry.remoteUrl,
+    "--cache-ttl",
+    String(entry.cacheTtl),
+    ...entry.baseEndpoint ? ["--endpoint", entry.baseEndpoint] : [],
+    operationId,
+    "--help"
+  ];
+  return new Promise((resolve2, reject) => {
+    let output = "";
+    const child = spawn(process.execPath, [bin, ...args], {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    child.stdout?.on("data", (d) => {
+      output += d.toString();
+    });
+    child.stderr?.on("data", (d) => {
+      output += d.toString();
+    });
+    child.on("close", () => resolve2(output));
+    child.on("error", reject);
+  });
 }
 
-// src/commands/services.ts
-function registerServices(program2) {
-  const services = program2.command("services").description("Manage and inspect available OAS services");
-  services.command("list").description("List all OAS services available in the current group").option("--refresh", "Bypass local cache and fetch fresh from server").option("--format <fmt>", "Output format: table | json | yaml", "table").option("--no-cache", "Bypass local cache and fetch fresh from server").action(async (opts) => {
-    const cfg = getConfig();
-    const client = new ServerClient(cfg);
-    if (!opts.cache) {
-      process.emitWarning("The --no-cache flag is deprecated. Please use --refresh instead.");
-    }
-    const useCache = opts.cache && !opts.refresh;
-    let entries = useCache ? await readOASListCache() : null;
-    if (!entries) {
-      entries = await client.listOAS();
-      if (entries.length > 0) {
-        const maxTtl = Math.min(...entries.map((e) => e.cacheTtl));
-        await writeOASListCache(entries, maxTtl);
-      }
-    }
-    const safe = entries.map(({ authConfig, ...rest }) => ({
-      ...rest,
-      authConfig: { type: authConfig["type"] ?? rest.authType }
-    }));
-    if (isJsonOutput()) {
-      outputSuccess(safe);
-      return;
-    }
-    const format = (opts.format ?? "table").toLowerCase();
-    if (entries.length === 0) {
-      console.log("No services registered in this group.");
-      return;
-    }
-    if (format === "json") {
-      console.log(JSON.stringify(safe, null, 2));
-      return;
-    }
-    if (format === "yaml") {
-      console.log(toYaml(safe));
-      return;
-    }
-    const nameWidth = Math.max(10, ...entries.map((e) => e.name.length));
-    console.log(`
-${"SERVICE".padEnd(nameWidth)}  AUTH      DESCRIPTION`);
-    console.log(`${"-".repeat(nameWidth)}  --------  ${"-".repeat(40)}`);
-    for (const e of entries) {
-      const auth = e.authType.padEnd(8);
-      const desc = e.description.length > 60 ? e.description.slice(0, 57) + "..." : e.description;
-      console.log(`${e.name.padEnd(nameWidth)}  ${auth}  ${desc}`);
+// src/commands/oas.ts
+var VALID_OAS_ACTIONS = ["info", "listapi", "apiinfo", "invokeapi"];
+function registerOas(program2) {
+  program2.command("oas <name> <action> [args...]").description(
+    "Interact with an OAS service: info | listapi | apiinfo <api> | invokeapi <api> --data <json>"
+  ).option("--format <fmt>", "Output format: json | table | yaml", "json").option("--data <json>", "Request body (JSON string or @filename, for invokeapi)").option("--params <json>", "Operation parameters as JSON (for invokeapi)").option("--query <jmespath>", "Filter response with JMESPath expression").option("--machine", "Agent-friendly mode: structured JSON envelope output").option("--dry-run", "Preview the HTTP request without executing (implies --machine)").allowUnknownOption(true).action(async (name, action, args, opts) => {
+    if (!VALID_OAS_ACTIONS.includes(action)) {
+      outputError(
+        ExitCode.USAGE_ERROR,
+        `Unknown action: ${action}`,
+        `Valid actions: ${VALID_OAS_ACTIONS.join(", ")}
+Usage:
+  ucli oas <service> info
+  ucli oas <service> listapi
+  ucli oas <service> apiinfo <api>
+  ucli oas <service> invokeapi <api> --data <json>`
+      );
     }
-    console.log();
-  });
-  services.command("info <name>").description("Show detailed information and available operations for a service").option("--format <fmt>", "Output format: table | json | yaml", "table").action(async (name, opts) => {
     const cfg = getConfig();
     const client = new ServerClient(cfg);
     let entry;
@@ -546,116 +627,344 @@ ${"SERVICE".padEnd(nameWidth)}  AUTH      DESCRIPTION`);
       outputError(
         ExitCode.NOT_FOUND,
         `Service not found: ${name}`,
-        "Run: ucli services list  to see available services"
+        "Run: ucli listoas  to see available services"
       );
     }
-    const help = await getServiceHelp(entry);
-    const { authConfig, ...rest } = entry;
-    const safe = {
-      ...rest,
-      authConfig: { type: authConfig["type"] ?? rest.authType },
-      operationsHelp: help
-    };
-    if (isJsonOutput()) {
-      outputSuccess(safe);
-      return;
+    switch (action) {
+      case "info": {
+        const { authConfig, ...rest } = entry;
+        const safe = {
+          ...rest,
+          authConfig: { type: authConfig["type"] ?? rest.authType }
+        };
+        if (isJsonOutput()) {
+          outputSuccess(safe);
+          return;
+        }
+        const format = (opts.format ?? "json").toLowerCase();
+        if (format === "json") {
+          console.log(JSON.stringify(safe, null, 2));
+          return;
+        }
+        if (format === "yaml") {
+          console.log(toYaml(safe));
+          return;
+        }
+        console.log(`
+Service: ${entry.name}`);
+        console.log(`Description: ${entry.description || "(none)"}`);
+        console.log(`OAS URL: ${entry.remoteUrl}`);
+        if (entry.baseEndpoint) console.log(`Base endpoint: ${entry.baseEndpoint}`);
+        console.log(`Auth type: ${entry.authType}`);
+        console.log(`Cache TTL: ${entry.cacheTtl}s`);
+        break;
+      }
+      case "listapi": {
+        const help = await getServiceHelp(entry);
+        const { authConfig, ...rest } = entry;
+        const safe = {
+          ...rest,
+          authConfig: { type: authConfig["type"] ?? rest.authType },
+          operationsHelp: help
+        };
+        if (isJsonOutput()) {
+          outputSuccess(safe);
+          return;
+        }
+        const format = (opts.format ?? "json").toLowerCase();
+        if (format === "json") {
+          console.log(JSON.stringify(safe, null, 2));
+          return;
+        }
+        if (format === "yaml") {
+          console.log(toYaml(safe));
+          return;
+        }
+        console.log(`
+Service: ${entry.name}`);
+        console.log(`Description: ${entry.description || "(none)"}`);
+        console.log("\nAvailable operations:");
+        console.log("\u2500".repeat(60));
+        console.log(help);
+        break;
+      }
+      case "apiinfo": {
+        const apiName = args[0];
+        if (!apiName) {
+          outputError(
+            ExitCode.USAGE_ERROR,
+            "Missing API operation name.",
+            "Usage: ucli oas <service> apiinfo <api>"
+          );
+        }
+        const help = await getOperationHelp(entry, apiName);
+        if (isJsonOutput()) {
+          outputSuccess({ operation: apiName, service: name, help });
+          return;
+        }
+        const format = (opts.format ?? "json").toLowerCase();
+        if (format === "json") {
+          console.log(JSON.stringify({ operation: apiName, service: name, help }, null, 2));
+          return;
+        }
+        console.log(`
+Operation: ${apiName} (service: ${name})`);
+        console.log("\u2500".repeat(60));
+        console.log(help);
+        break;
+      }
+      case "invokeapi": {
+        const apiName = args[0];
+        if (!apiName) {
+          outputError(
+            ExitCode.USAGE_ERROR,
+            "Missing API operation name.",
+            "Usage: ucli oas <service> invokeapi <api> --data <json>"
+          );
+        }
+        const operationArgs = [apiName];
+        const extraArgs = args.slice(1);
+        operationArgs.push(...extraArgs);
+        if (opts.params) {
+          let parsed;
+          try {
+            parsed = JSON.parse(opts.params);
+          } catch {
+            outputError(
+              ExitCode.USAGE_ERROR,
+              "Invalid --params JSON.",
+              `Example: --params '{"petId": 1}'`
+            );
+          }
+          if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+            for (const [k, v] of Object.entries(parsed)) {
+              if (v === void 0 || v === null) continue;
+              const strVal = typeof v === "object" ? JSON.stringify(v) : String(v);
+              operationArgs.push(`--${k}`, strVal);
+            }
+          }
+        }
+        if (opts.data) {
+          operationArgs.push("--data", opts.data);
+        }
+        const format = opts.format;
+        const query = opts.query;
+        const machine = opts.machine ?? false;
+        const dryRun = opts.dryRun ?? false;
+        try {
+          await runOperation({
+            entry,
+            operationArgs,
+            ...format !== void 0 ? { format } : {},
+            ...query !== void 0 ? { query } : {},
+            ...machine ? { machine } : {},
+            ...dryRun ? { dryRun } : {}
+          });
+        } catch (err) {
+          outputError(
+            ExitCode.GENERAL_ERROR,
+            `Operation failed: ${err.message}`
+          );
+        }
+        break;
+      }
     }
-    const format = (opts.format ?? "table").toLowerCase();
-    if (format === "json") {
-      console.log(JSON.stringify(safe, null, 2));
-      return;
+  });
+}
+
+// src/lib/mcp-runner.ts
+function resolve(mod, name) {
+  if (typeof mod[name] === "function") return mod[name];
+  if (mod.default && typeof mod.default[name] === "function") return mod.default[name];
+  throw new Error(`Cannot resolve export "${name}" from module`);
+}
+async function getMcp2cli() {
+  const clientMod = await import("./client-Y6NONDCI.js");
+  const runnerMod = await import("./runner-ROLDMGH3.js");
+  return {
+    createMcpClient: resolve(clientMod, "createMcpClient"),
+    getTools: resolve(runnerMod, "getTools"),
+    runTool: resolve(runnerMod, "runTool"),
+    describeTool: resolve(runnerMod, "describeTool"),
+    describeToolJson: resolve(runnerMod, "describeToolJson")
+  };
+}
+async function closeClient(client) {
+  if (typeof client.close === "function") {
+    await client.close();
+  }
+}
+function buildMcpConfig(entry) {
+  const base = { type: entry.transport };
+  if (entry.transport === "http") {
+    base.url = entry.serverUrl;
+  } else {
+    base.command = entry.command;
+  }
+  const auth = entry.authConfig;
+  if (auth.type === "http_headers") {
+    base.headers = auth.headers;
+  } else if (auth.type === "env") {
+    base.env = auth.env;
+  }
+  return base;
+}
+async function listMcpTools(entry) {
+  const { createMcpClient, getTools } = await getMcp2cli();
+  const config = buildMcpConfig(entry);
+  const client = await createMcpClient(config);
+  try {
+    const tools = await getTools(client, config, { noCache: true });
+    return tools;
+  } finally {
+    await closeClient(client);
+  }
+}
+async function describeMcpTool(entry, toolName, opts) {
+  const { createMcpClient, getTools, describeTool, describeToolJson } = await getMcp2cli();
+  const config = buildMcpConfig(entry);
+  const client = await createMcpClient(config);
+  try {
+    const tools = await getTools(client, config, { noCache: false, cacheTtl: 3600 });
+    const tool = tools.find((t) => t.name === toolName);
+    if (!tool) throw new Error(`Tool "${toolName}" not found on MCP server "${entry.name}"`);
+    if (opts?.json) {
+      describeToolJson(tool);
+    } else {
+      describeTool(tool);
     }
-    if (format === "yaml") {
-      console.log(toYaml(safe));
-      return;
+  } finally {
+    await closeClient(client);
+  }
+}
+async function runMcpTool(entry, toolName, rawArgs, opts) {
+  const { createMcpClient, getTools, runTool } = await getMcp2cli();
+  const config = buildMcpConfig(entry);
+  const client = await createMcpClient(config);
+  try {
+    const tools = await getTools(client, config, { noCache: false, cacheTtl: 3600 });
+    const tool = tools.find((t) => t.name === toolName);
+    if (!tool) throw new Error(`Tool "${toolName}" not found on MCP server "${entry.name}"`);
+    const normalizedArgs = [];
+    for (const arg of rawArgs) {
+      if (arg.includes("=") && !arg.startsWith("--")) {
+        const idx = arg.indexOf("=");
+        const key = arg.slice(0, idx);
+        const value = arg.slice(idx + 1);
+        normalizedArgs.push(`--${key}`, value);
+      } else {
+        normalizedArgs.push(arg);
+      }
     }
-    console.log(`
-Service: ${entry.name}`);
-    console.log(`Description: ${entry.description || "(none)"}`);
-    console.log(`OAS URL: ${entry.remoteUrl}`);
-    if (entry.baseEndpoint) console.log(`Base endpoint: ${entry.baseEndpoint}`);
-    console.log(`Auth type: ${entry.authType}`);
-    console.log(`Cache TTL: ${entry.cacheTtl}s`);
-    console.log("\nAvailable operations:");
-    console.log("\u2500".repeat(60));
-    console.log(help);
-  });
+    await runTool(client, tool, normalizedArgs, {
+      ...opts?.json ? { json: true } : {},
+      ...opts?.inputJson ? { inputJson: opts.inputJson } : {}
+    });
+  } finally {
+    await closeClient(client);
+  }
 }
 
-// src/commands/run.ts
-function registerRun(program2) {
-  program2.command("run [service] [args...]").description("Execute an operation on a service").option("--service <name>", "Service name (from `services list`)").option("--operation <id>", "OperationId to execute").option("--params <json>", "JSON string of operation parameters").option("--format <fmt>", "Output format: json | table | yaml", "json").option("--query <jmespath>", "Filter response with JMESPath expression").option("--data <json>", "Request body (JSON string or @filename)").option("--machine", "Agent-friendly mode: structured JSON envelope output").option("--dry-run", "Preview the HTTP request without executing (implies --machine)").allowUnknownOption(true).action(async (serviceArg, args, opts) => {
-    if (serviceArg && opts.service && serviceArg !== opts.service) {
-      outputError(
-        ExitCode.USAGE_ERROR,
-        `Conflicting service values: positional "${serviceArg}" and --service "${opts.service}". Use either the positional argument or --service flag, not both.`
-      );
-    }
-    const service = opts.service ?? serviceArg;
-    if (!service) {
+// src/commands/mcp.ts
+var VALID_MCP_ACTIONS = ["listtool", "toolinfo", "invoketool"];
+function registerMcp(program2) {
+  program2.command("mcp <name> <action> [args...]").description(
+    "Interact with a MCP server: listtool | toolinfo <tool> | invoketool <tool> --data <json>"
+  ).option("--format <fmt>", "Output format: table | json | yaml", "table").option("--data <json>", "Tool arguments as a JSON object (for invoketool)").option("--json", "Machine-readable JSON output").allowUnknownOption(true).action(async (name, action, args, opts) => {
+    if (!VALID_MCP_ACTIONS.includes(action)) {
       outputError(
         ExitCode.USAGE_ERROR,
-        "Missing service name. Use positional <service> or --service <name>.",
-        "Run: ucli services list  to see available services"
+        `Unknown action: ${action}`,
+        `Valid actions: ${VALID_MCP_ACTIONS.join(", ")}
+Usage:
+  ucli mcp <server> listtool
+  ucli mcp <server> toolinfo <tool>
+  ucli mcp <server> invoketool <tool> --data <json>`
       );
     }
     const cfg = getConfig();
     const client = new ServerClient(cfg);
     let entry;
     try {
-      entry = await client.getOAS(service);
+      entry = await client.getMCP(name);
     } catch {
       outputError(
         ExitCode.NOT_FOUND,
-        `Unknown service: ${service}`,
-        "Run: ucli services list  to see available services"
+        `Unknown MCP server: ${name}`,
+        "Run: ucli listmcp  to see available servers"
       );
     }
-    const extraArgs = opts.args ?? [];
-    const operationArgs = [...args, ...extraArgs];
-    if (opts.operation) {
-      operationArgs.unshift(opts.operation);
-    }
-    if (opts.params) {
-      let parsed;
-      try {
-        parsed = JSON.parse(opts.params);
-      } catch {
-        outputError(
-          ExitCode.USAGE_ERROR,
-          "Invalid --params JSON.",
-          `Example: --params '{"petId": 1}'`
-        );
+    switch (action) {
+      case "listtool": {
+        let tools;
+        try {
+          tools = await listMcpTools(entry);
+        } catch (err) {
+          outputError(ExitCode.GENERAL_ERROR, `Failed to fetch tools: ${err.message}`);
+        }
+        if (isJsonOutput()) {
+          outputSuccess(tools);
+          return;
+        }
+        if (tools.length === 0) {
+          console.log(`No tools found on MCP server "${name}".`);
+          return;
+        }
+        const format = (opts.format ?? "table").toLowerCase();
+        if (format === "json") {
+          console.log(JSON.stringify(tools, null, 2));
+          return;
+        }
+        if (format === "yaml") {
+          console.log(toYaml(tools));
+          return;
+        }
+        console.log(`
+Tools on "${name}":`);
+        console.log("\u2500".repeat(60));
+        for (const t of tools) {
+          console.log(`  ${t.name}`);
+          if (t.description) console.log(`    ${t.description}`);
+        }
+        console.log();
+        break;
       }
-      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-        for (const [k, v] of Object.entries(parsed)) {
-          if (v === void 0 || v === null) continue;
-          const strVal = typeof v === "object" ? JSON.stringify(v) : String(v);
-          operationArgs.push(`--${k}`, strVal);
+      case "toolinfo": {
+        const toolName = args[0];
+        if (!toolName) {
+          outputError(
+            ExitCode.USAGE_ERROR,
+            "Missing tool name.",
+            "Usage: ucli mcp <server> toolinfo <tool>"
+          );
         }
+        try {
+          await describeMcpTool(entry, toolName, { json: opts.json });
+        } catch (err) {
+          outputError(ExitCode.GENERAL_ERROR, `Failed to describe tool: ${err.message}`);
+        }
+        break;
+      }
+      case "invoketool": {
+        const toolName = args[0];
+        if (!toolName) {
+          outputError(
+            ExitCode.USAGE_ERROR,
+            "Missing tool name.",
+            "Usage: ucli mcp <server> invoketool <tool> --data <json>"
+          );
+        }
+        const extraArgs = args.slice(1);
+        try {
+          await runMcpTool(entry, toolName, extraArgs, {
+            json: opts.json,
+            inputJson: opts.data
+          });
+        } catch (err) {
+          outputError(ExitCode.GENERAL_ERROR, `Tool execution failed: ${err.message}`);
+        }
+        break;
       }
-    }
-    if (opts.data) {
-      operationArgs.push("--data", opts.data);
-    }
-    const format = opts.format;
-    const query = opts.query;
-    const machine = opts.machine ?? false;
-    const dryRun = opts.dryRun ?? false;
-    try {
-      await runOperation({
-        entry,
-        operationArgs,
-        ...format !== void 0 ? { format } : {},
-        ...query !== void 0 ? { query } : {},
-        ...machine ? { machine } : {},
-        ...dryRun ? { dryRun } : {}
-      });
-    } catch (err) {
-      outputError(
-        ExitCode.GENERAL_ERROR,
-        `Operation failed: ${err.message}`
-      );
     }
   });
 }
@@ -707,7 +1016,7 @@ function registerHelp(program2) {
           for (const e of entries) {
             console.log(`  ${e.name.padEnd(20)} ${e.description}`);
           }
-          console.log("\nTip: Run `ucli help <service>` for service-specific operations.");
+          console.log("\nTip: Run `ucli oas <service> listapi` for service-specific operations.");
         }
       } else {
         console.log("\nRun `ucli configure --server <url> --token <jwt>` to get started.");
@@ -721,7 +1030,7 @@ function registerHelp(program2) {
       entry = await client.getOAS(service);
     } catch {
       console.error(`Unknown service: ${service}`);
-      console.error("Run `ucli services list` to see available services.");
+      console.error("Run `ucli listoas` to see available services.");
       process.exit(ExitCode.NOT_FOUND);
     }
     console.log(`
@@ -734,10 +1043,9 @@ OAS spec: ${entry.remoteUrl}`);
     const help = await getServiceHelp(entry);
     console.log(help);
     console.log("\nExamples:");
-    console.log(`  ucli run ${entry.name} <operation>`);
-    console.log(`  ucli run ${entry.name} <operation> --format table`);
-    console.log(`  ucli run ${entry.name} <operation> --query "results[*].id"`);
-    console.log(`  ucli run ${entry.name} <operation> --data '{"key":"value"}'`);
+    console.log(`  ucli oas ${entry.name} listapi`);
+    console.log(`  ucli oas ${entry.name} apiinfo <operation>`);
+    console.log(`  ucli oas ${entry.name} invokeapi <operation> --data '{"key":"value"}'`);
   });
 }
 function printGeneralHelp() {
@@ -750,11 +1058,11 @@ SETUP
       Configure server connection and authentication.
 
 DISCOVERY
-  ucli services list
+  ucli listoas
       List all OAS services available in your group.
 
-  ucli services info <service>
-      Show detailed service info and all available operations.
+  ucli listmcp
+      List all MCP servers available in your group.
 
   ucli introspect
       Return complete capability manifest in a single call (JSON).
@@ -763,9 +1071,18 @@ DISCOVERY
   ucli help [service]
       Show this guide, or service-specific operations.
 
-EXECUTION
-  ucli run <service> <operation> [options]
-      Execute a service operation.
+OAS SERVICES
+  ucli oas <service> info
+      Show detailed service information.
+
+  ucli oas <service> listapi
+      List all available API operations.
+
+  ucli oas <service> apiinfo <api>
+      Show detailed input/output parameters for an API operation.
+
+  ucli oas <service> invokeapi <api> [options]
+      Execute an API operation.
 
       Options:
         --format json|table|yaml   Output format (default: json)
@@ -773,13 +1090,13 @@ EXECUTION
         --data <json|@file>        Request body for POST/PUT/PATCH
 
 MCP SERVERS
-  ucli mcp list
-      List all MCP servers in your group.
-
-  ucli mcp tools <server>
+  ucli mcp <server> listtool
       List tools available on a MCP server.
 
-  ucli mcp run <server> <tool> [key=value ...]
+  ucli mcp <server> toolinfo <tool>
+      Show detailed input/output parameters for a tool.
+
+  ucli mcp <server> invoketool <tool> --data <json>
       Call a tool on a MCP server.
 
 MAINTENANCE
@@ -802,236 +1119,18 @@ GLOBAL FLAGS
 
 ERRORS
   401 Unauthorized  \u2192 Run: ucli configure --server <url> --token <jwt>
-  404 Not Found     \u2192 Check service name: ucli services list
-  4xx Client Error  \u2192 Check operation args: ucli services info <service>
+  404 Not Found     \u2192 Check service name: ucli listoas
+  4xx Client Error  \u2192 Check operation args: ucli oas <service> listapi
   5xx Server Error  \u2192 Retry or run: ucli refresh
 
 AI AGENT QUICK START
   1. ucli introspect               # discover everything in one call
-  2. ucli run <svc> <op> [args]    # execute operations
-  3. Use --output json globally    # get structured { success, data/error } envelopes
+  2. ucli oas <svc> invokeapi <op> # execute OAS operations
+  3. ucli mcp <srv> invoketool <t> # execute MCP tools
+  4. Use --output json globally    # get structured { success, data/error } envelopes
 `);
 }
 
-// src/lib/mcp-runner.ts
-function resolve(mod, name) {
-  if (typeof mod[name] === "function") return mod[name];
-  if (mod.default && typeof mod.default[name] === "function") return mod.default[name];
-  throw new Error(`Cannot resolve export "${name}" from module`);
-}
-async function getMcp2cli() {
-  const clientMod = await import("./client-Y6NONDCI.js");
-  const runnerMod = await import("./runner-ROLDMGH3.js");
-  return {
-    createMcpClient: resolve(clientMod, "createMcpClient"),
-    getTools: resolve(runnerMod, "getTools"),
-    runTool: resolve(runnerMod, "runTool"),
-    describeTool: resolve(runnerMod, "describeTool"),
-    describeToolJson: resolve(runnerMod, "describeToolJson")
-  };
-}
-async function closeClient(client) {
-  if (typeof client.close === "function") {
-    await client.close();
-  }
-}
-function buildMcpConfig(entry) {
-  const base = { type: entry.transport };
-  if (entry.transport === "http") {
-    base.url = entry.serverUrl;
-  } else {
-    base.command = entry.command;
-  }
-  const auth = entry.authConfig;
-  if (auth.type === "http_headers") {
-    base.headers = auth.headers;
-  } else if (auth.type === "env") {
-    base.env = auth.env;
-  }
-  return base;
-}
-async function listMcpTools(entry) {
-  const { createMcpClient, getTools } = await getMcp2cli();
-  const config = buildMcpConfig(entry);
-  const client = await createMcpClient(config);
-  try {
-    const tools = await getTools(client, config, { noCache: true });
-    return tools;
-  } finally {
-    await closeClient(client);
-  }
-}
-async function describeMcpTool(entry, toolName, opts) {
-  const { createMcpClient, getTools, describeTool, describeToolJson } = await getMcp2cli();
-  const config = buildMcpConfig(entry);
-  const client = await createMcpClient(config);
-  try {
-    const tools = await getTools(client, config, { noCache: false, cacheTtl: 3600 });
-    const tool = tools.find((t) => t.name === toolName);
-    if (!tool) throw new Error(`Tool "${toolName}" not found on MCP server "${entry.name}"`);
-    if (opts?.json) {
-      describeToolJson(tool);
-    } else {
-      describeTool(tool);
-    }
-  } finally {
-    await closeClient(client);
-  }
-}
-async function runMcpTool(entry, toolName, rawArgs, opts) {
-  const { createMcpClient, getTools, runTool } = await getMcp2cli();
-  const config = buildMcpConfig(entry);
-  const client = await createMcpClient(config);
-  try {
-    const tools = await getTools(client, config, { noCache: false, cacheTtl: 3600 });
-    const tool = tools.find((t) => t.name === toolName);
-    if (!tool) throw new Error(`Tool "${toolName}" not found on MCP server "${entry.name}"`);
-    const normalizedArgs = [];
-    for (const arg of rawArgs) {
-      if (arg.includes("=") && !arg.startsWith("--")) {
-        const idx = arg.indexOf("=");
-        const key = arg.slice(0, idx);
-        const value = arg.slice(idx + 1);
-        normalizedArgs.push(`--${key}`, value);
-      } else {
-        normalizedArgs.push(arg);
-      }
-    }
-    await runTool(client, tool, normalizedArgs, {
-      ...opts?.json ? { json: true } : {},
-      ...opts?.inputJson ? { inputJson: opts.inputJson } : {}
-    });
-  } finally {
-    await closeClient(client);
-  }
-}
-
-// src/commands/mcp.ts
-function registerMcp(program2) {
-  const mcp = program2.command("mcp").description("Interact with MCP servers registered in your group");
-  mcp.command("list").description("List all MCP servers available in the current group").option("--format <fmt>", "Output format: table | json | yaml", "table").action(async (opts) => {
-    const cfg = getConfig();
-    const client = new ServerClient(cfg);
-    const entries = await client.listMCP();
-    const safe = entries.map(({ authConfig, ...rest }) => ({
-      ...rest,
-      authConfig: { type: authConfig.type }
-    }));
-    if (isJsonOutput()) {
-      outputSuccess(safe);
-      return;
-    }
-    if (entries.length === 0) {
-      console.log("No MCP servers registered in this group.");
-      return;
-    }
-    const format = (opts.format ?? "table").toLowerCase();
-    if (format === "json") {
-      console.log(JSON.stringify(safe, null, 2));
-      return;
-    }
-    if (format === "yaml") {
-      console.log(toYaml(safe));
-      return;
-    }
-    const nameWidth = Math.max(10, ...entries.map((e) => e.name.length));
-    console.log(`
-${"SERVER".padEnd(nameWidth)}  TRANSPORT  DESCRIPTION`);
-    console.log(`${"-".repeat(nameWidth)}  ---------  ${"-".repeat(40)}`);
-    for (const e of entries) {
-      const desc = e.description.length > 60 ? e.description.slice(0, 57) + "..." : e.description;
-      console.log(`${e.name.padEnd(nameWidth)}  ${e.transport.padEnd(9)}  ${desc}`);
-    }
-    console.log();
-  });
-  mcp.command("tools <server>").description("List tools available on a MCP server").option("--format <fmt>", "Output format: table | json | yaml", "table").action(async (serverName, opts) => {
-    const cfg = getConfig();
-    const client = new ServerClient(cfg);
-    let entry;
-    try {
-      entry = await client.getMCP(serverName);
-    } catch {
-      outputError(
-        ExitCode.NOT_FOUND,
-        `Unknown MCP server: ${serverName}`,
-        "Run: ucli mcp list  to see available servers"
-      );
-    }
-    let tools;
-    try {
-      tools = await listMcpTools(entry);
-    } catch (err) {
-      outputError(ExitCode.GENERAL_ERROR, `Failed to fetch tools: ${err.message}`);
-    }
-    if (isJsonOutput()) {
-      outputSuccess(tools);
-      return;
-    }
-    if (tools.length === 0) {
-      console.log(`No tools found on MCP server "${serverName}".`);
-      return;
-    }
-    const format = (opts.format ?? "table").toLowerCase();
-    if (format === "json") {
-      console.log(JSON.stringify(tools, null, 2));
-      return;
-    }
-    if (format === "yaml") {
-      console.log(toYaml(tools));
-      return;
-    }
-    console.log(`
-Tools on "${serverName}":`);
-    console.log("\u2500".repeat(60));
-    for (const t of tools) {
-      console.log(`  ${t.name}`);
-      if (t.description) console.log(`    ${t.description}`);
-    }
-    console.log();
-  });
-  mcp.command("describe <server> <tool>").description("Show detailed schema for a tool on a MCP server").option("--json", "Output full schema as JSON (for agent consumption)").action(async (serverName, toolName, opts) => {
-    const cfg = getConfig();
-    const client = new ServerClient(cfg);
-    let entry;
-    try {
-      entry = await client.getMCP(serverName);
-    } catch {
-      outputError(
-        ExitCode.NOT_FOUND,
-        `Unknown MCP server: ${serverName}`,
-        "Run: ucli mcp list  to see available servers"
-      );
-    }
-    try {
-      await describeMcpTool(entry, toolName, { json: opts.json });
-    } catch (err) {
-      outputError(ExitCode.GENERAL_ERROR, `Failed to describe tool: ${err.message}`);
-    }
-  });
-  mcp.command("run <server> <tool> [args...]").description("Call a tool on a MCP server").option("--json", "Machine-readable JSON output").option("--input-json <json>", "Pass tool arguments as a JSON object").action(async (serverName, toolName, args, opts) => {
-    const cfg = getConfig();
-    const client = new ServerClient(cfg);
-    let entry;
-    try {
-      entry = await client.getMCP(serverName);
-    } catch {
-      outputError(
-        ExitCode.NOT_FOUND,
-        `Unknown MCP server: ${serverName}`,
-        "Run: ucli mcp list  to see available servers"
-      );
-    }
-    try {
-      await runMcpTool(entry, toolName, args, {
-        json: opts.json,
-        inputJson: opts.inputJson
-      });
-    } catch (err) {
-      outputError(ExitCode.GENERAL_ERROR, `Tool execution failed: ${err.message}`);
-    }
-  });
-}
-
 // src/lib/errors.ts
 var debugEnabled = false;
 function setDebugMode(enabled) {
@@ -1046,7 +1145,7 @@ var HINT_MAP = {
   [ExitCode.CONFIG_ERROR]: "Run: ucli configure --server <url> --token <jwt>",
   [ExitCode.AUTH_ERROR]: "Your token may be expired or revoked. Run: ucli configure --server <url> --token <jwt>",
   [ExitCode.CONNECTIVITY_ERROR]: "Check that the server URL is correct and the server is running. Run: ucli doctor",
-  [ExitCode.NOT_FOUND]: "Check the resource name. Run: ucli services list  or  ucli mcp list",
+  [ExitCode.NOT_FOUND]: "Check the resource name. Run: ucli listoas  or  ucli listmcp",
   [ExitCode.SERVER_ERROR]: "The server returned an unexpected error. Try again or run: ucli doctor"
 };
 
@@ -1170,22 +1269,26 @@ _ucli_completions() {
   COMPREPLY=()
   cur="\${COMP_WORDS[COMP_CWORD]}"
   prev="\${COMP_WORDS[COMP_CWORD-1]}"
-  commands="configure services run refresh help mcp doctor completions introspect"
+  commands="configure listoas listmcp oas mcp refresh help doctor completions introspect"
 
   case "\${COMP_WORDS[1]}" in
-    services)
-      COMPREPLY=( $(compgen -W "list info" -- "$cur") )
+    oas)
+      if [ "$COMP_CWORD" -eq 3 ]; then
+        COMPREPLY=( $(compgen -W "info listapi apiinfo invokeapi" -- "$cur") )
+      fi
       return 0
       ;;
     mcp)
-      COMPREPLY=( $(compgen -W "list tools run" -- "$cur") )
+      if [ "$COMP_CWORD" -eq 3 ]; then
+        COMPREPLY=( $(compgen -W "listtool toolinfo invoketool" -- "$cur") )
+      fi
       return 0
       ;;
     completions)
       COMPREPLY=( $(compgen -W "bash zsh fish" -- "$cur") )
       return 0
       ;;
-    run|help)
+    listoas|listmcp|help)
       # dynamic completions would require server calls; skip for now
       return 0
       ;;
@@ -1207,11 +1310,12 @@ _ucli() {
   local -a commands
   commands=(
     'configure:Configure server URL and authentication token'
-    'services:Manage and inspect available OAS services'
-    'run:Execute an operation on a service'
+    'listoas:List all OAS services'
+    'listmcp:List all MCP servers'
+    'oas:Interact with an OAS service'
+    'mcp:Interact with a MCP server'
     'refresh:Force-refresh the local OAS cache'
     'help:Show usage guide'
-    'mcp:Interact with MCP servers'
     'doctor:Check configuration and connectivity'
     'completions:Generate shell completion script'
     'introspect:Return complete capability manifest for AI agents'
@@ -1227,11 +1331,15 @@ _ucli() {
       ;;
     args)
       case $words[1] in
-        services)
-          _values 'subcommand' 'list[List all OAS services]' 'info[Show service details]'
+        oas)
+          if (( CURRENT == 3 )); then
+            _values 'action' 'info[Show service info]' 'listapi[List API operations]' 'apiinfo[Show API details]' 'invokeapi[Invoke an API]'
+          fi
           ;;
         mcp)
-          _values 'subcommand' 'list[List MCP servers]' 'tools[List tools]' 'run[Call a tool]'
+          if (( CURRENT == 3 )); then
+            _values 'action' 'listtool[List tools]' 'toolinfo[Show tool details]' 'invoketool[Invoke a tool]'
+          fi
           ;;
         completions)
           _values 'shell' bash zsh fish
@@ -1249,24 +1357,26 @@ complete -c ucli -e
 
 # Top-level commands
 complete -c ucli -n __fish_use_subcommand -a configure -d 'Configure server URL and token'
-complete -c ucli -n __fish_use_subcommand -a services -d 'Manage OAS services'
-complete -c ucli -n __fish_use_subcommand -a run -d 'Execute a service operation'
+complete -c ucli -n __fish_use_subcommand -a listoas -d 'List OAS services'
+complete -c ucli -n __fish_use_subcommand -a listmcp -d 'List MCP servers'
+complete -c ucli -n __fish_use_subcommand -a oas -d 'Interact with an OAS service'
+complete -c ucli -n __fish_use_subcommand -a mcp -d 'Interact with a MCP server'
 complete -c ucli -n __fish_use_subcommand -a refresh -d 'Refresh local cache'
 complete -c ucli -n __fish_use_subcommand -a help -d 'Show usage guide'
-complete -c ucli -n __fish_use_subcommand -a mcp -d 'Interact with MCP servers'
 complete -c ucli -n __fish_use_subcommand -a doctor -d 'Check config and connectivity'
 complete -c ucli -n __fish_use_subcommand -a completions -d 'Generate shell completions'
-
 complete -c ucli -n __fish_use_subcommand -a introspect -d 'Return capability manifest for AI agents'
 
-# services subcommands
-complete -c ucli -n '__fish_seen_subcommand_from services' -a list -d 'List services'
-complete -c ucli -n '__fish_seen_subcommand_from services' -a info -d 'Show service details'
+# oas actions (third argument after server name)
+complete -c ucli -n '__fish_seen_subcommand_from oas' -a info -d 'Show service info'
+complete -c ucli -n '__fish_seen_subcommand_from oas' -a listapi -d 'List API operations'
+complete -c ucli -n '__fish_seen_subcommand_from oas' -a apiinfo -d 'Show API details'
+complete -c ucli -n '__fish_seen_subcommand_from oas' -a invokeapi -d 'Invoke an API'
 
-# mcp subcommands
-complete -c ucli -n '__fish_seen_subcommand_from mcp' -a list -d 'List MCP servers'
-complete -c ucli -n '__fish_seen_subcommand_from mcp' -a tools -d 'List tools'
-complete -c ucli -n '__fish_seen_subcommand_from mcp' -a run -d 'Call a tool'
+# mcp actions (third argument after server name)
+complete -c ucli -n '__fish_seen_subcommand_from mcp' -a listtool -d 'List tools'
+complete -c ucli -n '__fish_seen_subcommand_from mcp' -a toolinfo -d 'Show tool details'
+complete -c ucli -n '__fish_seen_subcommand_from mcp' -a invoketool -d 'Invoke a tool'
 
 # completions subcommands
 complete -c ucli -n '__fish_seen_subcommand_from completions' -a 'bash zsh fish' -d 'Shell type'`;
@@ -1336,73 +1446,89 @@ function toIntrospectMcpServer(e) {
 function getCommandReference() {
   return [
     {
-      name: "services list",
+      name: "listoas",
       description: "List all OAS services available in the current group",
-      usage: "ucli services list [--format json|table|yaml] [--refresh]",
+      usage: "ucli listoas [--format json|table|yaml] [--refresh]",
+      examples: [
+        "ucli listoas",
+        "ucli listoas --format json",
+        "ucli listoas --refresh"
+      ]
+    },
+    {
+      name: "oas info",
+      description: "Show detailed information for an OAS service",
+      usage: "ucli oas <service> info [--format json|table|yaml]",
+      examples: [
+        "ucli oas payments info",
+        "ucli oas payments info --format json"
+      ]
+    },
+    {
+      name: "oas listapi",
+      description: "List all available API operations for an OAS service",
+      usage: "ucli oas <service> listapi [--format json|table|yaml]",
       examples: [
-        "ucli services list",
-        "ucli services list --format json",
-        "ucli services list --refresh"
+        "ucli oas payments listapi",
+        "ucli oas payments listapi --format json"
       ]
     },
     {
-      name: "services info",
-      description: "Show detailed information and available operations for a service",
-      usage: "ucli services info <name> [--format json|table|yaml]",
+      name: "oas apiinfo",
+      description: "Show detailed input/output parameters for a specific API operation",
+      usage: "ucli oas <service> apiinfo <api>",
       examples: [
-        "ucli services info payments",
-        "ucli services info payments --format json"
+        "ucli oas payments apiinfo createCharge",
+        "ucli oas payments apiinfo getTransaction"
       ]
     },
     {
-      name: "run",
-      description: "Execute an operation on an OAS service",
-      usage: "ucli run <service> <operation> [--format json|table|yaml] [--query <jmespath>] [--data <json|@file>] [--params <json>] [--machine] [--dry-run]",
+      name: "oas invokeapi",
+      description: "Execute an API operation on an OAS service",
+      usage: "ucli oas <service> invokeapi <api> [--format json|table|yaml] [--query <jmespath>] [--data <json|@file>] [--params <json>] [--machine] [--dry-run]",
       examples: [
-        "ucli run payments listTransactions",
-        "ucli run payments getTransaction --transactionId txn_123",
-        `ucli run payments createCharge --data '{"amount": 5000, "currency": "USD"}'`,
-        'ucli run inventory listProducts --query "items[?stock > `0`].name"',
-        "ucli run payments listTransactions --machine",
-        `ucli run payments createCharge --dry-run --data '{"amount": 5000}'`
+        "ucli oas payments invokeapi listTransactions",
+        `ucli oas payments invokeapi getTransaction --params '{"transactionId": "txn_123"}'`,
+        `ucli oas payments invokeapi createCharge --data '{"amount": 5000, "currency": "USD"}'`,
+        'ucli oas inventory invokeapi listProducts --query "items[?stock > `0`].name"',
+        `ucli oas payments invokeapi createCharge --dry-run --data '{"amount": 5000}'`
       ]
     },
     {
-      name: "mcp list",
+      name: "listmcp",
       description: "List all MCP servers available in the current group",
-      usage: "ucli mcp list [--format json|table|yaml]",
+      usage: "ucli listmcp [--format json|table|yaml]",
       examples: [
-        "ucli mcp list",
-        "ucli mcp list --format json"
+        "ucli listmcp",
+        "ucli listmcp --format json"
       ]
     },
     {
-      name: "mcp tools",
+      name: "mcp listtool",
       description: "List tools available on a MCP server",
-      usage: "ucli mcp tools <server> [--format json|table|yaml]",
+      usage: "ucli mcp <server> listtool [--format json|table|yaml]",
       examples: [
-        "ucli mcp tools weather",
-        "ucli mcp tools weather --format json"
+        "ucli mcp weather listtool",
+        "ucli mcp weather listtool --format json"
       ]
     },
     {
-      name: "mcp describe",
-      description: "Show detailed schema for a tool on a MCP server",
-      usage: "ucli mcp describe <server> <tool> [--json]",
+      name: "mcp toolinfo",
+      description: "Show detailed input/output schema for a tool on a MCP server",
+      usage: "ucli mcp <server> toolinfo <tool> [--json]",
       examples: [
-        "ucli mcp describe weather get_forecast",
-        "ucli mcp describe weather get_forecast --json"
+        "ucli mcp weather toolinfo get_forecast",
+        "ucli mcp weather toolinfo get_forecast --json"
       ]
     },
     {
-      name: "mcp run",
+      name: "mcp invoketool",
       description: "Call a tool on a MCP server",
-      usage: "ucli mcp run <server> <tool> [key=value ...] [--json] [--input-json <json>]",
+      usage: "ucli mcp <server> invoketool <tool> [--data <json>] [--json]",
       examples: [
-        'ucli mcp run weather get_forecast location="New York"',
-        'ucli mcp run search web_search query="ucli docs" limit=5',
-        `ucli mcp run weather get_forecast --input-json '{"location": "New York"}'`,
-        'ucli mcp run weather get_forecast --json location="New York"'
+        `ucli mcp weather invoketool get_forecast --data '{"location": "New York"}'`,
+        `ucli mcp search invoketool web_search --data '{"query": "ucli docs", "limit": 5}'`,
+        `ucli mcp weather invoketool get_forecast --json --data '{"location": "New York"}'`
       ]
     },
     {
@@ -1459,10 +1585,11 @@ program.name("ucli").description(pkg.description).version(pkg.version, "-v, --ve
   }
 });
 registerConfigure(program);
-registerServices(program);
-registerRun(program);
-registerRefresh(program);
+registerListOas(program);
+registerListMcp(program);
+registerOas(program);
 registerMcp(program);
+registerRefresh(program);
 registerDoctor(program);
 registerCompletions(program);
 registerIntrospect(program);