@zhafron/opencode-kiro-auth 1.3.0 → 1.3.1

package/dist/plugin/accounts.js

@@ -91,18 +91,29 @@ export class AccountManager {
             }
             return !(a.rateLimitResetTime && now < a.rateLimitResetTime);
         });
-        if (available.length === 0)
-            return null;
         let selected;
-        if (this.strategy === 'sticky') {
-            selected = available.find((_, i) => i === this.cursor) || available[0];
-        }
-        else if (this.strategy === 'round-robin') {
-            selected = available[this.cursor % available.length];
-            this.cursor = (this.cursor + 1) % available.length;
+        if (available.length > 0) {
+            if (this.strategy === 'sticky') {
+                selected = available.find((_, i) => i === this.cursor) || available[0];
+            }
+            else if (this.strategy === 'round-robin') {
+                selected = available[this.cursor % available.length];
+                this.cursor = (this.cursor + 1) % available.length;
+            }
+            else if (this.strategy === 'lowest-usage') {
+                selected = [...available].sort((a, b) => (a.usedCount || 0) - (b.usedCount || 0) || (a.lastUsed || 0) - (b.lastUsed || 0))[0];
+            }
         }
-        else if (this.strategy === 'lowest-usage') {
-            selected = [...available].sort((a, b) => (a.usedCount || 0) - (b.usedCount || 0) || (a.lastUsed || 0) - (b.lastUsed || 0))[0];
+        if (!selected) {
+            const fallback = this.accounts
+                .filter((a) => !a.isHealthy)
+                .sort((a, b) => (a.usedCount || 0) - (b.usedCount || 0) || (a.lastUsed || 0) - (b.lastUsed || 0))[0];
+            if (fallback) {
+                fallback.isHealthy = true;
+                delete fallback.unhealthyReason;
+                delete fallback.recoveryTime;
+                selected = fallback;
+            }
         }
         if (selected) {
             selected.lastUsed = now;
@@ -175,7 +186,7 @@ export class AccountManager {
         if (acc) {
             acc.isHealthy = false;
             acc.unhealthyReason = reason;
-            acc.recoveryTime = recovery;
+            acc.recoveryTime = recovery || Date.now() + 3600000;
             kiroDb.upsertAccount(acc);
         }
     }

package/dist/plugin/storage/sqlite.d.ts

@@ -9,8 +9,6 @@ export declare class KiroDatabase {
     deleteAccount(id: string): void;
     getUsage(): Record<string, UsageMetadata>;
     upsertUsage(id: string, meta: UsageMetadata): void;
-    getSetting(key: string): string | null;
-    setSetting(key: string, value: string): void;
     close(): void;
 }
 export declare const kiroDb: KiroDatabase;

package/dist/plugin/storage/sqlite.js

@@ -37,7 +37,6 @@ export class KiroDatabase {
         FOREIGN KEY(account_id) REFERENCES accounts(id) ON DELETE CASCADE
       )
     `);
-        this.db.run('CREATE TABLE IF NOT EXISTS settings (key TEXT PRIMARY KEY, value TEXT)');
     }
     getAccounts() {
         return this.db.prepare('SELECT * FROM accounts').all();
@@ -88,15 +87,6 @@ export class KiroDatabase {
     `)
             .run(id, meta.usedCount, meta.limitCount, meta.realEmail || null, meta.lastSync);
     }
-    getSetting(key) {
-        const row = this.db.prepare('SELECT value FROM settings WHERE key = ?').get(key);
-        return row ? row.value : null;
-    }
-    setSetting(key, value) {
-        this.db
-            .prepare('INSERT INTO settings (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value=excluded.value')
-            .run(key, value);
-    }
     close() {
         this.db.close();
     }

package/dist/plugin/sync/kiro-cli.js

@@ -47,7 +47,7 @@ export async function syncFromKiroCli() {
                 const id = createDeterministicAccountId(email, authMethod, clientId, data.profile_arn);
                 const existing = kiroDb.getAccounts().find((a) => a.id === id);
                 const cliExpiresAt = data.expires_at ? new Date(data.expires_at).getTime() : 0;
-                if (existing && existing.expires_at >= cliExpiresAt)
+                if (existing && existing.is_healthy === 1 && existing.expires_at >= cliExpiresAt)
                     continue;
                 kiroDb.upsertAccount({
                     id,
@@ -77,7 +77,7 @@ export async function writeToKiroCli(acc) {
         return;
     try {
         const cliDb = new Database(dbPath);
-        cliDb.exec('PRAGMA busy_timeout = 5000');
+        cliDb.run('PRAGMA busy_timeout = 5000');
         const rows = cliDb.prepare('SELECT key, value FROM auth_kv').all();
         const targetKey = acc.authMethod === 'idc' ? 'kirocli:odic:token' : 'kirocli:social:token';
         const row = rows.find((r) => r.key === targetKey || r.key.endsWith(targetKey));

package/dist/plugin.js

@@ -87,6 +87,14 @@ export const createKiroPlugin = (id) => async ({ client, directory }) => {
                                 }
                                 throw new Error('All accounts are unhealthy or rate-limited');
                             }
+                            if (count > 1 && am.shouldShowToast())
+                                showToast(`Using ${acc.realEmail || acc.email} (${am.getAccounts().indexOf(acc) + 1}/${count})`, 'info');
+                            if (am.shouldShowUsageToast() &&
+                                acc.usedCount !== undefined &&
+                                acc.limitCount !== undefined) {
+                                const p = acc.limitCount > 0 ? (acc.usedCount / acc.limitCount) * 100 : 0;
+                                showToast(formatUsageMessage(acc.usedCount, acc.limitCount, acc.realEmail || acc.email), p >= 80 ? 'warning' : 'info');
+                            }
                             const auth = am.toAuthDetails(acc);
                             if (accessTokenExpired(auth, config.token_expiry_buffer_ms)) {
                                 try {
@@ -294,10 +302,9 @@ export const createKiroPlugin = (id) => async ({ client, directory }) => {
                             const accounts = [];
                             let startFresh = true;
                             const existingAm = await AccountManager.loadFromDisk(config.account_selection_strategy);
-                            const allAccounts = existingAm.getAccounts();
-                            const idcAccounts = allAccounts.filter((a) => a.authMethod === 'idc');
-                            if (idcAccounts.length > 0) {
-                                const existingAccounts = idcAccounts.map((acc, idx) => ({
+                            const idcAccs = existingAm.getAccounts().filter((a) => a.authMethod === 'idc');
+                            if (idcAccs.length > 0) {
+                                const existingAccounts = idcAccs.map((acc, idx) => ({
                                     email: acc.realEmail || acc.email,
                                     index: idx
                                 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhafron/opencode-kiro-auth",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "OpenCode plugin for AWS Kiro (CodeWhisperer) providing access to Claude models",
   "type": "module",
   "main": "dist/index.js",