chirpie 1.0.27 → 1.0.29

package/dist/index.js

@@ -279,7 +279,15 @@ var threadCommand = new Command4("thread").description("Create a thread").argume
 
 // src/commands/posts.ts
 import { Command as Command5 } from "commander";
-var postsCommand = new Command5("posts").description("List, get, or delete posts").option("--status <status>", "Filter by status").option("--account <id>", "Filter by account").option("--limit <n>", "Limit results", "20").option("--json", "Output raw JSON").action(async (opts) => {
+
+// src/lib/flags.ts
+function wantsJson(opts, cmd) {
+  if (opts?.json) return true;
+  return Boolean(cmd?.optsWithGlobals?.().json);
+}
+
+// src/commands/posts.ts
+var postsCommand = new Command5("posts").description("List, get, or delete posts").option("--status <status>", "Filter by status").option("--account <id>", "Filter by account").option("--limit <n>", "Limit results", "20").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const posts = await client.listPosts({
@@ -287,7 +295,7 @@ var postsCommand = new Command5("posts").description("List, get, or delete posts
       account_id: opts.account,
       limit: parseInt(opts.limit)
     });
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(posts);
     } else {
       table(
@@ -304,11 +312,11 @@ var postsCommand = new Command5("posts").description("List, get, or delete posts
     process.exit(1);
   }
 });
-postsCommand.command("get <id>").description("Get a post by ID").option("--json", "Output raw JSON").action(async (id, opts) => {
+postsCommand.command("get <id>").description("Get a post by ID").option("--json", "Output raw JSON").action(async (id, opts, cmd) => {
   const client = getClient();
   try {
     const post = await client.getPost(id);
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(post);
     } else {
       console.log(`ID:        ${post.id}`);
@@ -326,12 +334,14 @@ postsCommand.command("get <id>").description("Get a post by ID").option("--json"
 });
 postsCommand.command("delete <id>").description(
   "Delete a post (deleting any post of a scheduled thread cancels the thread)"
-).action(async (id) => {
+).option("--json", "Output raw JSON").action(async (id, opts, cmd) => {
   const client = getClient();
   try {
     const result = await client.deletePost(id);
     const cancelled = result.cancelled_ids ?? [];
-    if (cancelled.length > 1) {
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else if (cancelled.length > 1) {
       success(
         `Scheduled thread canceled (${cancelled.length} posts): ${cancelled.join(", ")}`
       );
@@ -394,12 +404,12 @@ async function readSecretFromStdin(prompt) {
     stdin.on("data", onData);
   });
 }
-var accountsCommand = new Command6("accounts").description("List connected social accounts (X, Bluesky, LinkedIn, Threads, Mastodon, Instagram, Facebook, Telegram, Pinterest, TikTok, YouTube, and Google Business Profile)").option("--json", "Output raw JSON").action(async (opts) => {
+var accountsCommand = new Command6("accounts").description("List connected social accounts (X, Bluesky, LinkedIn, Threads, Mastodon, Instagram, Facebook, Telegram, Pinterest, TikTok, YouTube, and Google Business Profile)").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const list = await client.listAccountsWithLimits();
     const { accounts, accounts_limit, accounts_active } = list;
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(list);
     } else {
       info(
@@ -426,11 +436,11 @@ var accountsCommand = new Command6("accounts").description("List connected socia
     process.exit(1);
   }
 });
-accountsCommand.command("activate").argument("<id>", "Account ID (from `chirpie accounts`)").description("Activate a connected account so it can publish").option("--json", "Output raw JSON").action(async (id, opts) => {
+accountsCommand.command("activate").argument("<id>", "Account ID (from `chirpie accounts`)").description("Activate a connected account so it can publish").option("--json", "Output raw JSON").action(async (id, opts, cmd) => {
   const client = getClient();
   try {
     const account = await client.activateAccount(id);
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(account);
     } else {
       success(`Activated ${account.display_name ?? account.username} (${account.platform})`);
@@ -442,11 +452,11 @@ accountsCommand.command("activate").argument("<id>", "Account ID (from `chirpie
 });
 accountsCommand.command("deactivate").argument("<id>", "Account ID (from `chirpie accounts`)").description(
   "Deactivate a connected account (stays connected, frees a plan slot, cancels its scheduled posts)"
-).option("--json", "Output raw JSON").action(async (id, opts) => {
+).option("--json", "Output raw JSON").action(async (id, opts, cmd) => {
   const client = getClient();
   try {
     const account = await client.deactivateAccount(id);
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(account);
     } else {
       success(
@@ -463,20 +473,24 @@ accountsCommand.command("deactivate").argument("<id>", "Account ID (from `chirpi
     process.exit(1);
   }
 });
-accountsCommand.command("connect-x").description("Connect a new X/Twitter account via OAuth").action(async () => {
+accountsCommand.command("connect-x").description("Connect a new X/Twitter account via OAuth").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const result = await client.connectXAccount();
-    info("Open this URL in your browser to connect your X account:");
-    console.log(`
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else {
+      info("Open this URL in your browser to connect your X account:");
+      console.log(`
   ${result.authorization_url}
 `);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to start connection");
     process.exit(1);
   }
 });
-accountsCommand.command("connect-bluesky").description("Connect a Bluesky account via app password").requiredOption("--handle <handle>", "Bluesky handle (e.g. user.bsky.social)").option("--app-password <password>", "App password (omit to enter securely via prompt)").action(async (opts) => {
+accountsCommand.command("connect-bluesky").description("Connect a Bluesky account via app password").requiredOption("--handle <handle>", "Bluesky handle (e.g. user.bsky.social)").option("--app-password <password>", "App password (omit to enter securely via prompt)").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     let appPassword = opts.appPassword;
@@ -492,81 +506,110 @@ accountsCommand.command("connect-bluesky").description("Connect a Bluesky accoun
       identifier: opts.handle,
       app_password: appPassword
     });
-    info(`Connected Bluesky account: ${result.username} (${result.platform_user_id})`);
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else {
+      info(`Connected Bluesky account: ${result.username} (${result.platform_user_id})`);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to connect Bluesky account");
     process.exit(1);
   }
 });
-accountsCommand.command("connect-linkedin").description("Connect a LinkedIn account via OAuth").action(async () => {
+accountsCommand.command("connect-linkedin").description("Connect a LinkedIn account via OAuth").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const result = await client.connectLinkedInAccount();
-    info("Open this URL in your browser to connect your LinkedIn account:");
-    console.log(`
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else {
+      info("Open this URL in your browser to connect your LinkedIn account:");
+      console.log(`
   ${result.authorization_url}
 `);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to start LinkedIn connection");
     process.exit(1);
   }
 });
-accountsCommand.command("connect-threads").description("Connect a Threads (Meta) account via OAuth").action(async () => {
+accountsCommand.command("connect-threads").description("Connect a Threads (Meta) account via OAuth").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const result = await client.connectThreadsAccount();
-    info("Open this URL in your browser to connect your Threads account:");
-    console.log(`
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else {
+      info("Open this URL in your browser to connect your Threads account:");
+      console.log(`
   ${result.authorization_url}
 `);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to start Threads connection");
     process.exit(1);
   }
 });
-accountsCommand.command("connect-mastodon").description("Connect a Mastodon account via OAuth").requiredOption("--instance <url>", "Mastodon instance URL (e.g. https://mastodon.social)").action(async (opts) => {
+accountsCommand.command("connect-mastodon").description("Connect a Mastodon account via OAuth").requiredOption("--instance <url>", "Mastodon instance URL (e.g. https://mastodon.social)").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const result = await client.connectMastodonAccount({
       platform: "mastodon",
       instance_url: opts.instance
     });
-    info("Open this URL in your browser to connect your Mastodon account:");
-    console.log(`
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else {
+      info("Open this URL in your browser to connect your Mastodon account:");
+      console.log(`
   ${result.authorization_url}
 `);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to start Mastodon connection");
     process.exit(1);
   }
 });
-accountsCommand.command("connect-instagram").description("Connect an Instagram account via Instagram Login (OAuth)").action(async () => {
+accountsCommand.command("connect-instagram").description("Connect an Instagram account via Instagram Login (OAuth)").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const result = await client.connectInstagramAccount();
-    info("Open this URL in your browser to connect your Instagram account:");
-    console.log(`
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else {
+      info("Open this URL in your browser to connect your Instagram account:");
+      console.log(`
   ${result.authorization_url}
 `);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to start Instagram connection");
     process.exit(1);
   }
 });
-accountsCommand.command("connect-facebook").description("Connect a Facebook Page via Facebook Login (OAuth)").action(async () => {
+accountsCommand.command("connect-facebook").description("Connect a Facebook Page via Facebook Login (OAuth)").option(
+  "--reconnect",
+  "Re-run the flow for an already authorized Facebook account, asking again about anything turned down last time"
+).option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
-    const result = await client.connectFacebookAccount();
-    info("Open this URL in your browser to connect your Facebook Page:");
-    console.log(`
+    const result = await client.connectFacebookAccount({
+      reconnect: opts.reconnect === true
+    });
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else {
+      info("Open this URL in your browser to connect your Facebook Page:");
+      console.log(`
   ${result.authorization_url}
 `);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to start Facebook connection");
     process.exit(1);
   }
 });
-accountsCommand.command("connect-telegram").description("Connect a Telegram bot to a channel or group").option("--bot-token <token>", "Telegram bot token (omit to enter securely via prompt)").option("--chat-id <id>", "Telegram chat ID (omit to enter via prompt)").action(async (opts) => {
+accountsCommand.command("connect-telegram").description("Connect a Telegram bot to a channel or group").option("--bot-token <token>", "Telegram bot token (omit to enter securely via prompt)").option("--chat-id <id>", "Telegram chat ID (omit to enter via prompt)").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     let botToken = opts.botToken;
@@ -598,14 +641,18 @@ accountsCommand.command("connect-telegram").description("Connect a Telegram bot
       bot_token: botToken,
       chat_id: chatId
     });
-    info(`Connected Telegram bot: ${result.username} (${result.platform_user_id})`);
+    if (wantsJson(opts, cmd)) {
+      json(result);
+    } else {
+      info(`Connected Telegram bot: ${result.username} (${result.platform_user_id})`);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to connect Telegram bot");
     process.exit(1);
   }
 });
 var xKeysCommand = accountsCommand.command("x-keys").description("Manage your own X developer app used to connect X accounts");
-xKeysCommand.command("set").description("Set or replace your own X developer app credentials").requiredOption("--client-id <id>", "OAuth 2.0 Client ID from developer.x.com").option("--client-secret <secret>", "OAuth 2.0 Client Secret (omit to enter securely via prompt)").option("--label <label>", "Optional name for the app").option("--json", "Output raw JSON").action(async (opts) => {
+xKeysCommand.command("set").description("Set or replace your own X developer app credentials").requiredOption("--client-id <id>", "OAuth 2.0 Client ID from developer.x.com").option("--client-secret <secret>", "OAuth 2.0 Client Secret (omit to enter securely via prompt)").option("--label <label>", "Optional name for the app").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     let clientSecret = opts.clientSecret;
@@ -621,7 +668,7 @@ xKeysCommand.command("set").description("Set or replace your own X developer app
       client_secret: clientSecret,
       ...opts.label ? { label: opts.label } : {}
     });
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(result);
     } else {
       success("X developer keys saved.");
@@ -634,11 +681,11 @@ xKeysCommand.command("set").description("Set or replace your own X developer app
     process.exit(1);
   }
 });
-xKeysCommand.command("status").description("Show whether your own X developer app is configured").option("--json", "Output raw JSON").action(async (opts) => {
+xKeysCommand.command("status").description("Show whether your own X developer app is configured").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const status = await client.getXKeysStatus();
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(status);
     } else if (!status.configured) {
       info("No X developer app configured. X accounts connect through Chirpie's app.");
@@ -654,11 +701,11 @@ xKeysCommand.command("status").description("Show whether your own X developer ap
     process.exit(1);
   }
 });
-xKeysCommand.command("remove").description("Remove your own X developer app credentials").option("--json", "Output raw JSON").action(async (opts) => {
+xKeysCommand.command("remove").description("Remove your own X developer app credentials").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const result = await client.removeXKeys();
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(result);
     } else {
       success(result.message);
@@ -708,11 +755,11 @@ var analyticsCommand = new Command7("analytics").description("Get analytics for
 
 // src/commands/keys.ts
 import { Command as Command8 } from "commander";
-var keysCommand = new Command8("keys").description("Manage API keys").option("--json", "Output raw JSON").action(async (opts) => {
+var keysCommand = new Command8("keys").description("Manage API keys").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const keys = await client.listKeys();
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(keys);
     } else {
       table(
@@ -732,11 +779,11 @@ var keysCommand = new Command8("keys").description("Manage API keys").option("--
     process.exit(1);
   }
 });
-keysCommand.command("create").description("Create a new API key").option("-n, --name <name>", "Key name").option("--json", "Output raw JSON").action(async (opts) => {
+keysCommand.command("create").description("Create a new API key").option("-n, --name <name>", "Key name").option("--json", "Output raw JSON").action(async (opts, cmd) => {
   const client = getClient();
   try {
     const key = await client.createKey(opts.name);
-    if (opts.json) {
+    if (wantsJson(opts, cmd)) {
       json(key);
     } else {
       success("API key created. Save it now; you won't see it again.");
@@ -749,11 +796,15 @@ keysCommand.command("create").description("Create a new API key").option("-n, --
     process.exit(1);
   }
 });
-keysCommand.command("revoke <id>").description("Revoke an API key").action(async (id) => {
+keysCommand.command("revoke <id>").description("Revoke an API key").option("--json", "Output raw JSON").action(async (id, opts, cmd) => {
   const client = getClient();
   try {
     await client.revokeKey(id);
-    success(`Key ${id} revoked`);
+    if (wantsJson(opts, cmd)) {
+      json({ id, revoked: true });
+    } else {
+      success(`Key ${id} revoked`);
+    }
   } catch (err) {
     error(err instanceof Error ? err.message : "Failed to revoke key");
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chirpie",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "Chirpie CLI: post to social media from the command line",
   "repository": {
     "type": "git",
@@ -44,7 +44,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@chirpie/sdk": "^1.0.25",
+    "@chirpie/sdk": "^1.0.26",
     "commander": "^13"
   },
   "devDependencies": {