agent-messenger 1.14.0 → 2.0.0

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

@@ -0,0 +1,153 @@
+#!/bin/bash
+#
+# send-template.sh - Send a WhatsApp template message via Cloud API
+#
+# Usage:
+#   ./send-template.sh <to> <template-name> [--language <code>] [--components <json>]
+#
+# Arguments:
+#   to            - Recipient phone number (e.g. 15551234567)
+#   template-name - Name of the approved template to send
+#
+# Options:
+#   --language <code>      - Language code (default: en_US)
+#   --components <json>    - JSON array of template components (variables, buttons, etc.)
+#
+# Example:
+#   ./send-template.sh 15551234567 hello_world
+#   ./send-template.sh 15551234567 order_confirmation --language en_US
+#   ./send-template.sh 15551234567 shipping_update --components '[{"type":"body","parameters":[{"type":"text","text":"ORDER-123"}]}]'
+
+set -euo pipefail
+
+# Check arguments
+if [ $# -lt 2 ]; then
+  echo "Usage: $0 <to> <template-name> [--language <code>] [--components <json>]"
+  echo ""
+  echo "Examples:"
+  echo "  $0 15551234567 hello_world"
+  echo "  $0 15551234567 order_confirmation --language en_US"
+  echo "  $0 15551234567 shipping_update --components '[{\"type\":\"body\",\"parameters\":[{\"type\":\"text\",\"text\":\"ORDER-123\"}]}]'"
+  exit 1
+fi
+
+TO="$1"
+TEMPLATE_NAME="$2"
+shift 2
+
+# Parse optional arguments
+LANGUAGE="en_US"
+COMPONENTS=""
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --language)
+      if [ $# -lt 2 ]; then
+        echo "Error: --language requires a value"
+        exit 1
+      fi
+      LANGUAGE="$2"
+      shift 2
+      ;;
+    --components)
+      if [ $# -lt 2 ]; then
+        echo "Error: --components requires a value"
+        exit 1
+      fi
+      COMPONENTS="$2"
+      shift 2
+      ;;
+    *)
+      echo "Unknown option: $1"
+      exit 1
+      ;;
+  esac
+done
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Check if agent-whatsappbot is installed
+if ! command -v agent-whatsappbot &> /dev/null; then
+  echo -e "${RED}Error: agent-whatsappbot 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-whatsappbot auth status 2>&1) || true
+
+if ! echo "$AUTH_STATUS" | jq -e '.valid' > /dev/null 2>&1; then
+  echo -e "${RED}Not authenticated!${NC}"
+  echo ""
+  echo "Run this to authenticate:"
+  echo "  agent-whatsappbot auth set <phone-number-id> <access-token>"
+  exit 1
+fi
+
+PHONE_ID=$(echo "$AUTH_STATUS" | jq -r '.phone_number_id // "Unknown"')
+echo -e "${GREEN}✓ Authenticated (Phone ID: $PHONE_ID)${NC}"
+echo ""
+
+# Send template message with retry logic
+max_attempts=3
+attempt=1
+
+echo "Sending template '$TEMPLATE_NAME' to $TO..."
+echo "Language: $LANGUAGE"
+if [ -n "$COMPONENTS" ]; then
+  echo "Components: $COMPONENTS"
+fi
+echo ""
+
+while [ $attempt -le $max_attempts ]; do
+  echo -e "${YELLOW}Attempt $attempt/$max_attempts...${NC}"
+
+  if [ -n "$COMPONENTS" ]; then
+    RESULT=$(agent-whatsappbot message send-template "$TO" "$TEMPLATE_NAME" --language "$LANGUAGE" --components "$COMPONENTS" 2>&1) || true
+  else
+    RESULT=$(agent-whatsappbot message send-template "$TO" "$TEMPLATE_NAME" --language "$LANGUAGE" 2>&1) || true
+  fi
+
+  if echo "$RESULT" | jq -e '.messages' > /dev/null 2>&1; then
+    echo -e "${GREEN}✓ Template message sent successfully!${NC}"
+
+    MSG_ID=$(echo "$RESULT" | jq -r '.messages[0].id // ""')
+
+    echo ""
+    echo "Message details:"
+    echo "  To: $TO"
+    echo "  Template: $TEMPLATE_NAME"
+    echo "  Language: $LANGUAGE"
+    if [ -n "$MSG_ID" ]; then
+      echo "  Message ID: $MSG_ID"
+    fi
+
+    exit 0
+  fi
+
+  if echo "$RESULT" | jq -e '.error' > /dev/null 2>&1; then
+    ERROR_MSG=$(echo "$RESULT" | jq -r '.error // "Unknown error"')
+
+    echo -e "${RED}✗ Failed: $ERROR_MSG${NC}"
+  else
+    echo -e "${RED}✗ Unexpected error: $RESULT${NC}"
+  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/src/cli.ts

@@ -20,30 +20,58 @@ program.command('slack', 'Interact with Slack workspaces', {
   executableFile: join(__dirname, 'platforms', 'slack', `cli${ext}`),
 })
 
+program.command('slackbot', 'Interact with Slack using bot tokens', {
+  executableFile: join(__dirname, 'platforms', 'slackbot', `cli${ext}`),
+})
+
 program.command('discord', 'Interact with Discord guilds', {
   executableFile: join(__dirname, 'platforms', 'discord', `cli${ext}`),
 })
 
+program.command('discordbot', 'Interact with Discord using bot tokens', {
+  executableFile: join(__dirname, 'platforms', 'discordbot', `cli${ext}`),
+})
+
 program.command('teams', 'Interact with Microsoft Teams', {
   executableFile: join(__dirname, 'platforms', 'teams', `cli${ext}`),
 })
 
-program.command('slackbot', 'Interact with Slack using bot tokens', {
-  executableFile: join(__dirname, 'platforms', 'slackbot', `cli${ext}`),
+program.command('telegram', 'Interact with Telegram via TDLib', {
+  executableFile: join(__dirname, 'platforms', 'telegram', `cli${ext}`),
 })
 
-program.command('discordbot', 'Interact with Discord using bot tokens', {
-  executableFile: join(__dirname, 'platforms', 'discordbot', `cli${ext}`),
+program.command('whatsapp', 'Interact with WhatsApp via linked device', {
+  executableFile: join(__dirname, 'platforms', 'whatsapp', `cli${ext}`),
 })
 
-program.command('channeltalkbot', 'Interact with Channel Talk using API credentials', {
-  executableFile: join(__dirname, 'platforms', 'channeltalkbot', `cli${ext}`),
+program.command('whatsappbot', 'Interact with WhatsApp using Cloud API credentials', {
+  executableFile: join(__dirname, 'platforms', 'whatsappbot', `cli${ext}`),
+})
+
+program.command('line', 'Interact with LINE', {
+  executableFile: join(__dirname, 'platforms', 'line', `cli${ext}`),
+})
+
+program.command('instagram', 'Interact with Instagram DMs', {
+  executableFile: join(__dirname, 'platforms', 'instagram', `cli${ext}`),
+})
+
+program.command('kakaotalk', 'Interact with KakaoTalk', {
+  executableFile: join(__dirname, 'platforms', 'kakaotalk', `cli${ext}`),
 })
 
 program.command('channeltalk', 'Interact with Channel Talk', {
   executableFile: join(__dirname, 'platforms', 'channeltalk', `cli${ext}`),
 })
 
+program.command('channeltalkbot', 'Interact with Channel Talk using API credentials', {
+  executableFile: join(__dirname, 'platforms', 'channeltalkbot', `cli${ext}`),
+})
+
+program.command('tui', 'Launch unified messenger TUI', {
+  executableFile: join(__dirname, 'tui', `cli${ext}`),
+})
+
 program.parse(process.argv)
 
 export default program

package/src/platforms/channeltalk/client.test.ts

@@ -50,17 +50,19 @@ describe('ChannelClient', () => {
 
   const getJsonBody = (callIndex = 0) => JSON.parse(String(fetchCalls[callIndex]?.options?.body)) as Record<string, unknown>
 
-  test('constructor requires account cookie', () => {
-    expect(() => new ChannelClient('', 'session-cookie')).toThrow(ChannelError)
-    expect(() => new ChannelClient('')).toThrow(ChannelError)
-    expect(() => new ChannelClient('account-cookie')).not.toThrow()
-    expect(() => new ChannelClient('account-cookie', '')).not.toThrow()
+  test('login() requires account cookie', async () => {
+    await expect(new ChannelClient().login({ accountCookie: '' })).rejects.toThrow(ChannelError)
+    await expect(new ChannelClient().login({ accountCookie: '', sessionCookie: 'session-cookie' })).rejects.toThrow(ChannelError)
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie' })
+    expect(client).toBeInstanceOf(ChannelClient)
+    const client2 = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: '' })
+    expect(client2).toBeInstanceOf(ChannelClient)
   })
 
   test('successful GET request returns unwrapped JSON', async () => {
     mockResponse({ account: { id: 'acc-1', name: 'Desk Owner', email: 'owner@example.com', emailVerified: true, language: 'en', country: 'KR', createdAt: 1 } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const account = await client.getAccount()
 
     expect(account.id).toBe('acc-1')
@@ -71,7 +73,7 @@ describe('ChannelClient', () => {
     mockResponse({ account: { id: 'acc-1', name: 'Desk Owner', email: 'owner@example.com', emailVerified: true, language: 'en', country: 'KR', createdAt: 1 } })
     mockResponse({ channel: { id: 'ch-1', name: 'Support' } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     await client.getAccount()
     await client.getChannel('ch-1')
 
@@ -87,7 +89,7 @@ describe('ChannelClient', () => {
     mockResponse({ errors: [{ message: 'Rate limited' }] }, 429, { 'Retry-After': '0.05' })
     mockResponse({ account: { id: 'acc-1', name: 'Desk Owner', email: 'owner@example.com', emailVerified: true, language: 'en', country: 'KR', createdAt: 1 } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const start = Date.now()
     const account = await client.getAccount()
     const elapsed = Date.now() - start
@@ -102,7 +104,7 @@ describe('ChannelClient', () => {
     mockResponse({ errors: [{ message: 'Server error' }] }, 500)
     mockResponse({ account: { id: 'acc-1', name: 'Desk Owner', email: 'owner@example.com', emailVerified: true, language: 'en', country: 'KR', createdAt: 1 } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const start = Date.now()
     const account = await client.getAccount()
     const elapsed = Date.now() - start
@@ -115,7 +117,7 @@ describe('ChannelClient', () => {
   test('4xx non-429 throws immediately without retry', async () => {
     mockResponse({ type: 'forbidden', errors: [{ message: 'Forbidden' }] }, 403)
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     await expect(client.getAccount()).rejects.toThrow(ChannelError)
     expect(fetchCalls).toHaveLength(1)
   })
@@ -129,7 +131,7 @@ describe('ChannelClient', () => {
       throw new Error('socket hang up')
     }
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
 
     try {
       await client.getAccount()
@@ -144,7 +146,7 @@ describe('ChannelClient', () => {
   test('204 response returns undefined', async () => {
     mockResponse(null, 204)
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const result = await (client as unknown as { request: <T>(method: string, path: string) => Promise<T> }).request<void>('GET', '/desk/account')
 
     expect(result).toBeUndefined()
@@ -168,7 +170,7 @@ describe('ChannelClient', () => {
   test('listChannels includes query params', async () => {
     mockResponse({ channels: [{ id: 'ch-1', name: 'Support' }] })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const channels = await client.listChannels({ limit: 500 })
 
     expect(channels[0]?.id).toBe('ch-1')
@@ -178,7 +180,7 @@ describe('ChannelClient', () => {
   test('getChannel uses the channel detail endpoint', async () => {
     mockResponse({ channel: { id: 'ch-1', name: 'Support' } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     await client.getChannel('ch-1')
 
     expect(fetchCalls[0].url).toBe('https://desk-api.channel.io/desk/channels/ch-1')
@@ -187,7 +189,7 @@ describe('ChannelClient', () => {
   test('listManagers uses the managers endpoint', async () => {
     mockResponse({ managers: [{ id: 'mgr-1', channelId: 'ch-1', accountId: 'acc-1', name: 'Alex' }] })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const managers = await client.listManagers('ch-1', { limit: 200 })
 
     expect(managers[0]?.id).toBe('mgr-1')
@@ -197,7 +199,7 @@ describe('ChannelClient', () => {
   test('getManagerRole unwraps the role response', async () => {
     mockResponse({ role: { permissions: ['read'] } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const role = await client.getManagerRole('ch-1')
 
     expect(role).toEqual({ permissions: ['read'] })
@@ -209,7 +211,7 @@ describe('ChannelClient', () => {
     mockResponse({ group: { id: 'grp-1', channelId: 'ch-1', name: 'ops' } })
     mockResponse({ messages: [{ id: 'msg-1' }] })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     await client.listGroups('ch-1', { limit: 500 })
     await client.getGroup('ch-1', 'grp-1')
     await client.getGroupMessages('ch-1', 'grp-1', { sortOrder: 'desc', limit: 100, since: 'cursor-1' })
@@ -227,7 +229,7 @@ describe('ChannelClient', () => {
   test('sendGroupMessage includes requestId in the body', async () => {
     mockResponse({ message: { id: 'msg-1', requestId: 'req-123' } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const blocks = ChannelClient.wrapTextInBlocks('hello group')
     await client.sendGroupMessage('ch-1', 'grp-1', blocks, 'req-123')
 
@@ -241,7 +243,7 @@ describe('ChannelClient', () => {
     mockResponse({ messages: [{ id: 'msg-1' }] })
     mockResponse({ message: { id: 'msg-2', requestId: 'req-234' } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const blocks = ChannelClient.wrapTextInBlocks('hello dm')
 
     await client.listDirectChats('ch-1', { limit: 200 })
@@ -260,7 +262,7 @@ describe('ChannelClient', () => {
     mockResponse({ messages: [{ id: 'msg-1' }] })
     mockResponse({ message: { id: 'msg-2', requestId: 'req-345' } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const blocks = ChannelClient.wrapTextInBlocks('hello user')
 
     await client.listUserChats('ch-1', { state: 'opened', limit: 25 })
@@ -278,7 +280,7 @@ describe('ChannelClient', () => {
   test('listBots uses the bots endpoint', async () => {
     mockResponse({ bots: [{ id: 'bot-1', channelId: 'ch-1', name: 'DeskBot' }] })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const bots = await client.listBots('ch-1', { limit: 1000 })
 
     expect(bots[0]?.id).toBe('bot-1')
@@ -288,7 +290,7 @@ describe('ChannelClient', () => {
   test('5xx on POST does not retry', async () => {
     mockResponse({ type: 'server_error', errors: [{ message: 'Server error' }] }, 500)
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     await expect(client.sendGroupMessage('ch-1', 'grp-1', ChannelClient.wrapTextInBlocks('hello'), 'req-123')).rejects.toThrow(ChannelError)
     expect(fetchCalls).toHaveLength(1)
   })
@@ -296,7 +298,7 @@ describe('ChannelClient', () => {
   test('error responses use desk API error fields', async () => {
     mockResponse({ type: 'not_found', status: 404, errors: [{ message: 'Missing resource' }], language: 'en' }, 404)
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
 
     try {
       await client.getChannel('missing')
@@ -315,7 +317,7 @@ describe('ChannelClient', () => {
     })
     mockResponse({ account: { id: 'acc-2', name: 'Desk Owner', email: 'owner@example.com', emailVerified: true, language: 'en', country: 'KR', createdAt: 2 } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     await client.getAccount()
 
     const start = Date.now()
@@ -329,7 +331,7 @@ describe('ChannelClient', () => {
   test('generated requests still include the cookie header on post endpoints', async () => {
     mockResponse({ message: { id: 'msg-1' } })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     await client.sendDirectChatMessage('ch-1', 'dm-1', ChannelClient.wrapTextInBlocks('hello'), 'req-999')
 
     expect(getHeaders().Cookie).toBe('x-account=account-cookie; ch-session-1=session-cookie')
@@ -344,7 +346,7 @@ describe('ChannelClient', () => {
     }
     mockResponse(searchResponse)
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const result = await client.searchTeamChatMessages('ch-1', 'hello world', { limit: 10 })
 
     const url = new URL(fetchCalls[0].url)
@@ -363,7 +365,7 @@ describe('ChannelClient', () => {
     }
     mockResponse(searchResponse)
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     const result = await client.searchUserChatMessages('ch-1', 'test query')
 
     const url = new URL(fetchCalls[0].url)
@@ -375,7 +377,7 @@ describe('ChannelClient', () => {
   test('searchTeamChatMessages works without limit parameter', async () => {
     mockResponse({ hits: [], bots: [], sessions: [] })
 
-    const client = new ChannelClient('account-cookie', 'session-cookie')
+    const client = await new ChannelClient().login({ accountCookie: 'account-cookie', sessionCookie: 'session-cookie' })
     await client.searchTeamChatMessages('ch-1', 'test')
 
     const url = new URL(fetchCalls[0].url)

package/src/platforms/channeltalk/client.ts

@@ -11,6 +11,7 @@ import type {
   MessageBlock,
 } from './types'
 import { ChannelError } from './types'
+import { ChannelCredentialManager } from './credential-manager'
 
 const BASE_URL = 'https://desk-api.channel.io'
 const MAX_RETRIES = 3
@@ -23,18 +24,37 @@ interface ChannelApiErrorResponse {
 }
 
 export class ChannelClient {
-  private accountCookie: string
+  private accountCookie: string | null = null
   private sessionCookie: string | undefined
   private rateLimitRemaining: number | null = null
   private rateLimitResetAt = 0
 
-  constructor(accountCookie: string, sessionCookie?: string) {
-    if (!accountCookie) {
-      throw new ChannelError('Account cookie is required', 'missing_account_cookie')
+  async login(credentials?: { accountCookie: string; sessionCookie?: string }): Promise<this> {
+    if (credentials) {
+      if (!credentials.accountCookie) {
+        throw new ChannelError('Account cookie is required', 'missing_account_cookie')
+      }
+      this.accountCookie = credentials.accountCookie
+      this.sessionCookie = credentials.sessionCookie
+      return this
     }
 
-    this.accountCookie = accountCookie
-    this.sessionCookie = sessionCookie
+    const { ensureChannelAuth } = await import('./ensure-auth')
+    await ensureChannelAuth()
+    const creds = await new ChannelCredentialManager().getCredentials()
+    if (!creds) {
+      throw new ChannelError(
+        'No Channel Talk credentials found. Make sure Channel Talk desktop app is installed and logged in.',
+        'no_credentials',
+      )
+    }
+    return this.login({ accountCookie: creds.account_cookie, sessionCookie: creds.session_cookie ?? undefined })
+  }
+
+  private ensureAuth(): void {
+    if (this.accountCookie === null) {
+      throw new ChannelError('Not authenticated. Call .login() first.', 'not_authenticated')
+    }
   }
 
   static wrapTextInBlocks(text: string): MessageBlock[] {
@@ -222,8 +242,8 @@ export class ChannelClient {
   private getHeaders(): Record<string, string> {
     return {
       Cookie: this.sessionCookie
-        ? `x-account=${this.accountCookie}; ch-session-1=${this.sessionCookie}`
-        : `x-account=${this.accountCookie}`,
+        ? `x-account=${this.accountCookie!}; ch-session-1=${this.sessionCookie}`
+        : `x-account=${this.accountCookie!}`,
       'Content-Type': 'application/json',
     }
   }
@@ -255,6 +275,7 @@ export class ChannelClient {
   }
 
   private async request<T>(method: string, path: string, body?: unknown, unwrapKey?: string): Promise<T> {
+    this.ensureAuth()
     const url = `${BASE_URL}${path}`
     let lastError: Error | undefined
 

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

@@ -50,15 +50,17 @@ type ChannelCredentialManagerLike = Pick<
 >
 type ChannelTokenExtractorLike = Pick<ChannelTokenExtractor, 'extract'>
 
-let createChannelClient = (accountCookie: string, sessionCookie?: string): ChannelClientLike =>
-  new ChannelClient(accountCookie, sessionCookie)
+let createChannelClient: (accountCookie: string, sessionCookie?: string) => ChannelClientLike | Promise<ChannelClientLike> = async (
+  accountCookie: string,
+  sessionCookie?: string,
+): Promise<ChannelClientLike> => new ChannelClient().login({ accountCookie, sessionCookie })
 
 let createCredentialManager = (): ChannelCredentialManagerLike => new ChannelCredentialManager()
 
 let createTokenExtractor = (): ChannelTokenExtractorLike => new ChannelTokenExtractor()
 
 export function setChannelAuthCommandDependenciesForTesting(dependencies: {
-  createChannelClient?: (accountCookie: string, sessionCookie?: string) => ChannelClientLike
+  createChannelClient?: (accountCookie: string, sessionCookie?: string) => ChannelClientLike | Promise<ChannelClientLike>
   createCredentialManager?: () => ChannelCredentialManagerLike
   createTokenExtractor?: () => ChannelTokenExtractorLike
 }): void {
@@ -68,8 +70,8 @@ export function setChannelAuthCommandDependenciesForTesting(dependencies: {
 }
 
 export function resetChannelAuthCommandDependenciesForTesting(): void {
-  createChannelClient = (accountCookie: string, sessionCookie?: string): ChannelClientLike =>
-    new ChannelClient(accountCookie, sessionCookie)
+  createChannelClient = async (accountCookie: string, sessionCookie?: string): Promise<ChannelClientLike> =>
+    new ChannelClient().login({ accountCookie, sessionCookie })
   createCredentialManager = (): ChannelCredentialManagerLike => new ChannelCredentialManager()
   createTokenExtractor = (): ChannelTokenExtractorLike => new ChannelTokenExtractor()
 }
@@ -86,7 +88,7 @@ export async function extractAction(options: ActionOptions = {}): Promise<Extrac
       }
     }
 
-    const client = createChannelClient(extracted.accountCookie, extracted.sessionCookie)
+    const client = await createChannelClient(extracted.accountCookie, extracted.sessionCookie)
     const account = await client.getAccount()
     const channels = await client.listChannels()
 
@@ -141,7 +143,7 @@ export async function statusAction(options: ActionOptions = {}): Promise<StatusR
     const storedWorkspace = (await credManager.listAll()).find((workspace) => workspace.workspace_id === creds.workspace_id)
 
     try {
-      const client = createChannelClient(creds.account_cookie, creds.session_cookie ?? undefined)
+      const client = await createChannelClient(creds.account_cookie, creds.session_cookie ?? undefined)
       const account = await client.getAccount()
 
       return {

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

@@ -14,7 +14,7 @@ export async function getClient(options: SharedOptions = {}): Promise<ChannelCli
     throw new Error('No credentials. Run "agent-channeltalk auth extract" first.')
   }
 
-  return new ChannelClient(creds.account_cookie, creds.session_cookie)
+  return new ChannelClient().login({ accountCookie: creds.account_cookie, sessionCookie: creds.session_cookie })
 }
 
 export async function getCurrentWorkspaceId(options: SharedOptions = {}): Promise<string> {

package/src/platforms/channeltalk/ensure-auth.ts

@@ -9,13 +9,15 @@ type ChannelCredentialManagerLike = Pick<
 >
 type ChannelTokenExtractorLike = Pick<ChannelTokenExtractor, 'extract'>
 
-let createChannelClient = (accountCookie: string, sessionCookie?: string): ChannelClientLike =>
-  new ChannelClient(accountCookie, sessionCookie)
+let createChannelClient: (accountCookie: string, sessionCookie?: string) => ChannelClientLike | Promise<ChannelClientLike> = async (
+  accountCookie: string,
+  sessionCookie?: string,
+): Promise<ChannelClientLike> => new ChannelClient().login({ accountCookie, sessionCookie })
 let createCredentialManager = (): ChannelCredentialManagerLike => new ChannelCredentialManager()
 let createTokenExtractor = (): ChannelTokenExtractorLike => new ChannelTokenExtractor()
 
 export function setEnsureChannelAuthDependenciesForTesting(deps: {
-  createClient?: (accountCookie: string, sessionCookie?: string) => ChannelClientLike
+  createClient?: (accountCookie: string, sessionCookie?: string) => ChannelClientLike | Promise<ChannelClientLike>
   createCredentialManager?: () => ChannelCredentialManagerLike
   createTokenExtractor?: () => ChannelTokenExtractorLike
 }): void {
@@ -25,15 +27,15 @@ export function setEnsureChannelAuthDependenciesForTesting(deps: {
 }
 
 export function resetEnsureChannelAuthDependenciesForTesting(): void {
-  createChannelClient = (accountCookie: string, sessionCookie?: string): ChannelClientLike =>
-    new ChannelClient(accountCookie, sessionCookie)
+  createChannelClient = async (accountCookie: string, sessionCookie?: string): Promise<ChannelClientLike> =>
+    new ChannelClient().login({ accountCookie, sessionCookie })
   createCredentialManager = () => new ChannelCredentialManager()
   createTokenExtractor = () => new ChannelTokenExtractor()
 }
 
 // Keep old API for backward compatibility
 export const setEnsureChannelAuthClientFactoryForTesting = (
-  factory: (accountCookie: string, sessionCookie?: string) => ChannelClientLike,
+  factory: (accountCookie: string, sessionCookie?: string) => ChannelClientLike | Promise<ChannelClientLike>,
 ): void => setEnsureChannelAuthDependenciesForTesting({ createClient: factory })
 
 export const resetEnsureChannelAuthClientFactoryForTesting = (): void =>
@@ -46,7 +48,7 @@ export async function ensureChannelAuth(): Promise<void> {
 
     if (creds) {
       try {
-        const client = createChannelClient(creds.account_cookie, creds.session_cookie ?? undefined)
+        const client = await createChannelClient(creds.account_cookie, creds.session_cookie ?? undefined)
         await client.getAccount()
         return
       } catch {
@@ -60,7 +62,7 @@ export async function ensureChannelAuth(): Promise<void> {
       return
     }
 
-    const client = createChannelClient(extracted.accountCookie, extracted.sessionCookie)
+    const client = await createChannelClient(extracted.accountCookie, extracted.sessionCookie)
     const account = await client.getAccount()
     const channels = await client.listChannels()
     if (channels.length === 0) {