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

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,34 @@ 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);
+  }
+}
+function explain(err) {
+  const msg = detail(err);
+  const port = msg.match(/port\s+(\d+)\s+in use/i)?.[1];
+  if (port) {
+    return `Browser login could not start because local port ${port} is already in use. Close the other OpenCode login window or finish the other browser login first.`;
+  }
+  if (msg.includes("this.client") || msg.includes("\u672A\u5B9A\u4E49\u7684\u4E0D\u662F\u4E00\u4E2Aobject")) {
+    return "Browser login callback failed inside OpenCode. Update the plugin to the latest version and retry.";
+  }
+  return msg;
+}
 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 +451,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;
@@ -446,12 +471,14 @@ function unwrap(input) {
   }
   if ("error" in input && input.error !== undefined) {
     return {
-      ok: false
+      ok: false,
+      error: input.error
     };
   }
   if ("data" in input) {
     return input.data === undefined ? {
-      ok: false
+      ok: false,
+      error: "Missing response data"
     } : {
       ok: true,
       data: input.data
@@ -482,6 +509,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);
@@ -532,9 +562,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)
@@ -660,19 +690,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: ${explain(ok.error)}`
     });
     return false;
   }
@@ -682,16 +718,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: ${explain(ok.error)}`
     });
     return false;
   }
@@ -723,9 +759,13 @@ 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;
+    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,
@@ -734,7 +774,7 @@ async function loginOpenAI(api) {
     if (!authz.ok) {
       api.ui.toast({
         variant: "error",
-        message: "Login failed"
+        message: `Login failed: ${explain(authz.error)}`
       });
       return false;
     }
@@ -747,10 +787,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: ${explain(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,34 @@ 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);
+  }
+}
+function explain(err) {
+  const msg = detail(err);
+  const port = msg.match(/port\s+(\d+)\s+in use/i)?.[1];
+  if (port) {
+    return `Browser login could not start because local port ${port} is already in use. Close the other OpenCode login window or finish the other browser login first.`;
+  }
+  if (msg.includes("this.client") || msg.includes("\u672A\u5B9A\u4E49\u7684\u4E0D\u662F\u4E00\u4E2Aobject")) {
+    return "Browser login callback failed inside OpenCode. Update the plugin to the latest version and retry.";
+  }
+  return msg;
+}
 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 +451,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;
@@ -446,12 +471,14 @@ function unwrap(input) {
   }
   if ("error" in input && input.error !== undefined) {
     return {
-      ok: false
+      ok: false,
+      error: input.error
     };
   }
   if ("data" in input) {
     return input.data === undefined ? {
-      ok: false
+      ok: false,
+      error: "Missing response data"
     } : {
       ok: true,
       data: input.data
@@ -482,6 +509,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);
@@ -532,9 +562,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)
@@ -660,19 +690,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: ${explain(ok.error)}`
     });
     return false;
   }
@@ -682,16 +718,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: ${explain(ok.error)}`
     });
     return false;
   }
@@ -723,9 +759,13 @@ 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;
+    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,
@@ -734,7 +774,7 @@ async function loginOpenAI(api) {
     if (!authz.ok) {
       api.ui.toast({
         variant: "error",
-        message: "Login failed"
+        message: `Login failed: ${explain(authz.error)}`
       });
       return false;
     }
@@ -747,10 +787,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: ${explain(err)}`
     });
     return false;
   }

package/package.json

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