@sunerpy/opencode-kiro-auth 0.2.1 → 0.2.2

package/dist/core/auth/auth-handler.d.ts

@@ -17,8 +17,19 @@ export declare class AuthHandler {
     /** Ends the auth flow cleanly with no key prompt and no credential written. */
     private endWithoutCredential;
     /**
-     * Self-drawn account-removal flow returning method:'auto' + failed-callback in
-     * all cases, so the auth flow ends with no key prompt and NO credential written.
+     * Ends the flow after a successful deletion. If a healthy account (or any
+     * account with a usable access token) remains, returns a SUCCESS callback
+     * keyed on that account's token so OpenCode shows success and persists a
+     * still-valid credential. If nothing usable remains, falls back to a failed
+     * callback (nothing left to authorize with).
+     */
+    private endWithRemainingCredentialOrFailed;
+    /**
+     * Self-drawn account-removal flow. No-op paths (cancel / no accounts /
+     * not-confirmed / non-TTY) end with method:'auto' + a failed callback so no
+     * key prompt appears and no bogus success is shown. The actual-deletion path
+     * ends with a remaining-account success (or failed if none remain), so a
+     * successful removal is not misreported as "Failed to authorize".
      */
     private authorizeRemoveAccounts;
 }

package/dist/core/auth/auth-handler.js

@@ -215,8 +215,34 @@ export class AuthHandler {
         };
     }
     /**
-     * Self-drawn account-removal flow returning method:'auto' + failed-callback in
-     * all cases, so the auth flow ends with no key prompt and NO credential written.
+     * Ends the flow after a successful deletion. If a healthy account (or any
+     * account with a usable access token) remains, returns a SUCCESS callback
+     * keyed on that account's token so OpenCode shows success and persists a
+     * still-valid credential. If nothing usable remains, falls back to a failed
+     * callback (nothing left to authorize with).
+     */
+    endWithRemainingCredentialOrFailed(instructions) {
+        const remaining = this.accountManager?.getAccounts?.() ?? [];
+        const hasToken = (acc) => typeof acc?.accessToken === 'string' && acc.accessToken.length > 0;
+        const fallback = remaining.find((acc) => acc?.isHealthy && hasToken(acc)) ??
+            remaining.find((acc) => hasToken(acc));
+        if (fallback) {
+            const key = fallback.accessToken;
+            return {
+                url: '',
+                instructions: `${instructions} Using ${fallback.email || 'a remaining account'} for future requests.`,
+                method: 'auto',
+                callback: async () => ({ type: 'success', key })
+            };
+        }
+        return this.endWithoutCredential(`${instructions} No accounts remain — run \`opencode auth login\` to reauthenticate.`);
+    }
+    /**
+     * Self-drawn account-removal flow. No-op paths (cancel / no accounts /
+     * not-confirmed / non-TTY) end with method:'auto' + a failed callback so no
+     * key prompt appears and no bogus success is shown. The actual-deletion path
+     * ends with a remaining-account success (or failed if none remain), so a
+     * successful removal is not misreported as "Failed to authorize".
      */
     async authorizeRemoveAccounts() {
         const accounts = this.accountManager?.getAccounts?.() ?? [];
@@ -248,6 +274,6 @@ export class AuthHandler {
         this.accountManager.removeAccount(target);
         logger.log('Removed Kiro account', { email: target.email, accountId: String(target.id) });
         process.stdout.write('Account deleted.\n');
-        return this.endWithoutCredential(`Account deleted: ${target.email || 'unknown'}.`);
+        return this.endWithRemainingCredentialOrFailed(`Account deleted: ${target.email || 'unknown'}.`);
     }
 }

package/package.json

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