mohdel 3.5.0 → 3.6.0

package/README.md

@@ -152,8 +152,9 @@ reading them. Mohdel is built so neither is present.
   starts a temporary HTTP callback listener on `127.0.0.1` with PKCE and state validation.
 - **Session credentials come from the caller.** The provider credential rides
   on each envelope and goes to the SDK. Optional ChatGPT sign-in saves OAuth
-  credentials in the caller's user-data directory; gate workers do not load
-  that store or select a local account.
+  credentials in the caller's user-data directory. The standalone gate and its
+  sessions never read that store. Only an embedder that opts into `ChatGptAuth`
+  reads it, through mohdel's helper.
 - **The session subprocess starts from an empty environment.** It is given
   back only what the runtime reads — `PATH`, proxy and TLS settings, mohdel's
   own dials, `OTEL_*`. Every `*_API_SK`, cloud credential and database URL the

package/js/chatgpt/bin.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+/**
+ * Access-token helper for a supervisor that cannot run the OAuth refresh
+ * itself (thin-gate's `ChatGptAuth`). Invoked as
+ * `node <path-to-this-file> access [--account <id>]`.
+ *
+ * stdout: `{"accessToken": "…", "refreshAt": <epoch ms>}`, exit 0.
+ * stderr: the error message, exit 1. The token never reaches stderr.
+ *
+ * @module chatgpt/bin
+ */
+
+import { createChatGPT } from './index.js'
+
+const USAGE = 'usage: node bin.js access [--account <id>]'
+
+async function main (args) {
+  const [verb, flag, id, ...rest] = args
+  if (verb !== 'access' || rest.length || (flag !== undefined && (flag !== '--account' || !id))) {
+    throw new Error(USAGE)
+  }
+  const { accessToken, refreshAt } = await createChatGPT().access(id)
+  process.stdout.write(JSON.stringify({ accessToken, refreshAt }))
+}
+
+main(process.argv.slice(2)).catch(err => {
+  process.stderr.write(err.message)
+  process.exitCode = 1
+})

package/js/chatgpt/index.js

@@ -11,6 +11,7 @@ const PERMISSION = 'chatgpt.tokens.use.direct'
 const SCOPE = `openid profile email offline_access resource.invoke ${PERMISSION}`
 const jwks = createRemoteJWKSet(new URL(`${ISSUER}/.well-known/jwks.json`))
 const random = () => randomBytes(32).toString('base64url')
+const REFRESH_MARGIN = 30000
 export const usageURL = 'https://chatgpt.com/settings/usage'
 
 async function jsonRequest (fetcher, url, options = {}) {
@@ -92,18 +93,21 @@ export function createChatGPT (options = {}) {
     await save(store)
   })
 
-  /** @param {string} [id] @returns {Promise<{accessToken: string, accountId: string}>} */
+  /**
+   * `refreshAt` is when this token stops being handed out; a caller may reuse it until then.
+   * @param {string} [id] @returns {Promise<{accessToken: string, accountId: string, refreshAt: number}>}
+   */
   const access = async (id) => withStore(directory, async (store, save) => {
     const account = store.accounts[id ?? store.active]
     if (!account?.access_token) throw new Error('ChatGPT is not connected; run mo chatgpt login')
     if (!account.scopes?.includes(PERMISSION)) throw new Error('ChatGPT plan usage is not enabled; run mo chatgpt login and grant plan usage')
-    if (account.expires_at <= Date.now() + 30000) {
+    if (account.expires_at <= Date.now() + REFRESH_MARGIN) {
       const tokens = await tokenRequest({ grant_type: 'refresh_token', client_id: account.client_id, refresh_token: account.refresh_token })
       Object.assign(account, credentials(tokens, account))
       await save(store)
       if (!account.scopes.includes(PERMISSION)) throw new Error('ChatGPT plan usage permission was removed; reconnect with mo chatgpt login')
     }
-    return { accessToken: account.access_token, accountId: account.client_id }
+    return { accessToken: account.access_token, accountId: account.client_id, refreshAt: account.expires_at - REFRESH_MARGIN }
   })
 
   /** @param {string} [id] @returns {Promise<Array<{id: string, model: string, label: string}>>} */

package/js/chatgpt/store.js

@@ -7,12 +7,20 @@ import envPaths from 'env-paths'
 export const defaultDirectory = () => join(envPaths('mohdel', { suffix: null }).data, 'chatgpt')
 
 export async function readStore (directory) {
+  const path = join(directory, 'accounts.json')
+  let text
   try {
-    return JSON.parse(await readFile(join(directory, 'accounts.json'), 'utf8'))
+    text = await readFile(path, 'utf8')
   } catch (err) {
     if (err.code === 'ENOENT') return { host: `urn:uuid:${randomUUID()}`, active: null, accounts: {} }
     throw err
   }
+  try {
+    return JSON.parse(text)
+  } catch {
+    // V8's parse error quotes the input, which here holds tokens.
+    throw new Error(`ChatGPT credentials are not valid JSON: ${path}`)
+  }
 }
 
 export async function writeStore (directory, store) {

package/js/session/adapters/chatgpt.js

@@ -7,6 +7,19 @@ import { getSpec } from './_catalog.js'
 import { discoverModels } from '../../chatgpt/models.js'
 import { abortedDone } from './_aborted.js'
 
+// A token belongs to one account, so its model list only changes with the token.
+const discovered = new Map()
+const DISCOVERED_TOKENS = 8
+
+async function accountModels (key, deps) {
+  const cached = discovered.get(key)
+  if (cached) return cached
+  const models = await discoverModels(key, deps)
+  discovered.set(key, models)
+  if (discovered.size > DISCOVERED_TOKENS) discovered.delete(discovered.keys().next().value)
+  return models
+}
+
 /**
  * Uses only the caller's OAuth access token, including behind the gate.
  * Session subprocesses never read the host's saved ChatGPT account.
@@ -18,7 +31,7 @@ export async function * chatgpt (envelope, deps = {}) {
   const start = String(process.hrtime.bigint())
   const model = getSpec(catalogKey(envelope.model))?.model ?? bareOf(catalogKey(envelope.model))
   try {
-    const models = await discoverModels(key, deps)
+    const models = await accountModels(key, deps)
     if (!models.some(m => m.slug === model)) {
       yield { type: 'error', error: { type: 'INVALID_REQUEST', severity: 'error', message: 'This model is not available to the selected ChatGPT account.', retryable: false } }
       return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mohdel",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "license": "MIT",
   "author": {
     "name": "Christophe Le Bars",
@@ -46,6 +46,10 @@
       "types": "./js/chatgpt/index.d.ts",
       "default": "./js/chatgpt/index.js"
     },
+    "./chatgpt/bin": {
+      "types": "./js/chatgpt/bin.d.ts",
+      "default": "./js/chatgpt/bin.js"
+    },
     ".": {
       "types": "./src/lib/index.d.ts",
       "default": "./src/lib/index.js"
@@ -140,7 +144,7 @@
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.222.0",
     "@opentelemetry/sdk-node": "^0.222.0",
     "chalk": "^6.0.1",
-    "mohdel-thin-gate-linux-x64-gnu": "3.5.0"
+    "mohdel-thin-gate-linux-x64-gnu": "3.6.0"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.129.0",