agent-messenger 2.10.2 → 2.11.1

package/skills/agent-wechatbot/templates/account-summary.sh

@@ -0,0 +1,122 @@
+#!/bin/bash
+#
+# account-summary.sh - Generate a summary of the WeChat Official Account, templates, and followers
+#
+# Usage:
+#   ./account-summary.sh [--json]
+#
+# Options:
+#   --json  Output raw JSON instead of formatted text
+#
+# Example:
+#   ./account-summary.sh
+#   ./account-summary.sh --json > summary.json
+
+set -euo pipefail
+
+OUTPUT_JSON=false
+if [ $# -gt 0 ] && [ "$1" = "--json" ]; then
+  OUTPUT_JSON=true
+fi
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+BOLD='\033[1m'
+NC='\033[0m'
+
+if ! command -v agent-wechatbot &> /dev/null; then
+  echo -e "${RED}Error: agent-wechatbot not found${NC}" >&2
+  echo "" >&2
+  echo "Install it with:" >&2
+  echo "  npm install -g agent-messenger" >&2
+  exit 1
+fi
+
+AUTH_STATUS=$(agent-wechatbot auth status 2>&1) || true
+
+if echo "$AUTH_STATUS" | jq -e '.error' > /dev/null 2>&1; then
+  echo -e "${RED}Not authenticated!${NC}" >&2
+  echo "" >&2
+  echo "Run this to authenticate:" >&2
+  echo "  agent-wechatbot auth set <app-id> <app-secret>" >&2
+  exit 1
+fi
+
+echo -e "${YELLOW}Fetching templates and followers...${NC}" >&2
+TEMPLATES_RESULT=$(agent-wechatbot template list 2>&1) || true
+USERS_RESULT=$(agent-wechatbot user list 2>&1) || true
+
+if [ "$OUTPUT_JSON" = true ]; then
+  jq -n \
+    --argjson auth "$AUTH_STATUS" \
+    --argjson templates "$TEMPLATES_RESULT" \
+    --argjson users "$USERS_RESULT" \
+    '{"auth": $auth, "templates": $templates, "users": $users}'
+  exit 0
+fi
+
+APP_ID=$(echo "$AUTH_STATUS" | jq -r '.app_id // "Unknown"')
+ACCOUNT_NAME=$(echo "$AUTH_STATUS" | jq -r '.account_name // "Unknown"')
+
+TEMPLATES=$(echo "$TEMPLATES_RESULT" | jq '.template_list // []' 2>/dev/null || echo '[]')
+TEMPLATE_COUNT=$(echo "$TEMPLATES" | jq 'length')
+
+FOLLOWER_TOTAL=$(echo "$USERS_RESULT" | jq -r '.total // 0' 2>/dev/null || echo '0')
+FOLLOWER_COUNT=$(echo "$USERS_RESULT" | jq -r '.count // 0' 2>/dev/null || echo '0')
+
+echo ""
+echo -e "${BOLD}${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo -e "${BOLD}${BLUE}  WeChat Official Account Summary${NC}"
+echo -e "${BOLD}${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo ""
+echo -e "${BOLD}Account:${NC} $ACCOUNT_NAME"
+echo -e "${BOLD}App ID:${NC}  $APP_ID"
+echo ""
+
+echo -e "${BOLD}${CYAN}Followers${NC}"
+echo "  Total:        $FOLLOWER_TOTAL"
+echo "  This page:    $FOLLOWER_COUNT"
+echo ""
+
+echo -e "${BOLD}${CYAN}Templates (${TEMPLATE_COUNT} total)${NC}"
+if [ "$TEMPLATE_COUNT" -gt 0 ]; then
+  echo "$TEMPLATES" | jq -r '
+    .[0:10] |
+    .[] |
+    "  \(.template_id) — \(.title)"
+  '
+  if [ "$TEMPLATE_COUNT" -gt 10 ]; then
+    echo "  ... and $((TEMPLATE_COUNT - 10)) more"
+  fi
+else
+  echo "  (no templates approved yet)"
+fi
+echo ""
+
+echo -e "${BOLD}${CYAN}Quick Actions:${NC}"
+echo ""
+echo -e "  ${GREEN}# Send a customer service message (within 48h window)${NC}"
+echo -e "  agent-wechatbot message send oABCD1234 \"Hello!\""
+echo ""
+echo -e "  ${GREEN}# Send a template notification (anytime)${NC}"
+FIRST_TEMPLATE=$(echo "$TEMPLATES" | jq -r '.[0].template_id // "TM00001"')
+echo -e "  agent-wechatbot template send oABCD1234 $FIRST_TEMPLATE --data '{...}'"
+echo ""
+echo -e "  ${GREEN}# List all templates${NC}"
+echo -e "  agent-wechatbot template list"
+echo ""
+
+echo -e "${BOLD}${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo ""
+
+SUMMARY_FILE="account-summary-$(date +%Y%m%d-%H%M%S).json"
+jq -n \
+  --argjson auth "$AUTH_STATUS" \
+  --argjson templates "$TEMPLATES_RESULT" \
+  --argjson users "$USERS_RESULT" \
+  '{"auth": $auth, "templates": $templates, "users": $users}' > "$SUMMARY_FILE"
+echo -e "${GREEN}✓ Full data saved to: $SUMMARY_FILE${NC}"
+echo ""

package/skills/agent-wechatbot/templates/post-message.sh

@@ -0,0 +1,122 @@
+#!/bin/bash
+#
+# post-message.sh - Send a customer service message via WeChat Official Account API
+#
+# Usage:
+#   ./post-message.sh <openid> <message>
+#
+# Arguments:
+#   openid  - Recipient OpenID (e.g. oABCD1234)
+#   message - Message text to send
+#
+# Example:
+#   ./post-message.sh oABCD1234 "Hello from script!"
+#   ./post-message.sh oABCD1234 "Thanks for your purchase ✅"
+#
+# Note: Customer service messages only work within the 48-hour interaction window.
+# Outside that window, use template messages via send-template.sh.
+
+set -euo pipefail
+
+# Check arguments
+if [ $# -lt 2 ]; then
+  echo "Usage: $0 <openid> <message>"
+  echo ""
+  echo "Examples:"
+  echo "  $0 oABCD1234 'Hello world!'"
+  echo "  $0 oABCD1234 'Build completed'"
+  exit 1
+fi
+
+OPENID="$1"
+MESSAGE="$2"
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Function to send message with retry logic
+send_message() {
+  local openid=$1
+  local message=$2
+  local max_attempts=3
+  local attempt=1
+
+  while [ $attempt -le $max_attempts ]; do
+    echo -e "${YELLOW}Attempt $attempt/$max_attempts...${NC}"
+
+    # Send message and capture result
+    RESULT=$(agent-wechatbot message send "$openid" "$message" 2>&1) || true
+
+    # Check if successful (no error field)
+    if ! echo "$RESULT" | jq -e '.error' > /dev/null 2>&1; then
+      echo -e "${GREEN}✓ Message sent successfully!${NC}"
+      echo ""
+      echo "Message details:"
+      echo "  To OpenID: $openid"
+      return 0
+    fi
+
+    # Extract error information
+    ERROR_MSG=$(echo "$RESULT" | jq -r '.error // "Unknown error"')
+    echo -e "${RED}✗ Failed: $ERROR_MSG${NC}"
+
+    # Don't retry on certain errors
+    if echo "$ERROR_MSG" | grep -qE "40164|IP whitelist"; then
+      echo -e "${RED}IP not in WeChat whitelist. Add your server IP in the admin panel.${NC}"
+      return 1
+    fi
+
+    if echo "$ERROR_MSG" | grep -qE "48h|48-hour"; then
+      echo -e "${YELLOW}Outside 48h window. Use a template message instead:${NC}"
+      echo "  ./send-template.sh $openid <template-id> --data '...'"
+      return 1
+    fi
+
+    # Exponential backoff before retry
+    if [ $attempt -lt $max_attempts ]; then
+      SLEEP_TIME=$((attempt * 2))
+      echo "Retrying in ${SLEEP_TIME}s..."
+      sleep $SLEEP_TIME
+    fi
+
+    attempt=$((attempt + 1))
+  done
+
+  echo -e "${RED}Failed after $max_attempts attempts${NC}"
+  return 1
+}
+
+# Check if agent-wechatbot is installed
+if ! command -v agent-wechatbot &> /dev/null; then
+  echo -e "${RED}Error: agent-wechatbot not found${NC}"
+  echo ""
+  echo "Install it with:"
+  echo "  npm install -g agent-messenger"
+  exit 1
+fi
+
+# Check authentication
+echo "Checking authentication..."
+AUTH_STATUS=$(agent-wechatbot auth status 2>&1) || true
+
+if echo "$AUTH_STATUS" | jq -e '.error' > /dev/null 2>&1; then
+  echo -e "${RED}Not authenticated!${NC}"
+  echo ""
+  echo "Run this to authenticate:"
+  echo "  agent-wechatbot auth set <app-id> <app-secret>"
+  exit 1
+fi
+
+APP_ID=$(echo "$AUTH_STATUS" | jq -r '.app_id // "Unknown"')
+echo -e "${GREEN}✓ Authenticated (App ID: $APP_ID)${NC}"
+echo ""
+
+# Send the message
+echo "Sending message to $OPENID..."
+echo "Message: $MESSAGE"
+echo ""
+
+send_message "$OPENID" "$MESSAGE"

package/skills/agent-wechatbot/templates/send-template.sh

@@ -0,0 +1,152 @@
+#!/bin/bash
+#
+# send-template.sh - Send a WeChat template message via Official Account API
+#
+# Usage:
+#   ./send-template.sh <openid> <template-id> --data <json> [--url <url>]
+#
+# Arguments:
+#   openid       - Recipient follower OpenID (e.g. oABCD1234)
+#   template-id  - Pre-approved template ID (e.g. TM00001)
+#
+# Options:
+#   --data <json>  - Required. JSON object with template parameters.
+#                    Format: {"<param>":{"value":"<text>","color":"<#hex>"}}
+#   --url <url>    - Optional. URL the message links to when tapped.
+#
+# Example:
+#   ./send-template.sh oABCD1234 TM00001 \
+#     --data '{"order_id":{"value":"ORD-9876"},"customer_name":{"value":"Alice"}}'
+#
+#   ./send-template.sh oABCD1234 TM00001 \
+#     --data '{"status":{"value":"shipped","color":"#00AA00"}}' \
+#     --url "https://example.com/orders/9876"
+
+set -euo pipefail
+
+if [ $# -lt 2 ]; then
+  echo "Usage: $0 <openid> <template-id> --data <json> [--url <url>]"
+  echo ""
+  echo "Examples:"
+  echo "  $0 oABCD1234 TM00001 --data '{\"order_id\":{\"value\":\"ORD-001\"}}'"
+  echo "  $0 oABCD1234 TM00001 --data '{...}' --url https://example.com/path"
+  exit 1
+fi
+
+OPENID="$1"
+TEMPLATE_ID="$2"
+shift 2
+
+DATA=""
+URL=""
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --data)
+      if [ $# -lt 2 ]; then
+        echo "Error: --data requires a JSON value"
+        exit 1
+      fi
+      DATA="$2"
+      shift 2
+      ;;
+    --url)
+      if [ $# -lt 2 ]; then
+        echo "Error: --url requires a value"
+        exit 1
+      fi
+      URL="$2"
+      shift 2
+      ;;
+    *)
+      echo "Unknown option: $1"
+      exit 1
+      ;;
+  esac
+done
+
+if [ -z "$DATA" ]; then
+  echo "Error: --data is required"
+  exit 1
+fi
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+# Check if agent-wechatbot is installed
+if ! command -v agent-wechatbot &> /dev/null; then
+  echo -e "${RED}Error: agent-wechatbot not found${NC}"
+  echo ""
+  echo "Install it with:"
+  echo "  npm install -g agent-messenger"
+  exit 1
+fi
+
+# Check authentication
+echo "Checking authentication..."
+AUTH_STATUS=$(agent-wechatbot auth status 2>&1) || true
+
+if echo "$AUTH_STATUS" | jq -e '.error' > /dev/null 2>&1; then
+  echo -e "${RED}Not authenticated!${NC}"
+  echo ""
+  echo "Run this to authenticate:"
+  echo "  agent-wechatbot auth set <app-id> <app-secret>"
+  exit 1
+fi
+
+APP_ID=$(echo "$AUTH_STATUS" | jq -r '.app_id // "Unknown"')
+echo -e "${GREEN}✓ Authenticated (App ID: $APP_ID)${NC}"
+echo ""
+
+# Send template message with retry
+max_attempts=3
+attempt=1
+
+echo "Sending template '$TEMPLATE_ID' to $OPENID..."
+if [ -n "$URL" ]; then
+  echo "URL: $URL"
+fi
+echo ""
+
+while [ $attempt -le $max_attempts ]; do
+  echo -e "${YELLOW}Attempt $attempt/$max_attempts...${NC}"
+
+  if [ -n "$URL" ]; then
+    RESULT=$(agent-wechatbot template send "$OPENID" "$TEMPLATE_ID" --data "$DATA" --url "$URL" 2>&1) || true
+  else
+    RESULT=$(agent-wechatbot template send "$OPENID" "$TEMPLATE_ID" --data "$DATA" 2>&1) || true
+  fi
+
+  if ! echo "$RESULT" | jq -e '.error' > /dev/null 2>&1; then
+    echo -e "${GREEN}✓ Template message sent successfully!${NC}"
+    echo ""
+    echo "Message details:"
+    echo "  To OpenID:  $OPENID"
+    echo "  Template:   $TEMPLATE_ID"
+    if [ -n "$URL" ]; then
+      echo "  URL:        $URL"
+    fi
+    exit 0
+  fi
+
+  ERROR_MSG=$(echo "$RESULT" | jq -r '.error // "Unknown error"')
+  echo -e "${RED}✗ Failed: $ERROR_MSG${NC}"
+
+  # Don't retry on permanent errors
+  if echo "$ERROR_MSG" | grep -qE "40164|IP whitelist|40125|Invalid App"; then
+    exit 1
+  fi
+
+  if [ $attempt -lt $max_attempts ]; then
+    SLEEP_TIME=$((attempt * 2))
+    echo "Retrying in ${SLEEP_TIME}s..."
+    sleep $SLEEP_TIME
+  fi
+
+  attempt=$((attempt + 1))
+done
+
+echo -e "${RED}Failed after $max_attempts attempts${NC}"
+exit 1

package/skills/agent-whatsapp/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: agent-whatsapp
 description: Interact with WhatsApp - send messages, read chats, manage conversations
-version: 2.10.2
+version: 2.11.1
 allowed-tools: Bash(agent-whatsapp:*)
 metadata:
   openclaw:

package/skills/agent-whatsappbot/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: agent-whatsappbot
 description: Interact with WhatsApp using Cloud API credentials - send messages, manage templates
-version: 2.10.2
+version: 2.11.1
 allowed-tools: Bash(agent-whatsappbot:*)
 metadata:
   openclaw:
@@ -245,6 +245,8 @@ agent-whatsappbot template list --pretty
 
 ## Common Patterns
 
+See `references/common-patterns.md` for additional workflows.
+
 ### Send a notification outside the 24h window
 
 Template messages are required when the customer hasn't messaged you in the last 24 hours. Always check your available templates first:
@@ -286,6 +288,14 @@ agent-whatsappbot message send-template 15559876543 deployment_alert \
   --components '[{"type":"body","parameters":[{"type":"text","text":"v2.1.0"},{"type":"text","text":"production"},{"type":"text","text":"success"}]}]'
 ```
 
+## Templates
+
+See `templates/` directory for runnable examples:
+
+- `post-message.sh` - Send messages with error handling and retries
+- `account-summary.sh` - Generate account and template summary
+- `send-template.sh` - Send a template message with parameters
+
 ## Error Handling
 
 All commands return consistent error format:
@@ -318,6 +328,20 @@ Config format:
 }
 ```
 
+## Key Differences from agent-whatsapp
+
+| Feature           | agent-whatsapp                       | agent-whatsappbot                  |
+| ----------------- | ------------------------------------ | ---------------------------------- |
+| Auth type         | User account (Baileys, QR/pairing)   | Cloud API (Phone Number ID + Token) |
+| Token source      | Pairing flow with phone number       | Meta Business Manager              |
+| Read messages     | Yes                                  | No (webhook-only inbound)          |
+| Group chats       | Yes                                  | No                                 |
+| Template messages | No                                   | Yes (required outside 24h window)  |
+| Free-form text    | Anytime                              | Only within 24h customer window    |
+| Media uploads     | Direct (local files)                 | URL only                           |
+| Multi-account     | Multi-phone, single CLI session      | Multi-account by Phone Number ID   |
+| CI/CD friendly    | Requires phone, pairing flow         | Yes (just set token)               |
+
 ## Limitations
 
 - **Cannot list or read received messages** — WhatsApp Cloud API delivers inbound messages via webhooks only. This CLI is send-only.
@@ -378,3 +402,8 @@ WhatsApp enforces rate limits based on your business tier. The CLI automatically
 - Use full international format without `+` prefix (e.g., `15551234567` not `+1-555-123-4567`)
 - If outside the 24h window, use `message send-template` instead of `message send`
 - Check that your WhatsApp Business account is active and not restricted
+
+## References
+
+- [Authentication Guide](references/authentication.md)
+- [Common Patterns](references/common-patterns.md)

package/src/platforms/channeltalk/commands/auth.test.ts

@@ -20,6 +20,9 @@ const mockListChannels = mock(() =>
   ]),
 )
 const mockExtract = mock(() => Promise.resolve([{ accountCookie: 'fresh-account', sessionCookie: 'fresh-session' }]))
+const mockCreateTokenExtractor = mock((_browserProfile?: string[]) => ({
+  extract: mockExtract,
+}))
 
 import {
   clearAction,
@@ -89,9 +92,7 @@ setChannelAuthCommandDependenciesForTesting({
       return true
     },
   }),
-  createTokenExtractor: () => ({
-    extract: mockExtract,
-  }),
+  createTokenExtractor: mockCreateTokenExtractor,
 })
 
 describe('channel auth commands', () => {
@@ -105,6 +106,7 @@ describe('channel auth commands', () => {
     mockGetAccount.mockReset()
     mockListChannels.mockReset()
     mockExtract.mockReset()
+    mockCreateTokenExtractor.mockReset()
 
     mockGetAccount.mockImplementation(() => Promise.resolve({ id: 'acct-1', name: 'Alice' }))
     mockListChannels.mockImplementation(() =>
@@ -116,6 +118,9 @@ describe('channel auth commands', () => {
     mockExtract.mockImplementation(() =>
       Promise.resolve([{ accountCookie: 'fresh-account', sessionCookie: 'fresh-session' }]),
     )
+    mockCreateTokenExtractor.mockImplementation((_browserProfile?: string[]) => ({
+      extract: mockExtract,
+    }))
   })
 
   describe('extractAction', () => {
@@ -136,6 +141,13 @@ describe('channel auth commands', () => {
       expect(workspaceStore.get('ws-2')?.account_cookie).toBe('fresh-account')
     })
 
+    it('passes custom browser profile paths to the token extractor', async () => {
+      await extractAction({ browserProfile: ['/tmp/profile-a', '/tmp/profile-b'] })
+
+      expect(mockCreateTokenExtractor).toHaveBeenCalledWith(['/tmp/profile-a', '/tmp/profile-b'])
+      expect(mockExtract).toHaveBeenCalledTimes(1)
+    })
+
     it('preserves current workspace if it still exists after re-extraction', async () => {
       workspaceStore.set('ws-2', {
         workspace_id: 'ws-2',

package/src/platforms/channeltalk/commands/auth.ts

@@ -1,5 +1,6 @@
 import { Command } from 'commander'
 
+import { collectBrowserProfileOption } from '@/shared/chromium'
 import { formatOutput } from '@/shared/utils/output'
 
 import { ChannelClient } from '../client'
@@ -9,6 +10,7 @@ import { ChannelTokenExtractor } from '../token-extractor'
 interface ActionOptions {
   workspace?: string
   pretty?: boolean
+  browserProfile?: string[]
   _credManager?: ChannelCredentialManager
 }
 
@@ -60,7 +62,8 @@ let createChannelClient: (
 
 let createCredentialManager = (): ChannelCredentialManagerLike => new ChannelCredentialManager()
 
-let createTokenExtractor = (): ChannelTokenExtractorLike => new ChannelTokenExtractor()
+let createTokenExtractor = (browserProfile?: string[]): ChannelTokenExtractorLike =>
+  new ChannelTokenExtractor(undefined, browserProfile)
 
 export function setChannelAuthCommandDependenciesForTesting(dependencies: {
   createChannelClient?: (
@@ -68,7 +71,7 @@ export function setChannelAuthCommandDependenciesForTesting(dependencies: {
     sessionCookie?: string,
   ) => ChannelClientLike | Promise<ChannelClientLike>
   createCredentialManager?: () => ChannelCredentialManagerLike
-  createTokenExtractor?: () => ChannelTokenExtractorLike
+  createTokenExtractor?: (browserProfile?: string[]) => ChannelTokenExtractorLike
 }): void {
   if (dependencies.createChannelClient) createChannelClient = dependencies.createChannelClient
   if (dependencies.createCredentialManager) createCredentialManager = dependencies.createCredentialManager
@@ -79,13 +82,14 @@ export function resetChannelAuthCommandDependenciesForTesting(): void {
   createChannelClient = async (accountCookie: string, sessionCookie?: string): Promise<ChannelClientLike> =>
     new ChannelClient().login({ accountCookie, sessionCookie })
   createCredentialManager = (): ChannelCredentialManagerLike => new ChannelCredentialManager()
-  createTokenExtractor = (): ChannelTokenExtractorLike => new ChannelTokenExtractor()
+  createTokenExtractor = (browserProfile?: string[]): ChannelTokenExtractorLike =>
+    new ChannelTokenExtractor(undefined, browserProfile)
 }
 
 export async function extractAction(options: ActionOptions = {}): Promise<ExtractResult | ErrorResult> {
   try {
     const credManager = options._credManager ?? createCredentialManager()
-    const extractor = createTokenExtractor()
+    const extractor = createTokenExtractor(options.browserProfile)
     const extracted = await extractor.extract()
 
     if (extracted.length === 0) {
@@ -270,7 +274,13 @@ export function createAuthCommand(): Command {
       new Command('extract')
         .description('Extract cookies from Channel Talk desktop app or a supported Chromium browser')
         .option('--pretty', 'Pretty print JSON output')
-        .action(async (opts: { pretty?: boolean }) => {
+        .option(
+          '--browser-profile <path>',
+          'Additional Chromium profile/user-data directory to scan (repeatable, comma-separated supported)',
+          collectBrowserProfileOption,
+          [],
+        )
+        .action(async (opts: { pretty?: boolean; browserProfile?: string[] }) => {
           cliOutput(await extractAction(opts), opts.pretty)
         }),
     )

package/src/platforms/channeltalk/token-extractor.ts

@@ -12,6 +12,7 @@ import {
   discoverBrowserProfileDirs,
   findLocalStatePath,
   getBrowserBasePath,
+  getAgentBrowserProfileDirs,
 } from '@/shared/chromium'
 import type { KeychainVariant } from '@/shared/chromium'
 
@@ -29,9 +30,11 @@ export class ChannelTokenExtractor {
   private platform: NodeJS.Platform
   private decryptor: ChromiumCookieDecryptor
   private cookieReader: ChromiumCookieReader
+  private customBrowserProfileDirs: string[]
 
-  constructor(platform?: NodeJS.Platform) {
+  constructor(platform?: NodeJS.Platform, customBrowserProfileDirs?: string[]) {
     this.platform = platform ?? process.platform
+    this.customBrowserProfileDirs = customBrowserProfileDirs ?? []
     this.cookieReader = new ChromiumCookieReader()
     this.decryptor = new ChromiumCookieDecryptor({ platform: this.platform })
   }
@@ -94,6 +97,11 @@ export class ChannelTokenExtractor {
       }
     }
 
+    for (const profileDir of getAgentBrowserProfileDirs({ customProfileDirs: this.customBrowserProfileDirs })) {
+      paths.push(join(profileDir, 'Cookies'))
+      paths.push(join(profileDir, 'Network', 'Cookies'))
+    }
+
     return paths
   }
 
@@ -105,16 +113,27 @@ export class ChannelTokenExtractor {
     const results: ExtractedChannelToken[] = []
     const seenAccounts = new Set<string>()
 
+    if (this.customBrowserProfileDirs.length > 0) {
+      for (const browserResult of await this.extractAllFromBrowserPaths()) {
+        if (!seenAccounts.has(browserResult.accountCookie)) {
+          seenAccounts.add(browserResult.accountCookie)
+          results.push(browserResult)
+        }
+      }
+    }
+
     const desktopResult = await this.extractFromDesktopApp()
     if (desktopResult && !seenAccounts.has(desktopResult.accountCookie)) {
       seenAccounts.add(desktopResult.accountCookie)
       results.push(desktopResult)
     }
 
-    for (const browserResult of await this.extractAllFromBrowserPaths()) {
-      if (!seenAccounts.has(browserResult.accountCookie)) {
-        seenAccounts.add(browserResult.accountCookie)
-        results.push(browserResult)
+    if (this.customBrowserProfileDirs.length === 0) {
+      for (const browserResult of await this.extractAllFromBrowserPaths()) {
+        if (!seenAccounts.has(browserResult.accountCookie)) {
+          seenAccounts.add(browserResult.accountCookie)
+          results.push(browserResult)
+        }
       }
     }
 

package/src/platforms/channeltalkbot/cli.ts

@@ -23,6 +23,15 @@ program
   .option('--pretty', 'Pretty-print JSON output')
   .option('--workspace <id>', 'Workspace ID to use')
   .option('--bot <name>', 'Bot name to use for sending messages')
+  .hook('preAction', (thisCmd, actionCmd) => {
+    for (const [key, value] of Object.entries(thisCmd.opts())) {
+      if (value === undefined) continue
+      const source = actionCmd.getOptionValueSource(key)
+      if (source === undefined || source === 'default') {
+        actionCmd.setOptionValue(key, value)
+      }
+    }
+  })
 
 program.addCommand(authCommand)
 program.addCommand(whoamiCommand)

package/src/platforms/channeltalkbot/commands/auth.ts

@@ -1,5 +1,6 @@
 import { Command } from 'commander'
 
+import { cliOutput } from '@/shared/utils/cli-output'
 import { formatOutput } from '@/shared/utils/output'
 
 import { ChannelBotClient } from '../client'
@@ -158,11 +159,6 @@ export async function botAction(name: string, options: ActionOptions): Promise<A
   }
 }
 
-function cliOutput(result: ActionResult, pretty?: boolean, exitOnError = true): void {
-  console.log(formatOutput(result, pretty))
-  if (result.error && exitOnError) process.exit(1)
-}
-
 export const authCommand = new Command('auth')
   .description('Authentication commands')
   .addCommand(