@harars/opencode-switch-openai-auth-plugin 0.1.2 → 0.1.4

package/README.md

@@ -2,57 +2,46 @@
 
 <img width="1107" height="525" alt="screenshot" src="https://github.com/user-attachments/assets/511a6118-e470-4955-b5a0-c8d9672d060b" />
 
-OpenCode TUI plugin for saving and switching between multiple OpenAI OAuth accounts with a single `/switch` command.
-
+OpenCode TUI plugin for switching between saved OpenAI OAuth accounts with a single `/switch` command.
 
 ## Features
 
-- one `/switch` command for login, switch, and remove
-- reuses the native OpenCode OpenAI OAuth flow
-- stores saved accounts in a plugin-owned JSON file
-- switches only `auth.json.openai` when you pick an account
-- keeps saved-account removal separate from active auth
-- supports multiple credentials for the same email by keying entries from the refresh token hash
-
-## Behavior
-
-The `/switch` dialog can show:
+- one `/switch` command for login, switching, and removal
+- uses the native OpenCode OpenAI OAuth flow
+- supports multiple saved accounts
+- marks the current account in the picker
+- keeps saved-account removal separate from the active session
 
-- `login`
-- saved accounts
-- `logout`
+## Installation
 
-Saved accounts are displayed with:
+Install the plugin with the OpenCode plugin command:
 
-- title: email, or account id, or generated fallback key
-- footer: `Current` for the active credential
-
-`login` behavior:
+```bash
+opencode plugin @harars/opencode-switch-openai-auth-plugin
+```
 
-- calls the native OpenCode provider auth flow for `openai`
-- rereads the active OpenAI auth after OAuth completes
-- saves that credential into `auth-switch/accounts.json`
+## Usage
 
-`switch` behavior:
+Run the command below in OpenCode:
 
-- writes the selected saved credential into `auth.json.openai`
-- refreshes host auth state when runtime support is available
+```text
+/switch
+```
 
-`logout` behavior:
+From there you can:
 
-- removes a saved credential from the plugin store
-- does not delete the currently active OpenAI auth from `auth.json`
+- sign in with another OpenAI account
+- switch to a saved account
+- remove a saved account
 
 ## Storage
 
-Plugin account store locations:
+Saved accounts are stored in a plugin-managed JSON file:
 
 - Linux: `~/.local/share/opencode/auth-switch/accounts.json`
 - macOS: `~/Library/Application Support/opencode/auth-switch/accounts.json`
 - Windows: `%LOCALAPPDATA%/opencode/auth-switch/accounts.json`
 
-`OPENCODE_TEST_HOME` is supported for tests.
-
 ## Local Development
 
 Install dependencies:
@@ -68,28 +57,13 @@ bun test
 bunx tsc -p tsconfig.json --noEmit
 ```
 
-## Loading The Plugin
-
-After publishing to npm, add the package name directly to your OpenCode `tui.json`.
+Build the package output:
 
-Example:
-
-```json
-{
-  "plugin": [
-    "@harars/opencode-switch-openai-auth-plugin"
-  ],
-  "plugin_enabled": {
-    "harars.switch-auth": true
-  }
-}
+```bash
+bun run build
 ```
 
-This package should publish built `dist` files so OpenCode can load the plugin from the installed package.
-
-For local development, you can still point `tui.json` at a local file path.
-
-Example local file setup:
+For local development, point your workspace `tui.json` at the local source entry:
 
 ```json
 {
@@ -105,5 +79,4 @@ Example local file setup:
 ## Package
 
 - package name: `@harars/opencode-switch-openai-auth-plugin`
-- plugin id: `harars.switch-auth`
 - license: MIT

package/dist/index.js

@@ -437,6 +437,37 @@ function same(prev, next) {
     return false;
   return prev.refresh === next.refresh;
 }
+function unwrap(input) {
+  if (!input || typeof input !== "object") {
+    return {
+      ok: true,
+      data: input
+    };
+  }
+  if ("error" in input && input.error !== undefined) {
+    return {
+      ok: false
+    };
+  }
+  if ("data" in input) {
+    return input.data === undefined ? {
+      ok: false
+    } : {
+      ok: true,
+      data: input.data
+    };
+  }
+  return {
+    ok: true,
+    data: input
+  };
+}
+async function authMethods(api) {
+  const res = unwrap(await api.client.provider.auth());
+  if (!res.ok)
+    return [];
+  return res.data.openai ?? [];
+}
 function bind(api, authz) {
   useKeyboard((evt) => {
     if (evt.name !== "c" || evt.ctrl || evt.meta)
@@ -668,17 +699,15 @@ async function auto(api, index, method, authz) {
 }
 async function hasLogin(api) {
   try {
-    const res = await api.client.provider.auth();
-    const methods = res.data?.openai ?? [];
-    return methods.some((item) => item.type === "oauth");
+    return (await authMethods(api)).some((item) => item.type === "oauth");
   } catch {
     return false;
   }
 }
 async function loginOpenAI(api) {
   try {
-    const auth = await api.client.provider.auth();
-    const methods = (auth.data?.openai ?? []).map((method2, index2) => ({
+    const available = await authMethods(api);
+    const methods = available.map((method2, index2) => ({
       method: method2,
       index: index2
     })).filter((item) => item.method.type === "oauth");
@@ -697,12 +726,12 @@ async function loginOpenAI(api) {
     const inputs = await prompts(api, method.label, method);
     if (method.prompts?.length && !inputs)
       return false;
-    const authz = await api.client.provider.oauth.authorize({
+    const authz = unwrap(await api.client.provider.oauth.authorize({
       providerID: "openai",
       method: picked.index,
       inputs
-    });
-    if (authz.error || !authz.data) {
+    }));
+    if (!authz.ok) {
       api.ui.toast({
         variant: "error",
         message: "Login failed"

package/dist/tui.js

@@ -437,6 +437,37 @@ function same(prev, next) {
     return false;
   return prev.refresh === next.refresh;
 }
+function unwrap(input) {
+  if (!input || typeof input !== "object") {
+    return {
+      ok: true,
+      data: input
+    };
+  }
+  if ("error" in input && input.error !== undefined) {
+    return {
+      ok: false
+    };
+  }
+  if ("data" in input) {
+    return input.data === undefined ? {
+      ok: false
+    } : {
+      ok: true,
+      data: input.data
+    };
+  }
+  return {
+    ok: true,
+    data: input
+  };
+}
+async function authMethods(api) {
+  const res = unwrap(await api.client.provider.auth());
+  if (!res.ok)
+    return [];
+  return res.data.openai ?? [];
+}
 function bind(api, authz) {
   useKeyboard((evt) => {
     if (evt.name !== "c" || evt.ctrl || evt.meta)
@@ -668,17 +699,15 @@ async function auto(api, index, method, authz) {
 }
 async function hasLogin(api) {
   try {
-    const res = await api.client.provider.auth();
-    const methods = res.data?.openai ?? [];
-    return methods.some((item) => item.type === "oauth");
+    return (await authMethods(api)).some((item) => item.type === "oauth");
   } catch {
     return false;
   }
 }
 async function loginOpenAI(api) {
   try {
-    const auth = await api.client.provider.auth();
-    const methods = (auth.data?.openai ?? []).map((method2, index2) => ({
+    const available = await authMethods(api);
+    const methods = available.map((method2, index2) => ({
       method: method2,
       index: index2
     })).filter((item) => item.method.type === "oauth");
@@ -697,12 +726,12 @@ async function loginOpenAI(api) {
     const inputs = await prompts(api, method.label, method);
     if (method.prompts?.length && !inputs)
       return false;
-    const authz = await api.client.provider.oauth.authorize({
+    const authz = unwrap(await api.client.provider.oauth.authorize({
       providerID: "openai",
       method: picked.index,
       inputs
-    });
-    if (authz.error || !authz.data) {
+    }));
+    if (!authz.ok) {
       api.ui.toast({
         variant: "error",
         message: "Login failed"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harars/opencode-switch-openai-auth-plugin",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "OpenCode TUI plugin for switching saved OpenAI OAuth accounts",
   "repository": {
     "type": "git",