fastclaw-cli 0.1.0 → 0.2.1

package/dist/index.js

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
 
 // src/index.ts
+import { readFileSync as readFileSync3 } from "fs";
+import { fileURLToPath } from "url";
+import { dirname, join as join2 } from "path";
 import { Command } from "commander";
 
 // src/commands/config-cmd.ts
@@ -534,8 +537,8 @@ function registerAppsCommand(admin) {
       }
     })
   );
-  apps.command("list").description("List all apps").action(
-    withErrorHandler(async () => {
+  apps.command("list").description("List all apps").option("-t, --show-token", "Show full API token (masked by default)").action(
+    withErrorHandler(async (cmdOpts) => {
       const { client, cfg } = getClient(apps);
       const list = await client.listApps();
       if (cfg.json) {
@@ -543,9 +546,16 @@ function registerAppsCommand(admin) {
       } else if (list.length === 0) {
         console.log(chalk4.dim("No apps found."));
       } else {
+        const maskToken2 = (token) => token.length > 8 ? token.slice(0, 4) + "****" + token.slice(-4) : "****";
         printTable(
-          ["ID", "Name", "Status", "Created"],
-          list.map((a) => [a.id, a.name, a.status, a.created_at])
+          ["ID", "Name", "Token", "Status", "Created"],
+          list.map((a) => [
+            a.id,
+            a.name,
+            cmdOpts.showToken ? a.api_token : maskToken2(a.api_token),
+            a.status,
+            a.created_at
+          ])
         );
       }
     })
@@ -583,12 +593,50 @@ function registerAdminCommand(program2) {
 
 // src/commands/bot/crud.ts
 import chalk5 from "chalk";
-function getClient2(bot) {
-  const opts = { ...bot.parent.opts(), ...bot.opts() };
+
+// src/commands/bot/resolve.ts
+function getClient2(cmd) {
+  const opts = { ...cmd.parent.opts(), ...cmd.opts() };
   const cfg = resolveConfig(opts);
   requireOption(cfg.appToken, "app-token");
   return { client: new FastClawClient({ url: cfg.url, appToken: cfg.appToken }), cfg };
 }
+function getAdminClient(cmd) {
+  const opts = { ...cmd.parent.opts(), ...cmd.opts() };
+  const cfg = resolveConfig(opts);
+  requireOption(cfg.adminToken, "admin-token");
+  return { client: new FastClawClient({ url: cfg.url, adminToken: cfg.adminToken }), cfg };
+}
+async function resolveClientForBot(cmd, botId) {
+  const opts = { ...cmd.parent.opts(), ...cmd.opts() };
+  const cfg = resolveConfig(opts);
+  if (cfg.appToken) {
+    try {
+      const client = new FastClawClient({ url: cfg.url, appToken: cfg.appToken });
+      await client.getBot(botId);
+      return { client, cfg };
+    } catch {
+    }
+  }
+  if (cfg.adminToken) {
+    const adminClient = new FastClawClient({ url: cfg.url, adminToken: cfg.adminToken });
+    const apps = await adminClient.listApps();
+    for (const app of apps) {
+      try {
+        const appClient = new FastClawClient({ url: cfg.url, appToken: app.api_token });
+        await appClient.getBot(botId);
+        return { client: appClient, cfg };
+      } catch {
+        continue;
+      }
+    }
+  }
+  throw new Error(
+    `Bot ${botId} not found. Ensure the correct --app-token is set, or provide --admin-token for cross-app lookup.`
+  );
+}
+
+// src/commands/bot/crud.ts
 function registerBotCrudCommands(bot) {
   bot.command("create").description("Create a new bot").requiredOption("-n, --name <name>", "Bot name").option("--slug <slug>", "URL slug").option("--user-id <userId>", "User ID").option("--expires-at <date>", "Expiration date (ISO-8601)").action(
     withErrorHandler(async (cmdOpts) => {
@@ -615,26 +663,70 @@ function registerBotCrudCommands(bot) {
       }
     })
   );
-  bot.command("list").description("List bots").option("--user-id <userId>", "User ID").action(
+  bot.command("list").description("List bots").option("--user-id <userId>", "User ID").option("-A, --all", "List bots across all apps (requires admin token)").action(
     withErrorHandler(async (cmdOpts) => {
-      const { client, cfg } = getClient2(bot);
-      const userId = cmdOpts.userId || cfg.userId;
-      const list = await client.listBots(userId);
-      if (cfg.json) {
-        printJson(list);
-      } else if (list.length === 0) {
-        console.log(chalk5.dim("No bots found."));
+      if (cmdOpts.all) {
+        const { client: adminClient, cfg } = getAdminClient(bot);
+        const userId = cmdOpts.userId || cfg.userId;
+        const apps = await adminClient.listApps();
+        const allBots = [];
+        for (const app of apps) {
+          const appClient = new FastClawClient({ url: cfg.url, appToken: app.api_token });
+          try {
+            const bots = await appClient.listBots(userId);
+            for (const b of bots) {
+              let ready = "-";
+              if (b.status === "running") {
+                try {
+                  const s = await appClient.getBotStatus(b.id);
+                  ready = s.ready ? "yes" : "no";
+                } catch {
+                }
+              }
+              allBots.push({ app_name: app.name, bot: b, ready });
+            }
+          } catch {
+          }
+        }
+        if (cfg.json) {
+          printJson(allBots.map((x) => ({ ...x.bot, app_name: x.app_name, ready: x.ready })));
+        } else if (allBots.length === 0) {
+          console.log(chalk5.dim("No bots found."));
+        } else {
+          printTable(
+            ["App", "ID", "Name", "Slug", "Status", "Ready", "Created"],
+            allBots.map((x) => [x.app_name, x.bot.id, x.bot.name, x.bot.slug, x.bot.status, x.ready, x.bot.created_at])
+          );
+        }
       } else {
-        printTable(
-          ["ID", "Name", "Slug", "Status", "Created"],
-          list.map((b) => [b.id, b.name, b.slug, b.status, b.created_at])
-        );
+        const { client, cfg } = getClient2(bot);
+        const userId = cmdOpts.userId || cfg.userId;
+        const list = await client.listBots(userId);
+        if (cfg.json) {
+          printJson(list);
+        } else if (list.length === 0) {
+          console.log(chalk5.dim("No bots found."));
+        } else {
+          const rows = [];
+          for (const b of list) {
+            let ready = "-";
+            if (b.status === "running") {
+              try {
+                const s = await client.getBotStatus(b.id);
+                ready = s.ready ? "yes" : "no";
+              } catch {
+              }
+            }
+            rows.push([b.id, b.name, b.slug, b.status, ready, b.created_at]);
+          }
+          printTable(["ID", "Name", "Slug", "Status", "Ready", "Created"], rows);
+        }
       }
     })
   );
   bot.command("get <id>").description("Get bot details").action(
     withErrorHandler(async (id) => {
-      const { client, cfg } = getClient2(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       const b = await client.getBot(id);
       if (cfg.json) {
         printJson(b);
@@ -658,7 +750,7 @@ function registerBotCrudCommands(bot) {
   );
   bot.command("update <id>").description("Update a bot").option("-n, --name <name>", "New name").option("--slug <slug>", "New slug").option("--expires-at <date>", "New expiration date").action(
     withErrorHandler(async (id, cmdOpts) => {
-      const { client, cfg } = getClient2(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       const result = await client.updateBot(id, {
         name: cmdOpts.name,
         slug: cmdOpts.slug,
@@ -673,7 +765,7 @@ function registerBotCrudCommands(bot) {
   );
   bot.command("delete <id>").description("Delete a bot").action(
     withErrorHandler(async (id) => {
-      const { client, cfg } = getClient2(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       const res = await client.deleteBot(id);
       if (cfg.json) {
         printJson(res);
@@ -686,12 +778,6 @@ function registerBotCrudCommands(bot) {
 
 // src/commands/bot/lifecycle.ts
 import chalk6 from "chalk";
-function getClient3(bot) {
-  const opts = { ...bot.parent.opts(), ...bot.opts() };
-  const cfg = resolveConfig(opts);
-  requireOption(cfg.appToken, "app-token");
-  return { client: new FastClawClient({ url: cfg.url, appToken: cfg.appToken }), cfg };
-}
 function buildBotUrls(baseUrl, slug, accessToken) {
   const { hostname } = new URL(baseUrl);
   const webchatUrl = `https://${slug}.${hostname}#token=${accessToken}`;
@@ -701,7 +787,7 @@ function buildBotUrls(baseUrl, slug, accessToken) {
 function registerBotLifecycleCommands(bot) {
   bot.command("start <id>").description("Start a bot").option("--wait", "Wait until bot is ready", true).action(
     withErrorHandler(async (id, cmdOpts) => {
-      const { client, cfg } = getClient3(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       await client.startBot(id);
       if (cmdOpts.wait) {
         const spinner = startSpinner("Waiting for bot to be ready...");
@@ -722,7 +808,7 @@ function registerBotLifecycleCommands(bot) {
   );
   bot.command("stop <id>").description("Stop a bot").action(
     withErrorHandler(async (id) => {
-      const { client, cfg } = getClient3(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       const res = await client.stopBot(id);
       if (cfg.json) {
         printJson(res);
@@ -733,7 +819,7 @@ function registerBotLifecycleCommands(bot) {
   );
   bot.command("restart <id>").description("Restart a bot").action(
     withErrorHandler(async (id) => {
-      const { client, cfg } = getClient3(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       const res = await client.restartBot(id);
       if (cfg.json) {
         printJson(res);
@@ -744,7 +830,7 @@ function registerBotLifecycleCommands(bot) {
   );
   bot.command("status <id>").description("Get bot status").action(
     withErrorHandler(async (id) => {
-      const { client, cfg } = getClient3(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       const s = await client.getBotStatus(id);
       const urls = s.status === "running" && s.ready ? await client.getBot(id).then((b) => buildBotUrls(cfg.url, b.slug, b.access_token)) : null;
       if (cfg.json) {
@@ -772,7 +858,7 @@ function registerBotLifecycleCommands(bot) {
   );
   bot.command("connect <id>").description("Get bot connection info").action(
     withErrorHandler(async (id) => {
-      const { client, cfg } = getClient3(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       const [c, b] = await Promise.all([client.getBotConnect(id), client.getBot(id)]);
       const urls = buildBotUrls(cfg.url, b.slug, b.access_token);
       if (cfg.json) {
@@ -793,7 +879,7 @@ function registerBotLifecycleCommands(bot) {
   );
   bot.command("reset-token <id>").description("Reset bot access token").action(
     withErrorHandler(async (id) => {
-      const { client, cfg } = getClient3(bot);
+      const { client, cfg } = await resolveClientForBot(bot, id);
       const res = await client.resetBotToken(id);
       if (cfg.json) {
         printJson(res);
@@ -831,7 +917,7 @@ async function promptSelect(message, choices) {
 }
 
 // src/commands/model/provider.ts
-function getClient4(model) {
+function getClient3(model) {
   const opts = model.parent.opts();
   const cfg = resolveConfig(opts);
   requireOption(cfg.appToken, "app-token");
@@ -840,7 +926,7 @@ function getClient4(model) {
 function registerModelProviderCommands(model) {
   model.command("add <bot-id>").description("Add a model provider (interactive or preset)").option("-p, --provider <name>", "Provider name or preset (google/anthropic/openai)").option("-k, --api-key <key>", "API key").action(
     withErrorHandler(async (botId, cmdOpts) => {
-      const { client, cfg } = getClient4(model);
+      const { client, cfg } = getClient3(model);
       let providerName = cmdOpts.provider;
       let apiKey = cmdOpts.apiKey;
       if (!providerName) {
@@ -883,7 +969,7 @@ function registerModelProviderCommands(model) {
   );
   model.command("list <bot-id>").description("List model providers").action(
     withErrorHandler(async (botId) => {
-      const { client, cfg } = getClient4(model);
+      const { client, cfg } = getClient3(model);
       const providers = await client.listProviders(botId);
       if (cfg.json) {
         printJson(providers);
@@ -901,7 +987,7 @@ function registerModelProviderCommands(model) {
   );
   model.command("get <bot-id> <provider>").description("Get provider details").action(
     withErrorHandler(async (botId, provider) => {
-      const { client, cfg } = getClient4(model);
+      const { client, cfg } = getClient3(model);
       const p = await client.getProvider(botId, provider);
       if (cfg.json) {
         printJson(p);
@@ -917,7 +1003,7 @@ function registerModelProviderCommands(model) {
   );
   model.command("delete <bot-id> <provider>").description("Delete a model provider").action(
     withErrorHandler(async (botId, provider) => {
-      const { client, cfg } = getClient4(model);
+      const { client, cfg } = getClient3(model);
       await client.deleteProvider(botId, provider);
       if (cfg.json) {
         printJson({ message: "deleted" });
@@ -929,7 +1015,7 @@ function registerModelProviderCommands(model) {
   const defaults = model.command("defaults").description("Manage default model settings");
   defaults.command("get <bot-id>").description("Get default model settings").action(
     withErrorHandler(async (botId) => {
-      const { client, cfg } = getClient4(model);
+      const { client, cfg } = getClient3(model);
       const d = await client.getDefaults(botId);
       if (cfg.json) {
         printJson(d);
@@ -943,7 +1029,7 @@ function registerModelProviderCommands(model) {
   );
   defaults.command("set <bot-id>").description("Set default model").option("--primary <model>", "Primary model (provider/model_id)").option("--fallback <model>", "Fallback model").action(
     withErrorHandler(async (botId, cmdOpts) => {
-      const { client, cfg } = getClient4(model);
+      const { client, cfg } = getClient3(model);
       const body = {};
       if (cmdOpts.primary) body.primary_model = cmdOpts.primary;
       if (cmdOpts.fallback) body.fallback_model = cmdOpts.fallback;
@@ -969,7 +1055,7 @@ function registerModelCommand(program2) {
 
 // src/commands/channel/crud.ts
 import chalk8 from "chalk";
-function getClient5(parent) {
+function getClient4(parent) {
   const opts = parent.parent.opts();
   const cfg = resolveConfig(opts);
   requireOption(cfg.appToken, "app-token");
@@ -978,7 +1064,7 @@ function getClient5(parent) {
 function registerChannelCrudCommands(channel) {
   channel.command("add <bot-id>").description("Add an IM channel").option("-c, --channel <type>", "Channel type (feishu/telegram/slack/discord)").option("--account <name>", "Account name", "default").option("--dm-policy <policy>", "DM policy (open/pairing/allowlist/disabled)").option("--group-policy <policy>", "Group policy (open/allowlist/disabled)").action(
     withErrorHandler(async (botId, cmdOpts) => {
-      const { client, cfg } = getClient5(channel);
+      const { client, cfg } = getClient4(channel);
       let channelType = cmdOpts.channel;
       if (!channelType) {
         channelType = await promptSelect("Channel type:", [
@@ -1019,7 +1105,7 @@ function registerChannelCrudCommands(channel) {
   );
   channel.command("list <bot-id>").description("List channels").action(
     withErrorHandler(async (botId) => {
-      const { client, cfg } = getClient5(channel);
+      const { client, cfg } = getClient4(channel);
       const channels = await client.listChannels(botId);
       if (cfg.json) {
         printJson(channels);
@@ -1038,7 +1124,7 @@ function registerChannelCrudCommands(channel) {
   );
   channel.command("remove <bot-id> <channel>").description("Remove a channel").option("--account <name>", "Specific account to remove").action(
     withErrorHandler(async (botId, ch, cmdOpts) => {
-      const { client, cfg } = getClient5(channel);
+      const { client, cfg } = getClient4(channel);
       const result = await client.removeChannel(botId, ch, cmdOpts.account);
       if (cfg.json) {
         printJson(result);
@@ -1050,7 +1136,7 @@ function registerChannelCrudCommands(channel) {
 }
 
 // src/commands/channel/pairing.ts
-function getClient6(parent) {
+function getClient5(parent) {
   const root = parent.parent.parent;
   const opts = root.opts();
   const cfg = resolveConfig(opts);
@@ -1061,7 +1147,7 @@ function registerPairingCommands(channel) {
   const pairing = channel.command("pairing").description("Manage channel pairing");
   pairing.command("list <bot-id> <channel>").description("List pairing requests").action(
     withErrorHandler(async (botId, ch) => {
-      const { client, cfg } = getClient6(pairing);
+      const { client, cfg } = getClient5(pairing);
       const list = await client.listPairing(botId, ch);
       if (cfg.json) {
         printJson(list);
@@ -1072,7 +1158,7 @@ function registerPairingCommands(channel) {
   );
   pairing.command("approve <bot-id> <channel>").description("Approve a pairing request").requiredOption("--code <code>", "Pairing code").action(
     withErrorHandler(async (botId, ch, cmdOpts) => {
-      const { client, cfg } = getClient6(pairing);
+      const { client, cfg } = getClient5(pairing);
       const result = await client.approvePairing(botId, ch, { code: cmdOpts.code });
       if (cfg.json) {
         printJson(result);
@@ -1083,7 +1169,7 @@ function registerPairingCommands(channel) {
   );
   pairing.command("revoke <bot-id> <channel>").description("Revoke a user's pairing").requiredOption("--user-id <userId>", "User ID to revoke").action(
     withErrorHandler(async (botId, ch, cmdOpts) => {
-      const { client, cfg } = getClient6(pairing);
+      const { client, cfg } = getClient5(pairing);
       const result = await client.revokePairing(botId, ch, { user_id: cmdOpts.userId });
       if (cfg.json) {
         printJson(result);
@@ -1094,7 +1180,7 @@ function registerPairingCommands(channel) {
   );
   pairing.command("users <bot-id> <channel>").description("List paired users").action(
     withErrorHandler(async (botId, ch) => {
-      const { client, cfg } = getClient6(pairing);
+      const { client, cfg } = getClient5(pairing);
       const result = await client.listPairedUsers(botId, ch);
       if (cfg.json) {
         printJson(result);
@@ -1114,7 +1200,7 @@ function registerChannelCommand(program2) {
 
 // src/commands/device/crud.ts
 import chalk9 from "chalk";
-function getClient7(device) {
+function getClient6(device) {
   const opts = device.parent.opts();
   const cfg = resolveConfig(opts);
   requireOption(cfg.appToken, "app-token");
@@ -1123,7 +1209,7 @@ function getClient7(device) {
 function registerDeviceCrudCommands(device) {
   device.command("list <bot-id>").description("List devices").option("--status <status>", "Filter by status (pending/paired)").option("--client-mode <mode>", "Filter by client mode (web/cli/desktop)").action(
     withErrorHandler(async (botId, cmdOpts) => {
-      const { client, cfg } = getClient7(device);
+      const { client, cfg } = getClient6(device);
       const result = await client.listDevices(botId, {
         status: cmdOpts.status,
         client_mode: cmdOpts.clientMode
@@ -1150,7 +1236,7 @@ function registerDeviceCrudCommands(device) {
   );
   device.command("approve <bot-id> <request-id>").description("Approve a device pairing request").action(
     withErrorHandler(async (botId, requestId) => {
-      const { client, cfg } = getClient7(device);
+      const { client, cfg } = getClient6(device);
       const result = await client.approveDevice(botId, requestId);
       if (cfg.json) {
         printJson(result);
@@ -1161,7 +1247,7 @@ function registerDeviceCrudCommands(device) {
   );
   device.command("revoke <bot-id> <device-id>").description("Revoke a paired device").option("--role <role>", "Role to revoke", "operator").action(
     withErrorHandler(async (botId, deviceId, cmdOpts) => {
-      const { client, cfg } = getClient7(device);
+      const { client, cfg } = getClient6(device);
       const result = await client.revokeDevice(botId, deviceId, cmdOpts.role);
       if (cfg.json) {
         printJson(result);
@@ -1181,7 +1267,7 @@ function registerDeviceCommand(program2) {
 // src/commands/skill/crud.ts
 import { readFileSync as readFileSync2 } from "fs";
 import chalk10 from "chalk";
-function getClient8(skill) {
+function getClient7(skill) {
   const opts = skill.parent.opts();
   const cfg = resolveConfig(opts);
   requireOption(cfg.appToken, "app-token");
@@ -1190,7 +1276,7 @@ function getClient8(skill) {
 function registerSkillCrudCommands(skill) {
   skill.command("list <bot-id>").description("List skills").action(
     withErrorHandler(async (botId) => {
-      const { client, cfg } = getClient8(skill);
+      const { client, cfg } = getClient7(skill);
       const list = await client.listSkills(botId);
       if (cfg.json) {
         printJson(list);
@@ -1203,7 +1289,7 @@ function registerSkillCrudCommands(skill) {
   );
   skill.command("set <bot-id> <name>").description("Create or update a skill").option("-c, --content <content>", "Skill content (markdown)").option("-f, --file <path>", "Read content from file").action(
     withErrorHandler(async (botId, name, cmdOpts) => {
-      const { client, cfg } = getClient8(skill);
+      const { client, cfg } = getClient7(skill);
       let content;
       if (cmdOpts.file) {
         content = readFileSync2(cmdOpts.file, "utf-8");
@@ -1222,7 +1308,7 @@ function registerSkillCrudCommands(skill) {
   );
   skill.command("delete <bot-id> <name>").description("Delete a skill").action(
     withErrorHandler(async (botId, name) => {
-      const { client, cfg } = getClient8(skill);
+      const { client, cfg } = getClient7(skill);
       const result = await client.deleteSkill(botId, name);
       if (cfg.json) {
         printJson(result);
@@ -1401,7 +1487,9 @@ function registerSetupCommand(program2) {
 }
 
 // src/index.ts
-var program = new Command().name("fastclaw").description("CLI for managing FastClaw bots").version("0.1.0").option("--url <url>", "FastClaw server URL").option("--admin-token <token>", "Admin API token").option("--app-token <token>", "App API token").option("--json", "Output as JSON");
+var __dirname = dirname(fileURLToPath(import.meta.url));
+var pkg = JSON.parse(readFileSync3(join2(__dirname, "..", "package.json"), "utf-8"));
+var program = new Command().name("fastclaw").description("CLI for managing FastClaw bots").version(pkg.version).option("--url <url>", "FastClaw server URL").option("--admin-token <token>", "Admin API token").option("--app-token <token>", "App API token").option("--json", "Output as JSON");
 registerSetupCommand(program);
 registerConfigCommand(program);
 registerAdminCommand(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastclaw-cli",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "CLI and SDK for managing FastClaw bots",
   "type": "module",
   "main": "dist/sdk.js",