@magpie-community/opencode-qoder-auth 0.2.9 → 0.2.11

package/README.md

@@ -200,9 +200,14 @@ in-flight read and caching it in memory for an hour. The same identity
 goes on the list, the claim and a device-token retry; it is not saved in
 the account's credentials.
 
-- Install Qoder desktop or run Qoder CLI to make its native runtime
-  available. The plugin finds the desktop's standard Windows/macOS
-  location or the CLI's matching `~/.qoder/.bin/umid-*` cache.
+- Install Qoder desktop, or sign in to Qoder CLI once, to make its native
+  runtime available. The plugin finds the desktop's `resources/umid`
+  (`Qoder.app` on macOS, `%LOCALAPPDATA%\Programs\Qoder` on Windows,
+  `/opt/Qoder` on Linux) or the runtime the CLI caches in `~/.qoder/.bin`
+  (`runtime-info-<platform>-<arch>-*` on macOS and Linux,
+  `umid-win32-x64-*\runtime-info.exe` on Windows; `QODER_CONFIG_DIR`,
+  `QODER_CLI_HOME` and `QODER_CONFIG_DIR_NAME` move it as they move the
+  CLI's folder).
 - For another installation location, set `QODER_RUNTIME_INFO` to the
   absolute path of Qoder's installed `runtime-info` executable
   (`runtime-info.exe` on Windows), with its accompanying SDK files.

package/index.mjs

@@ -1037,23 +1037,45 @@ const CAMPAIGN_MACHINE_TTL = 60 * 60 * 1000 // Qoder's desktop client renews its
 // campaignRuntime uses Qoder's own native device identity helper, installed
 // by its desktop client or cached by its CLI. A made-up token (including the
 // chat envelope's machine id and type 5) doesn't reveal international claims.
-async function campaignRuntime({ home = homedir(), platform = process.platform, arch = process.arch, env = process.env } = {}) {
+//
+// Where each one keeps it (Qoder desktop 0.4.3's packages, qodercli 1.1.66):
+//   - desktop: <install>/resources/umid/runtime-info(.exe): Qoder.app on
+//     macOS, %LOCALAPPDATA%\Programs\Qoder (the user installer) on Windows,
+//     /opt/Qoder (the .deb and the .rpm) on Linux;
+//   - CLI: <config>/.bin, where <config> is QODER_CONFIG_DIR, else
+//     QODER_CLI_HOME (or the home folder) joined with QODER_CONFIG_DIR_NAME
+//     (or .qoder): a file runtime-info-<platform>-<arch>-<hash> on macOS and
+//     Linux, a folder umid-win32-<arch>-<hash> holding runtime-info.exe on
+//     Windows.
+async function campaignRuntime({ home = homedir(), platform = process.platform, arch = process.arch, env = process.env, opt = "/opt" } = {}) {
   if (env.QODER_RUNTIME_INFO) return resolve(env.QODER_RUNTIME_INFO)
   const name = platform === "win32" ? "runtime-info.exe" : "runtime-info"
+  const isFile = async (path) => (await stat(path).catch(() => null))?.isFile() ?? false
   const paths = []
   if (platform === "win32") {
     const local = env.LOCALAPPDATA || join(home, "AppData", "Local")
     paths.push(join(local, "Programs", "Qoder", "resources", "umid", name))
   } else if (platform === "darwin") {
     for (const dir of ["/Applications", join(home, "Applications")]) paths.push(join(dir, "Qoder.app", "Contents", "Resources", "umid", name))
+  } else if (platform === "linux") {
+    paths.push(join(opt, "Qoder", "resources", "umid", name))
+  }
+  for (const path of paths) if (await isFile(path)) return path
+  const config = env.QODER_CONFIG_DIR || join(env.QODER_CLI_HOME || env.GEMINI_CLI_HOME || home, env.QODER_CONFIG_DIR_NAME || ".qoder")
+  const cache = join(config, ".bin")
+  const entries = await readdir(cache, { withFileTypes: true }).catch(() => [])
+  const found = []
+  for (const d of entries) {
+    let path
+    if (platform === "win32") {
+      if (d.isDirectory() && d.name.startsWith(`umid-win32-${arch}-`)) path = join(cache, d.name, name)
+    } else if (d.isFile() && d.name.startsWith(`runtime-info-${platform}-${arch}-`) && !d.name.endsWith(".tmp")) {
+      path = join(cache, d.name)
+    }
+    if (path && (await isFile(path))) found.push({ path, time: (await stat(path)).mtimeMs })
   }
-  for (const path of paths) if ((await stat(path).catch(() => null))?.isFile()) return path
-  const cache = join(home, ".qoder", ".bin")
-  const dirs = (await readdir(cache, { withFileTypes: true }).catch(() => []))
-    .filter((d) => d.isDirectory() && d.name.startsWith(`umid-${platform}-${arch}-`))
-  const cached = await Promise.all(dirs.map(async (d) => ({ path: join(cache, d.name, name), time: (await stat(join(cache, d.name))).mtimeMs })))
-  for (const { path } of cached.sort((a, b) => b.time - a.time)) if ((await stat(path).catch(() => null))?.isFile()) return path
-  throw new Error("Qoder check-in: device identity runtime not found; install Qoder desktop or run Qoder CLI, or set QODER_RUNTIME_INFO to its runtime-info executable")
+  if (found.length) return found.sort((a, b) => b.time - a.time)[0].path
+  throw new Error("Qoder check-in: device identity runtime not found; install Qoder desktop or sign in to Qoder CLI once, or set QODER_RUNTIME_INFO to its runtime-info executable")
 }
 
 // Read the SDK identity as Qoder does: environment 3 is international; on
@@ -1292,6 +1314,9 @@ const makePlugin = (site) => async ({ client }) => {
   }
   // each account's listing, the model configs a request carries
   const listings = new Map()
+  // A public and a VPC account can name the same uid but have different
+  // catalogs. Keep each deployment's listing apart.
+  const listingKey = (cred) => `${cred.vpc ?? ""}\0${cred.uid}`
   // the accounts fresh renewed: the built-in took the lapse mark off on a
   // renewed job token (qoderPersist), whatever the request then met
   const renewals = new WeakSet()
@@ -1300,7 +1325,7 @@ const makePlugin = (site) => async ({ client }) => {
   // says "renewed" for it
   const unsaid = new Set()
   const renewed = (cred) => {
-    const was = unsaid.delete(cred.uid)
+    const was = unsaid.delete(listingKey(cred))
     return renewals.has(cred) || was
   }
 
@@ -1321,10 +1346,11 @@ const makePlugin = (site) => async ({ client }) => {
     })
 
   const models = async (cred, again = false) => {
-    let l = listings.get(cred.uid)
+    const key = listingKey(cred)
+    let l = listings.get(key)
     if (!l || again) {
       l = modelInfos(await fetchListing(siteOf(site, cred), cred))
-      listings.set(cred.uid, l)
+      listings.set(key, l)
     }
     return l
   }
@@ -1537,7 +1563,7 @@ const makePlugin = (site) => async ({ client }) => {
           if (e?.expired) throw Object.assign(new Error(e.message), { signIn: "expired" })
           return provider.models
         }
-        if (renewals.has(cred)) unsaid.add(cred.uid)
+        if (renewals.has(cred)) unsaid.add(listingKey(cred))
         try {
           const ms = await models(cred, true)
           if (!ms.length) return provider.models

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-qoder-auth",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Qoder subscriptions in OpenCode and magpie: Qoder (qoder.com) and Qoder CN (qoder.cn)",
   "type": "module",
   "main": "./index.mjs",