@harars/opencode-switch-openai-auth-plugin 0.1.3 → 0.1.5

package/dist/index.js

@@ -39,6 +39,7 @@ import { insert as _$insert } from "@opentui/solid";
 import { setProp as _$setProp } from "@opentui/solid";
 import { createElement as _$createElement } from "@opentui/solid";
 import { TextAttributes } from "@opentui/core";
+import { onMount } from "solid-js";
 import { useKeyboard } from "@opentui/solid";
 
 // src/login-helpers.ts
@@ -74,12 +75,23 @@ async function clip(text) {
 function target(authz) {
   return authz.instructions.match(/[A-Z0-9]{4}-[A-Z0-9]{4,5}/)?.[0] ?? authz.url;
 }
+function detail(err) {
+  if (err instanceof Error)
+    return err.message;
+  if (typeof err === "string")
+    return err;
+  try {
+    return JSON.stringify(err);
+  } catch {
+    return String(err);
+  }
+}
 async function runOAuthCallback(callback, input) {
   try {
     const res = await callback(input);
-    return !res.error;
-  } catch {
-    return false;
+    return res.error ? { ok: false, error: res.error } : { ok: true };
+  } catch (err) {
+    return { ok: false, error: detail(err) };
   }
 }
 
@@ -428,6 +440,8 @@ function visible(prompt, values) {
   if (!prompt.when)
     return true;
   const cur = values[prompt.when.key];
+  if (cur === undefined)
+    return false;
   if (prompt.when.op === "eq")
     return cur === prompt.when.value;
   return cur !== prompt.when.value;
@@ -437,6 +451,39 @@ 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,
+      error: input.error
+    };
+  }
+  if ("data" in input) {
+    return input.data === undefined ? {
+      ok: false,
+      error: "Missing response data"
+    } : {
+      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)
@@ -451,6 +498,9 @@ function bind(api, authz) {
 }
 function WaitView(props) {
   bind(props.api, props.authz);
+  onMount(() => {
+    props.run();
+  });
   return (() => {
     var _el$ = _$createElement("box"), _el$2 = _$createElement("text"), _el$3 = _$createElement("text"), _el$4 = _$createElement("text"), _el$5 = _$createElement("text"), _el$7 = _$createElement("text");
     _$insertNode(_el$, _el$2);
@@ -501,9 +551,9 @@ function wait(api, title, authz, run) {
   api.ui.dialog.replace(() => _$createComponent(WaitView, {
     api,
     title,
-    authz
+    authz,
+    run
   }));
-  run();
 }
 async function choose(api, methods) {
   if (methods.length === 1)
@@ -629,19 +679,25 @@ async function code(api, index, method, authz) {
       },
       authz,
       onConfirm: async (value) => {
-        resolve(await runOAuthCallback(api.client.provider.oauth.callback, {
+        resolve(await runOAuthCallback((input) => api.client.provider.oauth.callback(input), {
           providerID: "openai",
           method: index,
           code: value
         }));
       },
-      onCancel: () => resolve(false)
-    }), () => resolve(false));
+      onCancel: () => resolve({
+        ok: false,
+        error: "Cancelled"
+      })
+    }), () => resolve({
+      ok: false,
+      error: "Cancelled"
+    }));
   });
-  if (!ok) {
+  if (!ok.ok) {
     api.ui.toast({
       variant: "error",
-      message: "Login failed"
+      message: `Login failed: ${detail(ok.error)}`
     });
     return false;
   }
@@ -651,16 +707,16 @@ async function auto(api, index, method, authz) {
   const prev = await readCurrentAuth();
   const ok = await new Promise((resolve) => {
     wait(api, method.label, authz, async () => {
-      resolve(await runOAuthCallback(api.client.provider.oauth.callback, {
+      resolve(await runOAuthCallback((input) => api.client.provider.oauth.callback(input), {
         providerID: "openai",
         method: index
       }));
     });
   });
-  if (!ok) {
+  if (!ok.ok) {
     api.ui.toast({
       variant: "error",
-      message: "Login failed"
+      message: `Login failed: ${detail(ok.error)}`
     });
     return false;
   }
@@ -668,17 +724,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");
@@ -694,18 +748,22 @@ async function loginOpenAI(api) {
       return false;
     const picked = methods[index];
     const method = picked.method;
-    const inputs = await prompts(api, method.label, method);
-    if (method.prompts?.length && !inputs)
-      return false;
-    const authz = await api.client.provider.oauth.authorize({
+    let inputs;
+    if (method.prompts?.length) {
+      const value = await prompts(api, method.label, method);
+      if (!value)
+        return false;
+      inputs = value;
+    }
+    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"
+        message: `Login failed: ${detail(authz.error)}`
       });
       return false;
     }
@@ -718,10 +776,10 @@ async function loginOpenAI(api) {
       message: "Unsupported auth method"
     });
     return false;
-  } catch {
+  } catch (err) {
     api.ui.toast({
       variant: "error",
-      message: "Login failed"
+      message: `Login failed: ${detail(err)}`
     });
     return false;
   }

package/dist/tui.js

@@ -39,6 +39,7 @@ import { insert as _$insert } from "@opentui/solid";
 import { setProp as _$setProp } from "@opentui/solid";
 import { createElement as _$createElement } from "@opentui/solid";
 import { TextAttributes } from "@opentui/core";
+import { onMount } from "solid-js";
 import { useKeyboard } from "@opentui/solid";
 
 // src/login-helpers.ts
@@ -74,12 +75,23 @@ async function clip(text) {
 function target(authz) {
   return authz.instructions.match(/[A-Z0-9]{4}-[A-Z0-9]{4,5}/)?.[0] ?? authz.url;
 }
+function detail(err) {
+  if (err instanceof Error)
+    return err.message;
+  if (typeof err === "string")
+    return err;
+  try {
+    return JSON.stringify(err);
+  } catch {
+    return String(err);
+  }
+}
 async function runOAuthCallback(callback, input) {
   try {
     const res = await callback(input);
-    return !res.error;
-  } catch {
-    return false;
+    return res.error ? { ok: false, error: res.error } : { ok: true };
+  } catch (err) {
+    return { ok: false, error: detail(err) };
   }
 }
 
@@ -428,6 +440,8 @@ function visible(prompt, values) {
   if (!prompt.when)
     return true;
   const cur = values[prompt.when.key];
+  if (cur === undefined)
+    return false;
   if (prompt.when.op === "eq")
     return cur === prompt.when.value;
   return cur !== prompt.when.value;
@@ -437,6 +451,39 @@ 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,
+      error: input.error
+    };
+  }
+  if ("data" in input) {
+    return input.data === undefined ? {
+      ok: false,
+      error: "Missing response data"
+    } : {
+      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)
@@ -451,6 +498,9 @@ function bind(api, authz) {
 }
 function WaitView(props) {
   bind(props.api, props.authz);
+  onMount(() => {
+    props.run();
+  });
   return (() => {
     var _el$ = _$createElement("box"), _el$2 = _$createElement("text"), _el$3 = _$createElement("text"), _el$4 = _$createElement("text"), _el$5 = _$createElement("text"), _el$7 = _$createElement("text");
     _$insertNode(_el$, _el$2);
@@ -501,9 +551,9 @@ function wait(api, title, authz, run) {
   api.ui.dialog.replace(() => _$createComponent(WaitView, {
     api,
     title,
-    authz
+    authz,
+    run
   }));
-  run();
 }
 async function choose(api, methods) {
   if (methods.length === 1)
@@ -629,19 +679,25 @@ async function code(api, index, method, authz) {
       },
       authz,
       onConfirm: async (value) => {
-        resolve(await runOAuthCallback(api.client.provider.oauth.callback, {
+        resolve(await runOAuthCallback((input) => api.client.provider.oauth.callback(input), {
           providerID: "openai",
           method: index,
           code: value
         }));
       },
-      onCancel: () => resolve(false)
-    }), () => resolve(false));
+      onCancel: () => resolve({
+        ok: false,
+        error: "Cancelled"
+      })
+    }), () => resolve({
+      ok: false,
+      error: "Cancelled"
+    }));
   });
-  if (!ok) {
+  if (!ok.ok) {
     api.ui.toast({
       variant: "error",
-      message: "Login failed"
+      message: `Login failed: ${detail(ok.error)}`
     });
     return false;
   }
@@ -651,16 +707,16 @@ async function auto(api, index, method, authz) {
   const prev = await readCurrentAuth();
   const ok = await new Promise((resolve) => {
     wait(api, method.label, authz, async () => {
-      resolve(await runOAuthCallback(api.client.provider.oauth.callback, {
+      resolve(await runOAuthCallback((input) => api.client.provider.oauth.callback(input), {
         providerID: "openai",
         method: index
       }));
     });
   });
-  if (!ok) {
+  if (!ok.ok) {
     api.ui.toast({
       variant: "error",
-      message: "Login failed"
+      message: `Login failed: ${detail(ok.error)}`
     });
     return false;
   }
@@ -668,17 +724,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");
@@ -694,18 +748,22 @@ async function loginOpenAI(api) {
       return false;
     const picked = methods[index];
     const method = picked.method;
-    const inputs = await prompts(api, method.label, method);
-    if (method.prompts?.length && !inputs)
-      return false;
-    const authz = await api.client.provider.oauth.authorize({
+    let inputs;
+    if (method.prompts?.length) {
+      const value = await prompts(api, method.label, method);
+      if (!value)
+        return false;
+      inputs = value;
+    }
+    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"
+        message: `Login failed: ${detail(authz.error)}`
       });
       return false;
     }
@@ -718,10 +776,10 @@ async function loginOpenAI(api) {
       message: "Unsupported auth method"
     });
     return false;
-  } catch {
+  } catch (err) {
     api.ui.toast({
       variant: "error",
-      message: "Login failed"
+      message: `Login failed: ${detail(err)}`
     });
     return false;
   }

package/package.json

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