+ OpenDesign +
+ jcode +
+ Grok Build +
+ Devin CLI +
+ DeepSeek TUI +
+ Qwen Code +
...and 20+ more providers including Nebius, Chutes, Hyperbolic, and custom OpenAI/Anthropic compatible endpoints
+### 🏠 Self-hosted Providers + +For speech and embeddings served from **your own** machine — whisper.cpp, +faster-whisper, Speaches, Kokoro-FastAPI, openedai-speech, llama.cpp/llama-server, +vLLM, Infinity, text-embeddings-inference, or anything else that speaks the OpenAI +shape. + +| Provider | Endpoint used | Typical server | +| --- | --- | --- | +| **Self-hosted STT** | `/v1/audio/transcriptions` | whisper.cpp, faster-whisper | +| **Self-hosted TTS** | `/v1/audio/speech` | Kokoro-FastAPI, openedai-speech | +| **Self-hosted Embedding** | `/v1/embeddings` | llama-server, vLLM, Infinity | + +Every other speech provider is a named cloud service with a fixed endpoint. These +three read their address from **each connection**, so one provider can front +several machines and load-balance across them like any other. + +Set it on the connection as `providerSpecificData.baseUrl`: + +| Provider | Give it | Result | +| --- | --- | --- | +| Self-hosted STT | the full URL — `http://host:8080/v1/audio/transcriptions` | used as-is | +| Self-hosted TTS | the server root — `http://host:8880` | `+ /v1/audio/speech` | +| Self-hosted Embedding | the **OpenAI base**, `/v1` included — `http://host:8080/v1` | `+ /embeddings` | + +> **Mind the `/v1` on embeddings.** The adapter appends `/embeddings`, so +> `http://host:8080` resolves to `http://host:8080/embeddings` and misses the +> OpenAI route — llama-server answers **501**. Give it the same base URL an OpenAI +> client would use. A full `.../v1/embeddings` is also accepted, so a value pasted +> from a `curl` example works too. + +The API key is not checked by most local servers, but the field must be non-empty: +it is what gives the connection a credentials record, and `baseUrl` lives there. +Any placeholder works. + +Self-hosted Embedding has **no cloud fallback by design** — a connection saved +without a `baseUrl` is reported as a configuration error rather than quietly +falling back to `api.openai.com`, which would send your input text and API key to +a third party under a provider named "Self-hosted". + --- ## 💡 Key Features diff --git a/cli/package.json b/cli/package.json index efb786e4..98ad8cdc 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "9router", - "version": "0.5.45", + "version": "0.5.50", "description": "9Router CLI - Start and manage 9Router server", "bin": { "9router": "./cli.js" diff --git a/cli/scripts/build-cli.js b/cli/scripts/build-cli.js index a1b28c5f..d4e4d279 100644 --- a/cli/scripts/build-cli.js +++ b/cli/scripts/build-cli.js @@ -81,201 +81,272 @@ function copyRecursive(src, dest) { } } -console.log("📦 Building 9Router CLI package with Next.js...\n"); +function resolveStandaloneBuild(appDir, buildDistDir) { + const legacyStandaloneRoot = path.join(appDir, ".next", "standalone"); + const resolvedStandaloneRoot = path.join(buildDistDir, "standalone"); + let standaloneRoot = fs.existsSync(resolvedStandaloneRoot) + ? resolvedStandaloneRoot + : legacyStandaloneRoot; -fs.mkdirSync(buildHomeDir, { recursive: true }); -fs.mkdirSync(path.join(buildHomeDir, "AppData", "Roaming"), { recursive: true }); -fs.mkdirSync(path.join(buildHomeDir, "AppData", "Local"), { recursive: true }); - -// Step 0: Sync version from app/cli/package.json to app/package.json -console.log("0️⃣ Syncing version to app/package.json..."); -const cliPkg = JSON.parse(fs.readFileSync(path.join(cliDir, "package.json"), "utf8")); -const appPkgPath = path.join(appDir, "package.json"); -const appPkg = JSON.parse(fs.readFileSync(appPkgPath, "utf8")); -if (appPkg.version !== cliPkg.version) { - appPkg.version = cliPkg.version; - fs.writeFileSync(appPkgPath, JSON.stringify(appPkg, null, 2) + "\n"); - console.log(`✅ Version synced: ${cliPkg.version}\n`); -} else { - console.log(`✅ Version already synced: ${cliPkg.version}\n`); -} - -// Step 1: Build app with Next.js (workspace tracing root → traced node_modules in standalone). -console.log("1️⃣ Building Next.js app..."); -try { - execSync("npm run build", { - stdio: "inherit", - cwd: appDir, - env: { - ...process.env, - HOME: buildHomeDir, - USERPROFILE: buildHomeDir, - APPDATA: path.join(buildHomeDir, "AppData", "Roaming"), - LOCALAPPDATA: path.join(buildHomeDir, "AppData", "Local"), - NEXT_DIST_DIR: buildDistDirName, - NEXT_TRACING_ROOT_MODE: "workspace", - } - }); - console.log("✅ Next.js build completed\n"); -} catch (error) { - console.error("❌ Next.js build failed"); - process.exit(1); -} - -// Step 2: Clean old app/cli/app if exists -console.log("2️⃣ Cleaning old app/cli/app..."); -if (fs.existsSync(cliAppDir)) { - fs.rmSync(cliAppDir, { recursive: true, force: true }); -} -console.log("✅ Cleaned\n"); - -// Step 3: Copy Next.js standalone build to app/cli/app. -// Newer Next.js standalone output writes server.js/package.json plus .next/, src/, and -// node_modules/ directly under .next/standalone. Older builds may still use a nested app/. -console.log("3️⃣ Copying Next.js standalone build to app/cli/app..."); -const standaloneRoot = path.join(appDir, ".next", "standalone"); -const standaloneRootResolved = path.join(buildDistDir, "standalone"); -let standaloneRootToUse = fs.existsSync(standaloneRootResolved) ? standaloneRootResolved : standaloneRoot; -// Next.js 16 nests standalone output under the project name when NEXT_TRACING_ROOT_MODE=workspace -// e.g. .next-cli-build/standalone/9router/server.js -const pkgName = path.basename(appDir); -const nestedRoot = path.join(standaloneRootToUse, pkgName); -if (fs.existsSync(path.join(nestedRoot, "server.js")) && !fs.existsSync(path.join(standaloneRootToUse, "server.js"))) { - console.log(`ℹ️ Detected nested standalone output: ${pkgName}/`); - standaloneRootToUse = nestedRoot; -} -const standaloneApp = fs.existsSync(path.join(standaloneRootToUse, "server.js")) - ? standaloneRootToUse - : path.join(standaloneRootToUse, "app"); -if (!fs.existsSync(standaloneApp)) { - console.error("❌ Next.js standalone build not found under .next/standalone"); - console.error("Expected either .next/standalone/server.js or .next/standalone/app/"); - process.exit(1); -} -copyRecursive(standaloneApp, cliAppDir); - -// Older nested-app layout stores traced node_modules at standalone root. -const standaloneNodeModules = path.join(standaloneRootToUse, "node_modules"); -if (standaloneApp !== standaloneRootToUse && fs.existsSync(standaloneNodeModules)) { - copyRecursive(standaloneNodeModules, path.join(cliAppDir, "node_modules")); -} -console.log("✅ Copied standalone build\n"); - -// Step 3a: Copy custom server (injects real socket IP, strips spoofable XFF). -const customServerSrc = path.join(appDir, "custom-server.js"); -if (fs.existsSync(customServerSrc)) { - fs.copyFileSync(customServerSrc, path.join(cliAppDir, "custom-server.js")); - console.log("✅ Copied custom-server.js\n"); -} else { - console.warn("⚠️ custom-server.js not found — server will run without real-IP injection\n"); -} - -// Step 3b: Ensure sql.js (pure JS fallback) bundled in app/cli/app/node_modules. -// Strip better-sqlite3 (native) — it lives in ~/.9router/runtime to avoid -// Windows EBUSY during global CLI updates. node:sqlite (Node ≥22.5) is also -// available as a no-install middle tier. -console.log("3️⃣ b Configuring SQLite drivers..."); -function ensureModuleInBundle(pkg) { - const dest = path.join(cliAppDir, "node_modules", pkg); - if (fs.existsSync(dest)) { - console.log(`✅ ${pkg} already bundled`); - return; + // Next.js 16 nests standalone output under the project name when + // NEXT_TRACING_ROOT_MODE=workspace, e.g. standalone/9router/server.js. + const pkgName = path.basename(appDir); + const nestedRoot = path.join(standaloneRoot, pkgName); + if (fs.existsSync(path.join(nestedRoot, "server.js")) && !fs.existsSync(path.join(standaloneRoot, "server.js"))) { + console.log(`ℹ️ Detected nested standalone output: ${pkgName}/`); + standaloneRoot = nestedRoot; } - const candidates = [ - path.join(appDir, "node_modules", pkg), - path.join(rootDir, "node_modules", pkg), + + const standaloneApp = fs.existsSync(path.join(standaloneRoot, "server.js")) + ? standaloneRoot + : path.join(standaloneRoot, "app"); + if (!fs.existsSync(standaloneApp)) { + throw new Error( + "Next.js standalone build not found under .next/standalone; " + + "expected either .next/standalone/server.js or .next/standalone/app/", + ); + } + + return { standaloneApp, standaloneRoot }; +} + +function copyStandaloneBuild(appDir, buildDistDir, cliAppDir) { + const { standaloneApp, standaloneRoot } = resolveStandaloneBuild(appDir, buildDistDir); + copyRecursive(standaloneApp, cliAppDir); + + // Older nested-app layout stores traced node_modules at standalone root. + const standaloneNodeModules = path.join(standaloneRoot, "node_modules"); + if (standaloneApp !== standaloneRoot && fs.existsSync(standaloneNodeModules)) { + copyRecursive(standaloneNodeModules, path.join(cliAppDir, "node_modules")); + } +} + +function mergeServerArtifacts(buildDistDir, cliAppDir) { + const serverSrc = path.join(buildDistDir, "server"); + const serverDest = path.join(cliAppDir, buildDistDirName, "server"); + if (!fs.existsSync(serverSrc)) { + throw new Error(`Complete Next.js server build not found: ${serverSrc}`); + } + copyRecursive(serverSrc, serverDest); +} + +function assertRequiredApiArtifacts(cliAppDir) { + const requiredArtifacts = [ + "app/api/v1/chat/completions/route.js", + "app/api/v1/messages/route.js", ]; - const src = candidates.find((p) => fs.existsSync(p)); - if (!src) { - console.warn(`⚠️ ${pkg} not found locally — bundle will rely on node:sqlite or runtime install`); - return; + const serverDir = path.join(cliAppDir, buildDistDirName, "server"); + const missingArtifacts = requiredArtifacts + .map((artifact) => path.join(serverDir, artifact)) + .filter((artifact) => !fs.existsSync(artifact)); + + if (missingArtifacts.length > 0) { + throw new Error( + `Required CLI API route artifact${missingArtifacts.length === 1 ? " is" : "s are"} missing:\n` + + missingArtifacts.join("\n"), + ); } - fs.mkdirSync(path.dirname(dest), { recursive: true }); - copyRecursive(src, dest); - console.log(`✅ Bundled ${pkg}`); -} -ensureModuleInBundle("sql.js"); -const betterDir = path.join(cliAppDir, "node_modules", "better-sqlite3"); -if (fs.existsSync(betterDir)) { - fs.rmSync(betterDir, { recursive: true, force: true }); - console.log("✅ Stripped better-sqlite3 (lives in ~/.9router/runtime)"); -} -console.log(""); - -// Step 4: Copy static files -console.log("4️⃣ Copying static files..."); -const staticSrc = path.join(appDir, ".next", "static"); -const staticSrcResolved = path.join(buildDistDir, "static"); -const staticDest = path.join(cliAppDir, buildDistDirName, "static"); -if (fs.existsSync(staticSrcResolved) || fs.existsSync(staticSrc)) { - copyRecursive(fs.existsSync(staticSrcResolved) ? staticSrcResolved : staticSrc, staticDest); - console.log("✅ Copied static files\n"); -} else { - console.log("⏭️ No static files found\n"); } -// Step 5: Copy public folder if exists -console.log("5️⃣ Copying public folder..."); -const publicSrc = path.join(appDir, "public"); -const publicDest = path.join(cliAppDir, "public"); -if (fs.existsSync(publicSrc)) { - copyRecursive(publicSrc, publicDest); - console.log("✅ Copied public folder\n"); -} else { - console.log("⏭️ No public folder found\n"); +function buildCliPackage() { + console.log("📦 Building 9Router CLI package with Next.js...\n"); + + fs.mkdirSync(buildHomeDir, { recursive: true }); + fs.mkdirSync(path.join(buildHomeDir, "AppData", "Roaming"), { recursive: true }); + fs.mkdirSync(path.join(buildHomeDir, "AppData", "Local"), { recursive: true }); + + // Step 0: Sync version from app/cli/package.json to app/package.json + console.log("0️⃣ Syncing version to app/package.json..."); + const cliPkg = JSON.parse(fs.readFileSync(path.join(cliDir, "package.json"), "utf8")); + const appPkgPath = path.join(appDir, "package.json"); + const appPkg = JSON.parse(fs.readFileSync(appPkgPath, "utf8")); + if (appPkg.version !== cliPkg.version) { + appPkg.version = cliPkg.version; + fs.writeFileSync(appPkgPath, JSON.stringify(appPkg, null, 2) + "\n"); + console.log(`✅ Version synced: ${cliPkg.version}\n`); + } else { + console.log(`✅ Version already synced: ${cliPkg.version}\n`); + } + + // Step 1: Build app with Next.js (workspace tracing root → traced node_modules in standalone). + console.log("1️⃣ Building Next.js app..."); + try { + execSync("npm run build", { + stdio: "inherit", + cwd: appDir, + env: { + ...process.env, + HOME: buildHomeDir, + USERPROFILE: buildHomeDir, + APPDATA: path.join(buildHomeDir, "AppData", "Roaming"), + LOCALAPPDATA: path.join(buildHomeDir, "AppData", "Local"), + NEXT_DIST_DIR: buildDistDirName, + NEXT_TRACING_ROOT_MODE: "workspace", + } + }); + console.log("✅ Next.js build completed\n"); + } catch (error) { + console.error("❌ Next.js build failed"); + process.exit(1); + } + + // Step 2: Clean old app/cli/app if exists + console.log("2️⃣ Cleaning old app/cli/app..."); + if (fs.existsSync(cliAppDir)) { + fs.rmSync(cliAppDir, { recursive: true, force: true }); + } + console.log("✅ Cleaned\n"); + + // Step 3: Copy Next.js standalone build to app/cli/app. + // Newer Next.js standalone output writes server.js/package.json plus .next/, src/, and + // node_modules/ directly under .next/standalone. Older builds may still use a nested app/. + console.log("3️⃣ Copying Next.js standalone build to app/cli/app..."); + try { + copyStandaloneBuild(appDir, buildDistDir, cliAppDir); + } catch (error) { + console.error("❌ Next.js standalone build not found under .next/standalone"); + console.error("Expected either .next/standalone/server.js or .next/standalone/app/"); + process.exit(1); + } + console.log("✅ Copied standalone build\n"); + + // Step 3a: Copy custom server (injects real socket IP, strips spoofable XFF). + const customServerSrc = path.join(appDir, "custom-server.js"); + if (fs.existsSync(customServerSrc)) { + fs.copyFileSync(customServerSrc, path.join(cliAppDir, "custom-server.js")); + console.log("✅ Copied custom-server.js\n"); + } else { + console.warn("⚠️ custom-server.js not found — server will run without real-IP injection\n"); + } + + // Step 3b: Ensure sql.js (pure JS fallback) bundled in app/cli/app/node_modules. + // Strip better-sqlite3 (native) — it lives in ~/.9router/runtime to avoid + // Windows EBUSY during global CLI updates. node:sqlite (Node ≥22.5) is also + // available as a no-install middle tier. + console.log("3️⃣ b Configuring SQLite drivers..."); + function ensureModuleInBundle(pkg) { + const dest = path.join(cliAppDir, "node_modules", pkg); + if (fs.existsSync(dest)) { + console.log(`✅ ${pkg} already bundled`); + return; + } + const candidates = [ + path.join(appDir, "node_modules", pkg), + path.join(rootDir, "node_modules", pkg), + ]; + const src = candidates.find((p) => fs.existsSync(p)); + if (!src) { + console.warn(`⚠️ ${pkg} not found locally — bundle will rely on node:sqlite or runtime install`); + return; + } + fs.mkdirSync(path.dirname(dest), { recursive: true }); + copyRecursive(src, dest); + console.log(`✅ Bundled ${pkg}`); + } + ensureModuleInBundle("sql.js"); + // `open` is external (see serverExternalPackages in next.config.mjs), so it must exist in + // the bundle's node_modules or every importer throws MODULE_NOT_FOUND at runtime. Output + // tracing normally copies it; this is the same belt-and-braces guard used for sql.js. + ensureModuleInBundle("open"); + const betterDir = path.join(cliAppDir, "node_modules", "better-sqlite3"); + if (fs.existsSync(betterDir)) { + fs.rmSync(betterDir, { recursive: true, force: true }); + console.log("✅ Stripped better-sqlite3 (lives in ~/.9router/runtime)"); + } + console.log(""); + + // Step 4: Copy static files + console.log("4️⃣ Copying static files..."); + const staticSrc = path.join(appDir, ".next", "static"); + const staticSrcResolved = path.join(buildDistDir, "static"); + const staticDest = path.join(cliAppDir, buildDistDirName, "static"); + if (fs.existsSync(staticSrcResolved) || fs.existsSync(staticSrc)) { + copyRecursive(fs.existsSync(staticSrcResolved) ? staticSrcResolved : staticSrc, staticDest); + console.log("✅ Copied static files\n"); + } else { + console.log("⏭️ No static files found\n"); + } + + // Step 5: Copy public folder if exists + console.log("5️⃣ Copying public folder..."); + const publicSrc = path.join(appDir, "public"); + const publicDest = path.join(cliAppDir, "public"); + if (fs.existsSync(publicSrc)) { + copyRecursive(publicSrc, publicDest); + console.log("✅ Copied public folder\n"); + } else { + console.log("⏭️ No public folder found\n"); + } + + // Step 6: Copy vendor-chunks (required for production) + console.log("6️⃣ Copying vendor-chunks..."); + const vendorChunksSrc = path.join(appDir, ".next", "server", "vendor-chunks"); + const vendorChunksSrcResolved = path.join(buildDistDir, "server", "vendor-chunks"); + const vendorChunksDest = path.join(cliAppDir, buildDistDirName, "server", "vendor-chunks"); + if (fs.existsSync(vendorChunksSrcResolved) || fs.existsSync(vendorChunksSrc)) { + copyRecursive(fs.existsSync(vendorChunksSrcResolved) ? vendorChunksSrcResolved : vendorChunksSrc, vendorChunksDest); + console.log("✅ Copied vendor-chunks\n"); + } else { + console.log("⏭️ No vendor-chunks found\n"); + } + + // Step 6b: Merge the complete generated server tree. Next.js standalone output + // is trace-pruned and can omit route modules or chunks loaded dynamically. + console.log("6️⃣ b Copying complete server artifacts..."); + mergeServerArtifacts(buildDistDir, cliAppDir); + assertRequiredApiArtifacts(cliAppDir); + console.log("✅ Copied complete server artifacts\n"); + + // Step 7: Copy MITM server files (not bundled by Next.js standalone) + console.log("7️⃣ Copying MITM server files..."); + const mitmSrc = path.join(appDir, "src", "mitm"); + const mitmDest = path.join(cliAppDir, "src", "mitm"); + if (fs.existsSync(mitmSrc)) { + copyRecursive(mitmSrc, mitmDest); + console.log("✅ Copied MITM files\n"); + } else { + console.log("⏭️ No MITM files found\n"); + } + + // Step 7b: Copy standalone updater (headless Node process for install progress) + console.log("7️⃣ b Copying updater files..."); + const updaterSrc = path.join(appDir, "src", "lib", "updater"); + const updaterDest = path.join(cliAppDir, "src", "lib", "updater"); + if (fs.existsSync(updaterSrc)) { + copyRecursive(updaterSrc, updaterDest); + console.log("✅ Copied updater files\n"); + } else { + console.log("⏭️ No updater files found\n"); + } + + // Step 8: Build MITM server (config driven - see app/cli/scripts/buildMitm.js) + console.log("8️⃣ Building MITM server..."); + try { + execSync("node scripts/buildMitm.js", { stdio: "inherit", cwd: cliDir }); + console.log("✅ MITM server build completed\n"); + } catch (error) { + console.error("❌ MITM build failed"); + process.exit(1); + } + + console.log("✨ CLI package build completed!"); + console.log(`📁 Output: ${cliAppDir}`); + + try { + const { execSync: exec } = require("child_process"); + const size = exec(`du -sh "${cliAppDir}"`, { encoding: "utf8" }).trim(); + console.log(`📊 Package size: ${size.split("\t")[0]}`); + } catch (e) { + // Silent fail on size check + } } -// Step 6: Copy vendor-chunks (required for production) -console.log("6️⃣ Copying vendor-chunks..."); -const vendorChunksSrc = path.join(appDir, ".next", "server", "vendor-chunks"); -const vendorChunksSrcResolved = path.join(buildDistDir, "server", "vendor-chunks"); -const vendorChunksDest = path.join(cliAppDir, buildDistDirName, "server", "vendor-chunks"); -if (fs.existsSync(vendorChunksSrcResolved) || fs.existsSync(vendorChunksSrc)) { - copyRecursive(fs.existsSync(vendorChunksSrcResolved) ? vendorChunksSrcResolved : vendorChunksSrc, vendorChunksDest); - console.log("✅ Copied vendor-chunks\n"); -} else { - console.log("⏭️ No vendor-chunks found\n"); -} +module.exports = { + assertRequiredApiArtifacts, + copyStandaloneBuild, + mergeServerArtifacts, +}; -// Step 7: Copy MITM server files (not bundled by Next.js standalone) -console.log("7️⃣ Copying MITM server files..."); -const mitmSrc = path.join(appDir, "src", "mitm"); -const mitmDest = path.join(cliAppDir, "src", "mitm"); -if (fs.existsSync(mitmSrc)) { - copyRecursive(mitmSrc, mitmDest); - console.log("✅ Copied MITM files\n"); -} else { - console.log("⏭️ No MITM files found\n"); -} - -// Step 7b: Copy standalone updater (headless Node process for install progress) -console.log("7️⃣ b Copying updater files..."); -const updaterSrc = path.join(appDir, "src", "lib", "updater"); -const updaterDest = path.join(cliAppDir, "src", "lib", "updater"); -if (fs.existsSync(updaterSrc)) { - copyRecursive(updaterSrc, updaterDest); - console.log("✅ Copied updater files\n"); -} else { - console.log("⏭️ No updater files found\n"); -} - -// Step 8: Build MITM server (config driven - see app/cli/scripts/buildMitm.js) -console.log("8️⃣ Building MITM server..."); -try { - execSync("node scripts/buildMitm.js", { stdio: "inherit", cwd: cliDir }); - console.log("✅ MITM server build completed\n"); -} catch (error) { - console.error("❌ MITM build failed"); - process.exit(1); -} - -console.log("✨ CLI package build completed!"); -console.log(`📁 Output: ${cliAppDir}`); - -try { - const { execSync: exec } = require("child_process"); - const size = exec(`du -sh "${cliAppDir}"`, { encoding: "utf8" }).trim(); - console.log(`📊 Package size: ${size.split("\t")[0]}`); -} catch (e) { - // Silent fail on size check +if (require.main === module) { + buildCliPackage(); } diff --git a/custom-server.js b/custom-server.js index 6e39683f..cf824ba4 100644 --- a/custom-server.js +++ b/custom-server.js @@ -1,7 +1,42 @@ const http = require("http"); +const path = require("path"); +const { pathToFileURL } = require("url"); const origCreate = http.createServer.bind(http); +let backgroundRefreshStarted = false; + +function startBackgroundTokenRefreshFromCustomServer() { + if (backgroundRefreshStarted) return; + backgroundRefreshStarted = true; + // Prefer source path (repo / standalone that still has src). Fail-open if missing + // — initializeApp also starts the same scheduler when the Next app boots. + const modPath = path.join(__dirname, "src", "sse", "services", "backgroundTokenRefresh.js"); + import(pathToFileURL(modPath).href) + .then((m) => { + try { + m.startBackgroundTokenRefresh(); + } catch (e) { + console.error("[BackgroundTokenRefresh] start failed:", e && e.message ? e.message : e); + } + const stop = () => { + try { + m.stopBackgroundTokenRefresh(); + } catch { + /* ignore */ + } + }; + process.once("SIGINT", stop); + process.once("SIGTERM", stop); + }) + .catch((e) => { + // Expected in published CLI standalone (src/ not on disk). App bootstrap covers it. + if (process.env.DEBUG_BACKGROUND_TOKEN_REFRESH) { + console.error("[BackgroundTokenRefresh] import failed:", e && e.message ? e.message : e); + } + }); +} + // Wrap Next standalone HTTP server: derive client IP from the TCP socket // (unspoofable) and strip client-supplied forwarding headers so downstream // rate-limiting keys on the real peer address instead of attacker-controlled XFF. @@ -26,7 +61,57 @@ http.createServer = (...args) => { if (viaProxy) req.headers["x-9r-via-proxy"] = "1"; return handler(req, res); }; - return origCreate(...rest, wrapped); + const server = origCreate(...rest, wrapped); + server.once("listening", () => { + startBackgroundTokenRefreshFromCustomServer(); + }); + const origEmit = server.emit; + // JBR 25 sends h2c upgrades that the HTTP/1.1 server would otherwise close. + server.emit = function (event, ...eventArgs) { + const [req, socket, head] = eventArgs; + if (event !== "upgrade" || String(req.headers.upgrade || "").toLowerCase() !== "h2c") { + return origEmit.call(this, event, ...eventArgs); + } + + const contentLength = Number(req.headers["content-length"] || 0); + if (!Number.isSafeInteger(contentLength) || contentLength < 0) { + socket.destroy(); + return true; + } + const chunks = [head]; + let received = head.length; + const serve = () => { + // Replay the upgraded request through the existing HTTP/1.1 handler. + const replay = new http.IncomingMessage(socket); + Object.assign(replay, { method: req.method, url: req.url, headers: req.headers, complete: true }); + if (received) replay.push(Buffer.concat(chunks, received).subarray(0, contentLength)); + replay.push(null); + const res = new http.ServerResponse(replay); + res.shouldKeepAlive = false; + res.assignSocket(socket); + res.once("finish", () => socket.end()); + Promise.resolve().then(() => wrapped(replay, res)).catch((error) => { + console.error("Failed to downgrade h2c request", error); + socket.destroy(); + }); + }; + if (received >= contentLength) serve(); + else { + socket.on("data", function readBody(chunk) { + chunks.push(chunk); + received += chunk.length; + if (received < contentLength) return; + socket.off("data", readBody); + serve(); + }); + socket.resume(); + } + delete req.headers.upgrade; + delete req.headers["http2-settings"]; + req.headers.connection = "close"; + return true; + }; + return server; }; -require("./server.js"); +if (require.main === module) require("./server.js"); diff --git a/docs/superpowers/plans/2026-08-02-gpt-5-6-codex-reasoning-overrides.md b/docs/superpowers/plans/2026-08-02-gpt-5-6-codex-reasoning-overrides.md new file mode 100644 index 00000000..8ff5a940 --- /dev/null +++ b/docs/superpowers/plans/2026-08-02-gpt-5-6-codex-reasoning-overrides.md @@ -0,0 +1,328 @@ +# GPT-5.6 Codex Reasoning Overrides Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Preserve Codex-advertised Max and Ultra overrides for GPT-5.6 Sol and Terra, preserve Max for Luna, and convert Luna Ultra to Max without changing Kiro or generic OpenAI-format behavior. + +**Architecture:** Keep the supported reasoning matrix in the existing `getThinkingLevels(provider, model)` resolver and reuse that result in both translation and Codex executor normalization. The dashboard already consumes this resolver, so no UI component change is required. Unsupported top-end levels remain safely normalized, with Luna Ultra selecting Luna's supported Max level. + +**Tech Stack:** JavaScript ES modules, Next.js, Vitest, Codex Responses transport. + +## Global Constraints + +- Apply the new overrides only to the OpenAI Codex provider (`codex`, exposed as `cx/`). +- Sol and Terra support `max` and `ultra`; Luna supports `max` but not `ultra`. +- Convert Luna `ultra` requests to `max` in both translated and native passthrough request paths. +- Preserve existing Kiro and generic OpenAI-compatible normalization. +- Do not add runtime model-catalog fetching, dependencies, pricing changes, or unrelated refactors. +- Write each behavior test first and observe the expected failure before changing production code. + +--- + +### Task 1: Provider-scoped GPT-5.6 level matrix + +**Files:** +- Modify: `tests/unit/thinking-levels-gpt56-sol.test.js` +- Modify: `open-sse/providers/thinkingLevels.js` + +**Interfaces:** +- Consumes: `getThinkingLevels(provider, model)` and existing capability metadata. +- Produces: `getThinkingLevels(provider, model): string[] | null` with Codex-only GPT-5.6 level overrides. + +- [ ] **Step 1: Replace the Sol-only assertions with the complete behavior matrix** + +Use literal expected arrays so each model/provider contract is independently checked: + +```js +it.each([ + ["gpt-5.6-sol", ["none", "minimal", "low", "medium", "high", "xhigh", "max", "ultra"]], + ["gpt-5.6-terra", ["none", "minimal", "low", "medium", "high", "xhigh", "max", "ultra"]], + ["gpt-5.6-luna", ["none", "minimal", "low", "medium", "high", "xhigh", "max"]], + ["gpt-5.6-sol-review", ["none", "minimal", "low", "medium", "high", "xhigh", "max", "ultra"]], + ["gpt-5.6-terra-review", ["none", "minimal", "low", "medium", "high", "xhigh", "max", "ultra"]], + ["gpt-5.6-luna-review", ["none", "minimal", "low", "medium", "high", "xhigh", "max"]], +])("returns Codex levels for %s", (model, expected) => { + expect(getThinkingLevels("codex", model)).toEqual(expected); +}); + +it("does not expose Codex-only GPT-5.6 overrides on Kiro", () => { + expect(getThinkingLevels("kiro", "gpt-5.6-sol")).toEqual([ + "none", "minimal", "low", "medium", "high", "xhigh", + ]); +}); +``` + +Keep the older Codex-model assertion to protect the existing `gpt-5.3-codex` behavior. + +- [ ] **Step 2: Run the level test and verify it fails for the missing matrix/provider scoping** + +Run: + +```bash +npx vitest run tests/unit/thinking-levels-gpt56-sol.test.js +``` + +Expected: FAIL because Sol lacks Ultra, Terra/Luna lack Max, and Kiro currently inherits Sol Max. + +- [ ] **Step 3: Add provider-aware pattern matching and the three Codex model rules** + +Update `PATTERN_THINKING` entries to accept an optional `provider` field and match it in `getThinkingLevels`: + +```js +const CODEX_GPT_5_6_LEVELS = ["none", "minimal", "low", "medium", "high", "xhigh", "max"]; + +const PATTERN_THINKING = [ + { provider: "codex", pattern: "*gpt-5.6-sol*", levels: [...CODEX_GPT_5_6_LEVELS, "ultra"] }, + { provider: "codex", pattern: "*gpt-5.6-terra*", levels: [...CODEX_GPT_5_6_LEVELS, "ultra"] }, + { provider: "codex", pattern: "*gpt-5.6-luna*", levels: CODEX_GPT_5_6_LEVELS }, + { pattern: "*codex*", levels: ["low", "medium", "high", "xhigh"] }, +]; + +const hit = PATTERN_THINKING.find((entry) => + (!entry.provider || entry.provider === provider) && matchPattern(entry.pattern, model) +); +``` + +- [ ] **Step 4: Re-run the level test and verify it passes** + +Run: + +```bash +npx vitest run tests/unit/thinking-levels-gpt56-sol.test.js +``` + +Expected: 1 test file passed with no failures. + +- [ ] **Step 5: Commit the capability matrix** + +```bash +git add open-sse/providers/thinkingLevels.js tests/unit/thinking-levels-gpt56-sol.test.js +git commit -m "feat(codex): expose GPT-5.6 reasoning overrides" +``` + +### Task 2: Model-aware shared thinking translation + +**Files:** +- Modify: `tests/translator/thinking-unified.test.js` +- Modify: `open-sse/translator/concerns/thinkingUnified.js` + +**Interfaces:** +- Consumes: `getThinkingLevels(provider, cleanModel): string[] | null` from Task 1. +- Produces: `parseSuffix(model)` support for `ultra` and `applyThinking(...)` output that preserves supported Codex levels. + +- [ ] **Step 1: Add failing suffix and translation tests** + +Add a literal parser assertion: + +```js +expect(parseSuffix("gpt-5.6-sol(ultra)")).toEqual({ + cleanModel: "gpt-5.6-sol", + override: { mode: "level", level: "ultra" }, +}); +``` + +Add table-driven Codex assertions using direct request fields: + +```js +it.each([ + ["gpt-5.6-sol", "max", "max"], + ["gpt-5.6-sol", "ultra", "ultra"], + ["gpt-5.6-terra", "max", "max"], + ["gpt-5.6-terra", "ultra", "ultra"], + ["gpt-5.6-luna", "max", "max"], + ["gpt-5.6-luna", "ultra", "max"], +])("normalizes Codex %s effort %s to %s", (model, effort, expected) => { + const out = apply("openai-responses", model, { reasoning: { effort } }, "codex"); + expect(out.reasoning_effort).toBe(expected); +}); +``` + +Add a parenthesized override assertion and Kiro isolation assertion: + +```js +expect(apply("openai-responses", "gpt-5.6-sol(ultra)", {}, "codex").reasoning_effort).toBe("ultra"); +expect(apply("openai", "gpt-5.6-sol", { reasoning_effort: "max" }, "kiro").reasoning_effort).toBe("xhigh"); +``` + +- [ ] **Step 2: Run the translator test and verify it fails for Ultra parsing and preserved Max/Ultra** + +Run: + +```bash +npx vitest run tests/translator/thinking-unified.test.js +``` + +Expected: FAIL because Ultra suffixes are ignored and OpenAI translation clamps Max to XHigh. + +- [ ] **Step 3: Implement supported-level normalization in the shared translator** + +Import `getThinkingLevels`. Recognize `ultra` explicitly in `parseSuffix` without adding it to the budget map. Resolve supported levels once in `applyThinking` and pass them to `applyFormat`. + +Use this normalization rule for the OpenAI format: + +```js +function normalizeOpenAILevel(level, supportedLevels) { + if (level !== "max" && level !== "ultra") return level; + if (supportedLevels?.includes(level)) return level; + if (level === "ultra" && supportedLevels?.includes("max")) return "max"; + return "xhigh"; +} +``` + +Keep `none`, automatic effort, budget conversion, and every non-OpenAI format unchanged. + +- [ ] **Step 4: Re-run the translator and generic OpenAI clamp tests** + +Run: + +```bash +npx vitest run tests/translator/thinking-unified.test.js tests/unit/thinking-effort-openai-max-clamp.test.js +``` + +Expected: 2 test files passed; generic OpenAI Max still becomes XHigh. + +- [ ] **Step 5: Commit shared translation support** + +```bash +git add open-sse/translator/concerns/thinkingUnified.js tests/translator/thinking-unified.test.js +git commit -m "feat(codex): preserve supported reasoning efforts" +``` + +### Task 3: Codex native passthrough normalization + +**Files:** +- Modify: `tests/unit/codex-fast-capacity.test.js` +- Modify: `open-sse/executors/codex.js` + +**Interfaces:** +- Consumes: `getThinkingLevels("codex", upstreamModel): string[] | null` from Task 1. +- Produces: `CodexExecutor.transformRequest(...)` payloads with model-supported upstream `reasoning.effort` values. + +- [ ] **Step 1: Add failing Codex executor behavior tests** + +Add a separate `describe("Codex reasoning normalization", ...)` block with real `transformRequest` calls: + +```js +it.each([ + ["gpt-5.6-sol", "max", "max"], + ["gpt-5.6-sol", "ultra", "ultra"], + ["gpt-5.6-terra", "max", "max"], + ["gpt-5.6-terra", "ultra", "ultra"], + ["gpt-5.6-luna", "max", "max"], + ["gpt-5.6-luna", "ultra", "max"], +])("normalizes %s effort %s to %s", (model, effort, expected) => { + const body = new CodexExecutor().transformRequest(model, { + model, + input: "hi", + reasoning: { effort }, + }, true, {}); + expect(body.reasoning.effort).toBe(expected); +}); + +it("resolves review models before applying the reasoning matrix", () => { + const body = new CodexExecutor().transformRequest("gpt-5.6-terra-review", { + model: "gpt-5.6-terra-review", + input: "hi", + reasoning_effort: "ultra", + }, true, {}); + expect(body.model).toBe("gpt-5.6-terra"); + expect(body.reasoning.effort).toBe("ultra"); +}); +``` + +Keep the existing GPT-5.5 Max-to-XHigh fast-tier test. + +- [ ] **Step 2: Run the executor test and verify supported values fail by being clamped** + +Run: + +```bash +npx vitest run tests/unit/codex-fast-capacity.test.js +``` + +Expected: FAIL because current normalization maps supported Max to XHigh and does not map Luna Ultra to Max. + +- [ ] **Step 3: Make Codex normalization model-aware** + +Import `getThinkingLevels` and replace the global Max clamp with: + +```js +function normalizeReasoningEffort(model, value) { + const supportedLevels = getThinkingLevels("codex", model); + if (supportedLevels?.includes(value)) return value; + if (value === "ultra" && supportedLevels?.includes("max")) return "max"; + if (value === "max" || value === "ultra") return "xhigh"; + return value; +} +``` + +Call it only after `body.model` has resolved review aliases to their upstream base model. Pass `body.model` for both `reasoning_effort` and existing `reasoning.effort` request shapes. + +- [ ] **Step 4: Re-run the executor and focused feature suites** + +Run: + +```bash +npx vitest run tests/unit/codex-fast-capacity.test.js tests/unit/thinking-levels-gpt56-sol.test.js tests/translator/thinking-unified.test.js tests/unit/thinking-effort-openai-max-clamp.test.js +``` + +Expected: 4 test files passed with no failures. + +- [ ] **Step 5: Commit native Codex normalization** + +```bash +git add open-sse/executors/codex.js tests/unit/codex-fast-capacity.test.js +git commit -m "feat(codex): forward GPT-5.6 max and ultra efforts" +``` + +### Task 4: Full verification and pull request + +**Files:** +- Verify all changed production, test, design, and plan files. + +**Interfaces:** +- Consumes: completed Tasks 1-3. +- Produces: verified branch pushed to `origin` and a pull request targeting `decolua/9router:master`. + +- [ ] **Step 1: Run all focused regression tests** + +```bash +npx vitest run tests/unit/thinking-levels-gpt56-sol.test.js tests/translator/thinking-unified.test.js tests/unit/thinking-effort-openai-max-clamp.test.js tests/unit/codex-fast-capacity.test.js +``` + +Expected: all selected test files and tests pass. + +- [ ] **Step 2: Run the complete unit test suite** + +```bash +npx vitest run tests/unit tests/translator +``` + +Expected: all test files pass with zero failed tests. + +- [ ] **Step 3: Run the production build** + +```bash +npm run build +``` + +Expected: Next.js production build exits with status 0. + +- [ ] **Step 4: Verify repository hygiene and requirement coverage** + +```bash +git diff --check upstream/master...HEAD +git status --short --branch +git log --oneline upstream/master..HEAD +``` + +Expected: no whitespace errors, no uncommitted source changes, and only scoped feature commits. + +- [ ] **Step 5: Push the feature branch and open the pull request** + +```bash +git push -u origin codex/gpt-5-6-reasoning-overrides +gh pr create --repo decolua/9router --base master --head seakleangnhak:codex/gpt-5-6-reasoning-overrides --title "feat(codex): support GPT-5.6 Max and Ultra overrides" --body $'## Summary\n- expose Max and Ultra for Codex GPT-5.6 Sol and Terra\n- expose Max for Codex GPT-5.6 Luna and normalize Luna Ultra to Max\n- keep Kiro and generic OpenAI-compatible reasoning behavior unchanged\n\n## Verification\n- `npx vitest run tests/unit tests/translator`\n- `npm run build`' +``` + +The pull request body must summarize the Codex-only support matrix, Luna Ultra-to-Max fallback, Kiro isolation, and fresh test/build evidence. diff --git a/docs/superpowers/specs/2026-08-02-gpt-5-6-codex-reasoning-overrides-design.md b/docs/superpowers/specs/2026-08-02-gpt-5-6-codex-reasoning-overrides-design.md new file mode 100644 index 00000000..832fb5ce --- /dev/null +++ b/docs/superpowers/specs/2026-08-02-gpt-5-6-codex-reasoning-overrides-design.md @@ -0,0 +1,122 @@ +# GPT-5.6 Codex Reasoning Overrides Design + +## Goal + +Expose and preserve the reasoning levels currently advertised by the OpenAI +Codex model catalog for GPT-5.6 Sol, Terra, and Luna when they are routed +through the `codex` provider (`cx/`). + +The supported override matrix is: + +| Model family | Max | Ultra | +| --- | --- | --- | +| GPT-5.6 Sol | Yes | Yes | +| GPT-5.6 Terra | Yes | Yes | +| GPT-5.6 Luna | Yes | No | + +The same matrix applies to 9router's virtual `-review` variants because they +resolve to the corresponding upstream base model. + +## Scope + +This change is limited to OpenAI Codex (`cx/`) routes. Kiro (`kr/`) and other +OpenAI-format providers retain their existing reasoning-level behavior even +when they expose models with the same GPT-5.6 names. + +The change covers the complete local request path: + +1. The provider page advertises only the levels supported by each Codex model. +2. A copied model suffix such as `gpt-5.6-sol(ultra)` is parsed as a reasoning + override. +3. The shared thinking translator preserves a supported Codex override while + retaining the existing `xhigh` fallback for unsupported OpenAI levels. +4. The Codex executor sends supported `max` and `ultra` values unchanged to the + upstream Codex Responses endpoint. + +## Current Behavior + +`gpt-5.6-luna` and the other GPT-5.6 models already exist in the Codex model +registry. The capability picker has a global Sol-only `max` pattern, which also +affects providers such as Kiro unintentionally. The shared OpenAI translator +and Codex executor then convert `max` to `xhigh`, so the advertised override is +not preserved end to end. `ultra` is not recognized as a model suffix. + +## Design + +### Provider-scoped level resolution + +Extend the existing model-pattern overrides in +`open-sse/providers/thinkingLevels.js` with an optional provider constraint. +Add three Codex-only GPT-5.6 patterns in most-specific order: + +- Sol: existing levels plus `max` and `ultra`. +- Terra: existing levels plus `max` and `ultra`. +- Luna: existing levels plus `max`. + +Matching remains wildcard-based so virtual `-review` variants inherit the +base model's levels. Provider matching prevents these overrides from changing +Kiro or other providers. + +### Shared translation + +Teach the suffix parser to recognize `ultra` as a discrete level without +assigning it a synthetic token budget. When applying the OpenAI wire format, +reuse the resolved per-provider model levels: + +- Preserve `max` or `ultra` when the target provider/model explicitly supports + the requested level. +- Convert `ultra` to `max` for GPT-5.6 Luna, preserving the highest level Luna + supports. +- Convert other unsupported `max` or `ultra` requests to `xhigh`, preserving + the existing safe fallback for generic OpenAI-compatible providers. +- Leave all existing lower levels and `none` handling unchanged. + +This keeps one capability source for the dashboard and translation behavior +instead of duplicating the GPT-5.6 matrix. + +### Codex executor + +Make Codex reasoning normalization model-aware. After virtual review models +are resolved to their upstream base model, preserve a requested level when +the Codex capability resolver lists it. Continue converting unsupported +`max` or `ultra` values to `xhigh`, except that Luna converts `ultra` to its +supported `max` level. + +Do not add `max` to the executor's legacy hyphen-suffix parser because +`gpt-5.1-codex-max` is an actual model identifier. Dashboard overrides use the +existing parenthesized suffix and the shared translator removes that suffix +before executor dispatch. + +## Error and Compatibility Behavior + +- `cx/gpt-5.6-luna(ultra)` becomes `max` rather than sending an unsupported + level upstream. +- Non-GPT-5.6 Codex models retain their current supported levels and fallback + behavior. +- Kiro GPT-5.6 routes no longer inherit the Codex Sol-only picker override and + continue using Kiro's existing effort normalization. +- Direct request fields and parenthesized model overrides follow the same + model-aware rules. + +## Testing + +Use test-driven development with focused unit coverage: + +1. Level resolver tests for Sol, Terra, Luna, their review variants, an older + Codex model, and Kiro isolation. +2. Shared translator tests proving `max` and `ultra` survive only for supported + Codex model/provider combinations, Luna `ultra` becomes `max`, and other + unsupported combinations become `xhigh`. +3. Codex executor tests proving native and translated request shapes preserve + supported values after upstream model resolution. +4. Existing thinking translation and Codex executor suites to guard generic + OpenAI clamping and fast-tier behavior. +5. Project lint/build checks in proportion to the changed JavaScript modules. + +## Non-goals + +- Runtime fetching or caching of the Codex model catalog. +- Adding these levels to Kiro or another provider. +- Changing model pricing, quotas, defaults, or service tiers. +- Adding Codex Ultra's multi-agent orchestration behavior inside 9router; + 9router only forwards the catalog-advertised reasoning override. diff --git a/i18n/README.vi.md b/i18n/README.vi.md index d0a51de4..5e01d8aa 100644 --- a/i18n/README.vi.md +++ b/i18n/README.vi.md @@ -1,21 +1,15 @@ -Dưới đây là bản dịch tiếng Việt của tài liệu Markdown, giữ nguyên toàn bộ cú pháp và cấu trúc kỹ thuật. -
- # 9Router - Free AI Router
+ # 9Router - Free AI Router & Token Saver
- **Không bao giờ ngừng code. Tự động định tuyến tới các mô hình AI MIỄN PHÍ & giá rẻ với cơ chế dự phòng thông minh.**
+ **Không bao giờ ngừng code. Tiết kiệm 20-40% token với RTK + tự động dự phòng sang các mô hình AI MIỄN PHÍ & giá rẻ.**
- **Nhà cung cấp AI Miễn cho OpenClaw.**
-
-
- 
-
- Group models under one name, then pick a strategy per combo: -
-+ Group models under one name, then pick a strategy per combo: +
+No combos yet
-- Create model combos with fallback support -
- -No combos yet
+Create model combos with fallback support
+ +
- {combo.name}
-
-
- {model}
-
- ))
- )}
- {combo.models.length > 3 && (
-
- +{combo.models.length - 3} more
-
- )}
- {combo.name}
+
+ {model}
+
+ ))
+ )}
+ {combo.models.length > 3 && (
+ +{combo.models.length - 3} more
+ )}
+ Vision Adapter
++ Your model can't read image/audio? Auto-switches to a model in the pool below. +
+{cap.label}
+ — {cap.desc}
+
+ {model}
+
+ ))
+ )}
+ {models.length > 3 && (
+ +{models.length - 3} more
+ )}
+ - Only letters, numbers, -, _ and . allowed -
-No models added yet
-+ Only letters, numbers, -, _ and . allowed +
+No models added yet
+