@zhafron/opencode-kiro-auth 1.0.0 → 1.1.1

package/dist/plugin.js

@@ -72,8 +72,41 @@ export const createKiroPlugin = (id) => async ({ client, directory }) => {
                                 }
                             }
                             const prep = transformToCodeWhisperer(url, init?.body, model, auth, think, budget);
+                            const apiTimestamp = config.enable_log_api_request ? logger.getTimestamp() : null;
+                            if (config.enable_log_api_request && apiTimestamp) {
+                                let parsedBody = null;
+                                if (prep.init.body && typeof prep.init.body === 'string') {
+                                    try {
+                                        parsedBody = JSON.parse(prep.init.body);
+                                    }
+                                    catch (e) {
+                                        parsedBody = prep.init.body;
+                                    }
+                                }
+                                logger.logApiRequest({
+                                    url: prep.url,
+                                    method: prep.init.method,
+                                    headers: prep.init.headers,
+                                    body: parsedBody,
+                                    conversationId: prep.conversationId,
+                                    model: prep.effectiveModel
+                                }, apiTimestamp);
+                            }
                             try {
                                 const res = await fetch(prep.url, prep.init);
+                                if (config.enable_log_api_request && apiTimestamp) {
+                                    const responseHeaders = {};
+                                    res.headers.forEach((value, key) => {
+                                        responseHeaders[key] = value;
+                                    });
+                                    logger.logApiResponse({
+                                        status: res.status,
+                                        statusText: res.statusText,
+                                        headers: responseHeaders,
+                                        conversationId: prep.conversationId,
+                                        model: prep.effectiveModel
+                                    }, apiTimestamp);
+                                }
                                 if (res.ok) {
                                     if (config.usage_tracking_enabled)
                                         fetchUsageLimits(auth)
@@ -104,16 +137,31 @@ export const createKiroPlugin = (id) => async ({ client, directory }) => {
                                         object: 'chat.completion',
                                         created: Math.floor(Date.now() / 1000),
                                         model,
-                                        choices: [{ index: 0, message: { role: 'assistant', content: p.content }, finish_reason: p.stopReason === 'tool_use' ? 'tool_calls' : 'stop' }],
-                                        usage: { prompt_tokens: p.inputTokens || 0, completion_tokens: p.outputTokens || 0, total_tokens: (p.inputTokens || 0) + (p.outputTokens || 0) }
+                                        choices: [
+                                            {
+                                                index: 0,
+                                                message: { role: 'assistant', content: p.content },
+                                                finish_reason: p.stopReason === 'tool_use' ? 'tool_calls' : 'stop'
+                                            }
+                                        ],
+                                        usage: {
+                                            prompt_tokens: p.inputTokens || 0,
+                                            completion_tokens: p.outputTokens || 0,
+                                            total_tokens: (p.inputTokens || 0) + (p.outputTokens || 0)
+                                        }
                                     };
                                     if (p.toolCalls.length > 0)
                                         oai.choices[0].message.tool_calls = p.toolCalls.map((tc) => ({
                                             id: tc.toolUseId,
                                             type: 'function',
-                                            function: { name: tc.name, arguments: typeof tc.input === 'string' ? tc.input : JSON.stringify(tc.input) }
+                                            function: {
+                                                name: tc.name,
+                                                arguments: typeof tc.input === 'string' ? tc.input : JSON.stringify(tc.input)
+                                            }
                                         }));
-                                    return new Response(JSON.stringify(oai), { headers: { 'Content-Type': 'application/json' } });
+                                    return new Response(JSON.stringify(oai), {
+                                        headers: { 'Content-Type': 'application/json' }
+                                    });
                                 }
                                 if (res.status === 401 && retry < config.rate_limit_max_retries) {
                                     logger.warn(`Unauthorized (401) on ${acc.email}, retrying...`);
@@ -140,9 +188,30 @@ export const createKiroPlugin = (id) => async ({ client, directory }) => {
                                     await am.saveToDisk();
                                     continue;
                                 }
+                                if (config.enable_log_api_request && apiTimestamp) {
+                                    const responseHeaders = {};
+                                    res.headers.forEach((value, key) => {
+                                        responseHeaders[key] = value;
+                                    });
+                                    logger.logApiResponse({
+                                        status: res.status,
+                                        statusText: res.statusText,
+                                        headers: responseHeaders,
+                                        error: `Kiro Error: ${res.status}`,
+                                        conversationId: prep.conversationId,
+                                        model: prep.effectiveModel
+                                    }, apiTimestamp);
+                                }
                                 throw new Error(`Kiro Error: ${res.status}`);
                             }
                             catch (e) {
+                                if (config.enable_log_api_request && apiTimestamp) {
+                                    logger.logApiResponse({
+                                        error: String(e),
+                                        conversationId: prep.conversationId,
+                                        model: prep.effectiveModel
+                                    }, apiTimestamp);
+                                }
                                 if (isNetworkError(e) && retry < config.rate_limit_max_retries) {
                                     const delay = 5000 * Math.pow(2, retry);
                                     showToast(`Network error. Retrying in ${Math.ceil(delay / 1000)}s...`, 'warning');
@@ -188,7 +257,12 @@ export const createKiroPlugin = (id) => async ({ client, directory }) => {
                                     };
                                     try {
                                         const u = await fetchUsageLimits({
-                                            refresh: encodeRefreshToken({ refreshToken: res.refreshToken, clientId: res.clientId, clientSecret: res.clientSecret, authMethod: 'idc' }),
+                                            refresh: encodeRefreshToken({
+                                                refreshToken: res.refreshToken,
+                                                clientId: res.clientId,
+                                                clientSecret: res.clientSecret,
+                                                authMethod: 'idc'
+                                            }),
                                             access: res.accessToken,
                                             expires: res.expiresAt,
                                             authMethod: 'idc',
@@ -197,7 +271,11 @@ export const createKiroPlugin = (id) => async ({ client, directory }) => {
                                             clientSecret: res.clientSecret,
                                             email: res.email
                                         });
-                                        am.updateUsage(acc.id, { usedCount: u.usedCount, limitCount: u.limitCount, realEmail: u.email });
+                                        am.updateUsage(acc.id, {
+                                            usedCount: u.usedCount,
+                                            limitCount: u.limitCount,
+                                            realEmail: u.email
+                                        });
                                     }
                                     catch (e) {
                                         logger.warn(`Initial usage fetch failed: ${e.message}`);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@zhafron/opencode-kiro-auth",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "OpenCode plugin for AWS Kiro (CodeWhisperer) providing access to Claude models",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
-    "format": "prettier --write --no-config --no-semi --single-quote --trailing-comma none --print-width 200 'src/**/*.ts'",
+    "format": "prettier --write --no-config --no-semi --single-quote --trailing-comma none --print-width 100 'src/**/*.ts'",
     "typecheck": "tsc --noEmit"
   },
   "keywords": [

package/dist/kiro/oauth-social.d.ts

@@ -1,17 +0,0 @@
-import type { KiroRegion } from '../plugin/types';
-export interface KiroSocialAuthorization {
-    url: string;
-    verifier: string;
-    region: KiroRegion;
-}
-export interface KiroSocialTokenResult {
-    refreshToken: string;
-    accessToken: string;
-    expiresAt: number;
-    email: string;
-    profileArn: string;
-    region: KiroRegion;
-    authMethod: 'social';
-}
-export declare function authorizeKiroSocial(port: number, state: string, challenge: string, region?: KiroRegion): Promise<string>;
-export declare function exchangeKiroSocial(code: string, verifier: string, region: KiroRegion, port: number): Promise<KiroSocialTokenResult>;

package/dist/kiro/oauth-social.js

@@ -1,51 +0,0 @@
-import { KIRO_AUTH_SERVICE, KIRO_CONSTANTS } from '../constants';
-export async function authorizeKiroSocial(port, state, challenge, region) {
-    const effectiveRegion = region || KIRO_CONSTANTS.DEFAULT_REGION;
-    const authServiceEndpoint = KIRO_AUTH_SERVICE.ENDPOINT.replace('{{region}}', effectiveRegion);
-    const redirectUri = `http://127.0.0.1:${port}/oauth/callback`;
-    const params = new URLSearchParams({
-        idp: 'Google',
-        redirect_uri: redirectUri,
-        code_challenge: challenge,
-        code_challenge_method: 'S256',
-        state: state,
-        prompt: 'select_account',
-    });
-    return `${authServiceEndpoint}/login?${params.toString()}`;
-}
-export async function exchangeKiroSocial(code, verifier, region, port) {
-    const authServiceEndpoint = KIRO_AUTH_SERVICE.ENDPOINT.replace('{{region}}', region);
-    const redirectUri = `http://127.0.0.1:${port}/oauth/callback`;
-    const tokenResponse = await fetch(`${authServiceEndpoint}/oauth/token`, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            'User-Agent': KIRO_CONSTANTS.USER_AGENT,
-        },
-        body: JSON.stringify({
-            code,
-            code_verifier: verifier,
-            redirect_uri: redirectUri,
-        }),
-    });
-    if (!tokenResponse.ok) {
-        const errorText = await tokenResponse.text();
-        throw new Error(`Token exchange failed: ${tokenResponse.status} ${errorText}`);
-    }
-    const tokenData = await tokenResponse.json();
-    if (!tokenData.accessToken || !tokenData.refreshToken || !tokenData.profileArn) {
-        throw new Error('Invalid token response: missing required fields');
-    }
-    const expiresIn = tokenData.expiresIn || 3600;
-    const expiresAt = Date.now() + expiresIn * 1000;
-    const email = tokenData.email || 'unknown@kiro.dev';
-    return {
-        refreshToken: tokenData.refreshToken,
-        accessToken: tokenData.accessToken,
-        expiresAt,
-        email,
-        profileArn: tokenData.profileArn,
-        region,
-        authMethod: 'social',
-    };
-}

package/dist/plugin/cli.d.ts

@@ -1,6 +0,0 @@
-import type { KiroAuthMethod, KiroRegion } from './types';
-export declare function promptAuthMethod(): Promise<KiroAuthMethod>;
-export declare function promptRegion(): Promise<KiroRegion>;
-export declare function promptConfirmation(message: string): Promise<boolean>;
-export declare function displayAuthUrl(url: string): void;
-export declare function cleanup(): void;

package/dist/plugin/cli.js

@@ -1,98 +0,0 @@
-import { createInterface } from 'node:readline';
-import * as logger from './logger';
-let rl = null;
-function getReadline() {
-    if (!rl) {
-        rl = createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
-        rl.on('SIGINT', () => {
-            logger.log('Received SIGINT, closing readline');
-            closeReadline();
-            process.exit(130);
-        });
-    }
-    return rl;
-}
-function closeReadline() {
-    if (rl) {
-        rl.close();
-        rl = null;
-    }
-}
-function question(prompt) {
-    return new Promise((resolve) => {
-        const readline = getReadline();
-        readline.question(prompt, (answer) => {
-            resolve(answer.trim());
-        });
-    });
-}
-function clearLine() {
-    if (process.stdout.isTTY) {
-        process.stdout.clearLine(0);
-        process.stdout.cursorTo(0);
-    }
-}
-export async function promptAuthMethod() {
-    console.log('\nSelect authentication method:');
-    console.log('  1. Social (GitHub, Google, etc.)');
-    console.log('  2. IDC (Identity Center)');
-    while (true) {
-        const answer = await question('\nEnter your choice (1 or 2): ');
-        if (answer === '1' || answer.toLowerCase() === 'social') {
-            clearLine();
-            return 'social';
-        }
-        if (answer === '2' || answer.toLowerCase() === 'idc') {
-            clearLine();
-            return 'idc';
-        }
-        console.log('Invalid choice. Please enter 1 or 2.');
-    }
-}
-export async function promptRegion() {
-    console.log('\nSelect AWS region:');
-    console.log('  1. us-east-1 (default)');
-    console.log('  2. us-west-2');
-    while (true) {
-        const answer = await question('\nEnter your choice (1 or 2, default: 1): ');
-        if (!answer || answer === '1' || answer.toLowerCase() === 'us-east-1') {
-            clearLine();
-            return 'us-east-1';
-        }
-        if (answer === '2' || answer.toLowerCase() === 'us-west-2') {
-            clearLine();
-            return 'us-west-2';
-        }
-        console.log('Invalid choice. Please enter 1 or 2.');
-    }
-}
-export async function promptConfirmation(message) {
-    while (true) {
-        const answer = await question(`${message} (y/n): `);
-        const lower = answer.toLowerCase();
-        if (lower === 'y' || lower === 'yes') {
-            clearLine();
-            return true;
-        }
-        if (lower === 'n' || lower === 'no') {
-            clearLine();
-            return false;
-        }
-        console.log('Invalid input. Please enter y or n.');
-    }
-}
-export function displayAuthUrl(url) {
-    console.log('\n' + '='.repeat(70));
-    console.log('Authentication Required');
-    console.log('='.repeat(70));
-    console.log('\nPlease open the following URL in your browser to authenticate:\n');
-    console.log(`  ${url}\n`);
-    console.log('Waiting for authentication to complete...');
-    console.log('='.repeat(70) + '\n');
-}
-export function cleanup() {
-    closeReadline();
-}

package/dist/plugin/debug.d.ts

@@ -1,2 +0,0 @@
-export declare function isDebugEnabled(): boolean;
-export declare function debugLog(context: string, message: string, data?: unknown): void;

package/dist/plugin/debug.js

@@ -1,9 +0,0 @@
-export function isDebugEnabled() {
-    return !!process.env.DEBUG;
-}
-export function debugLog(context, message, data) {
-    if (isDebugEnabled()) {
-        const formattedData = data !== undefined ? ` ${JSON.stringify(data)}` : '';
-        console.debug(`[${context}] ${message}${formattedData}`);
-    }
-}

package/dist/plugin/oauth-parser.d.ts

@@ -1,5 +0,0 @@
-export interface ParsedOAuthCallback {
-    code: string;
-    state: string;
-}
-export declare function parseOAuthCallbackInput(input: string): ParsedOAuthCallback;

package/dist/plugin/oauth-parser.js

@@ -1,23 +0,0 @@
-export function parseOAuthCallbackInput(input) {
-    const trimmed = input.trim();
-    try {
-        const url = new URL(trimmed);
-        const code = url.searchParams.get('code');
-        const state = url.searchParams.get('state');
-        if (!code || !state) {
-            throw new Error('Missing code or state in URL');
-        }
-        return { code, state };
-    }
-    catch {
-        const codeMatch = trimmed.match(/code=([^&\s]+)/);
-        const stateMatch = trimmed.match(/state=([^&\s]+)/);
-        if (codeMatch?.[1] && stateMatch?.[1]) {
-            return {
-                code: decodeURIComponent(codeMatch[1]),
-                state: decodeURIComponent(stateMatch[1]),
-            };
-        }
-        throw new Error('Invalid OAuth callback format. Expected full URL or query string with code and state parameters.');
-    }
-}

package/dist/plugin/quota.d.ts

@@ -1,15 +0,0 @@
-import { ManagedAccount } from './types';
-export type QuotaStatus = 'healthy' | 'warning' | 'exhausted';
-export interface QuotaInfo {
-    status: QuotaStatus;
-    used: number;
-    limit: number;
-    remaining: number;
-    percentage: number;
-    recoveryTime?: number;
-}
-export declare function checkQuotaStatus(account: ManagedAccount): QuotaStatus;
-export declare function updateAccountQuota(account: ManagedAccount, usage: any, accountManager?: any): void;
-export declare function sortAccountsByQuota(accounts: ManagedAccount[]): ManagedAccount[];
-export declare function filterHealthyAccounts(accounts: ManagedAccount[]): ManagedAccount[];
-export declare function getAccountWithMostQuota(accounts: ManagedAccount[]): ManagedAccount | null;

package/dist/plugin/quota.js

@@ -1,68 +0,0 @@
-import { calculateUsagePercentage, isQuotaExhausted, getRemainingCount } from './usage';
-const WARNING_THRESHOLD_PERCENT = 80;
-export function checkQuotaStatus(account) {
-    if (!account.usedCount || !account.limitCount) {
-        return 'healthy';
-    }
-    const usage = {
-        usedCount: account.usedCount,
-        limitCount: account.limitCount,
-    };
-    if (isQuotaExhausted(usage)) {
-        return 'exhausted';
-    }
-    const percentage = calculateUsagePercentage(usage);
-    if (percentage >= WARNING_THRESHOLD_PERCENT) {
-        return 'warning';
-    }
-    return 'healthy';
-}
-export function updateAccountQuota(account, usage, accountManager) {
-    const metadata = {
-        usedCount: typeof usage.usedCount === 'number' ? usage.usedCount : 0,
-        limitCount: typeof usage.limitCount === 'number' ? usage.limitCount : 0,
-        realEmail: usage.email
-    };
-    account.usedCount = metadata.usedCount;
-    account.limitCount = metadata.limitCount;
-    if (metadata.realEmail) {
-        account.realEmail = metadata.realEmail;
-    }
-    if (accountManager) {
-        accountManager.updateUsage(account.id, metadata);
-    }
-}
-export function sortAccountsByQuota(accounts) {
-    return [...accounts].sort((a, b) => {
-        const aRemaining = getRemainingQuota(a);
-        const bRemaining = getRemainingQuota(b);
-        return bRemaining - aRemaining;
-    });
-}
-function getRemainingQuota(account) {
-    if (!account.usedCount || !account.limitCount) {
-        return Infinity;
-    }
-    const usage = {
-        usedCount: account.usedCount,
-        limitCount: account.limitCount,
-    };
-    return getRemainingCount(usage);
-}
-export function filterHealthyAccounts(accounts) {
-    return accounts.filter(account => {
-        if (!account.isHealthy) {
-            return false;
-        }
-        const status = checkQuotaStatus(account);
-        return status !== 'exhausted';
-    });
-}
-export function getAccountWithMostQuota(accounts) {
-    const healthyAccounts = filterHealthyAccounts(accounts);
-    if (healthyAccounts.length === 0) {
-        return null;
-    }
-    const sorted = sortAccountsByQuota(healthyAccounts);
-    return sorted[0] || null;
-}

package/dist/plugin/recovery.d.ts

@@ -1,19 +0,0 @@
-export interface RecoveryState {
-    sessionId: string;
-    conversationId: string;
-    model: string;
-    lastMessageIndex: number;
-    errorCount: number;
-    lastError?: string;
-    timestamp: number;
-}
-export interface RecoveryStorage {
-    version: 1;
-    sessions: Record<string, RecoveryState>;
-}
-export interface SessionRecoveryHook {
-    handleSessionError(error: any, sessionId: string): Promise<boolean>;
-    isRecoverableError(error: any): boolean;
-    clearSession(sessionId: string): Promise<void>;
-}
-export declare function createSessionRecoveryHook(enabled: boolean, autoResume: boolean): SessionRecoveryHook;