@acomo/cli 1.0.12 → 1.0.13

package/dist/index.js

@@ -1,38 +1,23 @@
 #!/usr/bin/env node
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 
 // src/index.ts
-var import_fs6 = require("fs");
-var import_path6 = require("path");
-var import_url2 = require("url");
+import { readFileSync as readFileSync4 } from "fs";
+import { resolve as resolve5, dirname as dirname3 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // ../node_modules/yargs/lib/platform-shims/esm.mjs
-var import_assert = require("assert");
+import { notStrictEqual, strictEqual } from "assert";
 
 // ../node_modules/cliui/build/lib/index.js
 var align = {
@@ -323,30 +308,30 @@ function ui(opts) {
 }
 
 // ../node_modules/escalade/sync/index.mjs
-var import_path = require("path");
-var import_fs = require("fs");
+import { dirname, resolve } from "path";
+import { readdirSync, statSync } from "fs";
 function sync_default(start, callback) {
-  let dir = (0, import_path.resolve)(".", start);
-  let tmp, stats = (0, import_fs.statSync)(dir);
+  let dir = resolve(".", start);
+  let tmp, stats = statSync(dir);
   if (!stats.isDirectory()) {
-    dir = (0, import_path.dirname)(dir);
+    dir = dirname(dir);
   }
   while (true) {
-    tmp = callback(dir, (0, import_fs.readdirSync)(dir));
-    if (tmp) return (0, import_path.resolve)(dir, tmp);
-    dir = (0, import_path.dirname)(tmp = dir);
+    tmp = callback(dir, readdirSync(dir));
+    if (tmp) return resolve(dir, tmp);
+    dir = dirname(tmp = dir);
     if (tmp === dir) break;
   }
 }
 
 // ../node_modules/yargs/lib/platform-shims/esm.mjs
-var import_util3 = require("util");
-var import_fs4 = require("fs");
-var import_url = require("url");
+import { inspect } from "util";
+import { readFileSync as readFileSync3 } from "fs";
+import { fileURLToPath } from "url";
 
 // ../node_modules/yargs-parser/build/lib/index.js
-var import_util = require("util");
-var import_path2 = require("path");
+import { format } from "util";
+import { normalize, resolve as resolve2 } from "path";
 
 // ../node_modules/yargs-parser/build/lib/string-utils.js
 function camelCase(str) {
@@ -1284,7 +1269,7 @@ function stripQuotes(val) {
 }
 
 // ../node_modules/yargs-parser/build/lib/index.js
-var import_fs2 = require("fs");
+import { readFileSync } from "fs";
 var _a;
 var _b;
 var _c;
@@ -1302,16 +1287,16 @@ var parser = new YargsParser({
   env: () => {
     return env;
   },
-  format: import_util.format,
-  normalize: import_path2.normalize,
-  resolve: import_path2.resolve,
+  format,
+  normalize,
+  resolve: resolve2,
   // TODO: figure  out a  way to combine ESM and CJS coverage, such  that
   // we can exercise all the lines below:
   require: (path2) => {
-    if (typeof require !== "undefined") {
-      return require(path2);
+    if (typeof __require !== "undefined") {
+      return __require(path2);
     } else if (path2.match(/\.json$/)) {
-      return JSON.parse((0, import_fs2.readFileSync)(path2, "utf8"));
+      return JSON.parse(readFileSync(path2, "utf8"));
     } else {
       throw Error("only .json config files are supported in ESM");
     }
@@ -1330,7 +1315,7 @@ yargsParser.looksLikeNumber = looksLikeNumber;
 var lib_default = yargsParser;
 
 // ../node_modules/yargs/lib/platform-shims/esm.mjs
-var import_path4 = require("path");
+import { basename, dirname as dirname2, extname, relative, resolve as resolve4 } from "path";
 
 // ../node_modules/yargs/build/lib/utils/process-argv.js
 function getProcessArgvBinIndex() {
@@ -1363,19 +1348,19 @@ var YError = class _YError extends Error {
 };
 
 // ../node_modules/y18n/build/lib/platform-shims/node.js
-var import_fs3 = require("fs");
-var import_util2 = require("util");
-var import_path3 = require("path");
+import { readFileSync as readFileSync2, statSync as statSync2, writeFile } from "fs";
+import { format as format2 } from "util";
+import { resolve as resolve3 } from "path";
 var node_default = {
   fs: {
-    readFileSync: import_fs3.readFileSync,
-    writeFile: import_fs3.writeFile
+    readFileSync: readFileSync2,
+    writeFile
   },
-  format: import_util2.format,
-  resolve: import_path3.resolve,
+  format: format2,
+  resolve: resolve3,
   exists: (file) => {
     try {
-      return (0, import_fs3.statSync)(file).isFile();
+      return statSync2(file).isFile();
     } catch (err) {
       return false;
     }
@@ -1550,27 +1535,26 @@ var y18n2 = (opts) => {
 var y18n_default = y18n2;
 
 // ../node_modules/yargs/lib/platform-shims/esm.mjs
-var import_meta = {};
 var REQUIRE_ERROR = "require is not supported by ESM";
 var REQUIRE_DIRECTORY_ERROR = "loading a directory of commands is not supported yet for ESM";
-var __dirname2;
+var __dirname;
 try {
-  __dirname2 = (0, import_url.fileURLToPath)(import_meta.url);
+  __dirname = fileURLToPath(import.meta.url);
 } catch (e) {
-  __dirname2 = process.cwd();
+  __dirname = process.cwd();
 }
-var mainFilename = __dirname2.substring(0, __dirname2.lastIndexOf("node_modules"));
+var mainFilename = __dirname.substring(0, __dirname.lastIndexOf("node_modules"));
 var esm_default = {
   assert: {
-    notStrictEqual: import_assert.notStrictEqual,
-    strictEqual: import_assert.strictEqual
+    notStrictEqual,
+    strictEqual
   },
   cliui: ui,
   findUp: sync_default,
   getEnv: (key) => {
     return process.env[key];
   },
-  inspect: import_util3.inspect,
+  inspect,
   getCallerFile: () => {
     throw new YError(REQUIRE_DIRECTORY_ERROR);
   },
@@ -1578,11 +1562,11 @@ var esm_default = {
   mainFilename: mainFilename || process.cwd(),
   Parser: lib_default,
   path: {
-    basename: import_path4.basename,
-    dirname: import_path4.dirname,
-    extname: import_path4.extname,
-    relative: import_path4.relative,
-    resolve: import_path4.resolve
+    basename,
+    dirname: dirname2,
+    extname,
+    relative,
+    resolve: resolve4
   },
   process: {
     argv: () => process.argv,
@@ -1593,7 +1577,7 @@ var esm_default = {
     nextTick: process.nextTick,
     stdColumns: typeof process.stdout.columns !== "undefined" ? process.stdout.columns : null
   },
-  readFileSync: import_fs4.readFileSync,
+  readFileSync: readFileSync3,
   require: () => {
     throw new YError(REQUIRE_ERROR);
   },
@@ -1604,7 +1588,7 @@ var esm_default = {
     return [...str].length;
   },
   y18n: y18n_default({
-    directory: (0, import_path4.resolve)(__dirname2, "../../../locales"),
+    directory: resolve4(__dirname, "../../../locales"),
     updateFiles: false
   })
 };
@@ -1815,10 +1799,10 @@ function isFunction(arg) {
 
 // ../node_modules/yargs/build/lib/utils/which-module.js
 function whichModule(exported) {
-  if (typeof require === "undefined")
+  if (typeof __require === "undefined")
     return null;
-  for (let i = 0, files = Object.keys(require.cache), mod; i < files.length; i++) {
-    mod = require.cache[files[i]];
+  for (let i = 0, files = Object.keys(__require.cache), mod; i < files.length; i++) {
+    mod = __require.cache[files[i]];
     if (mod.exports === exported)
       return mod;
   }
@@ -3343,7 +3327,7 @@ function applyExtends(config, cwd, mergeExtends, _shim) {
     let pathToDefault = null;
     if (!isPath) {
       try {
-        pathToDefault = require.resolve(config.extends);
+        pathToDefault = __require.resolve(config.extends);
       } catch (_err) {
         return config;
       }
@@ -3352,7 +3336,7 @@ function applyExtends(config, cwd, mergeExtends, _shim) {
     }
     checkForCircularExtends(pathToDefault);
     previouslyVisitedConfigs.push(pathToDefault);
-    defaultConfig = isPath ? JSON.parse(shim2.readFileSync(pathToDefault, "utf8")) : require(config.extends);
+    defaultConfig = isPath ? JSON.parse(shim2.readFileSync(pathToDefault, "utf8")) : __require(config.extends);
     delete config.extends;
     defaultConfig = applyExtends(defaultConfig, shim2.path.dirname(pathToDefault), mergeExtends, shim2);
   }
@@ -12115,32 +12099,35 @@ var textFieldType = (type) => {
 };
 
 // src/lib/config-store.ts
-var import_fs5 = __toESM(require("fs"));
-var import_path5 = __toESM(require("path"));
-var import_os = __toESM(require("os"));
-var CONFIG_DIR = import_path5.default.join(import_os.default.homedir(), ".acomo");
-var CONFIG_FILE = import_path5.default.join(CONFIG_DIR, "config.json");
+import fs from "fs";
+import path from "path";
+import os from "os";
+var CONFIG_DIR = path.join(os.homedir(), ".acomo");
+var CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
 var ENV_KEYS = {
   baseUrl: "ACOMO_BASE_URL",
   tenantId: "ACOMO_TENANT_ID",
-  accessToken: "ACOMO_ACCESS_TOKEN",
-  email: "ACOMO_EMAIL"
+  accessToken: "ACOMO_ACCESS_TOKEN"
 };
+var DEFAULT_BASE_URL = "https://acomo.app";
 function loadEnvConfig() {
   const env2 = {};
   if (process.env[ENV_KEYS.baseUrl]) env2.baseUrl = process.env[ENV_KEYS.baseUrl];
   if (process.env[ENV_KEYS.tenantId]) env2.tenantId = process.env[ENV_KEYS.tenantId];
   if (process.env[ENV_KEYS.accessToken]) env2.accessToken = process.env[ENV_KEYS.accessToken];
-  if (process.env[ENV_KEYS.email]) env2.email = process.env[ENV_KEYS.email];
   return env2;
 }
 function loadConfig() {
   try {
-    if (!import_fs5.default.existsSync(CONFIG_FILE)) {
+    if (!fs.existsSync(CONFIG_FILE)) {
       return null;
     }
-    const content = import_fs5.default.readFileSync(CONFIG_FILE, "utf-8");
-    return JSON.parse(content);
+    const content = fs.readFileSync(CONFIG_FILE, "utf-8");
+    const raw = JSON.parse(content);
+    const baseUrl = typeof raw.baseUrl === "string" ? raw.baseUrl : "";
+    const tenantId = typeof raw.tenantId === "string" ? raw.tenantId : "";
+    const accessToken = typeof raw.accessToken === "string" ? raw.accessToken : "";
+    return { baseUrl, tenantId, accessToken };
   } catch (error) {
     return null;
   }
@@ -12152,10 +12139,9 @@ function resolveConfig() {
     return null;
   }
   const merged = {
-    baseUrl: envConfig.baseUrl ?? fileConfig?.baseUrl ?? "",
+    baseUrl: (envConfig.baseUrl ?? fileConfig?.baseUrl ?? "").trim(),
     tenantId: envConfig.tenantId ?? fileConfig?.tenantId ?? "",
-    accessToken: envConfig.accessToken ?? fileConfig?.accessToken ?? "",
-    email: envConfig.email ?? fileConfig?.email
+    accessToken: envConfig.accessToken ?? fileConfig?.accessToken ?? ""
   };
   if (!merged.accessToken || !merged.tenantId) {
     return null;
@@ -12163,36 +12149,45 @@ function resolveConfig() {
   return merged;
 }
 function saveConfig(config) {
-  if (!import_fs5.default.existsSync(CONFIG_DIR)) {
-    import_fs5.default.mkdirSync(CONFIG_DIR, { recursive: true });
+  if (!fs.existsSync(CONFIG_DIR)) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true });
   }
-  import_fs5.default.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), {
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), {
     mode: 384
   });
 }
 function clearConfig() {
   try {
-    if (import_fs5.default.existsSync(CONFIG_FILE)) {
-      import_fs5.default.unlinkSync(CONFIG_FILE);
+    if (fs.existsSync(CONFIG_FILE)) {
+      fs.unlinkSync(CONFIG_FILE);
     }
   } catch (error) {
   }
 }
 
 // src/lib/api-client.ts
-function createConfiguration(options) {
+var REQUIRED_KEYS = [
+  { key: "baseUrl", envKey: ENV_KEYS.baseUrl },
+  { key: "tenantId", envKey: ENV_KEYS.tenantId },
+  { key: "accessToken", envKey: ENV_KEYS.accessToken }
+];
+function createConfiguration() {
   const config = resolveConfig();
   if (!config) {
-    throw new Error("\u8A8D\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002`acomo login` \u3092\u5B9F\u884C\u3059\u308B\u304B\u3001\u74B0\u5883\u5909\u6570 (ACOMO_ACCESS_TOKEN, ACOMO_TENANT_ID) \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
+    throw new Error("\u8A8D\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002`acomo login` \u3092\u5B9F\u884C\u3059\u308B\u304B\u3001\u74B0\u5883\u5909\u6570 (ACOMO_ACCESS_TOKEN, ACOMO_TENANT_ID, ACOMO_BASE_URL) \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
+  }
+  const missing = REQUIRED_KEYS.filter(({ key }) => !config[key] || String(config[key]).trim() === "");
+  if (missing.length > 0) {
+    const keys = missing.map(({ key }) => key).join(", ");
+    const envVars = missing.map(({ envKey }) => envKey).join(", ");
+    const message = missing.length === 1 ? `${missing[0].key} \u304C\u672A\u8A2D\u5B9A\u3067\u3059\u3002\`acomo login\` \u3092\u5B9F\u884C\u3059\u308B\u304B\u3001\u74B0\u5883\u5909\u6570 ${missing[0].envKey} \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002` : `\u6B21\u306E\u8A2D\u5B9A\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059: ${keys}\u3002\`acomo login\` \u3092\u5B9F\u884C\u3059\u308B\u304B\u3001\u74B0\u5883\u5909\u6570 ${envVars} \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002`;
+    throw new Error(message);
   }
   const params = {
     basePath: config.baseUrl,
     accessToken: config.accessToken,
     apiKey: config.tenantId
   };
-  if (options?.accept === "text/plain") {
-    params.headers = { Accept: "text/plain" };
-  }
   return new Configuration(params);
 }
 function extractApiClasses() {
@@ -12221,7 +12216,7 @@ function buildOperationRegistry(config) {
 }
 
 // src/commands/login.ts
-var readline = __toESM(require("readline"));
+import * as readline from "readline";
 function command2() {
   return "login";
 }
@@ -12229,125 +12224,80 @@ function describe() {
   return "acomo \u306B\u30ED\u30B0\u30A4\u30F3\u3057\u307E\u3059";
 }
 var helpOptions = [
-  { name: "url", type: "string", description: `Base URL (env: ${ENV_KEYS.baseUrl})` },
-  { name: "tenant-id", type: "string", description: `Tenant ID (env: ${ENV_KEYS.tenantId})` },
-  { name: "token", type: "string", description: `\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3\uFF08\u76F4\u63A5\u6307\u5B9A\u3059\u308B\u5834\u5408\uFF09 (env: ${ENV_KEYS.accessToken})` },
-  { name: "email", type: "string", description: `\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9 (env: ${ENV_KEYS.email})` },
-  { name: "password", type: "string", description: "\u30D1\u30B9\u30EF\u30FC\u30C9" }
+  { name: "base-url", type: "string", description: `baseUrl (env: ${ENV_KEYS.baseUrl})` },
+  { name: "tenant-id", type: "string", description: `tenantId (env: ${ENV_KEYS.tenantId})` },
+  { name: "access-token", type: "string", description: `accessToken (env: ${ENV_KEYS.accessToken})` }
 ];
 function builder(yargs) {
-  return yargs.option("url", {
+  return yargs.option("base-url", {
     type: "string",
-    description: `Base URL (env: ${ENV_KEYS.baseUrl})`,
-    default: process.env[ENV_KEYS.baseUrl] || "https://acomo.app"
+    description: `baseUrl (env: ${ENV_KEYS.baseUrl})`
   }).option("tenant-id", {
     type: "string",
-    description: `Tenant ID (env: ${ENV_KEYS.tenantId})`,
+    description: `tenantId (env: ${ENV_KEYS.tenantId})`,
     default: process.env[ENV_KEYS.tenantId]
-  }).option("token", {
+  }).option("access-token", {
     type: "string",
-    description: `\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3\uFF08\u76F4\u63A5\u6307\u5B9A\u3059\u308B\u5834\u5408\uFF09 (env: ${ENV_KEYS.accessToken})`,
+    description: `accessToken (env: ${ENV_KEYS.accessToken})`,
     default: process.env[ENV_KEYS.accessToken]
-  }).option("email", {
-    type: "string",
-    description: `\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9 (env: ${ENV_KEYS.email})`,
-    default: process.env[ENV_KEYS.email]
-  }).option("password", {
-    type: "string",
-    description: "\u30D1\u30B9\u30EF\u30FC\u30C9"
   });
 }
-async function promptInput(question, hidden = false) {
+async function promptInput(question, defaultValue, displayDefault) {
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   });
+  const shown = displayDefault !== void 0 ? displayDefault : defaultValue;
+  const prompt = shown !== void 0 && shown !== "" ? `${question} [${shown}]: ` : `${question}: `;
   return new Promise((resolve6) => {
-    if (hidden) {
-      const stdin = process.stdin;
-      if (stdin.setRawMode) stdin.setRawMode(true);
-      process.stdout.write(question);
-      let password = "";
-      stdin.on("data", (char) => {
-        const c = char.toString();
-        if (c === "\n" || c === "\r" || c === "") {
-          stdin.pause();
-          if (stdin.setRawMode) stdin.setRawMode(false);
-          process.stdout.write("\n");
-          rl.close();
-          resolve6(password);
-        } else if (c === "") {
-          process.exit(130);
-        } else if (c === "\x7F") {
-          if (password.length > 0) {
-            password = password.slice(0, -1);
-            process.stdout.write("\b \b");
-          }
-        } else {
-          password += c;
-          process.stdout.write("*");
-        }
-      });
-    } else {
-      rl.question(question, (answer) => {
-        rl.close();
-        resolve6(answer);
-      });
-    }
+    rl.question(prompt, (answer) => {
+      rl.close();
+      const trimmed = answer.trim();
+      resolve6(trimmed !== "" ? trimmed : defaultValue ?? "");
+    });
   });
 }
+function maskAccessToken(token) {
+  return token && token.length > 10 ? `${token.slice(0, 10)}...` : token;
+}
 async function handler(argv) {
   try {
-    const url = argv.url || "https://acomo.app";
-    const tenantId = argv.tenantId;
+    const existing = loadConfig();
+    const defaultBaseUrl = argv.baseUrl ?? existing?.baseUrl ?? process.env[ENV_KEYS.baseUrl] ?? DEFAULT_BASE_URL;
+    const defaultTenantId = argv.tenantId ?? existing?.tenantId ?? process.env[ENV_KEYS.tenantId] ?? "";
+    const defaultAccessToken = argv.accessToken ?? existing?.accessToken ?? process.env[ENV_KEYS.accessToken] ?? "";
+    let baseUrl;
+    let tenantId;
+    let accessToken;
+    if (process.stdin.isTTY) {
+      baseUrl = (await promptInput("baseUrl", defaultBaseUrl)).trim() || defaultBaseUrl;
+      tenantId = (await promptInput("tenantId", defaultTenantId)).trim();
+      accessToken = (await promptInput("accessToken", defaultAccessToken, maskAccessToken(defaultAccessToken))).trim();
+    } else {
+      baseUrl = defaultBaseUrl;
+      tenantId = defaultTenantId;
+      accessToken = defaultAccessToken;
+    }
     if (!tenantId) {
-      console.error(`Tenant ID \u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002--tenant-id \u30AA\u30D7\u30B7\u30E7\u30F3\u307E\u305F\u306F\u74B0\u5883\u5909\u6570 ${ENV_KEYS.tenantId} \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002`);
+      console.error(
+        `tenantId \u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002--tenant-id \u30AA\u30D7\u30B7\u30E7\u30F3\u307E\u305F\u306F\u74B0\u5883\u5909\u6570 ${ENV_KEYS.tenantId} \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+      );
       process.exit(1);
     }
-    if (argv.token) {
-      saveConfig({
-        baseUrl: url,
-        tenantId,
-        accessToken: argv.token,
-        email: argv.email
-      });
-      console.log("\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3057\u305F\u3002");
-      return;
-    }
-    let email = argv.email;
-    let password = argv.password;
-    if (!process.stdin.isTTY && (!email || !password)) {
+    if (!accessToken) {
       console.error(
-        `\u975E\u30A4\u30F3\u30BF\u30E9\u30AF\u30C6\u30A3\u30D6\u74B0\u5883\u3067\u306F --token, --email, --password \u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
-\u63A8\u5968: acomo login --tenant-id <id> --token <token>
+        `\u975E\u30A4\u30F3\u30BF\u30E9\u30AF\u30C6\u30A3\u30D6\u74B0\u5883\u3067\u306F --access-token \u3068 --tenant-id\uFF08\u307E\u305F\u306F\u74B0\u5883\u5909\u6570\uFF09\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
+acomo login --tenant-id <id> --access-token <accessToken>
 \u307E\u305F\u306F\u74B0\u5883\u5909\u6570 ${ENV_KEYS.accessToken}, ${ENV_KEYS.tenantId} \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
       );
       process.exit(1);
     }
-    if (!email) {
-      email = await promptInput("Email: ");
-    }
-    if (!password) {
-      password = await promptInput("Password: ", true);
-    }
-    const config = new Configuration({
-      basePath: url
-    });
-    const authApi = new AuthApi(config);
-    const response = await authApi.signInWithEmailAndPassword({
-      signInDto: {
-        authTenantId: tenantId,
-        email,
-        password
-      }
-    });
     saveConfig({
-      baseUrl: url,
+      baseUrl: baseUrl || DEFAULT_BASE_URL,
       tenantId,
-      accessToken: response.accessToken,
-      email
+      accessToken
     });
-    console.log("\u30ED\u30B0\u30A4\u30F3\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002");
+    console.log("\u30ED\u30B0\u30A4\u30F3\u60C5\u5831\u3092\u8A2D\u5B9A\u3057\u307E\u3057\u305F\u3002");
   } catch (error) {
     console.error("\u30ED\u30B0\u30A4\u30F3\u306B\u5931\u6557\u3057\u307E\u3057\u305F:", error.message);
     process.exit(1);
@@ -12384,7 +12334,7 @@ function describe3() {
 }
 var helpPositionals = [
   { name: "subcommand", type: "string", required: true, description: "show | set" },
-  { name: "key", type: "string", required: false, description: "\u8A2D\u5B9A\u30AD\u30FC (baseUrl, tenantId, accessToken, email)\uFF08set \u6642\uFF09" },
+  { name: "key", type: "string", required: false, description: "\u8A2D\u5B9A\u30AD\u30FC (baseUrl, tenantId, accessToken)\uFF08set \u6642\uFF09" },
   { name: "value", type: "string", required: false, description: "\u8A2D\u5B9A\u5024\uFF08set \u6642\uFF09" }
 ];
 var helpOptions3 = [];
@@ -12401,7 +12351,7 @@ function builder3(yargs) {
     "\u8A2D\u5B9A\u3092\u66F4\u65B0",
     (y) => y.positional("key", {
       type: "string",
-      description: "\u8A2D\u5B9A\u30AD\u30FC (baseUrl, tenantId, accessToken, email)"
+      description: "\u8A2D\u5B9A\u30AD\u30FC (baseUrl, tenantId, accessToken)"
     }).positional("value", {
       type: "string",
       description: "\u8A2D\u5B9A\u5024"
@@ -12425,6 +12375,11 @@ async function showHandler(argv) {
       accessToken: config.accessToken ? `${config.accessToken.slice(0, 10)}...` : ""
     };
     console.log(JSON.stringify(masked, null, 2));
+    if (!config.baseUrl || config.baseUrl.trim() === "") {
+      console.error(
+        "baseUrl \u304C\u672A\u8A2D\u5B9A\u3067\u3059\u3002API \u547C\u3073\u51FA\u3057\u304C\u5931\u6557\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002`acomo login` \u3067\u8A2D\u5B9A\u3059\u308B\u304B\u3001\u74B0\u5883\u5909\u6570 ACOMO_BASE_URL \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      );
+    }
   } catch (error) {
     console.error("\u8A2D\u5B9A\u306E\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F:", error.message);
     process.exit(1);
@@ -12438,7 +12393,7 @@ async function setHandler(argv) {
       process.exit(1);
     }
     const { key, value } = argv;
-    const allowedKeys = ["baseUrl", "tenantId", "accessToken", "email"];
+    const allowedKeys = ["baseUrl", "tenantId", "accessToken"];
     if (!allowedKeys.includes(key)) {
       console.error(`\u7121\u52B9\u306A\u30AD\u30FC\u3067\u3059: ${key}`);
       console.error(`\u5229\u7528\u53EF\u80FD\u306A\u30AD\u30FC: ${allowedKeys.join(", ")}`);
@@ -13638,14 +13593,16 @@ function buildCommandHelp(params) {
 }
 
 // src/index.ts
-var import_meta2 = {};
-var scriptDir = typeof __dirname !== "undefined" ? __dirname : (0, import_path6.dirname)((0, import_url2.fileURLToPath)(import_meta2.url));
+var scriptDir = dirname3(fileURLToPath2(import.meta.url));
 var GLOBAL_OPTIONS2 = [
-  { name: "format", type: "string", description: "\u51FA\u529B\u5F62\u5F0F\uFF08API \u306E Accept \u30D8\u30C3\u30C0\u30FC\uFF09\u3002\u30D1\u30A4\u30D7\u6642\u306F json \u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u3002", choices: ["text", "json"] },
   { name: "help", type: "boolean", description: "Show help" },
   { name: "version", type: "boolean", description: "Show version number" }
 ];
-var OPTIONS_WITH_VALUE = /* @__PURE__ */ new Set(["-f", "--format", "--url", "--tenant-id", "--token", "--email", "--password"]);
+var OPTIONS_WITH_VALUE = /* @__PURE__ */ new Set([
+  "--base-url",
+  "--tenant-id",
+  "--access-token"
+]);
 function getHelpRequestedCommand(argv) {
   const args = argv.slice(2);
   let helpRequested = false;
@@ -13677,15 +13634,6 @@ var EXIT_CODES = {
   VALIDATION: 3,
   NOT_FOUND: 4
 };
-function isJsonOutput() {
-  const args = process.argv;
-  const fIdx = args.indexOf("--format");
-  const fAliasIdx = args.indexOf("-f");
-  if (fIdx !== -1 && args[fIdx + 1] === "json") return true;
-  if (fAliasIdx !== -1 && args[fAliasIdx + 1] === "json") return true;
-  if (!process.stdout.isTTY && fIdx === -1 && fAliasIdx === -1) return true;
-  return false;
-}
 async function resolveParams(positional) {
   if (positional) {
     try {
@@ -13715,7 +13663,8 @@ function placeholderForType(type) {
   if (type === "number" || type === "integer") return 0;
   if (type === "boolean") return false;
   if (type.includes("[]")) return [];
-  if (type === "object" || /[A-Z]/.test(type) || type.endsWith("Dto")) return {};
+  if (type === "object" || /[A-Z]/.test(type) || type.endsWith("Dto"))
+    return {};
   return "";
 }
 function buildExampleParams(params) {
@@ -13737,9 +13686,21 @@ function normalizeDescription(desc) {
 }
 function buildRootHelpDescriptor() {
   const commands = [
-    { name: command2(), kind: "builtin-command", summary: describe() },
-    { name: command3(), kind: "builtin-command", summary: describe2() },
-    { name: "config", kind: "builtin-command", summary: describe3() }
+    {
+      name: command2(),
+      kind: "builtin-command",
+      summary: describe()
+    },
+    {
+      name: command3(),
+      kind: "builtin-command",
+      summary: describe2()
+    },
+    {
+      name: "config",
+      kind: "builtin-command",
+      summary: describe3()
+    }
   ];
   const config = resolveConfig();
   if (config) {
@@ -13764,7 +13725,7 @@ function buildBuiltinHelpDescriptor(cmd) {
   if (cmd === command2()) {
     summary = describe();
     options = [...helpOptions, ...GLOBAL_OPTIONS2];
-    exampleCommand = "acomo login --tenant-id <id> --token <token>";
+    exampleCommand = "acomo login --tenant-id <tenantId> --access-token <accessToken>";
   } else if (cmd === command3()) {
     summary = describe2();
     options = [...helpOptions2, ...GLOBAL_OPTIONS2];
@@ -13818,14 +13779,21 @@ function buildApiCommandHelpDescriptor(operationId) {
       return entry;
     })
   } : null;
-  const minimalArgs = { ...buildExampleParams(paramInfo.params) };
+  const minimalArgs = {
+    ...buildExampleParams(paramInfo.params)
+  };
   if (paramInfo.requestBody) {
     const bodyExample = buildExampleBody(paramInfo.requestBody.properties);
     for (const [k, v] of Object.entries(bodyExample)) minimalArgs[k] = v;
   }
   const exampleCommand = `acomo ${operationId} '${JSON.stringify(minimalArgs)}'`;
   const positionals = [
-    { name: "params", type: "object", required: false, description: "JSON \u30D1\u30E9\u30E1\u30FC\u30BF" }
+    {
+      name: "params",
+      type: "object",
+      required: false,
+      description: "JSON \u30D1\u30E9\u30E1\u30FC\u30BF"
+    }
   ];
   return buildCommandHelp({
     command: operationId,
@@ -13845,52 +13813,58 @@ function buildApiCommandHelpDescriptor(operationId) {
     exampleCommand
   });
 }
-function handleError(error) {
-  const jsonMode = isJsonOutput();
+async function handleError(error) {
+  const jsonMode = !process.stdout.isTTY;
   if (error.name === "ResponseError") {
     const status = error.response?.status || 0;
     const exitCode = status === 401 || status === 403 ? EXIT_CODES.AUTH : status === 404 ? EXIT_CODES.NOT_FOUND : EXIT_CODES.GENERAL;
     if (error.response) {
-      const contentType = error.response.headers?.get?.("content-type") ?? "";
-      const bodyPromise = contentType.includes("text/plain") ? error.response.text().then((t) => ({ message: t })) : error.response.json().catch(() => ({ message: error.message }));
-      bodyPromise.then((body) => {
-        if (jsonMode) {
-          const errObj = {
-            error: true,
-            code: status === 401 ? "AUTH_REQUIRED" : status === 403 ? "FORBIDDEN" : status === 404 ? "NOT_FOUND" : "API_ERROR",
-            status,
-            message: body.message ?? error.message,
-            ...status === 401 ? { suggestion: "`acomo login` \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002" } : {}
-          };
-          console.error(JSON.stringify(errObj));
-        } else {
-          console.error(`API \u30A8\u30E9\u30FC (${status})`);
-          console.error(
-            typeof body === "string" ? body : JSON.stringify(body, null, 2)
-          );
-          if (status === 401) {
-            console.error("\n`acomo login` \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
-          }
-        }
-      }).catch(() => {
-        if (jsonMode) {
-          console.error(
-            JSON.stringify({
-              error: true,
-              code: "API_ERROR",
-              status,
-              message: error.message
-            })
-          );
-        } else {
-          console.error(error.message);
+      let body;
+      try {
+        body = await error.response.json();
+      } catch {
+        body = { message: error.message };
+      }
+      if (jsonMode) {
+        const errObj = {
+          error: true,
+          code: status === 401 ? "AUTH_REQUIRED" : status === 403 ? "FORBIDDEN" : status === 404 ? "NOT_FOUND" : "API_ERROR",
+          status,
+          message: body.message ?? error.message,
+          ...status === 401 ? { suggestion: "`acomo login` \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002" } : {}
+        };
+        console.error(JSON.stringify(errObj));
+      } else {
+        console.error(`API \u30A8\u30E9\u30FC (${status})`);
+        console.error(
+          typeof body === "string" ? body : JSON.stringify(body, null, 2)
+        );
+        if (status === 401) {
+          console.error("\n`acomo login` \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
         }
-      }).finally(() => {
-        process.exit(exitCode);
-      });
-      return process.exit(exitCode);
+      }
+      process.exit(exitCode);
     }
   }
+  if (error.name === "FetchError") {
+    const message = "\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002baseUrl\uFF08ACOMO_BASE_URL\uFF09\u3068\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002";
+    if (jsonMode) {
+      console.error(
+        JSON.stringify({
+          error: true,
+          code: "CONNECTION_ERROR",
+          message,
+          suggestion: "`acomo login` \u3067 baseUrl \u3092\u8A2D\u5B9A\u3059\u308B\u304B\u3001\u74B0\u5883\u5909\u6570 ACOMO_BASE_URL \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+        })
+      );
+    } else {
+      console.error(message);
+      console.error(
+        "\n`acomo login` \u3067 baseUrl \u3092\u8A2D\u5B9A\u3059\u308B\u304B\u3001\u74B0\u5883\u5909\u6570 ACOMO_BASE_URL \u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+      );
+    }
+    process.exit(EXIT_CODES.GENERAL);
+  }
   if (error.name === "RequiredError") {
     if (jsonMode) {
       console.error(
@@ -13953,15 +13927,9 @@ async function main() {
     process.exit(0);
   }
   const pkg = JSON.parse(
-    (0, import_fs6.readFileSync)((0, import_path6.resolve)(scriptDir, "../package.json"), "utf-8")
+    readFileSync4(resolve5(scriptDir, "../package.json"), "utf-8")
   );
-  const argv = yargs_default(hideBin(process.argv)).scriptName("acomo").usage("Usage: $0 <command> [options]").option("format", {
-    alias: "f",
-    type: "string",
-    description: "\u51FA\u529B\u5F62\u5F0F\uFF08API \u306E Accept \u30D8\u30C3\u30C0\u30FC\uFF09\u3002\u30D1\u30A4\u30D7\u6642\u306F json \u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u3002",
-    choices: ["text", "json"],
-    default: process.stdout.isTTY ? "text" : "json"
-  }).help().alias("h", "help").version(pkg.version).alias("v", "version");
+  const argv = yargs_default(hideBin(process.argv)).scriptName("acomo").usage("Usage: $0 <command> [options]").help().alias("h", "help").version(pkg.version).alias("v", "version");
   argv.command(
     command2(),
     describe(),
@@ -13999,18 +13967,27 @@ async function main() {
           },
           async (cmdArgv) => {
             try {
-              const params = await resolveParams(cmdArgv.params);
+              const params = await resolveParams(
+                cmdArgv.params
+              );
               const entry = registry.get(operationId);
-              const format3 = cmdArgv.format ?? "text";
-              const apiConfig = createConfiguration(
-                format3 === "text" ? { accept: "text/plain" } : void 0
+              const apiConfig = createConfiguration();
+              const instance = new entry.instance.constructor(
+                apiConfig
               );
-              const instance = new entry.instance.constructor(apiConfig);
-              const rawResponse = await instance[entry.method + "Raw"](params ?? {});
+              const rawResponse = await instance[entry.method + "Raw"](
+                params ?? {}
+              );
+              if (!rawResponse.raw.ok) {
+                throw new ResponseError(
+                  rawResponse.raw,
+                  "Response returned an error code"
+                );
+              }
               const text = await rawResponse.raw.text();
               process.stdout.write(text + "\n");
             } catch (error) {
-              handleError(error);
+              await handleError(error);
             }
           }
         );
@@ -14020,8 +13997,8 @@ async function main() {
   }
   argv.demandCommand(1, "\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002").strict().parse();
 }
-main().catch((error) => {
-  handleError(error);
+main().catch(async (error) => {
+  await handleError(error);
 });
 /*! Bundled license information: