@amaster.ai/runtime-cli 1.1.7 → 1.1.8

package/dist/cli.js

@@ -2,20 +2,14 @@
 import { existsSync, rmSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { join, resolve } from 'path';
 import { homedir } from 'os';
-import { Command } from 'commander';
+import { Command, Option } from 'commander';
 import chalk7 from 'chalk';
 import { createClient } from '@amaster.ai/client';
-import ora2 from 'ora';
+import ora from 'ora';
 import yaml from 'yaml';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -55,8 +49,7 @@ function getConfig() {
 }
 function saveConfig(config) {
   if (!existsSync(AMASTER_CONFIG_DIR)) {
-    const fs = __require("fs");
-    fs.mkdirSync(AMASTER_CONFIG_DIR, { recursive: true });
+    mkdirSync(AMASTER_CONFIG_DIR, { recursive: true });
   }
   writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
 }
@@ -124,8 +117,7 @@ function getAuthSession(appCode) {
 }
 function saveAuthSession(appCode, session) {
   if (!existsSync(AMASTER_CONFIG_DIR)) {
-    const fs = __require("fs");
-    fs.mkdirSync(AMASTER_CONFIG_DIR, { recursive: true });
+    mkdirSync(AMASTER_CONFIG_DIR, { recursive: true });
   }
   const authFile = join(AMASTER_CONFIG_DIR, `auth-${appCode}.json`);
   writeFileSync(authFile, JSON.stringify(session, null, 2), { mode: 384 });
@@ -172,8 +164,163 @@ init_config();
 
 // src/commands/auth.ts
 init_config();
+var OUTPUT_FORMATS = ["json", "pretty", "table", "ndjson", "csv"];
+function createFormatOption(description = "Output format") {
+  return new Option(
+    "--format <format>",
+    `${description}: ${OUTPUT_FORMATS.join(", ")}`
+  ).choices([...OUTPUT_FORMATS]).default("json");
+}
+function resolveOutputFormat(format) {
+  if (!format) {
+    return "json";
+  }
+  if (OUTPUT_FORMATS.includes(format)) {
+    return format;
+  }
+  throw new Error(`Unsupported output format: ${format}`);
+}
+function isPrettyOutput(format) {
+  return resolveOutputFormat(format) === "pretty";
+}
+function createSpinner(text, format) {
+  return ora({
+    text,
+    isSilent: !isPrettyOutput(format)
+  }).start();
+}
+function renderOutput(data, options = {}) {
+  const format = resolveOutputFormat(options.format);
+  switch (format) {
+    case "pretty":
+      if (options.pretty) {
+        options.pretty();
+        return;
+      }
+      renderPrettyFallback(data);
+      return;
+    case "json":
+      console.log(JSON.stringify(data ?? null, null, 2));
+      return;
+    case "ndjson":
+      renderNdjson(options.ndjsonItems ?? data);
+      return;
+    case "table":
+      renderTable(options.tableRows ?? inferRows(data));
+      return;
+    case "csv":
+      renderCsv(options.csvRows ?? inferRows(data));
+      return;
+  }
+}
+function renderPrettyFallback(data) {
+  const rows = inferRows(data);
+  if (rows.length === 0) {
+    console.log(JSON.stringify(data ?? null, null, 2));
+    return;
+  }
+  renderTable(rows);
+}
+function renderNdjson(data) {
+  const items = inferNdjsonItems(data);
+  for (const item of items) {
+    console.log(JSON.stringify(item ?? null));
+  }
+}
+function renderTable(rows) {
+  console.table(rows);
+}
+function renderCsv(rows) {
+  if (rows.length === 0) {
+    return;
+  }
+  const headers = [];
+  for (const row of rows) {
+    for (const key of Object.keys(row)) {
+      if (!headers.includes(key)) {
+        headers.push(key);
+      }
+    }
+  }
+  if (headers.length === 0) {
+    return;
+  }
+  console.log(headers.join(","));
+  for (const row of rows) {
+    console.log(headers.map((header) => escapeCsv(row[header])).join(","));
+  }
+}
+function inferNdjsonItems(data) {
+  const collection = extractCollection(data);
+  if (collection) {
+    return collection;
+  }
+  if (Array.isArray(data)) {
+    return data;
+  }
+  return [data ?? null];
+}
+function inferRows(data) {
+  const collection = extractCollection(data);
+  if (collection) {
+    return normalizeRows(collection);
+  }
+  if (Array.isArray(data)) {
+    return normalizeRows(data);
+  }
+  if (isPlainObject(data)) {
+    return [normalizeRow(data)];
+  }
+  return [{ value: normalizeCell(data) }];
+}
+function extractCollection(data) {
+  if (!isPlainObject(data)) {
+    return null;
+  }
+  if (Array.isArray(data.items)) {
+    return data.items;
+  }
+  if (Array.isArray(data.list)) {
+    return data.list;
+  }
+  return null;
+}
+function normalizeRows(items) {
+  return items.map((item) => {
+    if (isPlainObject(item)) {
+      return normalizeRow(item);
+    }
+    return { value: normalizeCell(item) };
+  });
+}
+function normalizeRow(row) {
+  return Object.fromEntries(
+    Object.entries(row).map(([key, value]) => [key, normalizeCell(value)])
+  );
+}
+function normalizeCell(value) {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  }
+  return JSON.stringify(value);
+}
+function escapeCsv(value) {
+  const cell = value === null || value === void 0 ? "" : typeof value === "string" ? value : typeof value === "number" || typeof value === "boolean" ? String(value) : JSON.stringify(value);
+  if (/[",\n]/.test(cell)) {
+    return `"${cell.replace(/"/g, '""')}"`;
+  }
+  return cell;
+}
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// src/commands/auth.ts
 async function login(appCode, options) {
-  const spinner = ora2(`Logging in to ${appCode}...`).start();
+  const spinner = createSpinner(`Logging in to ${appCode}...`, options.format);
   try {
     const appConfig = getAppConfig(appCode);
     if (!appConfig) {
@@ -183,16 +330,16 @@ async function login(appCode, options) {
       console.log(chalk7.yellow(`Initialize it first: amaster init --app-code ${appCode} --url <url>`));
       process.exit(1);
     }
+    let username = options.username;
     let email = options.email;
     let password = options.password;
-    if (!email || !password) {
+    if (!username && !email) {
       const { default: inquirer } = await import('inquirer');
       const answers = await inquirer.prompt([
         {
           type: "input",
-          name: "email",
-          message: "Email:",
-          when: !email
+          name: "login",
+          message: "Username or Email:"
         },
         {
           type: "password",
@@ -201,11 +348,32 @@ async function login(appCode, options) {
           when: !password
         }
       ]);
-      email = email || answers.email;
+      const login2 = answers.login;
+      if (login2.includes("@")) {
+        email = login2;
+      } else {
+        username = login2;
+      }
       password = password || answers.password;
+    } else if (!password) {
+      const { default: inquirer } = await import('inquirer');
+      const answers = await inquirer.prompt([
+        {
+          type: "password",
+          name: "password",
+          message: "Password:"
+        }
+      ]);
+      password = answers.password;
     }
     const client = createClient({ baseURL: appConfig.baseURL });
-    const result = await client.auth.login({ email, password });
+    const loginParams = { password };
+    if (email) {
+      loginParams.email = email;
+    } else if (username) {
+      loginParams.username = username;
+    }
+    const result = await client.auth.login(loginParams);
     if (result.error) {
       spinner.fail("Login failed");
       console.error(chalk7.red(result.error.message));
@@ -216,29 +384,53 @@ async function login(appCode, options) {
       spinner.fail("Login failed: No access token received");
       process.exit(1);
     }
+    const loggedInAt = (/* @__PURE__ */ new Date()).toISOString();
+    const expiresAt = loginData.expiresIn ? new Date(Date.now() + loginData.expiresIn * 1e3).toISOString() : void 0;
+    const sessionUser = loginData.user ? {
+      uid: loginData.user.uid,
+      email: loginData.user.email || "",
+      name: loginData.user.displayName || loginData.user.username || void 0
+    } : void 0;
     saveAuthSession(appCode, {
       accessToken: loginData.accessToken,
-      refreshToken: loginData.refreshToken,
-      expiresAt: loginData.expiresAt,
-      user: loginData.user,
-      loggedInAt: (/* @__PURE__ */ new Date()).toISOString()
+      expiresAt,
+      user: sessionUser,
+      loggedInAt
     });
     spinner.succeed(`Login successful: ${appCode}`);
-    console.log(chalk7.green(`
-Welcome, ${loginData.user?.name || loginData.user?.email || email}!`));
-    console.log(chalk7.gray(`App: ${appCode}`));
-    console.log(chalk7.gray(`URL: ${appConfig.baseURL}`));
-    if (loginData.expiresAt) {
-      const expires = new Date(loginData.expiresAt);
-      console.log(chalk7.gray(`Session expires: ${expires.toLocaleString()}`));
-    }
+    renderOutput(
+      {
+        appCode,
+        baseURL: appConfig.baseURL,
+        user: loginData.user ?? null,
+        expiresAt: expiresAt ?? null,
+        loggedInAt
+      },
+      {
+        format: options.format,
+        pretty: () => {
+          console.log(
+            chalk7.green(
+              `
+Welcome, ${loginData.user?.displayName || loginData.user?.email || loginData.user?.username || email}!`
+            )
+          );
+          console.log(chalk7.gray(`App: ${appCode}`));
+          console.log(chalk7.gray(`URL: ${appConfig.baseURL}`));
+          if (expiresAt) {
+            const expires = new Date(expiresAt);
+            console.log(chalk7.gray(`Session expires: ${expires.toLocaleString()}`));
+          }
+        }
+      }
+    );
   } catch (error) {
     spinner.fail("Login failed");
     throw error;
   }
 }
-async function logout(appCode) {
-  const spinner = ora2(`Logging out from ${appCode}...`).start();
+async function logout(appCode, options = {}) {
+  const spinner = createSpinner(`Logging out from ${appCode}...`, options.format);
   try {
     const appConfig = getAppConfig(appCode);
     if (appConfig) {
@@ -255,13 +447,25 @@ async function logout(appCode) {
     }
     clearAuthSession(appCode);
     spinner.succeed(`Logout successful: ${appCode}`);
+    renderOutput(
+      {
+        appCode,
+        loggedOut: true
+      },
+      {
+        format: options.format,
+        pretty: () => {
+          console.log(chalk7.green(`Logged out from ${appCode}`));
+        }
+      }
+    );
   } catch (error) {
     spinner.fail("Logout failed");
     throw error;
   }
 }
-async function getMe(getClient) {
-  const spinner = ora2("Fetching user info...").start();
+async function getMe(getClient, options = {}) {
+  const spinner = createSpinner("Fetching user info...", options.format);
   try {
     const client = getClient();
     const result = await client.auth.getMe();
@@ -272,160 +476,462 @@ async function getMe(getClient) {
     }
     spinner.succeed("User info retrieved");
     const user = result.data;
-    console.log(chalk7.blue("\n\u{1F464} User Profile\n"));
-    console.log(`  ${chalk7.bold("UID:")} ${user?.uid}`);
-    console.log(`  ${chalk7.bold("Email:")} ${user?.email}`);
-    console.log(`  ${chalk7.bold("Name:")} ${user?.name || "N/A"}`);
-    console.log(`  ${chalk7.bold("Status:")} ${user?.status || "N/A"}`);
+    renderOutput(user, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.blue("\n\u{1F464} User Profile\n"));
+        console.log(`  ${chalk7.bold("UID:")} ${user?.uid}`);
+        console.log(`  ${chalk7.bold("Email:")} ${user?.email}`);
+        console.log(`  ${chalk7.bold("Name:")} ${user?.displayName || user?.username || "N/A"}`);
+        console.log(`  ${chalk7.bold("Status:")} ${user?.isActive ? "Active" : "Inactive"}`);
+      }
+    });
   } catch (error) {
     spinner.fail("Failed to fetch user info");
     throw error;
   }
 }
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function resolveInputSource(input) {
+  if (!input.startsWith("@")) {
+    return input;
+  }
+  const filePath = input.slice(1);
+  if (!filePath) {
+    throw new Error("File path is required after '@'.");
+  }
+  return readFileSync(filePath, "utf8");
+}
+function parseJsonInput(input, label) {
+  const source = resolveInputSource(input).trim();
+  if (!source) {
+    throw new Error(`${label} is required.`);
+  }
+  try {
+    return JSON.parse(source);
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    throw new Error(`Invalid ${label}: ${reason}`);
+  }
+}
+async function promptForJson(message, defaultValue) {
+  const { default: inquirer } = await import('inquirer');
+  const { jsonData } = await inquirer.prompt([
+    {
+      type: "editor",
+      name: "jsonData",
+      message,
+      default: defaultValue
+    }
+  ]);
+  return jsonData;
+}
+async function loadJsonObjectInput(input, label, promptMessage) {
+  const source = input ?? await promptForJson(promptMessage, "{}");
+  const value = parseJsonInput(source, label);
+  if (!isPlainObject2(value)) {
+    throw new Error(`${label} must be a JSON object.`);
+  }
+  return value;
+}
+async function loadJsonArrayInput(input, label, promptMessage) {
+  const source = input ?? await promptForJson(promptMessage, "[]");
+  const value = parseJsonInput(source, label);
+  if (!Array.isArray(value)) {
+    throw new Error(`${label} must be a JSON array.`);
+  }
+  return value;
+}
+function loadOptionalJsonObjectInput(input, label) {
+  if (!input) {
+    return {};
+  }
+  const value = parseJsonInput(input, label);
+  if (!isPlainObject2(value)) {
+    throw new Error(`${label} must be a JSON object.`);
+  }
+  return value;
+}
+function parseCommaSeparatedValues(value) {
+  if (!value) {
+    return void 0;
+  }
+  const values = value.split(",").map((entry) => entry.trim()).filter(Boolean);
+  return values.length > 0 ? values : void 0;
+}
+function validateBulkUpdateItems(items) {
+  return items.map((item, index) => {
+    if (!isPlainObject2(item)) {
+      throw new Error(`Bulk update item at index ${index} must be a JSON object.`);
+    }
+    if (typeof item.id !== "string" && typeof item.id !== "number") {
+      throw new Error(`Bulk update item at index ${index} must include an 'id'.`);
+    }
+    return item;
+  });
+}
+function parseIdsInput(input) {
+  const source = resolveInputSource(input).trim();
+  if (!source) {
+    throw new Error("IDs are required.");
+  }
+  if (source.startsWith("[")) {
+    const value = parseJsonInput(input, "IDs");
+    if (!Array.isArray(value)) {
+      throw new Error("IDs must be a JSON array.");
+    }
+    return value.map((id, index) => {
+      if (typeof id !== "string" && typeof id !== "number") {
+        throw new Error(`ID at index ${index} must be a string or number.`);
+      }
+      return id;
+    });
+  }
+  const ids = source.split(/[,\n]/).map((id) => id.trim()).filter(Boolean);
+  if (ids.length === 0) {
+    throw new Error("IDs are required.");
+  }
+  return ids;
+}
+async function loadIdsInput(input) {
+  if (input) {
+    return parseIdsInput(input);
+  }
+  const { default: inquirer } = await import('inquirer');
+  const { ids } = await inquirer.prompt([
+    {
+      type: "input",
+      name: "ids",
+      message: "Enter IDs (comma-separated or JSON array):"
+    }
+  ]);
+  return parseIdsInput(ids);
+}
+function exitWithCommandError(spinner, failureMessage, error) {
+  spinner.fail(failureMessage);
+  const details = error instanceof Error ? error.message : String(error);
+  if (details) {
+    console.error(chalk7.red(details));
+  }
+  process.exit(1);
+}
+function buildListQueryParams(options) {
+  const params = loadOptionalJsonObjectInput(options.query, "query params");
+  const fields = parseCommaSeparatedValues(options.fields);
+  const relations = parseCommaSeparatedValues(options.relations);
+  const keywordFields = parseCommaSeparatedValues(options.keywordFields);
+  if (keywordFields && !options.keyword) {
+    throw new Error("--keyword-fields requires --keyword.");
+  }
+  if (options.orderDir && !options.orderBy) {
+    throw new Error("--order-dir requires --order-by.");
+  }
+  if (options.orders && (options.orderBy || options.orderDir)) {
+    throw new Error("--orders cannot be used together with --order-by or --order-dir.");
+  }
+  if (fields) {
+    params.__fields = fields;
+  }
+  if (relations) {
+    params.__relations = relations;
+  }
+  if (options.keyword) {
+    params.__keywords = keywordFields ? { fields: keywordFields, value: options.keyword } : options.keyword;
+  }
+  if (options.orderBy) {
+    params.orderBy = options.orderBy;
+  }
+  if (options.orderDir) {
+    params.orderDir = options.orderDir;
+  }
+  if (options.orders) {
+    params.__orders = options.orders;
+  }
+  if (options.filter) {
+    params.__filter = loadOptionalJsonObjectInput(options.filter, "filter");
+  }
+  if (options.limit !== void 0) {
+    params.limit = options.limit;
+  }
+  if (options.offset !== void 0) {
+    params.offset = options.offset;
+  }
+  return params;
+}
 async function listEntities(client, options) {
-  const spinner = ora2(`Fetching ${options.entity}...`).start();
+  const spinner = createSpinner(`Fetching ${options.entity}...`, options.format);
   try {
-    const result = await client.entity.list(options.namespace, options.entity, {
+    const entityClient = client.entity;
+    const query = buildListQueryParams(options);
+    const result = await entityClient.list(options.namespace, options.entity, {
+      ...query,
       page: options.page || 1,
-      pageSize: options.pageSize || 10
+      perPage: options.pageSize || 10
     });
     if (result.error) {
       spinner.fail("Failed to fetch entities");
       console.error(chalk7.red(result.error.message));
       process.exit(1);
     }
-    spinner.succeed(`Found ${result.data?.total || 0} ${options.entity}`);
-    const items = result.data?.list || [];
-    console.log(chalk7.blue(`
-\u{1F4E6} ${options.entity} in ${options.namespace}
+    spinner.stop();
+    const listData = result.data;
+    let items = [];
+    let total = 0;
+    if (Array.isArray(listData)) {
+      items = listData;
+      total = items.length;
+    } else if (listData?.items) {
+      items = listData.items;
+      total = listData.total || items.length;
+    } else if (listData?.list) {
+      items = listData.list;
+      total = listData.total || items.length;
+    }
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.blue(`
+\u{1F4E6} ${options.entity} in ${options.namespace}`));
+        console.log(chalk7.gray(`\u5171 ${total} \u6761\u8BB0\u5F55:
 `));
-    for (const item of items.slice(0, 10)) {
-      const id = item.id || item.uid || item._id;
-      console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(id)}`);
-      const entries = Object.entries(item).slice(0, 5);
-      for (const [key, value] of entries) {
-        if (key !== "id" && key !== "uid" && key !== "_id") {
-          const displayValue = typeof value === "object" ? JSON.stringify(value).slice(0, 50) : String(value).slice(0, 50);
-          console.log(`    ${chalk7.gray(key + ":")} ${displayValue}`);
+        if (items.length === 0) {
+          console.log(chalk7.gray("  \u6682\u65E0\u6570\u636E"));
+          return;
+        }
+        const firstItem = items[0];
+        const keys = Object.keys(firstItem).slice(0, 8);
+        const widths = {};
+        keys.forEach((key) => {
+          const maxValueWidth = Math.max(
+            key.length,
+            ...items.map((item) => {
+              const val = item[key];
+              if (val === null || val === void 0) return 4;
+              const str = typeof val === "object" ? JSON.stringify(val) : String(val);
+              return str.length;
+            })
+          );
+          widths[key] = Math.min(maxValueWidth + 2, 30);
+        });
+        const headerLine = keys.map((key) => {
+          const width = widths[key] ?? 0;
+          return chalk7.bold(key.slice(0, width).padEnd(width));
+        }).join("\u2502");
+        console.log("  " + headerLine);
+        console.log("  " + keys.map((key) => "\u2500".repeat(widths[key] ?? 0)).join("\u253C"));
+        for (const item of items) {
+          const rowLine = keys.map((key) => {
+            const width = widths[key] ?? 0;
+            let val = item[key];
+            if (val === null || val === void 0) val = "null";
+            const str = typeof val === "object" ? JSON.stringify(val).slice(0, width - 2) : String(val).slice(0, width - 2);
+            return str.padEnd(width);
+          }).join("\u2502");
+          console.log("  " + rowLine);
+        }
+        console.log();
+        if (items.length < total) {
+          console.log(chalk7.gray(`  ... \u8FD8\u6709 ${total - items.length} \u6761\u8BB0\u5F55`));
         }
       }
-      if (Object.keys(item).length > 6) {
-        console.log(`    ${chalk7.gray("...")}`);
-      }
-      console.log();
-    }
-    if (items.length > 10) {
-      console.log(chalk7.gray(`  ... and ${items.length - 10} more`));
-    }
+    });
   } catch (error) {
-    spinner.fail("Failed to fetch entities");
-    throw error;
+    exitWithCommandError(spinner, "Failed to fetch entities", error);
   }
 }
 async function getEntity(client, options) {
-  const spinner = ora2(`Fetching ${options.entity}...`).start();
+  const spinner = createSpinner(`Fetching ${options.entity}...`, options.format);
   try {
-    const result = await client.entity.get(options.namespace, options.entity, options.id);
+    const entityClient = client.entity;
+    const result = await entityClient.get(options.namespace, options.entity, options.id);
     if (result.error) {
       spinner.fail("Failed to fetch entity");
       console.error(chalk7.red(result.error.message));
       process.exit(1);
     }
     spinner.succeed("Entity retrieved");
-    console.log(chalk7.blue(`
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.blue(`
 \u{1F4C4} ${options.entity}
 `));
-    console.log(JSON.stringify(result.data, null, 2));
+        console.log(JSON.stringify(result.data, null, 2));
+      }
+    });
   } catch (error) {
-    spinner.fail("Failed to fetch entity");
-    throw error;
+    exitWithCommandError(spinner, "Failed to fetch entity", error);
   }
 }
 async function createEntity(client, options) {
-  const spinner = ora2(`Creating ${options.entity}...`).start();
+  const spinner = createSpinner(`Creating ${options.entity}...`, options.format);
   try {
-    let data = {};
-    if (options.data) {
-      data = JSON.parse(options.data);
-    } else {
-      const { default: inquirer } = await import('inquirer');
-      const { jsonData } = await inquirer.prompt([
-        {
-          type: "editor",
-          name: "jsonData",
-          message: "Enter JSON data:",
-          default: "{}"
-        }
-      ]);
-      data = JSON.parse(jsonData);
-    }
-    const result = await client.entity.create(options.namespace, options.entity, data);
+    const entityClient = client.entity;
+    const data = await loadJsonObjectInput(options.data, "entity data", "Enter JSON data:");
+    const result = await entityClient.create(options.namespace, options.entity, data);
     if (result.error) {
       spinner.fail("Failed to create entity");
       console.error(chalk7.red(result.error.message));
       process.exit(1);
     }
     spinner.succeed("Entity created");
-    console.log(chalk7.green("\nCreated entity:"));
-    console.log(JSON.stringify(result.data, null, 2));
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.green("\nCreated entity:"));
+        console.log(JSON.stringify(result.data, null, 2));
+      }
+    });
   } catch (error) {
-    spinner.fail("Failed to create entity");
-    throw error;
+    exitWithCommandError(spinner, "Failed to create entity", error);
   }
 }
 async function updateEntity(client, options) {
-  const spinner = ora2(`Updating ${options.entity}...`).start();
+  const spinner = createSpinner(`Updating ${options.entity}...`, options.format);
   try {
-    let data = {};
-    if (options.data) {
-      data = JSON.parse(options.data);
-    } else {
-      const { default: inquirer } = await import('inquirer');
-      const { jsonData } = await inquirer.prompt([
-        {
-          type: "editor",
-          name: "jsonData",
-          message: "Enter JSON data:",
-          default: "{}"
-        }
-      ]);
-      data = JSON.parse(jsonData);
-    }
-    const result = await client.entity.update(options.namespace, options.entity, options.id, data);
+    const entityClient = client.entity;
+    const data = await loadJsonObjectInput(options.data, "entity data", "Enter JSON data:");
+    const result = await entityClient.update(options.namespace, options.entity, options.id, data);
     if (result.error) {
       spinner.fail("Failed to update entity");
       console.error(chalk7.red(result.error.message));
       process.exit(1);
     }
     spinner.succeed("Entity updated");
-    console.log(chalk7.green("\nUpdated entity:"));
-    console.log(JSON.stringify(result.data, null, 2));
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.green("\nUpdated entity:"));
+        console.log(JSON.stringify(result.data, null, 2));
+      }
+    });
   } catch (error) {
-    spinner.fail("Failed to update entity");
-    throw error;
+    exitWithCommandError(spinner, "Failed to update entity", error);
   }
 }
 async function deleteEntity(client, options) {
-  const spinner = ora2(`Deleting ${options.entity}...`).start();
+  const spinner = createSpinner(`Deleting ${options.entity}...`, options.format);
   try {
-    const result = await client.entity.delete(options.namespace, options.entity, options.id);
+    const entityClient = client.entity;
+    const result = await entityClient.delete(options.namespace, options.entity, options.id);
     if (result.error) {
       spinner.fail("Failed to delete entity");
       console.error(chalk7.red(result.error.message));
       process.exit(1);
     }
     spinner.succeed("Entity deleted");
-    console.log(chalk7.green(`
+    renderOutput(
+      {
+        namespace: options.namespace,
+        entity: options.entity,
+        id: options.id,
+        deleted: true
+      },
+      {
+        format: options.format,
+        pretty: () => {
+          console.log(chalk7.green(`
 Deleted ${options.entity} with ID: ${options.id}`));
+        }
+      }
+    );
   } catch (error) {
-    spinner.fail("Failed to delete entity");
-    throw error;
+    exitWithCommandError(spinner, "Failed to delete entity", error);
+  }
+}
+async function listEntityOptions(client, options) {
+  const spinner = createSpinner(`Fetching ${options.entity} options...`, options.format);
+  try {
+    const entityClient = client.entity;
+    const fields = parseCommaSeparatedValues(options.fields);
+    const result = await entityClient.options(options.namespace, options.entity, fields);
+    if (result.error) {
+      spinner.fail("Failed to fetch entity options");
+      console.error(chalk7.red(result.error.message));
+      process.exit(1);
+    }
+    spinner.succeed(`Found ${result.data?.length || 0} options`);
+    renderOutput(result.data || [], {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.blue(`
+\u{1F9FE} ${options.entity} options
+`));
+        console.log(JSON.stringify(result.data || [], null, 2));
+      }
+    });
+  } catch (error) {
+    exitWithCommandError(spinner, "Failed to fetch entity options", error);
   }
 }
-async function listProcesses(client) {
-  const spinner = ora2("Fetching process definitions...").start();
+async function bulkUpdateEntities(client, options) {
+  const spinner = createSpinner(`Bulk updating ${options.entity}...`, options.format);
   try {
-    const result = await client.bpm.getProcessDefinitions();
+    const entityClient = client.entity;
+    const rawItems = await loadJsonArrayInput(
+      options.items,
+      "bulk update items",
+      "Enter JSON array of items:"
+    );
+    const items = validateBulkUpdateItems(rawItems);
+    const result = await entityClient.bulkUpdate(options.namespace, options.entity, items);
+    if (result.error) {
+      spinner.fail("Failed to bulk update entities");
+      console.error(chalk7.red(result.error.message));
+      process.exit(1);
+    }
+    spinner.succeed(`Updated ${items.length} entities`);
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.green(`
+Bulk updated ${items.length} ${options.entity} records:`));
+        console.log(JSON.stringify(result.data, null, 2));
+      }
+    });
+  } catch (error) {
+    exitWithCommandError(spinner, "Failed to bulk update entities", error);
+  }
+}
+async function bulkDeleteEntities(client, options) {
+  const spinner = createSpinner(`Bulk deleting ${options.entity}...`, options.format);
+  try {
+    const entityClient = client.entity;
+    const ids = await loadIdsInput(options.ids);
+    const result = await entityClient.bulkDelete(options.namespace, options.entity, ids);
+    if (result.error) {
+      spinner.fail("Failed to bulk delete entities");
+      console.error(chalk7.red(result.error.message));
+      process.exit(1);
+    }
+    spinner.succeed(`Deleted ${ids.length} entities`);
+    renderOutput(
+      {
+        namespace: options.namespace,
+        entity: options.entity,
+        ids,
+        deleted: true,
+        count: ids.length
+      },
+      {
+        format: options.format,
+        pretty: () => {
+          console.log(chalk7.green(`
+Deleted ${ids.length} ${options.entity} records.`));
+        }
+      }
+    );
+  } catch (error) {
+    exitWithCommandError(spinner, "Failed to bulk delete entities", error);
+  }
+}
+async function listProcesses(client, options = {}) {
+  const spinner = createSpinner("Fetching process definitions...", options.format);
+  try {
+    const bpmClient = client.bpm;
+    const result = await bpmClient.getProcessDefinitions();
     if (result.error) {
       spinner.fail("Failed to fetch processes");
       console.error(chalk7.red(result.error.message));
@@ -433,23 +939,29 @@ async function listProcesses(client) {
     }
     spinner.succeed(`Found ${result.data?.length || 0} process definitions`);
     const processes = result.data || [];
-    console.log(chalk7.blue("\n\u{1F4CA} Process Definitions\n"));
-    for (const proc of processes) {
-      console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(proc.key)}`);
-      console.log(`    ${chalk7.gray("Name:")} ${proc.name || "N/A"}`);
-      console.log(`    ${chalk7.gray("Version:")} ${proc.version || "N/A"}`);
-      console.log();
-    }
+    renderOutput(processes, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.blue("\n\u{1F4CA} Process Definitions\n"));
+        for (const proc of processes) {
+          console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(proc.key)}`);
+          console.log(`    ${chalk7.gray("Name:")} ${proc.name || "N/A"}`);
+          console.log(`    ${chalk7.gray("Version:")} ${proc.version || "N/A"}`);
+          console.log();
+        }
+      }
+    });
   } catch (error) {
     spinner.fail("Failed to fetch processes");
     throw error;
   }
 }
 async function startProcess(client, options) {
-  const spinner = ora2(`Starting process: ${options.key}...`).start();
+  const spinner = createSpinner(`Starting process: ${options.key}...`, options.format);
   try {
+    const bpmClient = client.bpm;
     const variables = options.variables ? JSON.parse(options.variables) : {};
-    const result = await client.bpm.startProcess({
+    const result = await bpmClient.startProcess({
       processKey: options.key,
       variables
     });
@@ -459,24 +971,30 @@ async function startProcess(client, options) {
       process.exit(1);
     }
     spinner.succeed("Process started");
-    console.log(chalk7.green("\nProcess Instance:"));
-    console.log(`  ${chalk7.bold("ID:")} ${result.data?.id}`);
-    console.log(`  ${chalk7.bold("Definition ID:")} ${result.data?.definitionId}`);
-    console.log(`  ${chalk7.bold("Business Key:")} ${result.data?.businessKey || "N/A"}`);
-    console.log(`  ${chalk7.bold("Status:")} ${result.data?.suspended ? "Suspended" : "Active"}`);
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.green("\nProcess Instance:"));
+        console.log(`  ${chalk7.bold("ID:")} ${result.data?.id}`);
+        console.log(`  ${chalk7.bold("Definition ID:")} ${result.data?.definitionId}`);
+        console.log(`  ${chalk7.bold("Business Key:")} ${result.data?.businessKey || "N/A"}`);
+        console.log(`  ${chalk7.bold("Status:")} ${result.data?.suspended ? "Suspended" : "Active"}`);
+      }
+    });
   } catch (error) {
     spinner.fail("Failed to start process");
     throw error;
   }
 }
 async function listTasks(client, options) {
-  const spinner = ora2("Fetching tasks...").start();
+  const spinner = createSpinner("Fetching tasks...", options.format);
   try {
+    const bpmClient = client.bpm;
     const params = {};
     if (options.assignee) {
       params.assignee = options.assignee;
     }
-    const result = await client.bpm.getMyTasks(params);
+    const result = await bpmClient.getMyTasks(params);
     if (result.error) {
       spinner.fail("Failed to fetch tasks");
       console.error(chalk7.red(result.error.message));
@@ -484,39 +1002,58 @@ async function listTasks(client, options) {
     }
     spinner.succeed(`Found ${result.data?.length || 0} tasks`);
     const tasks = result.data || [];
-    console.log(chalk7.blue("\n\u{1F4DD} Tasks\n"));
-    for (const task of tasks) {
-      console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(task.name || task.id)}`);
-      console.log(`    ${chalk7.gray("ID:")} ${task.id}`);
-      console.log(`    ${chalk7.gray("Assignee:")} ${task.assignee || "Unassigned"}`);
-      console.log(`    ${chalk7.gray("Created:")} ${task.created || "N/A"}`);
-      console.log();
-    }
+    renderOutput(tasks, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.blue("\n\u{1F4DD} Tasks\n"));
+        for (const task of tasks) {
+          console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(task.name || task.id)}`);
+          console.log(`    ${chalk7.gray("ID:")} ${task.id}`);
+          console.log(`    ${chalk7.gray("Assignee:")} ${task.assignee || "Unassigned"}`);
+          console.log(`    ${chalk7.gray("Created:")} ${task.created || "N/A"}`);
+          console.log();
+        }
+      }
+    });
   } catch (error) {
     spinner.fail("Failed to fetch tasks");
     throw error;
   }
 }
 async function completeTask(client, options) {
-  const spinner = ora2(`Completing task: ${options.id}...`).start();
+  const spinner = createSpinner(`Completing task: ${options.id}...`, options.format);
   try {
+    const bpmClient = client.bpm;
     const variables = options.variables ? JSON.parse(options.variables) : {};
-    const result = await client.bpm.completeTask(options.id, { variables });
+    const result = await bpmClient.completeTask(options.id, { variables });
     if (result.error) {
       spinner.fail("Failed to complete task");
       console.error(chalk7.red(result.error.message));
       process.exit(1);
     }
     spinner.succeed("Task completed");
+    renderOutput(
+      {
+        id: options.id,
+        completed: true
+      },
+      {
+        format: options.format,
+        pretty: () => {
+          console.log(chalk7.green(`Completed task: ${options.id}`));
+        }
+      }
+    );
   } catch (error) {
     spinner.fail("Failed to complete task");
     throw error;
   }
 }
-async function listWorkflows(client) {
-  const spinner = ora2("Fetching workflows...").start();
+async function listWorkflows(client, options = {}) {
+  const spinner = createSpinner("Fetching workflows...", options.format);
   try {
-    const result = await client.workflow.listWorkflows();
+    const workflowClient = client.workflow;
+    const result = await workflowClient.listWorkflows();
     if (result.error) {
       spinner.fail("Failed to fetch workflows");
       console.error(chalk7.red(result.error.message));
@@ -524,24 +1061,30 @@ async function listWorkflows(client) {
     }
     spinner.succeed(`Found ${result.data?.length || 0} workflows`);
     const workflows = result.data || [];
-    console.log(chalk7.blue("\n\u26A1 Workflows\n"));
-    for (const workflow of workflows) {
-      console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(workflow.code || workflow.id)}`);
-      console.log(`    ${chalk7.gray("Name:")} ${workflow.name || "N/A"}`);
-      console.log(`    ${chalk7.gray("Description:")} ${workflow.description || "N/A"}`);
-      console.log(`    ${chalk7.gray("Status:")} ${workflow.status || "N/A"}`);
-      console.log();
-    }
+    renderOutput(workflows, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.blue("\n\u26A1 Workflows\n"));
+        for (const workflow of workflows) {
+          console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(workflow.code || workflow.id)}`);
+          console.log(`    ${chalk7.gray("Name:")} ${workflow.name || "N/A"}`);
+          console.log(`    ${chalk7.gray("Description:")} ${workflow.description || "N/A"}`);
+          console.log(`    ${chalk7.gray("Status:")} ${workflow.status || "N/A"}`);
+          console.log();
+        }
+      }
+    });
   } catch (error) {
     spinner.fail("Failed to fetch workflows");
     throw error;
   }
 }
 async function executeWorkflow(client, options) {
-  const spinner = ora2(`Executing workflow: ${options.id}...`).start();
+  const spinner = createSpinner(`Executing workflow: ${options.id}...`, options.format);
   try {
+    const workflowClient = client.workflow;
     const input = options.input ? JSON.parse(options.input) : {};
-    const result = await client.workflow.execute(options.id, {
+    const result = await workflowClient.execute(options.id, {
       input,
       version: options.version
     });
@@ -551,22 +1094,28 @@ async function executeWorkflow(client, options) {
       process.exit(1);
     }
     spinner.succeed("Workflow executed");
-    console.log(chalk7.green("\nExecution Result:"));
-    console.log(JSON.stringify(result.data, null, 2));
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.green("\nExecution Result:"));
+        console.log(JSON.stringify(result.data, null, 2));
+      }
+    });
   } catch (error) {
     spinner.fail("Failed to execute workflow");
     throw error;
   }
 }
 async function uploadFile(client, options) {
-  const spinner = ora2("Uploading file...").start();
+  const spinner = createSpinner("Uploading file...", options.format);
   try {
+    const s3Client = client.s3;
     const filePath = resolve(options.file);
     if (!existsSync(filePath)) {
       spinner.fail(`File not found: ${options.file}`);
       process.exit(1);
     }
-    const result = await client.s3.uploadFile(filePath, {
+    const result = await s3Client.uploadFile(filePath, {
       key: options.key,
       bucket: options.bucket,
       isPublic: options.public
@@ -577,19 +1126,25 @@ async function uploadFile(client, options) {
       process.exit(1);
     }
     spinner.succeed("Upload complete");
-    console.log(chalk7.green("\nFile uploaded:"));
-    console.log(`  ${chalk7.bold("Key:")} ${result.data?.key}`);
-    console.log(`  ${chalk7.bold("URL:")} ${result.data?.url || "N/A"}`);
-    console.log(`  ${chalk7.bold("Bucket:")} ${result.data?.bucket || options.bucket || "default"}`);
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.green("\nFile uploaded:"));
+        console.log(`  ${chalk7.bold("Key:")} ${result.data?.key}`);
+        console.log(`  ${chalk7.bold("URL:")} ${result.data?.url || "N/A"}`);
+        console.log(`  ${chalk7.bold("Bucket:")} ${result.data?.bucket || options.bucket || "default"}`);
+      }
+    });
   } catch (error) {
     spinner.fail("Upload failed");
     throw error;
   }
 }
 async function listFiles(client, options) {
-  const spinner = ora2("Fetching files...").start();
+  const spinner = createSpinner("Fetching files...", options.format);
   try {
-    const result = await client.s3.listFiles({
+    const s3Client = client.s3;
+    const result = await s3Client.listFiles({
       bucket: options.bucket,
       prefix: options.prefix,
       page: options.page || 1,
@@ -602,15 +1157,20 @@ async function listFiles(client, options) {
     }
     spinner.succeed(`Found ${result.data?.total || 0} files`);
     const files = result.data?.list || [];
-    console.log(chalk7.blue(`
+    renderOutput(result.data, {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk7.blue(`
 \u{1F4C1} Files${options.bucket ? ` in ${options.bucket}` : ""}
 `));
-    for (const file of files) {
-      console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(file.key)}`);
-      console.log(`    ${chalk7.gray("Size:")} ${formatBytes(file.size || 0)}`);
-      console.log(`    ${chalk7.gray("Modified:")} ${file.lastModified || "N/A"}`);
-      console.log();
-    }
+        for (const file of files) {
+          console.log(`  ${chalk7.green("\u2022")} ${chalk7.bold(file.key)}`);
+          console.log(`    ${chalk7.gray("Size:")} ${formatBytes(file.size || 0)}`);
+          console.log(`    ${chalk7.gray("Modified:")} ${file.lastModified || "N/A"}`);
+          console.log();
+        }
+      }
+    });
   } catch (error) {
     spinner.fail("Failed to fetch files");
     throw error;
@@ -649,7 +1209,14 @@ function getAppMcpConfigPath(appCode) {
   return `/openclaw/apps/${appCode}/mcp-config.yaml`;
 }
 async function initOpenClaw(options) {
-  const spinner = ora2(`Initializing app: ${options.appCode}...`).start();
+  const spinner = createSpinner(`Initializing app: ${options.appCode}...`, options.format);
+  const pretty = isPrettyOutput(options.format);
+  const ossEndpoint = options.ossEndpoint || DEFAULT_OSS_ENDPOINT;
+  let installedSkills = 0;
+  let configuredMcpServers = 0;
+  let skillsError = null;
+  let mcpError = null;
+  const openClawDetected = existsSync(OPENCLAW_CONFIG_DIR);
   try {
     const existingConfig = getAppConfig(options.appCode);
     if (existingConfig && !options.force) {
@@ -658,29 +1225,45 @@ async function initOpenClaw(options) {
       console.log(chalk7.gray(`Current URL: ${existingConfig.baseURL}`));
       process.exit(1);
     }
-    if (!existsSync(OPENCLAW_CONFIG_DIR)) {
-      spinner.fail("OpenClaw not detected");
-      console.log(chalk7.yellow("\n\u26A0\uFE0F  Please install OpenClaw first:"));
-      console.log(chalk7.gray("   npm install -g openclaw"));
-      process.exit(1);
-    }
     addApp(options.appCode, {
       baseURL: options.baseURL,
-      ossEndpoint: options.ossEndpoint || DEFAULT_OSS_ENDPOINT,
+      ossEndpoint,
       initializedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
+    if (!openClawDetected) {
+      spinner.succeed(`App initialized: ${options.appCode}`);
+      if (pretty) {
+        console.log(chalk7.yellow("\n\u26A0\uFE0F  OpenClaw not detected, skipping skill download"));
+        console.log(chalk7.gray("   Install OpenClaw: npm install -g openclaw"));
+      } else {
+        renderOutput(
+          {
+            appCode: options.appCode,
+            baseURL: options.baseURL,
+            ossEndpoint,
+            openClawDetected: false,
+            installedSkills: 0,
+            configuredMcpServers: 0
+          },
+          { format: options.format }
+        );
+      }
+      return;
+    }
     spinner.succeed(`App initialized: ${options.appCode}`);
-    console.log(chalk7.blue("\n\u{1F4CB} Configuration:\n"));
-    console.log(`  App Code: ${chalk7.green(options.appCode)}`);
-    console.log(`  Base URL: ${chalk7.gray(options.baseURL)}`);
-    console.log();
-    const ossEndpoint = options.ossEndpoint || DEFAULT_OSS_ENDPOINT;
+    if (pretty) {
+      console.log(chalk7.blue("\n\u{1F4CB} Configuration:\n"));
+      console.log(`  App Code: ${chalk7.green(options.appCode)}`);
+      console.log(`  Base URL: ${chalk7.gray(options.baseURL)}`);
+      console.log();
+    }
     spinner.start("Downloading skills...");
     try {
       const skills = await downloadSkillManifest(ossEndpoint, options.appCode);
       if (skills.length === 0) {
         spinner.warn("No skills found");
       } else {
+        installedSkills = skills.length;
         spinner.text = `Installing ${skills.length} skills...`;
         const appSkillsDir = join(OPENCLAW_SKILLS_DIR, options.appCode);
         if (options.force && existsSync(appSkillsDir)) {
@@ -696,12 +1279,14 @@ async function initOpenClaw(options) {
         spinner.succeed(`Installed ${skills.length} skills`);
       }
     } catch (error) {
+      skillsError = error instanceof Error ? error.message : String(error);
       spinner.warn("Skills download failed (optional)");
     }
     spinner.start("Configuring MCP servers...");
     try {
       const mcpServers = await downloadMcpConfig(ossEndpoint, options.appCode);
       if (Object.keys(mcpServers).length > 0) {
+        configuredMcpServers = Object.keys(mcpServers).length;
         const openClawConfig = getOpenClawConfig();
         if (!openClawConfig.mcpServers) {
           openClawConfig.mcpServers = {};
@@ -715,23 +1300,48 @@ async function initOpenClaw(options) {
         spinner.succeed("No MCP servers to configure");
       }
     } catch (error) {
+      mcpError = error instanceof Error ? error.message : String(error);
       spinner.warn("MCP configuration failed (optional)");
     }
-    console.log();
-    console.log(chalk7.green("\u2705 Initialization complete!"));
-    console.log();
-    console.log(`Next step: Login to your app`);
-    console.log(chalk7.gray(`  amaster login --app ${options.appCode}`));
-    console.log();
     const apps = listApps();
-    if (apps.length > 1) {
-      console.log(chalk7.blue("Configured apps:"));
-      for (const app of apps) {
-        const config = getAppConfig(app);
-        console.log(`  ${chalk7.gray("\u2022")} ${app} - ${config?.baseURL}`);
+    const configuredApps = apps.map((app) => {
+      const config = getAppConfig(app);
+      return {
+        appCode: app,
+        baseURL: config?.baseURL || null
+      };
+    });
+    const summary = {
+      appCode: options.appCode,
+      baseURL: options.baseURL,
+      ossEndpoint,
+      openClawDetected: true,
+      installedSkills,
+      configuredMcpServers,
+      configuredApps,
+      warnings: {
+        skills: skillsError,
+        mcpServers: mcpError
       }
+    };
+    if (pretty) {
+      console.log();
+      console.log(chalk7.green("\u2705 Initialization complete!"));
       console.log();
+      console.log(`Next step: Login to your app`);
+      console.log(chalk7.gray(`  amaster login --app ${options.appCode}`));
+      console.log();
+      if (apps.length > 1) {
+        console.log(chalk7.blue("Configured apps:"));
+        for (const app of apps) {
+          const config = getAppConfig(app);
+          console.log(`  ${chalk7.gray("\u2022")} ${app} - ${config?.baseURL}`);
+        }
+        console.log();
+      }
+      return;
     }
+    renderOutput(summary, { format: options.format });
   } catch (error) {
     spinner.fail("Initialization failed");
     throw error;
@@ -854,163 +1464,257 @@ function createAmasterClient(appCode) {
     process.exit(1);
   }
   if (shouldRefreshToken(appCode)) {
-    console.log(chalk7.yellow("\u26A0\uFE0F  Session expiring soon. Please login again."));
+    console.error(chalk7.yellow("\u26A0\uFE0F  Session expiring soon. Please login again."));
   }
-  return createClient({
+  const client = createClient({
     baseURL: appConfig.baseURL,
     headers: {
       Authorization: `Bearer ${token}`
     },
     onUnauthorized: () => {
       console.error(chalk7.red("\n\u274C Session expired. Please login again."));
-      console.log(chalk7.yellow(`Run: amaster login --app ${appCode}`));
+      console.error(chalk7.yellow(`Run: amaster login --app ${appCode}`));
       process.exit(1);
     }
   });
+  client.setAccessToken(token);
+  return client;
 }
 var program = new Command();
 program.name("amaster").description("CLI for Amaster SDK - Multi-app support for OpenClaw").version("1.0.0");
-program.command("apps").description("List all configured apps").action(() => {
+program.command("apps").description("List all configured apps").addOption(createFormatOption()).action((options) => {
   const apps = listApps();
   const current = getCurrentApp();
-  console.log(chalk7.blue("\n\u{1F4F1} Configured Apps\n"));
-  if (apps.length === 0) {
-    console.log(chalk7.gray("  No apps configured"));
-    console.log(chalk7.gray("  Run: amaster init --app-code <code> --url <url>"));
-  } else {
-    for (const appCode of apps) {
-      const config = getAppConfig(appCode);
-      const isAuth = isAuthenticated(appCode);
-      const isCurrent = appCode === current;
-      let prefix = isCurrent ? chalk7.green("\u2192 ") : "  ";
-      console.log(`${prefix}${chalk7.bold(appCode)}${isCurrent ? chalk7.green(" (current)") : ""}`);
-      console.log(`     ${chalk7.gray(config?.baseURL || "No URL")}`);
-      console.log(`     ${isAuth ? chalk7.green("\u25CF Authenticated") : chalk7.yellow("\u25CB Not authenticated")}`);
+  const appSummaries = apps.map((appCode) => {
+    const config = getAppConfig(appCode);
+    return {
+      appCode,
+      baseURL: config?.baseURL || null,
+      authenticated: isAuthenticated(appCode),
+      current: appCode === current
+    };
+  });
+  renderOutput(appSummaries, {
+    format: options.format,
+    pretty: () => {
+      console.log(chalk7.blue("\n\u{1F4F1} Configured Apps\n"));
+      if (appSummaries.length === 0) {
+        console.log(chalk7.gray("  No apps configured"));
+        console.log(chalk7.gray("  Run: amaster init --app-code <code> --url <url>"));
+      } else {
+        for (const app of appSummaries) {
+          const prefix = app.current ? chalk7.green("\u2192 ") : "  ";
+          console.log(`${prefix}${chalk7.bold(app.appCode)}${app.current ? chalk7.green(" (current)") : ""}`);
+          console.log(`     ${chalk7.gray(app.baseURL || "No URL")}`);
+          console.log(
+            `     ${app.authenticated ? chalk7.green("\u25CF Authenticated") : chalk7.yellow("\u25CB Not authenticated")}`
+          );
+          console.log();
+        }
+      }
       console.log();
     }
-  }
-  console.log();
+  });
 });
-program.command("use <app-code>").description("Set the default app for subsequent commands").action((appCode) => {
+program.command("use <app-code>").description("Set the default app for subsequent commands").addOption(createFormatOption()).action((appCode, options) => {
   if (setCurrentApp(appCode)) {
-    console.log(chalk7.green(`\u2705 Now using app: ${appCode}`));
+    renderOutput(
+      {
+        appCode,
+        current: true
+      },
+      {
+        format: options.format,
+        pretty: () => {
+          console.log(chalk7.green(`\u2705 Now using app: ${appCode}`));
+        }
+      }
+    );
   } else {
     console.error(chalk7.red(`\u274C App not found: ${appCode}`));
     process.exit(1);
   }
 });
-program.command("init").description("Initialize an app for OpenClaw integration").requiredOption("--app-code <code>", "Application code (e.g., fhv94bto1)").requiredOption("--url <url>", "Base URL (e.g., https://fhv94bto1.helige.cn)").option("--api-key <key>", "API Key for OSS access").option("--oss-endpoint <endpoint>", "OSS endpoint").action(async (options) => {
+program.command("init").description("Initialize an app for OpenClaw integration").requiredOption("--app-code <code>", "Application code (e.g., fhv94bto1)").requiredOption("--url <url>", "Base URL (e.g., https://fhv94bto1.helige.cn)").option("--api-key <key>", "API Key for OSS access").option("--oss-endpoint <endpoint>", "OSS endpoint").option("--force", "Reinitialize an existing app").addOption(createFormatOption()).action(async (options) => {
   await initOpenClaw({
     appCode: options.appCode,
     baseURL: options.url,
     apiKey: options.apiKey,
-    ossEndpoint: options.ossEndpoint
+    ossEndpoint: options.ossEndpoint,
+    force: options.force,
+    format: options.format
   });
 });
-program.command("login").description("Authenticate with an app").option("--app <app-code>", "App code (uses default if not specified)").option("-e, --email <email>", "Email address").option("-p, --password <password>", "Password").action(async (options) => {
+program.command("login").description("Authenticate with an app").option("--app <app-code>", "App code (uses default if not specified)").option("-u, --username <username>", "Username").option("-e, --email <email>", "Email address").option("-p, --password <password>", "Password").addOption(createFormatOption()).action(async (options) => {
   const appCode = resolveAppCode(options.app);
-  await login(appCode, { email: options.email, password: options.password });
+  await login(appCode, {
+    username: options.username,
+    email: options.email,
+    password: options.password,
+    format: options.format
+  });
 });
-program.command("logout").description("Logout from an app").option("--app <app-code>", "App code (uses default if not specified)").action(async (options) => {
+program.command("logout").description("Logout from an app").option("--app <app-code>", "App code (uses default if not specified)").addOption(createFormatOption()).action(async (options) => {
   const appCode = resolveAppCode(options.app);
-  await logout(appCode);
+  await logout(appCode, { format: options.format });
 });
-program.command("whoami").description("Show current user information").option("--app <app-code>", "App code (uses default if not specified)").action(async (options) => {
+program.command("whoami").description("Show current user information").option("--app <app-code>", "App code (uses default if not specified)").addOption(createFormatOption()).action(async (options) => {
   const appCode = resolveAppCode(options.app);
-  await getMe(() => createAmasterClient(appCode));
+  await getMe(() => createAmasterClient(appCode), { format: options.format });
 });
 var entityCmd = program.command("entity").description("Manage entities");
-entityCmd.command("list <namespace> <entity>").description("List entities").option("--app <app-code>", "App code (uses default if not specified)").option("--page <page>", "Page number", "1").option("--page-size <size>", "Page size", "10").action(async (namespace, entityName, options) => {
+entityCmd.command("list <namespace> <entity>").description("List entities").option("--app <app-code>", "App code (uses default if not specified)").option("--page <page>", "Page number", "1").option("--page-size <size>", "Page size", "10").option("-f, --fields <fields>", "Comma-separated fields to return").option("-r, --relations <relations>", "Comma-separated relations to load").option("-k, --keyword <keyword>", "Keyword to search").option("--keyword-fields <fields>", "Comma-separated fields for keyword search").option("--order-by <field>", "Field to sort by").addOption(new Option("--order-dir <dir>", "Sort direction").choices(["asc", "desc"])).option("--orders <orders>", "Multi-order expression, e.g. created_at:desc,name:asc").option("--filter <json>", "Advanced __filter JSON or @file").option("--limit <limit>", "Limit number of records").option("--offset <offset>", "Offset number of records").option("-q, --query <json>", "Additional EntityQueryParams as JSON or @file").addOption(createFormatOption()).action(async (namespace, entityName, options) => {
   const appCode = resolveAppCode(options.app);
   await listEntities(createAmasterClient(appCode), {
     namespace,
     entity: entityName,
     page: parseInt(options.page),
-    pageSize: parseInt(options.pageSize)
+    pageSize: parseInt(options.pageSize),
+    fields: options.fields,
+    relations: options.relations,
+    keyword: options.keyword,
+    keywordFields: options.keywordFields,
+    orderBy: options.orderBy,
+    orderDir: options.orderDir,
+    orders: options.orders,
+    filter: options.filter,
+    limit: options.limit ? parseInt(options.limit) : void 0,
+    offset: options.offset ? parseInt(options.offset) : void 0,
+    query: options.query,
+    format: options.format
   });
 });
-entityCmd.command("get <namespace> <entity> <id>").description("Get entity by ID").option("--app <app-code>", "App code (uses default if not specified)").action(async (namespace, entityName, id, options) => {
+entityCmd.command("get <namespace> <entity> <id>").description("Get entity by ID").option("--app <app-code>", "App code (uses default if not specified)").addOption(createFormatOption()).action(async (namespace, entityName, id, options) => {
   const appCode = resolveAppCode(options.app);
-  await getEntity(createAmasterClient(appCode), { namespace, entity: entityName, id });
+  await getEntity(createAmasterClient(appCode), {
+    namespace,
+    entity: entityName,
+    id,
+    format: options.format
+  });
 });
-entityCmd.command("create <namespace> <entity>").description("Create new entity").option("--app <app-code>", "App code (uses default if not specified)").option("-d, --data <json>", "Entity data as JSON").action(async (namespace, entityName, options) => {
+entityCmd.command("create <namespace> <entity>").description("Create new entity").option("--app <app-code>", "App code (uses default if not specified)").option("-d, --data <json>", "Entity data as JSON or @file").addOption(createFormatOption()).action(async (namespace, entityName, options) => {
   const appCode = resolveAppCode(options.app);
   await createEntity(createAmasterClient(appCode), {
     namespace,
     entity: entityName,
-    data: options.data
+    data: options.data,
+    format: options.format
   });
 });
-entityCmd.command("update <namespace> <entity> <id>").description("Update entity").option("--app <app-code>", "App code (uses default if not specified)").option("-d, --data <json>", "Entity data as JSON").action(async (namespace, entityName, id, options) => {
+entityCmd.command("update <namespace> <entity> <id>").description("Update entity").option("--app <app-code>", "App code (uses default if not specified)").option("-d, --data <json>", "Entity data as JSON or @file").addOption(createFormatOption()).action(async (namespace, entityName, id, options) => {
   const appCode = resolveAppCode(options.app);
   await updateEntity(createAmasterClient(appCode), {
     namespace,
     entity: entityName,
     id,
-    data: options.data
+    data: options.data,
+    format: options.format
   });
 });
-entityCmd.command("delete <namespace> <entity> <id>").description("Delete entity").option("--app <app-code>", "App code (uses default if not specified)").action(async (namespace, entityName, id, options) => {
+entityCmd.command("delete <namespace> <entity> <id>").description("Delete entity").option("--app <app-code>", "App code (uses default if not specified)").addOption(createFormatOption()).action(async (namespace, entityName, id, options) => {
   const appCode = resolveAppCode(options.app);
   await deleteEntity(createAmasterClient(appCode), {
     namespace,
     entity: entityName,
-    id
+    id,
+    format: options.format
+  });
+});
+entityCmd.command("options <namespace> <entity>").description("List entity options").option("--app <app-code>", "App code (uses default if not specified)").option("-f, --fields <fields>", "Comma-separated fields to return").addOption(createFormatOption()).action(async (namespace, entityName, options) => {
+  const appCode = resolveAppCode(options.app);
+  await listEntityOptions(createAmasterClient(appCode), {
+    namespace,
+    entity: entityName,
+    fields: options.fields,
+    format: options.format
+  });
+});
+entityCmd.command("bulk-update <namespace> <entity>").description("Bulk update entities").option("--app <app-code>", "App code (uses default if not specified)").option("-i, --items <json>", "Items array as JSON or @file").addOption(createFormatOption()).action(async (namespace, entityName, options) => {
+  const appCode = resolveAppCode(options.app);
+  await bulkUpdateEntities(createAmasterClient(appCode), {
+    namespace,
+    entity: entityName,
+    items: options.items,
+    format: options.format
+  });
+});
+entityCmd.command("bulk-delete <namespace> <entity>").description("Bulk delete entities").option("--app <app-code>", "App code (uses default if not specified)").option("--ids <ids>", "Comma-separated IDs, JSON array, or @file").addOption(createFormatOption()).action(async (namespace, entityName, options) => {
+  const appCode = resolveAppCode(options.app);
+  await bulkDeleteEntities(createAmasterClient(appCode), {
+    namespace,
+    entity: entityName,
+    ids: options.ids,
+    format: options.format
   });
 });
 var bpmCmd = program.command("bpm").description("Manage BPM processes and tasks");
-bpmCmd.command("processes").description("List process definitions").option("--app <app-code>", "App code (uses default if not specified)").action(async (options) => {
+bpmCmd.command("processes").description("List process definitions").option("--app <app-code>", "App code (uses default if not specified)").addOption(createFormatOption()).action(async (options) => {
   const appCode = resolveAppCode(options.app);
-  await listProcesses(createAmasterClient(appCode));
+  await listProcesses(createAmasterClient(appCode), { format: options.format });
 });
-bpmCmd.command("start <key>").description("Start a process instance").option("--app <app-code>", "App code (uses default if not specified)").option("-v, --variables <json>", "Process variables as JSON").action(async (key, options) => {
+bpmCmd.command("start <key>").description("Start a process instance").option("--app <app-code>", "App code (uses default if not specified)").option("-v, --variables <json>", "Process variables as JSON").addOption(createFormatOption()).action(async (key, options) => {
   const appCode = resolveAppCode(options.app);
   await startProcess(createAmasterClient(appCode), {
     key,
-    variables: options.variables
+    variables: options.variables,
+    format: options.format
   });
 });
-bpmCmd.command("tasks").description("List tasks").option("--app <app-code>", "App code (uses default if not specified)").option("-a, --assignee <assignee>", "Filter by assignee").action(async (options) => {
+bpmCmd.command("tasks").description("List tasks").option("--app <app-code>", "App code (uses default if not specified)").option("-a, --assignee <assignee>", "Filter by assignee").addOption(createFormatOption()).action(async (options) => {
   const appCode = resolveAppCode(options.app);
-  await listTasks(createAmasterClient(appCode), { assignee: options.assignee });
+  await listTasks(createAmasterClient(appCode), {
+    assignee: options.assignee,
+    format: options.format
+  });
 });
-bpmCmd.command("complete <id>").description("Complete a task").option("--app <app-code>", "App code (uses default if not specified)").option("-v, --variables <json>", "Task variables as JSON").action(async (id, options) => {
+bpmCmd.command("complete <id>").description("Complete a task").option("--app <app-code>", "App code (uses default if not specified)").option("-v, --variables <json>", "Task variables as JSON").addOption(createFormatOption()).action(async (id, options) => {
   const appCode = resolveAppCode(options.app);
   await completeTask(createAmasterClient(appCode), {
     id,
-    variables: options.variables
+    variables: options.variables,
+    format: options.format
   });
 });
 var workflowCmd = program.command("workflow").description("Manage workflows");
-workflowCmd.command("list").description("List workflows").option("--app <app-code>", "App code (uses default if not specified)").action(async (options) => {
+workflowCmd.command("list").description("List workflows").option("--app <app-code>", "App code (uses default if not specified)").addOption(createFormatOption()).action(async (options) => {
   const appCode = resolveAppCode(options.app);
-  await listWorkflows(createAmasterClient(appCode));
+  await listWorkflows(createAmasterClient(appCode), { format: options.format });
 });
-workflowCmd.command("execute <id>").description("Execute a workflow").option("--app <app-code>", "App code (uses default if not specified)").option("-i, --input <json>", "Workflow input as JSON").action(async (id, options) => {
+workflowCmd.command("execute <id>").description("Execute a workflow").option("--app <app-code>", "App code (uses default if not specified)").option("-i, --input <json>", "Workflow input as JSON").addOption(createFormatOption()).action(async (id, options) => {
   const appCode = resolveAppCode(options.app);
   await executeWorkflow(createAmasterClient(appCode), {
     id,
-    input: options.input
+    input: options.input,
+    format: options.format
   });
 });
 var s3Cmd = program.command("s3").description("Manage S3 files");
-s3Cmd.command("list").description("List files").option("--app <app-code>", "App code (uses default if not specified)").option("-b, --bucket <bucket>", "Bucket name").action(async (options) => {
+s3Cmd.command("list").description("List files").option("--app <app-code>", "App code (uses default if not specified)").option("-b, --bucket <bucket>", "Bucket name").addOption(createFormatOption()).action(async (options) => {
   const appCode = resolveAppCode(options.app);
   await listFiles(createAmasterClient(appCode), {
-    bucket: options.bucket
+    bucket: options.bucket,
+    format: options.format
   });
 });
-s3Cmd.command("upload <file>").description("Upload a file").option("--app <app-code>", "App code (uses default if not specified)").option("-b, --bucket <bucket>", "Bucket name").option("-k, --key <key>", "Object key").action(async (file, options) => {
+s3Cmd.command("upload <file>").description("Upload a file").option("--app <app-code>", "App code (uses default if not specified)").option("-b, --bucket <bucket>", "Bucket name").option("-k, --key <key>", "Object key").addOption(createFormatOption()).action(async (file, options) => {
   const appCode = resolveAppCode(options.app);
   await uploadFile(createAmasterClient(appCode), {
     file,
     bucket: options.bucket,
-    key: options.key
+    key: options.key,
+    format: options.format
   });
 });
 var isMainModule = import.meta.url === new URL(process.argv[1] || "", import.meta.url).href || import.meta.url.endsWith(process.argv[1] || "") || process.argv[1]?.includes("cli.js") || false;
 if (isMainModule) {
-  program.parse();
+  program.parseAsync(process.argv).then(
+    () => process.exit(0),
+    (err) => {
+      console.error(err);
+      process.exit(1);
+    }
+  );
 }
 
 export { createAmasterClient, resolveAppCode };