diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..86b7318 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,17 @@ +.git +.DS_Store +.env +.env.* +node_modules +dist +packages/*/dist +release +release-local +logs +tmp +test-results +playwright-report +blob-report +docs/node_modules +docs/dist +docs/.astro diff --git a/.gitignore b/.gitignore index 291dafe..6efc5ae 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,8 @@ release tmp release-local logs -.opencat \ No newline at end of file +.opencat +test-results +playwright-report +blob-report +.tmp \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4c0c868 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,75 @@ +ARG NODE_IMAGE=node:22-bookworm +ARG RUNTIME_NODE_IMAGE=node:22-bookworm-slim + +FROM ${NODE_IMAGE} AS build +WORKDIR /app + +COPY package.json package-lock.json ./ +COPY packages/cli/package.json packages/cli/package.json +COPY packages/core/package.json packages/core/package.json +COPY packages/electron/package.json packages/electron/package.json +COPY packages/ui/package.json packages/ui/package.json +RUN npm ci + +COPY . . +RUN npm run build:docker + +FROM ${NODE_IMAGE} AS production-deps +WORKDIR /app +ENV NODE_ENV=production + +COPY package.json package-lock.json ./ +COPY packages/core/package.json packages/core/package.json +RUN npm ci --omit=dev --workspace=@claude-code-router/core --include-workspace-root=false \ + && npm cache clean --force + +FROM ${RUNTIME_NODE_IMAGE} AS runtime +ENV NODE_ENV=production \ + CCR_DATA_DIR=/data \ + CCR_WEB_HOST=127.0.0.1 \ + CCR_WEB_PORT=3459 \ + CCR_NGINX_PORT=8080 \ + CCR_GATEWAY_HOST=127.0.0.1 \ + CCR_GATEWAY_PORT=3456 \ + CCR_GATEWAY_CORE_PORT=3457 \ + CCR_PUBLIC_HOST=127.0.0.1 \ + CCR_PUBLIC_PORT=3458 + +WORKDIR /app + +RUN apt-get update \ + && apt-get install -y --no-install-recommends ca-certificates libstdc++6 nginx \ + && rm -rf /var/lib/apt/lists/* \ + && rm -f /etc/nginx/sites-enabled/default /etc/nginx/conf.d/default.conf \ + && rm -rf \ + /opt/yarn-* \ + /usr/local/bin/corepack \ + /usr/local/bin/npm \ + /usr/local/bin/npx \ + /usr/local/bin/yarn \ + /usr/local/bin/yarnpkg \ + /usr/local/include/node \ + /usr/local/lib/node_modules/corepack \ + /usr/local/lib/node_modules/npm \ + /usr/local/share/doc \ + /usr/local/share/man + +COPY package.json package-lock.json ./ +COPY packages/core/package.json packages/core/package.json +COPY --from=production-deps /app/node_modules node_modules + +COPY --from=build /app/packages/core/dist packages/core/dist +COPY --from=build /app/packages/ui/dist/renderer /usr/share/nginx/html +COPY docker/entrypoint.sh /usr/local/bin/ccr-docker-entrypoint +COPY docker/pm2.config.cjs docker/pm2.config.cjs + +RUN chmod +x /usr/local/bin/ccr-docker-entrypoint \ + && mkdir -p /data /run/nginx /var/lib/nginx /var/log/nginx + +VOLUME ["/data"] +EXPOSE 8080 + +HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \ + CMD node -e "fetch('http://127.0.0.1:' + (process.env.CCR_NGINX_PORT || '8080') + '/').then((r) => process.exit(r.ok ? 0 : 1)).catch(() => process.exit(1))" + +ENTRYPOINT ["ccr-docker-entrypoint"] diff --git a/README.md b/README.md index 3f5ce1e..f32ddf1 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,52 @@ -

Claude Code Router Desktop

+

Claude Code Router

Chinese README Discord X License + Desktop downloads Documentation

+
+ + + + + + + + +
+ + Kimi K2.7 Code sponsor banner + +
+ + Kimi Code Subscription +  ·  + API Global +  ·  + API China + +
+

+ Thanks to Kimi for sponsoring this project! Kimi K2.7 Code is an open-source, coding-focused agentic model developed by Moonshot AI, with substantial gains on real-world long-horizon coding tasks and higher end-to-end success across complex software engineering workflows. It also cuts thinking-token usage by approximately 30% compared with K2.6. Inside CCR, Kimi ships as built-in provider presets: import the pay-as-you-go API or the Kimi Code subscription in one click and route your coding agent's requests to Kimi, the subscription endpoint passes straight through natively with no protocol conversion, API endpoints are adapted automatically, and your balance and subscription usage show up right in the CCR dashboard. +

+

+ CCR already supports Kimi. Visit the Kimi Open Platform (中文站 | Global) to try the API, or explore the cost-effective Coding Plan. +

+
+ +
+ +Claude Code Router Desktop is a local gateway and desktop control panel for routing agent requests from Claude Code, Codex, ZCode, and compatible clients to the model provider you actually want to use. +

Claude Code Router Desktop screenshot

-Claude Code Router Desktop is a local gateway and desktop control panel for routing agent requests from Claude Code, Codex, ZCode, and compatible clients to the model provider you actually want to use. - ## Why Use CCR - Use one local endpoint for multiple agent tools instead of configuring every client separately. @@ -176,6 +209,36 @@ Codex support is powered by [musistudio/codexl](https://github.com/musistudio/co TeamoRouter + + + code0.ai icon +
+ code0.ai + + + + + claudeapi icon +
+ claudeapi + + + + + + + Qiniu Cloud AI icon +
+ Qiniu Cloud AI + + + + + Fenno.ai icon +
+ Fenno.ai + + diff --git a/README_zh.md b/README_zh.md index cd79161..7065c54 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,19 +1,52 @@ -

Claude Code Router Desktop

+

Claude Code Router

English README Discord X License + 桌面端下载次数 文档

+
+ + + + + + + + +
+ + Kimi K2.7 Code 赞助横幅 + +
+ + Kimi Code 订阅 +  ·  + API 中文站 +  ·  + API Global + +
+

+ 感谢 Kimi 赞助本项目！Kimi K2.7 Code 是 Moonshot AI 推出的编程专用开源智能体模型，在真实长程编程与复杂软件工程工作流中显著提升端到端任务成功率，同时优化推理效率，相比 K2.6 平均减少约 30% 的推理 token 消耗。在 CCR 中，Kimi 已作为内置供应商预设开箱即用：无论按量付费 API 还是 Kimi Code 订阅，一键导入即可把你的编程 Agent 请求路由到 Kimi，订阅端点原生直通、无需协议转换，API 端点自动适配，账户余额与订阅用量也能直接在 CCR 面板中查看。 +

+

+ CCR 已内置 Kimi 供应商预设。前往 Kimi 开放平台（中文站｜Global）体验 API，或了解高性价比 Coding Plan 套餐。 +

+
+ +
+ +Claude Code Router Desktop 是一个本地网关和桌面控制台，用来把 Claude Code、Codex、ZCode 以及兼容客户端的 Agent 请求路由到你真正想使用的模型服务。 +

Claude Code Router Desktop 项目截图

-Claude Code Router Desktop 是一个本地网关和桌面控制台，用来把 Claude Code、Codex、ZCode 以及兼容客户端的 Agent 请求路由到你真正想使用的模型服务。 - ## 为什么使用 CCR - 用一个本地入口连接多个 Agent 工具，不需要在每个客户端里重复配置 Provider。 @@ -175,6 +208,36 @@ CCR 可以完全通过桌面 UI 完成配置。首次使用建议按下面顺序 TeamoRouter + + + code0.ai 图标 +
+ code0.ai + + + + + claudeapi 图标 +
+ claudeapi + + + + + + + 七牛云 AI 图标 +
+ 七牛云 AI + + + + + Fenno.ai 图标 +
+ Fenno.ai + + diff --git a/build/build.mjs b/build/build.mjs index a07412b..ba43565 100644 --- a/build/build.mjs +++ b/build/build.mjs @@ -1,4 +1,4 @@ -import { buildBrowserRenderer, buildMain, buildRenderer, buildStyles, buildTrayRenderer, buildWebClientBridge, cleanDist, copyAppAssets, copyBrowserRendererHtml, copyMarketplacePlugins, copyModelCatalog, copyRendererHtml, copyTrayRendererHtml } from "./esbuild.config.mjs"; +import { buildBrowserRenderer, buildMain, buildRenderer, buildStyles, buildTrayRenderer, buildWebClientBridge, cleanDist, copyAppAssets, copyBrowserRendererHtml, copyMarketplacePlugins, copyModelCatalog, copyRendererHtml, copyTrayRendererHtml, syncUiRendererToRuntimeDists } from "./esbuild.config.mjs"; const mode = process.argv.includes("--dev") ? "development" : "production"; @@ -19,4 +19,6 @@ await Promise.all([ buildStyles({ minify: mode === "production" }) ]); -console.log(`Built Electron app assets in ${mode} mode.`); +syncUiRendererToRuntimeDists(); + +console.log(`Built monorepo package assets in ${mode} mode.`); diff --git a/build/dev.mjs b/build/dev.mjs index a7cf8fd..b91a341 100644 --- a/build/dev.mjs +++ b/build/dev.mjs @@ -5,12 +5,14 @@ import { spawn } from "node:child_process"; import { existsSync, readdirSync, readFileSync, statSync, watch } from "node:fs"; import path from "node:path"; import { - binPath, buildStyles, cleanDist, browserRendererHtmlInput, + cliSourceRoot, + coreSourceRoot, copyAppAssets, copyBrowserRendererHtml, + copyCliRuntimeToElectronDist, copyMarketplacePlugins, copyModelCatalog, copyRendererHtml, @@ -21,12 +23,12 @@ import { createRendererBuildOptions, createTrayRendererBuildOptions, createWebClientBridgeBuildOptions, - cssInput, - cssOutput, appAssetsInput, modelCatalogInput, projectRoot, + rendererRoot, rendererHtmlInput, + syncUiRendererToRuntimeDists, trayRendererHtmlInput, watchPlugin } from "./esbuild.config.mjs"; @@ -37,7 +39,12 @@ let pendingRestartReasons = []; const watchSignatures = new Map(); let shuttingDown = false; const restartDelayMs = 160; +const styleBuildDelayMs = 160; +const stylePollIntervalMs = 1000; const ignoredSignatureEntries = new Set([".DS_Store"]); +let styleBuildTimer = null; +let styleBuildInFlight = false; +let queuedStyleBuildReason = null; const ready = { browser: false, cli: false, @@ -46,6 +53,32 @@ const ready = { tray: false, webBridge: false }; +const devTarget = parseDevTarget(process.argv.slice(2)); +const enabled = { + cli: devTarget === "cli" || devTarget === "electron", + electron: devTarget === "electron", + ui: true +}; +const coreSharedSourceRoot = path.join(coreSourceRoot, "shared"); +const styleWatchRoots = [rendererRoot, coreSharedSourceRoot].filter((watchRoot) => existsSync(watchRoot)); +const activeReadyNames = new Set([ + ...(enabled.ui ? ["browser", "renderer", "tray", "webBridge"] : []), + ...(enabled.cli ? ["cli"] : []), + ...(enabled.electron ? ["main"] : []) +]); + +function parseDevTarget(args) { + const target = args[0] ?? "electron"; + if (target === "--help" || target === "-h") { + console.log("Usage: node build/dev.mjs [ui|cli|electron]"); + process.exit(0); + } + if (target === "ui" || target === "cli" || target === "electron") { + return target; + } + console.error(`Unknown dev target "${target}". Expected ui, cli, or electron.`); + process.exit(2); +} function logDev(message) { console.log(`[dev] ${new Date().toISOString()} ${message}`); @@ -57,6 +90,7 @@ function relativePath(file) { function readyState() { return Object.entries(ready) + .filter(([name]) => activeReadyNames.has(name)) .map(([name, value]) => `${name}:${value ? "ready" : "pending"}`) .join(" "); } @@ -163,7 +197,63 @@ function handleWatchedInput(label, watchedPath, eventType, filename, options, on } onChange(); - scheduleRestart(reason); + if (enabled.electron && options?.restart !== false) { + scheduleRestart(reason); + } +} + +function scheduleStyleBuild(reason) { + queuedStyleBuildReason = reason; + if (styleBuildTimer) { + clearTimeout(styleBuildTimer); + } + styleBuildTimer = setTimeout(() => { + styleBuildTimer = null; + void rebuildStyles(queuedStyleBuildReason ?? reason); + }, styleBuildDelayMs); +} + +async function rebuildStyles(reason) { + if (styleBuildInFlight) { + queuedStyleBuildReason = reason; + return; + } + + styleBuildInFlight = true; + queuedStyleBuildReason = null; + try { + logDev(`rebuilding styles: ${reason}`); + await buildStyles({ minify: false }); + syncUiRendererToRuntimeDists(); + if (enabled.electron) { + scheduleRestart(`styles rebuilt: ${reason}`); + } + } catch (error) { + const message = error instanceof Error ? error.message : String(error); + logDev(`style rebuild failed: ${message}`); + } finally { + styleBuildInFlight = false; + if (queuedStyleBuildReason) { + const queuedReason = queuedStyleBuildReason; + queuedStyleBuildReason = null; + scheduleStyleBuild(queuedReason); + } + } +} + +function pollStyleWatchRoots() { + for (const styleWatchRoot of styleWatchRoots) { + const label = `styles ${relativePath(styleWatchRoot)}`; + const signature = contentSignature(styleWatchRoot); + const previousSignature = watchSignatures.get(label); + if (previousSignature === signature.key) { + continue; + } + + watchSignatures.set(label, signature.key); + logDev(`watch event: ${label}; ${signature.summary}; content=changed`); + scheduleStyleBuild(label); + } } function markReady(name, reason = `${name} esbuild completed`) { @@ -171,7 +261,7 @@ function markReady(name, reason = `${name} esbuild completed`) { ready[name] = true; } logDev(`build ready: ${reason}; ${readyState()}`); - if (ready.browser && ready.cli && ready.main && ready.renderer && ready.tray && ready.webBridge) { + if (enabled.electron && Array.from(activeReadyNames).every((readyName) => ready[readyName])) { scheduleRestart(reason); } } @@ -221,114 +311,153 @@ function restartElectron() { }); } -logDev("starting dev build"); +logDev(`starting dev build target=${devTarget} ui=${enabled.ui ? "on" : "off"} cli=${enabled.cli ? "on" : "off"} electron=${enabled.electron ? "on" : "off"}`); cleanDist(); -copyAppAssets(); -copyMarketplacePlugins(); -copyModelCatalog(); +if (enabled.electron) { + copyAppAssets(); +} +if (enabled.cli || enabled.electron) { + copyMarketplacePlugins(); + copyModelCatalog(); +} copyBrowserRendererHtml(); copyRendererHtml(); copyTrayRendererHtml(); await buildStyles({ minify: false }); - -const tailwindProcess = spawn(binPath("tailwindcss"), ["-i", cssInput, "-o", cssOutput, "--watch"], { - cwd: projectRoot, - stdio: "inherit", - shell: process.platform === "win32" -}); -logDev(`Tailwind watcher started pid=${tailwindProcess.pid ?? "unknown"} input=${relativePath(cssInput)} output=${relativePath(cssOutput)}`); -tailwindProcess.on("exit", (code, signal) => { - logDev(`Tailwind watcher exited code=${code ?? "null"} signal=${signal ?? "null"}`); -}); +syncUiRendererToRuntimeDists(); rememberWatchSignature("home html", rendererHtmlInput); rememberWatchSignature("browser html", browserRendererHtmlInput); rememberWatchSignature("tray html", trayRendererHtmlInput); -rememberWatchSignature("app assets", appAssetsInput); -if (existsSync(modelCatalogInput)) { +for (const styleWatchRoot of styleWatchRoots) { + rememberWatchSignature(`styles ${relativePath(styleWatchRoot)}`, styleWatchRoot); +} +if (enabled.electron) { + rememberWatchSignature("app assets", appAssetsInput); +} +if ((enabled.cli || enabled.electron) && existsSync(modelCatalogInput)) { rememberWatchSignature("model catalog", modelCatalogInput); } const htmlWatcher = watch(rendererHtmlInput, { persistent: true }, (eventType, filename) => { - handleWatchedInput("home html", rendererHtmlInput, eventType, filename, undefined, copyRendererHtml); + handleWatchedInput("home html", rendererHtmlInput, eventType, filename, undefined, () => { + copyRendererHtml(); + syncUiRendererToRuntimeDists(); + }); }); const browserHtmlWatcher = watch(browserRendererHtmlInput, { persistent: true }, (eventType, filename) => { - handleWatchedInput("browser html", browserRendererHtmlInput, eventType, filename, undefined, copyBrowserRendererHtml); + handleWatchedInput("browser html", browserRendererHtmlInput, eventType, filename, undefined, () => { + copyBrowserRendererHtml(); + syncUiRendererToRuntimeDists(); + }); }); const trayHtmlWatcher = watch(trayRendererHtmlInput, { persistent: true }, (eventType, filename) => { - handleWatchedInput("tray html", trayRendererHtmlInput, eventType, filename, undefined, copyTrayRendererHtml); + handleWatchedInput("tray html", trayRendererHtmlInput, eventType, filename, undefined, () => { + copyTrayRendererHtml(); + syncUiRendererToRuntimeDists(); + }); }); -const appAssetsWatcher = watch(appAssetsInput, { persistent: true }, (eventType, filename) => { - handleWatchedInput("app assets", appAssetsInput, eventType, filename, { isDirectory: true }, copyAppAssets); -}); +const stylePoller = setInterval(pollStyleWatchRoots, stylePollIntervalMs); -const modelCatalogWatcher = existsSync(modelCatalogInput) +const appAssetsWatcher = enabled.electron + ? watch(appAssetsInput, { persistent: true }, (eventType, filename) => { + handleWatchedInput("app assets", appAssetsInput, eventType, filename, { isDirectory: true }, copyAppAssets); + }) + : { close: () => undefined }; + +const modelCatalogWatcher = (enabled.cli || enabled.electron) && existsSync(modelCatalogInput) ? watch(modelCatalogInput, { persistent: true }, (eventType, filename) => { handleWatchedInput("model catalog", modelCatalogInput, eventType, filename, undefined, copyModelCatalog); }) : { close: () => undefined }; -const mainContext = await esbuild.context( - createMainBuildOptions({ - mode: "development", - plugins: [watchPlugin("main", (name) => markReady(name))] - }) -); +const contexts = []; -const cliContext = await esbuild.context( - createCliBuildOptions({ - mode: "development", - plugins: [watchPlugin("cli", (name) => markReady(name))] - }) -); - -const rendererContext = await esbuild.context( - createRendererBuildOptions({ - mode: "development", - plugins: [ - watchPlugin("renderer", (name) => { - copyRendererHtml(); - markReady(name); +if (enabled.electron) { + contexts.push( + await esbuild.context( + createMainBuildOptions({ + mode: "development", + plugins: [watchPlugin("main", (name) => markReady(name))] }) - ] - }) -); + ) + ); +} -const trayRendererContext = await esbuild.context( - createTrayRendererBuildOptions({ - mode: "development", - plugins: [ - watchPlugin("tray", (name) => { - copyTrayRendererHtml(); - markReady(name); +if (enabled.cli) { + contexts.push( + await esbuild.context( + createCliBuildOptions({ + mode: "development", + plugins: [ + watchPlugin("cli", (name) => { + if (enabled.electron) { + copyCliRuntimeToElectronDist(); + } + markReady(name); + }) + ] }) - ] - }) -); + ) + ); +} -const browserRendererContext = await esbuild.context( - createBrowserRendererBuildOptions({ - mode: "development", - plugins: [ - watchPlugin("browser", (name) => { - copyBrowserRendererHtml(); - markReady(name); +if (enabled.ui) { + contexts.push( + await esbuild.context( + createRendererBuildOptions({ + mode: "development", + plugins: [ + watchPlugin("renderer", (name) => { + copyRendererHtml(); + syncUiRendererToRuntimeDists(); + markReady(name); + }) + ] }) - ] - }) -); + ), + await esbuild.context( + createTrayRendererBuildOptions({ + mode: "development", + plugins: [ + watchPlugin("tray", (name) => { + copyTrayRendererHtml(); + syncUiRendererToRuntimeDists(); + markReady(name); + }) + ] + }) + ), + await esbuild.context( + createBrowserRendererBuildOptions({ + mode: "development", + plugins: [ + watchPlugin("browser", (name) => { + copyBrowserRendererHtml(); + syncUiRendererToRuntimeDists(); + markReady(name); + }) + ] + }) + ), + await esbuild.context( + createWebClientBridgeBuildOptions({ + mode: "development", + plugins: [ + watchPlugin("webBridge", (name) => { + syncUiRendererToRuntimeDists(); + markReady(name); + }) + ] + }) + ) + ); +} -const webClientBridgeContext = await esbuild.context( - createWebClientBridgeBuildOptions({ - mode: "development", - plugins: [watchPlugin("webBridge", (name) => markReady(name))] - }) -); - -await Promise.all([mainContext.watch(), cliContext.watch(), rendererContext.watch(), trayRendererContext.watch(), browserRendererContext.watch(), webClientBridgeContext.watch()]); +await Promise.all(contexts.map((context) => context.watch())); logDev("watchers are active"); async function shutdown() { @@ -340,13 +469,16 @@ async function shutdown() { if (electronProcess) { electronProcess.kill(); } - tailwindProcess.kill(); + if (styleBuildTimer) { + clearTimeout(styleBuildTimer); + } htmlWatcher.close(); browserHtmlWatcher.close(); trayHtmlWatcher.close(); + clearInterval(stylePoller); appAssetsWatcher.close(); modelCatalogWatcher.close(); - await Promise.all([mainContext.dispose(), cliContext.dispose(), rendererContext.dispose(), trayRendererContext.dispose(), browserRendererContext.dispose(), webClientBridgeContext.dispose()]); + await Promise.all(contexts.map((context) => context.dispose())); process.exit(0); } diff --git a/build/docker-build.mjs b/build/docker-build.mjs new file mode 100644 index 0000000..75d4ed1 --- /dev/null +++ b/build/docker-build.mjs @@ -0,0 +1,37 @@ +import { + buildBrowserRenderer, + buildCoreServer, + buildRenderer, + buildStyles, + buildTrayRenderer, + buildWebClientBridge, + cleanDist, + copyBrowserRendererHtml, + copyMarketplacePlugins, + copyModelCatalog, + copyRendererHtml, + copyTrayRendererHtml, + syncUiRendererToRuntimeDists +} from "./esbuild.config.mjs"; + +const mode = process.argv.includes("--dev") ? "development" : "production"; + +cleanDist(); +copyMarketplacePlugins(); +copyModelCatalog(); +copyBrowserRendererHtml(); +copyRendererHtml(); +copyTrayRendererHtml(); + +await Promise.all([ + buildCoreServer({ mode }), + buildBrowserRenderer({ mode }), + buildRenderer({ mode }), + buildTrayRenderer({ mode }), + buildWebClientBridge({ mode }), + buildStyles({ minify: mode === "production" }) +]); + +syncUiRendererToRuntimeDists(); + +console.log(`Built Docker core server and UI assets in ${mode} mode.`); diff --git a/build/esbuild.config.mjs b/build/esbuild.config.mjs index bcf3a1a..e4a05f6 100644 --- a/build/esbuild.config.mjs +++ b/build/esbuild.config.mjs @@ -1,23 +1,63 @@ import esbuild from "esbuild"; import { spawn } from "node:child_process"; -import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs"; -import { builtinModules } from "node:module"; +import { chmodSync, cpSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs"; +import { builtinModules, createRequire } from "node:module"; import path from "node:path"; import { fileURLToPath } from "node:url"; const __dirname = path.dirname(fileURLToPath(import.meta.url)); +const requireFromHere = createRequire(import.meta.url); export const projectRoot = path.resolve(__dirname, ".."); -export const distDir = path.join(projectRoot, "dist"); -export const mainOutDir = path.join(distDir, "main"); -export const rendererOutDir = path.join(distDir, "renderer"); -export const appAssetsDir = path.join(distDir, "assets"); +export const packagesRoot = path.join(projectRoot, "packages"); +export const cliRoot = path.join(packagesRoot, "cli"); +export const coreRoot = path.join(packagesRoot, "core"); +export const electronRoot = path.join(packagesRoot, "electron"); +export const uiRoot = path.join(packagesRoot, "ui"); +export const cliSourceRoot = path.join(cliRoot, "src"); +export const coreSourceRoot = path.join(coreRoot, "src"); +export const electronSourceRoot = path.join(electronRoot, "src"); +export const uiSourceRoot = path.join(uiRoot, "src"); +export const legacyDistDir = path.join(projectRoot, "dist"); +export const cliDistDir = path.join(cliRoot, "dist"); +export const coreDistDir = path.join(coreRoot, "dist"); +export const electronDistDir = path.join(electronRoot, "dist"); +export const uiDistDir = path.join(uiRoot, "dist"); +export const distDir = electronDistDir; +export const cliMainOutDir = path.join(cliDistDir, "main"); +export const coreMainOutDir = path.join(coreDistDir, "main"); +export const electronMainOutDir = path.join(electronDistDir, "main"); +export const mainOutDir = electronMainOutDir; +export const gatewayPackageRoot = path.dirname(requireFromHere.resolve("@the-next-ai/ai-gateway/package.json")); +export const gatewayRuntimeInput = path.join(gatewayPackageRoot, "bin", "next-ai-gateway.js"); +export const electronGatewayRuntimeOutput = path.join(electronMainOutDir, "next-ai-gateway.js"); +export const botGatewaySdkPackageRoot = path.dirname(requireFromHere.resolve("@the-next-ai/bot-gateway-sdk/package.json")); +export const botGatewaySdkEntryInput = path.join(botGatewaySdkPackageRoot, "dist", "index.js"); +export const botGatewaySdkRunnerInput = path.join(botGatewaySdkPackageRoot, "bin", "bot-gateway-stdio.mjs"); +export const electronBotGatewaySdkRootDir = path.join(electronMainOutDir, "bot-gateway-sdk"); +export const electronBotGatewaySdkDistDir = path.join(electronBotGatewaySdkRootDir, "dist"); +export const electronBotGatewaySdkBinDir = path.join(electronBotGatewaySdkRootDir, "bin"); +export const electronBotGatewaySdkPackageOutput = path.join(electronBotGatewaySdkRootDir, "package.json"); +export const electronBotGatewaySdkEntryOutput = path.join(electronBotGatewaySdkDistDir, "index.js"); +export const electronBotGatewaySdkRunnerOutput = path.join(electronBotGatewaySdkBinDir, "bot-gateway-stdio.mjs"); +export const rendererOutDir = path.join(uiDistDir, "renderer"); +export const cliRendererOutDir = path.join(cliDistDir, "renderer"); +export const coreRendererOutDir = path.join(coreDistDir, "renderer"); +export const electronRendererOutDir = path.join(electronDistDir, "renderer"); +export const runtimeRendererOutDirs = [cliRendererOutDir, coreRendererOutDir, electronRendererOutDir]; +export const appAssetsDir = path.join(electronDistDir, "assets"); export const rendererAssetsDir = path.join(rendererOutDir, "assets"); -export const marketplacePluginsDir = path.join(distDir, "marketplace", "plugins"); -export const appAssetsInput = path.join(projectRoot, "assets"); -export const modelCatalogInput = path.join(projectRoot, "models.json"); -export const modelCatalogOutput = path.join(distDir, "models.json"); -export const rendererRoot = path.join(projectRoot, "src", "renderer"); +export const cliMarketplacePluginsDir = path.join(cliDistDir, "marketplace", "plugins"); +export const coreMarketplacePluginsDir = path.join(coreDistDir, "marketplace", "plugins"); +export const electronMarketplacePluginsDir = path.join(electronDistDir, "marketplace", "plugins"); +export const marketplacePluginsDir = electronMarketplacePluginsDir; +export const appAssetsInput = path.join(electronRoot, "assets"); +export const modelCatalogInput = path.join(coreRoot, "models.json"); +export const cliModelCatalogOutput = path.join(cliDistDir, "models.json"); +export const coreModelCatalogOutput = path.join(coreDistDir, "models.json"); +export const electronModelCatalogOutput = path.join(electronDistDir, "models.json"); +export const modelCatalogOutput = electronModelCatalogOutput; +export const rendererRoot = uiSourceRoot; export const rendererHtmlInput = path.join(rendererRoot, "pages", "home", "index.html"); export const rendererHtmlOutput = path.join(rendererOutDir, "pages", "home", "index.html"); export const browserRendererHtmlInput = path.join(rendererRoot, "pages", "browser", "index.html"); @@ -27,11 +67,14 @@ export const trayRendererHtmlOutput = path.join(rendererOutDir, "pages", "tray", export const cssInput = path.join(rendererRoot, "styles", "globals.css"); export const cssOutput = path.join(rendererAssetsDir, "main.css"); export const webClientBridgeOutput = path.join(rendererAssetsDir, "web-client-bridge.js"); +export const electronUndiciProxyAgentInput = path.join(coreSourceRoot, "proxy", "undici-proxy-agent.ts"); const lightweightMcpBundleNames = ["browser-web-search-proxy-mcp.js", "fusion-vision-mcp.js", "fusion-tool-fallback-mcp.js"]; const lightweightMcpBundleMaxBytes = 128 * 1024; const forbiddenLightweightMcpInputs = [ - { prefix: "src/main/", reason: "main-process modules can pull in config, Electron, or native storage side effects" }, - { prefix: "src/renderer/", reason: "renderer modules do not belong in stdio MCP subprocesses" }, + { prefix: "packages/core/src/config/", reason: "config modules can pull in native storage side effects" }, + { prefix: "packages/core/src/storage/", reason: "native SQLite storage is not allowed in lightweight MCP subprocesses" }, + { prefix: "packages/electron/src/", reason: "Electron runtime modules are not allowed in lightweight MCP subprocesses" }, + { prefix: "packages/ui/src/", reason: "UI modules do not belong in stdio MCP subprocesses" }, { prefix: "node_modules/better-sqlite3/", reason: "native SQLite is not allowed in lightweight MCP subprocesses" }, { prefix: "node_modules/electron/", reason: "Electron runtime modules are not allowed in lightweight MCP subprocesses" } ]; @@ -45,15 +88,28 @@ const nodeExternals = [ ]; export function cleanDist() { - rmSync(distDir, { force: true, recursive: true }); + rmSync(legacyDistDir, { force: true, recursive: true }); + rmSync(cliDistDir, { force: true, recursive: true }); + rmSync(coreDistDir, { force: true, recursive: true }); + rmSync(electronDistDir, { force: true, recursive: true }); + rmSync(uiDistDir, { force: true, recursive: true }); ensureDist(); } export function ensureDist() { - mkdirSync(mainOutDir, { recursive: true }); + mkdirSync(cliMainOutDir, { recursive: true }); + mkdirSync(coreMainOutDir, { recursive: true }); + mkdirSync(electronMainOutDir, { recursive: true }); + mkdirSync(electronBotGatewaySdkDistDir, { recursive: true }); + mkdirSync(electronBotGatewaySdkBinDir, { recursive: true }); mkdirSync(appAssetsDir, { recursive: true }); - mkdirSync(marketplacePluginsDir, { recursive: true }); + mkdirSync(cliMarketplacePluginsDir, { recursive: true }); + mkdirSync(coreMarketplacePluginsDir, { recursive: true }); + mkdirSync(electronMarketplacePluginsDir, { recursive: true }); mkdirSync(rendererAssetsDir, { recursive: true }); + for (const outputDir of runtimeRendererOutDirs) { + mkdirSync(path.join(outputDir, "assets"), { recursive: true }); + } mkdirSync(path.dirname(rendererHtmlOutput), { recursive: true }); mkdirSync(path.dirname(browserRendererHtmlOutput), { recursive: true }); mkdirSync(path.dirname(trayRendererHtmlOutput), { recursive: true }); @@ -69,12 +125,16 @@ export function copyAppAssets() { export function copyModelCatalog() { ensureDist(); if (existsSync(modelCatalogInput)) { - cpSync(modelCatalogInput, modelCatalogOutput); + cpSync(modelCatalogInput, cliModelCatalogOutput); + cpSync(modelCatalogInput, coreModelCatalogOutput); + cpSync(modelCatalogInput, electronModelCatalogOutput); } } export function copyRendererHtml() { - copyRendererPageHtml(rendererHtmlInput, rendererHtmlOutput, "main.js"); + copyRendererPageHtml(rendererHtmlInput, rendererHtmlOutput, "main.js", { + beforeModuleScriptTags: [' '] + }); } export function copyTrayRendererHtml() { @@ -89,14 +149,25 @@ export function copyMarketplacePlugins() { ensureDist(); for (const filename of ["claude-design-plugin.cjs", "cursor-proxy-plugin.cjs"]) { const source = path.join(projectRoot, "examples", "plugins", filename); - const target = path.join(marketplacePluginsDir, filename); if (existsSync(source)) { - cpSync(source, target); + cpSync(source, path.join(cliMarketplacePluginsDir, filename)); + cpSync(source, path.join(coreMarketplacePluginsDir, filename)); + cpSync(source, path.join(electronMarketplacePluginsDir, filename)); } } } -function copyRendererPageHtml(input, output, scriptName) { +export function syncUiRendererToRuntimeDists() { + ensureDist(); + for (const outputDir of runtimeRendererOutDirs) { + rmSync(outputDir, { force: true, recursive: true }); + if (existsSync(rendererOutDir)) { + cpSync(rendererOutDir, outputDir, { recursive: true }); + } + } +} + +function copyRendererPageHtml(input, output, scriptName, options = {}) { ensureDist(); const source = readFileSync(input, "utf8"); const styleTag = ' '; @@ -105,6 +176,12 @@ function copyRendererPageHtml(input, output, scriptName) { ? source.replace(' ', scriptTag) : source.replace("", `${scriptTag}\n `); + for (const extraScriptTag of options.beforeModuleScriptTags ?? []) { + if (!hasScriptTag(html, extraScriptTag)) { + html = html.replace(scriptTag, `${extraScriptTag}\n${scriptTag}`); + } + } + if (!html.includes('href="../../assets/main.css"')) { html = html.replace("", `${styleTag}\n `); } @@ -112,18 +189,38 @@ function copyRendererPageHtml(input, output, scriptName) { writeFileSync(output, html, "utf8"); } +function hasScriptTag(html, scriptTag) { + const sourceMatch = scriptTag.match(/\bsrc="([^"]+)"/); + return sourceMatch ? html.includes(sourceMatch[1]) : html.includes(scriptTag); +} + +function normalizeDuplicateShebangs(source) { + const lines = source.split("\n"); + if (!lines[0]?.startsWith("#!")) { + return source; + } + let index = 1; + while (lines[index]?.startsWith("#!")) { + index += 1; + } + return [lines[0], ...lines.slice(index)].join("\n"); +} + export function createMainBuildOptions({ mode = "production", plugins = [] } = {}) { return { absWorkingDir: projectRoot, bundle: true, entryNames: "[name]", entryPoints: [ - path.join(projectRoot, "src", "main", "main.ts"), - path.join(projectRoot, "src", "main", "browser-preload.ts"), - path.join(projectRoot, "src", "server", "mcp", "browser-web-search-proxy-mcp.ts"), - path.join(projectRoot, "src", "server", "mcp", "fusion-vision-mcp.ts"), - path.join(projectRoot, "src", "server", "mcp", "fusion-tool-fallback-mcp.ts"), - path.join(projectRoot, "src", "main", "preload.ts") + path.join(electronSourceRoot, "main", "main.ts"), + path.join(electronSourceRoot, "main", "browser-preload.ts"), + gatewayRuntimeInput, + path.join(coreSourceRoot, "mcp", "browser-web-search-proxy-mcp.ts"), + path.join(coreSourceRoot, "mcp", "fusion-vision-mcp.ts"), + path.join(coreSourceRoot, "mcp", "fusion-tool-fallback-mcp.ts"), + path.join(coreSourceRoot, "mcp", "toolhub-mcp.ts"), + electronUndiciProxyAgentInput, + path.join(electronSourceRoot, "main", "preload.ts") ], external: nodeExternals, format: "cjs", @@ -131,9 +228,9 @@ export function createMainBuildOptions({ mode = "production", plugins = [] } = { logLevel: "info", metafile: true, minify: mode === "production", - outdir: mainOutDir, + outdir: electronMainOutDir, platform: "node", - plugins, + plugins: [packageAliasPlugin(), ...plugins], sourcemap: mode !== "production", target: "node22" }; @@ -144,15 +241,44 @@ export function createCliBuildOptions({ mode = "production", plugins = [] } = {} absWorkingDir: projectRoot, bundle: true, entryNames: "[name]", - entryPoints: [path.join(projectRoot, "src", "main", "cli.ts")], + entryPoints: [ + path.join(cliSourceRoot, "cli.ts"), + path.join(coreSourceRoot, "mcp", "fusion-vision-mcp.ts"), + path.join(coreSourceRoot, "mcp", "fusion-tool-fallback-mcp.ts"), + path.join(coreSourceRoot, "mcp", "toolhub-mcp.ts") + ], external: nodeExternals.filter((moduleName) => moduleName !== "electron"), format: "cjs", legalComments: "none", logLevel: "info", minify: mode === "production", - outdir: mainOutDir, + outdir: cliMainOutDir, platform: "node", - plugins: [forbidCliElectronPlugin(), ...plugins], + plugins: [forbidCliElectronPlugin(), packageAliasPlugin(), ...plugins], + sourcemap: mode !== "production", + target: "node22" + }; +} + +export function createCoreServerBuildOptions({ mode = "production", plugins = [] } = {}) { + return { + absWorkingDir: projectRoot, + bundle: true, + entryNames: "[name]", + entryPoints: [ + path.join(coreSourceRoot, "entrypoints", "server.ts"), + path.join(coreSourceRoot, "mcp", "fusion-vision-mcp.ts"), + path.join(coreSourceRoot, "mcp", "fusion-tool-fallback-mcp.ts"), + path.join(coreSourceRoot, "mcp", "toolhub-mcp.ts") + ], + external: nodeExternals.filter((moduleName) => moduleName !== "electron"), + format: "cjs", + legalComments: "none", + logLevel: "info", + minify: mode === "production", + outdir: coreMainOutDir, + platform: "node", + plugins: [forbidCliElectronPlugin(), packageAliasPlugin(), ...plugins], sourcemap: mode !== "production", target: "node22" }; @@ -183,7 +309,7 @@ export function createRendererBuildOptions({ mode = "production", plugins = [] } minify: mode === "production", outfile: path.join(rendererAssetsDir, "main.js"), platform: "browser", - plugins: [rendererAliasPlugin(), ...plugins], + plugins: [rendererAliasPlugin(), packageAliasPlugin(), ...plugins], publicPath: "../../assets", sourcemap: mode !== "production", target: "chrome120" @@ -210,19 +336,40 @@ export function createWebClientBridgeBuildOptions({ mode = "production", plugins return { absWorkingDir: projectRoot, bundle: true, - entryPoints: [path.join(projectRoot, "src", "main", "web-client-bridge.ts")], + entryPoints: [path.join(uiSourceRoot, "web-client-bridge.ts")], format: "iife", legalComments: "none", logLevel: "info", minify: mode === "production", outfile: webClientBridgeOutput, platform: "browser", - plugins, + plugins: [packageAliasPlugin(), ...plugins], sourcemap: mode !== "production", target: "chrome120" }; } +export function createBotGatewaySdkBuildOptions({ mode = "production", plugins = [] } = {}) { + return { + absWorkingDir: projectRoot, + bundle: true, + entryPoints: [botGatewaySdkEntryInput], + external: [ + ...builtinModules, + ...builtinModules.map((moduleName) => `node:${moduleName}`) + ], + format: "esm", + legalComments: "none", + logLevel: "info", + minify: mode === "production", + outfile: electronBotGatewaySdkEntryOutput, + platform: "node", + plugins, + sourcemap: mode !== "production", + target: "node22" + }; +} + export function watchPlugin(name, onEnd) { return { name: `${name}-watch`, @@ -239,11 +386,38 @@ export function watchPlugin(name, onEnd) { export async function buildMain(options = {}) { const [mainBuildResult] = await Promise.all([ esbuild.build(createMainBuildOptions(options)), - esbuild.build(createCliBuildOptions(options)) + buildBotGatewaySdkRuntime(options), + buildCoreServer(options), + buildCli(options) ]); + copyCliRuntimeToElectronDist(); validateLightweightMcpBundles(mainBuildResult.metafile); } +export async function buildBotGatewaySdkRuntime(options = {}) { + ensureDist(); + await esbuild.build(createBotGatewaySdkBuildOptions(options)); + writeFileSync( + electronBotGatewaySdkPackageOutput, + `${JSON.stringify({ private: true, type: "module" }, null, 2)}\n`, + "utf8" + ); + writeFileSync( + electronBotGatewaySdkRunnerOutput, + normalizeDuplicateShebangs(readFileSync(botGatewaySdkRunnerInput, "utf8")), + "utf8" + ); + chmodSync(electronBotGatewaySdkRunnerOutput, 0o755); +} + +export async function buildCli(options = {}) { + await esbuild.build(createCliBuildOptions(options)); +} + +export async function buildCoreServer(options = {}) { + await esbuild.build(createCoreServerBuildOptions(options)); +} + export async function buildRenderer(options = {}) { await esbuild.build(createRendererBuildOptions(options)); } @@ -260,6 +434,14 @@ export async function buildWebClientBridge(options = {}) { await esbuild.build(createWebClientBridgeBuildOptions(options)); } +export function copyCliRuntimeToElectronDist() { + ensureDist(); + const cliRuntime = path.join(cliMainOutDir, "cli.js"); + if (existsSync(cliRuntime)) { + cpSync(cliRuntime, path.join(electronMainOutDir, "cli.js")); + } +} + export async function buildStyles({ minify = false } = {}) { ensureDist(); const args = ["-i", cssInput, "-o", cssOutput]; @@ -305,6 +487,26 @@ function rendererAliasPlugin() { }; } +function packageAliasPlugin() { + return { + name: "ccr-package-alias", + setup(build) { + build.onResolve({ filter: /^@ccr\/cli\// }, (args) => { + return { path: resolvePackageImport(cliSourceRoot, args.path.slice("@ccr/cli/".length)) }; + }); + build.onResolve({ filter: /^@ccr\/core\// }, (args) => { + return { path: resolvePackageImport(coreSourceRoot, args.path.slice("@ccr/core/".length)) }; + }); + build.onResolve({ filter: /^@ccr\/electron\// }, (args) => { + return { path: resolvePackageImport(electronSourceRoot, args.path.slice("@ccr/electron/".length)) }; + }); + build.onResolve({ filter: /^@ccr\/ui\// }, (args) => { + return { path: resolvePackageImport(uiSourceRoot, args.path.slice("@ccr/ui/".length)) }; + }); + } + }; +} + function forbidCliElectronPlugin() { return { name: "forbid-cli-electron", @@ -371,19 +573,23 @@ function normalizeBuildPath(value) { } function resolveRendererImport(importPath) { - const basePath = path.resolve(rendererRoot, importPath); + return resolvePackageImport(rendererRoot, importPath); +} + +function resolvePackageImport(rootDir, importPath) { + const packageBasePath = path.resolve(rootDir, importPath); const candidates = [ - basePath, - `${basePath}.tsx`, - `${basePath}.ts`, - `${basePath}.jsx`, - `${basePath}.js`, - `${basePath}.json`, - `${basePath}.css`, - path.join(basePath, "index.tsx"), - path.join(basePath, "index.ts"), - path.join(basePath, "index.jsx"), - path.join(basePath, "index.js") + packageBasePath, + `${packageBasePath}.tsx`, + `${packageBasePath}.ts`, + `${packageBasePath}.jsx`, + `${packageBasePath}.js`, + `${packageBasePath}.json`, + `${packageBasePath}.css`, + path.join(packageBasePath, "index.tsx"), + path.join(packageBasePath, "index.ts"), + path.join(packageBasePath, "index.jsx"), + path.join(packageBasePath, "index.js") ]; for (const candidate of candidates) { @@ -392,5 +598,5 @@ function resolveRendererImport(importPath) { } } - return basePath; + return packageBasePath; } diff --git a/build/run-tests.mjs b/build/run-tests.mjs index a870705..aaa9cfb 100644 --- a/build/run-tests.mjs +++ b/build/run-tests.mjs @@ -31,7 +31,7 @@ function runSuite(suite) { console.log(`\nRunning ${suite} tests...`); return new Promise((resolve, reject) => { - const child = spawn(electron, ["--test", `dist/tests/${suite}/*.js`], { + const child = spawn(electron, ["--test", `dist/tests/${suite}/*.test.js`], { cwd: projectRoot, env: { ...process.env, diff --git a/build/test.mjs b/build/test.mjs index 8319a30..be7b4ad 100644 --- a/build/test.mjs +++ b/build/test.mjs @@ -6,7 +6,9 @@ import { fileURLToPath } from "node:url"; const __dirname = path.dirname(fileURLToPath(import.meta.url)); const projectRoot = path.resolve(__dirname, ".."); const testsOutDir = path.join(projectRoot, "dist", "tests"); -const rendererRoot = path.join(projectRoot, "src", "renderer"); +const rendererRoot = path.join(projectRoot, "packages", "ui", "src"); +const cliSourceRoot = path.join(projectRoot, "packages", "cli", "src"); +const coreSourceRoot = path.join(projectRoot, "packages", "core", "src"); const testSuites = [ { name: "main", testDir: path.join(projectRoot, "tests", "main") }, { name: "renderer", testDir: path.join(projectRoot, "tests", "renderer") } @@ -25,7 +27,10 @@ if (unknownSuites.length > 0) { rmSync(testsOutDir, { force: true, recursive: true }); for (const suite of selectedSuites) { - const entryPoints = findTestFiles(suite.testDir); + const entryPoints = [ + ...findTestFiles(suite.testDir), + ...runtimeEntryPointsForSuite(suite.name) + ]; if (entryPoints.length === 0) { continue; } @@ -53,11 +58,21 @@ for (const suite of selectedSuites) { logLevel: "info", outdir: path.join(testsOutDir, suite.name), platform: "node", - plugins: [rendererAliasPlugin()], + plugins: [rendererAliasPlugin(), packageAliasPlugin()], target: "node22" }); } +function runtimeEntryPointsForSuite(suiteName) { + if (suiteName !== "main") { + return []; + } + return [ + path.join(coreSourceRoot, "mcp", "fusion-vision-mcp.ts"), + path.join(coreSourceRoot, "mcp", "toolhub-mcp.ts") + ]; +} + function findTestFiles(dir) { if (!existsSync(dir)) { return []; @@ -87,8 +102,26 @@ function rendererAliasPlugin() { }; } +function packageAliasPlugin() { + return { + name: "test-package-alias", + setup(build) { + build.onResolve({ filter: /^@ccr\/cli\// }, (args) => { + return { path: resolvePackageImport(cliSourceRoot, args.path.slice("@ccr/cli/".length)) }; + }); + build.onResolve({ filter: /^@ccr\/core\// }, (args) => { + return { path: resolvePackageImport(coreSourceRoot, args.path.slice("@ccr/core/".length)) }; + }); + } + }; +} + function resolveRendererImport(importPath) { - const basePath = path.resolve(rendererRoot, importPath); + return resolvePackageImport(rendererRoot, importPath); +} + +function resolvePackageImport(rootDir, importPath) { + const basePath = path.resolve(rootDir, importPath); const candidates = [ basePath, `${basePath}.tsx`, diff --git a/build/verify-packaged-app.cjs b/build/verify-packaged-app.cjs index 0d6371a..ee52160 100644 --- a/build/verify-packaged-app.cjs +++ b/build/verify-packaged-app.cjs @@ -9,6 +9,19 @@ const betterSqliteNativeRelativePath = path.join( "Release", "better_sqlite3.node" ); +const betterSqlitePackageRelativePath = path.join("app.asar.unpacked", "node_modules", "better-sqlite3"); +const betterSqlitePrunablePaths = [ + "deps", + "src", + "binding.gyp", + "README.md", + "docs", + "benchmark", + "benchmarks", + "test", + path.join("build", "Release", "obj"), + path.join("build", "Release", "obj.target") +]; module.exports = async function verifyPackagedApp(context) { const platform = context?.electronPlatformName; @@ -21,6 +34,7 @@ module.exports = async function verifyPackagedApp(context) { const resourcesDir = findResourcesDir(appOutDir, platform); assertFile(path.join(resourcesDir, "app.asar"), "Packaged app archive"); + cleanupBetterSqlitePackage(resourcesDir); const nativeModule = path.join(resourcesDir, betterSqliteNativeRelativePath); assertFile(nativeModule, "better-sqlite3 native module"); @@ -41,6 +55,13 @@ module.exports = async function verifyPackagedApp(context) { } }; +function cleanupBetterSqlitePackage(resourcesDir) { + const packageDir = path.join(resourcesDir, betterSqlitePackageRelativePath); + for (const relativePath of betterSqlitePrunablePaths) { + fs.rmSync(path.join(packageDir, relativePath), { force: true, recursive: true }); + } +} + function findResourcesDir(appOutDir, platform) { if (platform !== "darwin") { return path.join(appOutDir, "resources"); diff --git a/components.json b/components.json index e6f7108..a1acbd1 100644 --- a/components.json +++ b/components.json @@ -5,7 +5,7 @@ "tsx": true, "tailwind": { "config": "", - "css": "src/renderer/styles/globals.css", + "css": "packages/ui/src/styles/globals.css", "baseColor": "neutral", "cssVariables": true, "prefix": "" diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..d4a0916 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,15 @@ +services: + ccr: + build: + context: . + dockerfile: Dockerfile + image: claude-code-router:local + ports: + # Publish only Nginx. Internal web/gateway listeners stay inside the container. + - "3458:8080" + volumes: + - ccr-data:/data + restart: unless-stopped + +volumes: + ccr-data: diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 0000000..2b51a1f --- /dev/null +++ b/docker/README.md @@ -0,0 +1,91 @@ +# Docker deployment + +This image runs the core server package with PM2 and serves the built UI package +through Nginx. Nginx is the only published entrypoint: it serves the UI, proxies +management API calls to the internal core server, and proxies gateway API calls +to the internal gateway listener. + +## Build and run + +```sh +docker compose up --build +``` + +Then open: + +- Web UI: +- Gateway endpoint: + +`docker-compose.yml` publishes only Nginx (`3458:8080`). Behind Nginx, the image +runs separate container-private listeners for management RPC, API gateway +routing, and the core gateway runtime. They are implementation details and are +not published or configured by the default Compose file. + +To use a different host port, change the Compose port mapping and keep the +public router endpoint in sync: + +```yaml +services: + ccr: + ports: + - "8088:8080" + environment: + CCR_PUBLIC_BASE_URL: http://127.0.0.1:8088 +``` + +The container stores config and SQLite databases under `/data`, backed by the +`ccr-data` volume in `docker-compose.yml`. + +On a fresh data volume, the Web UI starts immediately. The gateway endpoint is +available through the same Nginx entrypoint, but the gateway only starts after at +least one provider and model are configured. + +## Image scripts + +```sh +npm run docker:build +npm run docker:run +``` + +## Smoke test + +```sh +npm run test:docker +``` + +The smoke test builds the image, starts an isolated temporary container with a +special-character `CCR_WEB_AUTH_TOKEN`, verifies that only the Nginx port is +published, checks UI and RPC authentication, confirms legacy Docker config is +migrated to the public Nginx router endpoint, and removes its temporary +container and volume. Set `CCR_DOCKER_TEST_SKIP_BUILD=1` to reuse an already +built image. + +The Dockerfile uses `node:22-bookworm` for build and native SQLite dependency +installation, then copies the production dependencies into a smaller +`node:22-bookworm-slim` runtime image. To use different base images: + +```sh +docker build \ + --build-arg NODE_IMAGE=node:22-bookworm \ + --build-arg RUNTIME_NODE_IMAGE=node:22-bookworm-slim \ + -t claude-code-router:local . +``` + +## Environment + +Most deployments only need the published Nginx port mapping, `CCR_WEB_AUTH_TOKEN`, +and optionally `CCR_PUBLIC_BASE_URL` when the host-facing URL is not +`http://127.0.0.1:3458`. + +| Variable | Default | Description | +| --- | --- | --- | +| `CCR_WEB_AUTH_TOKEN` | generated | Shared management UI token used by Nginx redirects and the core server. | +| `CCR_PUBLIC_BASE_URL` | `http://127.0.0.1:3458` | Full public router endpoint override. Set this when changing the host-facing Compose port. | +| `CCR_DATA_DIR` | `/data` | Container data root. | +| `CCR_NO_GATEWAY` | `0` | Set to `1` to run only the Web UI management service. | +| `CCR_DOCKER_INIT_CONFIG` | `1` | Set to `0` to disable first-run `config.json` bootstrap. | +| `CCR_DOCKER_SYNC_PUBLIC_ENDPOINT` | `1` | Sync existing Docker config to the Nginx public router endpoint on startup. | + +The first-run bootstrap writes a minimal legacy `config.json` only when neither +`config.json` nor `config.sqlite` exists in the mounted data directory. Once the +UI saves settings into SQLite, existing persisted configuration takes priority. diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh new file mode 100644 index 0000000..c4b8983 --- /dev/null +++ b/docker/entrypoint.sh @@ -0,0 +1,207 @@ +#!/bin/sh +set -eu + +CCR_DATA_DIR="${CCR_DATA_DIR:-/data}" +CCR_WEB_HOST="${CCR_WEB_HOST:-127.0.0.1}" +CCR_WEB_PORT="${CCR_WEB_PORT:-3459}" +CCR_NGINX_PORT="${CCR_NGINX_PORT:-8080}" +CCR_GATEWAY_HOST="${CCR_GATEWAY_HOST:-127.0.0.1}" +CCR_GATEWAY_PORT="${CCR_GATEWAY_PORT:-3456}" +CCR_GATEWAY_CORE_PORT="${CCR_GATEWAY_CORE_PORT:-3457}" +CCR_PUBLIC_HOST="${CCR_PUBLIC_HOST:-127.0.0.1}" +CCR_PUBLIC_PORT="${CCR_PUBLIC_PORT:-3458}" +CCR_PUBLIC_BASE_URL="${CCR_PUBLIC_BASE_URL:-http://${CCR_PUBLIC_HOST}:${CCR_PUBLIC_PORT}}" +CCR_NO_GATEWAY="${CCR_NO_GATEWAY:-0}" + +if [ -z "${CCR_WEB_AUTH_TOKEN:-}" ]; then + CCR_WEB_AUTH_TOKEN="$(node -e "process.stdout.write(require('node:crypto').randomBytes(32).toString('base64url'))")" +fi +CCR_WEB_AUTH_TOKEN_QUERY="$(node -e "process.stdout.write(encodeURIComponent(process.argv[1] || ''))" "${CCR_WEB_AUTH_TOKEN}")" + +export HOME="${CCR_DATA_DIR}" +export CCR_DATA_DIR +export CCR_GATEWAY_CORE_PORT +export CCR_GATEWAY_HOST +export CCR_GATEWAY_PORT +export CCR_NGINX_PORT +export CCR_NO_GATEWAY +export CCR_PUBLIC_BASE_URL +export CCR_PUBLIC_HOST +export CCR_PUBLIC_PORT +export CCR_WEB_AUTH_TOKEN +export CCR_WEB_AUTH_TOKEN_QUERY +export CCR_WEB_HOST +export CCR_WEB_PORT + +CONFIG_DIR="${HOME}/.claude-code-router" +CONFIG_FILE="${CONFIG_DIR}/config.json" +APP_CONFIG_DB_FILE="${CONFIG_DIR}/config.sqlite" + +mkdir -p "${CONFIG_DIR}" "${CONFIG_DIR}/app-data" /run/nginx /var/lib/nginx /var/log/nginx + +if [ "${CCR_DOCKER_INIT_CONFIG:-1}" != "0" ] && [ ! -f "${CONFIG_FILE}" ] && [ ! -f "${APP_CONFIG_DB_FILE}" ]; then + node - <<'NODE' +const fs = require("node:fs"); +const path = require("node:path"); + +const configDir = path.join(process.env.HOME, ".claude-code-router"); +const configFile = path.join(configDir, "config.json"); +const gatewayHost = process.env.CCR_GATEWAY_HOST || "0.0.0.0"; +const gatewayPort = Number(process.env.CCR_GATEWAY_PORT || "3456"); +const gatewayCorePort = Number(process.env.CCR_GATEWAY_CORE_PORT || "3457"); +const publicBaseUrl = (process.env.CCR_PUBLIC_BASE_URL || `http://127.0.0.1:${process.env.CCR_PUBLIC_PORT || "3458"}`).replace(/\/+$/, ""); + +fs.mkdirSync(configDir, { recursive: true, mode: 0o700 }); +fs.writeFileSync(configFile, `${JSON.stringify({ + HOST: gatewayHost, + PORT: gatewayPort, + gateway: { + coreHost: "127.0.0.1", + corePort: gatewayCorePort, + enabled: true, + host: gatewayHost, + port: gatewayPort + }, + routerEndpoint: publicBaseUrl +}, null, 2)}\n`, { mode: 0o600 }); +NODE +fi + +if [ "${CCR_DOCKER_SYNC_PUBLIC_ENDPOINT:-1}" != "0" ]; then + node - <<'NODE' +const fs = require("node:fs"); +const path = require("node:path"); + +const configDir = path.join(process.env.HOME, ".claude-code-router"); +const configFile = path.join(configDir, "config.json"); +const appConfigDbFile = path.join(configDir, "config.sqlite"); +const gatewayHost = process.env.CCR_GATEWAY_HOST || "127.0.0.1"; +const gatewayPort = Number(process.env.CCR_GATEWAY_PORT || "3456"); +const gatewayCorePort = Number(process.env.CCR_GATEWAY_CORE_PORT || "3457"); +const publicBaseUrl = (process.env.CCR_PUBLIC_BASE_URL || `http://127.0.0.1:${process.env.CCR_PUBLIC_PORT || "3458"}`).replace(/\/+$/, ""); + +function syncConfig(value) { + if (!value || typeof value !== "object" || Array.isArray(value)) { + return value; + } + value.HOST = gatewayHost; + value.PORT = gatewayPort; + value.gateway = { + ...(value.gateway && typeof value.gateway === "object" && !Array.isArray(value.gateway) ? value.gateway : {}), + coreHost: "127.0.0.1", + corePort: gatewayCorePort, + enabled: true, + host: gatewayHost, + port: gatewayPort + }; + value.routerEndpoint = publicBaseUrl; + return value; +} + +function syncJsonFile() { + if (!fs.existsSync(configFile)) { + return; + } + const parsed = JSON.parse(fs.readFileSync(configFile, "utf8")); + fs.writeFileSync(configFile, `${JSON.stringify(syncConfig(parsed), null, 2)}\n`, { mode: 0o600 }); +} + +function syncSqliteConfig() { + if (!fs.existsSync(appConfigDbFile)) { + return; + } + let Database; + try { + Database = require("better-sqlite3"); + } catch { + return; + } + const db = new Database(appConfigDbFile); + try { + const row = db.prepare("select value_json from app_config where key = ?").get("default"); + if (!row?.value_json) { + return; + } + const parsed = JSON.parse(row.value_json); + db.prepare("update app_config set value_json = ?, updated_at = ? where key = ?") + .run(JSON.stringify(syncConfig(parsed)), new Date().toISOString(), "default"); + } finally { + db.close(); + } +} + +syncJsonFile(); +syncSqliteConfig(); +NODE +fi + +cat > /etc/nginx/conf.d/default.conf < TeamoRouterAnthropic / Chat / Responses + + + code0.aiAnthropic / Chat / Responses + + + + claudeapiAnthropic Messages + + + + Qiniu Cloud AIChat / Responses / Anthropic / Gemini Generate + + + + Fenno.aiChat / Responses / Anthropic + ## Embeddable Button Component diff --git a/docs/src/content/docs/en/configuration/routing.md b/docs/src/content/docs/en/configuration/routing.md index a378c56..f21a521 100644 --- a/docs/src/content/docs/en/configuration/routing.md +++ b/docs/src/content/docs/en/configuration/routing.md @@ -162,7 +162,7 @@ Network errors move to the next attempt. Status-code fallback depends on the mod | Retry | `408`, `409`, `429`, `5xx` | | Fallback targets | Any `4xx` or `5xx` | -For `429` rate-limit responses, CCR waits before the next attempt. It honors `Retry-After` when the upstream provides it; otherwise it uses exponential backoff starting at 1 second and capped at 30 seconds per attempt. +Before moving to the next attempt, CCR waits for every fallback-triggering failure, including network errors. It honors a positive `Retry-After` header when the upstream provides one; otherwise it uses exponential backoff starting at 1 second and capped at 30 seconds per attempt. **Fallback targets** also switches on `4xx` because model-not-found, auth, or provider-side rejection errors may only affect the current target. If the fallback model works, the request can still succeed. diff --git a/docs/src/content/docs/en/configuration/toolhub.md b/docs/src/content/docs/en/configuration/toolhub.md new file mode 100644 index 0000000..c098456 --- /dev/null +++ b/docs/src/content/docs/en/configuration/toolhub.md @@ -0,0 +1,167 @@ +--- +title: ToolHub +pageTitle: ToolHub +eyebrow: Detailed Configuration +lead: Collapse many MCP servers into one compact entry point so agents lazy-load task-specific tools and save context. +--- + +## When To Use It + +As your MCP setup grows, exposing every tool directly to an agent makes the eager tool list large and easier to misuse. ToolHub exposes one `ccr-toolhub` MCP server with two meta tools: + +- `tool_hub.resolve`: searches the available MCP tool catalog for the current task. +- `tool_hub.invoke`: calls a real MCP tool that was selected for this task. + +Use ToolHub for tools that are not needed often but are still useful occasionally. It lazy-loads them only when a task actually needs them. The main value is saving context: large low-frequency tool catalogs do not have to stay in the agent's eager tool list, which reduces context use and the chance of selecting the wrong tool. Simple local code, file, or conversation tasks usually do not need ToolHub. + +## How It Works + +1. Enable ToolHub in **Settings → ToolHub**. +2. Select a configured model as the **Resolver model**. It reads the MCP tool catalog and chooses the tools needed for the task. Prefer `deepseek-v4-flash`, or another stable lightweight model in a similar flash-price tier. +3. Add or import backend MCP servers. ToolHub supports `stdio`, `streamable-http`, and `sse`. +4. Open Claude Code or Codex from CCR. CCR writes the `ccr-toolhub` MCP server into that agent config. +5. When the agent receives a request about external services, installed MCP capabilities, or business APIs, it calls `tool_hub.resolve` first, then uses `tool_hub.invoke` to run the selected tools. + +ToolHub combines MCP servers configured on the ToolHub page with compatible global Agent MCP servers from older configs, and excludes `ccr-toolhub` itself to avoid recursive calls. + +## Built-In Browser Automation + +When ToolHub is enabled in CCR Desktop and **Built-in browser automation** is turned on, agents can use the desktop built-in browser for web tasks. You do not need to add a browser backend on the ToolHub page, and you do not need a separate API key; CCR connects to it through the local gateway authentication path. + +To enable it: + +1. Open **Settings → ToolHub** and turn on **Enable ToolHub**. +2. Turn on **Built-in browser automation** on the same page. This switch is shown only after ToolHub is enabled. +3. After saving settings, reopen Claude Code or Codex from CCR so the new agent instance loads the latest configuration. + +> Already-running agent instances usually do not pick up this switch immediately. Restart the agent instance, or use the agent's own controls to restart ToolHub. + +Built-in browser automation is useful for tasks that need real browser state, such as opening sites, reading pages, filling forms, clicking buttons, scrolling, or completing web flows like ordering, booking, lookup, and checkout when no domain-specific capability exists. After it is enabled, the agent can: + +- Open or attach built-in browser tabs, then navigate to URLs or search queries. +- Read page content and find buttons, links, form fields, and other page elements. +- Click, type, select, press keys, and scroll page elements. +- Wait for page loads, navigation, dialogs, or human handoff results before continuing. +- Request human help for login, verification codes, CAPTCHA, human checks, or manual confirmation. + +When a web flow needs login, verification codes, CAPTCHA, a human check, or manual confirmation, CCR shows the built-in browser window and displays the requested action in the top toolbar. After the user clicks **Done** or **Hide**, the agent receives the result and continues. Handoff waits support up to 10 minutes. + +### Chrome Login Import Extension + +Built-in browser automation can also import login state for selected domains from system Chrome into CCR's in-app browser. This lets the agent reuse sites where you are already signed in to Chrome. It requires the unpacked Chrome extension in this repository: `extension/chrome`. + +Install it: + +1. Open `chrome://extensions` in Chrome. +2. Enable **Developer mode**. +3. Click **Load unpacked**. +4. Select the repository's `extension/chrome` directory. + +Import flow: + +1. When a task needs existing Chrome login state, the agent can request an import; the user can also click the key button in CCR's in-app browser toolbar. +2. CCR creates a one-time import job and opens a confirmation page. If your default browser is not Chrome, copy the confirmation URL into Chrome with the extension installed. +3. Review the requested domains on the confirmation page, then click **Confirm and Import**. +4. The Chrome extension reads cookies and localStorage for those domains and submits them to CCR. After it completes, the agent can continue the task in the built-in browser. + +The extension reads only the domains listed in the CCR import job. It does not enumerate every Chrome cookie. For localStorage, the extension temporarily opens non-active tabs for the selected origins, reads `localStorage`, and closes those tabs. If the confirmation page says the extension does not have site access, allow the extension to access the target domains in Chrome extension settings, reload the unpacked extension, and try again. + +> Note: Built-in browser automation depends on CCR Desktop's built-in browser and is only available in the desktop app. CLI, server deployments, and pure web environments do not include this built-in capability; use an external browser automation MCP server instead. + +## Options + +| Option | Description | +| --- | --- | +| Enable ToolHub | Exposes `ccr-toolhub` to agents. If no backend MCP server is available, CCR does not generate a ToolHub MCP config. | +| Built-in browser automation | Shown only after ToolHub is enabled. Lets agents use CCR Desktop's built-in browser for web tasks. | +| Resolver model | Choose from configured provider models. Prefer `deepseek-v4-flash`, or another stable lightweight model in a similar flash-price tier with enough tool-description understanding. | +| Max tools | Maximum tools returned by one resolve call. Range `1` to `20`, default `10`. | +| Timeout ms | Base timeout for ToolHub resolving and invocation. Range `8000` to `300000`, default `60000`. If a backend MCP server needs a longer request timeout, CCR raises the effective invocation timeout to match the backend. | +| MCP servers | Backend tool sources. Each server needs a unique name plus transport, command or URL, environment variables, headers, and timeouts. | +| Import JSON | Imports common MCP JSON shapes. Supports a root object, array, `mcpServers`, or `mcp_servers`. | + +## Add MCP Servers + +### stdio + +Use `stdio` for local command-line MCP servers. Configure: + +- **Command**: launch command, such as `npx`, `node`, or `python`. +- **Arguments**: command arguments. +- **Working directory**: optional working directory. +- **Stdio message mode**: keep `content-length` by default; use `newline-json` for line-delimited JSON servers. +- **Environment variables**: variables needed only by this MCP server. + +### streamable-http / sse + +Remote MCP servers need a URL. Authentication can use: + +- **API key**: stored directly in the config. +- **API key env**: read from an environment variable. +- **Headers**: custom request headers. + +If a remote server starts slowly or has long-running calls, adjust that server's **Startup timeout** or **Request timeout**. + +## JSON Example + +The desktop app's SQLite config is the effective source, so prefer editing through the UI. The fields below are useful for backups, migration, or troubleshooting: + +```json +{ + "toolHub": { + "enabled": true, + "browserAutomation": true, + "llm": { + "apiKey": "sk-...", + "baseUrl": "https://api.openai.com/v1", + "model": "gpt-5-mini" + }, + "maxTools": 10, + "requestTimeoutMs": 60000, + "mcpServers": [ + { + "name": "filesystem", + "transport": "stdio", + "command": "npx", + "args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"], + "env": {}, + "stdioMessageMode": "content-length", + "requestTimeoutMs": 30000, + "startupTimeoutMs": 600000 + } + ] + } +} +``` + +The import dialog also accepts common MCP JSON: + +```json +{ + "mcpServers": { + "filesystem": { + "command": "npx", + "args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"] + } + } +} +``` + +## ToolHub vs Fusion MCP + +| Capability | ToolHub | Fusion Custom MCP Tool | +| --- | --- | --- | +| Entry point | Agent-side `ccr-toolhub` MCP server | Capability inside one Fusion model | +| Tool selection | Dynamically resolves a tool bundle for each task | Fixed tools selected in the model config | +| Best for | Many MCP servers, changing tool catalogs, agent-led capability discovery | Adding a known tool set to one model | +| Visibility | Claude Code or Codex configs opened through CCR | Routes or agents that select that Fusion model | + +## Troubleshooting + +- Agent cannot see ToolHub: make sure ToolHub is enabled and at least one backend MCP server is configured or **Built-in browser automation** is turned on, then reopen Claude Code or Codex from CCR. +- Missing resolver model or API key: select a configured resolver model and confirm the provider credential works. +- The agent cannot use built-in browser automation: make sure you are using CCR Desktop, turned on **Built-in browser automation** in **Settings → ToolHub**, and reopened Claude Code or Codex from CCR. CLI, server deployments, and pure web environments do not include this built-in capability. +- Chrome login import confirmation keeps waiting for the extension: make sure the unpacked `extension/chrome` extension is loaded in Chrome and has site access for the target domains. If your default browser is not Chrome, copy the confirmation URL into Chrome manually. +- No tools are resolved: confirm the MCP server can list tools, improve tool names and descriptions, or increase **Max tools**. +- Calls time out: check ToolHub **Timeout ms** and the backend server request/startup timeouts. +- Import fails: validate JSON, avoid duplicate server names, make sure `stdio` entries have a command and remote entries have a URL. diff --git a/docs/src/content/docs/zh/configuration.md b/docs/src/content/docs/zh/configuration.md index 6515d0f..c4db009 100644 --- a/docs/src/content/docs/zh/configuration.md +++ b/docs/src/content/docs/zh/configuration.md @@ -2,29 +2,37 @@ title: Claude Code Router 详细配置 pageTitle: 详细配置 eyebrow: 详细配置 -lead: 深入配置概览仪表盘、API 密钥、服务、供应商、路由、Agent配置、Fusion、Bot、托盘和配置数据库位置。这里是按功能查字段和扩展能力的地方。 +lead: 按应用中的实际顺序，将主页页面和设置页分开说明：主页覆盖概览、供应商、Agent配置、路由、Fusion、API 密钥、日志&观测、服务和扩展；设置页覆盖 ToolHub、Bot、数据和托盘。 --- ## 页面结构 -详细配置文档已经拆成独立页面。左侧目录中的每一项都会进入一个页面；当前页面内的标题由右侧大纲负责。 +详细配置文档已经拆成独立页面。左侧目录中的每一项都会进入一个页面；当前页面内的标题由右侧大纲负责。主页页面跟随应用左侧主导航顺序；设置页单独分组，并按设置弹窗顺序排列。 + +## 主页页面 | 页面 | 内容 | | --- | --- | | 概览仪表盘 | 系统状态、账户余额、用量组件、布局编辑和分享卡片 | -| API 密钥 | 客户端访问 Key、过期时间和本地限额 | -| 服务配置 | Host、Port、代理模式、系统代理、网络捕获和 CA 证书 | | 供应商配置 | 上游服务、协议、基础 URL、模型列表和凭据 | | 一键导入供应商 | Provider deeplink 协议、Manifest 导入、一键导入按钮和安全边界 | -| 路由配置 | 条件规则、fallback 和请求改写 | -| 日志&观测 | 请求日志、Agent 执行追踪、工具调用和工具结果 | -| Fusion 组合模型 | 把基础模型与视觉、搜索、MCP 工具组合成新的可选模型 | | Agent配置 | Agent 启动方式、模型、作用范围、多开和 Bot 绑定 | +| 路由配置 | 条件规则、fallback 和请求改写 | +| Fusion 组合模型 | 把基础模型与视觉、搜索、MCP 工具组合成新的可选模型 | +| API 密钥 | 客户端访问 Key、过期时间和本地限额 | +| 日志&观测 | 请求日志、Agent 执行追踪、工具调用和工具结果 | +| 服务配置 | Host、Port、代理模式、系统代理、网络捕获和 CA 证书 | | 扩展机制 | Wrapper plugin、Core gateway plugin、自定义扩展创建和调试 | + +## 设置页 + +| 页面 | 内容 | +| --- | --- | +| ToolHub | 将多个 MCP server 收束成一个 Agent 可用的动态工具检索入口 | | Bot 与 IM 接力 Agent | Bot 转发、接力模式和平台页面 | -| 托盘配置 | 托盘图标、余额进度条和托盘窗口组件 | | 配置数据库位置 | 桌面 App 维护的 SQLite 配置数据库位置 | +| 托盘配置 | 托盘图标、余额进度条和托盘窗口组件 | ## 内容关系 -概览仪表盘用于查看系统状态和用量；API 密钥控制客户端访问 CCR；服务配置控制本地网关监听和代理能力；供应商配置和一键导入供应商页面覆盖上游模型服务如何进入 CCR；路由决定模型请求的上游去向；Agent配置页面覆盖 Claude Code、Codex 和 ZCode 的启动、多开与模型选择；Fusion 页面覆盖图像、搜索和 MCP 工具；扩展机制页面覆盖本地插件的创建、安装和调试；Bot 页面覆盖 IM 平台接力；托盘配置覆盖菜单栏图标和托盘窗口。 +概览仪表盘用于查看系统状态和用量；供应商配置和一键导入供应商页面覆盖上游模型服务如何进入 CCR；Agent配置页面覆盖 Claude Code、Codex 和 ZCode 的启动、多开与模型选择；路由决定模型请求的上游去向；Fusion 页面覆盖图像、搜索和 MCP 工具；API 密钥控制客户端访问 CCR；日志&观测覆盖请求日志和 Agent 执行链路；服务配置控制本地网关监听和代理能力；扩展机制覆盖本地插件的创建、安装和调试。ToolHub、Bot、配置数据库位置和托盘配置对应设置弹窗中的同名配置页。 diff --git a/docs/src/content/docs/zh/configuration/profile.md b/docs/src/content/docs/zh/configuration/profile.md index f5b1ffc..6a7c91c 100644 --- a/docs/src/content/docs/zh/configuration/profile.md +++ b/docs/src/content/docs/zh/configuration/profile.md @@ -24,7 +24,7 @@ lead: 为 Claude Code、Codex、ZCode 创建可复用的启动配置，并通过 | --- | --- | | 独立配置文件 | 选择“仅从 CCR 打开时生效”时，Claude Code 和 Codex 会写入 CCR 管理的独立配置目录，路径按配置 `id` 区分 | | 独立启动器 | Claude Code 使用独立启动包装器，Codex 和 ZCode 使用独立中间层启动器，文件名同样按配置 `id` 或名称区分 | -| 独立 App 数据目录 | 从 App 打开时，Claude App、Codex App、ZCode App 都会使用按配置 `id` 区分的用户数据目录 | +| 独立 App 数据目录 | 从 App 打开时，Claude App、ChatGPT（Codex 桌面端的新名称）、ZCode App 都会使用按配置 `id` 区分的用户数据目录 | | 运行状态 | CCR 按打开入口和配置 `id` 记录运行中的 App 实例；同一个配置再次打开会激活已有窗口，不同配置可以打开不同实例 | 这意味着你可以为同一个 Agent 建多个配置，例如“Claude Code - 工作项目”“Claude Code - 测试模型”“Codex - Fusion 图像能力”。它们可以选择不同模型、不同作用范围和不同 Bot，打开后就是不同的 Agent 实例。 @@ -74,10 +74,12 @@ Claude App 和 Claude Code CLI 的模型列表适配方式不同： | Codex model | 写入 Codex 默认模型。可以选择普通供应商模型或 Fusion 模型；留空时 CCR 使用可用模型中的默认值。 | | Show all sessions | 让 Codex 显示所有会话。ZCode 不提供该项。 | | 配置文件 | 默认是 `~/.codex/config.toml`。仅从 CCR 打开时生效会写入 CCR 管理的独立配置目录。 | -| 环境变量 | 注入 Codex CLI 或 Codex App。Claude Code 专用的模型发现变量不会传给 Codex。 | -| Bot | 只在 Codex App 入口生效。 | +| 环境变量 | 注入 Codex CLI 或 ChatGPT。Claude Code 专用的模型发现变量不会传给 Codex。 | +| Bot | 只在 ChatGPT App 入口生效。 | -保存后，Codex CLI 使用配置卡片里的终端图标复制命令，例如 `ccr "Codex - Work"`。Codex App 使用播放图标打开。CCR 会生成 `config.toml`、模型目录文件和中间层启动器，让 Codex CLI 与 Codex App 都使用同一套 CCR 模型和供应商信息。 +保存后，Codex CLI 使用配置卡片里的终端图标复制命令，例如 `ccr "Codex - Work"`。ChatGPT 使用播放图标打开。CCR 按照 CodexL 的启动方式，直接运行 ChatGPT App bundle 内的 Electron 可执行文件，为它设置隔离的用户数据目录，并把 `CODEX_CLI_PATH` 指向 CCR 中间层。中间层把 app-server 流量转发给 ChatGPT 内置的 Codex CLI，只适配账号展示：隔离目录已有有效 ChatGPT token 时显示真实账号；没有凭据时使用无 token、ChatGPT 形态的虚拟工作区身份，让桌面端在不保存真实用户登录的情况下仍可使用模型选择。为让原生 app-server 选择官方 API marketplace，CCR 只在进程启动阶段创建精确的 `ccr-local-profile` 引导标记，收到第一条原生响应后立即删除；正常启动后或异常退出时也会清理，不会把它保留成登录状态。其他认证文件全部保留。旧版 `Codex.app` 仍然兼容。 + +模型和公共插件列表不再由中间层合成。原生 Codex app-server 读取生成的 `model_catalog_json`，并原样处理 `model/list` 与公共 `plugin/list` 请求，因此 Codex 可以自行联网刷新官方公开 [`openai/plugins`](https://github.com/openai/plugins) Git marketplace。虚拟 workspace 中，只有必须使用真实 ChatGPT 鉴权的账号私有 marketplace 请求会得到明确空结果，绝不会用本地插件替代。下载后的 Git checkout 只作为 Codex 自己的常规 last-known-good 数据，CCR 不会拿它替代远端目录。 ### ZCode @@ -112,7 +114,7 @@ Claude Code CLI 配置会写入设置文件。选择“仅从 CCR 打开时生 Codex 配置会写入 `config.toml`，并生成模型目录文件。选择“仅从 CCR 打开时生效”时，CCR 会把这些文件放在按配置 `id` 区分的目录中。 -Codex 支持 CLI 和 App。CLI 会通过对应配置的启动器打开；App 会使用独立用户数据目录，并把当前配置中的模型和供应商信息带入 Codex App。 +Codex 支持 CLI 和 App。CLI 会通过对应配置的启动器打开；App 会启动 ChatGPT、使用独立用户数据目录，并把当前配置中的模型和供应商信息带入 App。 ### ZCode diff --git a/docs/src/content/docs/zh/configuration/provider-deeplink.md b/docs/src/content/docs/zh/configuration/provider-deeplink.md index 703ad8e..a281471 100644 --- a/docs/src/content/docs/zh/configuration/provider-deeplink.md +++ b/docs/src/content/docs/zh/configuration/provider-deeplink.md @@ -78,6 +78,22 @@ lead: 快速添加常见模型供应商，确认无误后即可保存，减少 TeamoRouterAnthropic / Chat / Responses + + + code0.aiAnthropic / Chat / Responses + + + + claudeapiAnthropic Messages + + + + 七牛云 AIChat / Responses / Anthropic / Gemini Generate + + + + Fenno.aiChat / Responses / Anthropic + ## 嵌入式按钮组件 diff --git a/docs/src/content/docs/zh/configuration/routing.md b/docs/src/content/docs/zh/configuration/routing.md index c00f069..332eda9 100644 --- a/docs/src/content/docs/zh/configuration/routing.md +++ b/docs/src/content/docs/zh/configuration/routing.md @@ -162,7 +162,7 @@ Fallback 处理请求失败后的降级。第一次选模型由路由完成； | 继续重试 | `408`、`409`、`429`、`5xx` | | 失败降级目标 | 任意 `4xx` 或 `5xx` | -对于 `429` 限流响应，CCR 会在下一次尝试前等待。上游提供 `Retry-After` 时会优先遵守；否则使用从 1 秒开始、单次最多 30 秒的指数退避。 +进入下一次尝试前，CCR 会对每个触发 Fallback 的失败进行等待，包括网络错误。上游提供正数 `Retry-After` 时会优先遵守；否则使用从 1 秒开始、单次最多 30 秒的指数退避。 **失败降级目标** 对 `4xx` 也会切换，是因为模型不存在、鉴权或供应商侧拒绝等错误可能只影响当前目标。切换后如果备用模型可用，请求仍然可以成功。 diff --git a/docs/src/content/docs/zh/configuration/toolhub.md b/docs/src/content/docs/zh/configuration/toolhub.md new file mode 100644 index 0000000..defadd0 --- /dev/null +++ b/docs/src/content/docs/zh/configuration/toolhub.md @@ -0,0 +1,167 @@ +--- +title: ToolHub +pageTitle: ToolHub +eyebrow: 详细配置 +lead: 将多个 MCP server 收束成一个紧凑入口，让 Agent 按任务懒加载需要的工具，减少工具列表占用的上下文。 +--- + +## 适用场景 + +当你接入的 MCP server 越来越多时，直接把所有工具暴露给 Agent 会让工具列表变长，也更容易选错工具。ToolHub 会向 Agent 暴露一个 `ccr-toolhub` MCP server，里面只有两个元工具： + +- `tool_hub.resolve`：根据用户任务和上下文检索可用 MCP 工具。 +- `tool_hub.invoke`：调用已经被本轮任务选中的真实 MCP 工具。 + +它适合把不常用但偶尔会用到的工具统一懒加载，在任务真正需要时才交给 Agent 使用。核心价值是节省上下文：避免把大量低频工具常驻在 Agent 的工具列表里，减少上下文占用和选错工具的概率。简单本地代码、文件或普通聊天任务通常不需要经过 ToolHub。 + +## 工作方式 + +1. 在 **设置 → ToolHub** 中启用 ToolHub。 +2. 选择一个已配置模型作为 **检索模型**。它负责阅读 MCP 工具目录并挑选本轮任务需要的工具；建议使用 `deepseek-v4-flash`，或同等 Flash 价位、响应稳定的轻量模型。 +3. 添加或导入后端 MCP server。ToolHub 支持 `stdio`、`streamable-http` 和 `sse`。 +4. 从 CCR 打开 Claude Code 或 Codex。CCR 会在对应 Agent 配置中写入 `ccr-toolhub`。 +5. Agent 遇到外部服务、已安装 MCP 能力或业务 API 相关请求时，先调用 `tool_hub.resolve`，再用 `tool_hub.invoke` 执行选中的工具。 + +ToolHub 会合并 **ToolHub 页面配置的 MCP servers** 和兼容旧配置中的全局 Agent MCP servers，并自动排除 `ccr-toolhub` 自身，避免递归调用。 + +## 内置浏览器自动化 + +在 CCR Desktop 中启用 ToolHub，并打开 **内置浏览器自动化** 开关后，Agent 可以使用桌面端内置浏览器完成网页操作。不需要在 ToolHub 页面手动添加浏览器后端，也不需要额外 API Key；CCR 会使用本地网关鉴权连接它。 + +启用步骤： + +1. 打开 **设置 → ToolHub**，先开启 **启用 ToolHub**。 +2. 在同一页打开 **内置浏览器自动化** 开关。该开关只会在 ToolHub 已启用时显示。 +3. 保存设置后，从 CCR 重新打开 Claude Code 或 Codex，让新的 Agent 实例加载最新配置。 + +> 已经运行中的 Agent 实例通常不会立即拿到这个开关变化。要让现有会话生效，请重启该 Agent 实例，或使用 Agent 自身能力重启 ToolHub。 + +内置浏览器自动化适合让 Agent 处理需要真实浏览器状态的任务，例如打开网站、读取页面、填写表单、点击按钮、在页面中滚动，或在没有专用业务能力时完成下单、预约、查询、结账等网页流程。开启后 Agent 可以： + +- 打开或附加内置浏览器标签页、导航 URL 或搜索词。 +- 读取页面内容，并找到按钮、链接、输入框等页面元素。 +- 点击、输入、选择、按键和滚动页面元素。 +- 等待页面加载、跳转、弹窗或人类接管结果，再继续后续步骤。 +- 在登录、验证码、CAPTCHA、人机验证或人工确认时请求用户接管。 + +当网页流程需要登录、验证码、CAPTCHA、人机验证或人工确认时，CCR 会显示内置浏览器窗口，并在顶部工具栏提示用户需要完成的步骤。用户点击 **Done** 或 **Hide** 后，Agent 会收到结果并继续执行。接管等待最长支持 10 分钟。 + +### Chrome 登录态导入扩展 + +内置浏览器自动化还支持把系统 Chrome 中指定域名的登录状态导入 CCR 内置浏览器。这样 Agent 处理网页任务时，可以复用你已经在 Chrome 中登录过的网站状态。该能力需要安装仓库里的 Chrome 解包扩展：`extension/chrome`。 + +安装方式： + +1. 在 Chrome 打开 `chrome://extensions`。 +2. 开启 **Developer mode**。 +3. 点击 **Load unpacked**。 +4. 选择仓库中的 `extension/chrome` 目录。 + +导入流程： + +1. 当任务需要复用 Chrome 登录状态时，Agent 会请求导入；用户也可以在 CCR 内置浏览器工具栏点击钥匙按钮主动发起。 +2. CCR 创建一次性导入任务，并打开确认页。如果默认浏览器不是 Chrome，请把确认页 URL 复制到已安装扩展的 Chrome 中打开。 +3. 用户在确认页检查要导入的域名，点击 **Confirm and Import**。 +4. Chrome 扩展读取这些域名的 cookies 和 localStorage，提交给 CCR；完成后 Agent 可以继续使用内置浏览器执行任务。 + +扩展只读取 CCR 导入任务列出的域名，不会枚举 Chrome 中的全部 cookies。读取 localStorage 时，扩展会临时打开对应 origin 的非激活标签页，读取后自动关闭。若确认页提示扩展没有站点访问权限，请在 Chrome 扩展设置中允许该扩展访问目标域名，然后重新加载解包扩展再重试。 + +> 注意：内置浏览器自动化依赖 CCR Desktop 的内置浏览器，只在桌面端可用。CLI、服务器部署或纯 Web 环境没有这项内置能力，请改用外部浏览器自动化 MCP server。 + +## 配置项 + +| 配置项 | 说明 | +| --- | --- | +| 启用 ToolHub | 开启后才会向 Agent 暴露 `ccr-toolhub`。如果没有可用后端 MCP server，CCR 不会生成 ToolHub MCP 配置。 | +| 内置浏览器自动化 | 仅在启用 ToolHub 后显示。开启后让 Agent 可以使用 CCR Desktop 的内置浏览器完成网页操作。 | +| 检索模型 | 从已配置供应商模型中选择。建议使用 `deepseek-v4-flash`，或同等 Flash 价位、响应稳定、工具理解能力足够的轻量模型。 | +| 最大工具数 | 单次解析最多返回的工具数量，范围 `1` 到 `20`，默认 `10`。 | +| 超时毫秒 | ToolHub 解析和调用的基础超时时间，范围 `8000` 到 `300000`，默认 `60000`。如果后端 MCP server 需要更长 request timeout，CCR 会按后端超时自动抬高实际调用超时。 | +| MCP servers | 后端工具来源。每个 server 需要唯一名称，并配置 transport、命令或 URL、环境变量、headers 和超时。 | +| Import JSON | 导入常见 MCP JSON。支持根对象、数组、`mcpServers` 或 `mcp_servers`。 | + +## 添加 MCP Server + +### stdio + +`stdio` 适合本地命令行 MCP server。需要填写： + +- **Command**：启动命令，例如 `npx`、`node`、`python`。 +- **Arguments**：命令参数。 +- **Working directory**：可选工作目录。 +- **Stdio message mode**：默认 `content-length`，如果 server 使用逐行 JSON，选择 `newline-json`。 +- **Environment variables**：只放这个 MCP server 需要的变量。 + +### streamable-http / sse + +远程 MCP server 需要填写 URL。鉴权可以使用： + +- **API key**：直接保存在配置中。 +- **API key env**：从环境变量读取。 +- **Headers**：添加自定义请求头。 + +如果远程服务启动慢或请求耗时长，可以单独调高该 server 的 **Startup timeout** 或 **Request timeout**。 + +## JSON 示例 + +桌面 App 的 SQLite 配置是当前生效来源，建议优先通过 UI 修改。下面字段适用于备份、迁移或排查时理解 ToolHub 配置结构： + +```json +{ + "toolHub": { + "enabled": true, + "browserAutomation": true, + "llm": { + "apiKey": "sk-...", + "baseUrl": "https://api.openai.com/v1", + "model": "gpt-5-mini" + }, + "maxTools": 10, + "requestTimeoutMs": 60000, + "mcpServers": [ + { + "name": "filesystem", + "transport": "stdio", + "command": "npx", + "args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"], + "env": {}, + "stdioMessageMode": "content-length", + "requestTimeoutMs": 30000, + "startupTimeoutMs": 600000 + } + ] + } +} +``` + +导入 MCP JSON 时也可以使用常见格式： + +```json +{ + "mcpServers": { + "filesystem": { + "command": "npx", + "args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"] + } + } +} +``` + +## 与 Fusion MCP 的区别 + +| 能力 | ToolHub | Fusion 自定义 MCP 工具 | +| --- | --- | --- | +| 使用入口 | Agent 侧的 `ccr-toolhub` MCP server | 某个 Fusion 模型内部能力 | +| 工具选择 | 每个任务动态检索并返回工具包 | 模型配置中固定选择工具 | +| 适合场景 | MCP server 很多、工具目录经常变化、希望 Agent 自主发现能力 | 给某个模型补一组明确工具 | +| 可见范围 | 通过 CCR 打开的 Claude Code 或 Codex 配置 | 选择该 Fusion 模型的路由或 Agent | + +## 排查 + +- Agent 看不到 ToolHub：确认已启用 ToolHub，并且至少配置了一个后端 MCP server 或开启了 **内置浏览器自动化**，然后从 CCR 重新打开 Claude Code 或 Codex。 +- 提示缺少检索模型或 API Key：在 **检索模型** 中选择已配置模型，并确认供应商凭据可用。 +- Agent 无法使用内置浏览器自动化：确认正在使用 CCR Desktop，并且已在 **设置 → ToolHub** 中开启 **内置浏览器自动化**，然后从 CCR 重新打开 Claude Code 或 Codex。CLI、服务器部署或纯 Web 环境没有这项内置能力。 +- Chrome 登录态导入确认页一直等待扩展：确认已在 Chrome 中加载 `extension/chrome` 解包扩展，并允许扩展访问要导入的目标域名。如果默认浏览器不是 Chrome，请手动把确认页 URL 复制到 Chrome。 +- 解析不到工具：检查 MCP server 是否能正常列出工具，工具名称和描述是否足够清楚，必要时提高 **最大工具数**。 +- 调用超时：分别检查 ToolHub 的 **超时毫秒** 和单个 MCP server 的 request/startup timeout。 +- 导入失败：检查 JSON 是否有效、server 名称是否重复、`stdio` 是否有 command，远程 transport 是否有 URL。 diff --git a/docs/src/i18n/content.ts b/docs/src/i18n/content.ts index 8569685..58a9dc1 100644 --- a/docs/src/i18n/content.ts +++ b/docs/src/i18n/content.ts @@ -60,25 +60,33 @@ export const docsContent = { configuration: { sidebarGroups: [ { - label: "详细配置", + label: "主页页面", icon: "wand", items: [ "概览仪表盘", "供应商配置", "一键导入供应商", - "路由配置", - "日志&观测", - "Fusion 组合模型", "Agent配置", + "路由配置", + "Fusion 组合模型", "API 密钥", + "日志&观测", "服务配置", - "托盘配置", "扩展机制", - "Bot 与 IM 接力 Agent", - "配置数据库位置", ], active: "概览仪表盘", }, + { + label: "设置页", + icon: "book", + items: [ + "ToolHub", + "Bot 与 IM 接力 Agent", + "配置数据库位置", + "托盘配置", + ], + active: "", + }, ], expandableSidebarItems: ["Fusion 组合模型", "Bot 与 IM 接力 Agent"], sidebarChildren: { @@ -105,6 +113,7 @@ export const docsContent = { 内置图像能力: "/configuration/fusion-vision/", 内置联网搜索: "/configuration/fusion-web-search/", "自定义 MCP 工具": "/configuration/fusion-mcp-tool/", + ToolHub: "/configuration/toolhub/", Agent配置: "/configuration/profile/", "API 密钥": "/configuration/api-keys/", 服务配置: "/configuration/server/", @@ -208,25 +217,33 @@ export const docsContent = { configuration: { sidebarGroups: [ { - label: "Detailed Configuration", + label: "Main Pages", icon: "wand", items: [ "Overview Dashboard", "Provider Config", "One click import", - "Routing Config", - "Logs & Observability", - "Fusion Models", "Agent Config", + "Routing Config", + "Fusion Models", "API Keys", + "Logs & Observability", "Server", - "Tray Configuration", "Extension Mechanism", - "Bots And IM Agent Relay", - "Config Database Location", ], active: "Overview Dashboard", }, + { + label: "Settings Pages", + icon: "book", + items: [ + "ToolHub", + "Bots And IM Agent Relay", + "Config Database Location", + "Tray Configuration", + ], + active: "", + }, ], expandableSidebarItems: ["Fusion Models", "Bots And IM Agent Relay"], sidebarChildren: { @@ -243,6 +260,7 @@ export const docsContent = { "Built-In Vision": "/en/configuration/fusion-vision/", "Built-In Web Search": "/en/configuration/fusion-web-search/", "Custom MCP Tool": "/en/configuration/fusion-mcp-tool/", + ToolHub: "/en/configuration/toolhub/", "Agent Config": "/en/configuration/profiles/", "API Keys": "/en/configuration/api-keys/", Server: "/en/configuration/server/", diff --git a/docs/src/layouts/DocsLayout.astro b/docs/src/layouts/DocsLayout.astro index 6be2c33..60d714c 100644 --- a/docs/src/layouts/DocsLayout.astro +++ b/docs/src/layouts/DocsLayout.astro @@ -291,6 +291,11 @@ const sidebarCloseLabel = locale === "zh" ? "关闭目录" : "Close navigation";
    {section.groups.map((group) => (
  • + {(section.groups.length > 1 || group.label !== section.label) && ( +
    + {group.label} +
    + )}
      {group.items.map((item) => { const isExpandable = item.children.length > 0; diff --git a/docs/src/pages/configuration/[slug].astro b/docs/src/pages/configuration/[slug].astro index 3dda58c..6f2271f 100644 --- a/docs/src/pages/configuration/[slug].astro +++ b/docs/src/pages/configuration/[slug].astro @@ -15,6 +15,7 @@ export function getStaticPaths() { "fusion-vision": "内置图像能力", "fusion-web-search": "内置联网搜索", "fusion-mcp-tool": "自定义 MCP 工具", + toolhub: "ToolHub", extensions: "扩展机制", server: "服务配置", tray: "托盘配置", diff --git a/docs/src/pages/en/configuration/[slug].astro b/docs/src/pages/en/configuration/[slug].astro index cc2fc90..fbc4927 100644 --- a/docs/src/pages/en/configuration/[slug].astro +++ b/docs/src/pages/en/configuration/[slug].astro @@ -15,6 +15,7 @@ export function getStaticPaths() { "fusion-vision": "Built-In Vision", "fusion-web-search": "Built-In Web Search", "fusion-mcp-tool": "Custom MCP Tool", + toolhub: "ToolHub", extensions: "Extension Mechanism", server: "Server", tray: "Tray Configuration", diff --git a/docs/src/styles/global.css b/docs/src/styles/global.css index a435ff4..094438b 100644 --- a/docs/src/styles/global.css +++ b/docs/src/styles/global.css @@ -642,28 +642,26 @@ pre { } .directory-group { - margin: 2px 0 9px; + margin: 8px 0 14px; } .directory-group:last-child { margin-bottom: 4px; } -.directory-group-label { - display: flex; - align-items: center; - gap: 8px; - min-height: 28px; - padding: 7px 8px 3px 0; - color: var(--sidebar-heading); - font-size: 12px; - font-weight: 720; - line-height: 1.35; +.directory-group + .directory-group { + margin-top: 20px; } -.directory-group-label .group-icon { - width: 14px; - height: 14px; +.directory-group-label { + display: block; + min-height: 20px; + padding: 2px 8px 5px 0; + color: var(--sidebar-subtle); + font-size: 11px; + font-weight: 760; + letter-spacing: 0.04em; + line-height: 1.3; } .sidebar-group h2 { @@ -768,7 +766,7 @@ pre { } .sidebar-directory .sidebar-children { - padding-left: 24px; + padding-left: 18px; } .sidebar-children::before { @@ -786,6 +784,14 @@ pre { left: 8px; } +.sidebar-directory .directory-children { + padding-left: 13px; +} + +.sidebar-directory .directory-children::before { + display: none; +} + .sidebar-details[open] > .sidebar-children { margin-bottom: 7px; } @@ -1312,6 +1318,18 @@ h1 { --provider-brand-3: #f4f4f5; } +.doc-markdown a.provider-import-button.provider-code0 { + --provider-brand: #101214; + --provider-brand-2: #267dff; + --provider-brand-3: #d8e8ff; +} + +.doc-markdown a.provider-import-button.provider-claudeapi { + --provider-brand: #0d1b2a; + --provider-brand-2: #2f8f83; + --provider-brand-3: #d7fff8; +} + .doc-markdown a.provider-import-button.provider-deepseek { --provider-brand: #173aa8; --provider-brand-2: #4e69ff; diff --git a/electron-builder.json b/electron-builder.json index eceb6e7..3455751 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -5,6 +5,7 @@ "asarUnpack": [ "**/*.node" ], + "electronLanguages": ["en-US", "zh-CN", "zh-TW", "zh_CN", "zh_TW"], "npmRebuild": true, "publish": [ { @@ -15,6 +16,7 @@ } ], "directories": { + "app": "packages/electron", "output": "release/${version}" }, "afterPack": "build/verify-packaged-app.cjs", @@ -27,7 +29,14 @@ ], "files": [ "dist", - "package.json" + "package.json", + "!node_modules/better-sqlite3/deps/**", + "!node_modules/better-sqlite3/src/**", + "!node_modules/better-sqlite3/binding.gyp", + "!node_modules/better-sqlite3/README.md", + "!node_modules/better-sqlite3/docs/**", + "!node_modules/better-sqlite3/benchmark/**", + "!node_modules/better-sqlite3/test/**" ], "mac": { "icon": "build/icon.icns", @@ -52,6 +61,7 @@ "artifactName": "Claude-Code-Router_${version}.${ext}" }, "linux": { + "executableName": "claude-code-router", "target": ["AppImage"], "artifactName": "Claude-Code-Router_${version}.${ext}" }, diff --git a/extension/chrome/README.md b/extension/chrome/README.md new file mode 100644 index 0000000..86a5f26 --- /dev/null +++ b/extension/chrome/README.md @@ -0,0 +1,23 @@ +# CCR Login Import Chrome Extension + +This unpacked Chrome extension imports cookies and localStorage for explicitly selected domains into CCR's in-app browser. + +## Development install + +1. Open `chrome://extensions`. +2. Enable **Developer mode**. +3. Click **Load unpacked**. +4. Select this `extension/chrome` directory. + +After changing extension files, click **Reload** for this unpacked extension in `chrome://extensions`. +The confirmation-page flow uses the site access declared in `manifest.json`; it does not request new host permissions from the page click. + +## Flow + +1. An agent calls CCR's Chrome login import browser tool, or the user clicks the key button in CCR's in-app browser. +2. CCR opens a one-time confirmation page in the system browser. +3. Review the requested domains and click **Confirm and Import**. + +The extension reads only the domains listed in the CCR job. It does not enumerate all Chrome cookies. + +For localStorage, the extension temporarily opens non-active tabs for the selected origins, reads `localStorage`, then closes those tabs. diff --git a/extension/chrome/background.js b/extension/chrome/background.js new file mode 100644 index 0000000..e86e03b --- /dev/null +++ b/extension/chrome/background.js @@ -0,0 +1,262 @@ +chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => { + if (!message || message.type !== "ccr-login-import-confirm") { + return false; + } + + runImport(message.importUrl) + .then((result) => sendResponse({ ok: true, result })) + .catch((error) => sendResponse({ error: formatError(error), ok: false })); + return true; +}); + +async function runImport(importUrl) { + const normalizedImportUrl = normalizeImportUrl(importUrl); + if (!normalizedImportUrl) { + throw new Error("Invalid CCR import URL."); + } + + const job = await fetchImportJob(normalizedImportUrl); + const domains = Array.isArray(job.domains) ? job.domains.map(normalizeDomain).filter(Boolean) : []; + if (domains.length === 0) { + throw new Error("CCR import job does not include any domains."); + } + + await ensureHostPermissions(domains); + + const cookies = await readCookiesForDomains(domains); + const localStorageEntries = await readLocalStorageForDomains(domains, cookies); + if (cookies.length === 0 && localStorageEntries.length === 0) { + throw new Error("No cookies or localStorage entries were found for the selected domains."); + } + + return await submitLoginState(normalizedImportUrl, cookies, localStorageEntries, domains); +} + +async function fetchImportJob(importUrl) { + const response = await fetch(importUrl, { + headers: { + "x-ccr-login-import": "chrome-extension" + } + }); + const body = await response.json().catch(() => ({})); + if (!response.ok) { + throw new Error(body?.error?.message || `CCR import job request failed (${response.status}).`); + } + if (!body.job || body.job.status !== "pending") { + throw new Error(`CCR import job is ${body.job?.status || "unavailable"}.`); + } + return body.job; +} + +async function submitLoginState(importUrl, cookies, localStorage, domains) { + const response = await fetch(`${importUrl.replace(/\/+$/, "")}/cookies`, { + body: JSON.stringify({ + cookies, + domains, + localStorage, + source: { + browser: "chrome", + extension: chrome.runtime.getManifest().version + } + }), + headers: { + "content-type": "application/json", + "x-ccr-login-import": "chrome-extension" + }, + method: "POST" + }); + const body = await response.json().catch(() => ({})); + if (!response.ok) { + throw new Error(body?.error?.message || `CCR login import failed (${response.status}).`); + } + return body.result || {}; +} + +async function readCookiesForDomains(domains) { + const cookies = []; + for (const domain of domains) { + cookies.push(...await chrome.cookies.getAll({ domain })); + } + return dedupeCookies(cookies); +} + +async function readLocalStorageForDomains(domains, cookies) { + const origins = localStorageOriginsForDomains(domains, cookies); + const entries = []; + for (const origin of origins) { + const entry = await readLocalStorageForOrigin(origin).catch(() => undefined); + if (entry && Object.keys(entry.items).length > 0) { + entries.push(entry); + } + } + return entries; +} + +async function readLocalStorageForOrigin(origin) { + const tab = await chrome.tabs.create({ + active: false, + url: `${origin}/` + }); + try { + await waitForTabLoad(tab.id, 15000); + const [frameResult] = await chrome.scripting.executeScript({ + func: () => { + const items = {}; + for (let index = 0; index < window.localStorage.length; index += 1) { + const key = window.localStorage.key(index); + if (key !== null) { + items[key] = window.localStorage.getItem(key) || ""; + } + } + return { + items, + origin: window.location.origin + }; + }, + target: { tabId: tab.id }, + world: "MAIN" + }); + const result = frameResult?.result; + if (!result || !allowedLocalStorageOrigin(result.origin, origin)) { + return undefined; + } + return result; + } finally { + if (tab.id !== undefined) { + await chrome.tabs.remove(tab.id).catch(() => undefined); + } + } +} + +function waitForTabLoad(tabId, timeoutMs) { + return new Promise((resolve) => { + let done = false; + const finish = () => { + if (done) { + return; + } + done = true; + chrome.tabs.onUpdated.removeListener(listener); + clearTimeout(timeout); + resolve(); + }; + const listener = (updatedTabId, changeInfo) => { + if (updatedTabId === tabId && changeInfo.status === "complete") { + finish(); + } + }; + const timeout = setTimeout(finish, timeoutMs); + chrome.tabs.onUpdated.addListener(listener); + }); +} + +function dedupeCookies(cookies) { + const seen = new Set(); + const result = []; + for (const cookie of cookies) { + const partitionKey = cookie.partitionKey ? JSON.stringify(cookie.partitionKey) : ""; + const key = `${cookie.storeId || ""}\n${cookie.domain}\n${cookie.path}\n${cookie.name}\n${partitionKey}`; + if (!seen.has(key)) { + seen.add(key); + result.push(cookie); + } + } + return result; +} + +function localStorageOriginsForDomains(domains, cookies) { + const origins = new Set(); + for (const domain of domains) { + if (domain === "localhost" || isIpAddress(domain)) { + origins.add(`http://${domain}`); + origins.add(`https://${domain}`); + } else { + origins.add(`https://${domain}`); + } + } + + for (const cookie of cookies) { + const host = normalizeDomain(cookie.domain); + if (!host || !cookie.hostOnly || !domains.some((domain) => host === domain || host.endsWith(`.${domain}`))) { + continue; + } + origins.add(`${cookie.secure === false ? "http" : "https"}://${host}`); + } + + return [...origins]; +} + +function originsForDomains(domains) { + return [...new Set(domains.flatMap((domain) => { + if (domain === "localhost" || isIpAddress(domain)) { + return [ + `http://${domain}/*`, + `https://${domain}/*` + ]; + } + return [ + `http://${domain}/*`, + `https://${domain}/*`, + `http://*.${domain}/*`, + `https://*.${domain}/*` + ]; + }))]; +} + +async function ensureHostPermissions(domains) { + const origins = originsForDomains(domains); + const granted = await chrome.permissions.contains({ origins }); + if (granted) { + return; + } + throw new Error( + [ + `CCR Login Import does not have Chrome site access for ${domains.join(", ")}.`, + "Reload the unpacked extension after updating it, then grant the extension site access for the requested domains in Chrome extensions settings." + ].join(" ") + ); +} + +function normalizeImportUrl(value) { + const raw = typeof value === "string" ? value.trim() : ""; + if (!raw) { + return ""; + } + try { + const url = new URL(raw); + if (!["127.0.0.1", "localhost"].includes(url.hostname)) { + return ""; + } + if (!/^\/chrome-import\/jobs\/[^/]+\/?$/.test(url.pathname)) { + return ""; + } + url.pathname = url.pathname.replace(/\/+$/, ""); + return url.toString(); + } catch { + return ""; + } +} + +function normalizeDomain(value) { + return typeof value === "string" + ? value.trim().replace(/^\*\./, "").replace(/^\./, "").toLowerCase() + : ""; +} + +function allowedLocalStorageOrigin(actualOrigin, requestedOrigin) { + try { + const actual = new URL(actualOrigin); + const requested = new URL(requestedOrigin); + return actual.protocol === requested.protocol && actual.hostname === requested.hostname && actual.port === requested.port; + } catch { + return false; + } +} + +function isIpAddress(value) { + return /^\d{1,3}(?:\.\d{1,3}){3}$/.test(value) || value.includes(":"); +} + +function formatError(error) { + return error instanceof Error ? error.message : String(error); +} diff --git a/extension/chrome/confirm.js b/extension/chrome/confirm.js new file mode 100644 index 0000000..56a6aa1 --- /dev/null +++ b/extension/chrome/confirm.js @@ -0,0 +1,46 @@ +const root = document.getElementById("ccr-chrome-login-import"); +const button = document.getElementById("ccr-confirm-import"); +const statusElement = document.getElementById("ccr-import-status"); + +if (root && button && statusElement) { + const importUrl = root.getAttribute("data-import-url") || ""; + button.disabled = false; + button.textContent = "Confirm and Import"; + setStatus("CCR Login Import extension is connected. Review the domains, then confirm."); + + button.addEventListener("click", () => { + void confirmImport(importUrl); + }); +} + +async function confirmImport(importUrl) { + button.disabled = true; + setStatus("Importing Chrome cookies and localStorage into CCR..."); + try { + const response = await chrome.runtime.sendMessage({ + importUrl, + type: "ccr-login-import-confirm" + }); + if (!response?.ok) { + throw new Error(response?.error || "Chrome login import failed."); + } + const result = response.result || {}; + setStatus( + `Imported ${result.cookieImported || 0} cookies and ${result.localStorageImported || 0} localStorage items. Skipped ${result.skipped || 0}.`, + "ok" + ); + button.textContent = "Imported"; + } catch (error) { + button.disabled = false; + setStatus(formatError(error), "error"); + } +} + +function setStatus(message, kind = "") { + statusElement.textContent = message; + statusElement.className = `status ${kind}`.trim(); +} + +function formatError(error) { + return error instanceof Error ? error.message : String(error); +} diff --git a/extension/chrome/manifest.json b/extension/chrome/manifest.json new file mode 100644 index 0000000..262869a --- /dev/null +++ b/extension/chrome/manifest.json @@ -0,0 +1,35 @@ +{ + "manifest_version": 3, + "name": "CCR Login Import", + "description": "Import selected Chrome site login cookies into CCR's in-app browser.", + "version": "0.1.0", + "action": { + "default_popup": "popup.html", + "default_title": "CCR Login Import" + }, + "background": { + "service_worker": "background.js" + }, + "content_scripts": [ + { + "js": [ + "confirm.js" + ], + "matches": [ + "http://127.0.0.1/*", + "http://localhost/*" + ] + } + ], + "permissions": [ + "cookies", + "scripting", + "storage" + ], + "host_permissions": [ + "http://127.0.0.1/*", + "http://localhost/*", + "http://*/*", + "https://*/*" + ] +} diff --git a/extension/chrome/popup.html b/extension/chrome/popup.html new file mode 100644 index 0000000..391063b --- /dev/null +++ b/extension/chrome/popup.html @@ -0,0 +1,110 @@ + + + + + + CCR Login Import + + + +
      +

      CCR Login Import

      + + +
      +
      + + + diff --git a/extension/chrome/popup.js b/extension/chrome/popup.js new file mode 100644 index 0000000..4b12be1 --- /dev/null +++ b/extension/chrome/popup.js @@ -0,0 +1,297 @@ +const importUrlInput = document.getElementById("import-url"); +const importButton = document.getElementById("import-button"); +const statusElement = document.getElementById("status"); + +document.addEventListener("DOMContentLoaded", () => { + void restoreLastImportUrl(); +}); + +importButton.addEventListener("click", () => { + void runImport(); +}); + +async function restoreLastImportUrl() { + const stored = await chrome.storage.local.get(["lastImportUrl"]); + if (typeof stored.lastImportUrl === "string") { + importUrlInput.value = stored.lastImportUrl; + } +} + +async function runImport() { + const importUrl = normalizeImportUrl(importUrlInput.value); + if (!importUrl) { + setStatus("Paste the import URL copied from CCR.", "error"); + return; + } + + importButton.disabled = true; + try { + await chrome.storage.local.set({ lastImportUrl: importUrl }); + setStatus("Reading CCR import job..."); + const job = await fetchImportJob(importUrl); + const domains = Array.isArray(job.domains) ? job.domains.map(normalizeDomain).filter(Boolean) : []; + if (domains.length === 0) { + throw new Error("CCR import job does not include any domains."); + } + + await ensureHostPermissions(domains); + + setStatus(`Reading cookies for ${domains.join(", ")}...`); + const cookies = await readCookiesForDomains(domains); + setStatus(`Reading localStorage for ${domains.join(", ")}...`); + const localStorageEntries = await readLocalStorageForDomains(domains, cookies); + + if (cookies.length === 0 && localStorageEntries.length === 0) { + throw new Error("No cookies or localStorage entries were found for the selected domains."); + } + + setStatus(`Sending ${cookies.length} cookies and ${localStorageItemCount(localStorageEntries)} localStorage items to CCR...`); + const result = await submitCookies(importUrl, cookies, localStorageEntries, domains); + setStatus( + `Imported ${result.cookieImported ?? 0} cookies and ${result.localStorageImported ?? 0} localStorage items. Skipped ${result.skipped ?? 0}.`, + "ok" + ); + } catch (error) { + setStatus(formatError(error), "error"); + } finally { + importButton.disabled = false; + } +} + +async function fetchImportJob(importUrl) { + const response = await fetch(importUrl, { + headers: { + "x-ccr-login-import": "chrome-extension" + } + }); + const body = await response.json().catch(() => ({})); + if (!response.ok) { + throw new Error(body?.error?.message || `CCR import job request failed (${response.status}).`); + } + if (!body.job || body.job.status !== "pending") { + throw new Error(`CCR import job is ${body.job?.status || "unavailable"}.`); + } + return body.job; +} + +async function submitCookies(importUrl, cookies, localStorage, domains) { + const response = await fetch(`${importUrl.replace(/\/+$/, "")}/cookies`, { + body: JSON.stringify({ + cookies, + domains, + localStorage, + source: { + browser: "chrome", + extension: chrome.runtime.getManifest().version + } + }), + headers: { + "content-type": "application/json", + "x-ccr-login-import": "chrome-extension" + }, + method: "POST" + }); + const body = await response.json().catch(() => ({})); + if (!response.ok) { + throw new Error(body?.error?.message || `CCR cookie import failed (${response.status}).`); + } + return body.result || {}; +} + +async function readCookiesForDomains(domains) { + const cookies = []; + for (const domain of domains) { + cookies.push(...await chrome.cookies.getAll({ domain })); + } + return dedupeCookies(cookies); +} + +async function readLocalStorageForDomains(domains, cookies) { + const origins = localStorageOriginsForDomains(domains, cookies); + const entries = []; + for (const origin of origins) { + const entry = await readLocalStorageForOrigin(origin).catch(() => undefined); + if (entry && Object.keys(entry.items).length > 0) { + entries.push(entry); + } + } + return entries; +} + +async function readLocalStorageForOrigin(origin) { + const tab = await chrome.tabs.create({ + active: false, + url: `${origin}/` + }); + try { + await waitForTabLoad(tab.id, 15000); + const [frameResult] = await chrome.scripting.executeScript({ + func: () => { + const items = {}; + for (let index = 0; index < window.localStorage.length; index += 1) { + const key = window.localStorage.key(index); + if (key !== null) { + items[key] = window.localStorage.getItem(key) || ""; + } + } + return { + items, + origin: window.location.origin + }; + }, + target: { tabId: tab.id }, + world: "MAIN" + }); + const result = frameResult?.result; + if (!result || !allowedLocalStorageOrigin(result.origin, origin)) { + return undefined; + } + return result; + } finally { + if (tab.id !== undefined) { + await chrome.tabs.remove(tab.id).catch(() => undefined); + } + } +} + +function waitForTabLoad(tabId, timeoutMs) { + return new Promise((resolve) => { + let done = false; + const finish = () => { + if (done) { + return; + } + done = true; + chrome.tabs.onUpdated.removeListener(listener); + window.clearTimeout(timeout); + resolve(); + }; + const listener = (updatedTabId, changeInfo) => { + if (updatedTabId === tabId && changeInfo.status === "complete") { + finish(); + } + }; + const timeout = window.setTimeout(finish, timeoutMs); + chrome.tabs.onUpdated.addListener(listener); + }); +} + +function dedupeCookies(cookies) { + const seen = new Set(); + const result = []; + for (const cookie of cookies) { + const partitionKey = cookie.partitionKey ? JSON.stringify(cookie.partitionKey) : ""; + const key = `${cookie.storeId || ""}\n${cookie.domain}\n${cookie.path}\n${cookie.name}\n${partitionKey}`; + if (!seen.has(key)) { + seen.add(key); + result.push(cookie); + } + } + return result; +} + +function localStorageOriginsForDomains(domains, cookies) { + const origins = new Set(); + for (const domain of domains) { + if (domain === "localhost" || isIpAddress(domain)) { + origins.add(`http://${domain}`); + origins.add(`https://${domain}`); + } else { + origins.add(`https://${domain}`); + } + } + + for (const cookie of cookies) { + const host = normalizeDomain(cookie.domain); + if (!host || !cookie.hostOnly || !domains.some((domain) => host === domain || host.endsWith(`.${domain}`))) { + continue; + } + origins.add(`${cookie.secure === false ? "http" : "https"}://${host}`); + } + + return [...origins]; +} + +function allowedLocalStorageOrigin(actualOrigin, requestedOrigin) { + try { + const actual = new URL(actualOrigin); + const requested = new URL(requestedOrigin); + return actual.protocol === requested.protocol && actual.hostname === requested.hostname && actual.port === requested.port; + } catch { + return false; + } +} + +function localStorageItemCount(entries) { + return entries.reduce((count, entry) => count + Object.keys(entry.items || {}).length, 0); +} + +function originsForDomains(domains) { + return [...new Set(domains.flatMap((domain) => { + if (domain === "localhost" || isIpAddress(domain)) { + return [ + `http://${domain}/*`, + `https://${domain}/*` + ]; + } + return [ + `http://${domain}/*`, + `https://${domain}/*`, + `http://*.${domain}/*`, + `https://*.${domain}/*` + ]; + }))]; +} + +async function ensureHostPermissions(domains) { + const origins = originsForDomains(domains); + const granted = await chrome.permissions.contains({ origins }); + if (granted) { + return; + } + throw new Error( + [ + `CCR Login Import does not have Chrome site access for ${domains.join(", ")}.`, + "Reload the unpacked extension after updating it, then grant the extension site access for the requested domains in Chrome extensions settings." + ].join(" ") + ); +} + +function normalizeImportUrl(value) { + const raw = value.trim(); + if (!raw) { + return ""; + } + try { + const url = new URL(raw); + if (!["127.0.0.1", "localhost"].includes(url.hostname)) { + return ""; + } + if (!/^\/chrome-import\/jobs\/[^/]+\/?$/.test(url.pathname)) { + return ""; + } + url.pathname = url.pathname.replace(/\/+$/, ""); + return url.toString(); + } catch { + return ""; + } +} + +function normalizeDomain(value) { + return typeof value === "string" + ? value.trim().replace(/^\*\./, "").replace(/^\./, "").toLowerCase() + : ""; +} + +function isIpAddress(value) { + return /^\d{1,3}(?:\.\d{1,3}){3}$/.test(value) || value.includes(":"); +} + +function setStatus(message, kind = "") { + statusElement.textContent = message; + statusElement.className = `status ${kind}`.trim(); +} + +function formatError(error) { + return error instanceof Error ? error.message : String(error); +} diff --git a/package-lock.json b/package-lock.json index dbcb224..4bbb5fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,28 +1,30 @@ { - "name": "claude-code-router", - "version": "3.0.7", + "name": "claude-code-router-monorepo", + "version": "3.0.11", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "claude-code-router", - "version": "3.0.7", + "name": "claude-code-router-monorepo", + "version": "3.0.11", "license": "MIT", + "workspaces": [ + "packages/*" + ], "dependencies": { - "@the-next-ai/ai-gateway": "^1.0.4", + "@the-next-ai/ai-gateway": "^1.0.7", "@the-next-ai/bot-gateway-sdk": "^0.1.0", "better-sqlite3": "^12.11.1", "electron-updater": "^6.8.9", "node-forge": "^1.4.0", + "openai": "^6.27.0", "undici": "^7.27.2" }, - "bin": { - "ccr": "dist/main/cli.js" - }, "devDependencies": { "@dnd-kit/core": "^6.3.1", "@dnd-kit/sortable": "^10.0.0", "@dnd-kit/utilities": "^3.2.2", + "@playwright/test": "^1.61.1", "@tailwindcss/cli": "^4.3.0", "@types/better-sqlite3": "^7.6.13", "@types/node": "^22.10.2", @@ -53,24 +55,33 @@ "version": "7.29.7", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" } }, + "node_modules/@claude-code-router/core": { + "resolved": "packages/core", + "link": true + }, + "node_modules/@claude-code-router/electron": { + "resolved": "packages/electron", + "link": true + }, + "node_modules/@claude-code-router/ui": { + "resolved": "packages/ui", + "link": true + }, "node_modules/@date-io/core": { "version": "2.17.0", "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.17.0.tgz", "integrity": "sha512-+EQE8xZhRM/hsY0CDTVyayMDDY5ihc4MqXCrPxooKw19yAzUIC6uUqsZeaOFNL9YKTNxYKrJP5DFgE8o5xRCOw==", - "dev": true, "license": "MIT" }, "node_modules/@date-io/date-fns": { "version": "2.17.0", "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.17.0.tgz", "integrity": "sha512-L0hWZ/mTpy3Gx/xXJ5tq5CzHo0L7ry6KEO9/w/JWiFWFLZgiNVo3ex92gOl3zmzjHqY/3Ev+5sehAr8UnGLEng==", - "dev": true, "license": "MIT", "dependencies": { "@date-io/core": "^2.17.0" @@ -88,7 +99,6 @@ "version": "2.17.0", "resolved": "https://registry.npmjs.org/@date-io/moment/-/moment-2.17.0.tgz", "integrity": "sha512-e4nb4CDZU4k0WRVhz1Wvl7d+hFsedObSauDHKtZwU9kt7gdYEAzKgnrSCTHsEaXrDumdrkCYTeZ0Tmyk7uV4tw==", - "dev": true, "license": "MIT", "dependencies": { "@date-io/core": "^2.17.0" @@ -106,7 +116,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz", "integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==", - "dev": true, "license": "MIT", "dependencies": { "tslib": "^2.0.0" @@ -119,7 +128,6 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz", "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==", - "dev": true, "license": "MIT", "dependencies": { "@dnd-kit/accessibility": "^3.1.1", @@ -135,7 +143,6 @@ "version": "10.0.0", "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz", "integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==", - "dev": true, "license": "MIT", "dependencies": { "@dnd-kit/utilities": "^3.2.2", @@ -150,7 +157,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz", "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==", - "dev": true, "license": "MIT", "dependencies": { "tslib": "^2.0.0" @@ -1170,7 +1176,6 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz", "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==", - "dev": true, "license": "ISC", "dependencies": { "get-stream": "^6.0.1", @@ -1184,14 +1189,12 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz", "integrity": "sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw==", - "dev": true, "license": "ISC" }, "node_modules/@mapbox/jsonlint-lines-primitives": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz", "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -1200,7 +1203,6 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz", "integrity": "sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==", - "dev": true, "license": "BSD-3-Clause", "peerDependencies": { "mapbox-gl": ">=0.32.1 <2.0.0" @@ -1210,28 +1212,24 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==", - "dev": true, "license": "ISC" }, "node_modules/@mapbox/tiny-sdf": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz", "integrity": "sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw==", - "dev": true, "license": "BSD-2-Clause" }, "node_modules/@mapbox/unitbezier": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz", "integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==", - "dev": true, "license": "BSD-2-Clause" }, "node_modules/@mapbox/vector-tile": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz", "integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==", - "dev": true, "license": "BSD-3-Clause", "dependencies": { "@mapbox/point-geometry": "~0.1.0" @@ -1241,7 +1239,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz", "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==", - "dev": true, "license": "ISC", "engines": { "node": ">=6.0.0" @@ -1251,13 +1248,16 @@ "version": "3.6.3", "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.6.3.tgz", "integrity": "sha512-UVrkSOs02YLehKaehrxhAejYMurehIHPfFQvPFZmdJHglHOU4V2cCUApTVEwOksvCp161ypEqVp+9H6mGhTTcw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.0", "gl-matrix": "^3.4.0" } }, + "node_modules/@musistudio/claude-code-router": { + "resolved": "packages/cli", + "link": true + }, "node_modules/@noble/hashes": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.2.0.tgz", @@ -1638,11 +1638,259 @@ "integrity": "sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==", "license": "MIT" }, + "node_modules/@playwright/test": { + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.1.tgz", + "integrity": "sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright": "1.61.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@pm2/agent": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@pm2/agent/-/agent-2.1.1.tgz", + "integrity": "sha512-0V9ckHWd/HSC8BgAbZSoq8KXUG81X97nSkAxmhKDhmF8vanyaoc1YXwc2KVkbWz82Rg4gjd2n9qiT3i7bdvGrQ==", + "license": "AGPL-3.0", + "dependencies": { + "async": "~3.2.0", + "chalk": "~3.0.0", + "dayjs": "~1.8.24", + "debug": "~4.3.1", + "eventemitter2": "~5.0.1", + "fast-json-patch": "^3.1.0", + "fclone": "~1.0.11", + "pm2-axon": "~4.0.1", + "pm2-axon-rpc": "~0.7.0", + "proxy-agent": "~6.4.0", + "semver": "~7.5.0", + "ws": "~7.5.10" + } + }, + "node_modules/@pm2/agent/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@pm2/agent/node_modules/dayjs": { + "version": "1.8.36", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz", + "integrity": "sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==", + "license": "MIT" + }, + "node_modules/@pm2/agent/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@pm2/agent/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@pm2/agent/node_modules/ws": { + "version": "7.5.11", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.11.tgz", + "integrity": "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==", + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/@pm2/blessed": { + "version": "0.1.81", + "resolved": "https://registry.npmjs.org/@pm2/blessed/-/blessed-0.1.81.tgz", + "integrity": "sha512-ZcNHqQjMuNRcQ7Z1zJbFIQZO/BDKV3KbiTckWdfbUaYhj7uNmUwb+FbdDWSCkvxNr9dBJQwvV17o6QBkAvgO0g==", + "license": "MIT", + "bin": { + "blessed": "bin/tput.js" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/@pm2/io": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@pm2/io/-/io-6.1.0.tgz", + "integrity": "sha512-IxHuYURa3+FQ6BKePlgChZkqABUKFYH6Bwbw7V/pWU1pP6iR1sCI26l7P9ThUEB385ruZn/tZS3CXDUF5IA1NQ==", + "license": "Apache-2", + "dependencies": { + "async": "~2.6.1", + "debug": "~4.3.1", + "eventemitter2": "^6.3.1", + "require-in-the-middle": "^5.0.0", + "semver": "~7.5.4", + "shimmer": "^1.2.0", + "signal-exit": "^3.0.3", + "tslib": "1.9.3" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/@pm2/io/node_modules/async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "license": "MIT", + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/@pm2/io/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@pm2/io/node_modules/eventemitter2": { + "version": "6.4.9", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.9.tgz", + "integrity": "sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==", + "license": "MIT" + }, + "node_modules/@pm2/io/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@pm2/io/node_modules/tslib": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", + "license": "Apache-2.0" + }, + "node_modules/@pm2/js-api": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.8.1.tgz", + "integrity": "sha512-n9tDOz1ojyDOs05XthEXrLFVQYbbh2oAN19UakLPyEZDrUyEq05h8wIZU8+dNXBQY/KeFlWMLVA76nnX52ofRg==", + "license": "Apache-2", + "dependencies": { + "async": "^2.6.3", + "debug": "~4.3.1", + "eventemitter2": "^6.3.1", + "extrareqp2": "^1.0.0", + "ws": "^8.21.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@pm2/js-api/node_modules/async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "license": "MIT", + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/@pm2/js-api/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@pm2/js-api/node_modules/eventemitter2": { + "version": "6.4.9", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.9.tgz", + "integrity": "sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==", + "license": "MIT" + }, + "node_modules/@pm2/pm2-version-check": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@pm2/pm2-version-check/-/pm2-version-check-1.0.4.tgz", + "integrity": "sha512-SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.1" + } + }, "node_modules/@reduxjs/toolkit": { "version": "2.12.0", "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.12.0.tgz", "integrity": "sha512-KiT+RzZbp6mQET+Mg+h2c97+9j1sNflUxQkIHI7Yuzf6Peu+OYpmkn6nbHWmLLWj+1ZODUJFwGZ7gx3L9R9EOw==", - "dev": true, "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.0.0", @@ -1669,7 +1917,6 @@ "version": "11.1.8", "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.8.tgz", "integrity": "sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA==", - "dev": true, "license": "MIT", "funding": { "type": "opencollective", @@ -1680,7 +1927,6 @@ "version": "2.6.5-forked.0", "resolved": "https://registry.npmjs.org/@rtsao/csstype/-/csstype-2.6.5-forked.0.tgz", "integrity": "sha512-0HwnY8uPWcCloTgdbbaJG3MbDUfNf6yKWZfCKxFv9yj2Sbp4mSKaIjC7Cr/5L4hMxvrrk85CU3wlAg7EtBBJ1Q==", - "dev": true, "license": "MIT" }, "node_modules/@sindresorhus/is": { @@ -1700,14 +1946,12 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", - "dev": true, "license": "MIT" }, "node_modules/@standard-schema/utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz", "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==", - "dev": true, "license": "MIT" }, "node_modules/@szmarczak/http-timer": { @@ -2066,9 +2310,9 @@ } }, "node_modules/@the-next-ai/ai-gateway": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@the-next-ai/ai-gateway/-/ai-gateway-1.0.4.tgz", - "integrity": "sha512-4SVznRNbm4+8acXk3VvinQO1Wv0NvkgrTe5bOijd5J6fE8GXRzwmfKAXM8pJMJJ/s6qLkJ7LJ4LqvuYs7rTABA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@the-next-ai/ai-gateway/-/ai-gateway-1.0.7.tgz", + "integrity": "sha512-HJtfjpBgjFEPQ6ub7nFTtEyxzzbrz6V5vQZfJOoHi3Jhpjob3W4h0UenTW6loHanJYucFIEh01SvB//Qj3ulcw==", "license": "MIT", "dependencies": { "diff": "^8.0.3", @@ -2096,6 +2340,12 @@ "node": ">=22.0.0" } }, + "node_modules/@tootallnate/quickjs-emscripten": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", + "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==", + "license": "MIT" + }, "node_modules/@types/better-sqlite3": { "version": "7.6.13", "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz", @@ -2123,28 +2373,24 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz", "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==", - "dev": true, "license": "MIT" }, "node_modules/@types/d3-color": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==", - "dev": true, "license": "MIT" }, "node_modules/@types/d3-ease": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz", "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==", - "dev": true, "license": "MIT" }, "node_modules/@types/d3-interpolate": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", - "dev": true, "license": "MIT", "dependencies": { "@types/d3-color": "*" @@ -2154,14 +2400,12 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz", "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==", - "dev": true, "license": "MIT" }, "node_modules/@types/d3-scale": { "version": "4.0.9", "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz", "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==", - "dev": true, "license": "MIT", "dependencies": { "@types/d3-time": "*" @@ -2171,7 +2415,6 @@ "version": "3.1.8", "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz", "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==", - "dev": true, "license": "MIT", "dependencies": { "@types/d3-path": "*" @@ -2181,14 +2424,12 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz", "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==", - "dev": true, "license": "MIT" }, "node_modules/@types/d3-timer": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz", "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==", - "dev": true, "license": "MIT" }, "node_modules/@types/debug": { @@ -2215,7 +2456,6 @@ "version": "2.0.46", "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.46.tgz", "integrity": "sha512-ynRvcq6wvqexJ9brDMS4BnBLzmr0e14d6ZJTEShTBWKymQiHwlAyGu0ZPEFI2Fh1U53F7tN9ufClWM5KvqkKOw==", - "dev": true, "license": "MIT" }, "node_modules/@types/http-cache-semantics": { @@ -2266,14 +2506,14 @@ "version": "15.7.15", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz", "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@types/react": { "version": "18.3.31", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.31.tgz", "integrity": "sha512-vfEqpXTvwT91yhmwdfouStN2hSKwTvyRs8qpLfADyrq/kxDw0hZM7Wk9Ug1FELj8hIby+S/+kQCSRFF32nv2Qw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@types/prop-types": "*", @@ -2304,7 +2544,6 @@ "version": "0.0.6", "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz", "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==", - "dev": true, "license": "MIT" }, "node_modules/@xmldom/xmldom": { @@ -2337,7 +2576,6 @@ "version": "7.1.4", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 14" @@ -2376,6 +2614,30 @@ } } }, + "node_modules/amp": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/amp/-/amp-0.3.1.tgz", + "integrity": "sha512-OwIuC4yZaRogHKiuU5WlMR5Xk/jAcpPtawWL05Gj8Lvm2F6mwoJt4O/bHI+DHwG79vWd+8OFYM4/BzYqyRd3qw==", + "license": "MIT" + }, + "node_modules/amp-message": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/amp-message/-/amp-message-0.1.2.tgz", + "integrity": "sha512-JqutcFwoU1+jhv7ArgW38bqrE+LQdcRv4NxNw0mp0JHQyB6tXesWRjtYKlDgHRY2o3JE5UTaBGUK8kSWUdxWUg==", + "license": "MIT", + "dependencies": { + "amp": "0.3.1" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -2390,7 +2652,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -2402,6 +2663,28 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/ansis": { + "version": "4.0.0-node10", + "resolved": "https://registry.npmjs.org/ansis/-/ansis-4.0.0-node10.tgz", + "integrity": "sha512-BRrU0Bo1X9dFGw6KgGz6hWrqQuOlVEDOzkb0QSLZY9sXHqA7pNj7yHPVJRz7y/rj4EOJ3d/D5uxH+ee9leYgsg==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/app-builder-lib": { "version": "26.15.3", "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.15.3.tgz", @@ -2586,11 +2869,22 @@ "node": ">=12.0.0" } }, + "node_modules/ast-types": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", + "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/async": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true, "license": "MIT" }, "node_modules/async-exit-hook": { @@ -2633,7 +2927,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.3.tgz", "integrity": "sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==", - "dev": true, "license": "MIT", "dependencies": { "core-js": "^2.5.0" @@ -2673,7 +2966,6 @@ "version": "4.12.1", "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.12.1.tgz", "integrity": "sha512-s7iGf5GaVMxEG0ENN9x+xTr7GFZCb1ZP/1uATUpCEK2X78nDB3RwbtFCo9pGAf9ru+VwoQ464DkaLEeRM08wJA==", - "dev": true, "license": "MPL-2.0", "engines": { "node": ">=4" @@ -2712,7 +3004,6 @@ "version": "16.1.1", "resolved": "https://registry.npmjs.org/baseui/-/baseui-16.1.1.tgz", "integrity": "sha512-pux441GCtmYrI8NE1SYqwsDnBad47msc7T/6p9JhHYrqYKo2y52YAO+7oSoFqIdaJxoY9r443U14hDkF68p56w==", - "dev": true, "license": "MIT", "dependencies": { "@date-io/date-fns": "^2.13.1", @@ -2759,21 +3050,18 @@ "version": "2.6.11", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.11.tgz", "integrity": "sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw==", - "dev": true, "license": "MIT" }, "node_modules/baseui/node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true, "license": "MIT" }, "node_modules/baseui/node_modules/react-uid": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/react-uid/-/react-uid-2.3.0.tgz", "integrity": "sha512-tsPZ77GR0pISGYmpCLHAbZTabKXZ7zBniKPVqVMMfnXFyo39zq5g/psIlD5vLTKkjQEhWOO8JhqcHnxkwNu6eA==", - "dev": true, "license": "MIT", "dependencies": { "tslib": "^1.10.0" @@ -2795,7 +3083,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.2.tgz", "integrity": "sha512-MYXhTY1BZpdJFjUovvYHVBmkq79szK/k7V3MO+36gJkWGkrXKtyr4vCPtpphaTLRAdDNoYEYFZWE8LjN+PIHNg==", - "dev": true, "license": "MIT", "engines": { "node": ">8.0.0" @@ -2809,7 +3096,6 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.5.tgz", "integrity": "sha512-HeTwlNa37AFa8MDZFZOKcNEkuF2YflA0hpGPiTT9vR7OawEt+GZbfM6wqkBahD3D3pUjIabQYzsnY/BSJbgq6Q==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", @@ -2827,9 +3113,17 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true, "license": "0BSD" }, + "node_modules/basic-ftp": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.3.1.tgz", + "integrity": "sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/better-sqlite3": { "version": "12.11.1", "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.11.1.tgz", @@ -2844,6 +3138,18 @@ "node": "20.x || 22.x || 23.x || 24.x || 25.x || 26.x" } }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/bindings": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", @@ -2885,6 +3191,12 @@ "dev": true, "license": "MIT" }, + "node_modules/bodec": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/bodec/-/bodec-0.1.0.tgz", + "integrity": "sha512-Ylo+MAo5BDUq1KA3f3R/MFhh+g8cnHmo8bz3YPGhI1znrMaf77ol1sfvYJzsw3nTE+Y2GryfDxBaR+AqpAkEHQ==", + "license": "MIT" + }, "node_modules/boolean": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", @@ -2910,7 +3222,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -2947,7 +3258,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, "license": "MIT" }, "node_modules/builder-util": { @@ -3062,7 +3372,6 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/card-validator/-/card-validator-6.2.0.tgz", "integrity": "sha512-1vYv45JaE9NmixZr4dl6ykzbFKv7imI9L7MQDs235b/a7EGbG8rrEsipeHtVvscLSUbl3RX6UP5gyOe0Y2FlHA==", - "dev": true, "license": "MIT", "dependencies": { "credit-card-type": "^8.0.0" @@ -3085,6 +3394,36 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/charm": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/charm/-/charm-0.1.2.tgz", + "integrity": "sha512-syedaZ9cPe7r3hoQA9twWYKu5AIyCswN5+szkmPBe9ccdLrj4bYaCnLVPTLd2kgVRc7+zoX4tyPgRnFKCj5YjQ==", + "license": "MIT/X11" + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, "node_modules/chownr": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", @@ -3118,6 +3457,30 @@ "node": ">=8" } }, + "node_modules/cli-tableau": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cli-tableau/-/cli-tableau-2.0.1.tgz", + "integrity": "sha512-he+WTicka9cl0Fg/y+YyxcN6/bfQ/1O3QmgxRXDhABKqLzvoOSM4fMzp39uMyLBulAFuywD2N7UaoQE7WaADxQ==", + "dependencies": { + "chalk": "3.0.0" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/cli-tableau/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -3150,7 +3513,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -3160,7 +3522,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -3173,7 +3534,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, "license": "MIT" }, "node_modules/combined-stream": { @@ -3193,7 +3553,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 10" @@ -3234,7 +3593,6 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", - "dev": true, "hasInstallScript": true, "license": "MIT" }, @@ -3249,7 +3607,12 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/credit-card-type/-/credit-card-type-8.3.0.tgz", "integrity": "sha512-czfZUpQ7W9CDxZL4yFLb1kFtM/q2lTOY975hL2aO+DC8+GRNDVSXVCHXhVFZPxiUKmQCZbFP8vIhxx5TBQaThw==", - "dev": true, + "license": "MIT" + }, + "node_modules/croner": { + "version": "4.1.97", + "resolved": "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz", + "integrity": "sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ==", "license": "MIT" }, "node_modules/cross-dirname": { @@ -3303,7 +3666,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz", "integrity": "sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==", - "dev": true, "license": "MIT", "dependencies": { "hyphenate-style-name": "^1.0.2", @@ -3314,21 +3676,24 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz", "integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w==", - "dev": true, "license": "MIT" }, "node_modules/csstype": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", - "dev": true, + "license": "MIT" + }, + "node_modules/culvert": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/culvert/-/culvert-0.1.2.tgz", + "integrity": "sha512-yi1x3EAWKjQTreYWeSd98431AV+IEE0qoDyOoaHJ7KJ21gv6HtBXHVLX74opVSGqcR8/AbjJBHAHpcOy2bj5Gg==", "license": "MIT" }, "node_modules/d3": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz", "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==", - "dev": true, "license": "ISC", "dependencies": { "d3-array": "3", @@ -3370,7 +3735,6 @@ "version": "3.2.4", "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", - "dev": true, "license": "ISC", "dependencies": { "internmap": "1 - 2" @@ -3383,7 +3747,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz", "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3393,7 +3756,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz", "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==", - "dev": true, "license": "ISC", "dependencies": { "d3-dispatch": "1 - 3", @@ -3410,7 +3772,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz", "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==", - "dev": true, "license": "ISC", "dependencies": { "d3-path": "1 - 3" @@ -3423,7 +3784,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3433,7 +3793,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz", "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==", - "dev": true, "license": "ISC", "dependencies": { "d3-array": "^3.2.0" @@ -3446,7 +3805,6 @@ "version": "6.0.4", "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz", "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==", - "dev": true, "license": "ISC", "dependencies": { "delaunator": "5" @@ -3459,7 +3817,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3469,7 +3826,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz", "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", - "dev": true, "license": "ISC", "dependencies": { "d3-dispatch": "1 - 3", @@ -3483,7 +3839,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", - "dev": true, "license": "ISC", "dependencies": { "commander": "7", @@ -3509,7 +3864,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=12" @@ -3519,7 +3873,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz", "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==", - "dev": true, "license": "ISC", "dependencies": { "d3-dsv": "1 - 3" @@ -3532,7 +3885,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz", "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==", - "dev": true, "license": "ISC", "dependencies": { "d3-dispatch": "1 - 3", @@ -3547,7 +3899,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz", "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3557,7 +3908,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz", "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==", - "dev": true, "license": "ISC", "dependencies": { "d3-array": "2.5.0 - 3" @@ -3570,7 +3920,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz", "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3580,7 +3929,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", - "dev": true, "license": "ISC", "dependencies": { "d3-color": "1 - 3" @@ -3593,7 +3941,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3603,7 +3950,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz", "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3613,7 +3959,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz", "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3623,7 +3968,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz", "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3633,7 +3977,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", - "dev": true, "license": "ISC", "dependencies": { "d3-array": "2.10.0 - 3", @@ -3650,7 +3993,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz", "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==", - "dev": true, "license": "ISC", "dependencies": { "d3-color": "1 - 3", @@ -3664,7 +4006,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3674,7 +4015,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz", "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", - "dev": true, "license": "ISC", "dependencies": { "d3-path": "^3.1.0" @@ -3687,7 +4027,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", - "dev": true, "license": "ISC", "dependencies": { "d3-array": "2 - 3" @@ -3700,7 +4039,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", - "dev": true, "license": "ISC", "dependencies": { "d3-time": "1 - 3" @@ -3713,7 +4051,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -3723,7 +4060,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", - "dev": true, "license": "ISC", "dependencies": { "d3-color": "1 - 3", @@ -3743,7 +4079,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", - "dev": true, "license": "ISC", "dependencies": { "d3-dispatch": "1 - 3", @@ -3756,11 +4091,19 @@ "node": ">=12" } }, + "node_modules/data-uri-to-buffer": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", + "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, "node_modules/date-fns": { "version": "2.30.0", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.21.0" @@ -3777,12 +4120,17 @@ "version": "1.3.8", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz", "integrity": "sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==", - "dev": true, "license": "MIT", "peerDependencies": { "date-fns": ">=2.0.0" } }, + "node_modules/dayjs": { + "version": "1.11.15", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.15.tgz", + "integrity": "sha512-MC+DfnSWiM9APs7fpiurHGCoeIx0Gdl6QZBy+5lu8MbYKN5FZEXqOgrundfibdfhGZ15o9hzmZ2xJjZnbvgKXQ==", + "license": "MIT" + }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -3804,7 +4152,6 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz", "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==", - "dev": true, "license": "MIT" }, "node_modules/decompress-response": { @@ -3891,11 +4238,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/degenerator": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", + "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", + "license": "MIT", + "dependencies": { + "ast-types": "^0.13.4", + "escodegen": "^2.1.0", + "esprima": "^4.0.1" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/delaunator": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.1.0.tgz", "integrity": "sha512-AGrQ4QSgssa1NGmWmLPqN5NY2KajF5MqxetNEO+o0n3ZwZZeTmt7bBnvzHWrmkZFxGgr4HdyFgelzgi06otLuQ==", - "dev": true, "license": "ISC", "dependencies": { "robust-predicates": "^3.0.2" @@ -3945,7 +4305,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==", - "dev": true, "license": "MIT" }, "node_modules/diff": { @@ -4016,7 +4375,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.8.7", @@ -4081,7 +4439,6 @@ "version": "2.2.4", "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==", - "dev": true, "license": "ISC" }, "node_modules/ejs": { @@ -4311,6 +4668,18 @@ "node": ">=10.13.0" } }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, "node_modules/env-paths": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz", @@ -4345,7 +4714,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4384,7 +4752,6 @@ "version": "1.47.1", "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.47.1.tgz", "integrity": "sha512-5RAqEwf4P4E17p+W75KLOWw/nOvKZzSQpxM32IpI2KZLaVonjTrZ0Ai5ghMaVI9eKC2p8eoQgcBdkEDgzFk6+Q==", - "dev": true, "license": "MIT", "workspaces": [ "docs", @@ -4455,9 +4822,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, "license": "MIT", - "optional": true, "engines": { "node": ">=10" }, @@ -4465,11 +4830,68 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eventemitter2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz", + "integrity": "sha512-5EM1GHXycJBS6mauYAbVKT1cVs7POKWb2NXD4Vyt8dDqeZa7LaDK1/sjtL+Zb0lzTpSNil4596Dyu97hz37QLg==", + "license": "MIT" + }, "node_modules/eventemitter3": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==", - "dev": true, "license": "MIT" }, "node_modules/expand-template": { @@ -4488,6 +4910,15 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/extrareqp2": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/extrareqp2/-/extrareqp2-1.0.0.tgz", + "integrity": "sha512-Gum0g1QYb6wpPJCVypWP3bbIuaibcFiJcpuPM10YSXp/tzqi84x9PJageob+eN4xVRIOto4wjSGNLyMD54D2xA==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/fast-decode-uri-component": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz", @@ -4500,6 +4931,12 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "license": "MIT" }, + "node_modules/fast-json-patch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz", + "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==", + "license": "MIT" + }, "node_modules/fast-json-stringify": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-6.4.0.tgz", @@ -4591,11 +5028,16 @@ "reusify": "^1.0.4" } }, + "node_modules/fclone": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fclone/-/fclone-1.0.11.tgz", + "integrity": "sha512-GDqVQezKzRABdeqflsgMr7ktzgF9CyS+p2oe0jJqUY6izSSbhPIQJDpoU4PtGcD7VPM9xh/dVrTu6z1nwgmEGw==", + "license": "MIT" + }, "node_modules/file-selector": { "version": "0.1.19", "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.19.tgz", "integrity": "sha512-kCWw3+Aai8Uox+5tHCNgMFaUdgidxvMnLWO6fM5sZ0hA2wlHP5/DHGF0ECe84BiB95qdJbKNEJhWKVDvMN+JDQ==", - "dev": true, "license": "MIT", "dependencies": { "tslib": "^2.0.1" @@ -4654,7 +5096,6 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -4681,7 +5122,6 @@ "version": "1.3.6", "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-1.3.6.tgz", "integrity": "sha512-Ik/6OCk9RQQ0T5Xw+hKNLWrjSMtv51dD4GRmJjbD5a58TIEpI5a5iXagKVl3Z5UuyslMCA8Xwnu76jQob62Yhg==", - "dev": true, "license": "MIT", "dependencies": { "tslib": "^2.0.3" @@ -4690,6 +5130,26 @@ "node": ">=10" } }, + "node_modules/follow-redirects": { + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", + "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/form-data": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", @@ -4711,7 +5171,6 @@ "version": "12.40.0", "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.40.0.tgz", "integrity": "sha512-uaBd3qC1v3KQqBEjwTUd183K6PbS+j0yR9w9VmEOLWA/tnUcSn8Xa3uck7t4dgpDoUss8xQTcj8W2L07lrnLFg==", - "dev": true, "license": "MIT", "dependencies": { "motion-dom": "^12.40.0", @@ -4762,11 +5221,24 @@ "dev": true, "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4776,7 +5248,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==", - "dev": true, "license": "ISC" }, "node_modules/get-caller-file": { @@ -4832,7 +5303,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -4841,6 +5311,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-uri": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.5.tgz", + "integrity": "sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==", + "license": "MIT", + "dependencies": { + "basic-ftp": "^5.0.2", + "data-uri-to-buffer": "^6.0.2", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/git-node-fs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/git-node-fs/-/git-node-fs-1.0.0.tgz", + "integrity": "sha512-bLQypt14llVXBg0S0u8q8HmU7g9p3ysH+NvVlae5vILuUvs759665HvmR5+wb04KjHyjFcDRxdYb4kyNnluMUQ==", + "license": "MIT" + }, + "node_modules/git-sha1": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/git-sha1/-/git-sha1-0.1.2.tgz", + "integrity": "sha512-2e/nZezdVlyCopOCYHeW0onkbZg7xP1Ad6pndPy1rCygeRykefUS6r7oA5cJRGEFvseiaz5a/qUHFVX1dd6Isg==", + "license": "MIT" + }, "node_modules/github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", @@ -4851,7 +5347,6 @@ "version": "3.4.4", "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.4.tgz", "integrity": "sha512-latSnyDNt/8zYUB6VIJ6PCh2jBjJX6gnDsoCZ7LyW7GkqrD51EWwa9qCoGixj8YqBtETQK/xY7OmpTF8xz1DdQ==", - "dev": true, "license": "MIT" }, "node_modules/glob": { @@ -4871,6 +5366,18 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/global-agent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", @@ -4957,14 +5464,12 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==", - "dev": true, "license": "ISC" }, "node_modules/hammerjs": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8.0" @@ -4974,7 +5479,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5027,7 +5531,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -5060,7 +5563,6 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dev": true, "license": "MIT", "dependencies": { "agent-base": "^7.1.0", @@ -5088,7 +5590,6 @@ "version": "7.0.6", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "dev": true, "license": "MIT", "dependencies": { "agent-base": "^7.1.2", @@ -5102,14 +5603,12 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz", "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==", - "dev": true, "license": "BSD-3-Clause" }, "node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -5142,7 +5641,6 @@ "version": "10.2.0", "resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz", "integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==", - "dev": true, "license": "MIT", "funding": { "type": "opencollective", @@ -5177,7 +5675,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-5.1.2.tgz", "integrity": "sha512-PYUF+94gDfhy+LsQxM0g3d6Hge4l1pAqOSOiZuHWzMvQEGsbRQ/ck2WioLqrY2ZkHyPgVUXxn+hrkF7D6QUGbA==", - "dev": true, "license": "MIT", "dependencies": { "css-in-js-utils": "^2.0.0" @@ -5187,7 +5684,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", - "dev": true, "license": "ISC", "engines": { "node": ">=12" @@ -5197,12 +5693,20 @@ "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.0.0" } }, + "node_modules/ip-address": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", + "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, "node_modules/ipaddr.js": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.4.0.tgz", @@ -5212,11 +5716,37 @@ "node": ">= 10" } }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz", + "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==", + "license": "MIT", + "dependencies": { + "hasown": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -5236,7 +5766,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -5249,7 +5778,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -5289,7 +5817,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -5323,11 +5850,22 @@ "jiti": "lib/jiti-cli.mjs" } }, + "node_modules/js-git": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/js-git/-/js-git-0.7.8.tgz", + "integrity": "sha512-+E5ZH/HeRnoc/LW0AmAyhU+mNcWBzAKE+30+IDMLSLbbK+Tdt02AdkOKq9u15rlJsDEGFqtgckc8ZM59LhhiUA==", + "license": "MIT", + "dependencies": { + "bodec": "^0.1.0", + "culvert": "^0.1.2", + "git-sha1": "^0.1.2", + "pako": "^0.2.5" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, "license": "MIT" }, "node_modules/js-yaml": { @@ -5388,7 +5926,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true, "license": "ISC", "optional": true }, @@ -5421,14 +5958,12 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", - "dev": true, "license": "MIT" }, "node_modules/kdbush": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz", "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==", - "dev": true, "license": "ISC" }, "node_modules/keyv": { @@ -5759,7 +6294,6 @@ "version": "4.18.1", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", - "dev": true, "license": "MIT" }, "node_modules/lodash.escaperegexp": { @@ -5779,7 +6313,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, "license": "MIT", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" @@ -5802,7 +6335,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "license": "ISC", "dependencies": { "yallist": "^4.0.0" @@ -5815,7 +6347,6 @@ "version": "1.20.0", "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-1.20.0.tgz", "integrity": "sha512-jhXLeC/7m0/tjL1nzMdKk6x256zWA6AtbhTVreHOiKPoeX2d6MK4FbyIQPpVq0E6iPWBisyy1TW+pEge/uMEuQ==", - "dev": true, "license": "ISC", "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" @@ -5835,7 +6366,6 @@ "version": "1.13.3", "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.3.tgz", "integrity": "sha512-p8lJFEiqmEQlyv+DQxFAOG/XPWN0Wp7j/Psq93Zywz7qt9CcUKFYDBOoOEKzqe6gudHVJY8/Bhqw6VDpX2lSBg==", - "dev": true, "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", @@ -5893,7 +6423,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.0.tgz", "integrity": "sha512-7g0+ejkOaI9w5x6LvQwmj68kUj6rxROywPSCqmclG/HBacmFnZqhVscQ8kovkn9FBCNJmOz6SY42+jnvZzDWdw==", - "dev": true, "license": "MIT" }, "node_modules/micromatch": { @@ -6006,7 +6535,6 @@ "version": "2.7.3", "resolved": "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.7.3.tgz", "integrity": "sha512-Z5z/+FzZqOSO3juSVKV3zcm4R2eAlWwlKMcqHmyFEJAaLILNcDKnIbnb4/kbcGyIuhtdWrzu8WOIR7uM6I34aw==", - "dev": true, "license": "MIT", "dependencies": { "@types/hammerjs": "^2.0.41", @@ -6041,14 +6569,18 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-2.0.5.tgz", "integrity": "sha512-ST0PnThzWKcgSLyc+ugLVql45PvESt3Ul/wrdV/OPc/6Pr8dbLAIJsN1cIp41FLzbN+srVTNIRn+5Cju0nyV6A==", - "dev": true, + "license": "MIT" + }, + "node_modules/module-details-from-path": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.4.tgz", + "integrity": "sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==", "license": "MIT" }, "node_modules/moment": { "version": "2.30.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "dev": true, "license": "MIT", "engines": { "node": "*" @@ -6058,7 +6590,6 @@ "version": "12.40.0", "resolved": "https://registry.npmjs.org/motion/-/motion-12.40.0.tgz", "integrity": "sha512-yjrHUrBFW6kQvjJwRsoiPSAhC5tRwRqNGJWmiJ4CrGnbKp0V88AdzkhBmDoqIsIPfarOe0Uddd37Xq43/gIocA==", - "dev": true, "license": "MIT", "dependencies": { "framer-motion": "^12.40.0", @@ -6085,7 +6616,6 @@ "version": "12.40.0", "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.40.0.tgz", "integrity": "sha512-HxU3ZaBwNPVQUBQf1xxgq+7JrPNZvjLVxgbpEZL7RrWJnsxOf0/OM+yrHG9ogLQ31Do/r57Oz2gQWPK+6q62mg==", - "dev": true, "license": "MIT", "dependencies": { "motion-utils": "^12.39.0" @@ -6095,7 +6625,6 @@ "version": "12.39.0", "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.39.0.tgz", "integrity": "sha512-8nadJAJjTtqRkmRF36FoJTrywK9nnFmnPwnSMyxaOCU7GDjN9RTMJIxx9De8ErM+vpPhMccr/6fo5WciyQLnMQ==", - "dev": true, "license": "MIT" }, "node_modules/mri": { @@ -6118,15 +6647,67 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz", "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==", - "dev": true, "license": "MIT" }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "license": "ISC" + }, "node_modules/napi-build-utils": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", "license": "MIT" }, + "node_modules/needle": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz", + "integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==", + "license": "MIT", + "dependencies": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + }, + "bin": { + "needle": "bin/needle" + }, + "engines": { + "node": ">= 4.4.x" + } + }, + "node_modules/needle/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/needle/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/netmask": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.1.1.tgz", + "integrity": "sha512-eonl3sLUha+S1GzTPxychyhnUzKyeQkZ7jLjKrBagJgPla13F+uQ71HgpFefyHgqrjEbCPkDArxYsjY8/+gLKA==", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/node-abi": { "version": "4.31.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.31.0.tgz", @@ -6260,6 +6841,15 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/normalize-url": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", @@ -6277,7 +6867,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -6356,6 +6945,44 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/pac-proxy-agent": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz", + "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==", + "license": "MIT", + "dependencies": { + "@tootallnate/quickjs-emscripten": "^0.23.0", + "agent-base": "^7.1.2", + "debug": "^4.3.4", + "get-uri": "^6.0.1", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.6", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.5" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/pac-resolver": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", + "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", + "license": "MIT", + "dependencies": { + "degenerator": "^5.0.0", + "netmask": "^2.0.2" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/pako": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==", + "license": "MIT" + }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -6376,6 +7003,12 @@ "node": ">=8" } }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" + }, "node_modules/path-scurry": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", @@ -6405,7 +7038,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.3.0.tgz", "integrity": "sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==", - "dev": true, "license": "BSD-3-Clause", "dependencies": { "ieee754": "^1.1.12", @@ -6441,7 +7073,6 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", - "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -6450,6 +7081,38 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pidusage": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.2.tgz", + "integrity": "sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==", + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pidusage/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/pino": { "version": "10.3.1", "resolved": "https://registry.npmjs.org/pino/-/pino-10.3.1.tgz", @@ -6518,6 +7181,38 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/playwright": { + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.1.tgz", + "integrity": "sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright-core": "1.61.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/playwright-core": { + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.1.tgz", + "integrity": "sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/plist": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz", @@ -6533,11 +7228,204 @@ "node": ">=10.4.0" } }, + "node_modules/pm2": { + "version": "6.0.14", + "resolved": "https://registry.npmjs.org/pm2/-/pm2-6.0.14.tgz", + "integrity": "sha512-wX1FiFkzuT2H/UUEA8QNXDAA9MMHDsK/3UHj6Dkd5U7kxyigKDA5gyDw78ycTQZAuGCLWyUX5FiXEuVQWafukA==", + "license": "AGPL-3.0", + "dependencies": { + "@pm2/agent": "~2.1.1", + "@pm2/blessed": "0.1.81", + "@pm2/io": "~6.1.0", + "@pm2/js-api": "~0.8.0", + "@pm2/pm2-version-check": "^1.0.4", + "ansis": "4.0.0-node10", + "async": "3.2.6", + "chokidar": "3.6.0", + "cli-tableau": "2.0.1", + "commander": "2.15.1", + "croner": "4.1.97", + "dayjs": "1.11.15", + "debug": "4.4.3", + "enquirer": "2.3.6", + "eventemitter2": "5.0.1", + "fclone": "1.0.11", + "js-yaml": "4.1.1", + "mkdirp": "1.0.4", + "needle": "2.4.0", + "pidusage": "3.0.2", + "pm2-axon": "~4.0.1", + "pm2-axon-rpc": "~0.7.1", + "pm2-deploy": "~1.0.2", + "pm2-multimeter": "^0.1.2", + "promptly": "2.2.0", + "semver": "7.7.2", + "source-map-support": "0.5.21", + "sprintf-js": "1.1.2", + "vizion": "~2.2.1" + }, + "bin": { + "pm2": "bin/pm2", + "pm2-dev": "bin/pm2-dev", + "pm2-docker": "bin/pm2-docker", + "pm2-runtime": "bin/pm2-runtime" + }, + "engines": { + "node": ">=16.0.0" + }, + "optionalDependencies": { + "pm2-sysmonit": "^1.2.8" + } + }, + "node_modules/pm2-axon": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pm2-axon/-/pm2-axon-4.0.1.tgz", + "integrity": "sha512-kES/PeSLS8orT8dR5jMlNl+Yu4Ty3nbvZRmaAtROuVm9nYYGiaoXqqKQqQYzWQzMYWUKHMQTvBlirjE5GIIxqg==", + "license": "MIT", + "dependencies": { + "amp": "~0.3.1", + "amp-message": "~0.1.1", + "debug": "^4.3.1", + "escape-string-regexp": "^4.0.0" + }, + "engines": { + "node": ">=5" + } + }, + "node_modules/pm2-axon-rpc": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/pm2-axon-rpc/-/pm2-axon-rpc-0.7.1.tgz", + "integrity": "sha512-FbLvW60w+vEyvMjP/xom2UPhUN/2bVpdtLfKJeYM3gwzYhoTEEChCOICfFzxkxuoEleOlnpjie+n1nue91bDQw==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.1" + }, + "engines": { + "node": ">=5" + } + }, + "node_modules/pm2-deploy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pm2-deploy/-/pm2-deploy-1.0.2.tgz", + "integrity": "sha512-YJx6RXKrVrWaphEYf++EdOOx9EH18vM8RSZN/P1Y+NokTKqYAca/ejXwVLyiEpNju4HPZEk3Y2uZouwMqUlcgg==", + "license": "MIT", + "dependencies": { + "run-series": "^1.1.8", + "tv4": "^1.3.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/pm2-multimeter": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/pm2-multimeter/-/pm2-multimeter-0.1.2.tgz", + "integrity": "sha512-S+wT6XfyKfd7SJIBqRgOctGxaBzUOmVQzTAS+cg04TsEUObJVreha7lvCfX8zzGVr871XwCSnHUU7DQQ5xEsfA==", + "license": "MIT/X11", + "dependencies": { + "charm": "~0.1.1" + } + }, + "node_modules/pm2-sysmonit": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/pm2-sysmonit/-/pm2-sysmonit-1.2.8.tgz", + "integrity": "sha512-ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA==", + "license": "Apache", + "optional": true, + "dependencies": { + "async": "^3.2.0", + "debug": "^4.3.1", + "pidusage": "^2.0.21", + "systeminformation": "^5.7", + "tx2": "~1.0.4" + } + }, + "node_modules/pm2-sysmonit/node_modules/pidusage": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.21.tgz", + "integrity": "sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==", + "license": "MIT", + "optional": true, + "dependencies": { + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pm2-sysmonit/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "optional": true + }, + "node_modules/pm2/node_modules/commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "license": "MIT" + }, + "node_modules/pm2/node_modules/js-yaml": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/pm2/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pm2/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pm2/node_modules/sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "license": "BSD-3-Clause" + }, "node_modules/polished": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/polished/-/polished-4.3.1.tgz", "integrity": "sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.17.8" @@ -6551,7 +7439,6 @@ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "dev": true, "license": "MIT", "funding": { "type": "opencollective", @@ -6592,7 +7479,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz", "integrity": "sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==", - "dev": true, "license": "ISC" }, "node_modules/prebuild-install": { @@ -6700,11 +7586,19 @@ "node": ">=10" } }, + "node_modules/promptly": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/promptly/-/promptly-2.2.0.tgz", + "integrity": "sha512-aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA==", + "license": "MIT", + "dependencies": { + "read": "^1.0.4" + } + }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.4.0", @@ -6716,7 +7610,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz", "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==", - "dev": true, "license": "MIT", "dependencies": { "react-is": "^16.3.2", @@ -6730,14 +7623,12 @@ "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true, "license": "MIT" }, "node_modules/prop-types/node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true, "license": "MIT" }, "node_modules/proper-lockfile": { @@ -6756,7 +7647,40 @@ "version": "3.6.1", "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.1.tgz", "integrity": "sha512-VG2K63Igkiv9p76tk1lilczEK1cT+kCjKtkdhw1dQZV3k3IXJbd3o6Ho8b9zJZaHSnT2hKe4I+ObmX9w6m5SmQ==", - "dev": true, + "license": "MIT" + }, + "node_modules/proxy-agent": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", + "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "http-proxy-agent": "^7.0.1", + "https-proxy-agent": "^7.0.3", + "lru-cache": "^7.14.1", + "pac-proxy-agent": "^7.0.1", + "proxy-from-env": "^1.1.0", + "socks-proxy-agent": "^8.0.2" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/proxy-agent/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "license": "MIT" }, "node_modules/pump": { @@ -6812,7 +7736,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz", "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==", - "dev": true, "license": "ISC" }, "node_modules/rc": { @@ -6834,7 +7757,6 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" @@ -6847,7 +7769,6 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.8.tgz", "integrity": "sha512-ma2FePH0z3px2+WOu6h+YycZcEvFmmxIlAb62cF52bG86eMySciO/EQZeQMXd07kPCYB0a1dWDT5J+KE9mCDUw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.13" @@ -6860,7 +7781,6 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.1.0", @@ -6874,7 +7794,6 @@ "version": "9.0.0", "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-9.0.0.tgz", "integrity": "sha512-wZ2o9B2qkdE3RumWhfyZT9swgJYJPeU5qHEcMU8weYpmLex1eeWX0CC32/Y0VutB+BBi2D+iePV/YZIiB4kZGw==", - "dev": true, "license": "MIT", "dependencies": { "attr-accept": "^1.1.3", @@ -6893,7 +7812,6 @@ "version": "2.13.7", "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.13.7.tgz", "integrity": "sha512-20lpZHEQrXPb+pp1tzd4ULL6DyO5D2KnR0G69tTDdydrmNhU7pdFmbQUYVyHUgp+xN29IuFR0PVuhOmvaZL9Og==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", @@ -6917,7 +7835,6 @@ "version": "7.79.0", "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.79.0.tgz", "integrity": "sha512-mhYp/MTmXvzYX6AJcJVko0rktoIhhmRnEouObj4wF5i/tCttgJvnp1+9wRkpITZjDTqpo4IOSJqu0dBlPlV/Lw==", - "dev": true, "license": "MIT", "engines": { "node": ">=18.0.0" @@ -6934,7 +7851,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/react-input-mask/-/react-input-mask-2.0.4.tgz", "integrity": "sha512-1hwzMr/aO9tXfiroiVCx5EtKohKwLk/NT8QlJXHQ4N+yJJFyUuMT+zfTpLBwX/lK3PkuMlievIffncpMZ3HGRQ==", - "dev": true, "license": "MIT", "dependencies": { "invariant": "^2.2.4", @@ -6949,7 +7865,6 @@ "version": "19.2.7", "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.7.tgz", "integrity": "sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==", - "dev": true, "license": "MIT", "peer": true }, @@ -6957,14 +7872,12 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==", - "dev": true, "license": "MIT" }, "node_modules/react-map-gl": { "version": "5.2.13", "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-5.2.13.tgz", "integrity": "sha512-yYqpZJADB7o5epiYpkcUED5MWevFnOsVn9mgKfizxjsenLMpVNgNgb/x0e9DS4VZtpOLWW2ZXYBB4BJZJlZmTQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", @@ -6986,7 +7899,6 @@ "version": "1.0.26", "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.26.tgz", "integrity": "sha512-CblNyiNVw2o+hsa5/49NH2ogGxZ+t+3aweRvNSq7TVjDIlwk7ir4lencEg5HxHeSzwNarSkNkiu0qJSOXtxm5A==", - "dev": true, "license": "MIT", "peerDependencies": { "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0", @@ -6997,7 +7909,6 @@ "version": "3.4.1", "resolved": "https://registry.npmjs.org/react-movable/-/react-movable-3.4.1.tgz", "integrity": "sha512-VTrBKjRWV4yVUDGj5dIZIhf07fyoFDXzIV6xs3KNNHpgPbkPT7FNu/Vbe11ZjHmT48uOykCmRMpS66DrzRbZZg==", - "dev": true, "license": "MIT", "peerDependencies": { "react": "*", @@ -7008,7 +7919,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/react-multi-ref/-/react-multi-ref-1.0.2.tgz", "integrity": "sha512-6oS5yzrZ4UrdMHbF6QAnnaoIe9h8R+Xv4m8uJWVK8/Q4RCc6RTT0XJ/LZ7llVgFcVbnDHeUAcVIhtRgFyzjJpA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.24.4" @@ -7018,7 +7928,6 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/react-range/-/react-range-1.10.0.tgz", "integrity": "sha512-kDo0LiBUHIQIP8menx0UoxTnHr7UXBYpIYl/DR9jCaO1o29VwvCLpkP/qOTNQz5hkJadPg1uEM07XJcJ1XGoKw==", - "dev": true, "license": "MIT", "peerDependencies": { "react": "*", @@ -7029,7 +7938,6 @@ "version": "9.3.0", "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.3.0.tgz", "integrity": "sha512-KQopgqFo/p/fgmAs5qz6p5RWaNAzq40WAu7fJIXnQpYxFPbJYtsJPWvGeF2rOBaY/kEuV77AVsX8TsQzKm+A/g==", - "dev": true, "license": "MIT", "dependencies": { "@types/use-sync-external-store": "^0.0.6", @@ -7053,7 +7961,6 @@ "version": "9.22.6", "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.6.tgz", "integrity": "sha512-U5j7KuUQt3AaMatlMJ0UJddqSiX+Km0YJxSqbAzIiGw5EmNz0khMyqP2hzgu4+QUtm+QPIrxzUX4raJxmVJnHg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", @@ -7072,12 +7979,23 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" } }, + "node_modules/read": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", + "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==", + "license": "ISC", + "dependencies": { + "mute-stream": "~0.0.4" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/read-binary-file-arch": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", @@ -7107,6 +8025,18 @@ "util-deprecate": "~1.0.1" } }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, "node_modules/real-require": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz", @@ -7120,7 +8050,6 @@ "version": "3.8.1", "resolved": "https://registry.npmjs.org/recharts/-/recharts-3.8.1.tgz", "integrity": "sha512-mwzmO1s9sFL0TduUpwndxCUNoXsBw3u3E/0+A+cLcrSfQitSG62L32N69GhqUrrT5qKcAE3pCGVINC6pqkBBQg==", - "dev": true, "license": "MIT", "workspaces": [ "www" @@ -7151,14 +8080,12 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==", - "dev": true, "license": "MIT" }, "node_modules/redux-thunk": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz", "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==", - "dev": true, "license": "MIT", "peerDependencies": { "redux": "^5.0.0" @@ -7183,6 +8110,20 @@ "node": ">=0.10.0" } }, + "node_modules/require-in-the-middle": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz", + "integrity": "sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==", + "license": "MIT", + "dependencies": { + "debug": "^4.1.1", + "module-details-from-path": "^1.0.3", + "resolve": "^1.22.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/resedit": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz", @@ -7205,16 +8146,35 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz", "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==", - "dev": true, "license": "MIT" }, "node_modules/resize-observer-polyfill": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==", - "dev": true, "license": "MIT" }, + "node_modules/resolve": { + "version": "1.22.12", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz", + "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "is-core-module": "^2.16.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/resolve-alpn": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", @@ -7226,7 +8186,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz", "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==", - "dev": true, "license": "MIT", "dependencies": { "protocol-buffers-schema": "^3.3.1" @@ -7375,14 +8334,32 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.3.tgz", "integrity": "sha512-NS3levdsRIUOmiJ8FZWCP7LG3QpJyrs/TE0Zpf1yvZu8cAJJ6QMW92H1c7kWpdIHo8RvmLxN/o2JXTKHp74lUA==", - "dev": true, "license": "Unlicense" }, + "node_modules/run-series": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz", + "integrity": "sha512-Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/rw": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", - "dev": true, "license": "BSD-3-Clause" }, "node_modules/safe-buffer": { @@ -7426,7 +8403,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, "license": "MIT" }, "node_modules/sanitize-filename": { @@ -7452,7 +8428,6 @@ "version": "0.23.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" @@ -7540,11 +8515,16 @@ "node": ">=8" } }, + "node_modules/shimmer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", + "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==", + "license": "BSD-2-Clause" + }, "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, "license": "ISC" }, "node_modules/simple-concat": { @@ -7605,6 +8585,44 @@ "node": ">=10" } }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "license": "MIT", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz", + "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==", + "license": "MIT", + "dependencies": { + "ip-address": "^10.1.1", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", + "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "^4.3.4", + "socks": "^2.8.3" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/sonic-boom": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.1.tgz", @@ -7618,7 +8636,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -7638,7 +8655,6 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", @@ -7722,7 +8738,6 @@ "version": "1.6.2", "resolved": "https://registry.npmjs.org/styletron-engine-atomic/-/styletron-engine-atomic-1.6.2.tgz", "integrity": "sha512-vWSIxpCkYbVD3xhnxYwnJDJePD8p8pJCu7g1zFxdQIM4z34Eo1zj3LgXJI6yeNMrJ7PkE56SYK6ZOo3hpTOBzA==", - "dev": true, "license": "MIT", "dependencies": { "inline-style-prefixer": "^5.1.0", @@ -7733,7 +8748,6 @@ "version": "6.1.1", "resolved": "https://registry.npmjs.org/styletron-react/-/styletron-react-6.1.1.tgz", "integrity": "sha512-K04BwKZTrdRG/wR5BaFG8z0bFu1jkT2HAp0UP5ZeMAKW6Ix8J3yuROWLoLUMZafaRRQ9LjiLpIl65u75L7YZow==", - "dev": true, "license": "MIT", "dependencies": { "prop-types": "^15.6.0", @@ -7747,7 +8761,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/styletron-standard/-/styletron-standard-3.1.0.tgz", "integrity": "sha512-Cr2q0IFsag6OaIeD/LBNRuCxNTPa/WtTbKP1X3o50mDudN8FGwmD5h1sMJ/Bu5+mO/2NfrNAv9V9zUXn6lXXMA==", - "dev": true, "license": "MIT", "dependencies": { "@rtsao/csstype": "2.6.5-forked.0", @@ -7772,7 +8785,6 @@ "version": "7.1.5", "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz", "integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==", - "dev": true, "license": "ISC", "dependencies": { "kdbush": "^3.0.0" @@ -7782,7 +8794,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -7791,11 +8802,49 @@ "node": ">=8" } }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/systeminformation": { + "version": "5.31.12", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.12.tgz", + "integrity": "sha512-qnTtO5wHrKeKE/MvQ6iIt6XAV+5fgt/kPIQf27DYgjVQQuHUfWkV4Gu6k04ZpEzAMuyQ3ZsovY7Ivhp+E9JyWw==", + "license": "MIT", + "optional": true, + "os": [ + "darwin", + "linux", + "win32", + "freebsd", + "openbsd", + "netbsd", + "sunos", + "android" + ], + "bin": { + "systeminformation": "lib/cli.js" + }, + "engines": { + "node": ">=8.0.0" + }, + "funding": { + "type": "Buy me a coffee", + "url": "https://www.buymeacoffee.com/systeminfo" + } + }, "node_modules/tailwind-merge": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz", "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==", - "dev": true, "license": "MIT", "funding": { "type": "github", @@ -7966,7 +9015,6 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", - "dev": true, "license": "MIT" }, "node_modules/tiny-typed-emitter": { @@ -8027,7 +9075,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==", - "dev": true, "license": "ISC" }, "node_modules/tmp": { @@ -8054,7 +9101,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -8086,7 +9132,6 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true, "license": "0BSD" }, "node_modules/tunnel-agent": { @@ -8101,6 +9146,34 @@ "node": "*" } }, + "node_modules/tv4": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", + "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==", + "license": [ + { + "type": "Public Domain", + "url": "http://geraintluff.github.io/tv4/LICENSE.txt" + }, + { + "type": "MIT", + "url": "http://jsonary.com/LICENSE.txt" + } + ], + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/tx2": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tx2/-/tx2-1.0.5.tgz", + "integrity": "sha512-sJ24w0y03Md/bxzK4FU8J8JveYYUbSs2FViLJ2D/8bytSiyPRbuE3DyL/9UKYXTZlV3yXq0L8GLlhobTnekCVg==", + "license": "MIT", + "optional": true, + "dependencies": { + "json-stringify-safe": "^5.0.1" + } + }, "node_modules/type-fest": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", @@ -8187,7 +9260,6 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz", "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==", - "dev": true, "license": "MIT", "dependencies": { "tslib": "^2.0.0" @@ -8209,7 +9281,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz", "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==", - "dev": true, "license": "MIT", "dependencies": { "detect-node-es": "^1.1.0", @@ -8232,7 +9303,6 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz", "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==", - "dev": true, "license": "MIT", "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" @@ -8255,7 +9325,6 @@ "version": "37.3.6", "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-37.3.6.tgz", "integrity": "sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==", - "dev": true, "license": "MIT AND ISC", "dependencies": { "@types/d3-array": "^3.0.3", @@ -8279,17 +9348,39 @@ "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz", "integrity": "sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg==", "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, "license": "MIT", "dependencies": { "@math.gl/web-mercator": "^3.5.5" } }, + "node_modules/vizion": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/vizion/-/vizion-2.2.1.tgz", + "integrity": "sha512-sfAcO2yeSU0CSPFI/DmZp3FsFE9T+8913nv1xWBOyzODv13fwkn6Vl7HqxGpkr9F608M+8SuFId3s+BlZqfXww==", + "license": "Apache-2.0", + "dependencies": { + "async": "^2.6.3", + "git-node-fs": "^1.0.0", + "ini": "^1.3.5", + "js-git": "^0.7.8" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/vizion/node_modules/async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "license": "MIT", + "dependencies": { + "lodash": "^4.17.14" + } + }, "node_modules/vt-pbf": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz", "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==", - "dev": true, "license": "MIT", "dependencies": { "@mapbox/point-geometry": "0.1.0", @@ -8301,7 +9392,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.0.0" @@ -8406,7 +9496,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, "license": "ISC" }, "node_modules/yargs": { @@ -8450,6 +9539,71 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } + }, + "packages/cli": { + "name": "@musistudio/claude-code-router", + "version": "3.0.3", + "license": "MIT", + "dependencies": { + "@the-next-ai/ai-gateway": "^1.0.4", + "@the-next-ai/bot-gateway-sdk": "^0.1.0", + "better-sqlite3": "^12.11.1", + "node-forge": "^1.4.0", + "undici": "^7.27.2" + }, + "bin": { + "ccr": "dist/main/cli.js" + }, + "engines": { + "node": ">=22" + } + }, + "packages/core": { + "name": "@claude-code-router/core", + "version": "3.0.3", + "dependencies": { + "@the-next-ai/ai-gateway": "^1.0.4", + "@the-next-ai/bot-gateway-sdk": "^0.1.0", + "better-sqlite3": "^12.11.1", + "node-forge": "^1.4.0", + "pm2": "^6.0.13", + "undici": "^7.27.2" + }, + "bin": { + "ccr-core-server": "dist/main/server.js" + }, + "engines": { + "node": ">=22" + } + }, + "packages/electron": { + "name": "@claude-code-router/electron", + "version": "3.0.11", + "dependencies": { + "better-sqlite3": "^12.11.1" + }, + "devDependencies": { + "electron-updater": "^6.8.9" + } + }, + "packages/ui": { + "name": "@claude-code-router/ui", + "version": "3.0.11", + "dependencies": { + "@dnd-kit/core": "^6.3.1", + "@dnd-kit/sortable": "^10.0.0", + "@dnd-kit/utilities": "^3.2.2", + "baseui": "^16.1.1", + "clsx": "^2.1.1", + "lucide-react": "^1.17.0", + "motion": "^12.40.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "recharts": "^3.8.1", + "styletron-engine-atomic": "^1.6.2", + "styletron-react": "^6.1.1", + "tailwind-merge": "^3.6.0" + } } } } diff --git a/package.json b/package.json index 29a63fe..9b218e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { - "name": "claude-code-router", - "version": "3.0.7", + "name": "claude-code-router-monorepo", + "version": "3.0.11", + "private": true, "license": "MIT", "description": "Local Claude Code Router gateway with CLI and web management UI.", "repository": { @@ -18,15 +19,9 @@ "gateway", "router" ], - "main": "dist/main/main.js", - "bin": { - "ccr": "dist/main/cli.js" - }, - "files": [ - "dist", - "LICENSE", - "README.md", - "README_zh.md" + "main": "packages/electron/dist/main/main.js", + "workspaces": [ + "packages/*" ], "engines": { "node": ">=22" @@ -35,9 +30,13 @@ "access": "public" }, "scripts": { - "dev": "node build/dev.mjs", - "build": "npm run build:assets && electron-builder", + "dev": "npm run dev:cli", + "dev:ui": "node build/dev.mjs ui", + "dev:cli": "node build/dev.mjs cli", + "dev:electron": "node build/dev.mjs electron", + "build": "node build/build.mjs && electron-builder", "build:assets": "node build/build.mjs", + "build:docker": "node build/docker-build.mjs", "build:app:mac": "npm run build:app:mac:local", "build:app:mac:local": "npm run build:assets && electron-builder --config build/electron-builder.local.cjs --mac --publish never", "build:app:mac:release": "node build/macos-release-preflight.mjs && npm run build:assets && electron-builder --mac --publish never", @@ -45,24 +44,31 @@ "prepack": "npm run build:assets", "prepublishOnly": "npm run typecheck", "preview": "npm run build:assets && electron .", + "docker:build": "docker build -t claude-code-router:local .", + "docker:run": "docker run --rm -p 3458:8080 -v ccr-data:/data claude-code-router:local", "test": "node build/test.mjs && node build/run-tests.mjs", + "test:docker": "node tests/docker/docker-smoke.mjs", + "test:e2e": "npm run build:assets && playwright test", + "test:e2e:install": "playwright install chromium", "test:main": "node build/test.mjs main && node build/run-tests.mjs main", "test:renderer": "node build/test.mjs renderer && node build/run-tests.mjs renderer", "typecheck": "tsc --noEmit", "rebuild:sqlite3": "electron-rebuild -f -w better-sqlite3" }, "dependencies": { - "@the-next-ai/ai-gateway": "^1.0.4", + "@the-next-ai/ai-gateway": "^1.0.7", "@the-next-ai/bot-gateway-sdk": "^0.1.0", "better-sqlite3": "^12.11.1", "electron-updater": "^6.8.9", "node-forge": "^1.4.0", + "openai": "^6.27.0", "undici": "^7.27.2" }, "devDependencies": { "@dnd-kit/core": "^6.3.1", "@dnd-kit/sortable": "^10.0.0", "@dnd-kit/utilities": "^3.2.2", + "@playwright/test": "^1.61.1", "@tailwindcss/cli": "^4.3.0", "@types/better-sqlite3": "^7.6.13", "@types/node": "^22.10.2", diff --git a/packages/cli/LICENSE b/packages/cli/LICENSE new file mode 100644 index 0000000..ea7e8ac --- /dev/null +++ b/packages/cli/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 musistudio + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/packages/cli/README.md b/packages/cli/README.md new file mode 100644 index 0000000..17dc66b --- /dev/null +++ b/packages/cli/README.md @@ -0,0 +1,375 @@ +

      Claude Code Router Desktop

      + +

      + Chinese README + Discord + X + License + Documentation +

      + +
      + + + + + + + + +
      + + Kimi K2.7 Code sponsor banner + +
      + + Kimi Code Subscription +  ·  + API Global +  ·  + API China + +
      +

      + Thanks to Kimi for sponsoring this project! Kimi K2.7 Code is an open-source, coding-focused agentic model developed by Moonshot AI, with substantial gains on real-world long-horizon coding tasks and higher end-to-end success across complex software engineering workflows. It also cuts thinking-token usage by approximately 30% compared with K2.6. Inside CCR, Kimi ships as built-in provider presets: import the pay-as-you-go API or the Kimi Code subscription in one click and route your coding agent's requests to Kimi, the subscription endpoint passes straight through natively with no protocol conversion, API endpoints are adapted automatically, and your balance and subscription usage show up right in the CCR dashboard. +

      +

      + CCR already supports Kimi. Visit the Kimi Open Platform (中文站 | Global) to try the API, or explore the cost-effective Coding Plan. +

      +
      + +
      + +Claude Code Router Desktop is a local gateway and desktop control panel for routing agent requests from Claude Code, Codex, ZCode, and compatible clients to the model provider you actually want to use. + +

      + Claude Code Router Desktop screenshot +

      + +## Why Use CCR + +- Use one local endpoint for multiple agent tools instead of configuring every client separately. +- Route requests with default routing, conditional rules, fallback targets, and request rewrites instead of editing client configuration by hand. +- Mix providers without changing your workflow. CCR supports OpenAI-compatible APIs, Anthropic Messages, Gemini Generate Content, OpenRouter, DeepSeek, SiliconFlow, Moonshot, Kimi Code, Mistral, Z.AI, Bailian, and custom providers. +- Control cost and reliability with fallback routing, API key rotation, usage statistics, and request logs. + +## Features + +- **Overview dashboard**: inspect system status, usage widgets, account balances, model distribution, and share cards. +- **Provider management**: add provider presets or custom endpoints, probe protocol support, test model connectivity, manage credentials, and monitor supported account balances where available. +- **Routing rules**: configure default routing, conditional and model-prefix rules, fallback handling, and request rewrites. +- **Agent Config**: configure Claude Code, Codex, and ZCode launch entries, models, scopes, and multi-instance app profiles. +- **Gateway compatibility**: translate supported client requests through the local CCR model gateway. +- **Proxy mode**: capture supported API traffic through a local proxy with optional system proxy integration and network capture. +- **Fusion models**: combine a base model with vision, web search, or MCP tools into a reusable selectable model. + +## Documentation + +Read the full documentation at [ccrdesk.top](https://ccrdesk.top/). + +## Download And Install + +1. Open the [GitHub Releases page](https://github.com/musistudio/claude-code-router/releases). +2. Download the package for your platform: + - macOS Apple Silicon: `Claude-Code-Router_-mac-Apple-Silicon-arm64.dmg` or `.zip` + - macOS Intel: `Claude-Code-Router_-mac-Intel-x64.dmg` or `.zip` + - Windows: `Claude Code Router_.exe` + - Linux: `Claude Code Router_.AppImage` +3. Install and launch **Claude Code Router**. +4. On first launch, CCR creates its local configuration database: + - macOS/Linux: `~/.claude-code-router/config.sqlite` + - Windows: `%APPDATA%\Claude Code Router\config.sqlite` + +CCR stores runtime configuration in SQLite. A legacy `config.json` is read only once for migration when no SQLite config exists. + +After the service is started from the **Server** page, CCR listens on `http://localhost:8080` by default. The **Server** page controls the gateway `Host`, `Port`, proxy mode, system proxy, network capture, and CA certificate status. + +## Quick Start + +CCR can be configured entirely from the desktop UI. Use this setup order for a clean first run. + +### 1. Add a provider + +Open **Providers**, click **Add Provider**, then choose a built-in preset or **Other / custom API endpoint**. Fill in the provider name, base URL, protocol, API key, and model list. Run protocol probing and model connectivity checks when available, then save the provider. + +### 2. Configure routing + +Open **Routing** to add conditional rules, configure request rewrites, and set fallback behavior. + +Use **Add Routing Rule** for request conditions, model-prefix routing, or rule-level fallback targets. + +### 3. Start the gateway + +Open **Server** and click **Start**. After the page shows Running, CCR listens on `http://localhost:8080`. Enable **Auto start** if you want CCR to start the local gateway whenever the desktop app opens. + +### 4. Connect your agent tool + +Open **Agent Config** and choose the client you want to use. Configure Claude Code, Codex, or ZCode, select the target model and effect scope, then apply the config. For app entries, use the **Open Agent** action to open the target app through CCR. + +### 5. Monitor and adjust + +Use **Settings → Logs & Observability** to enable request logs and agent observability. Use **Logs** to confirm `request model`, `resolved provider`, `resolved model`, status, tokens, latency, and errors; use the tray window for quick token and account status. + +## Acknowledgements + +Codex support is powered by [musistudio/codexl](https://github.com/musistudio/codexl). + +## Support & Sponsoring + +
      + +

      If you find this project helpful, please consider sponsoring its development. Your support is greatly appreciated.

      + + + + + + +
      + + Support on Ko-fi + +
      + One-time support via Ko-fi +       		+ + Sponsor with PayPal + +
      + International sponsorship +
      + + + + + + +
      + Alipay +
      + Alipay QR code +       		+ WeChat Pay +
      + WeChat Pay QR code +
      + +
      + +### Our Sponsors + +
      + +

      A huge thank you to all our sponsors for their generous support.

      + + + + + + + + + + + + + + +
      + + Zhipu icon +
      + Z智谱 +       +       		+ + AIHubmix icon +
      + AIHubmix +       +       		+ + BurnCloud icon +
      + BurnCloud +       +       		+ + 302.AI icon +
      + 302.AI +       +
      + + RunAPI icon +
      + RunAPI +       +       		+ + TeamoRouter icon +
      + TeamoRouter +       +       		+ + Qiniu Cloud AI icon +
      + Qiniu Cloud AI +       +       		+ + Fenno.ai icon +
      + Fenno.ai +       +
      + +

      Community Sponsors

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      @Simon Leischnig@duanshuaimin@vrgitadmin@*o@ceilwoo@*说
      @*更@K*g@R*R@bobleer@*苗@*划
      @Clarence-pan@carter003@S*r@*晖@*敏@Z*z
      @*然@cluic@*苗@PromptExpert@*应@yusnake
      @*飞@董*@*汀@*涯@*:-）@**磊
      @*琢@*成@Z*o@*琨@congzhangzh@*_
      @Z*m@*鑫@c*y@*昕@witsice@b*g
      @*亿@*辉@JACK@*光@W*l@kesku
      @biguncle@二吉吉@a*g@*林@*咸@*明
      @S*y@f*o@*智@F*t@r*c@qierkang
      @*军@snrise-z@*王@greatheart1000@*王@zcutlip
      @Peng-YM@*更@*.@F*t@*政@*铭
      @*叶@七*o@*青@**晨@*远@*霄
      @**吉@**飞@**驰@x*g@**东@*落
      @哆*k@*涛@苗大@*呢@d*u@crizcraig
      s*s*火*勤**锟*涛**明
      *知*语*瓜
      + +If your name is masked, please contact me via my homepage email to update it with your GitHub username. + +
      + +## License + +This project is licensed under the [MIT License](LICENSE). diff --git a/packages/cli/README_zh.md b/packages/cli/README_zh.md new file mode 100644 index 0000000..58c4fef --- /dev/null +++ b/packages/cli/README_zh.md @@ -0,0 +1,374 @@ +

      Claude Code Router Desktop

      + +

      + English README + Discord + X + License + 文档 +

      + +
      + + + + + + + + +
      + + Kimi K2.7 Code 赞助横幅 + +
      + + Kimi Code 订阅 +  ·  + API 中文站 +  ·  + API Global + +
      +

      + 感谢 Kimi 赞助本项目！Kimi K2.7 Code 是 Moonshot AI 推出的编程专用开源智能体模型，在真实长程编程与复杂软件工程工作流中显著提升端到端任务成功率，同时优化推理效率，相比 K2.6 平均减少约 30% 的推理 token 消耗。在 CCR 中，Kimi 已作为内置供应商预设开箱即用：无论按量付费 API 还是 Kimi Code 订阅，一键导入即可把你的编程 Agent 请求路由到 Kimi，订阅端点原生直通、无需协议转换，API 端点自动适配，账户余额与订阅用量也能直接在 CCR 面板中查看。 +

      +

      + CCR 已内置 Kimi 供应商预设。前往 Kimi 开放平台（中文站｜Global）体验 API，或了解高性价比 Coding Plan 套餐。 +

      +
      + +
      + +Claude Code Router Desktop 是一个本地网关和桌面控制台，用来把 Claude Code、Codex、ZCode 以及兼容客户端的 Agent 请求路由到你真正想使用的模型服务。 + +

      + Claude Code Router Desktop 项目截图 +

      + +## 为什么使用 CCR + +- 用一个本地入口连接多个 Agent 工具，不需要在每个客户端里重复配置 Provider。 +- 在不改变工作流的情况下混用不同 Provider。CCR 支持 OpenAI 兼容 API、Anthropic Messages、Gemini Generate Content、OpenRouter、DeepSeek、SiliconFlow、Moonshot、Kimi Code、Mistral、Z.AI、百炼以及自定义 Provider。 +- 通过 fallback 路由、API Key 轮换、用量统计和请求日志来控制成本和可靠性。 + +## 功能和特性 + +- **概览仪表盘**：查看系统状态、用量组件、账号余额、模型分布和分享卡片。 +- **Provider 管理**：添加预设或自定义端点，探测协议支持，检测模型连通性，管理凭据，并在可用时查看账号余额。 +- **路由规则**：配置条件路由、模型前缀规则、失败降级和请求改写。 +- **Agent配置**：为 Claude Code、Codex 和 ZCode 配置启动入口、模型、作用范围和多开 App 配置。 +- **网关兼容层**：通过本地 CCR 模型网关转换支持的客户端请求。 +- **代理模式**：通过本地代理捕获支持的 API 流量，可选系统代理和网络捕获。 +- **Fusion 组合模型**：把基础模型与视觉、联网搜索或 MCP 工具组合成新的可选模型。 + +## 文档 + +完整文档见 [ccrdesk.top](https://ccrdesk.top/)。 + +## 下载和安装 + +1. 打开 [GitHub Releases 页面](https://github.com/musistudio/claude-code-router/releases)。 +2. 按系统下载对应安装包： + - macOS Apple 芯片：`Claude-Code-Router_-mac-Apple-Silicon-arm64.dmg` 或 `.zip` + - macOS Intel 芯片：`Claude-Code-Router_-mac-Intel-x64.dmg` 或 `.zip` + - Windows：`Claude Code Router_.exe` + - Linux：`Claude Code Router_.AppImage` +3. 安装并启动 **Claude Code Router**。 +4. 首次启动后，CCR 会创建本地配置数据库： + - macOS/Linux：`~/.claude-code-router/config.sqlite` + - Windows：`%APPDATA%\Claude Code Router\config.sqlite` + +CCR 的运行配置存储在 SQLite 中。旧版 `config.json` 只会在没有 SQLite 配置时作为迁移来源读取一次。 + +从 **服务** 页面启动后，CCR 默认监听 `http://localhost:8080`。**服务** 页面负责配置网关 `Host`、`Port`、代理模式、系统代理、网络捕获和 CA 证书状态。 + +## 快速开始 + +CCR 可以完全通过桌面 UI 完成配置。首次使用建议按下面顺序操作。 + +### 1. 添加 Provider + +打开 **供应商**，点击 **添加供应商**，选择内置预设或 **其他 / 自定义 API 端点**。按表单填写 Provider 名称、基础 URL、协议、API Key 和模型列表。可用时先运行协议探测和模型连通性检查，然后保存 Provider。 + +### 2. 设置路由 + +打开 **路由**，添加条件规则，配置请求改写和失败降级。 + +如果需要更细粒度控制，使用 **添加路由规则** 添加模型前缀、请求条件或规则级失败降级目标。 + +### 3. 启动网关 + +打开 **服务**，点击 **启动**。页面显示运行中后，CCR 会在本机监听 `http://localhost:8080`。如果希望每次打开桌面应用时自动启动网关，可以启用自动启动。 + +### 4. 连接 Agent 工具 + +打开 **Agent配置**，选择要使用的客户端。配置 Claude Code、Codex 或 ZCode，选择目标模型和作用范围，然后应用配置。对于 App 入口，可以使用 **打开 Agent** 操作通过 CCR 打开目标应用。 + +### 5. 日常查看和调整 + +到 **设置 → 日志与观测** 打开请求日志和 Agent 观测。使用 **日志** 确认 `request model`、`resolved provider`、`resolved model`、状态码、tokens、耗时和错误；使用托盘窗口快速查看 Token 和账号状态。 + +## 致谢 + +对 Codex 的支持来自于 [musistudio/codexl](https://github.com/musistudio/codexl) 这个项目。 + +## 支持与赞助 + +
      + +

      如果你觉得这个项目有帮助，欢迎赞助项目开发。非常感谢你的支持。

      + + + + + + +
      + + 通过 Ko-fi 赞助 + +
      + 通过 Ko-fi 单次赞助 +       		+ + 通过 PayPal 赞助 + +
      + 国际赞助通道 +
      + + + + + + +
      + 支付宝 +
      + 支付宝收款码 +       		+ 微信支付 +
      + 微信支付收款码 +
      + +
      + +### 我们的赞助商 + +
      + +

      非常感谢所有赞助商的慷慨支持。

      + + + + + + + + + + + + + + +
      + + 智谱图标 +
      + Z智谱 +       +       		+ + AIHubmix 图标 +
      + AIHubmix +       +       		+ + BurnCloud 图标 +
      + BurnCloud +       +       		+ + 302.AI 图标 +
      + 302.AI +       +
      + + RunAPI 图标 +
      + RunAPI +       +       		+ + TeamoRouter 图标 +
      + TeamoRouter +       +       		+ + 七牛云 AI 图标 +
      + 七牛云 AI +       +       		+ + Fenno.ai 图标 +
      + Fenno.ai +       +
      + +

      社区赞助者

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      @Simon Leischnig@duanshuaimin@vrgitadmin@*o@ceilwoo@*说
      @*更@K*g@R*R@bobleer@*苗@*划
      @Clarence-pan@carter003@S*r@*晖@*敏@Z*z
      @*然@cluic@*苗@PromptExpert@*应@yusnake
      @*飞@董*@*汀@*涯@*:-）@**磊
      @*琢@*成@Z*o@*琨@congzhangzh@*_
      @Z*m@*鑫@c*y@*昕@witsice@b*g
      @*亿@*辉@JACK@*光@W*l@kesku
      @biguncle@二吉吉@a*g@*林@*咸@*明
      @S*y@f*o@*智@F*t@r*c@qierkang
      @*军@snrise-z@*王@greatheart1000@*王@zcutlip
      @Peng-YM@*更@*.@F*t@*政@*铭
      @*叶@七*o@*青@**晨@*远@*霄
      @**吉@**飞@**驰@x*g@**东@*落
      @哆*k@*涛@苗大@*呢@d*u@crizcraig
      s*s*火*勤**锟*涛**明
      *知*语*瓜
      + +如果你的名字被打码，请通过我的主页邮箱联系我更新为 GitHub 用户名。 + +
      + +## 许可证 + +本项目基于 [MIT License](LICENSE) 发布。 diff --git a/packages/cli/package.json b/packages/cli/package.json new file mode 100644 index 0000000..ef8d921 --- /dev/null +++ b/packages/cli/package.json @@ -0,0 +1,48 @@ +{ + "name": "@musistudio/claude-code-router", + "version": "3.0.3", + "license": "MIT", + "description": "Local Claude Code Router gateway with CLI and web management UI.", + "repository": { + "type": "git", + "url": "git+ssh://git@github.com/musistudio/claude-code-router.git" + }, + "bugs": { + "url": "https://github.com/musistudio/claude-code-router/issues" + }, + "homepage": "https://github.com/musistudio/claude-code-router#readme", + "keywords": [ + "claude-code", + "codex", + "llm", + "gateway", + "router" + ], + "main": "dist/main/cli.js", + "bin": { + "ccr": "dist/main/cli.js" + }, + "files": [ + "dist", + "LICENSE", + "README.md", + "README_zh.md" + ], + "engines": { + "node": ">=22" + }, + "publishConfig": { + "access": "public" + }, + "scripts": { + "prepack": "npm --prefix ../.. run build:assets", + "prepublishOnly": "npm --prefix ../.. run typecheck" + }, + "dependencies": { + "@the-next-ai/ai-gateway": "^1.0.4", + "@the-next-ai/bot-gateway-sdk": "^0.1.0", + "better-sqlite3": "^12.11.1", + "node-forge": "^1.4.0", + "undici": "^7.27.2" + } +} diff --git a/src/main/cli.ts b/packages/cli/src/cli.ts similarity index 65% rename from src/main/cli.ts rename to packages/cli/src/cli.ts index 8964d4f..fe66d04 100644 --- a/src/main/cli.ts +++ b/packages/cli/src/cli.ts @@ -1,18 +1,19 @@ #!/usr/bin/env node -import { spawn, spawnSync } from "node:child_process"; -import { accessSync, constants as fsConstants, existsSync, mkdirSync, readFileSync, statSync, unlinkSync, writeFileSync } from "node:fs"; +import { spawn } from "node:child_process"; +import { randomBytes } from "node:crypto"; +import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs"; import path from "node:path"; -import { assertAvailableGatewayModels, type ProfileConfig, type ProfileOpenSurface } from "../shared/app"; -import { botGatewayProfileEnv } from "./bot-gateway-env"; -import { applyClaudeAppGatewayConfig } from "./claude-app-gateway-service"; -import { launchClaudeAppProfile, resolveClaudeAppProfileUserDataDir } from "./claude-app-launch"; -import { launchCodexAppProfile, launchZcodeAppProfile } from "./codex-app-launch"; -import { loadAppConfig } from "./config"; -import { CONFIGDIR } from "./constants"; -import { applyProfileConfig, applyProfileRuntimeConfig } from "./profile-service"; -import { ensureProfileGateway } from "./profile-launch-service"; -import { buildProfileLaunchPlan, defaultProfileOpenSurface, findProfileForOpen, profileLaunchSpawnCommand, resolveProfileOpenSurface } from "./profile-launch-core"; -import { startWebManagementServer } from "./web-management-server"; +import { botGatewayProfileEnv } from "@ccr/core/agents/bot-gateway/env"; +import { applyClaudeAppGatewayConfig } from "@ccr/core/agents/claude-app/gateway-service"; +import { launchClaudeAppProfile, resolveClaudeAppProfileUserDataDir } from "@ccr/core/agents/claude-app/launch"; +import { codexDesktopAppName, launchCodexAppProfile, launchZcodeAppProfile } from "@ccr/core/agents/codex/app-launch"; +import { loadAppConfig } from "@ccr/core/config/config"; +import { CONFIGDIR } from "@ccr/core/config/constants"; +import { applyProfileConfig, applyProfileRuntimeConfig } from "@ccr/core/profiles/service"; +import { ensureProfileGateway } from "@ccr/core/profiles/launch-service"; +import { buildProfileLaunchPlan, defaultProfileOpenSurface, findProfileForOpen, profileLaunchSpawnCommand, resolveProfileOpenSurface } from "@ccr/core/profiles/launch-core"; +import { openSystemExternal, startWebManagementServer } from "@ccr/core/web/management-server"; +import { assertAvailableGatewayModels, type ProfileConfig, type ProfileOpenSurface } from "@ccr/core/contracts/app"; type ProfileCliOptions = { agentArgs: string[]; @@ -23,7 +24,7 @@ type ProfileCliOptions = { }; type WebCliOptions = { - command: "start" | "web"; + command: "start" | "ui" | "web"; daemonChild: boolean; help: boolean; host?: string; @@ -42,22 +43,22 @@ type CliOptions = ProfileCliOptions | StopCliOptions | WebCliOptions; type ServiceState = { host?: string; pid: number; + serviceToken?: string; startedAt: string; startGateway: boolean; url: string; }; const serviceStateFileName = "service.json"; +const serviceInstanceTokenEnv = "CCR_SERVICE_INSTANCE_TOKEN"; +const serviceRpcTimeoutMs = 2_000; const serviceStartTimeoutMs = 30_000; const serviceStopTimeoutMs = 10_000; +const webAuthHeader = "x-ccr-web-auth"; +const webAuthQueryParam = "ccr_web_token"; +const defaultCliCommandName = "ccr"; async function main(): Promise { - const delegatedExitCode = delegateManagedDesktopCliToExternalCli(); - if (delegatedExitCode !== undefined) { - process.exitCode = delegatedExitCode; - return; - } - const options = parseArgs(process.argv.slice(2)); if (options.command === "start") { if (options.help) { @@ -67,6 +68,14 @@ async function main(): Promise { await startService(options); return; } + if (options.command === "ui") { + if (options.help) { + printUiHelp(0); + return; + } + await openManagementUi(options); + return; + } if (options.command === "stop") { if (options.help) { printStopHelp(0); @@ -141,9 +150,9 @@ async function main(): Promise { const launch = launchCodexAppProfile(configDir, profile, launchConfig); const spawnError = await waitForImmediateSpawnError(launch.child, 500); if (spawnError) { - throw new Error(`Failed to open Codex App: ${spawnError}`); + throw new Error(`Failed to open ${codexDesktopAppName}: ${spawnError}`); } - process.stdout.write(`Opened Codex App with ${profile.name || profile.id}.\n`); + process.stdout.write(`Opened ${codexDesktopAppName} with ${profile.name || profile.id}.\n`); } return; } @@ -175,6 +184,9 @@ function parseArgs(args: string[]): CliOptions { if (args[0] === "start") { return parseWebArgs(args.slice(1), "start"); } + if (args[0] === "ui") { + return parseWebArgs(args.slice(1), "ui", true); + } if (args[0] === "stop") { return parseStopArgs(args.slice(1)); } @@ -226,7 +238,7 @@ function profileAppName(profile: Pick): string { if (profile.agent === "zcode") { return "ZCode App"; } - return "Codex App"; + return codexDesktopAppName; } function parseStopArgs(args: string[]): StopCliOptions { @@ -244,12 +256,12 @@ function parseStopArgs(args: string[]): StopCliOptions { return options; } -function parseWebArgs(args: string[], command: WebCliOptions["command"]): WebCliOptions { +function parseWebArgs(args: string[], command: WebCliOptions["command"], defaultOpen = false): WebCliOptions { const options: WebCliOptions = { command, daemonChild: false, help: false, - open: false, + open: defaultOpen, startGateway: true }; for (let index = 0; index < args.length; index += 1) { @@ -303,24 +315,31 @@ function parseWebArgs(args: string[], command: WebCliOptions["command"]): WebCli async function startService(options: WebCliOptions): Promise { const current = readServiceState(); - if (current && isProcessRunning(current.pid)) { + const currentVerification = current ? await verifyServiceState(current) : undefined; + if (current && currentVerification?.ok) { process.stdout.write(`CCR service is already running at ${current.url} (pid ${current.pid}).\n`); + if (options.open) { + await openManagementUrl(current.url); + } return; } - clearServiceState(); + if (current) { + clearServiceState(current.pid); + } + const serviceToken = generateServiceToken(); const childArgs = [ currentCliScript(), "serve", "--daemon-child", ...(options.host ? ["--host", options.host] : []), ...(options.port ? ["--port", String(options.port)] : []), - ...(options.open ? ["--open"] : ["--no-open"]), + "--no-open", ...(options.startGateway ? [] : ["--no-gateway"]) ]; const child = spawn(process.execPath, childArgs, { detached: true, - env: serviceChildEnv(), + env: serviceChildEnv(serviceToken), stdio: "ignore", windowsHide: true }); @@ -335,10 +354,31 @@ async function startService(options: WebCliOptions): Promise { throw new Error(`CCR service did not report ready within ${serviceStartTimeoutMs}ms.`); } process.stdout.write(`CCR service started at ${state.url} (pid ${state.pid}).\n`); + if (options.open) { + await openManagementUrl(state.url); + } } -function serviceChildEnv(): NodeJS.ProcessEnv { +async function openManagementUi(options: WebCliOptions): Promise { + await startService({ + ...options, + command: "start" + }); +} + +async function openManagementUrl(url: string): Promise { + try { + await openSystemExternal(url); + process.stdout.write(`Opened CCR management UI at ${url}\n`); + } catch (error) { + process.stderr.write(`Failed to open browser: ${formatError(error)}\n`); + process.stdout.write(`CCR management UI is available at ${url}\n`); + } +} + +function serviceChildEnv(serviceToken: string): NodeJS.ProcessEnv { const env = { ...process.env }; + env[serviceInstanceTokenEnv] = serviceToken; if (process.versions.electron) { env.ELECTRON_RUN_AS_NODE = "1"; } else { @@ -355,9 +395,11 @@ async function runWebServer(options: WebCliOptions): Promise { startGateway: options.startGateway }); if (options.daemonChild) { + const serviceToken = process.env[serviceInstanceTokenEnv]?.trim() || undefined; writeServiceState({ host: options.host, pid: process.pid, + ...(serviceToken ? { serviceToken } : {}), startedAt: new Date().toISOString(), startGateway: options.startGateway, url: runtime.url @@ -389,33 +431,40 @@ async function stopService(): Promise { process.stdout.write("CCR service is not running.\n"); return; } - if (!isProcessRunning(state.pid)) { + const verification = await verifyServiceState(state); + if (!verification.ok) { clearServiceState(state.pid); process.stdout.write("CCR service is not running.\n"); return; } - process.kill(state.pid, "SIGTERM"); - const stopped = await waitForProcessExit(state.pid, serviceStopTimeoutMs); - if (!stopped && isProcessRunning(state.pid)) { - throw new Error(`CCR service pid ${state.pid} did not stop within ${serviceStopTimeoutMs}ms.`); + + await callServiceRpc(state, "quitApp"); + const stopped = verification.trustedPid + ? await waitForProcessExit(state.pid, serviceStopTimeoutMs) + : await waitForServiceUnavailable(state, serviceStopTimeoutMs); + if (!stopped) { + throw new Error(`CCR service did not stop within ${serviceStopTimeoutMs}ms.`); } clearServiceState(state.pid); process.stdout.write("CCR service stopped.\n"); } function printHelp(exitCode: number): void { + const command = cliCommandName(); const output = [ "Usage:", - " ccr start [--host ] [--port ] [--open] [--no-gateway]", - " ccr stop", - " ccr [cli|app] [-- ]", + ` ${command} start [--host ] [--port ] [--open] [--no-gateway]`, + ` ${command} ui [--host ] [--port ] [--no-gateway]`, + ` ${command} stop`, + ` ${command} [cli|app] [-- ]`, "", "Examples:", - " ccr start", - " ccr stop", - " ccr Codex", - " ccr default-codex -- --model gpt-5-codex", - " ccr default-codex app" + ` ${command} start`, + ` ${command} ui`, + ` ${command} stop`, + ` ${command} Codex`, + ` ${command} default-codex -- --model gpt-5-codex`, + ` ${command} default-codex app` ].join("\n"); const stream = exitCode === 0 ? process.stdout : process.stderr; stream.write(`${output}\n`); @@ -423,16 +472,42 @@ function printHelp(exitCode: number): void { } function printStartHelp(exitCode: number): void { + const command = cliCommandName(); const output = [ "Usage:", - " ccr start [--host ] [--port ] [--open] [--no-gateway]", + ` ${command} start [--host ] [--port ] [--open] [--no-gateway]`, "", "Options:", " --host Management server host. Defaults to 127.0.0.1.", " --port Management server port. Defaults to 3458.", " --open Open the management page in the default browser.", " --no-open Do not open the management page.", - " --no-gateway Start only the web management server." + " --no-gateway Start only the web management server.", + "", + "Environment:", + " CCR_WEB_AUTH_TOKEN Use this token for management UI and RPC authentication." + ].join("\n"); + const stream = exitCode === 0 ? process.stdout : process.stderr; + stream.write(`${output}\n`); + process.exitCode = exitCode; +} + +function printUiHelp(exitCode: number): void { + const command = cliCommandName(); + const output = [ + "Usage:", + ` ${command} ui [--host ] [--port ] [--no-gateway]`, + "", + "Starts the background CCR service if needed and opens the management UI in the default browser.", + "", + "Options:", + " --host Management server host. Defaults to 127.0.0.1.", + " --port Management server port. Defaults to 3458.", + " --no-open Start or find the service and print the management URL without opening a browser.", + " --no-gateway Start only the web management server when the service is not already running.", + "", + "Environment:", + " CCR_WEB_AUTH_TOKEN Use this token for management UI and RPC authentication." ].join("\n"); const stream = exitCode === 0 ? process.stdout : process.stderr; stream.write(`${output}\n`); @@ -440,11 +515,12 @@ function printStartHelp(exitCode: number): void { } function printStopHelp(exitCode: number): void { + const command = cliCommandName(); const output = [ "Usage:", - " ccr stop", + ` ${command} stop`, "", - "Stops the background CCR service started by `ccr start`." + `Stops the background CCR service started by \`${command} start\`.` ].join("\n"); const stream = exitCode === 0 ? process.stdout : process.stderr; stream.write(`${output}\n`); @@ -452,21 +528,32 @@ function printStopHelp(exitCode: number): void { } function printWebHelp(exitCode: number): void { + const command = cliCommandName(); const output = [ "Usage:", - " ccr serve [--host ] [--port ] [--open] [--no-gateway]", + ` ${command} serve [--host ] [--port ] [--open] [--no-gateway]`, "", "Options:", " --host Management server host. Defaults to 127.0.0.1.", " --port Management server port. Defaults to 3458.", " --open Open the management page in the default browser.", - " --no-gateway Start only the web management server." + " --no-gateway Start only the web management server.", + "", + "Environment:", + " CCR_WEB_AUTH_TOKEN Use this token for management UI and RPC authentication." ].join("\n"); const stream = exitCode === 0 ? process.stdout : process.stderr; stream.write(`${output}\n`); process.exitCode = exitCode; } +function cliCommandName(): string { + const configured = process.env.CCR_CLI_COMMAND_NAME?.trim(); + return configured && /^[A-Za-z0-9._-]+$/.test(configured) + ? configured + : defaultCliCommandName; +} + function readServiceState(): ServiceState | undefined { const file = serviceStateFile(); if (!existsSync(file)) { @@ -481,6 +568,7 @@ function readServiceState(): ServiceState | undefined { return { host: parsed.host, pid, + serviceToken: typeof parsed.serviceToken === "string" && parsed.serviceToken.trim() ? parsed.serviceToken.trim() : undefined, startedAt: parsed.startedAt || "", startGateway: parsed.startGateway !== false, url: parsed.url @@ -516,99 +604,11 @@ function currentCliScript(): string { return __filename; } -function delegateManagedDesktopCliToExternalCli(): number | undefined { - if (!isManagedDesktopCliRuntime()) { - return undefined; - } - if (process.env.CCR_MANAGED_CLI_NO_DELEGATE === "1" || process.env.CCR_MANAGED_CLI_DELEGATED === "1") { - return undefined; - } - - const externalCcr = findExternalCcrCommand(); - if (!externalCcr) { - return undefined; - } - - const launch = profileLaunchSpawnCommand({ - args: process.argv.slice(2), - command: externalCcr - }); - const result = spawnSync(launch.command, launch.args, { - env: { - ...process.env, - CCR_MANAGED_CLI_DELEGATED: "1" - }, - stdio: "inherit", - windowsVerbatimArguments: !!launch.windowsVerbatimArguments - }); - if (result.error) { - return undefined; - } - if (typeof result.status === "number") { - return result.status; - } - return result.signal === "SIGINT" ? 130 : 1; -} - -function isManagedDesktopCliRuntime(): boolean { - const script = process.argv[1] || __filename; - return samePath(path.resolve(script), path.join(CONFIGDIR, "bin", "ccr-cli.js")); -} - -function findExternalCcrCommand(): string | undefined { - const pathKey = process.platform === "win32" - ? Object.keys(process.env).find((key) => key.toLowerCase() === "path") || "Path" - : "PATH"; - const pathValue = process.env[pathKey] || ""; - const managedBinDir = path.resolve(CONFIGDIR, "bin"); - const names = process.platform === "win32" - ? ["ccr.cmd", "ccr.exe", "ccr.bat", "ccr"] - : ["ccr"]; - - for (const rawSegment of pathValue.split(path.delimiter)) { - const dir = path.resolve(rawSegment || "."); - if (samePath(dir, managedBinDir)) { - continue; - } - for (const name of names) { - const candidate = path.join(dir, name); - if (isExecutableFile(candidate)) { - return candidate; - } - } - } - return undefined; -} - -function isExecutableFile(file: string): boolean { - try { - const stats = statSync(file); - if (!stats.isFile() && !stats.isSymbolicLink()) { - return false; - } - if (process.platform === "win32") { - return true; - } - accessSync(file, fsConstants.X_OK); - return true; - } catch { - return false; - } -} - -function samePath(left: string, right: string): boolean { - const normalizedLeft = path.normalize(left); - const normalizedRight = path.normalize(right); - return process.platform === "win32" - ? normalizedLeft.toLowerCase() === normalizedRight.toLowerCase() - : normalizedLeft === normalizedRight; -} - async function waitForServiceState(pid: number | undefined, timeoutMs: number): Promise { const startedAt = Date.now(); while (Date.now() - startedAt < timeoutMs) { const state = readServiceState(); - if (state && (!pid || state.pid === pid) && isProcessRunning(state.pid)) { + if (state && (!pid || state.pid === pid) && (await verifyServiceState(state)).ok) { return state; } await delay(150); @@ -640,6 +640,98 @@ function isProcessRunning(pid: number | undefined): boolean { } } +type ServiceStateVerification = + | { ok: true; trustedPid: boolean } + | { ok: false }; + +type ServiceIdentity = { + pid?: unknown; + serviceTokenConfigured?: unknown; + serviceTokenMatches?: unknown; +}; + +async function verifyServiceState(state: ServiceState): Promise { + if (!isProcessRunning(state.pid)) { + return { ok: false }; + } + + if (state.serviceToken) { + const identity = await callServiceRpc(state, "getServiceIdentity", [state.serviceToken]).catch(() => undefined); + if (identity?.serviceTokenMatches === true && Number(identity.pid) === state.pid) { + return { ok: true, trustedPid: true }; + } + return { ok: false }; + } + + const appInfo = await callServiceRpc<{ name?: unknown }>(state, "getAppInfo").catch(() => undefined); + return appInfo?.name === "Claude Code Router" + ? { ok: true, trustedPid: false } + : { ok: false }; +} + +async function waitForServiceUnavailable(state: ServiceState, timeoutMs: number): Promise { + const startedAt = Date.now(); + while (Date.now() - startedAt < timeoutMs) { + const appInfo = await callServiceRpc<{ name?: unknown }>(state, "getAppInfo").catch(() => undefined); + if (appInfo?.name !== "Claude Code Router") { + return true; + } + await delay(150); + } + const appInfo = await callServiceRpc<{ name?: unknown }>(state, "getAppInfo").catch(() => undefined); + return appInfo?.name !== "Claude Code Router"; +} + +async function callServiceRpc(state: ServiceState, method: string, args: unknown[] = []): Promise { + const endpoint = serviceRpcEndpoint(state.url); + const authToken = serviceAuthToken(state.url); + if (!endpoint || !authToken) { + throw new Error("CCR service state does not include a usable management URL."); + } + + const controller = new AbortController(); + const timer = setTimeout(() => controller.abort(), serviceRpcTimeoutMs); + try { + const response = await fetch(endpoint, { + body: JSON.stringify({ args, method }), + headers: { + "content-type": "application/json", + [webAuthHeader]: authToken + }, + method: "POST", + signal: controller.signal + }); + const payload = await response.json().catch(() => undefined) as { ok?: boolean; value?: T } | undefined; + if (!response.ok || !payload?.ok) { + throw new Error(`CCR service RPC ${method} failed with HTTP ${response.status}`); + } + return payload.value as T; + } finally { + clearTimeout(timer); + } +} + +function serviceRpcEndpoint(url: string): string | undefined { + try { + const parsed = new URL(url); + return `${parsed.origin}/api/ccr/rpc`; + } catch { + return undefined; + } +} + +function serviceAuthToken(url: string): string { + try { + return new URL(url).searchParams.get(webAuthQueryParam)?.trim() ?? ""; + } catch { + return ""; + } +} + +function generateServiceToken(): string { + return randomBytes(32).toString("base64url"); +} + function delay(ms: number): Promise { return new Promise((resolve) => setTimeout(resolve, ms)); } diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json new file mode 100644 index 0000000..1f70006 --- /dev/null +++ b/packages/cli/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "rootDir": "src" + }, + "include": ["src/**/*.ts", "src/**/*.d.ts"] +} diff --git a/models.json b/packages/core/models.json similarity index 100% rename from models.json rename to packages/core/models.json diff --git a/packages/core/package.json b/packages/core/package.json new file mode 100644 index 0000000..91f6862 --- /dev/null +++ b/packages/core/package.json @@ -0,0 +1,21 @@ +{ + "name": "@claude-code-router/core", + "version": "3.0.3", + "private": true, + "description": "Claude Code Router core gateway, routing, provider, and storage services.", + "main": "dist/main/server.js", + "bin": { + "ccr-core-server": "dist/main/server.js" + }, + "engines": { + "node": ">=22" + }, + "dependencies": { + "@the-next-ai/ai-gateway": "^1.0.4", + "@the-next-ai/bot-gateway-sdk": "^0.1.0", + "better-sqlite3": "^12.11.1", + "node-forge": "^1.4.0", + "pm2": "^6.0.13", + "undici": "^7.27.2" + } +} diff --git a/src/main/bot-gateway-env.ts b/packages/core/src/agents/bot-gateway/env.ts similarity index 92% rename from src/main/bot-gateway-env.ts rename to packages/core/src/agents/bot-gateway/env.ts index 524945b..1dd8e60 100644 --- a/src/main/bot-gateway-env.ts +++ b/packages/core/src/agents/bot-gateway/env.ts @@ -1,8 +1,9 @@ import os from "node:os"; import { createRequire } from "node:module"; +import { existsSync } from "node:fs"; import path from "node:path"; -import type { AppConfig, BotGatewayRuntimeConfig, ProfileConfig, ProfileOpenSurface } from "../shared/app"; -import { CONFIGDIR } from "./constants"; +import type { AppConfig, BotGatewayRuntimeConfig, ProfileConfig, ProfileOpenSurface } from "@ccr/core/contracts/app"; +import { CONFIGDIR } from "@ccr/core/config/constants"; const requireFromHere = createRequire(__filename); @@ -126,6 +127,11 @@ function botGatewaySdkEnv(): Record { } function resolveBotGatewaySdkModule(): string { + const bundled = resolveBundledBotGatewaySdkModule(); + if (bundled) { + return bundled; + } + try { return path.join(path.dirname(requireFromHere.resolve("@the-next-ai/bot-gateway-sdk/package.json")), "dist", "index.js"); } catch { @@ -133,6 +139,20 @@ function resolveBotGatewaySdkModule(): string { } } +function resolveBundledBotGatewaySdkModule(): string { + const resourcesPath = (process as NodeJS.Process & { resourcesPath?: string }).resourcesPath; + const candidates = [ + path.join(__dirname, "bot-gateway-sdk", "dist", "index.js"), + ...(resourcesPath + ? [ + path.join(resourcesPath, "app.asar", "dist", "main", "bot-gateway-sdk", "dist", "index.js"), + path.join(resourcesPath, "app", "dist", "main", "bot-gateway-sdk", "dist", "index.js") + ] + : []) + ]; + return candidates.find((candidate) => existsSync(candidate)) ?? ""; +} + function normalizeBotGatewayForWebSocket(bot: BotGatewayRuntimeConfig): BotGatewayRuntimeConfig { const platform = normalizeBotGatewayPlatform(bot.platform); return { diff --git a/src/main/bot-handoff-scan-service.ts b/packages/core/src/agents/bot-gateway/handoff-scan-service.ts similarity index 98% rename from src/main/bot-handoff-scan-service.ts rename to packages/core/src/agents/bot-gateway/handoff-scan-service.ts index 8522eb0..59712eb 100644 --- a/src/main/bot-handoff-scan-service.ts +++ b/packages/core/src/agents/bot-gateway/handoff-scan-service.ts @@ -1,7 +1,7 @@ import { execFile } from "node:child_process"; import { promisify } from "node:util"; -import type { BotHandoffScanTarget } from "../shared/app"; -import { windowsSystemCommand } from "./windows-system"; +import type { BotHandoffScanTarget } from "@ccr/core/contracts/app"; +import { windowsSystemCommand } from "@ccr/core/platform/windows-system"; const execFileAsync = promisify(execFile); diff --git a/src/main/bot-gateway-qr-login-service.ts b/packages/core/src/agents/bot-gateway/qr-login-service.ts similarity index 95% rename from src/main/bot-gateway-qr-login-service.ts rename to packages/core/src/agents/bot-gateway/qr-login-service.ts index b44edca..cf1f665 100644 --- a/src/main/bot-gateway-qr-login-service.ts +++ b/packages/core/src/agents/bot-gateway/qr-login-service.ts @@ -2,7 +2,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs"; import os from "node:os"; import path from "node:path"; import { pathToFileURL } from "node:url"; -import { CONFIGDIR } from "./constants"; +import { CONFIGDIR } from "@ccr/core/config/constants"; import type { BotGatewayQrLoginCancelRequest, BotGatewayQrLoginCancelResult, @@ -11,7 +11,7 @@ import type { BotGatewayQrLoginWaitRequest, BotGatewayQrLoginWaitResult, BotGatewayRuntimeConfig -} from "../shared/app"; +} from "@ccr/core/contracts/app"; type BotGatewayClientWithRequest = { close?: () => Promise | void; @@ -244,6 +244,7 @@ async function loadBotGatewaySdk(): Promise { async function importBotGatewaySdk(): Promise { const candidates = [ process.env.CCR_BOT_GATEWAY_SDK_MODULE, + resolveBundledBotGatewaySdkModule(), "@the-next-ai/bot-gateway-sdk" ].filter((value): value is string => Boolean(value?.trim())); const errors: string[] = []; @@ -261,6 +262,20 @@ async function importBotGatewaySdk(): Promise { throw new Error(`Unable to load @the-next-ai/bot-gateway-sdk. ${errors.join("; ")}`); } +function resolveBundledBotGatewaySdkModule(): string { + const resourcesPath = (process as NodeJS.Process & { resourcesPath?: string }).resourcesPath; + const candidates = [ + path.join(__dirname, "bot-gateway-sdk", "dist", "index.js"), + ...(resourcesPath + ? [ + path.join(resourcesPath, "app.asar", "dist", "main", "bot-gateway-sdk", "dist", "index.js"), + path.join(resourcesPath, "app", "dist", "main", "bot-gateway-sdk", "dist", "index.js") + ] + : []) + ]; + return candidates.find((candidate) => existsSync(candidate)) ?? ""; +} + function botGatewaySdkImportSpecifier(value: string): string { const trimmed = value.trim(); if (/^[a-zA-Z][a-zA-Z0-9+.-]*:/.test(trimmed)) { diff --git a/src/main/claude-app-cdp.ts b/packages/core/src/agents/claude-app/cdp.ts similarity index 100% rename from src/main/claude-app-cdp.ts rename to packages/core/src/agents/claude-app/cdp.ts diff --git a/src/shared/claude-app-gateway.ts b/packages/core/src/agents/claude-app/gateway-routes.ts similarity index 98% rename from src/shared/claude-app-gateway.ts rename to packages/core/src/agents/claude-app/gateway-routes.ts index c4127f7..3ccda7e 100644 --- a/src/shared/claude-app-gateway.ts +++ b/packages/core/src/agents/claude-app/gateway-routes.ts @@ -1,5 +1,5 @@ -import type { AppConfig } from "./app"; -import { normalizeProfileScopeValue } from "./app"; +import type { AppConfig } from "@ccr/core/contracts/app"; +import { normalizeProfileScopeValue } from "@ccr/core/contracts/app"; export const CLAUDE_APP_FALLBACK_MODEL = "claude-sonnet-4-5"; export const CLAUDE_APP_ONE_MILLION_CONTEXT_SUFFIX = "[1m]"; diff --git a/src/main/claude-app-gateway-service.ts b/packages/core/src/agents/claude-app/gateway-service.ts similarity index 97% rename from src/main/claude-app-gateway-service.ts rename to packages/core/src/agents/claude-app/gateway-service.ts index 89d1e35..58c7eff 100644 --- a/src/main/claude-app-gateway-service.ts +++ b/packages/core/src/agents/claude-app/gateway-service.ts @@ -2,16 +2,16 @@ import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } import os from "node:os"; import path from "node:path"; import { createHash, randomBytes, randomUUID } from "node:crypto"; -import { resolveRuntimeAppPath } from "./app-paths"; -import { saveAppConfig } from "./config"; -import { CONFIGDIR } from "./constants"; +import { resolveRuntimeAppPath } from "@ccr/core/runtime/app-paths"; +import { saveAppConfig } from "@ccr/core/config/config"; +import { CONFIGDIR } from "@ccr/core/config/constants"; import { buildClaudeAppGatewayInferenceModels, type ClaudeAppGatewayInferenceModel, type ClaudeAppGatewayModelRouteOptions -} from "../shared/claude-app-gateway"; -import { NO_AVAILABLE_GATEWAY_MODELS_MESSAGE, hasAvailableGatewayModels, type ApiKeyConfig, type AppConfig, type ClaudeAppGatewayApplyResult } from "../shared/app"; -import { findModelCatalogEntry } from "../server/gateway/model-catalog"; +} from "@ccr/core/agents/claude-app/gateway-routes"; +import { NO_AVAILABLE_GATEWAY_MODELS_MESSAGE, hasAvailableGatewayModels, type ApiKeyConfig, type AppConfig, type ClaudeAppGatewayApplyResult } from "@ccr/core/contracts/app"; +import { findModelCatalogEntry } from "@ccr/core/gateway/model-catalog"; const CLAUDE_APP_CONFIG_ID = "8f69f2f1-3275-4ad8-9317-4aa7e972f311"; const CLAUDE_APP_CONFIG_NAME = "Claude Code Router"; diff --git a/src/main/claude-app-launch.ts b/packages/core/src/agents/claude-app/launch.ts similarity index 82% rename from src/main/claude-app-launch.ts rename to packages/core/src/agents/claude-app/launch.ts index f4f6ce9..7969edf 100644 --- a/src/main/claude-app-launch.ts +++ b/packages/core/src/agents/claude-app/launch.ts @@ -2,12 +2,12 @@ import { spawn, type ChildProcess } from "node:child_process"; import { mkdirSync, readdirSync, readFileSync, statSync } from "node:fs"; import os from "node:os"; import path from "node:path"; -import type { AppConfig, ProfileConfig } from "../shared/app"; -import { botGatewayProfileEnv } from "./bot-gateway-env"; -import { prepareClaudeAppCdpUserDataDir, reserveClaudeAppCdpPort, scheduleClaudeAppDesignCdp } from "./claude-app-cdp"; -import { claudeCodeUtcTimezoneEnvOverride } from "./claude-environment"; -import { resolveClaudeCodeSettingsFile } from "./profile-launch-core"; -import { normalizeWindowsDesktopAppCandidate, windowsDesktopAppCandidates } from "./windows-app-discovery"; +import type { AppConfig, ProfileConfig } from "@ccr/core/contracts/app"; +import { botGatewayProfileEnv } from "@ccr/core/agents/bot-gateway/env"; +import { prepareClaudeAppCdpUserDataDir, reserveClaudeAppCdpPort, scheduleClaudeAppDesignCdp } from "@ccr/core/agents/claude-app/cdp"; +import { claudeCodeUtcTimezoneEnvOverride } from "@ccr/core/agents/claude-code/environment"; +import { resolveClaudeCodeSettingsFile } from "@ccr/core/profiles/launch-core"; +import { normalizeWindowsDesktopAppCandidate, windowsDesktopAppCandidates } from "@ccr/core/platform/windows-app-discovery"; type ClaudeAppLookupResult = { checked: string[]; @@ -36,8 +36,12 @@ const windowsClaudeExeNames = [ ]; const windowsClaudePackageKeywords = ["claude", "anthropic"]; +type ClaudeAppCandidateOptions = { + allowGenericExecutable?: boolean; +}; + export async function launchClaudeAppProfile(configDir: string, profile: ProfileConfig, config?: AppConfig): Promise { - const lookup = findInstalledClaudeAppExecutable(); + const lookup = findInstalledClaudeAppExecutable(profile.appPath); if (!lookup.executable) { throw new Error([ "Claude App was not found. Install Claude App or set CLAUDE_APP_PATH to its executable, then try again.", @@ -224,9 +228,14 @@ function claudeElectronUserDataDir(settingsDir: string, profile: ProfileConfig): ); } -function findInstalledClaudeAppExecutable(): ClaudeAppLookupResult { +export function findInstalledClaudeAppExecutable(profileAppPath?: string): ClaudeAppLookupResult { const checked: string[] = []; - const envCandidate = findFirstExecutable(envClaudeAppPathCandidates(), checked); + const profileCandidate = findFirstExecutable(profileClaudeAppPathCandidates(profileAppPath), checked, { allowGenericExecutable: true }); + if (profileCandidate) { + return { checked, executable: profileCandidate }; + } + + const envCandidate = findFirstExecutable(envClaudeAppPathCandidates(), checked, { allowGenericExecutable: true }); if (envCandidate) { return { checked, executable: envCandidate }; } @@ -240,13 +249,13 @@ function findInstalledClaudeAppExecutable(): ClaudeAppLookupResult { return { checked, executable: findFirstExecutable(linuxClaudeAppCandidates(), checked) }; } -function findFirstExecutable(candidates: string[], checked: string[]): string | undefined { +function findFirstExecutable(candidates: string[], checked: string[], options: ClaudeAppCandidateOptions = {}): string | undefined { for (const candidate of candidates) { if (!candidate || checked.includes(candidate)) { continue; } checked.push(candidate); - const executable = normalizeClaudeAppCandidate(candidate); + const executable = normalizeClaudeAppCandidate(candidate, options); if (executable) { return executable; } @@ -261,6 +270,11 @@ function envClaudeAppPathCandidates(): string[] { .map(resolveUserPath); } +function profileClaudeAppPathCandidates(value: string | undefined): string[] { + const trimmed = value?.trim() || ""; + return trimmed ? [resolveUserPath(trimmed)] : []; +} + function macClaudeAppCandidates(): string[] { const roots = [ "/Applications", @@ -289,13 +303,20 @@ function windowsClaudeAppCandidates(): string[] { function linuxClaudeAppCandidates(): string[] { return [ "/usr/bin/claude", + "/usr/bin/claude-desktop", "/usr/local/bin/claude", + "/usr/local/bin/claude-desktop", "/opt/Claude/claude", - "/opt/Claude/Claude" + "/opt/Claude/Claude", + "/opt/Claude Desktop/claude", + "/opt/Claude Desktop/Claude", + "/opt/Claude Desktop/claude-desktop", + "/opt/ClaudeDesktop/ClaudeDesktop", + "/opt/AnthropicClaude/AnthropicClaude" ]; } -function normalizeClaudeAppCandidate(candidate: string): string | undefined { +export function normalizeClaudeAppCandidate(candidate: string, options: ClaudeAppCandidateOptions = {}): string | undefined { if (process.platform === "darwin") { if (candidate.endsWith(".app")) { return executableFromMacAppBundle(candidate); @@ -303,9 +324,10 @@ function normalizeClaudeAppCandidate(candidate: string): string | undefined { return isFile(candidate) ? candidate : undefined; } if (process.platform === "win32") { - return normalizeWindowsClaudeAppCandidate(candidate); + const executable = normalizeWindowsClaudeAppCandidate(candidate); + return executable && isAllowedClaudeAppExecutable(executable, options) ? executable : undefined; } - return isFile(candidate) ? candidate : undefined; + return isFile(candidate) && isAllowedClaudeAppExecutable(candidate, options) ? candidate : undefined; } function executableFromMacAppBundle(appPath: string): string | undefined { @@ -358,6 +380,25 @@ function normalizeWindowsClaudeAppCandidate(candidate: string): string | undefin }); } +function isAllowedClaudeAppExecutable(executable: string, options: ClaudeAppCandidateOptions): boolean { + if (options.allowGenericExecutable || !isGenericClaudeExecutableName(executable)) { + return true; + } + return hasElectronDesktopAppResources(executable); +} + +function isGenericClaudeExecutableName(executable: string): boolean { + const name = path.basename(executable).toLowerCase(); + return name === "claude" || name === "claude.exe"; +} + +function hasElectronDesktopAppResources(executable: string): boolean { + const resourcesDir = path.join(path.dirname(executable), "resources"); + return isFile(path.join(resourcesDir, "app.asar")) || + isDirectory(path.join(resourcesDir, "app")) || + isDirectory(path.join(resourcesDir, "app.asar.unpacked")); +} + function profileEnv(profile: ProfileConfig): Record { return Object.entries(profile.env ?? {}).reduce>((result, [key, value]) => { if (isEnvName(key) && typeof value === "string") { diff --git a/src/main/claude-environment.ts b/packages/core/src/agents/claude-code/environment.ts similarity index 63% rename from src/main/claude-environment.ts rename to packages/core/src/agents/claude-code/environment.ts index 12a3f13..33ed526 100644 --- a/src/main/claude-environment.ts +++ b/packages/core/src/agents/claude-code/environment.ts @@ -1,3 +1,6 @@ +export const CLAUDE_CODE_MCP_CONFIG_ENV = "CCR_CLAUDE_CODE_MCP_CONFIG"; +export const CODEXL_CLAUDE_CODE_MCP_CONFIG_ENV = "CODEXL_CLAUDE_CODE_MCP_CONFIG"; + const chinaTimeZones = new Set([ "asia/chongqing", "asia/chungking", @@ -9,6 +12,15 @@ const chinaTimeZones = new Set([ "prc" ]); +export function claudeCodeMcpConfigEnv(configFile: string | undefined): Record { + return configFile + ? { + [CLAUDE_CODE_MCP_CONFIG_ENV]: configFile, + [CODEXL_CLAUDE_CODE_MCP_CONFIG_ENV]: configFile + } + : {}; +} + export function claudeCodeUtcTimezoneEnvOverride(timeZone = currentTimeZone()): Record { return isChinaTimeZone(timeZone) ? { TZ: "UTC" } : {}; } diff --git a/src/main/codex-app-launch.ts b/packages/core/src/agents/codex/app-launch.ts similarity index 84% rename from src/main/codex-app-launch.ts rename to packages/core/src/agents/codex/app-launch.ts index 2a70b69..6db6a46 100644 --- a/src/main/codex-app-launch.ts +++ b/packages/core/src/agents/codex/app-launch.ts @@ -1,15 +1,15 @@ import { spawn, type ChildProcess } from "node:child_process"; -import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs"; +import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, unlinkSync, writeFileSync } from "node:fs"; import os from "node:os"; import path from "node:path"; -import type { AppConfig, ProfileConfig } from "../shared/app"; -import { botGatewayProfileEnv } from "./bot-gateway-env"; -import { codexModelCatalogJson } from "./codex-model-catalog"; -import { buildProfileLaunchPlan, resolveCodexConfigFile } from "./profile-launch-core"; -import { normalizeWindowsDesktopAppCandidate, windowsDesktopAppCandidates } from "./windows-app-discovery"; -import { writeZcodeGatewayConfig, zcodeHomeFromConfigFile } from "./zcode-profile-config"; +import type { AppConfig, ProfileConfig } from "@ccr/core/contracts/app"; +import { botGatewayProfileEnv } from "@ccr/core/agents/bot-gateway/env"; +import { codexModelCatalogJson } from "@ccr/core/agents/codex/model-catalog"; +import { buildProfileLaunchPlan, resolveCodexConfigFile } from "@ccr/core/profiles/launch-core"; +import { normalizeWindowsDesktopAppCandidate, windowsDesktopAppCandidates } from "@ccr/core/platform/windows-app-discovery"; +import { writeZcodeGatewayConfig, zcodeHomeFromConfigFile } from "@ccr/core/agents/zcode/profile-config"; -type CodexAppLookupResult = { +export type CodexAppLookupResult = { checked: string[]; executable?: string; }; @@ -47,13 +47,21 @@ export type CodexCompatibleAppModelCatalogWriteResult = { userDataDir: string; }; +export const codexDesktopAppName = "ChatGPT"; + const codexAppSpec: CodexCompatibleAppSpec = { bundledCliNames: ["codex", "Codex", "OpenAI Codex"], defaultCliCommand: "codex", - displayName: "Codex App", - envPathKeys: ["CCR_CODEX_APP_PATH", "CODEX_APP_PATH", "CODEXL_CODEX_PATH"], + displayName: codexDesktopAppName, + envPathKeys: ["CCR_CHATGPT_APP_PATH", "CHATGPT_APP_PATH", "CODEXL_CHATGPT_PATH", "CCR_CODEX_APP_PATH", "CODEX_APP_PATH", "CODEXL_CODEX_PATH"], kind: "codex", linuxCandidates: [ + "/opt/ChatGPT/chatgpt", + "/opt/ChatGPT/ChatGPT", + "/opt/OpenAI ChatGPT/chatgpt", + "/opt/OpenAI ChatGPT/ChatGPT", + "/usr/local/bin/chatgpt-app", + "/usr/bin/chatgpt-app", "/opt/Codex/codex", "/opt/Codex/Codex", "/opt/OpenAI Codex/codex", @@ -61,11 +69,18 @@ const codexAppSpec: CodexCompatibleAppSpec = { "/usr/local/bin/codex-app", "/usr/bin/codex-app" ], - macAppNames: ["Codex.app", "OpenAI Codex.app"], + macAppNames: ["ChatGPT.app", "OpenAI ChatGPT.app", "Codex.app", "OpenAI Codex.app"], modelCatalogFilename: "ccr-codex-model-catalog.json", userDataDirName: "codex-app-user-data", - windowsAppDirs: ["Codex", "OpenAI Codex", "OpenAICodex"], + windowsAppDirs: ["ChatGPT", "OpenAI ChatGPT", "OpenAIChatGPT", "Codex", "OpenAI Codex", "OpenAICodex"], windowsExeNames: [ + "ChatGPT.exe", + "chatgpt.exe", + "OpenAI ChatGPT.exe", + "OpenAIChatGPT.exe", + "OpenAIChatGPTApp.exe", + "chatgpt-app.exe", + "openai-chatgpt.exe", "Codex.exe", "codex.exe", "OpenAI Codex.exe", @@ -74,9 +89,16 @@ const codexAppSpec: CodexCompatibleAppSpec = { "codex-app.exe", "openai-codex.exe" ], - windowsPackageKeywords: ["codex", "openaicodex"], + windowsPackageKeywords: ["chatgpt", "openaichatgpt", "codex", "openaicodex"], windowsVendorDirs: ["OpenAI"], windowsWhereNames: [ + "ChatGPT", + "chatgpt", + "OpenAI ChatGPT", + "OpenAIChatGPT", + "OpenAIChatGPTApp", + "chatgpt-app", + "openai-chatgpt", "Codex", "codex", "OpenAI Codex", @@ -135,6 +157,10 @@ export function launchCodexAppProfile(configDir: string, profile: ProfileConfig, return launchCodexCompatibleAppProfile(configDir, profile, codexAppSpec, config); } +export function findInstalledCodexAppExecutable(profileAppPath?: string): CodexAppLookupResult { + return findInstalledCodexCompatibleAppExecutable(codexAppSpec, profileAppPath); +} + export function launchZcodeAppProfile(configDir: string, profile: ProfileConfig, config?: AppConfig): CodexAppLaunchResult { return launchCodexCompatibleAppProfile(configDir, profile, zcodeAppSpec, config); } @@ -164,6 +190,9 @@ export function writeCodexCompatibleAppModelCatalog( const spec = profile.agent === "zcode" ? zcodeAppSpec : codexAppSpec; const configFile = resolveCodexConfigFile(configDir, profile); const codexHome = codexCompatibleHomeFromConfigFile(spec, configFile); + if (spec.kind === "codex") { + removeLegacyCodexVirtualAuthMarker(codexHome); + } const userDataDir = codexElectronUserDataDir(codexHome, profile, spec); mkdirSync(userDataDir, { recursive: true }); const file = codexAppModelCatalogFile(userDataDir, spec); @@ -175,13 +204,37 @@ export function writeCodexCompatibleAppModelCatalog( return { changed: previous !== content, file, userDataDir }; } +export function removeLegacyCodexVirtualAuthMarker(codexHome: string): boolean { + const authFile = path.join(codexHome, "auth.json"); + if (!isFile(authFile)) { + return false; + } + try { + const value = JSON.parse(readFileSync(authFile, "utf8")) as Record; + const keys = Object.keys(value).sort(); + if ( + keys.length !== 2 || + keys[0] !== "OPENAI_API_KEY" || + keys[1] !== "auth_mode" || + value.auth_mode !== "apikey" || + value.OPENAI_API_KEY !== "ccr-local-profile" + ) { + return false; + } + unlinkSync(authFile); + return true; + } catch { + return false; + } +} + function launchCodexCompatibleAppProfile( configDir: string, profile: ProfileConfig, spec: CodexCompatibleAppSpec, config?: AppConfig ): CodexAppLaunchResult { - const lookup = findInstalledCodexAppExecutable(spec); + const lookup = findInstalledCodexCompatibleAppExecutable(spec, profile.appPath); if (!lookup.executable) { throw new Error([ `${spec.displayName} was not found. Install ${spec.displayName} or set ${spec.envPathKeys[1]} to its executable, then try again.`, @@ -218,7 +271,7 @@ function launchCodexCompatibleAppProfile( delete env.CODEXL_ZCODE_MODEL_CATALOG_B64; sanitizeCodexCompatibleAppEnv(env, spec.kind); - const launch = codexAppLaunchCommand(lookup.executable, userDataDir, appEnv); + const launch = codexAppLaunchCommand(lookup.executable, userDataDir); const child = spawn(launch.command, launch.args, { detached: true, env, @@ -255,6 +308,9 @@ function codexProfileEnv(profile: ProfileConfig, appExecutable: string, spec: Co } return { ...(profile.model.trim() ? { CCR_CODEX_MODEL: profile.model.trim() } : {}), + ...(process.env.CCR_CODEX_CLI_MIDDLEWARE_LOG?.trim() + ? { CCR_CODEX_CLI_MIDDLEWARE_LOG: process.env.CCR_CODEX_CLI_MIDDLEWARE_LOG.trim() } + : {}), CCR_CODEX_MODEL_PROVIDER: providerId, CCR_CODEX_PROFILE: providerId, CCR_CODEX_REMOTE_FRONTEND_MODE: remoteFrontendMode, @@ -351,34 +407,13 @@ function codexElectronArgs(userDataDir: string): string[] { ]; } -function codexAppLaunchCommand(executable: string, userDataDir: string, env: Record): { args: string[]; command: string; pidIsLauncher?: boolean } { - const appBundle = process.platform === "darwin" ? macAppBundleFromExecutable(executable) : undefined; - if (appBundle) { - return { - command: "/usr/bin/open", - pidIsLauncher: true, - args: [ - "-W", - "-n", - ...macOpenEnvArgs(env), - appBundle, - "--args", - ...codexElectronArgs(userDataDir) - ] - }; - } +function codexAppLaunchCommand(executable: string, userDataDir: string): { args: string[]; command: string; pidIsLauncher?: boolean } { return { command: executable, args: codexElectronArgs(userDataDir) }; } -function macOpenEnvArgs(env: Record): string[] { - return Object.entries(env) - .filter(([key, value]) => isEnvName(key) && typeof value === "string") - .flatMap(([key, value]) => ["--env", `${key}=${value}`]); -} - function macAppBundleFromExecutable(executable: string): string | undefined { const marker = ".app/Contents/MacOS/"; const index = executable.indexOf(marker); @@ -389,10 +424,6 @@ function macAppBundleFromExecutable(executable: string): string | undefined { return isDirectory(appBundle) ? appBundle : undefined; } -function isEnvName(value: string): boolean { - return /^[A-Za-z_][A-Za-z0-9_]*$/.test(value); -} - function codexElectronUserDataDir(codexHome: string, profile: ProfileConfig, spec: CodexCompatibleAppSpec): string { return path.join( codexHome, @@ -410,8 +441,13 @@ function codexCompatibleHomeFromConfigFile(spec: CodexCompatibleAppSpec, configF return spec.kind === "zcode" ? zcodeHomeFromConfigFile(configFile) : path.dirname(configFile); } -function findInstalledCodexAppExecutable(spec: CodexCompatibleAppSpec): CodexAppLookupResult { +function findInstalledCodexCompatibleAppExecutable(spec: CodexCompatibleAppSpec, profileAppPath?: string): CodexAppLookupResult { const checked: string[] = []; + const profileCandidate = findFirstExecutable(profileCodexAppPathCandidates(profileAppPath), checked, spec); + if (profileCandidate) { + return { checked, executable: profileCandidate }; + } + const envCandidate = findFirstExecutable(envCodexAppPathCandidates(spec), checked, spec); if (envCandidate) { return { checked, executable: envCandidate }; @@ -447,6 +483,11 @@ function envCodexAppPathCandidates(spec: CodexCompatibleAppSpec): string[] { .map(resolveUserPath); } +function profileCodexAppPathCandidates(value: string | undefined): string[] { + const trimmed = value?.trim() || ""; + return trimmed ? [resolveUserPath(trimmed)] : []; +} + function macCodexAppCandidates(spec: CodexCompatibleAppSpec): string[] { const roots = [ "/Applications", diff --git a/src/main/codex-cli-middleware-runtime.ts b/packages/core/src/agents/codex/cli-middleware-runtime.ts similarity index 94% rename from src/main/codex-cli-middleware-runtime.ts rename to packages/core/src/agents/codex/cli-middleware-runtime.ts index 2f7b30b..1da08f6 100644 --- a/src/main/codex-cli-middleware-runtime.ts +++ b/packages/core/src/agents/codex/cli-middleware-runtime.ts @@ -18,6 +18,8 @@ const REQUEST_TIMEOUT_MS = numberEnv("CCR_CODEX_APP_REQUEST_TIMEOUT_MS", 10 * 60 const TURN_IDLE_TIMEOUT_MS = numberEnv("CCR_CODEX_CLAUDE_TURN_IDLE_TIMEOUT_MS", 10 * 60 * 1000); const CONFIG_DIR = resolveConfigDir(); const LOG_PATH = process.env.CCR_CODEX_CLI_MIDDLEWARE_LOG || ""; +const CLAUDE_CODE_MCP_CONFIG_ENV = "CCR_CLAUDE_CODE_MCP_CONFIG"; +const CODEXL_CLAUDE_CODE_MCP_CONFIG_ENV = "CODEXL_CLAUDE_CODE_MCP_CONFIG"; const CLAUDE_CODE_CHINA_TIME_ZONES = new Set([ "asia/chongqing", "asia/chungking", @@ -28,6 +30,11 @@ const CLAUDE_CODE_CHINA_TIME_ZONES = new Set([ "china standard time", "prc" ]); +const ACCOUNT_REMOTE_PLUGIN_MARKETPLACE_KINDS = new Set([ + "created-by-me-remote", + "shared-with-me", + "workspace-directory" +]); let BOT_BRIDGE_INSTANCE = null; function claudeCodeUtcTimezoneEnvOverride() { @@ -147,6 +154,11 @@ async function runClaudeCodeCliWrapper(args) { } function claudeCodeCliWrapperArgs(args) { + const modelArgs = claudeCodeArgsWithModel(args); + return claudeCodeArgsWithMcpConfig(modelArgs, process.env); +} + +function claudeCodeArgsWithModel(args) { const model = nonEmptyEnv("CCR_CLAUDE_CODE_MODEL") || nonEmptyEnv("CODEXL_CLAUDE_CODE_MODEL") || nonEmptyEnv("ANTHROPIC_MODEL"); if (!model || claudeCodeArgsHaveModel(args) || claudeCodeArgsShouldSkipModelInjection(args)) { return args; @@ -154,6 +166,14 @@ function claudeCodeCliWrapperArgs(args) { return ["--model", model, ...args]; } +function claudeCodeArgsWithMcpConfig(args, env) { + const mcpConfig = nonEmptyEnvFrom(env, CLAUDE_CODE_MCP_CONFIG_ENV) || nonEmptyEnvFrom(env, CODEXL_CLAUDE_CODE_MCP_CONFIG_ENV); + if (!mcpConfig || claudeCodeArgsHaveMcpConfig(args) || claudeCodeArgsShouldSkipModelInjection(args)) { + return args; + } + return ["--mcp-config", mcpConfig, ...args]; +} + function claudeCodeArgsHaveModel(args) { for (const arg of args) { if (arg === "--model" || arg === "-m" || arg.startsWith("--model=")) { @@ -163,6 +183,15 @@ function claudeCodeArgsHaveModel(args) { return false; } +function claudeCodeArgsHaveMcpConfig(args) { + for (const arg of args) { + if (arg === "--mcp-config" || arg.startsWith("--mcp-config=")) { + return true; + } + } + return false; +} + function claudeCodeArgsShouldSkipModelInjection(args) { if (args.some((arg) => arg === "--help" || arg === "-h" || arg === "--version" || arg === "-v")) { return true; @@ -207,6 +236,7 @@ function claudeCodeOptionTakesValue(arg) { "--debug-to", "--fallback-model", "--model", + "--mcp-config", "--output-format", "--permission-mode", "--resume", @@ -259,16 +289,19 @@ async function runCodexCliMiddleware(args) { return; } + const cleanupAuthBootstrap = createEphemeralCodexApiKeyBootstrap(runtimeAgent); const child = childProcess.spawn(realCli, realArgs, { env: childEnvForAgent(runtimeAgent), stdio: ["pipe", "pipe", "inherit"] }); child.on("error", (error) => { + cleanupAuthBootstrap(); log("codex_cli_spawn_error", { error: formatError(error) }); }); const requestMap = new Map(); const current = { cwd: "" }; + const chatGptAuth = loadChatGptAuth(); const stdinRl = readline.createInterface({ input: process.stdin, crlfDelay: Infinity, terminal: false }); stdinRl.on("line", (line) => { const custom = customAppServerLineResponse(line); @@ -278,13 +311,16 @@ async function runCodexCliMiddleware(args) { } const rewritten = rewriteCodexStdinLine(line); trackRequestLine(rewritten, requestMap, current); - child.stdin.write(rewritten + "\n"); + if (!child.stdin.destroyed) child.stdin.write(rewritten + "\n"); + }); + stdinRl.on("close", () => { + if (!child.stdin.destroyed) child.stdin.end(); }); - stdinRl.on("close", () => child.stdin.end()); const stdoutRl = readline.createInterface({ input: child.stdout, crlfDelay: Infinity, terminal: false }); stdoutRl.on("line", (line) => { - const rewritten = rewriteCodexStdoutLine(line, requestMap); + cleanupAuthBootstrap(); + const rewritten = rewriteCodexStdoutLine(line, requestMap, chatGptAuth); botBridge().handleJsonRpcLine(rewritten); if (!shouldSuppressBotBridgeLine(rewritten)) { process.stdout.write(rewritten + "\n"); @@ -292,10 +328,65 @@ async function runCodexCliMiddleware(args) { }); const exit = await waitForChildResult(child); + cleanupAuthBootstrap(); log("codex_cli_exit", { code: exit.code, signal: exit.signal, exitCode: exit.exitCode }); process.exitCode = exit.exitCode; } +function createEphemeralCodexApiKeyBootstrap(runtimeAgent) { + if (runtimeAgent !== "codex") return () => {}; + const scope = nonEmptyEnv("CCR_PROFILE_SCOPE"); + if (scope !== "ccr" && scope !== "custom") return () => {}; + const authFile = path.join(codexRuntimeHome(), "auth.json"); + if (fs.existsSync(authFile)) return () => {}; + const temporary = authFile + ".tmp-" + process.pid; + let active = false; + try { + fs.mkdirSync(path.dirname(authFile), { recursive: true, mode: 0o700 }); + fs.writeFileSync(temporary, JSON.stringify({ + auth_mode: "apikey", + OPENAI_API_KEY: "ccr-local-profile" + }, null, 2) + "\n", { mode: 0o600 }); + fs.renameSync(temporary, authFile); + active = true; + log("codex_auth_bootstrap_created", { authFile }); + } catch (error) { + try { + fs.unlinkSync(temporary); + } catch { + } + log("codex_auth_bootstrap_create_error", { authFile, error: formatError(error) }); + } + + return () => { + if (!active) return; + try { + if (!fs.existsSync(authFile)) { + active = false; + return; + } + const value = readJsonFile(authFile); + const keys = value && typeof value === "object" ? Object.keys(value).sort() : []; + if ( + keys.length === 2 && + keys[0] === "OPENAI_API_KEY" && + keys[1] === "auth_mode" && + value.auth_mode === "apikey" && + value.OPENAI_API_KEY === "ccr-local-profile" + ) { + fs.unlinkSync(authFile); + active = false; + log("codex_auth_bootstrap_removed", { authFile }); + return; + } + active = false; + log("codex_auth_bootstrap_preserved_changed_file", { authFile }); + } catch (error) { + log("codex_auth_bootstrap_remove_error", { authFile, error: formatError(error) }); + } + }; +} + async function runDirectCodexCli(realCli, realArgs) { const runtimeAgent = codexRuntimeAgent(); const child = childProcess.spawn(realCli, realArgs, { @@ -371,7 +462,7 @@ function cliConfigString(key, value) { return key + "=\"" + tomlEscape(value) + "\""; } -function rewriteCodexStdoutLine(line, requestMap) { +function rewriteCodexStdoutLine(line, requestMap, chatGptAuth) { let value; try { value = JSON.parse(line); @@ -382,15 +473,37 @@ function rewriteCodexStdoutLine(line, requestMap) { if (!id || !requestMap.has(id)) return line; const request = requestMap.get(id); requestMap.delete(id); - if (value.error) return line; + if (value.error) { + if (request.method === "model/list" || request.method === "plugin/list") { + log("app_server_list_error", { method: request.method, error: value.error }); + } + return line; + } if (request.method === "account/read") { - value.result = mockAccountRead(); + value.result = codexAppAccountRead(chatGptAuth); } else if (request.method === "getAuthStatus") { - value.result = mockAuthStatus(request.includeToken); + value.result = codexAppAuthStatus(chatGptAuth, request.includeToken); } else if (request.method === "thread/list") { value = mergeForeignThreadList(value, request.params); } else if (request.method === "model/list") { - value.result = modelList(request.params, value.result); + log("app_server_model_list_response", { + count: extractModelListItems(value.result).length, + nextCursor: value.result && value.result.nextCursor + }); + return line; + } else if (request.method === "plugin/list") { + const marketplaces = value.result && Array.isArray(value.result.marketplaces) ? value.result.marketplaces : []; + log("app_server_plugin_list_response", { + marketplaceCount: marketplaces.length, + marketplaces: marketplaces.map((marketplace) => ({ + name: marketplace && marketplace.name, + path: marketplace && marketplace.path, + pluginCount: marketplace && Array.isArray(marketplace.plugins) ? marketplace.plugins.length : 0 + })) + }); + return line; + } else { + return line; } return JSON.stringify(value); } @@ -408,6 +521,9 @@ function rewriteCodexStdinLine(line) { if (!value || typeof value !== "object" || typeof value.method !== "string") { return line; } + if (value.method === "model/list" || value.method === "plugin/list") { + log("app_server_list_request", { method: value.method, params: value.params || {} }); + } let changed = false; if (normalizeCliAppServerRequest(value)) { changed = true; @@ -752,7 +868,7 @@ function trackRequestLine(line, requestMap, current) { if (!id || !method) return; const cwd = requestWorkspaceCwd(value, method); if (cwd) current.cwd = cwd; - if (!["account/read", "getAuthStatus", "thread/list", "config/read", "model/list"].includes(method)) return; + if (!["account/read", "getAuthStatus", "thread/list", "config/read", "model/list", "plugin/list"].includes(method)) return; const params = clone(value.params || {}); if (method === "thread/list" && current.cwd && !params.codexlWorkspaceCwd) { params.codexlWorkspaceCwd = current.cwd; @@ -771,6 +887,13 @@ function customAppServerLineResponse(line) { } catch { return undefined; } + if (value && typeof value.method === "string") { + log("app_server_request", { + id: jsonRpcIdKey(value.id), + method: value.method, + params: value.params || {} + }); + } if (value && value.type === "fetch" && String(value.method || "").toUpperCase() === "POST" && fetchUrlIsTranscribe(value.url)) { return { requestId: value.requestId || value.id || uuid(), @@ -780,9 +903,25 @@ function customAppServerLineResponse(line) { headers: { "content-type": "application/json" } }; } + if (value && value.method === "plugin/list" && jsonRpcIdKey(value.id) && accountRemoteOnlyPluginList(value.params)) { + log("app_server_account_remote_plugin_list_empty", { + marketplaceKinds: value.params.marketplaceKinds + }); + return { + id: value.id, + result: { marketplaces: [], marketplaceLoadErrors: [], featuredPluginIds: [] } + }; + } return undefined; } +function accountRemoteOnlyPluginList(params) { + const kinds = params && Array.isArray(params.marketplaceKinds) + ? params.marketplaceKinds.map((kind) => String(kind || "")).filter(Boolean) + : []; + return kinds.length > 0 && kinds.every((kind) => ACCOUNT_REMOTE_PLUGIN_MARKETPLACE_KINDS.has(kind)); +} + function fetchUrlIsTranscribe(url) { const text = String(url || "").trim(); if (text === "/transcribe") return true; @@ -1954,7 +2093,7 @@ function claudeCommand(work) { } return { command, - args, + args: claudeCodeArgsWithMcpConfig(args, env), env }; } @@ -2355,8 +2494,12 @@ function configRead(params, values) { model: agentEnv(runtimeAgent, "MODEL") || DEFAULT_MODEL, model_catalog_json: JSON.stringify(modelCatalogConfigValue()), model_provider: agentEnv(runtimeAgent, "MODEL_PROVIDER") || "claude-code", - approval_policy: "default", - sandbox_mode: "workspace-write" + approval_policy: "default" + // sandbox_mode intentionally omitted: let Codex read it from its own + // config.toml (e.g. [windows] sandbox) instead of forcing workspace-write. + // Forcing workspace-write triggers codex-windows-sandbox-setup.exe on every + // command, which fails on systems where the COM+ catalog is unavailable + // (see openai/codex#29332), surfacing as repeated error dialogs. } }; } @@ -2434,15 +2577,83 @@ function configWriteResponse(params) { return { config: params.config || null, ok: true }; } +function loadChatGptAuth() { + const workspaceName = nonEmptyEnv("CCR_CODEX_WORKSPACE_NAME") || + nonEmptyEnv("CODEXL_CODEX_WORKSPACE_NAME") || + nonEmptyEnv("CODEXL_CODEX_INSTANCE_NAME") || + agentEnv("codex", "PROFILE"); + const fallback = { + authToken: "", + email: "", + planType: "", + workspaceName + }; + const value = readJsonFile(path.join(codexRuntimeHome(), "auth.json")); + if (!value || !isPlainObject(value)) return fallback; + if (typeof value.auth_mode === "string" && value.auth_mode !== "chatgpt") return fallback; + if (!isPlainObject(value.tokens)) return fallback; + + const authToken = stringValue(value.tokens.access_token); + const idToken = stringValue(value.tokens.id_token); + const claims = jwtPayloadClaims(authToken) || jwtPayloadClaims(idToken) || {}; + const profileClaims = isPlainObject(claims["https://api.openai.com/profile"]) + ? claims["https://api.openai.com/profile"] + : {}; + const authClaims = isPlainObject(claims["https://api.openai.com/auth"]) + ? claims["https://api.openai.com/auth"] + : {}; + return { + authToken, + email: stringValue(profileClaims.email) || stringValue(claims.email) || stringValue(value.email), + planType: stringValue(authClaims.chatgpt_plan_type) || stringValue(claims.chatgpt_plan_type), + workspaceName + }; +} + +function jwtPayloadClaims(token) { + if (!token) return undefined; + const payload = String(token).split(".")[1]; + if (!payload) return undefined; + try { + const normalized = payload.replace(/-/g, "+").replace(/_/g, "/"); + const padded = normalized + "=".repeat((4 - normalized.length % 4) % 4); + const value = JSON.parse(Buffer.from(padded, "base64").toString("utf8")); + return isPlainObject(value) ? value : undefined; + } catch { + return undefined; + } +} + +function codexAppAccountRead(auth) { + return { + account: { + type: "chatgpt", + email: auth.email || auth.workspaceName || "codex", + planType: auth.planType || "unknown" + }, + requiresOpenaiAuth: true + }; +} + +function codexAppAuthStatus(auth, includeToken) { + const result = { + authMethod: "chatgpt", + requiresOpenaiAuth: true + }; + if (includeToken) result.authToken = auth.authToken || null; + return result; +} + function mockAccountRead() { - const runtimeAgent = codexRuntimeAgent(); - const email = agentEnv(runtimeAgent, "WORKSPACE_NAME") || (runtimeAgent === "zcode" ? "ZCode" : "Claude Code"); - return { account: { type: "chatgpt", email, planType: "unknown" }, requiresOpenaiAuth: false }; + return { + account: { type: "amazonBedrock", credentialSource: "codexManaged" }, + requiresOpenaiAuth: false + }; } function mockAuthStatus(includeToken) { - const result = { authMethod: "chatgpt", account: mockAccountRead().account, requiresOpenaiAuth: false }; - if (includeToken) result.authToken = null; + const result = { authMethod: "amazonBedrock", authToken: null, requiresOpenaiAuth: false }; + if (includeToken) result.authToken = "ccr-local-profile"; return result; } @@ -2490,7 +2701,7 @@ function claudeControlPermissionResponse(message, requestId, approval) { const allows = permissionResponseAllows(approval); const response = allows ? { behavior: "allow", updatedInput: pointer(message, "/request/input") || pointer(message, "/params/input") || {} } - : { behavior: "deny", message: "Denied in Codex App" }; + : { behavior: "deny", message: "Denied in ChatGPT" }; const toolUseId = firstString(message, ["/request/tool_use_id", "/request/toolUseId", "/params/tool_use_id"]); if (toolUseId) response.toolUseID = toolUseId; return { type: "control_response", response: { subtype: "success", request_id: requestId, response } }; @@ -2510,7 +2721,7 @@ async function waitForAppResponse(map, requestId, timeoutMs) { } await sleep(100); } - throw new Error("Timed out waiting for Codex App response: " + requestId); + throw new Error("Timed out waiting for ChatGPT response: " + requestId); } function permissionResponseAllows(value) { @@ -3246,6 +3457,10 @@ async function importBotGatewaySdk() { if (configured) { candidates.push(configured); } + const bundled = bundledBotGatewaySdkModule(); + if (bundled) { + candidates.push(bundled); + } candidates.push("@the-next-ai/bot-gateway-sdk"); const errors = []; for (const candidate of candidates) { @@ -3262,6 +3477,20 @@ async function importBotGatewaySdk() { throw new Error("Unable to load @the-next-ai/bot-gateway-sdk. " + errors.join("; ")); } +function bundledBotGatewaySdkModule() { + const resourcesPath = process["resourcesPath"]; + const candidates = [ + path.join(__dirname, "bot-gateway-sdk", "dist", "index.js"), + ...(resourcesPath + ? [ + path.join(resourcesPath, "app.asar", "dist", "main", "bot-gateway-sdk", "dist", "index.js"), + path.join(resourcesPath, "app", "dist", "main", "bot-gateway-sdk", "dist", "index.js") + ] + : []) + ]; + return candidates.find((candidate) => fs.existsSync(candidate)) || ""; +} + function botGatewaySdkImportSpecifier(value) { const trimmed = String(value || "").trim(); if (!trimmed) return "@the-next-ai/bot-gateway-sdk"; @@ -4228,6 +4457,11 @@ function nonEmptyEnv(name) { return typeof value === "string" && value.trim() ? value.trim() : ""; } +function nonEmptyEnvFrom(env, name) { + const value = env?.[name]; + return typeof value === "string" && value.trim() ? value.trim() : ""; +} + function codexRuntimeAgent() { return nonEmptyEnv("CCR_ZCODE_PROFILE") || nonEmptyEnv("CODEXL_ZCODE_PROFILE") || diff --git a/src/main/codex-model-catalog.ts b/packages/core/src/agents/codex/model-catalog.ts similarity index 80% rename from src/main/codex-model-catalog.ts rename to packages/core/src/agents/codex/model-catalog.ts index 07ba04d..198f207 100644 --- a/src/main/codex-model-catalog.ts +++ b/packages/core/src/agents/codex/model-catalog.ts @@ -1,11 +1,14 @@ -import { BUILTIN_FUSION_WEB_SEARCH_TOOL_NAME } from "../shared/app"; -import type { AppConfig, GatewayProviderConfig, GatewayProviderProtocol, VirtualModelProfileConfig } from "../shared/app"; +import { BUILTIN_FUSION_WEB_SEARCH_TOOL_NAME } from "@ccr/core/contracts/app"; +import type { AppConfig, GatewayProviderConfig, GatewayProviderProtocol, ProviderModelMetadata, ProviderReasoningLevel, VirtualModelProfileConfig } from "@ccr/core/contracts/app"; import { findModelCatalogEntry, modelCatalogMaxInputTokens, readCatalogCapability, type ModelCatalogEntry -} from "../server/gateway/model-catalog"; +} from "@ccr/core/gateway/model-catalog"; +import { codexDefaultBaseUrl, readCodexLocalModelCatalog } from "@ccr/core/agents/local-providers/codex"; +import { localAgentProviderApiKey } from "@ccr/core/agents/local-providers/shared"; +import { normalizeProviderBaseUrl } from "@ccr/core/providers/url"; const fusionModelProviderName = "Fusion"; const codexDefaultContextWindow = 128_000; @@ -115,13 +118,13 @@ function codexModelCatalogItem( const profile = codexModelCapabilityProfile(model, config); const contextWindow = codexModelContextWindow(model, profile.catalogEntry); return { - additional_speed_tiers: [], + additional_speed_tiers: profile.additionalSpeedTiers, apply_patch_tool_type: profile.applyPatchToolType, availability_nux: null, base_instructions: "You are Codex, a coding agent.", context_window: contextWindow, - default_reasoning_level: profile.supportsReasoning ? "medium" : null, - default_reasoning_summary: "none", + default_reasoning_level: profile.defaultReasoningLevel, + default_reasoning_summary: profile.defaultReasoningSummary, description: `CCR gateway model ${model}`, display_name: model, effective_context_window_percent: codexEffectiveContextWindowPercent, @@ -129,7 +132,7 @@ function codexModelCatalogItem( input_modalities: profile.inputModalities, max_context_window: contextWindow, priority, - service_tiers: [], + service_tiers: profile.serviceTiers, shell_type: "shell_command", slug: model, support_verbosity: true, @@ -147,10 +150,14 @@ function codexModelCatalogItem( } type CodexCapabilityProfile = { + additionalSpeedTiers: unknown[]; applyPatchToolType: string | null; catalogEntry?: ModelCatalogEntry; + defaultReasoningLevel: string | null; + defaultReasoningSummary: string; inputModalities: string[]; supportedReasoningLevels: Array<{ description: string; effort: string }>; + serviceTiers: unknown[]; supportsImageInput: boolean; supportsParallelToolCalls: boolean; supportsReasoning: boolean; @@ -162,13 +169,18 @@ function codexModelCapabilityProfile( config?: Partial> ): CodexCapabilityProfile { const selector = parseModelSelector(model); - const provider = selector?.provider ? findConfiguredProvider(config, selector.provider) : undefined; + const provider = selector?.provider ? findConfiguredProvider(config, selector.provider) : findConfiguredProviderForModel(config, model); + const providerModel = selector?.model ?? model; + const providerModelMetadata = provider + ? providerModelMetadataFor(provider, providerModel) ?? localCodexModelMetadataFor(provider, providerModel) + : undefined; const catalogEntry = findModelCatalogEntry(model); const capabilities = catalogEntry?.capabilities ?? {}; const providerProtocol = provider ? codexProviderProtocol(provider) : undefined; const providerSupportsResponses = provider ? codexProviderSupportsResponses(provider) : false; const supportsFusionWebSearch = codexVirtualModelSupportsFusionWebSearch(model, config); - const supportsReasoning = readCatalogCapability(capabilities, "reasoning"); + const metadataReasoningLevels = normalizeProviderReasoningLevels(providerModelMetadata?.supportedReasoningLevels); + const supportsReasoning = providerModelMetadata?.supportsReasoningSummaries ?? (metadataReasoningLevels ? true : readCatalogCapability(capabilities, "reasoning")); const supportsImageInput = catalogEntrySupportsImageInput(catalogEntry); const supportsParallelToolCalls = readCatalogCapability(capabilities, "parallelFunctionCalling"); const applyPatchToolType = providerSupportsResponses || catalogModelLooksLikeGpt(model, catalogEntry) || codexPatchBridgeApplies(model, catalogEntry, config) @@ -186,10 +198,18 @@ function codexModelCapabilityProfile( ); return { + additionalSpeedTiers: providerModelMetadata?.additionalSpeedTiers ?? [], applyPatchToolType, catalogEntry, + defaultReasoningLevel: providerModelMetadata && providerModelMetadata.defaultReasoningLevel !== undefined + ? providerModelMetadata.defaultReasoningLevel + : supportsReasoning + ? "medium" + : null, + defaultReasoningSummary: providerModelMetadata?.defaultReasoningSummary ?? "none", inputModalities: supportsImageInput ? ["text", "image"] : ["text"], - supportedReasoningLevels: supportsReasoning ? supportedReasoningLevels(capabilities) : [], + serviceTiers: providerModelMetadata?.serviceTiers ?? [], + supportedReasoningLevels: metadataReasoningLevels ?? (supportsReasoning ? supportedReasoningLevels(capabilities) : []), supportsImageInput, supportsParallelToolCalls, supportsReasoning, @@ -197,6 +217,64 @@ function codexModelCapabilityProfile( }; } +function providerModelMetadataFor(provider: GatewayProviderConfig, model: string): ProviderModelMetadata | undefined { + const metadata = provider.modelMetadata ?? {}; + const direct = metadata[model]; + if (direct) { + return direct; + } + const normalized = model.trim().toLowerCase(); + const match = Object.entries(metadata).find(([candidate]) => candidate.trim().toLowerCase() === normalized); + return match?.[1]; +} + +function localCodexModelMetadataFor(provider: GatewayProviderConfig, model: string): ProviderModelMetadata | undefined { + if (!isLocalCodexProvider(provider)) { + return undefined; + } + return readCodexLocalModelCatalog().modelMetadata?.[model]; +} + +function isLocalCodexProvider(provider: GatewayProviderConfig): boolean { + const baseUrl = providerBaseUrl(provider).trim().replace(/\/+$/g, ""); + const normalizedBaseUrl = normalizeProviderBaseUrl(baseUrl); + const normalizedCodexBaseUrl = normalizeProviderBaseUrl(codexDefaultBaseUrl); + return ( + providerApiKey(provider) === localAgentProviderApiKey && + ( + baseUrl.toLowerCase() === codexDefaultBaseUrl.toLowerCase() || + baseUrl.toLowerCase().includes("chatgpt.com/backend-api/codex") || + normalizedBaseUrl === normalizedCodexBaseUrl + ) + ); +} + +function providerBaseUrl(provider: GatewayProviderConfig): string { + return provider.api_base_url || provider.baseUrl || provider.baseurl || ""; +} + +function providerApiKey(provider: GatewayProviderConfig): string { + return provider.api_key || provider.apiKey || provider.apikey || ""; +} + +function normalizeProviderReasoningLevels(levels: ProviderReasoningLevel[] | undefined): Array<{ description: string; effort: string }> | undefined { + const normalized = (levels ?? []) + .map((level) => ({ + description: level.description.trim() || effortDescription(level.effort), + effort: level.effort.trim() + })) + .filter((level) => level.effort); + return normalized.length > 0 ? normalized : undefined; +} + +function effortDescription(effort: string): string { + const normalized = effort.trim().toLowerCase(); + if (normalized === "xhigh") { + return "Extra high reasoning"; + } + return `${effort.slice(0, 1).toUpperCase()}${effort.slice(1)} reasoning`; +} + function codexModelContextWindow(model: string, entry = findModelCatalogEntry(model)): number { return modelCatalogMaxInputTokens(entry) || codexDefaultContextWindow; } @@ -233,6 +311,19 @@ function findConfiguredProvider( return (config?.Providers ?? []).find((provider) => provider.name.trim().toLowerCase() === normalized); } +function findConfiguredProviderForModel( + config: Partial> | undefined, + model: string +): GatewayProviderConfig | undefined { + const normalized = model.trim().toLowerCase(); + if (!normalized) { + return undefined; + } + return (config?.Providers ?? []).find((provider) => + provider.models.some((candidate) => candidate.trim().toLowerCase() === normalized) + ); +} + function codexProviderProtocol(provider: GatewayProviderConfig): GatewayProviderProtocol | undefined { const capabilityProtocols = uniqueProviderProtocols((provider.capabilities ?? []).map((capability) => normalizeProviderProtocol(capability.type))); for (const protocol of ["openai_responses", "openai_chat_completions", "anthropic_messages", "gemini_generate_content", "gemini_interactions"] as GatewayProviderProtocol[]) { diff --git a/src/main/local-agent-providers/claude-code.ts b/packages/core/src/agents/local-providers/claude-code.ts similarity index 76% rename from src/main/local-agent-providers/claude-code.ts rename to packages/core/src/agents/local-providers/claude-code.ts index ae1ad43..bdae4e2 100644 --- a/src/main/local-agent-providers/claude-code.ts +++ b/packages/core/src/agents/local-providers/claude-code.ts @@ -1,3 +1,4 @@ +import { execFileSync } from "node:child_process"; import os from "node:os"; import path from "node:path"; import type { @@ -5,10 +6,11 @@ import type { LocalAgentProviderImportResult, ProviderAccountConfig, ProviderAccountMappingConfig -} from "../../shared/app"; +} from "@ccr/core/contracts/app"; import { bearerAuthPlugin, findOauthTokenSet, + isRecord, missingCandidate, providerInternalNamePlaceholder, providerPayload, @@ -16,9 +18,10 @@ import { uniqueProviderName, uniqueStrings, type OAuthTokenSet -} from "./shared"; +} from "@ccr/core/agents/local-providers/shared"; -const claudeDefaultModels = ["claude-sonnet-4-20250514"]; +const claudeDefaultModels = ["claude-sonnet-5"]; +const claudeCodeKeychainService = "Claude Code-credentials"; const percentLimitMapping = (id: string, label: string, path: string, window: string) => ({ id, @@ -148,6 +151,19 @@ function readClaudeCodeOauth(): OAuthTokenSet | undefined { sourceFile }; } + + const keychainRecord = readClaudeCodeKeychainRecord(); + if (keychainRecord) { + const credential = findOauthTokenSet(keychainRecord); + if (credential) { + return { + accessToken: credential.accessToken, + refreshToken: credential.refreshToken, + sourceFile: `keychain:${claudeCodeKeychainService}` + }; + } + } + return undefined; } @@ -158,3 +174,24 @@ function claudeCredentialFiles(): string[] { path.join(os.homedir(), ".config", "claude", "credentials.json") ]); } + +// Newer macOS builds of the Claude Code CLI store credentials in the +// Keychain instead of ~/.claude/.credentials.json. Reading it triggers the +// standard macOS keychain access prompt (Allow / Always Allow); the user +// declining or the item not existing both surface as a non-zero exit here. +function readClaudeCodeKeychainRecord(): Record | undefined { + if (process.platform !== "darwin") { + return undefined; + } + try { + const output = execFileSync( + "security", + ["find-generic-password", "-s", claudeCodeKeychainService, "-w"], + { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] } + ); + const parsed = JSON.parse(output.trim()) as unknown; + return isRecord(parsed) ? parsed : undefined; + } catch { + return undefined; + } +} diff --git a/src/main/local-agent-providers/codex.ts b/packages/core/src/agents/local-providers/codex.ts similarity index 68% rename from src/main/local-agent-providers/codex.ts rename to packages/core/src/agents/local-providers/codex.ts index eb50bbc..b6ba7dd 100644 --- a/src/main/local-agent-providers/codex.ts +++ b/packages/core/src/agents/local-providers/codex.ts @@ -3,18 +3,23 @@ import path from "node:path"; import type { LocalAgentProviderCandidate, LocalAgentProviderImportResult, + LocalAgentProviderProbeResult, GatewayProviderConfig, ProviderAccountConfig, ProviderAccountConnectorConfig, ProviderAccountMappingConfig, ProviderAccountMeter, - ProviderAccountMeterDetail -} from "../../shared/app"; -import { normalizeProviderBaseUrl } from "../../shared/provider-url"; + ProviderAccountMeterDetail, + ProviderModelMetadata, + ProviderReasoningLevel +} from "@ccr/core/contracts/app"; +import { normalizeProviderBaseUrl } from "@ccr/core/providers/url"; +import { fetchWithSystemProxy } from "@ccr/core/proxy/system-proxy-fetch"; import { isRecord, localAgentProviderApiKey, missingCandidate, + modelMetadataForModels, modelDisplayNamesForModels, providerInternalNamePlaceholder, providerNamePlaceholder, @@ -26,15 +31,17 @@ import { uniqueProviderName, uniqueStrings, type OAuthTokenSet -} from "./shared"; +} from "@ccr/core/agents/local-providers/shared"; export const codexDefaultBaseUrl = "https://chatgpt.com/backend-api/codex"; const codexAccountBaseUrl = "https://chatgpt.com/backend-api"; const codexDefaultModels = ["gpt-5-codex"]; +const codexProbeTimeoutMs = 8_000; -type LocalAgentModelCatalog = { +export type LocalAgentModelCatalog = { modelDisplayNames?: Record; + modelMetadata?: Record; models: string[]; }; @@ -233,7 +240,7 @@ const codexAccountTokenUsageMapping: ProviderAccountMappingConfig = { export function codexCandidate(): LocalAgentProviderCandidate { const auth = readCodexAuth(); - const catalog = readCodexModelCatalog(); + const catalog = readCodexLocalModelCatalog(); if (auth?.refreshToken || auth?.accessToken) { return { detail: "ChatGPT login detected. Click Import to add it as a gateway provider.", @@ -241,6 +248,7 @@ export function codexCandidate(): LocalAgentProviderCandidate { importable: true, kind: "codex", modelDisplayNames: catalog.modelDisplayNames, + modelMetadata: catalog.modelMetadata, models: catalog.models, name: "Codex API", protocol: "openai_responses", @@ -251,14 +259,15 @@ export function codexCandidate(): LocalAgentProviderCandidate { return missingCandidate("codex", "codex-api", "Codex API", "openai_responses", catalog.models, catalog.modelDisplayNames); } -export function importCodexProvider(candidate: LocalAgentProviderCandidate, providerNames: string[]): LocalAgentProviderImportResult { +export async function importCodexProvider(candidate: LocalAgentProviderCandidate, providerNames: string[]): Promise { const auth = readCodexAuth(); if (!auth?.refreshToken && !auth?.accessToken) { throw new Error("Codex login token was not found."); } - const provider = providerPayload(candidate, uniqueProviderName(providerNames, "Codex API"), codexDefaultBaseUrl, codexProviderAccountConfig()); + const probedCandidate = await codexCandidateWithProbedModels(candidate).catch(() => candidate); + const provider = providerPayload(probedCandidate, uniqueProviderName(providerNames, "Codex API"), codexDefaultBaseUrl, codexProviderAccountConfig()); return { - candidate, + candidate: probedCandidate, provider, providerPlugins: [ codexOauthPlugin("codex-oauth"), @@ -277,8 +286,16 @@ export function importCodexProvider(candidate: LocalAgentProviderCandidate, prov }; } +export async function probeCodexProvider(candidate: LocalAgentProviderCandidate): Promise { + const probedCandidate = await codexCandidateWithProbedModels(candidate).catch(() => candidate); + return { + candidate: probedCandidate, + probe: codexProviderProbe(probedCandidate) + }; +} + export function readCodexAuth(): OAuthTokenSet | undefined { - const sourceFile = path.join(os.homedir(), ".codex", "auth.json"); + const sourceFile = path.join(codexHomeDir(), ".codex", "auth.json"); const record = readJsonRecord(sourceFile); if (!record) { return undefined; @@ -588,33 +605,234 @@ function codexBackendRequestTransform(): Record { }; } -function readCodexModelCatalog(): LocalAgentModelCatalog { - const modelsFile = path.join(os.homedir(), ".codex", "models_cache.json"); +export function readCodexLocalModelCatalog(): LocalAgentModelCatalog { + const modelsFile = path.join(codexHomeDir(), ".codex", "models_cache.json"); const record = readJsonRecord(modelsFile); + const catalog = codexModelCatalogFromPayload(record); + const uniqueModels = uniqueStrings([...catalog.models, ...codexDefaultModels]); + return { + modelDisplayNames: modelDisplayNamesForModels(catalog.modelDisplayNames, uniqueModels), + modelMetadata: modelMetadataForModels(catalog.modelMetadata, uniqueModels), + models: uniqueModels + }; +} + +async function codexCandidateWithProbedModels(candidate: LocalAgentProviderCandidate): Promise { + const catalog = await fetchCodexModelCatalog(); + if (catalog.models.length === 0) { + return candidate; + } + return { + ...candidate, + modelDisplayNames: catalog.modelDisplayNames, + modelMetadata: catalog.modelMetadata, + models: catalog.models + }; +} + +async function fetchCodexModelCatalog(): Promise { + const auth = readCodexAuth(); + if (!auth?.accessToken) { + throw new Error("Codex access token was not found."); + } + + const controller = new AbortController(); + const timer = setTimeout(() => controller.abort(), codexProbeTimeoutMs); + try { + const response = await fetchWithSystemProxy(`${codexDefaultBaseUrl}/models`, { + headers: { + accept: "application/json", + authorization: `Bearer ${auth.accessToken}`, + "User-Agent": "codex-cli", + ...(auth.accountId ? { "ChatGPT-Account-Id": auth.accountId } : {}), + ...(auth.isFedrampAccount ? { "X-OpenAI-Fedramp": "true" } : {}) + }, + method: "GET", + signal: controller.signal + }); + const text = await response.text(); + if (!response.ok) { + throw new Error(`Codex model probe returned HTTP ${response.status}.`); + } + const payload = parseJson(text); + const catalog = codexModelCatalogFromPayload(payload); + if (catalog.models.length === 0) { + throw new Error("Codex model probe returned no models."); + } + return catalog; + } finally { + clearTimeout(timer); + } +} + +function codexProviderProbe(candidate: LocalAgentProviderCandidate) { + return { + capabilities: [ + { + baseUrl: codexDefaultBaseUrl, + source: "detected" as const, + type: "openai_responses" as const + } + ], + detectedProtocol: "openai_responses" as const, + modelDisplayNames: candidate.modelDisplayNames, + modelMetadata: candidate.modelMetadata, + modelSource: "openai" as const, + models: candidate.models, + normalizedBaseUrl: codexDefaultBaseUrl, + protocols: [ + { + baseUrl: codexDefaultBaseUrl, + endpoint: `${codexDefaultBaseUrl}/responses`, + message: "", + protocol: "openai_responses" as const, + supported: true + } + ] + }; +} + +function codexModelCatalogFromPayload(payload: unknown): LocalAgentModelCatalog { const models: string[] = []; const modelDisplayNames: Record = {}; - for (const item of Array.isArray(record?.models) ? record.models : []) { + const modelMetadata: Record = {}; + for (const item of codexModelCatalogItems(payload)) { const model = isRecord(item) - ? readString(item.slug) || readString(item.id) || readString(item.name) + ? readString(item.slug) || readString(item.id) || readString(item.model) || readString(item.name) : readString(item); if (!model) { continue; } models.push(model); if (isRecord(item)) { - const displayName = readString(item.display_name) || readString(item.displayName) || readString(item.label) || readString(item.name); + const displayName = readString(item.display_name) || readString(item.displayName) || readString(item.label) || readString(item.title) || readString(item.name); if (displayName && displayName !== model) { modelDisplayNames[model] = displayName; } + const metadata = codexModelMetadataFromItem(item); + if (metadata) { + modelMetadata[model] = metadata; + } } } - const uniqueModels = uniqueStrings([...models, ...codexDefaultModels]); + const uniqueModels = uniqueStrings(models); return { modelDisplayNames: modelDisplayNamesForModels(modelDisplayNames, uniqueModels), + modelMetadata: modelMetadataForModels(modelMetadata, uniqueModels), models: uniqueModels }; } +function codexModelMetadataFromItem(item: Record): ProviderModelMetadata | undefined { + const additionalSpeedTiers = readArray(item.additional_speed_tiers) ?? readArray(item.additionalSpeedTiers) ?? readArray(item.speed_tiers) ?? readArray(item.speedTiers); + const serviceTiers = readArray(item.service_tiers) ?? readArray(item.serviceTiers); + const supportedReasoningLevels = + readReasoningLevels(item.supported_reasoning_levels) ?? + readReasoningLevels(item.supportedReasoningLevels) ?? + readReasoningEfforts(item.supported_reasoning_efforts) ?? + readReasoningEfforts(item.supportedReasoningEfforts) ?? + readReasoningEfforts(item.reasoning_efforts) ?? + readReasoningEfforts(item.reasoningEfforts); + const defaultReasoningLevel = readNullableString(item.default_reasoning_level) ?? readNullableString(item.defaultReasoningLevel); + const defaultReasoningSummary = readString(item.default_reasoning_summary) || readString(item.defaultReasoningSummary); + const supportsReasoningSummaries = readBoolean(item.supports_reasoning_summaries) ?? readBoolean(item.supportsReasoningSummaries); + const metadata: ProviderModelMetadata = { + ...(additionalSpeedTiers ? { additionalSpeedTiers } : {}), + ...(defaultReasoningLevel !== undefined ? { defaultReasoningLevel } : {}), + ...(defaultReasoningSummary ? { defaultReasoningSummary } : {}), + ...(serviceTiers ? { serviceTiers } : {}), + ...(supportedReasoningLevels ? { supportedReasoningLevels } : {}), + ...(supportsReasoningSummaries !== undefined ? { supportsReasoningSummaries } : {}) + }; + return Object.keys(metadata).length > 0 ? metadata : undefined; +} + +function readArray(value: unknown): unknown[] | undefined { + return Array.isArray(value) ? value : undefined; +} + +function readNullableString(value: unknown): string | null | undefined { + if (value === null) { + return null; + } + const text = readString(value); + return text || undefined; +} + +function readReasoningLevels(value: unknown): ProviderReasoningLevel[] | undefined { + if (!Array.isArray(value)) { + return undefined; + } + const levels = value + .map((item): ProviderReasoningLevel | undefined => { + if (!isRecord(item)) { + const effort = readString(item); + return effort ? { description: effortDescription(effort), effort } : undefined; + } + const effort = readString(item.effort) || readString(item.name) || readString(item.id) || readString(item.value); + if (!effort) { + return undefined; + } + return { + description: readString(item.description) || readString(item.label) || effortDescription(effort), + effort + }; + }) + .filter((item): item is ProviderReasoningLevel => Boolean(item)); + return levels.length > 0 ? levels : undefined; +} + +function readReasoningEfforts(value: unknown): ProviderReasoningLevel[] | undefined { + if (Array.isArray(value)) { + return readReasoningLevels(value); + } + if (!isRecord(value)) { + return undefined; + } + return readReasoningLevels(Object.values(value)); +} + +function effortDescription(effort: string): string { + const normalized = effort.trim().toLowerCase(); + if (normalized === "xhigh") { + return "Extra high reasoning"; + } + return `${effort.slice(0, 1).toUpperCase()}${effort.slice(1)} reasoning`; +} + +function codexModelCatalogItems(payload: unknown): unknown[] { + if (Array.isArray(payload)) { + return payload; + } + if (!isRecord(payload)) { + return []; + } + + const items: unknown[] = []; + for (const candidate of [payload.data, payload.models]) { + if (Array.isArray(candidate)) { + items.push(...candidate); + } + } + return items; +} + +function parseJson(text: string): unknown { + try { + return JSON.parse(text) as unknown; + } catch { + return undefined; + } +} + +export function codexModelCatalogFromPayloadForTest(payload: unknown): LocalAgentModelCatalog { + return codexModelCatalogFromPayload(payload); +} + +function codexHomeDir(): string { + return process.env.CCR_INTERNAL_HOME_DIR?.trim() || process.env.HOME?.trim() || process.env.USERPROFILE?.trim() || os.homedir(); +} + function readCodexIdTokenClaims(idToken: string | undefined): { accountId?: string; isFedrampAccount?: boolean } { const payload = readJwtPayload(idToken); const auth = isRecord(payload?.["https://api.openai.com/auth"]) diff --git a/packages/core/src/agents/local-providers/service.ts b/packages/core/src/agents/local-providers/service.ts new file mode 100644 index 0000000..6f1ab13 --- /dev/null +++ b/packages/core/src/agents/local-providers/service.ts @@ -0,0 +1,50 @@ +import type { + LocalAgentProviderCandidate, + LocalAgentProviderImportRequest, + LocalAgentProviderImportResult, + LocalAgentProviderProbeRequest, + LocalAgentProviderProbeResult +} from "@ccr/core/contracts/app"; +import { claudeCodeCandidate, importClaudeCodeProvider } from "@ccr/core/agents/local-providers/claude-code"; +import { codexCandidate, importCodexProvider, probeCodexProvider } from "@ccr/core/agents/local-providers/codex"; +import { importZcodeProvider, zcodeCandidate } from "@ccr/core/agents/local-providers/zcode"; + +export { codexDefaultBaseUrl, readCodexAuth } from "@ccr/core/agents/local-providers/codex"; +export { localAgentProviderApiKey, type OAuthTokenSet } from "@ccr/core/agents/local-providers/shared"; + +export function getLocalAgentProviderCandidates(): LocalAgentProviderCandidate[] { + return [ + codexCandidate(), + claudeCodeCandidate(), + zcodeCandidate() + ].filter((candidate) => candidate.status !== "missing"); +} + +export async function importLocalAgentProvider(request: LocalAgentProviderImportRequest): Promise { + const candidate = getLocalAgentProviderCandidates().find((item) => item.id === request.id); + if (!candidate) { + throw new Error("Local agent provider was not found."); + } + if (!candidate.importable) { + throw new Error(candidate.detail || "Local agent login is not importable."); + } + + if (candidate.kind === "codex") { + return importCodexProvider(candidate, request.providerNames ?? []); + } + if (candidate.kind === "claude-code") { + return importClaudeCodeProvider(candidate, request.providerNames ?? []); + } + return importZcodeProvider(candidate, request.providerNames ?? []); +} + +export async function probeLocalAgentProvider(request: LocalAgentProviderProbeRequest): Promise { + const candidate = getLocalAgentProviderCandidates().find((item) => item.id === request.id); + if (!candidate) { + throw new Error("Local agent provider was not found."); + } + if (candidate.kind === "codex") { + return probeCodexProvider(candidate); + } + throw new Error("Local agent provider model probing is not supported."); +} diff --git a/src/main/local-agent-providers/shared.ts b/packages/core/src/agents/local-providers/shared.ts similarity index 89% rename from src/main/local-agent-providers/shared.ts rename to packages/core/src/agents/local-providers/shared.ts index 34f952e..1432c01 100644 --- a/src/main/local-agent-providers/shared.ts +++ b/packages/core/src/agents/local-providers/shared.ts @@ -4,8 +4,9 @@ import type { LocalAgentProviderCandidate, LocalAgentProviderKind, ProviderAccountConfig, - ProviderDeepLinkPayload -} from "../../shared/app"; + ProviderDeepLinkPayload, + ProviderModelMetadata +} from "@ccr/core/contracts/app"; export type OAuthTokenSet = { accountId?: string; @@ -39,8 +40,8 @@ export function missingCandidate( importable: false, kind, modelDisplayNames: modelDisplayNamesForModels(modelDisplayNames, models), - models, - name, + models, + name, protocol, status: "missing" }; @@ -58,12 +59,24 @@ export function providerPayload( apiKey: localAgentProviderApiKey, baseUrl, modelDisplayNames: modelDisplayNamesForModels(candidate.modelDisplayNames, models), + modelMetadata: modelMetadataForModels(candidate.modelMetadata, models), models, name, protocol: candidate.protocol }; } +export function modelMetadataForModels( + value: Record | undefined, + models: string[] +): Record | undefined { + const modelIds = new Set(models); + const entries = Object.entries(value ?? {}) + .map(([rawModel, metadata]) => [rawModel.trim(), metadata] as const) + .filter(([model, metadata]) => model && modelIds.has(model) && metadata && typeof metadata === "object"); + return entries.length > 0 ? Object.fromEntries(entries) : undefined; +} + export function modelDisplayNamesForModels( value: Record | undefined, models: string[] diff --git a/src/main/local-agent-providers/zcode.ts b/packages/core/src/agents/local-providers/zcode.ts similarity index 98% rename from src/main/local-agent-providers/zcode.ts rename to packages/core/src/agents/local-providers/zcode.ts index 247f754..f32f3c0 100644 --- a/src/main/local-agent-providers/zcode.ts +++ b/packages/core/src/agents/local-providers/zcode.ts @@ -4,8 +4,8 @@ import type { LocalAgentProviderCandidate, LocalAgentProviderImportResult, ProviderAccountConfig -} from "../../shared/app"; -import { findProviderPresetByBaseUrl } from "../presets"; +} from "@ccr/core/contracts/app"; +import { findProviderPresetByBaseUrl } from "@ccr/core/providers/presets/index"; import { apiKeyAuthPlugin, cloneProviderAccountConfig, @@ -21,7 +21,7 @@ import { uniqueProviderName, uniqueStrings, type ApiTokenSet -} from "./shared"; +} from "@ccr/core/agents/local-providers/shared"; type ZcodeConfiguredProvider = { apiKey: string; diff --git a/src/main/zcode-profile-config.ts b/packages/core/src/agents/zcode/profile-config.ts similarity index 98% rename from src/main/zcode-profile-config.ts rename to packages/core/src/agents/zcode/profile-config.ts index 9e62c65..c8ebb35 100644 --- a/src/main/zcode-profile-config.ts +++ b/packages/core/src/agents/zcode/profile-config.ts @@ -1,9 +1,9 @@ import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs"; import os from "node:os"; import path from "node:path"; -import type { AppConfig, ProfileConfig } from "../shared/app"; -import { normalizeRouteSelector } from "../server/gateway/claude-code-router-plugin"; -import { buildCodexModelCatalogIds } from "./codex-model-catalog"; +import type { AppConfig, ProfileConfig } from "@ccr/core/contracts/app"; +import { normalizeRouteSelector } from "@ccr/core/gateway/claude-code-router-plugin"; +import { buildCodexModelCatalogIds } from "@ccr/core/agents/codex/model-catalog"; export type ZcodeProfileConfigWriteResult = { backupFile?: string; diff --git a/src/main/api-key-store.ts b/packages/core/src/config/api-key-store.ts similarity index 97% rename from src/main/api-key-store.ts rename to packages/core/src/config/api-key-store.ts index d60bf0b..76fca9c 100644 --- a/src/main/api-key-store.ts +++ b/packages/core/src/config/api-key-store.ts @@ -1,8 +1,8 @@ import { chmodSync, existsSync, mkdirSync } from "node:fs"; import { dirname } from "node:path"; -import { API_KEYS_DB_FILE, LEGACY_API_KEYS_DB_FILES } from "./constants"; -import { createBetterSqliteDatabase, type BetterSqliteDatabase } from "./sqlite-native"; -import type { ApiKeyConfig, ApiKeyLimitConfig } from "../shared/app"; +import { API_KEYS_DB_FILE, LEGACY_API_KEYS_DB_FILES } from "@ccr/core/config/constants"; +import { createBetterSqliteDatabase, type BetterSqliteDatabase } from "@ccr/core/storage/sqlite-native"; +import type { ApiKeyConfig, ApiKeyLimitConfig } from "@ccr/core/contracts/app"; type SqlDatabase = BetterSqliteDatabase; type SqlValue = bigint | Buffer | number | string | null; diff --git a/src/main/app-config-store.ts b/packages/core/src/config/app-config-store.ts similarity index 98% rename from src/main/app-config-store.ts rename to packages/core/src/config/app-config-store.ts index 837b9cc..13e1209 100644 --- a/src/main/app-config-store.ts +++ b/packages/core/src/config/app-config-store.ts @@ -1,7 +1,7 @@ import { chmodSync, existsSync, mkdirSync } from "node:fs"; import { dirname } from "node:path"; -import { APP_CONFIG_DB_FILE, LEGACY_APP_CONFIG_DB_FILES } from "./constants"; -import { createBetterSqliteDatabase, type BetterSqliteDatabase } from "./sqlite-native"; +import { APP_CONFIG_DB_FILE, LEGACY_APP_CONFIG_DB_FILES } from "@ccr/core/config/constants"; +import { createBetterSqliteDatabase, type BetterSqliteDatabase } from "@ccr/core/storage/sqlite-native"; type SqlDatabase = BetterSqliteDatabase; type SqlValue = bigint | Buffer | number | string | null; diff --git a/src/main/config.ts b/packages/core/src/config/config.ts similarity index 92% rename from src/main/config.ts rename to packages/core/src/config/config.ts index ef2702a..4e93f9c 100644 --- a/src/main/config.ts +++ b/packages/core/src/config/config.ts @@ -1,12 +1,12 @@ import { createHash, randomBytes } from "node:crypto"; import { existsSync, readFileSync } from "node:fs"; -import { loadPersistedAppConfig, replacePersistedAppConfig } from "./app-config-store"; -import { loadPersistedApiKeys, replacePersistedApiKeys } from "./api-key-store"; -import { CONFIG_FILE, GATEWAY_CONFIG_FILE, LEGACY_CONFIG_FILE, LEGACY_WINDOWS_CONFIG_FILE } from "./constants"; -import { normalizeCodexProviderAccountConfig } from "./local-agent-providers/codex"; -import { CLAUDE_CODE_DEFAULT_ENV, CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY_ENV, DEFAULT_OVERVIEW_WIDGETS, DEFAULT_TRAY_COMPONENT_VARIANTS, DEFAULT_TRAY_WIDGETS, DEFAULT_TRAY_WINDOW_MODULES, OVERVIEW_WIDGET_SIZE_VALUES, ROUTER_FALLBACK_MAX_RETRY_COUNT, TRAY_SINGLETON_WIDGET_TYPES, TRAY_TOP_WIDGET_TYPES, TRAY_WINDOW_MODULE_IDS, enforceSingleEnabledGlobalProfilePerAgent } from "../shared/app"; -import { createDefaultAppConfig } from "../shared/default-config"; -import { findProviderPresetByBaseUrl, providerApiKeySafetyIssue, providerEndpointCanReceiveProviderApiKey } from "./presets"; +import { loadPersistedAppConfig, replacePersistedAppConfig } from "@ccr/core/config/app-config-store"; +import { loadPersistedApiKeys, replacePersistedApiKeys } from "@ccr/core/config/api-key-store"; +import { CONFIG_FILE, GATEWAY_CONFIG_FILE, LEGACY_CONFIG_FILE, LEGACY_WINDOWS_CONFIG_FILE } from "@ccr/core/config/constants"; +import { normalizeCodexProviderAccountConfig } from "@ccr/core/agents/local-providers/codex"; +import { CLAUDE_CODE_DEFAULT_ENV, CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY_ENV, DEFAULT_OVERVIEW_WIDGETS, DEFAULT_TRAY_COMPONENT_VARIANTS, DEFAULT_TRAY_WIDGETS, DEFAULT_TRAY_WINDOW_MODULES, OVERVIEW_WIDGET_SIZE_VALUES, ROUTER_FALLBACK_MAX_RETRY_COUNT, TRAY_SINGLETON_WIDGET_TYPES, TRAY_TOP_WIDGET_TYPES, TRAY_WINDOW_MODULE_IDS, enforceSingleEnabledGlobalProfilePerAgent } from "@ccr/core/contracts/app"; +import { createDefaultAppConfig } from "@ccr/core/config/default-config"; +import { findProviderPresetByBaseUrl, providerApiKeySafetyIssue, providerEndpointCanReceiveProviderApiKey } from "@ccr/core/providers/presets/index"; import type { AppConfig, ApiKeyConfig, @@ -33,6 +33,8 @@ import type { ProviderAccountConfig, ProviderAccountConnectorConfig, ProviderCredentialConfig, + ProviderModelMetadata, + ProviderReasoningLevel, ProfileConfig, ProfileRuntimeConfig, ProxyRouteTarget, @@ -50,11 +52,12 @@ import type { TrayBalanceProgressConfig, TrayComponentVariants, TrayIconPreference, + ToolHubConfig, TrayWidgetConfig, TrayWidgetType, TrayWidgetVariant, TrayWindowModuleId -} from "../shared/app"; +} from "@ccr/core/contracts/app"; type LoadedProfileConfig = Partial> & { claudeCode?: Partial; @@ -66,7 +69,7 @@ type LoadedBotGatewayConfig = Partial> handoff?: Partial; }; -type LoadedAppConfig = Partial> & { +type LoadedAppConfig = Partial> & { Router?: Partial; agent?: Partial; botConfigs?: BotGatewaySavedConfig[]; @@ -75,9 +78,10 @@ type LoadedAppConfig = Partial; profile?: LoadedProfileConfig; proxy?: Partial; + toolHub?: Partial; }; -type RawAppConfigSource = "default" | "legacy-json" | "sqlite"; +export type RawAppConfigSource = "default" | "legacy-json" | "sqlite"; type RawAppConfigLoadResult = { source: RawAppConfigSource; @@ -209,7 +213,7 @@ export async function loadAppConfig(): Promise { try { const loadedRawConfig = await loadRawAppConfig(); const rawValue = loadedRawConfig.value; - const value = interpolateEnvVars(rawValue) as Partial; + const value = interpolateRawAppConfigEnvVars(rawValue, loadedRawConfig.source) as Partial; const picked = pickConfig(value); const providers = picked.Providers ?? DEFAULT_CONFIG.Providers; const port = picked.PORT ?? endpointPort(picked.routerEndpoint) ?? DEFAULT_CONFIG.PORT; @@ -274,7 +278,16 @@ export async function loadAppConfig(): Promise { ...(picked.proxy ?? {}), targets: picked.proxy?.targets?.length ? picked.proxy.targets : DEFAULT_CONFIG.proxy.targets }, - routerEndpoint: endpoint + routerEndpoint: endpoint, + toolHub: { + ...DEFAULT_CONFIG.toolHub, + ...(picked.toolHub ?? {}), + llm: { + ...DEFAULT_CONFIG.toolHub.llm, + ...(picked.toolHub?.llm ?? {}) + }, + mcpServers: picked.toolHub?.mcpServers ?? DEFAULT_CONFIG.toolHub.mcpServers + } }); const shouldPersistApiKeys = loadedApiKeys.length === 0 || hasConfigFileApiKeys(rawValue) || configFileApiKeys.length > 0; if (shouldPersistApiKeys) { @@ -615,6 +628,10 @@ function pickConfig(value: Partial): LoadedAppConfig { if (observability) { config.observability = observability; } + const toolHub = parseToolHub((value as Record).toolHub ?? (value as Record).tool_hub); + if (toolHub) { + config.toolHub = toolHub; + } if (typeof value.preferredProvider === "string" && value.preferredProvider.trim()) { config.preferredProvider = value.preferredProvider.trim(); } @@ -676,6 +693,53 @@ function parseObservability(value: unknown): Partial | unde return Object.keys(observability).length ? observability : undefined; } +function parseToolHub(value: unknown): Partial | undefined { + if (!isObject(value)) { + return undefined; + } + + const toolHub: Partial = {}; + if (typeof value.enabled === "boolean") { + toolHub.enabled = value.enabled; + } + const browserAutomation = value.browserAutomation ?? value.browser_automation; + if (typeof browserAutomation === "boolean") { + toolHub.browserAutomation = browserAutomation; + } + const maxTools = readNumber(value.maxTools ?? value.max_tools); + if (maxTools !== undefined) { + toolHub.maxTools = clampNumber(maxTools, 1, 20); + } + const requestTimeoutMs = readNumber(value.requestTimeoutMs ?? value.request_timeout_ms); + if (requestTimeoutMs !== undefined) { + toolHub.requestTimeoutMs = clampNumber(requestTimeoutMs, 8000, 300000); + } + const mcpServers = parseMcpServers(value.mcpServers ?? value.mcp_servers); + if (mcpServers) { + toolHub.mcpServers = mcpServers; + } + + const rawLlm = isObject(value.llm) ? value.llm : value; + const llm: Partial = {}; + const apiKey = readString(rawLlm.apiKey) || readString(rawLlm.api_key); + if (apiKey !== undefined) { + llm.apiKey = apiKey; + } + const baseUrl = readString(rawLlm.baseUrl) || readString(rawLlm.base_url); + if (baseUrl !== undefined) { + llm.baseUrl = baseUrl; + } + const model = readString(rawLlm.model); + if (model !== undefined) { + llm.model = model; + } + if (Object.keys(llm).length > 0) { + toolHub.llm = llm as ToolHubConfig["llm"]; + } + + return Object.keys(toolHub).length ? toolHub : undefined; +} + function parseOverviewWidgets(value: unknown): OverviewWidgetConfig[] | undefined { if (!Array.isArray(value)) { return undefined; @@ -973,6 +1037,7 @@ function parseProviders(value: unknown): GatewayProviderConfig[] | undefined { : []; const modelDescriptions = parseModelDescriptions(item.modelDescriptions ?? item.model_descriptions, models); const modelDisplayNames = parseModelDisplayNames(item.modelDisplayNames ?? item.model_display_names, models); + const modelMetadata = parseModelMetadata(item.modelMetadata ?? item.model_metadata, models); if (!name) { return undefined; @@ -995,6 +1060,7 @@ function parseProviders(value: unknown): GatewayProviderConfig[] | undefined { id: readString(item.id), modelDescriptions, modelDisplayNames, + modelMetadata, models, name, provider: readString(item.provider), @@ -1040,6 +1106,68 @@ function parseModelDisplayNames(value: unknown, models: string[]): Record 0 ? Object.fromEntries(entries) : undefined; } +function parseModelMetadata(value: unknown, models: string[]): Record | undefined { + if (!isObject(value)) { + return undefined; + } + + const modelIds = new Set(models); + const entries = Object.entries(value) + .map(([rawModel, rawMetadata]) => [rawModel.trim(), parseProviderModelMetadata(rawMetadata)] as const) + .filter((entry): entry is [string, ProviderModelMetadata] => { + const [model, metadata] = entry; + return Boolean(model && metadata && modelIds.has(model)); + }); + + return entries.length > 0 ? Object.fromEntries(entries) : undefined; +} + +function parseProviderModelMetadata(value: unknown): ProviderModelMetadata | undefined { + if (!isObject(value)) { + return undefined; + } + const supportedReasoningLevels = parseProviderReasoningLevels(value.supportedReasoningLevels ?? value.supported_reasoning_levels); + const metadata: ProviderModelMetadata = { + ...(Array.isArray(value.additionalSpeedTiers) ? { additionalSpeedTiers: value.additionalSpeedTiers } : {}), + ...(Array.isArray(value.additional_speed_tiers) ? { additionalSpeedTiers: value.additional_speed_tiers } : {}), + ...(value.defaultReasoningLevel === null ? { defaultReasoningLevel: null } : {}), + ...(readString(value.defaultReasoningLevel) ? { defaultReasoningLevel: readString(value.defaultReasoningLevel) } : {}), + ...(value.default_reasoning_level === null ? { defaultReasoningLevel: null } : {}), + ...(readString(value.default_reasoning_level) ? { defaultReasoningLevel: readString(value.default_reasoning_level) } : {}), + ...(readString(value.defaultReasoningSummary) ? { defaultReasoningSummary: readString(value.defaultReasoningSummary) } : {}), + ...(readString(value.default_reasoning_summary) ? { defaultReasoningSummary: readString(value.default_reasoning_summary) } : {}), + ...(Array.isArray(value.serviceTiers) ? { serviceTiers: value.serviceTiers } : {}), + ...(Array.isArray(value.service_tiers) ? { serviceTiers: value.service_tiers } : {}), + ...(supportedReasoningLevels ? { supportedReasoningLevels } : {}), + ...(typeof value.supportsReasoningSummaries === "boolean" ? { supportsReasoningSummaries: value.supportsReasoningSummaries } : {}), + ...(typeof value.supports_reasoning_summaries === "boolean" ? { supportsReasoningSummaries: value.supports_reasoning_summaries } : {}) + }; + return Object.keys(metadata).length > 0 ? metadata : undefined; +} + +function parseProviderReasoningLevels(value: unknown): ProviderReasoningLevel[] | undefined { + if (!Array.isArray(value)) { + return undefined; + } + const levels = value + .map((item): ProviderReasoningLevel | undefined => { + if (!isObject(item)) { + const effort = readString(item); + return effort ? { description: effort, effort } : undefined; + } + const effort = readString(item.effort); + if (!effort) { + return undefined; + } + return { + description: readString(item.description) || effort, + effort + }; + }) + .filter((item): item is ProviderReasoningLevel => Boolean(item)); + return levels.length > 0 ? levels : undefined; +} + function withProviderIds(providers: GatewayProviderConfig[]): GatewayProviderConfig[] { const counts = new Map(); return providers.map((provider) => { @@ -1737,7 +1865,7 @@ function parseMcpServers(value: unknown): GatewayMcpServerConfig[] | undefined { return undefined; } - const transport = parseMcpServerTransport(item.transport); + const transport = parseMcpServerTransport(item.transport ?? item.type); const name = readString(item.name) || (transport !== "stdio" ? readString(item.url) : readString(item.command)) || `mcp-${index + 1}`; const protocolVersion = readString(item.protocolVersion) || "2024-11-05"; const startupTimeoutMs = clampNumber(readNumber(item.startupTimeoutMs) ?? 600000, 100, 600000); @@ -1792,7 +1920,7 @@ function parseMcpServerTransport(value: unknown): GatewayMcpServerTransport { if (normalized === "sse") { return "sse"; } - if (normalized === "streamable-http" || normalized === "streamble-http" || normalized === "websocket") { + if (normalized === "http" || normalized === "streamable-http" || normalized === "streamablehttp" || normalized === "streamble-http" || normalized === "websocket") { return "streamable-http"; } return "stdio"; @@ -2135,8 +2263,10 @@ function parseProfiles(value: unknown): ProfileConfig[] | undefined { const botGateway = surface !== "cli" && parsedBotGateway ? completeBotGatewayConfig(parsedBotGateway) : undefined; if (agent === "claude-code") { + const appPath = readProfileAppPath(item, agent); return { agent, + ...(appPath ? { appPath } : {}), ...(botConfigId ? { botConfigId } : {}), ...(botGateway ? { botGateway } : {}), enabled, @@ -2151,8 +2281,10 @@ function parseProfiles(value: unknown): ProfileConfig[] | undefined { }; } + const appPath = readProfileAppPath(item, agent); return { agent, + ...(appPath ? { appPath } : {}), ...(botConfigId ? { botConfigId } : {}), ...(botGateway ? { botGateway } : {}), cliMiddleware: true, @@ -2182,6 +2314,18 @@ function parseProfiles(value: unknown): ProfileConfig[] | undefined { .filter((item): item is ProfileConfig => Boolean(item)); } +function readProfileAppPath(item: Record, agent: ProfileConfig["agent"]): string | undefined { + return readString(item.appPath) || + readString(item.app_path) || + readString(item.appExecutablePath) || + readString(item.app_executable_path) || + (agent === "claude-code" + ? readString(item.claudeAppPath) || readString(item.claude_app_path) + : agent === "codex" + ? readString(item.chatgptAppPath) || readString(item.chatgpt_app_path) || readString(item.codexAppPath) || readString(item.codex_app_path) + : readString(item.zcodeAppPath) || readString(item.zcode_app_path)); +} + function parseProfileAgent(value: unknown): ProfileConfig["agent"] | undefined { if (typeof value !== "string") { return undefined; @@ -2489,6 +2633,10 @@ function isDefaultSeedApiKey(apiKey: ApiKeyConfig): boolean { ); } +export function interpolateRawAppConfigEnvVars(value: unknown, source: RawAppConfigSource): unknown { + return source === "legacy-json" ? interpolateEnvVars(value) : value; +} + function interpolateEnvVars(value: unknown): unknown { if (typeof value === "string") { return value.replace(/\$\{([^}]+)\}|\$([A-Z_][A-Z0-9_]*)/g, (match, braced, unbraced) => { diff --git a/src/main/constants.ts b/packages/core/src/config/constants.ts similarity index 82% rename from src/main/constants.ts rename to packages/core/src/config/constants.ts index d97409b..b283061 100644 --- a/src/main/constants.ts +++ b/packages/core/src/config/constants.ts @@ -1,20 +1,18 @@ import path from "node:path"; -import { APP_NAME, APP_STORAGE_NAME, LEGACY_CONFIGDIR, resolveRuntimeAppPath } from "./app-paths"; -import { copyMissingDirectoryContents } from "./storage-migration"; +import { APP_NAME, APP_STORAGE_NAME, LEGACY_CONFIGDIR, resolveRuntimeAppPath, resolveRuntimeConfigDir, resolveRuntimeDataDir } from "@ccr/core/runtime/app-paths"; +import { copyMissingDirectoryContents } from "@ccr/core/storage/migration"; -export { IPC_CHANNELS } from "../shared/ipc-channels"; +export { IPC_CHANNELS } from "@ccr/core/contracts/ipc-channels"; export const LEGACY_CONFIG_FILE = path.join(LEGACY_CONFIGDIR, "config.json"); export { APP_NAME, APP_STORAGE_NAME, LEGACY_CONFIGDIR }; -export const CONFIGDIR = process.platform === "win32" - ? path.join(resolveRuntimeAppPath("appData"), APP_STORAGE_NAME) - : LEGACY_CONFIGDIR; +export const CONFIGDIR = resolveRuntimeConfigDir(); export const LEGACY_WINDOWS_CONFIGDIR = path.join(resolveRuntimeAppPath("appData"), APP_NAME); export const LEGACY_WINDOWS_CONFIG_FILE = path.join(LEGACY_WINDOWS_CONFIGDIR, "config.json"); export const CONFIG_FILE = path.join(CONFIGDIR, "config.json"); export const ONBOARDING_FINISHED_FILE = path.join(CONFIGDIR, ".onboard_finished"); -export const DATADIR = resolveRuntimeAppPath("userData"); +export const DATADIR = resolveRuntimeDataDir(); export const APP_CONFIG_DB_FILE = path.join(CONFIGDIR, "config.sqlite"); export const API_KEYS_DB_FILE = path.join(DATADIR, "api-keys.sqlite"); export const LEGACY_APP_CONFIG_DB_FILES = process.platform === "win32" ? [path.join(LEGACY_WINDOWS_CONFIGDIR, "config.sqlite")] : []; diff --git a/src/shared/default-config.ts b/packages/core/src/config/default-config.ts similarity index 94% rename from src/shared/default-config.ts rename to packages/core/src/config/default-config.ts index c7953cd..58a3868 100644 --- a/src/shared/default-config.ts +++ b/packages/core/src/config/default-config.ts @@ -6,7 +6,7 @@ import { DEFAULT_TRAY_WINDOW_MODULES, type AppConfig, type ProxyRouteTarget -} from "./app"; +} from "@ccr/core/contracts/app"; export const DEFAULT_PROXY_TARGETS: ProxyRouteTarget[] = [ { host: "api.anthropic.com", paths: ["/v1/messages", "/v1/messages/count_tokens"] }, @@ -169,6 +169,18 @@ export function createDefaultAppConfig(options: DefaultAppConfigOptions): AppCon trayProgressTargetTokens: 100000, trayWidgets: DEFAULT_TRAY_WIDGETS, trayWindowModules: DEFAULT_TRAY_WINDOW_MODULES, + toolHub: { + browserAutomation: false, + enabled: false, + llm: { + apiKey: "", + baseUrl: "https://api.openai.com/v1", + model: "" + }, + mcpServers: [], + maxTools: 10, + requestTimeoutMs: 60000 + }, virtualModelProfiles: [] }; } diff --git a/src/shared/app.ts b/packages/core/src/contracts/app.ts similarity index 93% rename from src/shared/app.ts rename to packages/core/src/contracts/app.ts index 3fb5606..1fa0e90 100644 --- a/src/shared/app.ts +++ b/packages/core/src/contracts/app.ts @@ -133,6 +133,7 @@ export type GatewayProviderConfig = { id?: string; modelDescriptions?: Record; modelDisplayNames?: Record; + modelMetadata?: Record; models: string[]; name: string; provider?: string; @@ -140,6 +141,20 @@ export type GatewayProviderConfig = { type?: GatewayProviderProtocol | string; }; +export type ProviderReasoningLevel = { + description: string; + effort: string; +}; + +export type ProviderModelMetadata = { + additionalSpeedTiers?: unknown[]; + defaultReasoningLevel?: string | null; + defaultReasoningSummary?: string; + serviceTiers?: unknown[]; + supportedReasoningLevels?: ProviderReasoningLevel[]; + supportsReasoningSummaries?: boolean; +}; + export type ProviderCredentialConfig = { account?: ProviderAccountConfig; api_key?: string; @@ -160,6 +175,7 @@ export type ProviderAccountStatus = "ok" | "warning" | "critical" | "error" | "u export type ProviderAccountMeterKind = "balance" | "subscription" | "quota" | "time_window" | "tokens" | "requests"; export type ProviderAccountMeterUnit = "USD" | "CNY" | "hours" | "minutes" | "tokens" | "requests" | string; export type ProviderAccountMeterWindow = "5h" | "daily" | "weekly" | "monthly" | string; +export type ProviderAccountHttpJsonParser = "kimi-code-usages" | "new-api-key-usage" | "new-api-user-self"; export type ProviderAccountConfig = { connectors?: ProviderAccountConnectorConfig[]; @@ -193,7 +209,7 @@ export type ProviderAccountHttpJsonConnectorConfig = ProviderAccountConnectorBas headers?: Record; mapping: ProviderAccountMappingConfig; method?: "GET" | "POST"; - parser?: "kimi-code-usages"; + parser?: ProviderAccountHttpJsonParser; type: "http-json"; }; @@ -292,6 +308,7 @@ export type ProviderDeepLinkPayload = { icon?: string; modelDescriptions?: Record; modelDisplayNames?: Record; + modelMetadata?: Record; models: string[]; name?: string; protocol?: GatewayProviderProtocol; @@ -322,6 +339,7 @@ export type LocalAgentProviderCandidate = { importable: boolean; kind: LocalAgentProviderKind; modelDisplayNames?: Record; + modelMetadata?: Record; models: string[]; name: string; protocol: GatewayProviderProtocol; @@ -340,6 +358,16 @@ export type LocalAgentProviderImportResult = { providerPlugins: unknown[]; }; +export type LocalAgentProviderProbeRequest = { + forceRefresh?: boolean; + id: string; +}; + +export type LocalAgentProviderProbeResult = { + candidate: LocalAgentProviderCandidate; + probe: GatewayProviderProbeResult; +}; + export type ProviderCatalogModelsRequest = { baseUrl?: string; name?: string; @@ -351,6 +379,7 @@ export type ProviderCatalogModelsResult = { loadedFrom?: string; matchedBy?: "base-url" | "provider-id" | "provider-name"; modelDisplayNames?: Record; + modelMetadata?: Record; models: string[]; provider?: string; providerName?: string; @@ -405,6 +434,8 @@ export type GatewayProviderCapability = { type: GatewayProviderProtocol; }; +export type GatewayProviderDetectedProvider = "new-api"; + export type GatewayProviderProbeRequest = { apiKey?: string; baseUrl: string; @@ -417,6 +448,7 @@ export type GatewayProviderProbeRequest = { export type GatewayProviderProbeCandidate = { baseUrl: string; + declaredProtocols?: GatewayProviderProtocol[]; label?: string; protocols: GatewayProviderProtocol[]; source: "custom" | "preset"; @@ -445,6 +477,7 @@ export type ProviderIconDetectionResult = { export type GatewayProviderProbeProtocolResult = { baseUrl?: string; + detectedProvider?: GatewayProviderDetectedProvider; endpoint: string; message: string; protocol: GatewayProviderProtocol; @@ -453,9 +486,12 @@ export type GatewayProviderProbeProtocolResult = { }; export type GatewayProviderProbeResult = { + account?: ProviderAccountConfig; capabilities?: GatewayProviderCapability[]; + detectedProvider?: GatewayProviderDetectedProvider; detectedProtocol?: GatewayProviderProtocol; modelDisplayNames?: Record; + modelMetadata?: Record; modelSource?: "anthropic" | "gemini" | "openai"; models: string[]; normalizedBaseUrl: string; @@ -635,6 +671,21 @@ export type GatewayAgentConfig = { mcpServers: GatewayMcpServerConfig[]; }; +export type ToolHubLlmConfig = { + apiKey: string; + baseUrl: string; + model: string; +}; + +export type ToolHubConfig = { + browserAutomation: boolean; + enabled: boolean; + llm: ToolHubLlmConfig; + mcpServers: GatewayMcpServerConfig[]; + maxTools: number; + requestTimeoutMs: number; +}; + export const CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY_ENV = "CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY"; export const CLAUDE_CODE_DEFAULT_ENV: Record = { [CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY_ENV]: "1" @@ -1086,6 +1137,7 @@ export type CodexProfileConfig = { export type ProfileConfig = { agent: ProfileClientKind; + appPath?: string; botConfigId?: string; botGateway?: BotGatewayRuntimeConfig; configFile?: string; @@ -1396,6 +1448,7 @@ export type AppConfig = { trayIcon: TrayIconPreference; trayWidgets: TrayWidgetConfig[]; trayWindowModules: TrayWindowModuleId[]; + toolHub: ToolHubConfig; virtualModelProfiles?: VirtualModelProfileConfig[]; }; @@ -1453,12 +1506,91 @@ export type BuiltInBrowserTabState = { url: string; }; +export type BuiltInBrowserAutomationHandoffKind = + | "blocked" + | "human_verification" + | "login_required" + | "other" + | "verification_code"; + +export type BuiltInBrowserAutomationHandoff = { + id: string; + kind: BuiltInBrowserAutomationHandoffKind; + message: string; + reason?: string; + requestedAt: number; + sessionId?: string; + status: "pending"; + tabId?: string; +}; + export type BuiltInBrowserState = { activeTabId?: string; apps: InstalledBrowserApp[]; + automationHandoff?: BuiltInBrowserAutomationHandoff; tabs: BuiltInBrowserTabState[]; }; +export type ChromeLoginImportTarget = "browser" | "browser-and-web-search"; + +export type ChromeLoginImportStatus = + | "completed" + | "expired" + | "failed" + | "pending"; + +export type ChromeLoginImportRequest = { + domains: string[]; + openConfirmationPage?: boolean; + target?: ChromeLoginImportTarget; +}; + +export type ChromeLoginImportResult = { + completedAt: number; + cookieImported: number; + cookieSkipped: number; + domains: string[]; + errors?: string[]; + imported: number; + localStorageImported: number; + localStorageSkipped: number; + partitions: string[]; + skipped: number; +}; + +export type ChromeLoginImportJob = { + confirmUrl: string; + createdAt: number; + domains: string[]; + endpointUrl: string; + expiresAt: number; + id: string; + importUrl: string; + result?: ChromeLoginImportResult; + status: ChromeLoginImportStatus; + target: ChromeLoginImportTarget; +}; + +export type ChromeLoginImportCookie = { + domain: string; + expirationDate?: number; + hostOnly?: boolean; + httpOnly?: boolean; + name: string; + partitionKey?: unknown; + path?: string; + sameSite?: "lax" | "no_restriction" | "strict" | "unspecified"; + secure?: boolean; + session?: boolean; + storeId?: string; + value: string; +}; + +export type ChromeLoginImportLocalStorage = { + items: Record; + origin: string; +}; + export type ProxyCertificateInstallResult = { caCertFile: string; manualCommand?: string; diff --git a/src/shared/deep-link.ts b/packages/core/src/contracts/deep-link.ts similarity index 99% rename from src/shared/deep-link.ts rename to packages/core/src/contracts/deep-link.ts index 5b9999e..b8bb98a 100644 --- a/src/shared/deep-link.ts +++ b/packages/core/src/contracts/deep-link.ts @@ -6,8 +6,8 @@ import type { ProviderDeepLinkPayload, ProviderDeepLinkRequest, ProviderManifestDeepLinkPayload -} from "./app"; -import { providerUrlWithDefaultScheme } from "./provider-url"; +} from "@ccr/core/contracts/app"; +import { providerUrlWithDefaultScheme } from "@ccr/core/providers/url"; export const appDeepLinkProtocol = "ccr"; export const providerDeepLinkHost = "provider"; diff --git a/src/shared/i18n.ts b/packages/core/src/contracts/i18n.ts similarity index 99% rename from src/shared/i18n.ts rename to packages/core/src/contracts/i18n.ts index 0b5b927..4cc9c57 100644 --- a/src/shared/i18n.ts +++ b/packages/core/src/contracts/i18n.ts @@ -273,8 +273,8 @@ const zhPatternErrorMessages: PatternTranslator[] = [ translate: (endpoint, status) => `CDP ${endpoint} 返回 HTTP ${status}` }, { - pattern: /^Timed out waiting for Codex App response: (.+)$/, - translate: (requestId) => `等待 Codex App 响应超时：${requestId}` + pattern: /^Timed out waiting for (?:ChatGPT|Codex App) response: (.+)$/, + translate: (requestId) => `等待 ChatGPT 响应超时：${requestId}` }, { pattern: /^No active turn for thread (.+)$/, diff --git a/src/shared/ipc-channels.ts b/packages/core/src/contracts/ipc-channels.ts similarity index 93% rename from src/shared/ipc-channels.ts rename to packages/core/src/contracts/ipc-channels.ts index 103b0b0..6a89c08 100644 --- a/src/shared/ipc-channels.ts +++ b/packages/core/src/contracts/ipc-channels.ts @@ -43,6 +43,7 @@ export const IPC_CHANNELS = { appBotHandoffBluetoothTargetsScan: "ccr:app:bot-handoff-bluetooth-targets-scan", appBotHandoffWifiTargetsScan: "ccr:app:bot-handoff-wifi-targets-scan", appCheckProviderConnectivity: "ccr:app:check-provider-connectivity", + appProbeLocalAgentProvider: "ccr:app:probe-local-agent-provider", appProbeProvider: "ccr:app:probe-provider", appProbeProviderCandidates: "ccr:app:probe-provider-candidates", appProviderDeepLink: "ccr:app:provider-deep-link", @@ -73,10 +74,13 @@ export const IPC_CHANNELS = { browserBack: "ccr:browser:back", browserCloseTab: "ccr:browser:close-tab", browserForward: "ccr:browser:forward", + browserGetChromeLoginImport: "ccr:browser:get-chrome-login-import", browserGetState: "ccr:browser:get-state", browserNavigate: "ccr:browser:navigate", browserNewTab: "ccr:browser:new-tab", browserReload: "ccr:browser:reload", + browserResolveAutomationHandoff: "ccr:browser:resolve-automation-handoff", browserSelectTab: "ccr:browser:select-tab", + browserStartChromeLoginImport: "ccr:browser:start-chrome-login-import", browserStateChanged: "ccr:browser:state-changed" } as const; diff --git a/packages/core/src/entrypoints/server.ts b/packages/core/src/entrypoints/server.ts new file mode 100644 index 0000000..2059d8a --- /dev/null +++ b/packages/core/src/entrypoints/server.ts @@ -0,0 +1,129 @@ +#!/usr/bin/env node +import { startWebManagementServer } from "@ccr/core/web/management-server"; + +type CoreServerOptions = { + help: boolean; + host?: string; + open: boolean; + port?: number; + startGateway: boolean; +}; + +export async function runCoreServer(args = process.argv.slice(2)): Promise { + const options = parseCoreServerArgs(args); + if (options.help) { + printHelp(); + return; + } + + const runtime = await startWebManagementServer({ + host: options.host, + open: options.open, + port: options.port, + startGateway: options.startGateway + }); + process.stdout.write(`CCR core server is running at ${runtime.url}\n`); + + let closing = false; + const shutdown = (signal: NodeJS.Signals) => { + if (closing) { + return; + } + closing = true; + void runtime.close().finally(() => { + process.exit(signal === "SIGINT" ? 130 : 143); + }); + }; + process.once("SIGINT", shutdown); + process.once("SIGTERM", shutdown); + await new Promise(() => undefined); +} + +function parseCoreServerArgs(args: string[]): CoreServerOptions { + const options: CoreServerOptions = { + help: false, + open: false, + startGateway: true + }; + + for (let index = 0; index < args.length; index += 1) { + const arg = args[index]; + if (arg === "--help" || arg === "-h") { + options.help = true; + continue; + } + if (arg === "--open") { + options.open = true; + continue; + } + if (arg === "--no-open") { + options.open = false; + continue; + } + if (arg === "--gateway") { + options.startGateway = true; + continue; + } + if (arg === "--no-gateway") { + options.startGateway = false; + continue; + } + if (arg === "--host") { + index += 1; + options.host = requiredArg(args[index], "--host"); + continue; + } + if (arg.startsWith("--host=")) { + options.host = requiredArg(arg.slice("--host=".length), "--host"); + continue; + } + if (arg === "--port") { + index += 1; + options.port = parsePort(requiredArg(args[index], "--port")); + continue; + } + if (arg.startsWith("--port=")) { + options.port = parsePort(requiredArg(arg.slice("--port=".length), "--port")); + continue; + } + throw new Error(`Unknown core server option: ${arg}`); + } + + return options; +} + +function printHelp(): void { + process.stdout.write([ + "Usage:", + " ccr-core-server [--host ] [--port ] [--no-gateway]", + "", + "Options:", + " --host Management server host. Defaults to CCR_WEB_HOST or 127.0.0.1.", + " --port Management server port. Defaults to CCR_WEB_PORT or 3458.", + " --no-gateway Start only the web management server.", + "", + "Environment:", + " CCR_WEB_AUTH_TOKEN Use this token for management UI and RPC authentication." + ].join("\n") + "\n"); +} + +function requiredArg(value: string | undefined, flag: string): string { + if (!value) { + throw new Error(`Missing value for ${flag}`); + } + return value; +} + +function parsePort(value: string): number { + const port = Number(value); + if (!Number.isInteger(port) || port <= 0 || port > 65535) { + throw new Error(`Invalid port: ${value}`); + } + return port; +} + +runCoreServer().catch((error) => { + const message = error instanceof Error ? error.message : String(error); + process.stderr.write(`${message}\n`); + process.exitCode = 1; +}); diff --git a/src/server/gateway/claude-code-router-plugin.ts b/packages/core/src/gateway/claude-code-router-plugin.ts similarity index 89% rename from src/server/gateway/claude-code-router-plugin.ts rename to packages/core/src/gateway/claude-code-router-plugin.ts index 18d6d51..579ea5d 100644 --- a/src/server/gateway/claude-code-router-plugin.ts +++ b/packages/core/src/gateway/claude-code-router-plugin.ts @@ -2,8 +2,8 @@ import { createRequire } from "node:module"; import { EventEmitter } from "node:events"; import os from "node:os"; import path from "node:path"; -import { availableGatewayModelIds, type AppConfig, type RouterBuiltInAgentRuleId, type RouterConfig, type RouterFallbackConfig, type RouterRule, type RouterRuleCondition, type RouterRuleRewrite } from "../../shared/app"; -import { CONFIGDIR } from "../../main/constants"; +import { availableGatewayModelIds, type AppConfig, type RouterBuiltInAgentRuleId, type RouterConfig, type RouterFallbackConfig, type RouterRule, type RouterRuleCondition, type RouterRuleRewrite } from "@ccr/core/contracts/app"; +import { CONFIGDIR } from "@ccr/core/config/constants"; type HeaderValue = string | string[] | undefined; @@ -57,6 +57,7 @@ export class ClaudeCodeRouterPlugin { }; if (builtInAgentRouteMatches(request, this.config, "claude-code")) { injectClaudeCodeAgentToolDescription(body, this.config); + injectClaudeCodeToolHubInstructions(body, this.config); removeClaudeCodeBillingSystemHeader(body); request.builtInSubagentModel = extractAndRemoveClaudeCodeSubagentModelTag(body); } @@ -245,7 +246,7 @@ function resolveBuiltInClaudeCodeSubagentRouteDecision( return undefined; } const target = normalizeRouteSelector(request.builtInSubagentModel); - if (!target) { + if (!target || isSubagentModelPlaceholder(target) || !isKnownInlineRoute(target, config)) { return undefined; } return { @@ -321,6 +322,7 @@ function builtInAgentUserAgentNeedle(agent: RouterBuiltInAgentRuleId): string { const ccrSubagentModelOpenTag = ""; const ccrSubagentModelCloseTag = ""; const ccrSubagentModelTagExample = `${ccrSubagentModelOpenTag}Provider/model${ccrSubagentModelCloseTag}`; +const ccrSubagentModelPlaceholder = "provider/model"; const claudeCodeBillingSystemHeaderPrefix = "x-anthropic-billing-header"; const ccrSubagentToolModelInstruction = `CCR subagent routing is enabled. When calling this tool, the prompt parameter MUST start with ` + @@ -342,6 +344,107 @@ const ccrSubagentPromptFieldInstruction = type ClaudeCodeSubagentToolKind = "subagent" | "workflow"; const claudeCodeAgentToolNames = new Set(["agent", "task"]); const claudeCodeWorkflowToolNames = new Set(["workflow"]); +const ccrToolHubSystemInstructionMarker = "CCR ToolHub tool resolution is enabled."; + +function claudeCodeToolName(tool: Record): string | undefined { + const functionSpec = isRecord(tool.function) ? tool.function : undefined; + return readString(tool.name) ?? readString(functionSpec?.name); +} + +function normalizeClaudeCodeToolName(toolName: string | undefined): string { + return toolName?.toLowerCase().replace(/[-._]/g, "") ?? ""; +} + +function injectClaudeCodeToolHubInstructions(body: Record, config: AppConfig): void { + if (!config.toolHub?.enabled || !Array.isArray(body.tools)) { + return; + } + const toolNames = claudeCodeToolHubToolNames(body.tools); + if (!toolNames.resolve) { + return; + } + const invokeName = toolNames.invoke ?? "tool_hub.invoke"; + appendSystemInstruction(body, [ + ccrToolHubSystemInstructionMarker, + `The ToolHub search/resolution tool is ${toolNames.resolve}; call this actual tool, do not merely mention its name in text.`, + `You MUST call the ToolHub search/resolution tool ${toolNames.resolve} before answering any request that asks about external services, installed MCP capabilities, business APIs, orders, coupons, stores, accounts, available tools, or capabilities that are not already obvious from the eager tools.`, + `Do this even if the user did not mention ToolHub or ${toolNames.resolve}. Only skip the ToolHub search/resolution tool when the request is clearly local code/file/shell work or simple conversation that does not need an external or MCP capability.`, + `If ${toolNames.resolve} returns selected tools, call the ToolHub invocation tool ${invokeName} to run the selected tool instead of telling the user that no such capability is available.`, + "When the ToolHub resolve result includes executionPlanJs or workflowSketch, treat that JavaScript as the invocation dependency plan: await means serial order, and only callTool calls grouped inside the same Promise.all may be issued in parallel.", + "Use the user's request as the task and include concise context when resolving. Do not ask the user to name the MCP tool unless the task is genuinely ambiguous after resolution." + ].join("\n")); +} + +function claudeCodeToolHubToolNames(tools: unknown[]): { invoke?: string; resolve?: string } { + const names: { invoke?: string; resolve?: string } = {}; + for (const tool of tools) { + if (!isRecord(tool)) { + continue; + } + const name = claudeCodeToolName(tool); + const normalized = normalizeClaudeCodeToolName(name); + if (normalized.endsWith("toolhubresolve") && shouldUseClaudeCodeToolHubName(names.resolve, name)) { + names.resolve = name; + } + if (normalized.endsWith("toolhubinvoke") && shouldUseClaudeCodeToolHubName(names.invoke, name)) { + names.invoke = name; + } + } + return names; +} + +function shouldUseClaudeCodeToolHubName(current: string | undefined, candidate: string | undefined): boolean { + if (!candidate) { + return false; + } + if (!current) { + return true; + } + return claudeCodeToolHubNameScore(candidate) > claudeCodeToolHubNameScore(current); +} + +function claudeCodeToolHubNameScore(name: string): number { + const normalized = name.toLowerCase(); + if (normalized.startsWith("mcp__ccr-toolhub__") || normalized.startsWith("mcp__ccr_toolhub__")) { + return 3; + } + if (normalized.startsWith("mcp__") && normalized.includes("toolhub")) { + return 2; + } + if (normalized.startsWith("mcp__")) { + return 1; + } + return 0; +} + +function appendSystemInstruction(body: Record, instruction: string): void { + if (systemContainsInstruction(body.system, ccrToolHubSystemInstructionMarker)) { + return; + } + if (typeof body.system === "string") { + body.system = body.system.trim() ? `${body.system}\n\n${instruction}` : instruction; + return; + } + if (Array.isArray(body.system)) { + body.system.push({ text: instruction, type: "text" }); + return; + } + if (body.system === undefined) { + body.system = [{ text: instruction, type: "text" }]; + } +} + +function systemContainsInstruction(system: unknown, marker: string): boolean { + if (typeof system === "string") { + return system.includes(marker); + } + if (!Array.isArray(system)) { + return false; + } + return system.some((block) => typeof block === "string" + ? block.includes(marker) + : isRecord(block) && typeof block.text === "string" && block.text.includes(marker)); +} function injectClaudeCodeAgentToolDescription(body: Record, config: AppConfig): void { if (!Array.isArray(body.tools)) { @@ -1098,6 +1201,10 @@ function isKnownInlineRoute(model: string | undefined, config: AppConfig): boole return config.Providers.some((provider) => provider.name.trim().toLowerCase() === providerName); } +function isSubagentModelPlaceholder(model: string): boolean { + return model.trim().toLowerCase() === ccrSubagentModelPlaceholder; +} + function calculateTokenCount(messages: unknown, system: unknown, tools: unknown): number { return countMessageTokens(messages) + countSystemTokens(system) + countToolTokens(tools); } diff --git a/src/server/gateway/model-catalog.ts b/packages/core/src/gateway/model-catalog.ts similarity index 99% rename from src/server/gateway/model-catalog.ts rename to packages/core/src/gateway/model-catalog.ts index 5220e95..b32e2e6 100644 --- a/src/server/gateway/model-catalog.ts +++ b/packages/core/src/gateway/model-catalog.ts @@ -1,4 +1,4 @@ -import { loadModelCatalogPayload } from "../../main/model-catalog-file"; +import { loadModelCatalogPayload } from "@ccr/core/models/catalog-file"; const claudeCodeDefaultContextTokens = 200_000; let modelCatalogIndex: ModelCatalogIndex | undefined; diff --git a/src/server/gateway/remote-control-service.ts b/packages/core/src/gateway/remote-control-service.ts similarity index 100% rename from src/server/gateway/remote-control-service.ts rename to packages/core/src/gateway/remote-control-service.ts diff --git a/packages/core/src/gateway/runtime-change.ts b/packages/core/src/gateway/runtime-change.ts new file mode 100644 index 0000000..1097362 --- /dev/null +++ b/packages/core/src/gateway/runtime-change.ts @@ -0,0 +1,23 @@ +import type { AppConfig } from "@ccr/core/contracts/app"; + +export function shouldRestartGatewayForRuntimeConfigChange(previousConfig: AppConfig, nextConfig: AppConfig): boolean { + return ( + previousConfig.gateway.enabled !== nextConfig.gateway.enabled || + previousConfig.gateway.host !== nextConfig.gateway.host || + previousConfig.gateway.port !== nextConfig.gateway.port || + previousConfig.gateway.coreHost !== nextConfig.gateway.coreHost || + previousConfig.gateway.corePort !== nextConfig.gateway.corePort || + previousConfig.proxy.enabled !== nextConfig.proxy.enabled || + previousConfig.proxy.host !== nextConfig.proxy.host || + previousConfig.proxy.mode !== nextConfig.proxy.mode || + previousConfig.proxy.port !== nextConfig.proxy.port || + previousConfig.proxy.systemProxy !== nextConfig.proxy.systemProxy || + JSON.stringify(previousConfig.proxy.targets) !== JSON.stringify(nextConfig.proxy.targets) || + JSON.stringify(previousConfig.agent) !== JSON.stringify(nextConfig.agent) || + JSON.stringify(previousConfig.Providers) !== JSON.stringify(nextConfig.Providers) || + JSON.stringify(previousConfig.plugins) !== JSON.stringify(nextConfig.plugins) || + JSON.stringify(previousConfig.providerPlugins) !== JSON.stringify(nextConfig.providerPlugins) || + JSON.stringify(previousConfig.toolHub) !== JSON.stringify(nextConfig.toolHub) || + JSON.stringify(previousConfig.virtualModelProfiles) !== JSON.stringify(nextConfig.virtualModelProfiles) + ); +} diff --git a/src/server/gateway/service.ts b/packages/core/src/gateway/service.ts similarity index 93% rename from src/server/gateway/service.ts rename to packages/core/src/gateway/service.ts index 1680d7f..1131954 100644 --- a/src/server/gateway/service.ts +++ b/packages/core/src/gateway/service.ts @@ -22,35 +22,36 @@ import type { VirtualModelFusionVisionConfig, VirtualModelFusionWebSearchConfig, VirtualModelFusionWebSearchProvider -} from "../../shared/app"; +} from "@ccr/core/contracts/app"; import { CLAUDE_APP_FALLBACK_MODEL, buildClaudeAppGatewayModelRoutes, inferClaudeAppGatewayTargetModel, resolveClaudeAppGatewayRouteModel, type ClaudeAppGatewayModelRouteOptions -} from "../../shared/claude-app-gateway"; +} from "@ccr/core/agents/claude-app/gateway-routes"; import { BUILTIN_FUSION_VISION_TOOL_NAME, BUILTIN_FUSION_WEB_SEARCH_TOOL_NAME, NO_AVAILABLE_GATEWAY_MODELS_MESSAGE, ROUTER_FALLBACK_MAX_RETRY_COUNT, hasAvailableGatewayModels -} from "../../shared/app"; -import { findProviderPresetByBaseUrl, providerApiKeySafetyIssue } from "../../main/presets"; -import { normalizeProviderBaseUrl as normalizeProviderBaseUrlInput } from "../../shared/provider-url"; -import { backendService } from "../backend-service"; -import { RAW_TRACE_SPOOL_DIR } from "../../main/constants"; -import { loadPersistedApiKeys } from "../../main/api-key-store"; -import { codexDefaultBaseUrl, readCodexAuth } from "../../main/local-agent-provider-service"; -import { fetchWithSystemProxy, getSystemProxyUrlForProtocol } from "../../main/system-proxy-fetch"; -import { handleNetworkCaptureMcpRequest, isNetworkCaptureMcpPath } from "../mcp/network-capture-mcp"; -import { pluginService } from "../../main/plugins/service"; -import { proxyService } from "../proxy/service"; -import { createSseErrorDetector, recordGatewayRequestLog, updateGatewayRequestLogFromRawTrace, type RequestLogRawTraceUpdateInput } from "../../main/request-log-store"; -import { recordGatewayUsageCapture } from "../../main/usage-store"; -import { ClaudeCodeRouterPlugin, normalizeRouteSelector } from "./claude-code-router-plugin"; -import { ccrRemoteControlPathPrefix, ccrRemoteControlService } from "./remote-control-service"; +} from "@ccr/core/contracts/app"; +import { findProviderPresetByBaseUrl, providerApiKeySafetyIssue } from "@ccr/core/providers/presets/index"; +import { normalizeProviderBaseUrl as normalizeProviderBaseUrlInput } from "@ccr/core/providers/url"; +import { backendService } from "@ccr/core/plugins/backend-service"; +import { RAW_TRACE_SPOOL_DIR } from "@ccr/core/config/constants"; +import { loadPersistedApiKeys } from "@ccr/core/config/api-key-store"; +import { codexDefaultBaseUrl, readCodexAuth } from "@ccr/core/agents/local-providers/service"; +import { fetchWithSystemProxy, getSystemProxyUrlForProtocol } from "@ccr/core/proxy/system-proxy-fetch"; +import { handleNetworkCaptureMcpRequest, isNetworkCaptureMcpPath } from "@ccr/core/mcp/network-capture-mcp"; +import { BROWSER_AUTOMATION_MCP_PATH, TOOL_HUB_MCP_SERVER_NAME, browserAutomationMcpEnabled, toolHubBuiltInBackendServers, toolHubMcpRuntimeConfig, toolHubRequestTimeoutMs } from "@ccr/core/mcp/toolhub-config"; +import { pluginService } from "@ccr/core/plugins/service"; +import { proxyService } from "@ccr/core/proxy/service"; +import { createSseErrorDetector, recordGatewayRequestLog, updateGatewayRequestLogFromRawTrace, type RequestLogRawTraceUpdateInput } from "@ccr/core/observability/request-log-store"; +import { recordGatewayUsageCapture } from "@ccr/core/usage/store"; +import { ClaudeCodeRouterPlugin, normalizeRouteSelector } from "@ccr/core/gateway/claude-code-router-plugin"; +import { ccrRemoteControlPathPrefix, ccrRemoteControlService } from "@ccr/core/gateway/remote-control-service"; import { claudeCodeEffectiveMaxInputTokens, findModelCatalogEntry, @@ -59,7 +60,7 @@ import { readCatalogCapability, type ModelCatalogCapabilities, type ModelCatalogEntry -} from "./model-catalog"; +} from "@ccr/core/gateway/model-catalog"; type CoreGatewayProvider = { apikey?: string; @@ -129,6 +130,7 @@ export type BrowserWebSearchMcpRegistration = { export type BrowserWebSearchProtocolResult = { content?: string; + diagnostics?: string[]; snippet?: string; title: string; url: string; @@ -150,6 +152,11 @@ export type BrowserWebSearchMcpIntegration = { stopBrowserWebSearchMcpServers: () => Promise; }; +export type BrowserAutomationMcpIntegration = { + handleBrowserAutomationMcpRequest: (request: IncomingMessage, response: ServerResponse) => Promise; + stopBrowserAutomationMcpServer: () => Promise; +}; + type CoreGatewayHealth = { runtimeId?: string; status?: string; @@ -311,6 +318,7 @@ const persistedApiKeyCacheTtlMs = 1000; let persistedApiKeyCache: { loadedAt: number; values: ApiKeyConfig[] } | undefined; class GatewayService { + private browserAutomationMcpIntegration?: BrowserAutomationMcpIntegration; private browserWebSearchMcpIntegration?: BrowserWebSearchMcpIntegration; private child?: ChildProcess; private config?: AppConfig; @@ -331,14 +339,19 @@ class GatewayService { this.browserWebSearchMcpIntegration = integration; } + setBrowserAutomationMcpIntegration(integration: BrowserAutomationMcpIntegration): void { + this.browserAutomationMcpIntegration = integration; + } + async start(config: AppConfig): Promise { const coreHostError = loopbackCoreHostError(config.gateway.coreHost); if (coreHostError) { - return { + this.status = { ...this.getStatus(), lastError: coreHostError, state: "error" }; + return this.status; } await this.stop(); this.config = config; @@ -379,7 +392,7 @@ class GatewayService { } if (shouldRunGateway) { - await writeCoreGatewayConfig(config, this.rawTraceSyncToken, this.browserWebSearchMcpIntegration); + await writeCoreGatewayConfig(config, this.rawTraceSyncToken, this.coreAuthToken, this.browserWebSearchMcpIntegration); await stopPreviousManagedCoreGateway(config, this.status.coreEndpoint); if (await isCoreGatewayHealthy(this.status.coreEndpoint)) { throw new Error(`Core gateway endpoint is already in use: ${this.status.coreEndpoint}`); @@ -388,11 +401,12 @@ class GatewayService { const runtimeId = randomUUID(); const upstreamProxyUrl = proxyService.getUpstreamProxyUrl("https") ?? await getSystemProxyUrlForProtocol("https"); this.child = spawnGatewayProcess(config, upstreamProxyUrl, runtimeId, this.coreAuthToken); + const managedChild = this.child; writeManagedCoreGatewayMarker(config, this.child, runtimeId); this.child.stdout?.on("data", (chunk) => console.info(`[gateway] ${chunk.toString().trimEnd()}`)); this.child.stderr?.on("data", (chunk) => console.warn(`[gateway] ${chunk.toString().trimEnd()}`)); this.child.on("exit", (code, signal) => { - void this.handleCoreGatewayExit(code, signal); + void this.handleCoreGatewayExit(managedChild, code, signal); }); } @@ -437,6 +451,9 @@ class GatewayService { await this.browserWebSearchMcpIntegration?.stopBrowserWebSearchMcpServers().catch((error) => { console.warn(`[gateway] Failed to stop browser web search MCP: ${formatError(error)}`); }); + await this.browserAutomationMcpIntegration?.stopBrowserAutomationMcpServer().catch((error) => { + console.warn(`[gateway] Failed to stop browser automation MCP: ${formatError(error)}`); + }); this.status = { ...this.status, @@ -495,8 +512,8 @@ class GatewayService { }); } - private async handleCoreGatewayExit(code: number | null, signal: NodeJS.Signals | null): Promise { - if (this.status.state === "stopped") { + private async handleCoreGatewayExit(child: ChildProcess, code: number | null, signal: NodeJS.Signals | null): Promise { + if (this.child !== child || this.status.state === "stopped") { return; } removeManagedCoreGatewayMarker(this.config); @@ -549,6 +566,31 @@ class GatewayService { return; } + if (path === BROWSER_AUTOMATION_MCP_PATH || path === `${BROWSER_AUTOMATION_MCP_PATH}/`) { + if (!browserAutomationMcpEnabled(this.config)) { + sendJson(response, 404, { + error: { + message: "CCR browser automation MCP is disabled." + } + }); + return; + } + const authorization = await authorize(request, response, this.config); + if (!authorization.ok) { + return; + } + if (!this.browserAutomationMcpIntegration) { + sendJson(response, 503, { + error: { + message: "CCR browser automation MCP is only available in the Electron desktop app." + } + }); + return; + } + await this.browserAutomationMcpIntegration.handleBrowserAutomationMcpRequest(request, response); + return; + } + if (isNetworkCaptureMcpPath(path)) { if (!this.config.proxy.captureNetwork) { sendJson(response, 404, { error: { message: "Network capture MCP is disabled." } }); @@ -635,7 +677,7 @@ class GatewayService { const client = inferGatewayClient(apiKey, request.headers); const cursorCompatPreparation = prepareCursorOpenAICompatChatBody(this.config, client, method, path, requestBody); if (cursorCompatPreparation) { - headers["x-ccr-cursor-openai-compat"] = cursorCompatPreparation.diagnostic; + headers["x-ccr-cursor-openai-compat"] = sanitizeHeaderValue(cursorCompatPreparation.diagnostic); } let bodyToForward: Buffer | undefined = cursorCompatPreparation?.body ?? requestBody; let routeFallback = this.config.Router.fallback; @@ -643,12 +685,12 @@ class GatewayService { let codexApplyPatchBridgeActive = false; const claudeModelRewrite = prepareClaudeCodeDiscoveredModelRequest(this.config, request.headers, method, path, bodyToForward); if (claudeModelRewrite) { - headers["x-ccr-claude-model-discovery"] = claudeModelRewrite.diagnostic; + headers["x-ccr-claude-model-discovery"] = sanitizeHeaderValue(claudeModelRewrite.diagnostic); bodyToForward = claudeModelRewrite.body; } const claudeAppModelRewrite = prepareClaudeAppFallbackModelRequest(this.config, method, path, bodyToForward); if (claudeAppModelRewrite) { - headers["x-ccr-claude-app-model-rewrite"] = claudeAppModelRewrite.diagnostic; + headers["x-ccr-claude-app-model-rewrite"] = sanitizeHeaderValue(claudeAppModelRewrite.diagnostic); bodyToForward = claudeAppModelRewrite.body; routedModel = claudeAppModelRewrite.routedModel; } @@ -665,18 +707,28 @@ class GatewayService { let responseCompleted = false; let onClientDisconnect: (() => void) | undefined; let onResponseFinish: (() => void) | undefined; + const handleClientDisconnect = () => { + if (responseCompleted || response.writableEnded) { + return; + } + if (!clientDisconnected) { + clientDisconnected = true; + upstreamAbortController.abort(new Error(clientDisconnectMessage)); + } + onClientDisconnect?.(); + }; response.once("finish", () => { responseCompleted = true; onResponseFinish?.(); }); - response.once("close", () => { - if (responseCompleted || response.writableEnded) { - return; - } - clientDisconnected = true; - upstreamAbortController.abort(new Error(clientDisconnectMessage)); - onClientDisconnect?.(); + response.once("close", handleClientDisconnect); + response.on("error", () => { + // Client-side write failures (EPIPE / ECONNRESET when the client closes + // mid-stream, common during tool execution) must not crash the main + // process as an Uncaught Exception. Swallow them here; the close handler + // above already records the disconnect via writeStreamLog. + handleClientDisconnect(); }); const writeRequestLog = ( @@ -743,10 +795,10 @@ class GatewayService { }); const serialized = Buffer.from(`${JSON.stringify(routed.body)}\n`, "utf8"); headers["content-type"] = "application/json"; - headers["x-ccr-route-reason"] = routed.decision.reason; + headers["x-ccr-route-reason"] = sanitizeHeaderValue(routed.decision.reason); routeFallback = routed.decision.fallback ?? routeFallback; if (routed.decision.model) { - headers["x-ccr-routed-model"] = routed.decision.model; + headers["x-ccr-routed-model"] = sanitizeHeaderValue(routed.decision.model); routedModel = routed.decision.model; } bodyToForward = serialized; @@ -761,10 +813,10 @@ class GatewayService { }); const serialized = Buffer.from(`${JSON.stringify(routed.body)}\n`, "utf8"); headers["content-type"] = "application/json"; - headers["x-ccr-route-reason"] = routed.decision.reason; + headers["x-ccr-route-reason"] = sanitizeHeaderValue(routed.decision.reason); routeFallback = routed.decision.fallback ?? routeFallback; if (routed.decision.model) { - headers["x-ccr-routed-model"] = routed.decision.model; + headers["x-ccr-routed-model"] = sanitizeHeaderValue(routed.decision.model); routedModel = routed.decision.model; } bodyToForward = serialized; @@ -781,7 +833,7 @@ class GatewayService { if (codexApplyPatchBridgeRequest) { bodyToForward = codexApplyPatchBridgeRequest.body; codexApplyPatchBridgeActive = true; - headers["x-ccr-codex-patch-bridge"] = codexApplyPatchBridgeRequest.diagnostic; + headers["x-ccr-codex-patch-bridge"] = sanitizeHeaderValue(codexApplyPatchBridgeRequest.diagnostic); headers["content-type"] = "application/json"; } @@ -807,6 +859,15 @@ class GatewayService { sinceMs: startedAt - 1_000 }); + if (hostedWebSearchProtocolContext && !this.browserWebSearchMcpIntegration) { + const message = browserWebSearchUnavailableMessage(hostedWebSearchProtocolContext.toolName); + const responseHeaders = new Headers({ "content-type": "application/json; charset=utf-8" }); + const responseBody = JSON.stringify({ error: { message } }); + writeRequestLog(503, responseHeaders, responseBody, false, message); + sendJson(response, 503, { error: { message } }); + return; + } + if (hostedWebSearchProtocolContext && this.browserWebSearchMcpIntegration) { const records = await selectHostedWebSearchProtocolRecords( hostedWebSearchProtocolContext, @@ -906,10 +967,21 @@ class GatewayService { bodyToForward = upstreamResult.attempt.body ?? bodyToForward; routedModel = upstreamResult.attempt.model ?? routedModel; const responseHeaders = rewriteCapabilityResponseHeaders( - mergeFallbackResponseHeaders(upstreamResponseHeaders(upstreamResult), upstreamResult), + // Copy into a mutable Headers instance: upstream fetch Response.headers + // can be immutable (TypeError: immutable on .delete/.set), and + // mergeFallbackResponseHeaders returns the original object as-is when + // no fallback occurred. Codex apply_patch / web-search paths call + // .delete("content-length") below, which would otherwise throw and + // surface as a 502. + new Headers(mergeFallbackResponseHeaders(upstreamResponseHeaders(upstreamResult), upstreamResult)), this.config ); const upstreamResponse = upstreamResult.response; + if (clientDisconnected || upstreamAbortController.signal.aborted) { + await cancelResponseBody(upstreamResponse); + writeRequestLog(clientClosedRequestStatusCode, responseHeaders, "", false, clientDisconnectMessage); + return; + } if (codexApplyPatchBridgeActive) { responseHeaders.delete("content-length"); } @@ -923,6 +995,11 @@ class GatewayService { responseHeaders.delete("content-length"); } recordProviderCredentialOutcome(this.config, method, upstreamResult.attempt, upstreamResponse.status, responseHeaders); + if (clientDisconnected || response.destroyed) { + await cancelResponseBody(upstreamResponse); + writeRequestLog(clientClosedRequestStatusCode, responseHeaders, "", false, clientDisconnectMessage); + return; + } response.writeHead(upstreamResponse.status, Object.fromEntries(filteredResponseHeaders(responseHeaders))); if (!upstreamResponse.body) { if (shouldCaptureUsage) { @@ -957,6 +1034,7 @@ class GatewayService { this.browserWebSearchMcpIntegration ) : patchedResponseBody; + const responseStreams = uniqueStreams([upstreamBody, patchedResponseBody, responseBody]); const sampler = createBodySampler(); const sseErrorDetector = createSseErrorDetector(responseHeaders.get("content-type") ?? undefined); let streamDetectedError: string | undefined; @@ -968,7 +1046,7 @@ class GatewayService { } logRecorded = true; writeRequestLog( - upstreamResponse.status, + clientDisconnected ? clientClosedRequestStatusCode : upstreamResponse.status, responseHeaders, sampler.read(), sampler.isTruncated(), @@ -977,13 +1055,21 @@ class GatewayService { }; onClientDisconnect = () => { writeStreamLog(clientDisconnectMessage); - responseBody.destroy(new Error(clientDisconnectMessage)); + responseBody.unpipe(response); + destroyResponseStreams(responseStreams); }; onResponseFinish = () => { if (upstreamStreamEnded) { writeStreamLog(); } }; + const onResponseStreamError = (error: Error) => { + streamDetectedError ??= sseErrorDetector.finish(); + writeStreamLog(clientDisconnected ? clientDisconnectMessage : formatError(error)); + }; + for (const stream of responseStreams) { + stream.on("error", onResponseStreamError); + } responseBody.on("data", (chunk) => { sampler.append(chunk); streamDetectedError ??= sseErrorDetector.append(chunk); @@ -995,10 +1081,6 @@ class GatewayService { writeStreamLog(); } }); - responseBody.once("error", (error) => { - streamDetectedError ??= sseErrorDetector.finish(); - writeStreamLog(clientDisconnected ? clientDisconnectMessage : formatError(error)); - }); if (shouldCaptureUsage) { responseBody.once("end", () => { void recordGatewayUsageCapture({ @@ -1016,6 +1098,10 @@ class GatewayService { }); }); } + if (clientDisconnected || response.destroyed) { + onClientDisconnect(); + return; + } responseBody.pipe(response); } @@ -1084,14 +1170,15 @@ export const gatewayService = new GatewayService(); async function writeCoreGatewayConfig( config: AppConfig, rawTraceSyncToken: string, + coreAuthToken: string, browserWebSearchMcpIntegration?: BrowserWebSearchMcpIntegration ): Promise { assertLoopbackCoreHost(config.gateway.coreHost); mkdirSync(dirname(config.gateway.generatedConfigFile), { mode: privateDirMode, recursive: true }); const pluginCoreGatewayConfig = pluginService.getCoreGatewayConfig(); const providerPlugins = withCodexOauthRuntimeDefaults([ - ...(config.providerPlugins ?? []), - ...pluginService.getCoreProviderPlugins() + ...(config.providerPlugins ?? []).filter(providerPluginEnabled), + ...pluginService.getCoreProviderPlugins().filter(providerPluginEnabled) ]); const codexOauthProviderNames = codexOauthLocalProviderNames(providerPlugins); const virtualModelProfiles = normalizeCoreGatewayVirtualModelProfiles(withCodexCompatibleVirtualModelProfiles(withFusionVirtualModelAliases([ @@ -1099,7 +1186,7 @@ async function writeCoreGatewayConfig( ...pluginService.getVirtualModelProfiles() ])), config); const coreEndpoint = endpoint(config.gateway.coreHost, config.gateway.corePort); - const builtinToolArtifacts = await fusionBuiltinToolArtifacts(virtualModelProfiles, coreEndpoint, browserWebSearchMcpIntegration); + const builtinToolArtifacts = await fusionBuiltinToolArtifacts(virtualModelProfiles, coreEndpoint, coreAuthToken, browserWebSearchMcpIntegration); const providers = [ ...config.Providers .flatMap((provider) => toCoreGatewayProviders(withCodexOauthProviderBaseUrl(provider, codexOauthProviderNames))) @@ -1108,12 +1195,20 @@ async function writeCoreGatewayConfig( ]; const pluginAgentConfig = isRecord(pluginCoreGatewayConfig.agent) ? pluginCoreGatewayConfig.agent : {}; const pluginMcpServers = Array.isArray(pluginAgentConfig.mcpServers) ? pluginAgentConfig.mcpServers : []; + const externalMcpServers = [ + ...pluginMcpServers, + ...(config.agent?.mcpServers ?? []), + ...(config.toolHub?.mcpServers ?? []) + ]; + const toolHubServer = toolHubMcpServer(config, externalMcpServers); const mcpServers = [ ...builtinToolArtifacts.mcpServers, - ...pluginMcpServers, - ...(config.agent?.mcpServers ?? []) + ...(toolHubServer ? [toolHubServer] : externalMcpServers) ]; - const fallbackMcpServer = fusionToolFallbackMcpServer(virtualModelProfiles, mcpServers); + const fallbackMcpServer = fusionToolFallbackMcpServer(virtualModelProfiles, [ + ...builtinToolArtifacts.mcpServers, + ...externalMcpServers + ]); if (fallbackMcpServer) { mcpServers.push(fallbackMcpServer); } @@ -1169,6 +1264,10 @@ function writePrivateTextFile(file: string, content: string): void { } } +function providerPluginEnabled(plugin: unknown): boolean { + return !isRecord(plugin) || plugin.enabled !== false; +} + export function normalizeCoreGatewayVirtualModelProfiles(profiles: unknown[], config: AppConfig): unknown[] { return profiles.map((profile) => normalizeCoreGatewayVirtualModelProfile(profile, config)); } @@ -1385,6 +1484,7 @@ function hasOwn(value: Record, key: string): boolean { async function fusionBuiltinToolArtifacts( profiles: unknown[], coreEndpoint: string, + coreAuthToken: string, browserWebSearchMcpIntegration?: BrowserWebSearchMcpIntegration ): Promise<{ mcpServers: GatewayMcpServerConfig[]; providers: CoreGatewayProvider[] }> { const providers: CoreGatewayProvider[] = []; @@ -1407,12 +1507,14 @@ async function fusionBuiltinToolArtifacts( const toolServerKey = `vision:${visionConfig.toolName}`; if (!toolServerKeys.has(toolServerKey)) { toolServerKeys.add(toolServerKey); + const useGatewayVisionRuntime = !visionConfig.baseUrl; mcpServers.push(fusionBuiltinMcpServer({ entry, env: { FUSION_BUILTIN_TOOL_KIND: "vision", FUSION_TOOL_NAME: visionConfig.toolName, - ...(visionConfig.baseUrl ? { VISION_BASE_URL: visionConfig.baseUrl } : { VISION_GATEWAY_BASE_URL: `${coreEndpoint}/v1` }), + ...(useGatewayVisionRuntime ? { VISION_GATEWAY_BASE_URL: `${coreEndpoint}/v1` } : { VISION_BASE_URL: visionConfig.baseUrl || "" }), + ...(useGatewayVisionRuntime && coreAuthToken ? { VISION_GATEWAY_API_KEY: coreAuthToken } : {}), ...(resolvedVision.model ? { VISION_MODEL: resolvedVision.model } : {}), ...(visionConfig.baseUrl && visionConfig.apiKey ? { VISION_API_KEY: visionConfig.apiKey } : {}), ...(visionConfig.timeoutMs ? { VISION_TIMEOUT_MS: String(visionConfig.timeoutMs) } : {}) @@ -1460,6 +1562,15 @@ async function fusionBuiltinToolArtifacts( return { mcpServers, providers }; } +export async function fusionBuiltinToolArtifactsForTest( + profiles: unknown[], + coreEndpoint: string, + coreAuthToken: string, + browserWebSearchMcpIntegration?: BrowserWebSearchMcpIntegration +): Promise<{ mcpServers: GatewayMcpServerConfig[]; providers: unknown[] }> { + return fusionBuiltinToolArtifacts(profiles, coreEndpoint, coreAuthToken, browserWebSearchMcpIntegration); +} + function fusionBuiltinMcpServer({ entry, env, @@ -1518,56 +1629,146 @@ function bundledFusionToolFallbackMcpEntryPath(): string { return pathJoin(__dirname, "fusion-tool-fallback-mcp.js"); } +function toolHubMcpServer(config: AppConfig, backendServers: unknown[]): GatewayMcpServerConfig | undefined { + const toolHub = config.toolHub; + const runtimeBackendServers = [ + ...toolHubBuiltInBackendServers(config), + ...backendServers + ]; + const runtimeConfig = toolHubMcpRuntimeConfig(config, runtimeBackendServers); + if (!toolHub?.enabled || !runtimeConfig) { + return undefined; + } + + return { + ...runtimeConfig, + name: uniqueMcpServerName(TOOL_HUB_MCP_SERVER_NAME, runtimeBackendServers), + protocolVersion: "2024-11-05", + requestTimeoutMs: toolHubRequestTimeoutMs(config, runtimeBackendServers), + startupTimeoutMs: 600000, + stdioMessageMode: "content-length", + transport: "stdio" + }; +} + export function fusionFallbackToolDefinitions( profiles: unknown[], backedToolNames: Set = new Set() -): Array<{ description?: string; inputSchema?: Record; name: string }> { - const byName = new Map; name: string }>(); +): FusionFallbackToolDefinition[] { + const byName = new Map(); for (const profile of profiles) { - if (!isRecord(profile) || profile.enabled === false || !Array.isArray(profile.tools)) { + if (!isRecord(profile) || profile.enabled === false) { continue; } - for (const tool of profile.tools) { - if (!isRecord(tool)) { - continue; - } - const name = stringValue(tool.name); - if (!name) { - continue; - } - if (backedToolNames.has(name)) { - continue; - } - const existing = byName.get(name); - const description = stringValue(tool.description); - const inputSchema = isRecord(tool.inputSchema) - ? tool.inputSchema - : isRecord(tool.input_schema) - ? tool.input_schema - : undefined; - if (existing) { - if (!existing.description && description) { - existing.description = description; + if (Array.isArray(profile.tools)) { + for (const tool of profile.tools) { + if (!isRecord(tool)) { + continue; } - if (!existing.inputSchema && inputSchema) { - existing.inputSchema = inputSchema; + const name = stringValue(tool.name); + if (!name) { + continue; + } + if (backedToolNames.has(name)) { + continue; } - continue; - } - byName.set(name, { - ...(description ? { description } : {}), - ...(inputSchema ? { inputSchema } : {}), - name - }); + const existing = byName.get(name); + const description = stringValue(tool.description); + const inputSchema = isRecord(tool.inputSchema) + ? tool.inputSchema + : isRecord(tool.input_schema) + ? tool.input_schema + : undefined; + const unavailableMessage = fusionFallbackToolUnavailableMessage(profile, name); + if (existing) { + if (!existing.description && description) { + existing.description = description; + } + if (!existing.inputSchema && inputSchema) { + existing.inputSchema = inputSchema; + } + if (!existing.unavailableMessage && unavailableMessage) { + existing.unavailableMessage = unavailableMessage; + } + continue; + } + + byName.set(name, { + ...(description ? { description } : {}), + ...(inputSchema ? { inputSchema } : {}), + ...(unavailableMessage ? { unavailableMessage } : {}), + name + }); + } + } + + const browserFallback = browserWebSearchFallbackToolDefinition(profile, backedToolNames); + if (browserFallback && !byName.has(browserFallback.name)) { + byName.set(browserFallback.name, browserFallback); } } return [...byName.values()]; } +type FusionFallbackToolDefinition = { + description?: string; + inputSchema?: Record; + name: string; + unavailableMessage?: string; +}; + +function fusionFallbackToolUnavailableMessage(profile: unknown, toolName: string): string | undefined { + if (!isRecord(profile)) { + return undefined; + } + const metadata = isRecord(profile.metadata) ? profile.metadata : undefined; + const fusionWebSearch = isRecord(metadata?.fusionWebSearch) ? metadata.fusionWebSearch : undefined; + const webSearchConfig = readFusionWebSearchConfig(fusionWebSearch); + if (webSearchConfig?.provider !== "browser" || webSearchConfig.toolName !== toolName) { + return undefined; + } + return browserWebSearchUnavailableMessage(toolName); +} + +function browserWebSearchUnavailableMessage(toolName: string): string { + return [ + `Fusion MCP tool "${toolName}" is unavailable because In-app Browser web search requires CCR Desktop.`, + "This runtime did not register the Electron browser web search integration, so the hidden browser search tool cannot run here.", + "Run the profile in CCR Desktop or switch the Fusion web search provider to Brave, Bing, Google CSE, Serper, SerpAPI, Tavily, or Exa." + ].join(" "); +} + +function browserWebSearchFallbackToolDefinition( + profile: Record, + backedToolNames: Set +): FusionFallbackToolDefinition | undefined { + const metadata = isRecord(profile.metadata) ? profile.metadata : undefined; + const fusionWebSearch = isRecord(metadata?.fusionWebSearch) ? metadata.fusionWebSearch : undefined; + const webSearchConfig = readFusionWebSearchConfig(fusionWebSearch); + if (webSearchConfig?.provider !== "browser" || !webSearchConfig.toolName || backedToolNames.has(webSearchConfig.toolName)) { + return undefined; + } + return { + description: "Fallback registration for CCR In-app Browser web search when the Electron browser integration is unavailable.", + inputSchema: { + additionalProperties: true, + properties: { + count: { maximum: 20, minimum: 1, type: "number" }, + prompt: { type: "string" }, + query: { type: "string" } + }, + required: ["prompt"], + type: "object" + }, + name: webSearchConfig.toolName, + unavailableMessage: fusionFallbackToolUnavailableMessage(profile, webSearchConfig.toolName) + }; +} + export function fusionToolNamesBackedByMcpServers(servers: unknown[]): Set { const names = new Set(); for (const server of servers) { @@ -2993,7 +3194,8 @@ function hostedWebSearchEvidenceText(records: BrowserWebSearchProtocolRecord[], const content = focusedWebSearchContent(result.content, queryHint); const details = [ result.snippet ? `Search snippet: ${result.snippet}` : "", - content ? `Extracted page content: ${content}` : "" + content ? `Extracted page content: ${content}` : "", + result.diagnostics?.length ? `Diagnostics: ${result.diagnostics.join("; ")}` : "" ].filter(Boolean).join("\n"); return [ `${resultIndex + 1}. ${result.title}`, @@ -5157,7 +5359,8 @@ function anthropicWebSearchResultBlock(result: BrowserWebSearchProtocolResult): function anthropicWebSearchResultSnippet(result: BrowserWebSearchProtocolResult): string | undefined { const parts = [ result.snippet ? `Search snippet: ${sanitizeWebSearchEvidenceText(result.snippet)}` : "", - result.content ? `Extracted page content: ${sanitizeWebSearchEvidenceText(result.content)}` : "" + result.content ? `Extracted page content: ${sanitizeWebSearchEvidenceText(result.content)}` : "", + result.diagnostics?.length ? `Diagnostics: ${result.diagnostics.join("; ")}` : "" ].filter(Boolean); return parts.length > 0 ? parts.join("\n") : undefined; } @@ -5498,7 +5701,7 @@ async function fetchUpstreamWithFallback(input: { }); if (hasNextAttempt && shouldFallbackAfterStatus(response.status, fallbackMode)) { - const delayMs = retryDelayAfterStatus(response.status, response, failedAttempts.length); + const delayMs = retryDelayAfterStatus(response.status, response.headers, failedAttempts.length); failedAttempts.push({ credentialChain: attempt.credentialChain, credentialIds: attempt.credentialIds, @@ -5521,10 +5724,13 @@ async function fetchUpstreamWithFallback(input: { }; } catch (error) { const message = formatError(error); + const delayMs = hasNextAttempt && !input.signal?.aborted + ? retryDelayAfterNetworkError(failedAttempts.length) + : 0; failedAttempts.push({ credentialChain: attempt.credentialChain, credentialIds: attempt.credentialIds, - delayMs: 0, + delayMs, error: message, model: attempt.model }); @@ -5536,6 +5742,9 @@ async function fetchUpstreamWithFallback(input: { }); } if (hasNextAttempt) { + if (delayMs > 0) { + await delay(delayMs); + } continue; } throw new UpstreamRequestError(message, { @@ -5560,12 +5769,19 @@ function prepareUpstreamCredentialAttempt(input: { }): UpstreamAttempt { const normalizedBody = normalizeConfiguredProviderModelBody(input.attempt.body, input.config); const target = resolveProviderCredentialRoutingTarget(input.config, input.headers, input.path, input.attempt.body); + const attemptBody = (body: Buffer | undefined) => usageAwareOpenAiChatAttemptBody({ + body, + config: input.config, + path: input.path, + target + }); if (!target) { + const body = bodyHasConfiguredProviderModelSelector(input.attempt.body, input.config) + ? input.attempt.body + : normalizedBody?.body ?? input.attempt.body; return { ...input.attempt, - body: bodyHasConfiguredProviderModelSelector(input.attempt.body, input.config) - ? input.attempt.body - : normalizedBody?.body ?? input.attempt.body, + body: attemptBody(body), headers: input.headers }; } @@ -5574,7 +5790,7 @@ function prepareUpstreamCredentialAttempt(input: { if (credentials.length === 0) { return { ...input.attempt, - body: target.body ?? normalizedBody?.body ?? input.attempt.body, + body: attemptBody(target.body ?? normalizedBody?.body ?? input.attempt.body), headers: input.headers }; } @@ -5584,7 +5800,7 @@ function prepareUpstreamCredentialAttempt(input: { if (selection.credentials.length === 0) { return { ...input.attempt, - body: target.body ?? normalizedBody?.body ?? input.attempt.body, + body: attemptBody(target.body ?? normalizedBody?.body ?? input.attempt.body), headers: input.headers }; } @@ -5592,7 +5808,7 @@ function prepareUpstreamCredentialAttempt(input: { const headers: Record = { ...input.headers, "x-target-providers": selection.credentials.map((candidate) => candidate.internalName).join(","), - "x-ccr-logical-provider": target.provider.name, + "x-ccr-logical-provider": providerRuntimeId(target.provider), "x-ccr-provider-credential-chain": selection.credentials.map((candidate) => candidate.credentialId).join(",") }; delete headers["x-target-provider"]; @@ -5602,7 +5818,7 @@ function prepareUpstreamCredentialAttempt(input: { return { ...input.attempt, - body: target.body ?? normalizedBody?.body ?? input.attempt.body, + body: attemptBody(target.body ?? normalizedBody?.body ?? input.attempt.body), credentialChain: selection.credentials.map((candidate) => candidate.internalName), credentialIds: selection.credentials.map((candidate) => candidate.credentialId), credentialProtocol: target.protocol, @@ -5611,6 +5827,53 @@ function prepareUpstreamCredentialAttempt(input: { }; } +function usageAwareOpenAiChatAttemptBody(input: { + body: Buffer | undefined; + config: AppConfig; + path: string; + target?: { protocol: GatewayProviderProtocol }; +}): Buffer | undefined { + if (input.target?.protocol === "openai_chat_completions") { + return usageAwareOpenAiChatBody(input.body); + } + + const protocol = requestProtocolForPath(input.path); + if (!protocol) { + return input.body; + } + + const parsedBody = parseJsonObjectSafe(input.body); + const modelSelector = resolveConfiguredProviderModelSelector(stringValue(parsedBody?.model), input.config); + const providerProtocol = modelSelector + ? providerProtocolForClientProtocol(modelSelector.provider, protocol) + : undefined; + return providerProtocol === "openai_chat_completions" + ? usageAwareOpenAiChatBody(input.body) + : input.body; +} + +function usageAwareOpenAiChatBody(body: Buffer | undefined): Buffer | undefined { + const parsedBody = parseJsonObjectSafe(body); + if (!parsedBody || parsedBody.stream !== true) { + return body; + } + const streamOptions = isRecord(parsedBody.stream_options) + ? parsedBody.stream_options + : isRecord(parsedBody.streamOptions) + ? parsedBody.streamOptions + : {}; + if (streamOptions.include_usage === true || streamOptions.includeUsage === true) { + return body; + } + return Buffer.from(`${JSON.stringify({ + ...parsedBody, + stream_options: { + ...streamOptions, + include_usage: true + } + })}\n`, "utf8"); +} + function normalizeConfiguredProviderModelBody( body: Buffer | undefined, config: AppConfig @@ -5933,17 +6196,30 @@ function shouldFallbackAfterStatus(statusCode: number, mode: RouterFallbackMode) return false; } -function retryDelayAfterStatus(statusCode: number, response: Response, failedAttemptIndex: number): number { - if (statusCode !== 429) { - return 0; - } - const retryAfterMs = parseRetryAfterHeaderMs(response.headers.get("retry-after")); - if (retryAfterMs !== undefined) { - return clampNumber(retryAfterMs, 0, upstreamRetryAfterMaxMs); +function retryDelayAfterStatus(_statusCode: number, headers: Headers, failedAttemptIndex: number): number { + const retryAfterMs = parseRetryAfterHeaderMs(headers.get("retry-after")); + if (retryAfterMs !== undefined && retryAfterMs > 0) { + return clampNumber(retryAfterMs, 1, upstreamRetryAfterMaxMs); } return exponentialRetryBackoffMs(failedAttemptIndex); } +function retryDelayAfterNetworkError(failedAttemptIndex: number): number { + return exponentialRetryBackoffMs(failedAttemptIndex); +} + +export function fallbackRetryDelayAfterStatusForTest(input: { failedAttemptIndex?: number; retryAfter?: string | null; statusCode: number }): number { + const headers = new Headers(); + if (input.retryAfter !== undefined && input.retryAfter !== null) { + headers.set("retry-after", input.retryAfter); + } + return retryDelayAfterStatus(input.statusCode, headers, input.failedAttemptIndex ?? 0); +} + +export function fallbackRetryDelayAfterNetworkErrorForTest(failedAttemptIndex = 0): number { + return retryDelayAfterNetworkError(failedAttemptIndex); +} + function parseRetryAfterHeaderMs(value: string | null): number | undefined { const trimmed = value?.trim(); if (!trimmed) { @@ -5972,6 +6248,29 @@ async function drainResponseBody(response: Response): Promise { } } +async function cancelResponseBody(response: Response): Promise { + try { + await response.body?.cancel(); + } catch { + // The client already disconnected; best-effort upstream cleanup must not mask that expected path. + } +} + +function uniqueStreams(streams: Readable[]): Readable[] { + return [...new Set(streams)]; +} + +function destroyResponseStreams(streams: Readable[]): void { + for (const stream of streams) { + if (!stream.destroyed) { + // A downstream client close is an expected abort path. Destroying with + // an Error would emit another error event on Readable/Transform stages, + // and intermediate stages may not be the final responseBody listener. + stream.destroy(); + } + } +} + function parseJsonObjectSafe(buffer: Buffer | undefined): Record | undefined { if (!buffer || buffer.byteLength === 0) { return undefined; @@ -6002,7 +6301,7 @@ function mergeFallbackResponseHeaders(headers: Headers, result: UpstreamFetchRes merged.set("x-ccr-fallback-delays-ms", formatFallbackDelays(result.failedAttempts)); } if (result.attempt.model) { - merged.set("x-ccr-fallback-model", result.attempt.model); + merged.set("x-ccr-fallback-model", sanitizeHeaderValue(result.attempt.model)); } } if (credentialIds.length) { @@ -6070,6 +6369,11 @@ function resolveGatewayEntry(): string { return entry; } + const bundledEntry = resolveBundledGatewayEntry(); + if (bundledEntry) { + return bundledEntry; + } + for (const packageName of gatewayPackageCandidates) { try { return requireFromHere.resolve(packageName); @@ -6080,6 +6384,45 @@ function resolveGatewayEntry(): string { return requireFromHere.resolve(gatewayPackageCandidates[0]); } +function resolveBundledGatewayEntry(): string | undefined { + const resourcesPath = (process as NodeJS.Process & { resourcesPath?: string }).resourcesPath; + return [ + pathJoin(__dirname, "next-ai-gateway.js"), + ...(resourcesPath + ? [ + pathJoin(resourcesPath, "app.asar", "dist", "main", "next-ai-gateway.js"), + pathJoin(resourcesPath, "app", "dist", "main", "next-ai-gateway.js") + ] + : []) + ].find((candidate) => existsSync(candidate)); +} + +function resolveUndiciProxyAgentModule(): string { + const bundled = resolveBundledUndiciProxyAgentModule(); + if (bundled) { + return bundled; + } + + try { + return requireFromHere.resolve("undici"); + } catch (error) { + throw new Error(`Unable to resolve undici ProxyAgent module for gateway proxy preload: ${formatError(error)}`); + } +} + +function resolveBundledUndiciProxyAgentModule(): string | undefined { + const resourcesPath = (process as NodeJS.Process & { resourcesPath?: string }).resourcesPath; + return [ + pathJoin(__dirname, "undici-proxy-agent.js"), + ...(resourcesPath + ? [ + pathJoin(resourcesPath, "app.asar", "dist", "main", "undici-proxy-agent.js"), + pathJoin(resourcesPath, "app", "dist", "main", "undici-proxy-agent.js") + ] + : []) + ].find((candidate) => existsSync(candidate)); +} + function createGatewayProcessEnv(config: AppConfig, upstreamProxyUrl: string | undefined, runtimeId: string, coreAuthToken: string): NodeJS.ProcessEnv { const env: NodeJS.ProcessEnv = { ...process.env, @@ -6118,7 +6461,7 @@ function createGatewayProcessEnv(config: AppConfig, upstreamProxyUrl: string | u env.https_proxy = upstreamProxyUrl; env.all_proxy = upstreamProxyUrl; env.CCR_UPSTREAM_PROXY_URL = upstreamProxyUrl; - env.CCR_UNDICI_MODULE = requireFromHere.resolve("undici"); + env.CCR_UNDICI_MODULE = resolveUndiciProxyAgentModule(); return env; } @@ -6379,6 +6722,20 @@ function sanitizeProviderHeaderId(value: string | undefined): string | undefined return normalized || undefined; } +function sanitizeHeaderValue(value: unknown): string { + // HTTP header values must be ByteString (code point <= 255). Values derived + // from user-facing names — model selectors like "小米mimo/...", provider + // names, route reasons — can contain non-ASCII characters that crash Node's + // fetch/undici with "Cannot convert argument to a ByteString" (surfaced as + // 502). Normalize to ASCII while preserving case and printable punctuation. + const text = typeof value === "string" && value.trim() ? value : "unknown"; + const sanitized = text + .replace(/[^\x20-\x7E]+/g, "-") + .replace(/-{2,}/g, "-") + .replace(/^-+|-+$/g, ""); + return sanitized || "unknown"; +} + function providerCredentialInternalName( provider: GatewayProviderConfig, protocol: GatewayProviderProtocol, diff --git a/src/server/mcp/browser-web-search-proxy-mcp.ts b/packages/core/src/mcp/browser-web-search-proxy-mcp.ts similarity index 100% rename from src/server/mcp/browser-web-search-proxy-mcp.ts rename to packages/core/src/mcp/browser-web-search-proxy-mcp.ts diff --git a/src/server/mcp/fusion-tool-fallback-mcp.ts b/packages/core/src/mcp/fusion-tool-fallback-mcp.ts similarity index 96% rename from src/server/mcp/fusion-tool-fallback-mcp.ts rename to packages/core/src/mcp/fusion-tool-fallback-mcp.ts index a67635d..87c9b62 100644 --- a/src/server/mcp/fusion-tool-fallback-mcp.ts +++ b/packages/core/src/mcp/fusion-tool-fallback-mcp.ts @@ -28,6 +28,7 @@ type McpTool = { description: string; inputSchema: JsonValue; name: string; + unavailableMessage?: string; }; type ToolCallResult = { @@ -134,10 +135,11 @@ async function handleJsonRpcRequest(payload: unknown): Promise item.name === toolLabel); const knownSuffix = toolNames.has(toolLabel) ? "" : " The requested tool was not in the fallback catalog."; return { content: [{ - text: + text: tool?.unavailableMessage || `Fusion MCP tool "${toolLabel}" is temporarily unavailable. ` + "CCR registered a fallback definition because the real MCP server did not provide the tool during discovery. " + `Check the Fusion MCP server logs and retry.${knownSuffix}`, @@ -179,7 +181,8 @@ function readFallbackTools(): McpTool[] { readString(item.description) || `Fallback registration for Fusion MCP tool "${name}". The real MCP server should handle successful calls.`, inputSchema: isRecord(item.inputSchema) ? item.inputSchema as JsonValue : objectSchema({}), - name + name, + unavailableMessage: readString(item.unavailableMessage) }); } return result; diff --git a/src/server/mcp/fusion-vision-mcp.ts b/packages/core/src/mcp/fusion-vision-mcp.ts similarity index 100% rename from src/server/mcp/fusion-vision-mcp.ts rename to packages/core/src/mcp/fusion-vision-mcp.ts diff --git a/src/server/mcp/network-capture-mcp.ts b/packages/core/src/mcp/network-capture-mcp.ts similarity index 98% rename from src/server/mcp/network-capture-mcp.ts rename to packages/core/src/mcp/network-capture-mcp.ts index 2c6e0b7..15dd6dc 100644 --- a/src/server/mcp/network-capture-mcp.ts +++ b/packages/core/src/mcp/network-capture-mcp.ts @@ -1,7 +1,7 @@ -import packageJson from "../../../package.json"; +import packageJson from "../../package.json"; import type { IncomingMessage, ServerResponse } from "node:http"; -import type { ProxyNetworkExchange } from "../../shared/app"; -import { proxyService } from "../proxy/service"; +import type { ProxyNetworkExchange } from "@ccr/core/contracts/app"; +import { proxyService } from "@ccr/core/proxy/service"; type JsonPrimitive = boolean | null | number | string; type JsonValue = JsonPrimitive | JsonValue[] | { [key: string]: JsonValue }; diff --git a/src/server/mcp/tool-discovery.ts b/packages/core/src/mcp/tool-discovery.ts similarity index 99% rename from src/server/mcp/tool-discovery.ts rename to packages/core/src/mcp/tool-discovery.ts index 61f0276..efe2b41 100644 --- a/src/server/mcp/tool-discovery.ts +++ b/packages/core/src/mcp/tool-discovery.ts @@ -1,11 +1,11 @@ import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process"; -import { fetchWithSystemProxy } from "../../main/system-proxy-fetch"; +import { fetchWithSystemProxy } from "@ccr/core/proxy/system-proxy-fetch"; import type { GatewayMcpRemoteServerConfig, GatewayMcpServerConfig, GatewayMcpStdioServerConfig, GatewayMcpToolInfo -} from "../../shared/app"; +} from "@ccr/core/contracts/app"; type JsonRpcMessage = { error?: unknown; diff --git a/packages/core/src/mcp/toolhub-config.ts b/packages/core/src/mcp/toolhub-config.ts new file mode 100644 index 0000000..5c4cbd1 --- /dev/null +++ b/packages/core/src/mcp/toolhub-config.ts @@ -0,0 +1,226 @@ +import { join as pathJoin } from "node:path"; +import { CONFIGDIR } from "@ccr/core/config/constants"; +import type { AppConfig, GatewayMcpServerConfig } from "@ccr/core/contracts/app"; + +export const TOOL_HUB_MCP_SERVER_NAME = "ccr-toolhub"; +export const TOOL_HUB_MCP_RUNTIME_FILE_NAME = "toolhub-mcp.js"; +export const BROWSER_AUTOMATION_MCP_SERVER_NAME = "ccr-browser-automation"; +export const BROWSER_AUTOMATION_MCP_PATH = "/__ccr/browser-automation/mcp"; +export const BROWSER_AUTOMATION_HANDOFF_TIMEOUT_MS = 600000; +export const TOOL_HUB_DEFAULT_REQUEST_TIMEOUT_MS = 60000; + +export type ToolHubMcpRuntimeConfig = { + args: string[]; + command: string; + env: Record; +}; + +export type ClaudeCodeMcpServerConfig = ToolHubMcpRuntimeConfig | { + args?: string[]; + command: string; + cwd?: string; + env?: Record; +} | { + headers?: Record; + type: "http" | "sse"; + url: string; +}; + +export type ToolHubClaudeCodeMcpConfig = { + mcpServers: Record; +}; + +export function toolHubBackendServers( + config: AppConfig | undefined, + extraServers: unknown[] = [], + options: { + apiKey?: string; + includeBuiltIns?: boolean; + } = {} +): unknown[] { + return [ + ...(options.includeBuiltIns === false ? [] : toolHubBuiltInBackendServers(config, options)), + ...(Array.isArray(config?.agent?.mcpServers) ? config.agent.mcpServers : []), + ...(Array.isArray(config?.toolHub?.mcpServers) ? config.toolHub.mcpServers : []), + ...extraServers + ].filter(isToolHubBackendServer); +} + +export function toolHubBuiltInBackendServers( + config: AppConfig | undefined, + options: { + apiKey?: string; + } = {} +): GatewayMcpServerConfig[] { + if (!config || !browserAutomationMcpEnabled(config) || !hasGatewayEndpoint(config)) { + return []; + } + + return [ + { + apiKey: options.apiKey || firstConfiguredApiKey(config), + headers: {}, + name: BROWSER_AUTOMATION_MCP_SERVER_NAME, + protocolVersion: "2024-11-05", + requestTimeoutMs: BROWSER_AUTOMATION_HANDOFF_TIMEOUT_MS, + startupTimeoutMs: 60000, + transport: "streamable-http", + url: `${gatewayEndpoint(config)}${BROWSER_AUTOMATION_MCP_PATH}` + } + ]; +} + +export function browserAutomationMcpEnabled(config: AppConfig | undefined): boolean { + return Boolean(config?.toolHub?.enabled && config.toolHub.browserAutomation); +} + +export function toolHubMcpRuntimeConfig( + config: AppConfig | undefined, + backendServers?: unknown[], + options: { + command?: string; + entryPath?: string; + resolver?: { + apiKey?: string; + baseUrl?: string; + model?: string; + }; + } = {} +): ToolHubMcpRuntimeConfig | undefined { + const toolHub = config?.toolHub; + if (!toolHub?.enabled) { + return undefined; + } + + const resolvedBackendServers = backendServers ?? toolHubBackendServers(config, [], { + apiKey: options.resolver?.apiKey + }); + const normalizedBackendServers = resolvedBackendServers.filter(isToolHubBackendServer); + if (normalizedBackendServers.length === 0) { + return undefined; + } + const requestTimeoutMs = toolHubRequestTimeoutMs(config, normalizedBackendServers); + + return { + args: [options.entryPath ?? bundledToolHubMcpEntryPath()], + command: options.command ?? process.execPath, + env: { + ELECTRON_RUN_AS_NODE: "1", + TOOLHUB_CACHE_FILE: pathJoin(CONFIGDIR, "toolhub-cache.json"), + TOOLHUB_MAX_TOOLS: String(toolHub.maxTools ?? 10), + TOOLHUB_MCP_SERVERS_JSON: JSON.stringify(normalizedBackendServers), + TOOLHUB_OPENAI_API_KEY: options.resolver?.apiKey ?? toolHub.llm?.apiKey ?? "", + TOOLHUB_OPENAI_BASE_URL: options.resolver?.baseUrl ?? toolHub.llm?.baseUrl ?? "https://api.openai.com/v1", + TOOLHUB_OPENAI_MODEL: options.resolver?.model ?? toolHub.llm?.model ?? "", + TOOLHUB_REQUEST_TIMEOUT_MS: String(requestTimeoutMs) + } + }; +} + +export function toolHubRequestTimeoutMs(config: AppConfig | undefined, backendServers?: unknown[]): number { + const configuredTimeout = positiveInteger(config?.toolHub?.requestTimeoutMs, TOOL_HUB_DEFAULT_REQUEST_TIMEOUT_MS); + const backendTimeouts = (backendServers ?? toolHubBackendServers(config)) + .map((server) => isRecord(server) ? positiveInteger(server.requestTimeoutMs, 0) : 0); + return Math.max(configuredTimeout, ...backendTimeouts); +} + +export function toolHubClaudeCodeMcpConfig( + config: AppConfig | undefined, + options: Parameters[2] = {} +): ToolHubClaudeCodeMcpConfig | undefined { + const toolHub = config?.toolHub; + if (!toolHub?.enabled) { + return undefined; + } + + const backendServers = toolHubBackendServers(config, [], { + apiKey: options.resolver?.apiKey + }); + if (backendServers.length === 0) { + return undefined; + } + + const runtimeConfig = toolHubMcpRuntimeConfig(config, backendServers, options); + return runtimeConfig + ? { mcpServers: { [TOOL_HUB_MCP_SERVER_NAME]: runtimeConfig } } + : undefined; +} + +export function bundledToolHubMcpEntryPath(): string { + return pathJoin(__dirname, TOOL_HUB_MCP_RUNTIME_FILE_NAME); +} + +export function bundledToolHubMcpEntryPathCandidates(): string[] { + const resourcesPath = (process as NodeJS.Process & { resourcesPath?: string }).resourcesPath; + return uniqueStrings([ + bundledToolHubMcpEntryPath(), + ...(resourcesPath + ? [ + pathJoin(resourcesPath, "app.asar", "dist", "main", TOOL_HUB_MCP_RUNTIME_FILE_NAME), + pathJoin(resourcesPath, "app", "dist", "main", TOOL_HUB_MCP_RUNTIME_FILE_NAME) + ] + : []), + pathJoin(process.cwd(), "packages", "electron", "dist", "main", TOOL_HUB_MCP_RUNTIME_FILE_NAME), + pathJoin(process.cwd(), "packages", "cli", "dist", "main", TOOL_HUB_MCP_RUNTIME_FILE_NAME), + pathJoin(process.cwd(), "packages", "core", "dist", "main", TOOL_HUB_MCP_RUNTIME_FILE_NAME), + pathJoin(process.cwd(), "dist", "main", TOOL_HUB_MCP_RUNTIME_FILE_NAME) + ]); +} + +function isToolHubBackendServer(value: unknown): value is Record { + return isRecord(value) && stringValue(value.name)?.toLowerCase() !== TOOL_HUB_MCP_SERVER_NAME; +} + +function isRecord(value: unknown): value is Record { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + +function stringValue(value: unknown): string | undefined { + return typeof value === "string" && value.trim() ? value.trim() : undefined; +} + +function firstConfiguredApiKey(config: AppConfig): string | undefined { + return (Array.isArray(config.APIKEYS) ? config.APIKEYS : []) + .find((apiKey) => apiKey.key.trim())?.key.trim() || stringValue(config.APIKEY); +} + +function positiveInteger(value: unknown, fallback: number): number { + return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.trunc(value) : fallback; +} + +function gatewayEndpoint(config: AppConfig): string { + return `http://${formatHost(clientGatewayHost(config.gateway.host))}:${config.gateway.port}`; +} + +function hasGatewayEndpoint(config: AppConfig): boolean { + const gateway = (config as Partial).gateway; + return Boolean(gateway && stringValue(gateway.host) && Number.isFinite(gateway.port)); +} + +function formatHost(host: string): string { + return host.includes(":") && !host.startsWith("[") ? `[${host}]` : host; +} + +function clientGatewayHost(host: string): string { + const value = stringValue(host) ?? "127.0.0.1"; + if (value === "0.0.0.0") { + return "127.0.0.1"; + } + if (value === "::" || value === "[::]") { + return "::1"; + } + return value; +} + +function uniqueStrings(values: string[]): string[] { + const seen = new Set(); + const result: string[] = []; + for (const value of values) { + if (!value || seen.has(value)) { + continue; + } + seen.add(value); + result.push(value); + } + return result; +} diff --git a/packages/core/src/mcp/toolhub-mcp.ts b/packages/core/src/mcp/toolhub-mcp.ts new file mode 100644 index 0000000..9d440d9 --- /dev/null +++ b/packages/core/src/mcp/toolhub-mcp.ts @@ -0,0 +1,2944 @@ +#!/usr/bin/env node +import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process"; +import { createHash, randomUUID } from "node:crypto"; +import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs"; +import os from "node:os"; +import path from "node:path"; +import OpenAI from "openai"; + +type JsonPrimitive = boolean | null | number | string; +type JsonValue = JsonPrimitive | JsonValue[] | { [key: string]: JsonValue }; + +type JsonRpcRequest = { + error?: { + code?: number; + message?: string; + }; + id?: null | number | string; + jsonrpc?: string; + method?: string; + params?: unknown; + result?: unknown; +}; + +type JsonRpcResponse = + | { + id: null | number | string; + jsonrpc: "2.0"; + result: JsonValue; + } + | { + error: { + code: number; + data?: JsonValue; + message: string; + }; + id: null | number | string; + jsonrpc: "2.0"; + }; + +type GatewayMcpServerBaseConfig = { + label?: string; + name: string; + protocolVersion?: string; + requestTimeoutMs?: number; + startupTimeoutMs?: number; + transport: "stdio" | "streamable-http" | "sse"; +}; + +type GatewayMcpStdioServerConfig = GatewayMcpServerBaseConfig & { + args?: string[]; + command: string; + cwd?: string; + env?: Record; + stdioMessageMode?: "content-length" | "newline-json"; + transport: "stdio"; +}; + +type GatewayMcpRemoteServerConfig = GatewayMcpServerBaseConfig & { + apiKey?: string; + apiKeyEnv?: string; + headers?: Record; + transport: "streamable-http" | "sse"; + url: string; +}; + +type GatewayMcpServerConfig = GatewayMcpStdioServerConfig | GatewayMcpRemoteServerConfig; + +type ToolDefinition = { + description?: string; + inputSchema?: Record; + name: string; + outputSchema?: Record; + tags?: string[]; + title?: string; +}; + +type ToolInvocation = { + mode: "both" | "invoke" | "workflow"; + sideEffect: boolean; +}; + +type CatalogEntry = { + alias: string; + canonicalName: string; + description: string; + inputSchema?: Record; + invocation: ToolInvocation; + outputSchema?: Record; + remoteToolName: string; + serverId: string; + serverLabel?: string; + serverName: string; + serverNamespace: string; + status: "offline" | "online" | "unknown"; + tags: string[]; + title: string; + toolName: string; +}; + +type McpClient = { + callTool(name: string, args: Record): Promise; + close(): Promise; + listTools(): Promise; +}; + +type PendingRequest = { + reject: (error: Error) => void; + resolve: (message: JsonRpcRequest) => void; + timer: ReturnType; +}; + +type MessageMode = "content-length" | "newline-json"; + +type ResolveInput = { + constraints?: { + allowSideEffects?: boolean; + latencyBudgetMs?: number; + maxTools?: number; + preferWorkflow?: boolean; + }; + context?: Record; + task?: string; + __codeToolScopeKey?: string; + __toolHubScopeKey?: string; +}; + +type CodeToolSessionState = { + inFlightResolves: Map>; + loadedTools: Set; + recentObservations: Array<{ + resultSummary: string; + toolName: string; + }>; + recentlyResolvedTasks: Array<{ + observationCount: number; + resolvedAt: number; + taskHash: string; + toolNames: string[]; + }>; +}; + +type LlmToolResolution = { + plannedSteps?: string[]; + referencedTokens?: string[]; + selectedTools: CatalogEntry[]; + summary: string; + workflowSketch?: string; +}; + +type ResolveOutput = { + alreadyResolved?: boolean; + executionPlanInstructions?: string; + executionPlanJs?: string; + nextAction?: { + confirmationRequiredFor: string[]; + firstAction: { + missingArguments?: string[]; + toolName?: string; + type: "ask_user" | "invoke_tool"; + }; + instruction: string; + requiredArgumentsByTool: Array<{ + requiredArguments: string[]; + sideEffect: boolean; + toolName: string; + }>; + }; + plannedSteps?: string[]; + reasoningSummary: string; + referencedTokens?: string[]; + retriever?: "llm" | "local"; + runtimeContext?: { + availableContextKeys: string[]; + summary: string[]; + }; + selectedToolNames: string[]; + selectedTools: CatalogEntry[]; + tsDefinitions?: string; + usedLlm?: boolean; + workflowSketch?: string; +}; + +const protocolVersion = "2024-11-05"; +const toolHubServerName = "ccr-toolhub"; +const resolveToolName = "tool_hub.resolve"; +const invokeToolName = "tool_hub.invoke"; +const defaultRequestTimeoutMs = 60_000; +const defaultMaxTools = 10; +const discoveryCacheMaxAgeMs = 10_000; +const repeatedResolveWindowMs = 5 * 60_000; +const executionPlanInstructions = [ + "Treat executionPlanJs as the dependency plan for ToolHub invocations.", + "Each callTool(toolName, args) call maps to one tool_hub.invoke call with tool=toolName and args=args.", + "await means the next ToolHub invocation depends on the previous result and must not be started early.", + "Only callTool calls inside the same Promise.all([...]) expression may be issued as parallel tool calls.", + "If a later call needs values from an earlier result, wait for that earlier result and fill the arguments after it returns." +].join(" "); +const reservedJavaScriptWords = new Set( + "await break case catch class const continue debugger default delete do else enum export extends false finally for function if import in instanceof new null return super switch this throw true try typeof var void while with yield" + .split(" ") +); + +type RuntimeLike = { + callTool(params: unknown): Promise; + close(): void; +}; + +let runtime: RuntimeLike; +let inputBuffer = Buffer.alloc(0); +let lastMessageMode: MessageMode = "content-length"; + +process.stdin.on("data", (chunk) => { + inputBuffer = Buffer.concat([inputBuffer, Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)]); + drainInputBuffer().catch((error) => { + writeJsonRpc(jsonRpcError(null, -32603, formatError(error)), lastMessageMode); + }); +}); + +process.stdin.resume(); + +process.on("exit", () => { + runtime.close(); +}); + +async function drainInputBuffer(): Promise { + while (true) { + discardLeadingNewlines(); + if (inputBuffer.length === 0) { + return; + } + + if (!startsWithContentLengthHeader(inputBuffer)) { + const newline = inputBuffer.indexOf("\n"); + if (newline < 0) { + return; + } + const message = inputBuffer.subarray(0, newline).toString("utf8").trim(); + inputBuffer = inputBuffer.subarray(newline + 1); + if (!message) { + continue; + } + await handleJsonRpcMessage(message, "newline-json"); + continue; + } + + const headerEnd = inputBuffer.indexOf("\r\n\r\n"); + if (headerEnd < 0) { + return; + } + + const headerText = inputBuffer.subarray(0, headerEnd).toString("utf8"); + const lengthMatch = headerText.match(/content-length:\s*(\d+)/i); + if (!lengthMatch) { + inputBuffer = inputBuffer.subarray(headerEnd + 4); + writeJsonRpc(jsonRpcError(null, -32600, "Missing Content-Length header."), "content-length"); + continue; + } + + const contentLength = Number(lengthMatch[1]); + const messageStart = headerEnd + 4; + const messageEnd = messageStart + contentLength; + if (inputBuffer.length < messageEnd) { + return; + } + + const message = inputBuffer.subarray(messageStart, messageEnd).toString("utf8"); + inputBuffer = inputBuffer.subarray(messageEnd); + await handleJsonRpcMessage(message, "content-length"); + } +} + +function discardLeadingNewlines(): void { + while (inputBuffer[0] === 10 || inputBuffer[0] === 13) { + inputBuffer = inputBuffer.subarray(1); + } +} + +function startsWithContentLengthHeader(buffer: Buffer): boolean { + return /^content-length\s*:/i.test(buffer.subarray(0, Math.min(buffer.length, 64)).toString("utf8")); +} + +async function handleJsonRpcMessage(message: string, messageMode: MessageMode): Promise { + lastMessageMode = messageMode; + let payload: unknown; + try { + payload = JSON.parse(message) as unknown; + } catch (error) { + writeJsonRpc(jsonRpcError(null, -32700, `Invalid JSON-RPC request: ${formatError(error)}`), messageMode); + return; + } + + const response = await handleJsonRpcRequest(payload); + if (response) { + writeJsonRpc(response, messageMode); + } +} + +async function handleJsonRpcRequest(payload: unknown): Promise { + if (!isRecord(payload)) { + return jsonRpcError(null, -32600, "JSON-RPC request must be an object."); + } + + const request = payload as JsonRpcRequest; + const id = request.id ?? null; + if (request.id === undefined && request.method?.startsWith("notifications/")) { + return undefined; + } + if (request.jsonrpc !== "2.0" || !request.method) { + return jsonRpcError(id, -32600, "Invalid JSON-RPC 2.0 request."); + } + + try { + switch (request.method) { + case "initialize": + return jsonRpcResult(id, { + capabilities: { + tools: {} + }, + protocolVersion, + serverInfo: { + name: toolHubServerName, + title: "CCR ToolHub", + version: "1.0.0" + } + }); + case "ping": + return jsonRpcResult(id, {}); + case "tools/list": + return jsonRpcResult(id, { tools: metaTools() as unknown as JsonValue }); + case "tools/call": + return jsonRpcResult(id, await runtime.callTool(request.params) as JsonValue); + default: + return jsonRpcError(id, -32601, `Unsupported MCP method: ${request.method}`); + } + } catch (error) { + return jsonRpcError(id, -32603, formatError(error)); + } +} + +class ToolHubRuntime { + private readonly clients = new Map(); + private readonly registry = new ToolHubRegistry((serverName, config) => this.clientForServer(serverName, config)); + private readonly sessions = new Map(); + + async callTool(params: unknown): Promise { + const name = isRecord(params) && typeof params.name === "string" ? params.name.trim() : ""; + const args = isRecord(params) && isRecord(params.arguments) ? params.arguments : {}; + if (name === resolveToolName || name === "tool_hub_resolve" || name === "code_tool.resolve" || name === "code_tool_resolve") { + return this.resolveTools(args as ResolveInput); + } + if (name === invokeToolName || name === "tool_hub_invoke" || name === "code_tool.invoke" || name === "code_tool_invoke") { + return this.invokeTool(args); + } + throw new Error(`Unknown ToolHub meta tool: ${name}`); + } + + close(): void { + for (const entry of this.clients.values()) { + void entry.client.close(); + } + this.clients.clear(); + this.sessions.clear(); + } + + private async resolveTools(input: ResolveInput): Promise { + const task = typeof input.task === "string" ? input.task.trim() : ""; + if (!task) { + throw new Error(`${resolveToolName} requires task.`); + } + const maxTools = normalizeMaxTools(input.constraints?.maxTools ?? envNumber("TOOLHUB_MAX_TOOLS", defaultMaxTools)); + const scopeKey = this.scopeKey(input); + const session = this.session(scopeKey); + const taskHash = normalizeResolveTaskKey(task); + + this.registry.updateServers(readBackendServers()); + let catalog = await this.registry.listTools(); + if (catalog.length === 0) { + await this.registry.refreshServers(undefined, true); + catalog = await this.registry.listTools(); + } + if (taskWantsChromeLoginImport(task) && !catalogHasChromeLoginImportTool(catalog)) { + await this.registry.refreshServers(["ccr-browser-automation"], true); + catalog = await this.registry.listTools(); + } + if (catalog.length === 0) { + throw new Error("No MCP tools are available to resolve."); + } + + const cached = this.findRecentlyResolvedTask(scopeKey, taskHash); + if (cached) { + const selectedTools = expandToolBundleWithCompanionTools( + uniqueToolEntries([ + ...cached.toolNames + .map((toolName) => this.resolveCatalogEntry(toolName, catalog)) + .filter((entry): entry is CatalogEntry => Boolean(entry)), + ...getDeterministicTaskTools(task, catalog) + ]), + catalog + ); + if (selectedTools.length > 0) { + this.markToolsLoaded(scopeKey, selectedTools); + return toolResult(this.buildRepeatedResolveOutput(selectedTools)); + } + } + + const inFlightResolve = session.inFlightResolves.get(taskHash); + if (inFlightResolve) { + const output = await inFlightResolve; + const selectedTools = expandToolBundleWithCompanionTools( + uniqueToolEntries([ + ...output.selectedTools + .map((tool) => this.resolveCatalogEntry(tool.toolName, catalog) ?? tool) + .filter((entry): entry is CatalogEntry => Boolean(entry)), + ...getDeterministicTaskTools(task, catalog) + ]), + catalog + ); + if (selectedTools.length > 0) { + this.markToolsLoaded(scopeKey, selectedTools); + return toolResult(this.buildRepeatedResolveOutput(selectedTools)); + } + return toolResult(output); + } + + const resolvePromise = this.executeFreshResolve({ + catalog, + context: input.context, + maxTools, + observations: session.recentObservations.slice(-5), + scopeKey, + task, + taskHash, + timeoutMs: input.constraints?.latencyBudgetMs, + withoutSideEffects: input.constraints?.allowSideEffects === false + }); + session.inFlightResolves.set(taskHash, resolvePromise); + try { + return toolResult(await resolvePromise); + } finally { + if (session.inFlightResolves.get(taskHash) === resolvePromise) { + session.inFlightResolves.delete(taskHash); + } + } + } + + private async invokeTool(args: Record): Promise { + const requestedTool = typeof args.tool === "string" ? args.tool.trim() : ""; + if (!requestedTool) { + throw new Error(`${invokeToolName} requires tool.`); + } + const scopeKey = this.scopeKey(args); + this.registry.updateServers(readBackendServers()); + const catalog = await this.registry.listTools(); + const entry = this.resolveCatalogEntry(requestedTool, catalog); + if (!entry) { + return toolError("UNKNOWN_TOOL", `Unknown ToolHub tool: ${requestedTool}`); + } + if (!this.session(scopeKey).loadedTools.has(entry.toolName)) { + return toolError("TOOL_NOT_RESOLVED", `Tool ${entry.toolName} is not loaded in this session. Call ${resolveToolName} for the task first.`); + } + const toolArgs = isRecord(args.args) ? args.args : {}; + const client = this.clientForServer(entry.serverName); + const result = await client.callTool(entry.remoteToolName, toolArgs); + this.rememberObservation(scopeKey, entry.toolName, result); + return result; + } + + private async executeFreshResolve(input: { + catalog: CatalogEntry[]; + context?: Record; + maxTools: number; + observations: CodeToolSessionState["recentObservations"]; + scopeKey: string; + task: string; + taskHash: string; + timeoutMs?: number; + withoutSideEffects: boolean; + }): Promise { + let resolution: LlmToolResolution; + let retriever: NonNullable = "llm"; + let usedLlm = true; + try { + resolution = await this.resolveCatalogWithLlm(input); + } catch (error) { + resolution = this.resolveCatalogLocally({ ...input, error }); + if (resolution.selectedTools.length === 0) { + throw error; + } + retriever = "local"; + usedLlm = false; + } + + let selectedTools = expandToolBundleWithCompanionTools( + uniqueToolEntries([ + ...resolution.selectedTools, + ...getDeterministicTaskTools(input.task, input.catalog) + ]), + input.catalog + ); + if (input.withoutSideEffects) { + selectedTools = selectedTools.filter((tool) => !tool.invocation.sideEffect); + } + if (selectedTools.length === 0) { + throw new Error("ToolHub could not resolve any matching MCP tools for this task."); + } + + this.markToolsLoaded(input.scopeKey, selectedTools); + this.rememberResolvedTask(input.scopeKey, input.taskHash, selectedTools); + const executionPlanJs = buildExecutionPlanJs(resolution.workflowSketch, selectedTools); + return { + ...this.buildResolveOutput(resolution.summary, selectedTools, executionPlanJs), + plannedSteps: resolution.plannedSteps, + referencedTokens: resolution.referencedTokens, + retriever, + usedLlm, + workflowSketch: executionPlanJs + }; + } + + private async resolveCatalogWithLlm(input: { + catalog: CatalogEntry[]; + context?: Record; + maxTools: number; + observations: CodeToolSessionState["recentObservations"]; + task: string; + timeoutMs?: number; + }): Promise { + const searchAgent = new OpenAiToolHubSearchAgent({ + openAiApiKey: env("TOOLHUB_OPENAI_API_KEY"), + openAiBaseUrl: env("TOOLHUB_OPENAI_BASE_URL") || "https://api.openai.com/v1", + openAiModel: env("TOOLHUB_OPENAI_MODEL") + }); + const result = await searchAgent.search({ + catalog: input.catalog.map(toSearchCatalogItem), + code: JSON.stringify({ + context: input.context ?? {}, + observations: input.observations ?? [] + }), + query: input.task, + timeoutMs: input.timeoutMs ?? envNumber("TOOLHUB_REQUEST_TIMEOUT_MS", defaultRequestTimeoutMs), + topK: input.maxTools + }); + const selectedTools = result.selectedToolNames + .map((toolName) => this.resolveCatalogEntry(toolName, input.catalog)) + .filter((entry): entry is CatalogEntry => Boolean(entry)) + .slice(0, input.maxTools); + return { + plannedSteps: result.plannedSteps, + referencedTokens: result.referencedTokens, + selectedTools, + summary: result.summary, + workflowSketch: result.workflowSketch + }; + } + + private resolveCatalogLocally(input: { + catalog: CatalogEntry[]; + context?: Record; + error: unknown; + maxTools: number; + observations: CodeToolSessionState["recentObservations"]; + task: string; + }): LlmToolResolution { + const taskText = [ + input.task, + input.context ? JSON.stringify(input.context) : "", + ...input.observations.map((observation) => `${observation.toolName} ${observation.resultSummary}`) + ].join(" "); + const preferredToolNames = getLocalFallbackPreferredTools(taskText); + const scored = input.catalog + .map((tool, index) => ({ + index, + score: scoreLocalCatalogMatch(taskText, tool, preferredToolNames), + tool + })) + .filter((item) => item.score > 0) + .sort((left, right) => right.score - left.score || left.index - right.index); + const selectedTools = uniqueToolEntries(scored.map((item) => item.tool)).slice(0, input.maxTools); + return { + plannedSteps: selectedTools.length > 0 + ? [ + "Resolve retrieval LLM did not finish within the latency budget.", + "Selected candidate tools with local catalog matching." + ] + : undefined, + referencedTokens: tokenizeLocalSearchText(taskText), + selectedTools, + summary: `Resolve retrieval fell back to local catalog matching after LLM retrieval failed: ${formatError(input.error)}.`, + workflowSketch: buildLocalFallbackWorkflowSketch(selectedTools) + }; + } + + private clientForServer(serverName: string, config?: GatewayMcpServerConfig): McpClient { + const server = config ?? readBackendServers().find((candidate) => candidate.name === serverName); + if (!server) { + throw new Error(`ToolHub backend MCP server not found: ${serverName}`); + } + const existing = this.clients.get(serverName); + const configHash = hashToolHubMcpServerConfig(server); + if (existing && existing.configHash === configHash) { + return existing.client; + } + void existing?.client.close(); + const client = server.transport === "stdio" + ? new StdioMcpClient(server) + : server.transport === "sse" + ? new SseMcpClient(server) + : new HttpMcpClient(server); + this.clients.set(serverName, { client, configHash }); + return client; + } + + private resolveCatalogEntry(nameOrAlias: string, catalog: CatalogEntry[]): CatalogEntry | undefined { + const resolvedName = resolveCatalogItemName(catalog.map((entry) => ({ + alias: entry.alias, + canonicalName: entry.canonicalName, + name: entry.toolName, + remoteToolName: entry.remoteToolName + })), nameOrAlias); + if (!resolvedName) { + return undefined; + } + return catalog.find((entry) => entry.toolName === resolvedName); + } + + private buildResolveOutput(summary: string, selectedTools: CatalogEntry[], executionPlanJs = buildSequentialExecutionPlanJs(selectedTools)): ResolveOutput { + return { + executionPlanInstructions, + executionPlanJs, + nextAction: this.buildResolveNextAction(selectedTools), + reasoningSummary: summary, + runtimeContext: { + availableContextKeys: ["selectedTools", "executionPlanJs", "executionPlanInstructions"], + summary: [ + ...selectedTools.map((tool) => `${tool.toolName}: ${tool.description || tool.title}`), + "Follow executionPlanJs for dependency ordering before invoking selected tools." + ] + }, + selectedToolNames: selectedTools.map((tool) => tool.toolName), + selectedTools, + tsDefinitions: buildTsDefinitions(selectedTools), + workflowSketch: executionPlanJs + }; + } + + private buildRepeatedResolveOutput(selectedTools: CatalogEntry[]): ResolveOutput { + const nextAction = this.buildResolveNextAction(selectedTools); + const executionPlanJs = buildSequentialExecutionPlanJs(selectedTools); + return { + alreadyResolved: true, + executionPlanInstructions, + executionPlanJs, + nextAction, + reasoningSummary: [ + "This task has already been resolved in the current ToolHub session.", + nextAction.instruction + ].join(" "), + runtimeContext: { + availableContextKeys: ["selectedTools", "nextAction", "executionPlanJs", "executionPlanInstructions"], + summary: [ + "The selected tools are already loaded for tool_hub.invoke.", + "Do not repeat discovery for this task.", + nextAction.instruction, + "Follow executionPlanJs for dependency ordering before invoking selected tools." + ] + }, + selectedToolNames: selectedTools.map((tool) => tool.toolName), + selectedTools, + workflowSketch: executionPlanJs + }; + } + + private buildResolveNextAction(selectedTools: CatalogEntry[]): NonNullable { + const requiredArgumentsByTool = selectedTools + .map((tool) => ({ + requiredArguments: getSchemaRequiredProperties(tool.inputSchema), + sideEffect: tool.invocation.sideEffect, + toolName: tool.toolName + })) + .filter((item) => item.requiredArguments.length > 0); + const confirmationRequiredFor = selectedTools + .filter((tool) => tool.invocation.sideEffect) + .map((tool) => tool.toolName); + const firstTool = selectFirstActionTool(selectedTools); + const firstRequiredArguments = firstTool ? getSchemaRequiredProperties(firstTool.inputSchema) : []; + const firstAction = firstRequiredArguments.length > 0 + ? { + missingArguments: firstRequiredArguments, + toolName: firstTool?.toolName, + type: "ask_user" as const + } + : { + toolName: firstTool?.toolName, + type: "invoke_tool" as const + }; + const instructionParts = [ + "Do not call tool_hub.resolve again for this task.", + "Follow executionPlanJs: await is serial dependency; only Promise.all groups may run in parallel." + ]; + if (firstTool && firstRequiredArguments.length > 0) { + instructionParts.push(`Ask the user for missing required arguments for ${firstTool.toolName}: ${firstRequiredArguments.join(", ")}.`); + } else if (firstTool) { + instructionParts.push(`Call tool_hub.invoke for ${firstTool.toolName}.`); + } else { + instructionParts.push("Ask the user for the missing task details before invoking tools."); + } + if (confirmationRequiredFor.length > 0) { + instructionParts.push(`Before calling side-effecting tools, ask for explicit confirmation: ${confirmationRequiredFor.join(", ")}.`); + } + return { + confirmationRequiredFor, + firstAction, + instruction: instructionParts.join(" "), + requiredArgumentsByTool + }; + } + + private scopeKey(input: Record): string { + return readNonEmptyString(input.__toolHubScopeKey) || readNonEmptyString(input.__codeToolScopeKey) || "default"; + } + + private session(scopeKey: string): CodeToolSessionState { + const existing = this.sessions.get(scopeKey); + if (existing) { + return existing; + } + const session: CodeToolSessionState = { + inFlightResolves: new Map(), + loadedTools: new Set(), + recentObservations: [], + recentlyResolvedTasks: [] + }; + this.sessions.set(scopeKey, session); + return session; + } + + private markToolsLoaded(scopeKey: string, entries: CatalogEntry[]): void { + const session = this.session(scopeKey); + for (const entry of entries) { + session.loadedTools.add(entry.toolName); + } + } + + private rememberResolvedTask(scopeKey: string, taskHash: string, entries: CatalogEntry[]): void { + const session = this.session(scopeKey); + session.recentlyResolvedTasks = session.recentlyResolvedTasks.filter((item) => item.taskHash !== taskHash); + session.recentlyResolvedTasks.unshift({ + observationCount: session.recentObservations.length, + resolvedAt: Date.now(), + taskHash, + toolNames: entries.map((entry) => entry.toolName) + }); + session.recentlyResolvedTasks = session.recentlyResolvedTasks.slice(0, 10); + } + + private findRecentlyResolvedTask(scopeKey: string, taskHash: string): CodeToolSessionState["recentlyResolvedTasks"][number] | undefined { + const session = this.session(scopeKey); + const now = Date.now(); + session.recentlyResolvedTasks = session.recentlyResolvedTasks.filter((item) => now - item.resolvedAt <= repeatedResolveWindowMs); + return session.recentlyResolvedTasks.find((item) => item.taskHash === taskHash); + } + + private rememberObservation(scopeKey: string, toolName: string, result: unknown): void { + const session = this.session(scopeKey); + session.recentObservations.push({ + resultSummary: summarizeValue(result), + toolName + }); + session.recentObservations = session.recentObservations.slice(-20); + } +} + +class ToolHubRegistry { + private discoveryPromise: Promise | undefined; + private readonly entries = new Map(); + + constructor(private readonly clientFactory: (serverName: string, config?: GatewayMcpServerConfig) => McpClient) {} + + updateServers(servers: GatewayMcpServerConfig[]): void { + const nextServerNames = new Set(); + for (const server of servers) { + nextServerNames.add(server.name); + const configHash = hashToolHubMcpServerConfig(server); + const existing = this.entries.get(server.name); + if (existing && existing.configHash === configHash) { + existing.config = cloneServerConfig(server); + continue; + } + const cachedDiscovery = toolHubPersistentCache.readDiscovery(server.name, configHash); + this.entries.set(server.name, { + config: cloneServerConfig(server), + configHash, + lastCheckedAt: cachedDiscovery?.cachedAt, + lastSeenOnlineAt: cachedDiscovery?.lastSeenOnlineAt, + loadedFromCache: Boolean(cachedDiscovery), + status: "unknown", + tools: cachedDiscovery?.tools.map((tool) => ({ ...tool })) ?? [] + }); + } + + for (const serverName of this.entries.keys()) { + if (!nextServerNames.has(serverName)) { + this.entries.delete(serverName); + } + } + } + + async listTools(): Promise { + await this.ensureDiscoveryFresh(); + return this.listCatalogEntriesSync(); + } + + async refreshServers(serverNames?: string[], force = true): Promise { + const targetServerNames = normalizeTargetServerNames(serverNames, this.entries); + if (targetServerNames.length === 0) { + return; + } + if (this.discoveryPromise) { + await this.discoveryPromise; + if (!force) { + return; + } + } + this.discoveryPromise = this.performDiscovery(targetServerNames, force); + try { + await this.discoveryPromise; + } finally { + this.discoveryPromise = undefined; + } + } + + private async ensureDiscoveryFresh(maxAgeMs = discoveryCacheMaxAgeMs): Promise { + const staleServerNames = [...this.entries.values()] + .filter((entry) => !entry.lastCheckedAt || Date.now() - entry.lastCheckedAt > maxAgeMs) + .map((entry) => entry.config.name); + if (staleServerNames.length === 0) { + return; + } + await this.refreshServers(staleServerNames, false); + } + + private listCatalogEntriesSync(): CatalogEntry[] { + const namespaces = serverNamespaces([...this.entries.values()].map((entry) => entry.config.name)); + const entries: CatalogEntry[] = []; + for (const entry of this.entries.values()) { + const serverNamespace = namespaces.get(entry.config.name) ?? toIdentifier(entry.config.name); + for (const tool of entry.tools) { + const remoteToolName = tool.name.trim(); + if (!remoteToolName) { + continue; + } + const toolName = `mcp.${serverNamespace}.${remoteToolName}`; + entries.push({ + alias: toIdentifier(toolName), + canonicalName: `${entry.config.name}.${remoteToolName}`, + description: tool.description ?? "", + inputSchema: tool.inputSchema, + invocation: inferInvocation(tool), + outputSchema: tool.outputSchema, + remoteToolName, + serverId: entry.config.name, + serverLabel: entry.config.label, + serverName: entry.config.name, + serverNamespace, + status: entry.status, + tags: tool.tags ?? [], + title: tool.title || tool.name, + toolName + }); + } + } + return entries.sort((left, right) => left.toolName.localeCompare(right.toolName)); + } + + private async performDiscovery(serverNames: string[], force: boolean): Promise { + for (const serverName of serverNames) { + const entry = this.entries.get(serverName); + if (!entry) { + continue; + } + if (!force && entry.lastCheckedAt && Date.now() - entry.lastCheckedAt < 3_000) { + continue; + } + await this.probeServer(entry.config); + } + } + + private async probeServer(config: GatewayMcpServerConfig): Promise { + const now = Date.now(); + try { + const tools = await this.clientFactory(config.name, config).listTools(); + const entry = this.entries.get(config.name); + if (!entry) { + return; + } + entry.status = "online"; + entry.tools = tools.map((tool) => ({ ...tool })); + entry.lastCheckedAt = now; + entry.lastSeenOnlineAt = now; + entry.loadedFromCache = true; + entry.error = undefined; + toolHubPersistentCache.writeDiscovery(config.name, entry.configHash, entry.tools, now); + } catch (error) { + const entry = this.entries.get(config.name); + if (!entry) { + return; + } + entry.status = "offline"; + entry.lastCheckedAt = now; + entry.loadedFromCache = false; + entry.error = formatError(error); + } + } +} + +runtime = new ToolHubRuntime(); + +class SseMcpClient implements McpClient { + private endpointUrl = ""; + private initialized = false; + private nextId = 1; + private openPromise: Promise | undefined; + private readonly pending = new Map(); + private streamAbort: AbortController | undefined; + private streamBuffer = ""; + + constructor(private readonly server: GatewayMcpRemoteServerConfig) {} + + async listTools(): Promise { + await this.ensureInitialized(); + const result = await this.request("tools/list", {}); + return normalizeToolList(result); + } + + async callTool(name: string, args: Record): Promise { + await this.ensureInitialized(); + return this.request("tools/call", { + name, + arguments: args + }); + } + + async close(): Promise { + this.initialized = false; + this.endpointUrl = ""; + this.streamAbort?.abort(); + this.streamAbort = undefined; + this.rejectAll(new Error(`MCP SSE client closed: ${this.server.name}`)); + } + + private async ensureInitialized(): Promise { + if (this.initialized) { + return; + } + await this.ensureStream(); + await this.request("initialize", { + capabilities: {}, + clientInfo: { name: toolHubServerName, version: "1.0.0" }, + protocolVersion: this.server.protocolVersion || protocolVersion + }, this.server.startupTimeoutMs); + await this.notification("notifications/initialized", {}).catch(() => undefined); + this.initialized = true; + } + + private async ensureStream(): Promise { + if (this.endpointUrl) { + return; + } + if (!this.openPromise) { + this.openPromise = this.openStream().finally(() => { + this.openPromise = undefined; + }); + } + await this.openPromise; + } + + private async openStream(): Promise { + const controller = new AbortController(); + this.streamAbort = controller; + const response = await fetch(this.server.url, { + headers: this.headers(false), + method: "GET", + signal: controller.signal + }); + if (!response.ok || !response.body) { + throw new Error(`MCP SSE stream failed (${this.server.name}): ${response.status}`); + } + + let resolveEndpoint: () => void = () => {}; + let rejectEndpoint: (error: Error) => void = () => {}; + const endpointReady = new Promise((resolve, reject) => { + resolveEndpoint = resolve; + rejectEndpoint = reject; + }); + const timeout = setTimeout(() => { + rejectEndpoint(new Error(`MCP SSE endpoint timed out (${this.server.name}).`)); + controller.abort(); + }, this.server.startupTimeoutMs ?? defaultRequestTimeoutMs); + + const reader = response.body.getReader(); + const decoder = new TextDecoder(); + void (async () => { + try { + for (;;) { + const { done, value } = await reader.read(); + if (done) break; + this.streamBuffer += decoder.decode(value, { stream: true }); + this.streamBuffer = consumeSseEvents(this.streamBuffer, (event) => { + if (event.event === "endpoint") { + this.endpointUrl = new URL(event.data.trim(), this.server.url).toString(); + clearTimeout(timeout); + resolveEndpoint(); + return; + } + this.routeSseMessage(event.data); + }); + } + this.rejectAll(new Error(`MCP SSE stream closed (${this.server.name}).`)); + } catch (error) { + clearTimeout(timeout); + rejectEndpoint(toError(error)); + this.rejectAll(toError(error)); + } + })(); + + await endpointReady; + } + + private request(method: string, params: Record, timeoutMs = this.server.requestTimeoutMs): Promise { + return this.ensureStream().then(() => { + const id = this.nextId++; + const message = { + id, + jsonrpc: "2.0", + method, + params + }; + const pending = new Promise((resolve, reject) => { + const timer = setTimeout(() => { + this.pending.delete(String(id)); + reject(new Error(`MCP SSE request timed out (${this.server.name}): ${method}`)); + }, timeoutMs ?? defaultRequestTimeoutMs); + this.pending.set(String(id), { + reject, + resolve: (response) => { + if (isRecord(response.error)) { + reject(new Error(String(response.error.message ?? "MCP request failed."))); + return; + } + resolve(response.result); + }, + timer + }); + }); + return this.post(message).then(() => pending); + }); + } + + private async notification(method: string, params: Record): Promise { + await this.ensureStream(); + await this.post({ jsonrpc: "2.0", method, params }); + } + + private async post(message: Record): Promise { + const response = await fetch(this.endpointUrl, { + body: JSON.stringify(message), + headers: this.headers(true), + method: "POST" + }); + if (!response.ok) { + throw new Error(`MCP SSE post failed (${this.server.name}): ${response.status}`); + } + } + + private headers(json: boolean): Headers { + const headers = new Headers({ + ...(json ? { "content-type": "application/json" } : {}), + ...(this.server.headers ?? {}) + }); + const apiKey = this.server.apiKey || (this.server.apiKeyEnv ? process.env[this.server.apiKeyEnv] : ""); + if (apiKey && !headers.has("authorization")) { + headers.set("authorization", `Bearer ${apiKey}`); + } + return headers; + } + + private routeSseMessage(text: string): void { + let message: JsonRpcRequest; + try { + message = JSON.parse(text) as JsonRpcRequest; + } catch { + return; + } + const key = message.id === undefined || message.id === null ? "" : String(message.id); + const pending = key ? this.pending.get(key) : undefined; + if (!pending) { + return; + } + this.pending.delete(key); + clearTimeout(pending.timer); + pending.resolve(message); + } + + private rejectAll(error: Error): void { + for (const item of this.pending.values()) { + clearTimeout(item.timer); + item.reject(error); + } + this.pending.clear(); + } +} + +class HttpMcpClient implements McpClient { + private initialized = false; + private sessionId = ""; + + constructor(private readonly server: GatewayMcpRemoteServerConfig) {} + + async listTools(): Promise { + await this.ensureInitialized(); + const result = await this.request("tools/list", {}); + return normalizeToolList(result); + } + + async callTool(name: string, args: Record): Promise { + await this.ensureInitialized(); + return this.request("tools/call", { + name, + arguments: args + }); + } + + async close(): Promise { + this.initialized = false; + this.sessionId = ""; + } + + private async ensureInitialized(): Promise { + if (this.initialized) { + return; + } + await this.request("initialize", { + capabilities: {}, + clientInfo: { name: toolHubServerName, version: "1.0.0" }, + protocolVersion: this.server.protocolVersion || protocolVersion + }, this.server.startupTimeoutMs); + await this.notification("notifications/initialized", {}).catch(() => undefined); + this.initialized = true; + } + + private async notification(method: string, params: Record): Promise { + await this.frame({ jsonrpc: "2.0", method, params }, this.server.requestTimeoutMs, true); + } + + private async request(method: string, params: Record, timeoutMs = this.server.requestTimeoutMs): Promise { + const response = await this.frame({ + id: randomUUID(), + jsonrpc: "2.0", + method, + params + }, timeoutMs, false); + if (!isRecord(response)) { + throw new Error(`Invalid MCP response from ${this.server.name}.`); + } + if (isRecord(response.error)) { + throw new Error(`MCP request failed (${this.server.name}): ${String(response.error.message ?? "Unknown error")}`); + } + return response.result; + } + + private async frame(request: Record, timeoutMs = defaultRequestTimeoutMs, notification: boolean): Promise { + const controller = new AbortController(); + const timer = setTimeout(() => controller.abort(), timeoutMs); + try { + const headers = new Headers({ + accept: "application/json, text/event-stream", + "content-type": "application/json", + ...(this.server.headers ?? {}) + }); + const apiKey = this.server.apiKey || (this.server.apiKeyEnv ? process.env[this.server.apiKeyEnv] : ""); + if (apiKey && !headers.has("authorization")) { + headers.set("authorization", `Bearer ${apiKey}`); + } + if (this.sessionId) { + headers.set("mcp-session-id", this.sessionId); + } + const response = await fetch(this.server.url, { + body: JSON.stringify(request), + headers, + method: "POST", + signal: controller.signal + }); + this.sessionId = response.headers.get("mcp-session-id") || response.headers.get("x-mcp-session-id") || this.sessionId; + if (notification && response.status === 204) { + return undefined; + } + const text = await response.text(); + if (!response.ok) { + throw new Error(`MCP HTTP request failed (${this.server.name}): ${response.status} ${text.slice(0, 300)}`); + } + if (!text.trim()) { + return undefined; + } + return parseHttpJsonRpcResponse(text); + } finally { + clearTimeout(timer); + } + } +} + +class StdioMcpClient implements McpClient { + private child: ChildProcessWithoutNullStreams | undefined; + private initialized = false; + private nextId = 1; + private readonly pending = new Map(); + private stdoutBuffer = Buffer.alloc(0); + + constructor(private readonly server: GatewayMcpStdioServerConfig) {} + + async listTools(): Promise { + await this.ensureInitialized(); + const result = await this.request("tools/list", {}, this.server.requestTimeoutMs); + return normalizeToolList(result); + } + + async callTool(name: string, args: Record): Promise { + await this.ensureInitialized(); + return this.request("tools/call", { + name, + arguments: args + }, this.server.requestTimeoutMs); + } + + async close(): Promise { + this.initialized = false; + for (const item of this.pending.values()) { + clearTimeout(item.timer); + item.reject(new Error(`MCP stdio client closed: ${this.server.name}`)); + } + this.pending.clear(); + if (this.child && !this.child.killed) { + this.child.kill(); + } + this.child = undefined; + } + + private async ensureInitialized(): Promise { + if (this.initialized) { + return; + } + this.ensureChild(); + await this.request("initialize", { + capabilities: {}, + clientInfo: { name: toolHubServerName, version: "1.0.0" }, + protocolVersion: this.server.protocolVersion || protocolVersion + }, this.server.startupTimeoutMs); + this.notify("notifications/initialized", {}); + this.initialized = true; + } + + private ensureChild(): ChildProcessWithoutNullStreams { + if (this.child) { + return this.child; + } + const child = spawn(this.server.command, this.server.args ?? [], { + cwd: this.server.cwd || undefined, + env: { + ...process.env, + ...(this.server.env ?? {}) + }, + stdio: ["pipe", "pipe", "pipe"] + }) as ChildProcessWithoutNullStreams; + child.stdout.on("data", (chunk: Buffer) => this.readStdout(chunk)); + child.stderr.on("data", (chunk: Buffer) => { + const text = chunk.toString("utf8").trim(); + if (text) { + console.error(`[ToolHub backend ${this.server.name}] ${text}`); + } + }); + child.on("error", (error) => this.rejectAll(error)); + child.on("exit", (code, signal) => { + this.initialized = false; + this.child = undefined; + this.rejectAll(new Error(`MCP server exited (${this.server.name}): ${signal ?? code ?? "unknown"}`)); + }); + this.child = child; + return child; + } + + private request(method: string, params: Record, timeoutMs = defaultRequestTimeoutMs): Promise { + const id = this.nextId++; + const message = { + id, + jsonrpc: "2.0", + method, + params + }; + return new Promise((resolve, reject) => { + const timer = setTimeout(() => { + this.pending.delete(String(id)); + reject(new Error(`MCP stdio request timed out (${this.server.name}): ${method}`)); + }, timeoutMs); + this.pending.set(String(id), { + reject, + resolve: (response) => { + if (isRecord(response.error)) { + reject(new Error(String(response.error.message ?? "MCP request failed."))); + return; + } + resolve(response.result); + }, + timer + }); + this.write(message); + }); + } + + private notify(method: string, params: Record): void { + this.write({ jsonrpc: "2.0", method, params }); + } + + private write(message: Record): void { + const child = this.ensureChild(); + const text = JSON.stringify(message); + if (this.server.stdioMessageMode === "newline-json") { + child.stdin.write(`${text}\n`); + return; + } + child.stdin.write(`Content-Length: ${Buffer.byteLength(text, "utf8")}\r\n\r\n${text}`); + } + + private readStdout(chunk: Buffer): void { + this.stdoutBuffer = Buffer.concat([this.stdoutBuffer, chunk]); + if (this.server.stdioMessageMode === "newline-json") { + this.drainNewlineJsonStdout(); + } else { + this.drainContentLengthStdout(); + } + } + + private drainContentLengthStdout(): void { + while (true) { + const headerEnd = this.stdoutBuffer.indexOf("\r\n\r\n"); + if (headerEnd < 0) return; + const headerText = this.stdoutBuffer.subarray(0, headerEnd).toString("utf8"); + const lengthMatch = headerText.match(/content-length:\s*(\d+)/i); + if (!lengthMatch) { + this.stdoutBuffer = this.stdoutBuffer.subarray(headerEnd + 4); + continue; + } + const contentLength = Number(lengthMatch[1]); + const messageStart = headerEnd + 4; + const messageEnd = messageStart + contentLength; + if (this.stdoutBuffer.length < messageEnd) return; + const text = this.stdoutBuffer.subarray(messageStart, messageEnd).toString("utf8"); + this.stdoutBuffer = this.stdoutBuffer.subarray(messageEnd); + this.routeMessage(text); + } + } + + private drainNewlineJsonStdout(): void { + while (true) { + const newline = this.stdoutBuffer.indexOf("\n"); + if (newline < 0) return; + const text = this.stdoutBuffer.subarray(0, newline).toString("utf8").trim(); + this.stdoutBuffer = this.stdoutBuffer.subarray(newline + 1); + if (text) { + this.routeMessage(text); + } + } + } + + private routeMessage(text: string): void { + let message: JsonRpcRequest; + try { + message = JSON.parse(text) as JsonRpcRequest; + } catch { + return; + } + const key = message.id === undefined || message.id === null ? "" : String(message.id); + const pending = key ? this.pending.get(key) : undefined; + if (!pending) { + return; + } + this.pending.delete(key); + clearTimeout(pending.timer); + pending.resolve(message); + } + + private rejectAll(error: Error): void { + for (const item of this.pending.values()) { + clearTimeout(item.timer); + item.reject(error); + } + this.pending.clear(); + } +} + +const treeSitterToolName = "tree_sitter_collect_tool_references"; +const defaultMaxTurns = 3; +const maxTurnsLimit = 6; +const minSearchTimeoutMs = 8_000; +const maxTurnTimeoutMs = 60_000; +const minTurnRemainingMs = 3_500; +const minFinalAnswerTurnTimeoutMs = 8_000; +const timeoutHeadroomMs = 1_500; + +type SearchCatalogItem = { + alias: string; + canonicalName?: string; + description: string; + invocationMode: string; + name: string; + remoteToolName?: string; + required?: string[]; + serverId?: string; + serverLabel?: string; + sideEffect: boolean; + title: string; +}; + +type SearchMessage = { + content?: string | null; + role: "assistant" | "system" | "tool" | "user"; + tool_call_id?: string; + tool_calls?: Array<{ + function: { + arguments: string; + name: string; + }; + id: string; + type: "function"; + }>; +}; + +type SearchResult = { + plannedSteps?: string[]; + referencedTokens: string[]; + selectedToolNames: string[]; + summary: string; + workflowSketch?: string; +}; + +type ToolReference = { + column: number; + line: number; + rawName: string; + source: string; +}; + +class OpenAiToolHubSearchAgent { + private readonly analyzer = new ToolReferenceAnalyzer(); + + constructor(private readonly config: { + openAiApiKey?: string; + openAiBaseUrl?: string; + openAiModel?: string; + }) {} + + async search(input: { + catalog: SearchCatalogItem[]; + code?: string; + maxTurns?: number; + query: string; + timeoutMs?: number; + topK?: number; + }): Promise { + const query = input.query.trim(); + if (!query) { + throw new Error("ToolHub resolve query must be non-empty."); + } + const apiKey = this.config.openAiApiKey || env("TOOLHUB_OPENAI_API_KEY"); + const baseURL = this.config.openAiBaseUrl || env("TOOLHUB_OPENAI_BASE_URL") || "https://api.openai.com/v1"; + const model = this.config.openAiModel || env("TOOLHUB_OPENAI_MODEL"); + if (!apiKey || !model) { + throw new Error("ToolHub resolver requires TOOLHUB_OPENAI_API_KEY and TOOLHUB_OPENAI_MODEL."); + } + + const topK = normalizeTopK(input.topK); + const maxTurns = normalizeSearchMaxTurns(input.maxTurns); + const timeoutMs = normalizeSearchTimeout(input.timeoutMs); + const deadlineAt = Date.now() + timeoutMs; + await waitForLocalResolverEndpoint(baseURL, apiKey, timeoutMs); + const client = new OpenAI({ apiKey, baseURL }); + const messages: SearchMessage[] = [ + { + role: "user", + content: JSON.stringify({ + context: input.code ?? "", + query + }, null, 2) + } + ]; + + let didCallAnalyzer = false; + let analyzerCallCount = 0; + let summary = ""; + let workflowSketch = ""; + let plannedSteps: string[] = []; + let llmSelectedNames: string[] = []; + let referencedTokens: string[] = []; + let latestResolvedFromAnalyzer: string[] = []; + + for (let turn = 0; turn < maxTurns; turn += 1) { + const remainingMs = deadlineAt - Date.now(); + const minTurnTimeoutMs = didCallAnalyzer ? minFinalAnswerTurnTimeoutMs : minTurnRemainingMs; + if (remainingMs <= minTurnTimeoutMs + timeoutHeadroomMs) { + break; + } + const turnTimeoutMs = Math.min(remainingMs - timeoutHeadroomMs, maxTurnTimeoutMs); + const responseMessage = await this.callOpenAiWithTools( + client, + model, + buildSearchSystemPrompt(input.catalog, topK), + messages, + turnTimeoutMs + ); + + const toolCalls = responseMessage.tool_calls ?? []; + if (toolCalls.length > 0) { + messages.push(responseMessage); + const roundResolvedToolNames: string[] = []; + for (const toolCall of toolCalls) { + if (toolCall.function.name !== treeSitterToolName) { + messages.push({ + role: "tool", + tool_call_id: toolCall.id, + content: JSON.stringify({ error: `Unknown tool: ${toolCall.function.name}` }) + }); + continue; + } + didCallAnalyzer = true; + analyzerCallCount += 1; + const toolInput = parseToolArguments(toolCall.function.arguments); + const analyzeCode = typeof toolInput.code === "string" ? toolInput.code : ""; + const references = this.analyzer.collectReferences(analyzeCode); + const tokens = uniqueStrings(references.map((item) => item.rawName)); + const resolvedToolNames = uniqueStrings( + tokens + .map((token) => resolveCatalogItemName(input.catalog, token)) + .filter((name): name is string => typeof name === "string") + ); + referencedTokens = uniqueStrings([...referencedTokens, ...tokens]); + roundResolvedToolNames.push(...resolvedToolNames); + messages.push({ + role: "tool", + tool_call_id: toolCall.id, + content: JSON.stringify({ + references, + resolvedToolNames, + tokens + }) + }); + } + latestResolvedFromAnalyzer = uniqueStrings(roundResolvedToolNames); + continue; + } + + const contentText = typeof responseMessage.content === "string" ? responseMessage.content.trim() : ""; + const parsed = firstJsonObject(contentText); + if (!parsed) { + messages.push(responseMessage); + messages.push({ + role: "user", + content: didCallAnalyzer + ? "Return only a valid JSON object with keys \"summary\", \"steps\", \"workflowSketch\", and \"toolNames\"." + : `You must call ${treeSitterToolName} on a TypeScript workflow sketch before your final answer.` + }); + continue; + } + + summary = typeof parsed.summary === "string" ? parsed.summary.trim() : ""; + workflowSketch = typeof parsed.workflowSketch === "string" ? parsed.workflowSketch : ""; + plannedSteps = toStringArray(parsed.steps); + const workflowReferences = this.analyzer.collectReferences(workflowSketch); + const workflowTokens = uniqueStrings(workflowReferences.map((item) => item.rawName)); + const workflowResolvedNames = uniqueStrings( + workflowTokens + .map((token) => resolveCatalogItemName(input.catalog, token)) + .filter((name): name is string => typeof name === "string") + ); + referencedTokens = uniqueStrings([...referencedTokens, ...workflowTokens]); + llmSelectedNames = uniqueStrings( + [ + ...workflowResolvedNames, + ...toStringArray(parsed.toolNames) + ] + .map((name) => resolveCatalogItemName(input.catalog, name)) + .filter((name): name is string => typeof name === "string") + ); + const selectedToolNames = uniqueStrings([...latestResolvedFromAnalyzer, ...llmSelectedNames]).slice(0, topK); + const refinementFeedback = didCallAnalyzer + ? buildSearchRefinementFeedback({ + selectedToolNames, + summary, + workflowSketch + }) + : selectedToolNames.length === 0 + ? "Your current answer resolved to zero valid catalog tools. Call the tree-sitter tool on a revised TypeScript workflow sketch before answering." + : undefined; + if (refinementFeedback && turn + 1 < maxTurns) { + messages.push(responseMessage); + messages.push({ role: "user", content: refinementFeedback }); + continue; + } + break; + } + + const selectedToolNames = uniqueStrings([...latestResolvedFromAnalyzer, ...llmSelectedNames]).slice(0, topK); + if (selectedToolNames.length === 0) { + throw new Error(didCallAnalyzer || analyzerCallCount > 0 + ? "Resolve retrieval did not converge on any valid catalog tools after AST refinement." + : "Resolve retrieval did not converge on any valid catalog tools."); + } + if (!didCallAnalyzer || analyzerCallCount === 0) { + referencedTokens = uniqueStrings([...referencedTokens, ...selectedToolNames]); + } + if (didCallAnalyzer && analyzerCallCount === 0) { + throw new Error("Resolve retrieval LLM did not complete an AST planning round."); + } + if (!summary) { + summary = didCallAnalyzer + ? "Resolved a planned end-to-end tool bundle with AST-assisted retrieval." + : "Resolved a planned end-to-end tool bundle from the resolver model response."; + } else if (summary.toLowerCase().includes("no strong tool bundle match was found")) { + summary = "Resolved a candidate tool bundle after iterative AST refinement."; + } + return { + plannedSteps: plannedSteps.length > 0 ? plannedSteps : undefined, + referencedTokens, + selectedToolNames, + summary, + workflowSketch: workflowSketch || undefined + }; + } + + private async callOpenAiWithTools( + client: OpenAI, + model: string, + system: string, + messages: SearchMessage[], + timeoutMs: number + ): Promise { + const response = await client.chat.completions.create({ + model, + temperature: 0, + messages: [ + { role: "system", content: system }, + ...messages + ] as OpenAI.Chat.Completions.ChatCompletionMessageParam[], + stream: false, + tools: [ + { + type: "function", + function: { + name: treeSitterToolName, + description: "Analyze a short TypeScript workflow sketch and extract exact ToolHub tool references.", + parameters: { + type: "object", + properties: { + code: { + type: "string", + description: "TypeScript workflow sketch that references ToolHub tools." + } + }, + required: ["code"], + additionalProperties: false + } + } + } + ], + tool_choice: "auto" + } as OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming, { + timeout: timeoutMs + }); + + const message = response.choices[0]?.message; + if (!message) { + throw new Error("OpenAI resolve retrieval returned no assistant message."); + } + const content = typeof message.content === "string" ? message.content : ""; + const toolCalls = (message.tool_calls ?? []) + .map((toolCall, index) => { + const rawToolCall = toolCall as unknown as { function?: unknown }; + const functionCall = isRecord(rawToolCall.function) ? rawToolCall.function : {}; + return { + id: toolCall.id || `tool_call_${index}`, + type: "function" as const, + function: { + arguments: typeof functionCall.arguments === "string" ? functionCall.arguments : "", + name: typeof functionCall.name === "string" ? functionCall.name : "" + } + }; + }) + .filter((toolCall) => toolCall.function.name.length > 0); + if (!content && toolCalls.length === 0) { + throw new Error("OpenAI resolve retrieval returned no assistant content or tool calls."); + } + return { + role: "assistant", + content, + tool_calls: toolCalls + }; + } +} + +async function waitForLocalResolverEndpoint(baseURL: string, apiKey: string, timeoutMs: number): Promise { + const readinessUrl = localResolverReadinessUrl(baseURL); + if (!readinessUrl) { + return; + } + const deadline = Date.now() + Math.min(Math.max(timeoutMs, 1000), 30_000); + let lastError: unknown; + while (Date.now() < deadline) { + const controller = new AbortController(); + const timer = setTimeout(() => controller.abort(), 1000); + try { + await fetch(readinessUrl, { + headers: { authorization: `Bearer ${apiKey}` }, + method: "GET", + signal: controller.signal + }); + return; + } catch (error) { + lastError = error; + if (!isRetryableLocalResolverError(error)) { + return; + } + await delay(300); + } finally { + clearTimeout(timer); + } + } + throw new Error(`ToolHub resolver could not connect to CCR Gateway at ${readinessUrl}: ${formatError(lastError)}.`); +} + +function localResolverReadinessUrl(baseURL: string): string | undefined { + let parsed: URL; + try { + parsed = new URL(baseURL); + } catch { + return undefined; + } + if (!isLoopbackHostname(parsed.hostname)) { + return undefined; + } + const base = baseURL.replace(/\/+$/g, ""); + return `${base}/models`; +} + +function isLoopbackHostname(hostname: string): boolean { + const normalized = hostname.trim().toLowerCase().replace(/^\[|\]$/g, ""); + return normalized === "localhost" || + normalized === "::1" || + normalized === "0:0:0:0:0:0:0:1" || + normalized.startsWith("127."); +} + +function isRetryableLocalResolverError(error: unknown): boolean { + if (error instanceof DOMException && error.name === "AbortError") { + return true; + } + const code = errorCode(error); + return code === "ECONNREFUSED" || + code === "ECONNRESET" || + code === "EHOSTUNREACH" || + code === "ENETUNREACH" || + code === "ETIMEDOUT"; +} + +function errorCode(error: unknown): string { + if (!isRecord(error)) { + return ""; + } + const direct = typeof error.code === "string" ? error.code : ""; + if (direct) { + return direct; + } + const cause = isRecord(error.cause) ? error.cause : undefined; + return typeof cause?.code === "string" ? cause.code : ""; +} + +function delay(ms: number): Promise { + return new Promise((resolve) => setTimeout(resolve, ms)); +} + +function metaTools(): Array<{ description: string; inputSchema: Record; name: string }> { + return [ + { + name: resolveToolName, + description: [ + "Search ToolHub with the configured model and resolve installed MCP tools needed for a task.", + `MUST be called before answering any request about external services, installed MCP capabilities, business APIs, orders, coupons, stores, accounts, available tools, or capabilities that are not already obvious from the eager tools.`, + `Call this even if the user did not mention ToolHub or ${resolveToolName}.`, + `Use ${invokeToolName} after this tool returns selected tools.`, + "Follow the returned executionPlanJs: await means serial dependency, and only calls grouped by Promise.all may be invoked in parallel.", + "Use the user's request as task and include concise context so the resolver can select the right tools." + ].join(" "), + inputSchema: { + type: "object", + properties: { + task: { type: "string" }, + context: { type: "object", additionalProperties: true }, + constraints: { + type: "object", + properties: { + maxTools: { type: "number" } + }, + additionalProperties: false + } + }, + required: ["task"], + additionalProperties: false + } + }, + { + name: invokeToolName, + description: `Invoke one MCP tool selected by ${resolveToolName}. Follow executionPlanJs from ${resolveToolName}; do not parallelize invoke calls unless that plan groups them in Promise.all.`, + inputSchema: { + type: "object", + properties: { + tool: { type: "string" }, + args: { type: "object", additionalProperties: true } + }, + required: ["tool"], + additionalProperties: false + } + } + ]; +} + +function readBackendServers(): GatewayMcpServerConfig[] { + const raw = env("TOOLHUB_MCP_SERVERS_JSON"); + if (!raw) { + return []; + } + try { + const parsed = JSON.parse(raw) as unknown; + return Array.isArray(parsed) + ? parsed.map(normalizeServerConfig).filter((server): server is GatewayMcpServerConfig => Boolean(server)) + : []; + } catch { + return []; + } +} + +function normalizeServerConfig(value: unknown): GatewayMcpServerConfig | undefined { + if (!isRecord(value)) { + return undefined; + } + const rawTransport = typeof value.transport === "string" ? value.transport : typeof value.type === "string" ? value.type : ""; + const normalizedTransport = rawTransport.toLowerCase().replace(/_/g, "-"); + const transport = normalizedTransport === "streamable-http" || normalizedTransport === "streamablehttp" || normalizedTransport === "http" + ? "streamable-http" + : normalizedTransport === "sse" + ? "sse" + : "stdio"; + const name = typeof value.name === "string" && value.name.trim() ? value.name.trim() : ""; + if (!name) { + return undefined; + } + const base = { + label: typeof value.label === "string" && value.label.trim() ? value.label.trim() : undefined, + name, + protocolVersion: typeof value.protocolVersion === "string" ? value.protocolVersion : protocolVersion, + requestTimeoutMs: normalizeTimeout(value.requestTimeoutMs, defaultRequestTimeoutMs), + startupTimeoutMs: normalizeTimeout(value.startupTimeoutMs, defaultRequestTimeoutMs), + transport + }; + if (transport !== "stdio") { + const url = typeof value.url === "string" && value.url.trim() ? value.url.trim() : ""; + if (!url) { + return undefined; + } + return { + ...base, + apiKey: typeof value.apiKey === "string" ? value.apiKey : undefined, + apiKeyEnv: typeof value.apiKeyEnv === "string" ? value.apiKeyEnv : undefined, + headers: isStringRecord(value.headers) ? value.headers : {}, + transport, + url + }; + } + const command = typeof value.command === "string" && value.command.trim() ? value.command.trim() : ""; + if (!command) { + return undefined; + } + return { + ...base, + args: Array.isArray(value.args) ? value.args.filter((item): item is string => typeof item === "string") : [], + command, + cwd: typeof value.cwd === "string" && value.cwd.trim() ? value.cwd.trim() : undefined, + env: isStringRecord(value.env) ? value.env : {}, + stdioMessageMode: value.stdioMessageMode === "newline-json" ? "newline-json" : "content-length", + transport + }; +} + +function normalizeToolList(value: unknown): ToolDefinition[] { + const tools = isRecord(value) && Array.isArray(value.tools) ? value.tools : []; + const result: ToolDefinition[] = []; + for (const tool of tools) { + if (!isRecord(tool) || typeof tool.name !== "string" || !tool.name.trim()) { + continue; + } + result.push({ + description: typeof tool.description === "string" ? tool.description : "", + inputSchema: normalizeInputSchema(tool.inputSchema ?? tool.input_schema), + name: tool.name.trim(), + outputSchema: normalizeOptionalSchema(tool.outputSchema ?? tool.output_schema), + tags: Array.isArray(tool.tags) ? tool.tags.filter((tag): tag is string => typeof tag === "string") : undefined, + title: typeof tool.title === "string" && tool.title.trim() ? tool.title.trim() : undefined + }); + } + return result; +} + +function normalizeInputSchema(value: unknown): Record { + return isRecord(value) ? value : { type: "object", properties: {} }; +} + +function normalizeOptionalSchema(value: unknown): Record | undefined { + return isRecord(value) ? value : undefined; +} + +function parseHttpJsonRpcResponse(text: string): unknown { + if (/^event:/m.test(text) || /^data:/m.test(text)) { + const events = text.split(/\n\n+/); + for (const event of events) { + const data = event + .split(/\n/) + .filter((line) => line.startsWith("data:")) + .map((line) => line.slice("data:".length).trim()) + .join("\n"); + if (!data) continue; + try { + return JSON.parse(data) as unknown; + } catch { + continue; + } + } + } + return JSON.parse(text) as unknown; +} + +function consumeSseEvents(buffer: string, handle: (event: { data: string; event: string }) => void): string { + let offset = 0; + for (;;) { + const nextMatch = /\r?\n\r?\n/.exec(buffer.slice(offset)); + if (!nextMatch || nextMatch.index < 0) { + return buffer.slice(offset); + } + const next = offset + nextMatch.index; + const raw = buffer.slice(offset, next); + offset = next + nextMatch[0].length; + let event = "message"; + const data: string[] = []; + for (const line of raw.split(/\r?\n/)) { + if (line.startsWith("event:")) { + event = line.slice("event:".length).trim() || "message"; + } else if (line.startsWith("data:")) { + data.push(line.slice("data:".length).trimStart()); + } + } + if (data.length > 0 || event !== "message") { + handle({ data: data.join("\n"), event }); + } + } +} + +function firstJsonObject(text: string): Record | undefined { + try { + const parsed = JSON.parse(text) as unknown; + return isRecord(parsed) ? parsed : undefined; + } catch { + const start = text.indexOf("{"); + const end = text.lastIndexOf("}"); + if (start < 0 || end <= start) return undefined; + try { + const parsed = JSON.parse(text.slice(start, end + 1)) as unknown; + return isRecord(parsed) ? parsed : undefined; + } catch { + return undefined; + } + } +} + +function serverNamespaces(serverNames: string[]): Map { + const counts = new Map(); + const output = new Map(); + for (const serverName of serverNames) { + const base = toIdentifier(serverName); + const count = (counts.get(base) ?? 0) + 1; + counts.set(base, count); + output.set(serverName, count === 1 ? base : `${base}_${count}`); + } + return output; +} + +function toIdentifier(value: string): string { + const normalized = value.replace(/[^a-zA-Z0-9_]/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, ""); + if (!normalized) { + return "tool"; + } + return /^\d/.test(normalized) ? `_${normalized}` : normalized; +} + +function toSearchCatalogItem(entry: CatalogEntry): SearchCatalogItem { + return { + alias: entry.alias, + canonicalName: entry.canonicalName, + description: entry.description, + invocationMode: entry.invocation.mode, + name: entry.toolName, + remoteToolName: entry.remoteToolName, + required: getSchemaRequiredProperties(entry.inputSchema), + serverId: entry.serverId, + serverLabel: entry.serverLabel, + sideEffect: entry.invocation.sideEffect, + title: entry.title + }; +} + +function buildSearchSystemPrompt(catalog: SearchCatalogItem[], topK: number): string { + return [ + "You are the ToolHub resolve planner and retrieval agent.", + "Your job is to return the complete anticipated tool bundle for the user task, not just the first tool.", + "You must think ahead about the next likely steps needed to finish the task end-to-end.", + `You MUST call ${treeSitterToolName} before your final answer.`, + "You may need multiple planning and search rounds.", + "If your first workflow sketch yields zero, partial, or weak tool matches, revise the sketch and call the tree-sitter tool again before answering.", + "Workflow you must follow:", + "1. Plan the likely execution steps.", + "2. Draft a short JavaScript/TypeScript workflow sketch that uses the exact catalog tool names or aliases you expect to need.", + "2a. Prefer sketches that call tools through string literals such as callTool(\"\", {...}) or tools.call(\"\", {...}).", + "3. Call the tree-sitter tool on that sketch.", + "4. Inspect the tree-sitter result and check whether the bundle is complete end-to-end.", + "5. If it is incomplete, revise the sketch and call the tree-sitter tool again.", + "6. Return the final JSON only after the bundle is complete.", + `Return at most ${topK} tool names.`, + "Final answer MUST be a JSON object with this shape:", + "{ \"summary\": string, \"steps\": string[], \"workflowSketch\": string, \"toolNames\": string[] }", + "Rules:", + "- toolNames must be exact catalog names or aliases.", + "- workflowSketch is the dependency plan that will be returned to the caller as executionPlanJs.", + "- In workflowSketch, use await to show serial dependencies and Promise.all([...]) only for tool calls that are independent and safe to invoke in parallel.", + "- Do not put side-effecting calls in Promise.all unless they are truly independent and safe to run concurrently.", + "- In workflowSketch, prefer string-literal tool calls over reconstructed member chains whenever possible.", + "- Include prerequisite and downstream tools you will likely need after the first action.", + "- Never invent tool names.", + "- Generic browser automation tools are a strong match for web tasks such as ordering, buying, booking, delivery, or checkout when no domain-specific MCP tool exists.", + "- For browser navigation/open calls, prefer omitting waitUntil or using waitUntil: \"interactive\" so the agent can inspect and act as soon as the page is usable.", + "- Do not use waitUntil: \"network_idle\" for Gmail, Google sign-in, SPAs, mail, chat, auth, checkout, verification, or pages with long-lived requests. Use network_idle only when the user explicitly asks for network quiescence.", + "- When selecting CCR browser automation tools, include the human-handoff follow-up tools needed if login, CAPTCHA, verification, blocked navigation, or manual confirmation appears.", + "- For CCR browser automation bundles, include browser_handoff_request and browser_handoff_wait when the workflow may need user help. Do not assume all browser tools are preloaded.", + "- For importing existing Chrome login state into CCR's in-app browser, select browser_chrome_login_import and include browser_chrome_login_import_status to check completion.", + "- If using member-call syntax, prefer tools.(...) or mcp..(...).", + "- For lookup tasks, do not stop at opening or navigating. Include the tools needed to read or extract the answer.", + "- If the catalog has no strong match, return an empty toolNames array.", + "", + "Tool catalog:", + JSON.stringify(catalog, null, 2) + ].join("\n"); +} + +function buildSearchRefinementFeedback(input: { + selectedToolNames: string[]; + summary: string; + workflowSketch: string; +}): string | undefined { + const issues: string[] = []; + if (!input.workflowSketch.trim()) { + issues.push("workflowSketch is empty."); + } + if (input.selectedToolNames.length === 0) { + issues.push("Your current answer resolved to zero valid catalog tools."); + } + if (input.summary.trim().toLowerCase().includes("no strong tool bundle match was found")) { + issues.push("Your summary says the bundle is weak; revise the workflow sketch and search again."); + } + if (issues.length === 0) { + return undefined; + } + return [ + "Your last candidate tool bundle is incomplete.", + ...issues.map((issue, index) => `${index + 1}. ${issue}`), + `Revise the workflow sketch, call ${treeSitterToolName} again, and then return updated JSON only.` + ].join("\n"); +} + +class ToolReferenceAnalyzer { + collectReferences(code: string): ToolReference[] { + if (!code.trim()) { + return []; + } + const references: ToolReference[] = []; + this.collectStringCallReferences(code, references); + this.collectMemberReferences(code, references); + return uniqueToolReferences(references); + } + + private collectStringCallReferences(code: string, output: ToolReference[]): void { + const patterns: Array<{ regex: RegExp; source: string }> = [ + { regex: /\bcallTool\s*\(\s*(["'`])([^"'`]+)\1/g, source: "callTool" }, + { regex: /\btools\s*\.\s*call\s*\(\s*(["'`])([^"'`]+)\1/g, source: "tools.call" }, + { regex: /\b[\w$]+\s*\.\s*callTool\s*\(\s*(["'`])([^"'`]+)\1/g, source: "context.callTool" }, + { regex: /\btools\s*\[\s*(["'`])([^"'`]+)\1\s*\]\s*\(/g, source: "tools.subscript" } + ]; + for (const pattern of patterns) { + for (const match of code.matchAll(pattern.regex)) { + const rawName = match[2]?.trim(); + if (rawName) { + output.push(buildToolReference(code, match.index ?? 0, rawName, pattern.source)); + } + } + } + } + + private collectMemberReferences(code: string, output: ToolReference[]): void { + const patterns: Array<{ regex: RegExp; source: string }> = [ + { regex: /\btools\s*\.\s*([A-Za-z_$][\w$]*(?:\s*\.\s*[A-Za-z_$][\w$]*)*)\s*\(/g, source: "tools.member" }, + { regex: /\bmcp\s*\.\s*([A-Za-z_$][\w$]*(?:\s*\.\s*[A-Za-z_$][\w$]*){1,})\s*\(/g, source: "mcp.member" } + ]; + for (const pattern of patterns) { + for (const match of code.matchAll(pattern.regex)) { + const pathText = match[1]?.replace(/\s+/g, ""); + if (!pathText || pathText === "call") { + continue; + } + const rawName = pattern.source === "mcp.member" ? `mcp.${pathText}` : pathText; + output.push(buildToolReference(code, match.index ?? 0, rawName, pattern.source)); + } + } + } +} + +function buildToolReference(code: string, index: number, rawName: string, source: string): ToolReference { + const before = code.slice(0, index); + const lines = before.split(/\r?\n/); + return { + column: lines[lines.length - 1].length + 1, + line: lines.length, + rawName, + source + }; +} + +function uniqueToolReferences(references: ToolReference[]): ToolReference[] { + const seen = new Set(); + const output: ToolReference[] = []; + for (const reference of references) { + const key = `${reference.rawName}\u0000${reference.source}\u0000${reference.line}\u0000${reference.column}`; + if (seen.has(key)) { + continue; + } + seen.add(key); + output.push(reference); + } + return output; +} + +function parseToolArguments(value: string): Record { + try { + const parsed = JSON.parse(value) as unknown; + return isRecord(parsed) ? parsed : {}; + } catch { + return {}; + } +} + +function toStringArray(value: unknown): string[] { + return Array.isArray(value) ? value.filter((item): item is string => typeof item === "string") : []; +} + +function normalizeTopK(value: unknown): number { + return Math.min(Math.max(toPositiveIntOrDefault(value, defaultMaxTools), 1), 20); +} + +function normalizeSearchMaxTurns(value: unknown): number { + return Math.min(Math.max(toPositiveIntOrDefault(value, defaultMaxTurns), 1), maxTurnsLimit); +} + +function normalizeSearchTimeout(value: unknown): number { + return Math.max(toPositiveIntOrDefault(value, defaultRequestTimeoutMs), minSearchTimeoutMs); +} + +function toPositiveIntOrDefault(value: unknown, fallback: number): number { + if (typeof value !== "number" || !Number.isFinite(value)) { + return fallback; + } + const rounded = Math.floor(value); + return rounded > 0 ? rounded : fallback; +} + +function resolveCatalogItemName( + catalog: Array<{ alias: string; canonicalName?: string; name: string; remoteToolName?: string }>, + token: string +): string | undefined { + const normalized = token.trim(); + if (!normalized) { + return undefined; + } + const lookupCandidates = uniqueStrings([ + normalized, + toIdentifier(normalized), + normalized.startsWith("mcp.") ? normalized : `mcp.${normalized}`, + normalized.startsWith("mcp_") ? normalized : `mcp_${toIdentifier(normalized)}` + ]); + for (const item of catalog) { + const itemExactNames = uniqueStrings([ + item.name, + item.alias, + item.canonicalName ?? "", + item.canonicalName ? toIdentifier(item.canonicalName) : "" + ].filter(Boolean)); + for (const candidate of lookupCandidates) { + if (itemExactNames.includes(candidate)) { + return item.name; + } + } + } + const suffixMatches = catalog.filter((item) => matchesUniqueSuffix(item, normalized)); + return suffixMatches.length === 1 ? suffixMatches[0].name : undefined; +} + +function matchesUniqueSuffix( + item: { alias: string; canonicalName?: string; name: string; remoteToolName?: string }, + token: string +): boolean { + const tokenAlias = toIdentifier(token); + const nameSuffix = item.name.split(".").slice(1).join("."); + const remoteToolName = item.remoteToolName || item.name.split(".").at(-1) || ""; + const suffixes = uniqueStrings([ + item.canonicalName ?? "", + item.canonicalName ? toIdentifier(item.canonicalName) : "", + nameSuffix, + toIdentifier(nameSuffix), + remoteToolName, + toIdentifier(remoteToolName) + ].filter(Boolean)); + return suffixes.includes(token) || suffixes.includes(tokenAlias); +} + +function buildTsDefinitions(entries: CatalogEntry[]): string { + return entries + .map((entry) => { + const typeName = toTypeName(entry.toolName); + const argsTypeName = `${typeName}Args`; + return [ + "/**", + ` * ${entry.description || entry.title}`, + ` * Exact tool name: "${entry.toolName}".`, + ` * Callable references: "${entry.toolName}", "${entry.alias}".`, + " */", + `type ${argsTypeName} = ${schemaToType(entry.inputSchema)};`, + `type ${typeName}Call = { tool: "${entry.toolName}"; args: ${argsTypeName}; };` + ].join("\n"); + }) + .join("\n\n"); +} + +function schemaToType(schema: Record | undefined): string { + if (!isRecord(schema) || !isRecord(schema.properties)) { + return "Record"; + } + const required = new Set(getSchemaRequiredProperties(schema)); + const lines = ["{"]; + for (const [key, value] of Object.entries(schema.properties)) { + const propertySchema = isRecord(value) ? value : {}; + lines.push(` ${JSON.stringify(key)}${required.has(key) ? "" : "?"}: ${jsonSchemaTypeToTs(propertySchema)};`); + } + lines.push("}"); + return lines.join("\n"); +} + +function jsonSchemaTypeToTs(schema: Record): string { + if (Array.isArray(schema.enum) && schema.enum.every((item) => typeof item === "string")) { + return schema.enum.map((item) => JSON.stringify(item)).join(" | ") || "string"; + } + switch (schema.type) { + case "array": + return "unknown[]"; + case "boolean": + return "boolean"; + case "integer": + case "number": + return "number"; + case "object": + return "Record"; + case "string": + return "string"; + default: + return "unknown"; + } +} + +function toTypeName(value: string): string { + const words = value.replace(/[^a-zA-Z0-9]+/g, " ").trim().split(/\s+/); + const name = words.map((word) => `${word.slice(0, 1).toUpperCase()}${word.slice(1)}`).join(""); + return name || "Tool"; +} + +function scoreLocalCatalogMatch(taskText: string, tool: CatalogEntry, preferredToolScores: Map): number { + const taskTokens = tokenizeLocalSearchText(taskText); + const taskTokenSet = new Set(taskTokens); + const toolText = [ + tool.toolName, + tool.alias, + tool.canonicalName, + tool.remoteToolName, + tool.serverId, + tool.serverLabel ?? "", + tool.title, + tool.description, + ...tool.tags + ].join(" "); + const toolTokens = tokenizeLocalSearchText(toolText); + let score = preferredToolScores.get(tool.remoteToolName) ?? preferredToolScores.get(tool.toolName) ?? 0; + for (const token of toolTokens) { + if (taskTokenSet.has(token)) { + score += token.length > 4 ? 3 : 1; + } + } + if (tool.invocation.sideEffect) { + score -= 8; + } + return score; +} + +function getLocalFallbackPreferredTools(taskText: string): Map { + const tokens = new Set(tokenizeLocalSearchText(taskText)); + const normalizedText = taskText.toLowerCase(); + const scores = new Map(); + const add = (toolName: string, score: number) => scores.set(toolName, Math.max(scores.get(toolName) ?? 0, score)); + if (hasAnyToken(tokens, [ + "app", + "book", + "booking", + "browse", + "buy", + "cart", + "checkout", + "coffee", + "delivery", + "latte", + "order", + "pickup", + "product", + "purchase", + "restaurant", + "search", + "shop", + "store", + "website" + ]) || /咖啡|拿铁|生椰|点单|下单|外卖|配送|自取|门店|商品|购买|结账|订单/.test(normalizedText)) { + add("browser_session_open", 120); + add("browser_navigate", 112); + add("browser_snapshot", 108); + add("browser_ax_query", 96); + add("browser_element_input", 88); + add("browser_element_click", 84); + add("browser_screenshot", 60); + add("browser_events_await", 44); + } + if (hasAnyToken(tokens, [ + "auth", + "chrome", + "cookie", + "cookies", + "import", + "localstorage", + "login", + "session", + "signin", + "storage" + ]) || /chrome|cookie|cookies|localstorage|local storage|登录态|登录状态|导入登录|浏览器登录|本地存储/.test(normalizedText)) { + add("browser_chrome_login_import", 128); + add("browser_chrome_login_import_status", 92); + } + if (hasAnyToken(tokens, ["address", "delivery", "geo", "geolocation", "location", "nearby", "pickup", "store"]) || + /地址|定位|位置|附近|配送|外卖|自取|门店/.test(normalizedText)) { + add("location_permission_status", 90); + add("location_get_current", 86); + } + if (hasAnyToken(tokens, ["ask", "choice", "confirm", "confirmation", "missing", "option", "preference", "question", "select", "user"]) || + /确认|选择|偏好|口味|缺少|询问|用户/.test(normalizedText)) { + add("user_interaction_collect", 82); + } + return scores; +} + +function getDeterministicTaskTools(taskText: string, catalog: CatalogEntry[]): CatalogEntry[] { + if (!taskWantsChromeLoginImport(taskText)) { + return []; + } + return [ + catalog.find((tool) => isBrowserAutomationTool(tool) && tool.remoteToolName === "browser_chrome_login_import"), + catalog.find((tool) => isBrowserAutomationTool(tool) && tool.remoteToolName === "browser_chrome_login_import_status") + ].filter((tool): tool is CatalogEntry => Boolean(tool)); +} + +function taskWantsChromeLoginImport(taskText: string): boolean { + const normalizedText = taskText.toLowerCase(); + return normalizedText.includes("browser_chrome_login_import") || + /(chrome|谷歌浏览器|浏览器).*(login|signin|auth|cookie|localstorage|local storage|session|登录态|登录状态|登录信息|本地存储|cookie)/.test(normalizedText) || + /(import|导入|迁移|同步).*(chrome|谷歌浏览器).*(login|signin|auth|cookie|localstorage|local storage|session|登录态|登录状态|登录信息|本地存储)/.test(normalizedText) || + /(登录态|登录状态|登录信息).*(chrome|谷歌浏览器|浏览器).*(导入|迁移|同步)/.test(normalizedText); +} + +function catalogHasChromeLoginImportTool(catalog: CatalogEntry[]): boolean { + return catalog.some((tool) => isBrowserAutomationTool(tool) && tool.remoteToolName === "browser_chrome_login_import"); +} + +function tokenizeLocalSearchText(text: string): string[] { + const tokens = text + .replace(/([a-z0-9])([A-Z])/g, "$1 $2") + .replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2") + .toLowerCase() + .split(/[^a-z0-9_]+/) + .map((token) => token.trim()) + .filter((token) => token.length > 1 && !localSearchStopWords.has(token)); + return uniqueStrings(tokens); +} + +const localSearchStopWords = new Set(["a", "an", "and", "are", "as", "be", "by", "for", "from", "in", "is", "it", "need", "of", "or", "the", "then", "to", "with"]); + +function uniqueToolEntries(entries: CatalogEntry[]): CatalogEntry[] { + const seen = new Set(); + const output: CatalogEntry[] = []; + for (const entry of entries) { + if (seen.has(entry.toolName)) { + continue; + } + seen.add(entry.toolName); + output.push(entry); + } + return output; +} + +function expandToolBundleWithCompanionTools(selectedTools: CatalogEntry[], catalog: CatalogEntry[]): CatalogEntry[] { + const output = uniqueToolEntries(selectedTools); + const selectedNames = new Set(output.map((tool) => tool.toolName)); + const selectedRemoteNames = new Set(output.map((tool) => tool.remoteToolName)); + const hasBrowserAutomationTool = output.some((tool) => isBrowserAutomationTool(tool)); + const hasHandoffRequestTool = output.some((tool) => + isBrowserAutomationTool(tool) && + (tool.remoteToolName === "browser_handoff_request" || tool.remoteToolName === "askHumanHelp") + ); + const hasChromeLoginImportTool = output.some((tool) => + isBrowserAutomationTool(tool) && + tool.remoteToolName === "browser_chrome_login_import" + ); + const companionRemoteNames = new Set(); + + if (hasBrowserAutomationTool) { + companionRemoteNames.add("browser_handoff_request"); + companionRemoteNames.add("browser_handoff_status"); + companionRemoteNames.add("browser_handoff_wait"); + } + if (hasHandoffRequestTool) { + companionRemoteNames.add("browser_handoff_wait"); + } + if (hasChromeLoginImportTool) { + companionRemoteNames.add("browser_chrome_login_import_status"); + } + + for (const remoteToolName of companionRemoteNames) { + if (selectedRemoteNames.has(remoteToolName)) { + continue; + } + const companion = catalog.find((tool) => + isBrowserAutomationTool(tool) && + tool.remoteToolName === remoteToolName && + !selectedNames.has(tool.toolName) + ); + if (companion) { + output.push(companion); + selectedNames.add(companion.toolName); + selectedRemoteNames.add(companion.remoteToolName); + } + } + + return output; +} + +function isBrowserAutomationTool(tool: CatalogEntry): boolean { + return tool.serverName === "ccr-browser-automation" || + tool.serverId === "ccr-browser-automation" || + tool.serverNamespace === "ccr_browser_automation" || + tool.toolName.startsWith("mcp.ccr_browser_automation."); +} + +function buildLocalFallbackWorkflowSketch(selectedTools: CatalogEntry[]): string | undefined { + return selectedTools.length > 0 ? buildSequentialExecutionPlanJs(selectedTools) : undefined; +} + +function isBrowserNavigationTool(tool: CatalogEntry): boolean { + return isBrowserAutomationTool(tool) && ( + tool.toolName.endsWith("browser_session_open") || + tool.toolName.endsWith("browser_navigate") || + tool.remoteToolName === "browser_session_open" || + tool.remoteToolName === "browser_navigate" + ); +} + +function buildExecutionPlanJs(workflowSketch: string | undefined, selectedTools: CatalogEntry[]): string { + const trimmed = typeof workflowSketch === "string" ? workflowSketch.trim() : ""; + return trimmed || buildSequentialExecutionPlanJs(selectedTools); +} + +function buildSequentialExecutionPlanJs(selectedTools: CatalogEntry[]): string { + if (selectedTools.length === 0) { + return [ + "async function runWithToolHub() {", + " // Ask the user for missing task details before invoking tools.", + "}" + ].join("\n"); + } + const lines = [ + "async function runWithToolHub() {", + " // Invoke calls in this order unless the plan explicitly uses Promise.all." + ]; + selectedTools.forEach((tool, index) => { + lines.push(` const step${index + 1} = await callTool(${JSON.stringify(tool.toolName)}, ${buildExecutionPlanArgs(tool)});`); + }); + lines.push("}"); + return lines.join("\n"); +} + +function buildExecutionPlanArgs(tool: CatalogEntry): string { + if (isBrowserNavigationTool(tool)) { + return "{ url, waitUntil: \"interactive\" }"; + } + const required = getSchemaRequiredProperties(tool.inputSchema); + if (required.length === 0) { + return "{}"; + } + return `{ ${required.map((key) => `${JSON.stringify(key)}: ${toPlanVariableName(key)}`).join(", ")} }`; +} + +function toPlanVariableName(value: string): string { + const identifier = toIdentifier(value).replace(/^[A-Z]/, (match) => match.toLowerCase()); + if (!identifier || reservedJavaScriptWords.has(identifier)) { + return "value"; + } + return identifier; +} + +function inferInvocation(tool: ToolDefinition): ToolInvocation { + const text = `${tool.name} ${tool.title ?? ""} ${tool.description ?? ""}`; + const tokenList = tokenizeToolText(text); + const tokens = new Set(tokenList); + const sideEffect = hasAnyToken(tokens, [ + "book", + "cancel", + "commit", + "create", + "delete", + "execute", + "merge", + "post", + "publish", + "purchase", + "push", + "remove", + "reserve", + "run", + "send", + "submit", + "update", + "write" + ]); + const workflowOnly = hasAnyToken(tokens, ["batch", "bulk", "foreach", "iterate", "parallel"]) || + hasTokenSequence(tokenList, ["for", "each"]) || + hasTokenSequence(tokenList, ["sync", "all"]) || + hasTokenSequence(tokenList, ["export", "all"]); + return { + mode: workflowOnly ? "workflow" : "both", + sideEffect + }; +} + +function tokenizeToolText(text: string): string[] { + const spaced = text + .replace(/([a-z0-9])([A-Z])/g, "$1 $2") + .replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2") + .replace(/[^a-zA-Z0-9_]+/g, " ") + .toLowerCase(); + return spaced.split(/\s+|_+/).filter(Boolean); +} + +function hasAnyToken(tokens: Set, candidates: string[]): boolean { + return candidates.some((candidate) => tokens.has(candidate)); +} + +function hasTokenSequence(tokens: string[], sequence: string[]): boolean { + if (sequence.length === 0 || tokens.length < sequence.length) { + return false; + } + for (let index = 0; index <= tokens.length - sequence.length; index += 1) { + if (sequence.every((token, offset) => tokens[index + offset] === token)) { + return true; + } + } + return false; +} + +function selectFirstActionTool(selectedTools: CatalogEntry[]): CatalogEntry | undefined { + const candidates = selectedTools + .map((tool, index) => ({ + index, + rank: rankFirstActionTool(tool), + tool + })) + .filter((candidate) => !candidate.tool.invocation.sideEffect); + const rankedCandidates = candidates.length + ? candidates + : selectedTools.map((tool, index) => ({ + index, + rank: rankFirstActionTool(tool), + tool + })); + return rankedCandidates.sort((left, right) => { + return left.rank.derivedRequiredCount - right.rank.derivedRequiredCount || + right.rank.userSuppliedRequiredCount - left.rank.userSuppliedRequiredCount || + left.rank.requiredCount - right.rank.requiredCount || + left.index - right.index; + })[0]?.tool; +} + +function rankFirstActionTool(tool: CatalogEntry): { + derivedRequiredCount: number; + requiredCount: number; + userSuppliedRequiredCount: number; +} { + const required = getSchemaRequiredProperties(tool.inputSchema); + return { + derivedRequiredCount: required.filter(isLikelyWorkflowIntermediateArgument).length, + requiredCount: required.length, + userSuppliedRequiredCount: required.filter(isLikelyUserSuppliedArgument).length + }; +} + +function isLikelyWorkflowIntermediateArgument(name: string): boolean { + const normalized = normalizeSchemaPropertyName(name); + return /(?:dept|department|shop|store|merchant|product|goods|sku|cart|order|payment|coupon|address)id$/.test(normalized) || + /(?:sku|order|product|goods|shop|store)(?:code|no|num|number)$/.test(normalized) || + normalized === "id" || + normalized.endsWith("list"); +} + +function isLikelyUserSuppliedArgument(name: string): boolean { + const normalized = normalizeSchemaPropertyName(name); + return normalized === "query" || + normalized === "keyword" || + normalized === "keywords" || + normalized === "search" || + normalized === "address" || + normalized === "city" || + normalized === "latitude" || + normalized === "lat" || + normalized === "longitude" || + normalized === "lng" || + normalized === "lon" || + normalized.endsWith("name") || + normalized.endsWith("text"); +} + +function normalizeSchemaPropertyName(name: string): string { + return name.trim().toLowerCase().replace(/[^a-z0-9]+/g, ""); +} + +function getSchemaRequiredProperties(schema: Record | undefined): string[] { + return Array.isArray(schema?.required) + ? schema.required.filter((item): item is string => typeof item === "string") + : []; +} + +function cloneServerConfig(config: GatewayMcpServerConfig): GatewayMcpServerConfig { + if (config.transport === "stdio") { + return { + ...config, + args: config.args ? [...config.args] : undefined, + env: config.env ? { ...config.env } : undefined + }; + } + return { + ...config, + headers: config.headers ? { ...config.headers } : undefined + }; +} + +function normalizeTargetServerNames(serverNames: string[] | undefined, entries: Map): string[] { + if (!serverNames || serverNames.length === 0) { + return [...entries.keys()]; + } + return uniqueStrings(serverNames.map((item) => item.trim()).filter((item) => entries.has(item))); +} + +const toolHubPersistentCache = { + readDiscovery(serverName: string, configHash: string): { + cachedAt: number; + configHash: string; + lastSeenOnlineAt?: number; + tools: ToolDefinition[]; + } | null { + const store = readCacheStore(); + const entry = store.discovery[serverName]; + if (!entry) { + return null; + } + if (entry.configHash !== configHash) { + delete store.discovery[serverName]; + writeCacheStore(store); + return null; + } + return { + cachedAt: entry.cachedAt, + configHash: entry.configHash, + lastSeenOnlineAt: entry.lastSeenOnlineAt, + tools: entry.tools.map((tool) => ({ ...tool })) + }; + }, + writeDiscovery(serverName: string, configHash: string, tools: ToolDefinition[], lastSeenOnlineAt = Date.now()): void { + const store = readCacheStore(); + store.discovery[serverName] = { + cachedAt: Date.now(), + configHash, + lastSeenOnlineAt, + tools: tools.map((tool) => ({ ...tool })) + }; + writeCacheStore(store); + } +}; + +type ToolHubCacheStore = { + discovery: Record; + version: 1; +}; + +function readCacheStore(): ToolHubCacheStore { + try { + const file = toolHubCacheFile(); + if (!existsSync(file)) { + return createEmptyCacheStore(); + } + const parsed = JSON.parse(readFileSync(file, "utf8")) as unknown; + return normalizeCacheStore(parsed); + } catch { + return createEmptyCacheStore(); + } +} + +function writeCacheStore(store: ToolHubCacheStore): void { + const file = toolHubCacheFile(); + mkdirSync(path.dirname(file), { recursive: true }); + const tempFile = `${file}.${process.pid}.tmp`; + writeFileSync(tempFile, `${JSON.stringify(store, null, 2)}\n`, { encoding: "utf8", mode: 0o600 }); + renameSync(tempFile, file); +} + +function createEmptyCacheStore(): ToolHubCacheStore { + return { discovery: {}, version: 1 }; +} + +function normalizeCacheStore(value: unknown): ToolHubCacheStore { + if (!isRecord(value) || value.version !== 1 || !isRecord(value.discovery)) { + return createEmptyCacheStore(); + } + const discovery: ToolHubCacheStore["discovery"] = {}; + for (const [serverName, entryValue] of Object.entries(value.discovery)) { + if (!isRecord(entryValue) || typeof entryValue.configHash !== "string" || !Array.isArray(entryValue.tools)) { + continue; + } + discovery[serverName] = { + cachedAt: typeof entryValue.cachedAt === "number" && Number.isFinite(entryValue.cachedAt) ? entryValue.cachedAt : Date.now(), + configHash: entryValue.configHash, + lastSeenOnlineAt: typeof entryValue.lastSeenOnlineAt === "number" && Number.isFinite(entryValue.lastSeenOnlineAt) ? entryValue.lastSeenOnlineAt : undefined, + tools: entryValue.tools + .map(normalizeToolDefinitionForCache) + .filter((tool): tool is ToolDefinition => Boolean(tool)) + }; + } + return { discovery, version: 1 }; +} + +function normalizeToolDefinitionForCache(value: unknown): ToolDefinition | null { + if (!isRecord(value) || typeof value.name !== "string" || !value.name.trim()) { + return null; + } + return { + description: typeof value.description === "string" ? value.description : "", + inputSchema: normalizeOptionalSchema(value.inputSchema), + name: value.name.trim(), + outputSchema: normalizeOptionalSchema(value.outputSchema), + tags: Array.isArray(value.tags) ? value.tags.filter((tag): tag is string => typeof tag === "string") : undefined, + title: typeof value.title === "string" && value.title.trim() ? value.title.trim() : undefined + }; +} + +function toolHubCacheFile(): string { + return env("TOOLHUB_CACHE_FILE") || path.join(os.homedir(), ".claude-code-router", "toolhub-cache.json"); +} + +function hashToolHubMcpServerConfig(config: GatewayMcpServerConfig): string { + return createHash("sha256").update(stableJsonStringify(config) ?? "null").digest("hex"); +} + +function stableJsonStringify(value: unknown): string | undefined { + if (value === undefined) { + return undefined; + } + if (value === null || typeof value !== "object") { + return JSON.stringify(value); + } + if (Array.isArray(value)) { + return `[${value.map((item) => stableJsonStringify(item) ?? "null").join(",")}]`; + } + const record = value as Record; + const entries = Object.keys(record) + .filter((key) => record[key] !== undefined) + .sort() + .map((key) => `${JSON.stringify(key)}:${stableJsonStringify(record[key]) ?? "null"}`); + return `{${entries.join(",")}}`; +} + +function normalizeResolveTaskKey(value: string): string { + return value.trim().toLowerCase().replace(/\s+/g, " "); +} + +function readNonEmptyString(value: unknown): string | undefined { + return typeof value === "string" && value.trim() ? value.trim() : undefined; +} + +function summarizeValue(value: unknown): string { + try { + const text = JSON.stringify(value); + return text.length > 600 ? `${text.slice(0, 600)}...` : text; + } catch { + return String(value); + } +} + +function uniqueStrings(values: string[]): string[] { + return [...new Set(values)]; +} + +function jsonRpcResult(id: null | number | string, result: JsonValue): JsonRpcResponse { + return { + id, + jsonrpc: "2.0", + result + }; +} + +function jsonRpcError(id: null | number | string, code: number, message: string): JsonRpcResponse { + return { + error: { + code, + message + }, + id, + jsonrpc: "2.0" + }; +} + +function writeJsonRpc(response: JsonRpcResponse, messageMode: MessageMode = "content-length"): void { + const text = JSON.stringify(response); + if (messageMode === "newline-json") { + process.stdout.write(`${text}\n`); + return; + } + process.stdout.write(`Content-Length: ${Buffer.byteLength(text, "utf8")}\r\n\r\n${text}`); +} + +function toolError(code: string, message: string): unknown { + return { + content: [{ + text: `${code}: ${message}`, + type: "text" + }], + isError: true + }; +} + +function toolResult(payload: Record): unknown { + return { + ...payload, + content: [{ + text: JSON.stringify(payload, null, 2), + type: "text" + }], + structuredContent: payload + }; +} + +function env(name: string): string { + return process.env[name]?.trim() ?? ""; +} + +function envNumber(name: string, fallback: number): number { + const parsed = Number(process.env[name]); + return Number.isFinite(parsed) ? parsed : fallback; +} + +function normalizeMaxTools(value: unknown): number { + const parsed = typeof value === "number" ? value : Number(value); + return Number.isFinite(parsed) ? Math.min(Math.max(Math.floor(parsed), 1), 20) : defaultMaxTools; +} + +function normalizeTimeout(value: unknown, fallback: number): number { + const parsed = typeof value === "number" ? value : Number(value); + return Number.isFinite(parsed) ? Math.min(Math.max(Math.floor(parsed), 100), 600_000) : fallback; +} + +function isRecord(value: unknown): value is Record { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + +function isStringRecord(value: unknown): value is Record { + return isRecord(value) && Object.values(value).every((item) => typeof item === "string"); +} + +function formatError(error: unknown): string { + return error instanceof Error ? error.message : String(error); +} + +function toError(error: unknown): Error { + return error instanceof Error ? error : new Error(String(error)); +} diff --git a/src/main/model-catalog-file.ts b/packages/core/src/models/catalog-file.ts similarity index 87% rename from src/main/model-catalog-file.ts rename to packages/core/src/models/catalog-file.ts index 68b5c86..08c09e1 100644 --- a/src/main/model-catalog-file.ts +++ b/packages/core/src/models/catalog-file.ts @@ -24,8 +24,11 @@ export function modelCatalogPathCandidates(): string[] { process.env.CCR_MODEL_CATALOG_PATH?.trim() || "", process.env.CCR_MODELS_JSON_PATH?.trim() || "", pathResolve(process.cwd(), "models.json"), + pathResolve(process.cwd(), "packages", "core", "models.json"), + pathResolve(process.cwd(), "packages", "cli", "models.json"), pathResolve(__dirname, "..", "models.json"), pathResolve(__dirname, "..", "assets", "models.json"), + pathResolve(__dirname, "..", "..", "models.json"), pathResolve(__dirname, "..", "..", "..", "models.json") ]); } diff --git a/src/main/model-pricing-service.ts b/packages/core/src/models/pricing-service.ts similarity index 99% rename from src/main/model-pricing-service.ts rename to packages/core/src/models/pricing-service.ts index 92c074d..e581d21 100644 --- a/src/main/model-pricing-service.ts +++ b/packages/core/src/models/pricing-service.ts @@ -1,4 +1,4 @@ -import { fetchWithSystemProxy } from "./system-proxy-fetch"; +import { fetchWithSystemProxy } from "@ccr/core/proxy/system-proxy-fetch"; type ModelPricingSource = "litellm" | "models.dev" | "openrouter"; diff --git a/src/main/request-log-store.ts b/packages/core/src/observability/request-log-store.ts similarity index 99% rename from src/main/request-log-store.ts rename to packages/core/src/observability/request-log-store.ts index 25c735f..edd289e 100644 --- a/src/main/request-log-store.ts +++ b/packages/core/src/observability/request-log-store.ts @@ -1,10 +1,10 @@ import { mkdirSync } from "node:fs"; import { dirname } from "node:path"; import { StringDecoder } from "node:string_decoder"; -import { REQUEST_LOGS_DB_FILE } from "./constants"; -import { estimateUsageCostUsd } from "./model-pricing-service"; -import { createBetterSqliteDatabase, type BetterSqliteDatabase } from "./sqlite-native"; -import { normalizeUsageInputTokens } from "./usage-normalization"; +import { REQUEST_LOGS_DB_FILE } from "@ccr/core/config/constants"; +import { estimateUsageCostUsd } from "@ccr/core/models/pricing-service"; +import { createBetterSqliteDatabase, type BetterSqliteDatabase } from "@ccr/core/storage/sqlite-native"; +import { normalizeUsageInputTokens } from "@ccr/core/usage/normalization"; import type { AgentAnalysisAgentRow, AgentAnalysisFilter, @@ -38,7 +38,7 @@ import type { RequestLogRetryAttempt, RequestLogStatusFilter, UsageStatsRange -} from "../shared/app"; +} from "@ccr/core/contracts/app"; type SqlDatabase = BetterSqliteDatabase; type SqlValue = bigint | Buffer | number | string | null; diff --git a/src/main/windows-app-discovery.ts b/packages/core/src/platform/windows-app-discovery.ts similarity index 99% rename from src/main/windows-app-discovery.ts rename to packages/core/src/platform/windows-app-discovery.ts index 1737231..827e6f7 100644 --- a/src/main/windows-app-discovery.ts +++ b/packages/core/src/platform/windows-app-discovery.ts @@ -2,7 +2,7 @@ import { spawnSync } from "node:child_process"; import { readdirSync, statSync } from "node:fs"; import os from "node:os"; import path from "node:path"; -import { windowsSystemCommand } from "./windows-system"; +import { windowsSystemCommand } from "@ccr/core/platform/windows-system"; export type WindowsDesktopAppDiscoveryOptions = { appDirs: string[]; diff --git a/src/main/windows-system.ts b/packages/core/src/platform/windows-system.ts similarity index 100% rename from src/main/windows-system.ts rename to packages/core/src/platform/windows-system.ts diff --git a/src/server/backend-service.ts b/packages/core/src/plugins/backend-service.ts similarity index 99% rename from src/server/backend-service.ts rename to packages/core/src/plugins/backend-service.ts index 09c142b..84abbf2 100644 --- a/src/server/backend-service.ts +++ b/packages/core/src/plugins/backend-service.ts @@ -1,7 +1,7 @@ import { copyFileSync, existsSync, mkdirSync, rmSync } from "node:fs"; import http, { type IncomingMessage, type Server, type ServerResponse } from "node:http"; import path from "node:path"; -import { createBetterSqliteDatabase, type BetterSqliteDatabase, type BetterSqliteStatement } from "../main/sqlite-native"; +import { createBetterSqliteDatabase, type BetterSqliteDatabase, type BetterSqliteStatement } from "@ccr/core/storage/sqlite-native"; type MaybePromise = T | Promise; export type SqliteValue = bigint | Buffer | number | string | Uint8Array | null; diff --git a/src/main/plugins/service.ts b/packages/core/src/plugins/service.ts similarity index 90% rename from src/main/plugins/service.ts rename to packages/core/src/plugins/service.ts index 83dfcdc..05fc11c 100644 --- a/src/main/plugins/service.ts +++ b/packages/core/src/plugins/service.ts @@ -14,9 +14,9 @@ import type { ProviderAccountMeter, ProviderAccountPluginConnectorConfig, ProviderAccountSnapshot -} from "../../shared/app"; -import { backendService, type RegisteredHttpBackend, type SqliteStore, type SqliteStoreOptions } from "../../server/backend-service"; -import { CONFIGDIR, DATADIR } from "../constants"; +} from "@ccr/core/contracts/app"; +import { backendService, type RegisteredHttpBackend, type SqliteStore, type SqliteStoreOptions } from "@ccr/core/plugins/backend-service"; +import { CONFIGDIR, DATADIR } from "@ccr/core/config/constants"; type MaybePromise = T | Promise; type PluginLogger = { @@ -144,6 +144,18 @@ type LoadedPlugin = { stop?: () => MaybePromise; }; +type PluginServiceStateSnapshot = { + apps: InstalledBrowserApp[]; + coreGatewayConfig: Record; + coreProviderPlugins: unknown[]; + gatewayRoutes: RegisteredGatewayRoute[]; + providerAccountConnectors: Map; + proxyRoutes: RegisteredProxyRoute[]; + resourceOwnerIds: Set; + stopHooks: Array<() => MaybePromise>; + virtualModelProfiles: unknown[]; +}; + const requireFromHere = createRequire(__filename); const builtInMarketplacePluginModules = new Map([ ["claude-design", path.join(__dirname, "..", "marketplace", "plugins", "claude-design-plugin.cjs")], @@ -172,8 +184,14 @@ class GatewayPluginService { if (pluginConfig.enabled === false) { continue; } + const snapshot = this.createStateSnapshot(); this.resourceOwnerIds.add(pluginConfig.id); - await this.loadConfiguredPlugin(pluginConfig); + try { + await this.loadConfiguredPlugin(pluginConfig); + } catch (error) { + await this.rollbackConfiguredPluginLoad(pluginConfig.id, snapshot); + console.warn(`[plugin:${pluginConfig.id}] Disabled after startup failure: ${formatError(error)}`); + } } } @@ -513,6 +531,47 @@ class GatewayPluginService { ): Promise { return backendService.openSqliteStore(pluginId, pluginDataDir, options); } + + private createStateSnapshot(): PluginServiceStateSnapshot { + return { + apps: [...this.apps], + coreGatewayConfig: { ...this.coreGatewayConfig }, + coreProviderPlugins: [...this.coreProviderPlugins], + gatewayRoutes: [...this.gatewayRoutes], + providerAccountConnectors: new Map(this.providerAccountConnectors), + proxyRoutes: [...this.proxyRoutes], + resourceOwnerIds: new Set(this.resourceOwnerIds), + stopHooks: [...this.stopHooks], + virtualModelProfiles: [...this.virtualModelProfiles] + }; + } + + private async rollbackConfiguredPluginLoad(pluginId: string, snapshot: PluginServiceStateSnapshot): Promise { + const newStopHooks = this.stopHooks.slice(snapshot.stopHooks.length).reverse(); + this.apps = snapshot.apps; + this.coreGatewayConfig = snapshot.coreGatewayConfig; + this.coreProviderPlugins = snapshot.coreProviderPlugins; + this.gatewayRoutes = snapshot.gatewayRoutes; + this.providerAccountConnectors = snapshot.providerAccountConnectors; + this.proxyRoutes = snapshot.proxyRoutes; + this.resourceOwnerIds = snapshot.resourceOwnerIds; + this.stopHooks = snapshot.stopHooks; + this.virtualModelProfiles = snapshot.virtualModelProfiles; + + for (const stopHook of newStopHooks) { + try { + await stopHook(); + } catch (error) { + console.warn(`[plugin:${pluginId}] Rollback stop hook failed: ${formatError(error)}`); + } + } + + try { + await backendService.stopOwner(pluginId); + } catch (error) { + console.warn(`[plugin:${pluginId}] Rollback resource cleanup failed: ${formatError(error)}`); + } + } } export const pluginService = new GatewayPluginService(); diff --git a/src/main/profile-launch-core.ts b/packages/core/src/profiles/launch-core.ts similarity index 98% rename from src/main/profile-launch-core.ts rename to packages/core/src/profiles/launch-core.ts index ea5bea2..ab187fd 100644 --- a/src/main/profile-launch-core.ts +++ b/packages/core/src/profiles/launch-core.ts @@ -1,7 +1,7 @@ import path from "node:path"; -import type { AppConfig, ProfileConfig, ProfileOpenSurface } from "../shared/app"; -import { claudeCodeUtcTimezoneEnvOverride } from "./claude-environment"; -import { resolveZcodeConfigFile } from "./zcode-profile-config"; +import type { AppConfig, ProfileConfig, ProfileOpenSurface } from "@ccr/core/contracts/app"; +import { claudeCodeUtcTimezoneEnvOverride } from "@ccr/core/agents/claude-code/environment"; +import { resolveZcodeConfigFile } from "@ccr/core/agents/zcode/profile-config"; export type ProfileLaunchPlan = { args: string[]; diff --git a/src/main/profile-launch-service.ts b/packages/core/src/profiles/launch-service.ts similarity index 93% rename from src/main/profile-launch-service.ts rename to packages/core/src/profiles/launch-service.ts index a42d5aa..17cd4d5 100644 --- a/src/main/profile-launch-service.ts +++ b/packages/core/src/profiles/launch-service.ts @@ -1,25 +1,34 @@ import { spawn, spawnSync, type ChildProcess } from "node:child_process"; -import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs"; +import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "node:fs"; import os from "node:os"; import path from "node:path"; -import { assertAvailableGatewayModels, type AppConfig, type ProfileOpenCommandResult, type ProfileOpenRequest, type ProfileOpenResult, type ProfileRuntimeEntry, type ProfileRuntimeStatus, type ProfileStopResult } from "../shared/app"; -import { botGatewayProfileEnv } from "./bot-gateway-env"; -import { applyClaudeAppGatewayConfig, readClaudeAppGatewayApiKeyCandidates } from "./claude-app-gateway-service"; -import { launchClaudeAppProfile, resolveClaudeAppProfileUserDataDir } from "./claude-app-launch"; -import { claudeCodeUtcTimezoneEnvOverride } from "./claude-environment"; -import { launchCodexAppProfile, launchZcodeAppProfile, refreshCodexCompatibleAppProfileFiles } from "./codex-app-launch"; -import { codexCliMiddlewareRuntimeScript } from "./codex-cli-middleware-runtime"; -import { CONFIGDIR } from "./constants"; -import { gatewayService } from "../server/gateway/service"; -import { buildProfileLaunchPlan, findProfileForOpen, profileLaunchSpawnCommand, profileOpenCommand, resolveClaudeCodeSettingsFile, resolveProfileOpenSurface } from "./profile-launch-core"; -import { applyProfileConfig, cleanupGeneratedBinBackups } from "./profile-service"; -import { broadcastWindowsEnvironmentChanged, windowsSystemCommand } from "./windows-system"; +import { assertAvailableGatewayModels, type AppConfig, type ProfileOpenCommandResult, type ProfileOpenRequest, type ProfileOpenResult, type ProfileRuntimeEntry, type ProfileRuntimeStatus, type ProfileStopResult } from "@ccr/core/contracts/app"; +import { botGatewayProfileEnv } from "@ccr/core/agents/bot-gateway/env"; +import { applyClaudeAppGatewayConfig, readClaudeAppGatewayApiKeyCandidates } from "@ccr/core/agents/claude-app/gateway-service"; +import { launchClaudeAppProfile, resolveClaudeAppProfileUserDataDir } from "@ccr/core/agents/claude-app/launch"; +import { claudeCodeUtcTimezoneEnvOverride } from "@ccr/core/agents/claude-code/environment"; +import { codexDesktopAppName, launchCodexAppProfile, launchZcodeAppProfile, refreshCodexCompatibleAppProfileFiles } from "@ccr/core/agents/codex/app-launch"; +import { codexCliMiddlewareRuntimeScript } from "@ccr/core/agents/codex/cli-middleware-runtime"; +import { CONFIGDIR } from "@ccr/core/config/constants"; +import { gatewayService } from "@ccr/core/gateway/service"; +import { TOOL_HUB_MCP_RUNTIME_FILE_NAME, bundledToolHubMcpEntryPathCandidates } from "@ccr/core/mcp/toolhub-config"; +import { buildProfileLaunchPlan, findProfileForOpen, profileLaunchSpawnCommand, profileOpenCommand, resolveClaudeCodeSettingsFile, resolveProfileOpenSurface } from "@ccr/core/profiles/launch-core"; +import { applyProfileConfig, cleanupGeneratedBinBackups } from "@ccr/core/profiles/service"; +import { broadcastWindowsEnvironmentChanged, windowsSystemCommand } from "@ccr/core/platform/windows-system"; const ccrPathBlockStart = "# >>> Claude Code Router CLI >>>"; const ccrPathBlockEnd = "# <<< Claude Code Router CLI <<<"; +export const desktopCliCommandName = "ccr-app"; +const desktopCliRuntimeFileName = "ccr-cli.js"; +const desktopCliCommandNameEnv = "CCR_CLI_COMMAND_NAME"; let claudeAppBotWorker: ChildProcess | undefined; let claudeAppBotWorkerProfileId: string | undefined; +type ProfileOpenCommandOptions = { + commandName?: string; + ensureLauncher?: boolean; +}; + type ProfileAppLaunchResult = { child: ChildProcess; claudeDesignProxy?: boolean; @@ -41,14 +50,16 @@ type RunningProfileApp = ProfileRuntimeEntry & { process.once("exit", () => stopClaudeAppBotWorker()); -export async function getProfileOpenCommand(config: AppConfig, request: ProfileOpenRequest): Promise { +export async function getProfileOpenCommand(config: AppConfig, request: ProfileOpenRequest, options: ProfileOpenCommandOptions = {}): Promise { assertAvailableGatewayModels(config); await applyProfileConfig(config); const profile = findProfileForOpen(config, request.profileId); const surface = resolveProfileOpenSurface(profile, request.surface); - ensureCcrCliLauncher(); + if (options.ensureLauncher) { + ensureCcrCliLauncher(); + } return { - command: profileOpenCommand(profile, surface, "ccr", commandProfileRef(config, profile)), + command: profileOpenCommand(profile, surface, options.commandName ?? "ccr", commandProfileRef(config, profile)), profileId: profile.id, profileName: profile.name, surface @@ -97,7 +108,7 @@ export async function openProfileFromCcr(config: AppConfig, request: ProfileOpen } async function openCodexAppProfile(config: AppConfig, profile: ReturnType): Promise { - const appName = profile.agent === "zcode" ? "ZCode App" : "Codex App"; + const appName = profile.agent === "zcode" ? "ZCode App" : codexDesktopAppName; const profileGatewayConfig = await ensureProfileGateway(config, profile, appName); const existing = runningProfileApp(profile.id, "app"); if (existing) { @@ -1083,13 +1094,15 @@ export function ensureCcrCliLauncher(): string { const binDir = path.join(CONFIGDIR, "bin"); mkdirSync(binDir, { recursive: true }); cleanupGeneratedBinBackups(); + cleanupLegacyCcrCliLauncher(binDir); - const runtimeFile = path.join(binDir, "ccr-cli.js"); + const runtimeFile = path.join(binDir, desktopCliRuntimeFileName); const runtimeSource = findBundledCcrCliSource(); writeFileIfChanged(runtimeFile, readFileSync(runtimeSource, "utf8")); chmodSafe(runtimeFile); + ensureBundledToolHubMcpRuntime(path.join(binDir, TOOL_HUB_MCP_RUNTIME_FILE_NAME)); - const launcherFile = path.join(binDir, process.platform === "win32" ? "ccr.cmd" : "ccr"); + const launcherFile = path.join(binDir, process.platform === "win32" ? `${desktopCliCommandName}.cmd` : desktopCliCommandName); const launcherContent = process.platform === "win32" ? windowsCcrLauncher(runtimeFile) : posixCcrLauncher(runtimeFile); @@ -1100,6 +1113,29 @@ export function ensureCcrCliLauncher(): string { return launcherFile; } +function cleanupLegacyCcrCliLauncher(binDir: string): void { + const legacyLauncherFile = path.join(binDir, process.platform === "win32" ? "ccr.cmd" : "ccr"); + if (!existsSync(legacyLauncherFile)) { + return; + } + try { + const source = readFileSync(legacyLauncherFile, "utf8"); + if (!isLegacyManagedCcrCliLauncher(source)) { + return; + } + rmSync(legacyLauncherFile, { force: true }); + } catch (error) { + console.warn(`[profile] Failed to remove legacy ccr launcher: ${formatError(error)}`); + } +} + +function isLegacyManagedCcrCliLauncher(source: string): boolean { + return source.includes("CCR_CLI_NODE_PATH") && + source.includes(desktopCliRuntimeFileName) && + source.includes("ELECTRON_RUN_AS_NODE=1") && + source.includes("CCR_NODE_BIN"); +} + function findBundledCcrCliSource(): string { const resourcesPath = (process as NodeJS.Process & { resourcesPath?: string }).resourcesPath; const candidates = [ @@ -1119,10 +1155,21 @@ function findBundledCcrCliSource(): string { return source; } +function ensureBundledToolHubMcpRuntime(file: string): void { + const source = bundledToolHubMcpEntryPathCandidates().find((candidate) => existsSync(candidate)); + if (!source) { + return; + } + writeFileIfChanged(file, readFileSync(source, "utf8")); + chmodSafe(file); +} + function posixCcrLauncher(runtimeFile: string): string { const nodePath = bundledNodePath(); return [ "#!/bin/sh", + `${desktopCliCommandNameEnv}=${shQuote(desktopCliCommandName)}`, + `export ${desktopCliCommandNameEnv}`, `CCR_CLI_NODE_PATH=${shQuote(nodePath)}`, 'if [ -n "$NODE_PATH" ]; then', ' export NODE_PATH="$CCR_CLI_NODE_PATH:$NODE_PATH"', @@ -1141,6 +1188,7 @@ function windowsCcrLauncher(runtimeFile: string): string { return [ "@echo off", "setlocal", + `set "${desktopCliCommandNameEnv}=${desktopCliCommandName}"`, `set "CCR_CLI_RUNTIME=${cmdEnvValue(runtimeFile)}"`, `set "CCR_CLI_NODE_PATH=${cmdEnvValue(nodePath)}"`, "if defined NODE_PATH (", @@ -1316,7 +1364,7 @@ function shellRcPathBlock(): string { const binDir = "$HOME/.claude-code-router/bin"; return [ ccrPathBlockStart, - "# Added by Claude Code Router. Enables the ccr command in new shells.", + "# Added by Claude Code Router. Enables the ccr-app command in new shells.", 'case ":$PATH:" in', ` *":${binDir}:"*) ;;`, ` *) export PATH="${binDir}:$PATH" ;;`, @@ -1349,7 +1397,7 @@ function ensureFishPathBlock(file: string, binDir: string): void { function fishPathBlock(): string { return [ ccrPathBlockStart, - "# Added by Claude Code Router. Enables the ccr command in new shells.", + "# Added by Claude Code Router. Enables the ccr-app command in new shells.", 'set -l ccr_bin "$HOME/.claude-code-router/bin"', "if not contains $ccr_bin $PATH", " set -gx PATH $ccr_bin $PATH", diff --git a/src/main/profile-service.ts b/packages/core/src/profiles/service.ts similarity index 82% rename from src/main/profile-service.ts rename to packages/core/src/profiles/service.ts index 1f877ee..7376260 100644 --- a/src/main/profile-service.ts +++ b/packages/core/src/profiles/service.ts @@ -2,21 +2,36 @@ import { randomBytes } from "node:crypto"; import { chmodSync, copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "node:fs"; import os from "node:os"; import path from "node:path"; -import { CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY_ENV, NO_AVAILABLE_GATEWAY_MODELS_MESSAGE, enforceSingleEnabledGlobalProfilePerAgent, hasAvailableGatewayModels, type ApiKeyConfig, type AppConfig, type ProfileApplyResult, type ProfileClientApplyStatus, type ProfileClientKind, type ProfileConfig } from "../shared/app"; -import { replacePersistedApiKeys } from "./api-key-store"; -import { botGatewayProfileEnv } from "./bot-gateway-env"; -import { claudeCodeUtcTimezoneEnvOverride } from "./claude-environment"; -import { writeCodexCompatibleAppModelCatalog } from "./codex-app-launch"; -import { codexCliMiddlewareRuntimeScript } from "./codex-cli-middleware-runtime"; -import { codexModelCatalogJson } from "./codex-model-catalog"; -import { CONFIGDIR } from "./constants"; -import { resolveZcodeConfigFile, writeZcodeGatewayConfig, zcodeHomeFromConfigFile } from "./zcode-profile-config"; -import { normalizeRouteSelector } from "../server/gateway/claude-code-router-plugin"; +import { CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY_ENV, NO_AVAILABLE_GATEWAY_MODELS_MESSAGE, enforceSingleEnabledGlobalProfilePerAgent, hasAvailableGatewayModels, type ApiKeyConfig, type AppConfig, type ProfileApplyResult, type ProfileClientApplyStatus, type ProfileClientKind, type ProfileConfig } from "@ccr/core/contracts/app"; +import { replacePersistedApiKeys } from "@ccr/core/config/api-key-store"; +import { botGatewayProfileEnv } from "@ccr/core/agents/bot-gateway/env"; +import { + CLAUDE_CODE_MCP_CONFIG_ENV, + CODEXL_CLAUDE_CODE_MCP_CONFIG_ENV, + claudeCodeMcpConfigEnv, + claudeCodeUtcTimezoneEnvOverride +} from "@ccr/core/agents/claude-code/environment"; +import { writeCodexCompatibleAppModelCatalog } from "@ccr/core/agents/codex/app-launch"; +import { codexCliMiddlewareRuntimeScript } from "@ccr/core/agents/codex/cli-middleware-runtime"; +import { codexModelCatalogJson } from "@ccr/core/agents/codex/model-catalog"; +import { CONFIGDIR } from "@ccr/core/config/constants"; +import { resolveZcodeConfigFile, writeZcodeGatewayConfig, zcodeHomeFromConfigFile } from "@ccr/core/agents/zcode/profile-config"; +import { normalizeRouteSelector } from "@ccr/core/gateway/claude-code-router-plugin"; +import { + TOOL_HUB_MCP_RUNTIME_FILE_NAME, + TOOL_HUB_MCP_SERVER_NAME, + bundledToolHubMcpEntryPathCandidates, + toolHubClaudeCodeMcpConfig, + toolHubMcpRuntimeConfig, + type ToolHubMcpRuntimeConfig +} from "@ccr/core/mcp/toolhub-config"; const managedRootStart = "# BEGIN CCR managed profile"; const managedRootEnd = "# END CCR managed profile"; const managedProviderStart = "# BEGIN CCR managed Codex provider"; const managedProviderEnd = "# END CCR managed Codex provider"; +const managedToolHubMcpStart = "# BEGIN CCR managed ToolHub MCP"; +const managedToolHubMcpEnd = "# END CCR managed ToolHub MCP"; const originalBackupSuffix = ".ccr-original"; const originalMissingSuffix = ".ccr-original-missing"; const fallbackClientToken = "ccr-local"; @@ -41,11 +56,26 @@ export async function applyProfileConfig(config: AppConfig): Promise - profile.enabled + const managedCleanupResult = cleanupManagedClaudeCodeToolHubArtifacts(profiles, { includeActive: true }); + result.clients = profiles.map((profile) => { + const cleanupResult = profile.agent === "claude-code" + ? cleanupClaudeCodeToolHubArtifacts(profile) + : { ok: true }; + const status = profile.enabled ? unavailableModelStatus(profile, profilePath(profile)) - : disabledProfileStatus(profile) - ); + : disabledProfileStatus(profile); + const cleanupMessage = [managedCleanupResult, cleanupResult] + .filter((item) => !item.ok) + .map((item) => item.message) + .filter(Boolean) + .join("; "); + return cleanupMessage + ? { + ...status, + message: `${status.message} Failed to clean stale ToolHub config: ${cleanupMessage}` + } + : status; + }); return result; } @@ -61,10 +91,133 @@ export async function applyProfileConfig(config: AppConfig): Promise profile.agent === "claude-code") + .map((profile) => normalizedFileKey(claudeCodeToolHubMcpConfigFile(profile)))); + const activeGeneratedSettingsFiles = new Set(profiles + .filter((profile) => profile.agent === "claude-code" && isGeneratedProfileScope(profile.scope)) + .map((profile) => normalizedFileKey(resolveClaudeCodeSettingsFile(profile)))); + const errors: string[] = []; + let changed = false; + + for (const file of managedClaudeCodeToolHubMcpConfigFiles()) { + if (!options.includeActive && activeToolHubFiles.has(normalizedFileKey(file))) { + continue; + } + try { + rmSync(file, { force: true }); + changed = true; + } catch (error) { + errors.push(`${file}: ${formatError(error)}`); + } + } + + for (const file of managedClaudeCodeSettingsFiles()) { + if (!options.includeActive && activeGeneratedSettingsFiles.has(normalizedFileKey(file))) { + continue; + } + try { + changed = cleanupClaudeCodeToolHubSettingsFile(file, { backup: false }).changed || changed; + } catch (error) { + errors.push(`${file}: ${formatError(error)}`); + } + } + + return errors.length > 0 + ? { changed, message: errors.join("; "), ok: false } + : { changed, ok: true }; +} + +function managedClaudeCodeToolHubMcpConfigFiles(): string[] { + return managedClaudeCodeGeneratedFiles("toolhub-mcp.json"); +} + +function managedClaudeCodeSettingsFiles(): string[] { + return managedClaudeCodeGeneratedFiles("settings.json"); +} + +function managedClaudeCodeGeneratedFiles(fileName: string): string[] { + const profilesDir = path.join(CONFIGDIR, "profiles"); + let entries; + try { + entries = readdirSync(profilesDir, { withFileTypes: true }); + } catch { + return []; + } + const files: string[] = []; + for (const entry of entries) { + if (!entry.isDirectory()) { + continue; + } + const profileDir = path.join(profilesDir, entry.name); + for (const file of [ + path.join(profileDir, "claude", fileName), + path.join(profileDir, "custom", "claude", fileName) + ]) { + if (existsSync(file)) { + files.push(file); + } + } + } + return files; +} + +function normalizedFileKey(file: string): string { + const normalized = path.resolve(file); + return process.platform === "win32" ? normalized.toLowerCase() : normalized; +} + +function cleanupClaudeCodeToolHubSettingsFile(file: string, options: { backup: boolean }): { changed: boolean } { + const settings = readJsonObject(file); + const env = isRecord(settings.env) ? { ...settings.env } : {}; + if (!deleteClaudeCodeToolHubEnv(env)) { + return { changed: false }; + } + const content = `${JSON.stringify({ ...settings, env }, null, 2)}\n`; + const writeResult = options.backup + ? writeFileWithBackup(file, content, { mode: privateFileMode }) + : writeGeneratedFileIfChanged(file, content, { mode: privateFileMode }); + return { changed: writeResult.changed }; +} + +function deleteClaudeCodeToolHubEnv(env: Record): boolean { + let changed = false; + for (const key of [CLAUDE_CODE_MCP_CONFIG_ENV, CODEXL_CLAUDE_CODE_MCP_CONFIG_ENV]) { + if (key in env) { + delete env[key]; + changed = true; + } + } + return changed; +} + +function cleanupClaudeCodeToolHubArtifacts(profile: ProfileConfig): { changed?: boolean; message?: string; ok: boolean } { + try { + let changed = false; + const mcpConfigFile = claudeCodeToolHubMcpConfigFile(profile); + if (existsSync(mcpConfigFile)) { + rmSync(mcpConfigFile, { force: true }); + changed = true; + } + changed = cleanupClaudeCodeToolHubSettingsFile(resolveClaudeCodeSettingsFile(profile), { backup: true }).changed || changed; + return { changed, ok: true }; + } catch (error) { + return { + message: formatError(error), + ok: false + }; + } +} + export function applyProfileRuntimeConfig(config: AppConfig, profile: ProfileConfig, token: string): ProfileClientApplyStatus { cleanupGeneratedBinBackups(); const appliedAt = new Date().toISOString(); @@ -84,8 +237,11 @@ function applyClaudeCodeProfile(config: AppConfig, profile: ProfileConfig, token try { const endpoint = gatewayEndpoint(config); const settings = readJsonObject(settingsFile); + const settingsEnv = withoutBotGatewayEnv(Object.fromEntries(stringRecord(settings.env))); + delete settingsEnv[CLAUDE_CODE_MCP_CONFIG_ENV]; + delete settingsEnv[CODEXL_CLAUDE_CODE_MCP_CONFIG_ENV]; const env = { - ...withoutBotGatewayEnv(Object.fromEntries(stringRecord(settings.env))), + ...settingsEnv, ...profileEnv(profile) }; env.ANTHROPIC_BASE_URL = endpoint; @@ -108,17 +264,18 @@ function applyClaudeCodeProfile(config: AppConfig, profile: ProfileConfig, token } else { delete env.ANTHROPIC_SMALL_FAST_MODEL; } - Object.assign(env, claudeCodeUtcTimezoneEnvOverride()); + const toolHubMcpConfigResult = writeClaudeCodeToolHubMcpConfig(config, profile, token); + Object.assign(env, claudeCodeMcpConfigEnv(toolHubMcpConfigResult.file), claudeCodeUtcTimezoneEnvOverride()); const helperResult = writeClaudeCodeApiKeyHelper(profile, token); - const wrapperResult = writeClaudeCodeWrapper(config, profile, helperResult.file); + const wrapperResult = writeClaudeCodeWrapper(config, profile, helperResult.file, toolHubMcpConfigResult.file); const nextSettings = { ...settings, apiKeyHelper: process.platform === "win32" ? `"${helperResult.file}"` : helperResult.file, env }; const writeResult = writeFileWithBackup(settingsFile, `${JSON.stringify(nextSettings, null, 2)}\n`, { mode: privateFileMode }); - const changed = writeResult.changed || helperResult.changed || wrapperResult.changed; + const changed = writeResult.changed || helperResult.changed || wrapperResult.changed || toolHubMcpConfigResult.changed; return { appliedAt, backupFile: writeResult.backupFile ?? helperResult.backupFile ?? wrapperResult.backupFile, @@ -164,6 +321,7 @@ function applyCodexProfile(config: AppConfig, profile: ProfileConfig, token: str const modelCatalogResult = writeFileWithBackup(modelCatalogFile, codexModelCatalogJson(config, model)); const appModelCatalogResult = writeCodexCompatibleAppModelCatalog(CONFIGDIR, { ...profile, model }, config); const showAllSessions = profile.agent === "zcode" ? false : Boolean(profile.showAllSessions); + const toolHubMcpResult = writeCodexToolHubMcpRuntimeConfig(config, token); const nextConfig = buildCodexConfigToml(source, { baseUrl: endpoint, modelCatalogFile, @@ -172,7 +330,8 @@ function applyCodexProfile(config: AppConfig, profile: ProfileConfig, token: str providerId, providerName, showAllSessions, - token + token, + toolHubMcp: toolHubMcpResult.runtime }); const writeResult = writeFileWithBackup(configFile, nextConfig, { mode: privateFileMode }); const separateProfileResult = maybeWriteSeparateCodexProfileFile(configFile, source, { @@ -193,11 +352,13 @@ function applyCodexProfile(config: AppConfig, profile: ProfileConfig, token: str const changed = writeResult.changed || modelCatalogResult.changed || appModelCatalogResult.changed || + toolHubMcpResult.changed || Boolean(separateProfileResult?.changed) || Boolean(middlewareResult?.changed); const extras = [ modelCatalogFile ? `catalog ${modelCatalogFile}` : "", appModelCatalogResult.file ? `app catalog ${appModelCatalogResult.file}` : "", + toolHubMcpResult.file ? `toolhub runtime ${toolHubMcpResult.file}` : "", separateProfileResult?.file ? `profile ${separateProfileResult.file}` : "", middlewareResult?.file ? `middleware ${middlewareResult.file}` : "" ].filter(Boolean); @@ -343,6 +504,64 @@ function resolveClaudeCodeSettingsFile(profile: ProfileConfig): string { return resolveUserPath(profile.settingsFile || "~/.claude/settings.json"); } +function claudeCodeToolHubMcpConfigFile(profile: ProfileConfig): string { + return path.join(ccrManagedProfileDir(profile), "claude", "toolhub-mcp.json"); +} + +function writeClaudeCodeToolHubMcpConfig(config: AppConfig, profile: ProfileConfig, token: string): { changed: boolean; file?: string } { + const file = claudeCodeToolHubMcpConfigFile(profile); + const entryPath = path.join(CONFIGDIR, "bin", TOOL_HUB_MCP_RUNTIME_FILE_NAME); + const mcpConfig = toolHubClaudeCodeMcpConfig(config, { + entryPath, + resolver: { + apiKey: token, + baseUrl: `${gatewayEndpoint(config).replace(/\/+$/g, "")}/v1`, + model: toolHubResolverModel(config) + } + }); + if (!mcpConfig) { + if (existsSync(file)) { + rmSync(file, { force: true }); + return { changed: true }; + } + return { changed: false }; + } + + const runtimeResult = ensureToolHubMcpRuntimeFile(entryPath); + const writeResult = writeGeneratedFileIfChanged(file, `${JSON.stringify(mcpConfig, null, 2)}\n`, { mode: privateFileMode }); + return { changed: runtimeResult.changed || writeResult.changed, file }; +} + +function writeCodexToolHubMcpRuntimeConfig(config: AppConfig, token: string): { changed: boolean; file?: string; runtime?: ToolHubMcpRuntimeConfig } { + const entryPath = path.join(CONFIGDIR, "bin", TOOL_HUB_MCP_RUNTIME_FILE_NAME); + const runtime = toolHubMcpRuntimeConfig(config, undefined, { + entryPath, + resolver: { + apiKey: token, + baseUrl: `${gatewayEndpoint(config).replace(/\/+$/g, "")}/v1`, + model: toolHubResolverModel(config) + } + }); + if (!runtime) { + return { changed: false }; + } + + const runtimeResult = ensureToolHubMcpRuntimeFile(entryPath); + return { + changed: runtimeResult.changed, + file: entryPath, + runtime + }; +} + +function ensureToolHubMcpRuntimeFile(file: string): { changed: boolean } { + const source = bundledToolHubMcpEntryPathCandidates().find((candidate) => existsSync(candidate)); + if (!source) { + throw new Error(`ToolHub MCP runtime was not found. Rebuild or reinstall CCR and try again. Checked: ${bundledToolHubMcpEntryPathCandidates().join(", ")}`); + } + return writeGeneratedFileIfChanged(file, readFileSync(source, "utf8"), { mode: publicExecutableMode }); +} + function resolveCodexConfigFile(profile: ProfileConfig): string { if (profile.agent === "zcode") { return resolveZcodeConfigFile(profile); @@ -382,11 +601,14 @@ function buildCodexConfigToml( providerName: string; showAllSessions: boolean; token: string; + toolHubMcp?: ToolHubMcpRuntimeConfig; } ): string { let content = removeManagedBlock(source, managedRootStart, managedRootEnd); content = removeManagedBlock(content, managedProviderStart, managedProviderEnd); + content = removeManagedBlock(content, managedToolHubMcpStart, managedToolHubMcpEnd); content = removeCodexProviderTable(content, values.providerId); + content = removeCodexMcpServerTable(content, TOOL_HUB_MCP_SERVER_NAME); if (values.configFormat === "separate_profile_files") { content = removeCodexProfileTable(content, values.providerId); } @@ -415,8 +637,29 @@ function buildCodexConfigToml( managedProviderEnd, "" ].join("\n"); + const toolHubMcpBlock = buildCodexToolHubMcpBlock(values.toolHubMcp); - return `${rootBlock}${trimLeadingBlankLines(cleanedRoot)}${restSource}${providerBlock}`.replace(/\n{4,}/g, "\n\n\n"); + return `${rootBlock}${trimLeadingBlankLines(cleanedRoot)}${restSource}${providerBlock}${toolHubMcpBlock}`.replace(/\n{4,}/g, "\n\n\n"); +} + +function buildCodexToolHubMcpBlock(runtime: ToolHubMcpRuntimeConfig | undefined): string { + if (!runtime) { + return ""; + } + + const serverTable = `mcp_servers.${tomlKey(TOOL_HUB_MCP_SERVER_NAME)}`; + return [ + "", + managedToolHubMcpStart, + `[${serverTable}]`, + `command = ${tomlString(runtime.command)}`, + `args = ${tomlStringArray(runtime.args)}`, + "", + `[${serverTable}.env]`, + ...Object.entries(runtime.env).map(([key, value]) => `${tomlKey(key)} = ${tomlString(value)}`), + managedToolHubMcpEnd, + "" + ].join("\n"); } function maybeWriteSeparateCodexProfileFile( @@ -503,15 +746,15 @@ function claudeCodeApiKeyHelperCmdScript(token: string): string { ].join("\r\n"); } -function writeClaudeCodeWrapper(config: AppConfig, profile: ProfileConfig, apiKeyHelperFile: string): { backupFile?: string; changed: boolean; file: string } { +function writeClaudeCodeWrapper(config: AppConfig, profile: ProfileConfig, apiKeyHelperFile: string, mcpConfigFile: string | undefined): { backupFile?: string; changed: boolean; file: string } { const binDir = path.join(CONFIGDIR, "bin"); mkdirSync(binDir, { mode: privateDirMode, recursive: true }); const runtimeFile = path.join(binDir, codexMiddlewareRuntimeFilename()); const runtimeResult = writeGeneratedFileIfChanged(runtimeFile, codexCliMiddlewareRuntimeScript(), { mode: publicExecutableMode }); const file = path.join(binDir, claudeCodeWrapperFilename(profile)); const content = process.platform === "win32" - ? claudeCodeWrapperCmdScript(config, profile, runtimeFile, apiKeyHelperFile) - : claudeCodeWrapperShellScript(config, profile, runtimeFile, apiKeyHelperFile); + ? claudeCodeWrapperCmdScript(config, profile, runtimeFile, apiKeyHelperFile, mcpConfigFile) + : claudeCodeWrapperShellScript(config, profile, runtimeFile, apiKeyHelperFile, mcpConfigFile); const writeResult = writeGeneratedFileIfChanged(file, content, { mode: privateExecutableMode }); return { changed: writeResult.changed || runtimeResult.changed, @@ -526,7 +769,7 @@ function claudeCodeWrapperFilename(profile: ProfileConfig): string { : `ccr-claude-code-wrapper-${slug}`; } -function claudeCodeWrapperShellScript(config: AppConfig, profile: ProfileConfig, runtimeFile: string, apiKeyHelperFile: string): string { +function claudeCodeWrapperShellScript(config: AppConfig, profile: ProfileConfig, runtimeFile: string, apiKeyHelperFile: string, mcpConfigFile: string | undefined): string { const realClaude = profile.env?.CCR_CLAUDE_CODE_BIN?.trim() || "claude"; const surface = normalizeProfileSurface(profile.surface); const remoteEndpoint = `${gatewayEndpoint(config)}/__ccr/remote`; @@ -539,6 +782,7 @@ function claudeCodeWrapperShellScript(config: AppConfig, profile: ProfileConfig, "#!/bin/sh", ...envExports, ...shellEnvExports(claudeCodeRuntimeEnv(config, profile, settingsDir)), + ...shellEnvExports(claudeCodeMcpConfigEnv(mcpConfigFile)), ...shellEnvExports(claudeCodeUtcTimezoneEnvOverride()), `: "\${CCR_PROFILE_SURFACE:=${surface}}"`, "export CCR_PROFILE_SURFACE", @@ -557,7 +801,7 @@ function claudeCodeWrapperShellScript(config: AppConfig, profile: ProfileConfig, ].join("\n"); } -function claudeCodeWrapperCmdScript(config: AppConfig, profile: ProfileConfig, runtimeFile: string, apiKeyHelperFile: string): string { +function claudeCodeWrapperCmdScript(config: AppConfig, profile: ProfileConfig, runtimeFile: string, apiKeyHelperFile: string, mcpConfigFile: string | undefined): string { const realClaude = profile.env?.CCR_CLAUDE_CODE_BIN?.trim() || "claude"; const surface = normalizeProfileSurface(profile.surface); const remoteEndpoint = `${gatewayEndpoint(config)}/__ccr/remote`; @@ -570,6 +814,7 @@ function claudeCodeWrapperCmdScript(config: AppConfig, profile: ProfileConfig, r "@echo off", ...envExports, ...cmdEnvExports(claudeCodeRuntimeEnv(config, profile, settingsDir)), + ...cmdEnvExports(claudeCodeMcpConfigEnv(mcpConfigFile)), ...cmdEnvExports(claudeCodeUtcTimezoneEnvOverride()), `if not defined CCR_PROFILE_SURFACE ${cmdSetLine("CCR_PROFILE_SURFACE", surface)}`, ...botEnvExports, @@ -920,6 +1165,31 @@ function removeCodexProfileTable(source: string, providerId: string): string { return removeTomlTable(source, "profiles", providerId); } +function removeCodexMcpServerTable(source: string, serverName: string): string { + const lines = source.split(/(?<=\n)/); + const headers = new Set([ + `[mcp_servers.${serverName}]`, + `[mcp_servers.${tomlQuotedKey(serverName)}]`, + `[mcp_servers.${serverName}.env]`, + `[mcp_servers.${tomlQuotedKey(serverName)}.env]` + ]); + const kept: string[] = []; + for (let index = 0; index < lines.length; index += 1) { + const line = lines[index]; + if (!headers.has(line.trim())) { + kept.push(line); + continue; + } + + index += 1; + while (index < lines.length && !/^\s*\[/.test(lines[index])) { + index += 1; + } + index -= 1; + } + return kept.join(""); +} + function removeTomlTable(source: string, section: string, name: string): string { const lines = source.split(/(?<=\n)/); const headers = new Set([ @@ -1068,7 +1338,9 @@ function generatedBinBackupBaseName(entry: string): string | undefined { function isManagedGeneratedBinFile(fileName: string): boolean { const normalized = fileName.replace(/\.cmd$/i, ""); return normalized === "ccr" || + normalized === "ccr-app" || normalized === "ccr-cli.js" || + normalized === TOOL_HUB_MCP_RUNTIME_FILE_NAME || normalized === codexMiddlewareRuntimeFilename() || normalized.startsWith("ccr-claude-code-api-key-") || normalized.startsWith("ccr-claude-code-wrapper-") || @@ -1446,6 +1718,30 @@ function defaultClientModel(config: AppConfig): string { return "gpt-5-codex"; } +function toolHubResolverModel(config: AppConfig): string { + const model = config.toolHub.llm.model.trim(); + if (!model) { + return ""; + } + if (model.includes("/")) { + return model; + } + const baseUrl = normalizeUrlForMatch(config.toolHub.llm.baseUrl); + const provider = config.Providers.find((candidate) => + candidate.models.includes(model) && + (!baseUrl || normalizeUrlForMatch(providerBaseUrl(candidate)) === baseUrl) + ) ?? config.Providers.find((candidate) => candidate.models.includes(model)); + return provider?.name ? `${provider.name}/${model}` : model; +} + +function providerBaseUrl(provider: AppConfig["Providers"][number]): string { + return provider.api_base_url || provider.baseUrl || provider.baseurl || ""; +} + +function normalizeUrlForMatch(value: string | undefined): string { + return (value || "").trim().replace(/\/+$/g, ""); +} + function normalizeClientModel(value: string | undefined): string { return normalizeRouteSelector(value)?.trim() || ""; } @@ -1547,6 +1843,10 @@ function tomlString(value: string): string { return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r")}"`; } +function tomlStringArray(values: string[]): string { + return `[${values.map((value) => tomlString(value)).join(", ")}]`; +} + function tomlStringContent(value: string): string { return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r"); } diff --git a/src/main/provider-account-service.ts b/packages/core/src/providers/account-service.ts similarity index 92% rename from src/main/provider-account-service.ts rename to packages/core/src/providers/account-service.ts index 094d36b..adeb61d 100644 --- a/src/main/provider-account-service.ts +++ b/packages/core/src/providers/account-service.ts @@ -1,12 +1,12 @@ import { createHash, randomUUID } from "node:crypto"; -import { loadAppConfig } from "./config"; -import { attachCodexRateLimitResetCreditDetails } from "./local-agent-providers/codex"; -import { localAgentProviderApiKey, readCodexAuth } from "./local-agent-provider-service"; -import { pluginService } from "./plugins/service"; -import { getUsageTotalsSince } from "./usage-store"; -import { findProviderPresetByBaseUrl, providerEndpointCanReceiveProviderApiKey } from "./presets"; -import { fetchWithSystemProxy } from "./system-proxy-fetch"; -import { normalizeProviderBaseUrl, providerUrlWithDefaultScheme } from "../shared/provider-url"; +import { loadAppConfig } from "@ccr/core/config/config"; +import { attachCodexRateLimitResetCreditDetails } from "@ccr/core/agents/local-providers/codex"; +import { localAgentProviderApiKey, readCodexAuth } from "@ccr/core/agents/local-providers/service"; +import { pluginService } from "@ccr/core/plugins/service"; +import { getUsageTotalsSince } from "@ccr/core/usage/store"; +import { findProviderPresetByBaseUrl, providerEndpointCanReceiveProviderApiKey } from "@ccr/core/providers/presets/index"; +import { fetchWithSystemProxy } from "@ccr/core/proxy/system-proxy-fetch"; +import { normalizeProviderBaseUrl, providerUrlWithDefaultScheme } from "@ccr/core/providers/url"; import type { AppConfig, GatewayProviderConfig, @@ -36,7 +36,7 @@ import type { ProviderAccountStandardConnectorConfig, ProviderCredentialConfig, ProviderAccountStatus -} from "../shared/app"; +} from "@ccr/core/contracts/app"; type CacheEntry = { expiresAt: number; @@ -146,6 +146,26 @@ export async function testProviderAccountConnector(request: ProviderAccountTestR status: statusFromMeters(meters, [], 1) }; } + if (connector.parser === "new-api-key-usage") { + const meters = newApiKeyUsageMeters(payload); + return { + meters, + message: meters.length === 0 ? newApiKeyUsageFallbackMessage(payload) : readMappedString(connector.mapping.message, payload), + paths: flattenJsonPaths(payload), + payload, + status: statusFromMeters(meters, [], 1) + }; + } + if (connector.parser === "new-api-user-self") { + const meters = newApiUserSelfMeters(payload); + return { + meters, + message: meters.length === 0 ? readMappedString(connector.mapping.message, payload) ?? "No user balance data available." : readMappedString(connector.mapping.message, payload), + paths: flattenJsonPaths(payload), + payload, + status: statusFromMeters(meters, [], 1) + }; + } const meters = mappedMetersFromPayload(connector, payload); @@ -158,6 +178,18 @@ export async function testProviderAccountConnector(request: ProviderAccountTestR }; } +export function newApiKeyUsageMetersForTest(payload: unknown): ProviderAccountMeter[] { + return newApiKeyUsageMeters(payload); +} + +export function newApiKeyUsageFallbackMessageForTest(payload: unknown): string { + return newApiKeyUsageFallbackMessage(payload); +} + +export function newApiUserSelfMetersForTest(payload: unknown): ProviderAccountMeter[] { + return newApiUserSelfMeters(payload); +} + export async function resetCodexRateLimitCredit(request: ProviderAccountResetRequest): Promise { const providerName = request.provider?.trim(); const creditId = request.creditId?.trim(); @@ -586,6 +618,24 @@ async function resolveHttpJsonConnector( source: "http-json" }; } + if (connector.parser === "new-api-key-usage") { + const meters = newApiKeyUsageMeters(payload); + return { + errors: [], + message: meters.length === 0 ? newApiKeyUsageFallbackMessage(payload) : readMappedString(connector.mapping.message, payload), + meters, + source: "http-json" + }; + } + if (connector.parser === "new-api-user-self") { + const meters = newApiUserSelfMeters(payload); + return { + errors: [], + message: meters.length === 0 ? readMappedString(connector.mapping.message, payload) ?? "No user balance data available." : readMappedString(connector.mapping.message, payload), + meters, + source: "http-json" + }; + } const meters = mappedMetersFromPayload(connector, payload); return { @@ -758,6 +808,90 @@ function normalizeRemoteSnapshot( }; } +function newApiKeyUsageMeters(payload: unknown): ProviderAccountMeter[] { + const meter = newApiKeyUsageMeter(payload); + return meter ? [meter] : []; +} + +function newApiKeyUsageMeter(payload: unknown): ProviderAccountMeter | undefined { + const data = newApiKeyUsageData(payload); + if (!data) { + return undefined; + } + + const unlimited = readBoolean(readJsonRecordValue(data, "unlimited_quota")) === true; + const remaining = normalizeNumber(readJsonRecordValue(data, "total_available")); + const limit = normalizeNumber(readJsonRecordValue(data, "total_granted")); + const used = normalizeNumber(readJsonRecordValue(data, "total_used")); + if (unlimited || (limit === undefined && remaining === undefined && used === undefined)) { + return undefined; + } + + return { + id: "new_api_key_quota", + kind: "quota", + label: "API key quota", + limit, + remaining, + source: "http-json", + unit: "quota", + used + }; +} + +function newApiKeyUsageFallbackMessage(payload: unknown): string { + const data = newApiKeyUsageData(payload); + if (data && readBoolean(readJsonRecordValue(data, "unlimited_quota")) === true) { + return "API key has no dedicated quota limit. Configure a New API user balance connector with an access token and New-Api-User to read account balance."; + } + return readMappedString("$.message", payload) ?? "No API key quota data available."; +} + +function newApiUserSelfMeters(payload: unknown): ProviderAccountMeter[] { + const meter = newApiUserSelfMeter(payload); + return meter ? [meter] : []; +} + +function newApiUserSelfMeter(payload: unknown): ProviderAccountMeter | undefined { + const data = newApiUserSelfData(payload); + if (!data) { + return undefined; + } + + const remaining = normalizeNumber(readJsonRecordValue(data, "quota")); + const used = normalizeNumber(readJsonRecordValue(data, "used_quota")); + if (remaining === undefined && used === undefined) { + return undefined; + } + + return { + id: "new_api_user_balance", + kind: "balance", + label: "User balance", + limit: remaining !== undefined && used !== undefined ? remaining + used : undefined, + remaining, + source: "http-json", + unit: "quota", + used + }; +} + +function newApiKeyUsageData(payload: unknown): Record | undefined { + if (!isRecord(payload)) { + return undefined; + } + const data = readJsonRecordValue(payload, "data"); + return isRecord(data) ? data : payload; +} + +function newApiUserSelfData(payload: unknown): Record | undefined { + if (!isRecord(payload)) { + return undefined; + } + const data = readJsonRecordValue(payload, "data"); + return isRecord(data) ? data : payload; +} + function kimiCodeUsageMeters(payload: unknown): ProviderAccountMeter[] { if (!isRecord(payload)) { return []; diff --git a/src/main/provider-icons.ts b/packages/core/src/providers/icons.ts similarity index 97% rename from src/main/provider-icons.ts rename to packages/core/src/providers/icons.ts index c522032..78f2c17 100644 --- a/src/main/provider-icons.ts +++ b/packages/core/src/providers/icons.ts @@ -2,10 +2,10 @@ import { createHash } from "node:crypto"; import { existsSync, mkdirSync, readdirSync, writeFileSync } from "node:fs"; import path from "node:path"; import { pathToFileURL } from "node:url"; -import { PROVIDER_ICON_CACHE_DIR } from "./constants"; -import { fetchWithSystemProxy } from "./system-proxy-fetch"; -import type { ProviderIconDetectionRequest, ProviderIconDetectionResult } from "../shared/app"; -import { compactProviderUrl, providerUrlWithDefaultScheme } from "../shared/provider-url"; +import { PROVIDER_ICON_CACHE_DIR } from "@ccr/core/config/constants"; +import { fetchWithSystemProxy } from "@ccr/core/proxy/system-proxy-fetch"; +import type { ProviderIconDetectionRequest, ProviderIconDetectionResult } from "@ccr/core/contracts/app"; +import { compactProviderUrl, providerUrlWithDefaultScheme } from "@ccr/core/providers/url"; const faviconServiceUrl = "https://t0.gstatic.com/faviconV2"; const maxProviderIconBytes = 1024 * 1024; diff --git a/src/main/provider-manifest-service.ts b/packages/core/src/providers/manifest-service.ts similarity index 97% rename from src/main/provider-manifest-service.ts rename to packages/core/src/providers/manifest-service.ts index f287364..40bdf89 100644 --- a/src/main/provider-manifest-service.ts +++ b/packages/core/src/providers/manifest-service.ts @@ -1,9 +1,9 @@ import { lookup } from "node:dns/promises"; import https from "node:https"; import net from "node:net"; -import { parseProviderManifestPayload } from "../shared/deep-link"; -import { findProviderPresetByBaseUrl, providerEndpointCanReceiveProviderApiKey, providerIdentitySafetyIssue } from "./presets"; -import { providerUrlWithDefaultScheme } from "../shared/provider-url"; +import { parseProviderManifestPayload } from "@ccr/core/contracts/deep-link"; +import { findProviderPresetByBaseUrl, providerEndpointCanReceiveProviderApiKey, providerIdentitySafetyIssue } from "@ccr/core/providers/presets/index"; +import { providerUrlWithDefaultScheme } from "@ccr/core/providers/url"; import type { GatewayProviderConfig, ProviderAccountConnectorConfig, @@ -12,7 +12,7 @@ import type { ProviderDeepLinkPayload, ProviderManifestFetchRequest, ProviderManifestFetchResult -} from "../shared/app"; +} from "@ccr/core/contracts/app"; type SafeAddress = { address: string; diff --git a/src/main/provider-model-catalog.ts b/packages/core/src/providers/model-catalog.ts similarity index 98% rename from src/main/provider-model-catalog.ts rename to packages/core/src/providers/model-catalog.ts index 87519c6..ef57208 100644 --- a/src/main/provider-model-catalog.ts +++ b/packages/core/src/providers/model-catalog.ts @@ -1,7 +1,7 @@ -import type { ProviderCatalogModelsRequest, ProviderCatalogModelsResult } from "../shared/app"; -import { providerUrlWithDefaultScheme } from "../shared/provider-url"; -import { loadModelCatalogPayload } from "./model-catalog-file"; -import { findProviderPreset, findProviderPresetByBaseUrl } from "./presets"; +import type { ProviderCatalogModelsRequest, ProviderCatalogModelsResult } from "@ccr/core/contracts/app"; +import { providerUrlWithDefaultScheme } from "@ccr/core/providers/url"; +import { loadModelCatalogPayload } from "@ccr/core/models/catalog-file"; +import { findProviderPreset, findProviderPresetByBaseUrl } from "@ccr/core/providers/presets/index"; type CatalogProviderEntry = { apiUrls: string[]; diff --git a/packages/core/src/providers/new-api.ts b/packages/core/src/providers/new-api.ts new file mode 100644 index 0000000..44c2609 --- /dev/null +++ b/packages/core/src/providers/new-api.ts @@ -0,0 +1,92 @@ +import type { ProviderAccountConfig, ProviderAccountHttpJsonConnectorConfig } from "@ccr/core/contracts/app"; +import { compactProviderUrl, providerUrlWithDefaultScheme } from "@ccr/core/providers/url"; + +export type DetectedProviderKind = "new-api"; + +const newApiHeaderNames = ["x-new-api-version", "x-oneapi-request-id"]; + +export function detectedProviderFromHeaders(headers: Record): DetectedProviderKind | undefined { + return hasNewApiHeaders(headers) ? "new-api" : undefined; +} + +export function hasNewApiHeaders(headers: Record): boolean { + const normalized = new Set(Object.keys(headers).map((key) => key.toLowerCase())); + return newApiHeaderNames.some((header) => normalized.has(header)); +} + +export function newApiKeyUsageAccountConfig(baseUrl: string): ProviderAccountConfig { + return { + connectors: [ + { + auth: "provider-api-key", + endpoint: newApiKeyUsageEndpoint(baseUrl), + mapping: { + message: "$.message", + meters: [ + { + id: "new_api_key_quota", + kind: "quota", + label: "API key quota", + limit: "$.data.total_granted", + remaining: "$.data.total_available", + unit: "quota", + used: "$.data.total_used", + } + ] + }, + method: "GET", + parser: "new-api-key-usage", + type: "http-json" + } + ], + enabled: true + }; +} + +export function newApiKeyUsageEndpoint(baseUrl: string): string { + const root = newApiRootBaseUrl(baseUrl); + return `${root}/api/usage/token/`; +} + +export function newApiUserSelfConnectorConfig(baseUrl: string): ProviderAccountHttpJsonConnectorConfig { + return { + auth: "none", + endpoint: newApiUserSelfEndpoint(baseUrl), + headers: { + Authorization: "Bearer ", + "New-Api-User": "" + }, + mapping: { + meters: [ + { + id: "new_api_user_balance", + kind: "balance", + label: "User balance", + remaining: "$.data.quota", + unit: "quota", + used: "$.data.used_quota" + } + ] + }, + method: "GET", + parser: "new-api-user-self", + type: "http-json" + }; +} + +export function newApiUserSelfEndpoint(baseUrl: string): string { + const root = newApiRootBaseUrl(baseUrl); + return `${root}/api/user/self`; +} + +export function newApiRootBaseUrl(baseUrl: string): string { + try { + const url = new URL(providerUrlWithDefaultScheme(baseUrl.trim())); + url.pathname = url.pathname.replace(/\/+(v1|api)$/i, "").replace(/\/+$/, "") || "/"; + url.search = ""; + url.hash = ""; + return compactProviderUrl(url); + } catch { + return baseUrl.trim().replace(/[?#].*$/, "").replace(/\/+$/, "").replace(/\/(v1|api)$/i, ""); + } +} diff --git a/src/main/presets/anthropic/index.ts b/packages/core/src/providers/presets/anthropic/index.ts similarity index 93% rename from src/main/presets/anthropic/index.ts rename to packages/core/src/providers/presets/anthropic/index.ts index 7cdc93b..929a717 100644 --- a/src/main/presets/anthropic/index.ts +++ b/packages/core/src/providers/presets/anthropic/index.ts @@ -1,4 +1,4 @@ -import { defaultProviderAccountConfig, type ProviderPreset } from "../../../shared/provider-presets"; +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; export const anthropicProviderPreset: ProviderPreset = { account: defaultProviderAccountConfig, diff --git a/src/main/presets/bailian/index.ts b/packages/core/src/providers/presets/bailian/index.ts similarity index 92% rename from src/main/presets/bailian/index.ts rename to packages/core/src/providers/presets/bailian/index.ts index f52da99..5a21269 100644 --- a/src/main/presets/bailian/index.ts +++ b/packages/core/src/providers/presets/bailian/index.ts @@ -1,4 +1,4 @@ -import { defaultProviderAccountConfig, type ProviderPreset } from "../../../shared/provider-presets"; +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; export const bailianProviderPreset: ProviderPreset = { account: defaultProviderAccountConfig, diff --git a/packages/core/src/providers/presets/claudeapi/index.ts b/packages/core/src/providers/presets/claudeapi/index.ts new file mode 100644 index 0000000..dbd10d7 --- /dev/null +++ b/packages/core/src/providers/presets/claudeapi/index.ts @@ -0,0 +1,15 @@ +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; + +export const claudeApiProviderPreset: ProviderPreset = { + account: defaultProviderAccountConfig, + aliases: ["claudeapi", "claudeapi.com", "www.claudeapi.com"], + endpoints: [ + { + baseUrl: "https://gw.claudeapi.com", + protocols: ["anthropic_messages"] + } + ], + id: "claudeapi", + name: "claudeapi", + websiteUrl: "https://console.claudeapi.com/agent/register/LbmB7Y9kPloyzhwF?utm_source=claudecoderouter&utm_medium=partner&utm_campaign=claudecoderouter_2026&utm_content=default" +}; diff --git a/packages/core/src/providers/presets/code0/index.ts b/packages/core/src/providers/presets/code0/index.ts new file mode 100644 index 0000000..1caf832 --- /dev/null +++ b/packages/core/src/providers/presets/code0/index.ts @@ -0,0 +1,15 @@ +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; + +export const code0ProviderPreset: ProviderPreset = { + account: defaultProviderAccountConfig, + aliases: ["code0", "code0.ai", "code 0"], + endpoints: [ + { + baseUrl: "https://console.code0.ai", + protocols: ["anthropic_messages", "openai_chat_completions", "openai_responses"] + } + ], + id: "code0", + name: "code0.ai", + websiteUrl: "https://code0.ai/agent/register/9n9jOsSnYQoemIVL?utm_source=claudecoderouter&utm_medium=partner&utm_campaign=claudecoderouter_2026&utm_content=default" +}; diff --git a/src/main/presets/deepseek/index.ts b/packages/core/src/providers/presets/deepseek/index.ts similarity index 90% rename from src/main/presets/deepseek/index.ts rename to packages/core/src/providers/presets/deepseek/index.ts index ee87dc6..ee51cd3 100644 --- a/src/main/presets/deepseek/index.ts +++ b/packages/core/src/providers/presets/deepseek/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const deepSeekProviderAccountConfig: ProviderAccountConfig = { connectors: [ diff --git a/packages/core/src/providers/presets/fenno/index.ts b/packages/core/src/providers/presets/fenno/index.ts new file mode 100644 index 0000000..63a645c --- /dev/null +++ b/packages/core/src/providers/presets/fenno/index.ts @@ -0,0 +1,15 @@ +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; + +export const fennoProviderPreset: ProviderPreset = { + account: defaultProviderAccountConfig, + aliases: ["fenno", "fenno.ai", "fenno ai"], + endpoints: [ + { + baseUrl: "https://api.fenno.ai", + protocols: ["openai_chat_completions", "openai_responses", "anthropic_messages"] + } + ], + id: "fenno", + name: "Fenno.ai", + websiteUrl: "https://api.fenno.ai/register?redirect=/purchase?tab=subscription%26group=16&aff=9HHHAB5QLAES" +}; diff --git a/src/main/presets/gemini/index.ts b/packages/core/src/providers/presets/gemini/index.ts similarity index 93% rename from src/main/presets/gemini/index.ts rename to packages/core/src/providers/presets/gemini/index.ts index 4d92ad5..7e0fec7 100644 --- a/src/main/presets/gemini/index.ts +++ b/packages/core/src/providers/presets/gemini/index.ts @@ -1,4 +1,4 @@ -import { defaultProviderAccountConfig, type ProviderPreset } from "../../../shared/provider-presets"; +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; export const geminiProviderPreset: ProviderPreset = { account: defaultProviderAccountConfig, diff --git a/src/main/presets/index.ts b/packages/core/src/providers/presets/index.ts similarity index 50% rename from src/main/presets/index.ts rename to packages/core/src/providers/presets/index.ts index cee4dea..2a56d91 100644 --- a/src/main/presets/index.ts +++ b/packages/core/src/providers/presets/index.ts @@ -1,19 +1,24 @@ -import { anthropicProviderPreset } from "./anthropic"; -import { bailianProviderPreset } from "./bailian"; -import { deepSeekProviderPreset } from "./deepseek"; -import { geminiProviderPreset } from "./gemini"; -import { kimiCodingProviderPreset } from "./kimi-coding"; -import { mistralProviderPreset } from "./mistral"; -import { moonshotChinaProviderPreset, moonshotGlobalProviderPreset } from "./moonshot"; -import { openaiProviderPreset } from "./openai"; -import { openRouterProviderPreset } from "./openrouter"; -import { runApiProviderPreset } from "./runapi"; -import { siliconFlowProviderPreset } from "./siliconflow"; -import { teamoRouterProviderPreset } from "./teamorouter"; -import { zaiGlobalCodingProviderPreset } from "./zai-global-coding"; -import { zaiGlobalGeneralProviderPreset } from "./zai-global-general"; -import { zhipuCnCodingProviderPreset } from "./zhipu-cn-coding"; -import { zhipuCnGeneralProviderPreset } from "./zhipu-cn-general"; +import { anthropicProviderPreset } from "@ccr/core/providers/presets/anthropic/index"; +import { bailianProviderPreset } from "@ccr/core/providers/presets/bailian/index"; +import { claudeApiProviderPreset } from "@ccr/core/providers/presets/claudeapi/index"; +import { code0ProviderPreset } from "@ccr/core/providers/presets/code0/index"; +import { deepSeekProviderPreset } from "@ccr/core/providers/presets/deepseek/index"; +import { fennoProviderPreset } from "@ccr/core/providers/presets/fenno/index"; +import { geminiProviderPreset } from "@ccr/core/providers/presets/gemini/index"; +import { kimiCodingProviderPreset } from "@ccr/core/providers/presets/kimi-coding/index"; +import { minimaxChinaProviderPreset, minimaxGlobalProviderPreset } from "@ccr/core/providers/presets/minimax/index"; +import { mistralProviderPreset } from "@ccr/core/providers/presets/mistral/index"; +import { moonshotChinaProviderPreset, moonshotGlobalProviderPreset } from "@ccr/core/providers/presets/moonshot/index"; +import { openaiProviderPreset } from "@ccr/core/providers/presets/openai/index"; +import { openRouterProviderPreset } from "@ccr/core/providers/presets/openrouter/index"; +import { qiniuAiProviderPreset } from "@ccr/core/providers/presets/qiniu-ai/index"; +import { runApiProviderPreset } from "@ccr/core/providers/presets/runapi/index"; +import { siliconFlowProviderPreset } from "@ccr/core/providers/presets/siliconflow/index"; +import { teamoRouterProviderPreset } from "@ccr/core/providers/presets/teamorouter/index"; +import { zaiGlobalCodingProviderPreset } from "@ccr/core/providers/presets/zai-global-coding/index"; +import { zaiGlobalGeneralProviderPreset } from "@ccr/core/providers/presets/zai-global-general/index"; +import { zhipuCnCodingProviderPreset } from "@ccr/core/providers/presets/zhipu-cn-coding/index"; +import { zhipuCnGeneralProviderPreset } from "@ccr/core/providers/presets/zhipu-cn-general/index"; import { findProviderPresetByBaseUrlInList, findProviderPresetInList, @@ -22,8 +27,8 @@ import { providerEndpointCanReceiveProviderApiKeyInList, providerIdentitySafetyIssueInList, providerPresetMatchesBaseUrl -} from "../../shared/provider-preset-utils"; -import type { ProviderIdentitySafetyIssue, ProviderPreset } from "../../shared/provider-presets"; +} from "@ccr/core/providers/presets/utils"; +import type { ProviderIdentitySafetyIssue, ProviderPreset } from "@ccr/core/providers/presets/types"; export const providerPresets: ProviderPreset[] = [ openaiProviderPreset, @@ -36,13 +41,19 @@ export const providerPresets: ProviderPreset[] = [ zhipuCnGeneralProviderPreset, zaiGlobalCodingProviderPreset, zaiGlobalGeneralProviderPreset, + minimaxGlobalProviderPreset, + minimaxChinaProviderPreset, mistralProviderPreset, moonshotChinaProviderPreset, moonshotGlobalProviderPreset, bailianProviderPreset, siliconFlowProviderPreset, + qiniuAiProviderPreset, + fennoProviderPreset, runApiProviderPreset, - teamoRouterProviderPreset + teamoRouterProviderPreset, + code0ProviderPreset, + claudeApiProviderPreset ]; export function getProviderPresets(): ProviderPreset[] { diff --git a/src/main/presets/kimi-coding/index.ts b/packages/core/src/providers/presets/kimi-coding/index.ts similarity index 87% rename from src/main/presets/kimi-coding/index.ts rename to packages/core/src/providers/presets/kimi-coding/index.ts index 6848c28..924fd10 100644 --- a/src/main/presets/kimi-coding/index.ts +++ b/packages/core/src/providers/presets/kimi-coding/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const kimiCodingProviderAccountConfig: ProviderAccountConfig = { connectors: [ diff --git a/packages/core/src/providers/presets/minimax/index.ts b/packages/core/src/providers/presets/minimax/index.ts new file mode 100644 index 0000000..f01fee0 --- /dev/null +++ b/packages/core/src/providers/presets/minimax/index.ts @@ -0,0 +1,44 @@ +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; +import { standardProviderAccountConfig } from "@ccr/core/providers/presets/types"; + +export const minimaxGlobalProviderPreset: ProviderPreset = { + account: standardProviderAccountConfig, + aliases: ["minimax", "minimax global"], + defaultModels: ["MiniMax-M3"], + endpoints: [ + { + baseUrl: "https://api.minimax.io/v1", + protocols: ["openai_chat_completions"], + websiteUrl: "https://platform.minimax.io/docs" + }, + { + baseUrl: "https://api.minimax.io/anthropic/v1", + protocols: ["anthropic_messages"], + websiteUrl: "https://platform.minimax.io/docs" + } + ], + id: "minimax-global", + name: "MiniMax (Global)", + websiteUrl: "https://platform.minimax.io/docs" +}; + +export const minimaxChinaProviderPreset: ProviderPreset = { + account: standardProviderAccountConfig, + aliases: ["minimax", "minimaxi", "minimax china"], + defaultModels: ["MiniMax-M3"], + endpoints: [ + { + baseUrl: "https://api.minimaxi.com/v1", + protocols: ["openai_chat_completions"], + websiteUrl: "https://platform.minimaxi.com/docs" + }, + { + baseUrl: "https://api.minimaxi.com/anthropic/v1", + protocols: ["anthropic_messages"], + websiteUrl: "https://platform.minimaxi.com/docs" + } + ], + id: "minimax-cn", + name: "MiniMax (China)", + websiteUrl: "https://platform.minimaxi.com/docs" +}; diff --git a/src/main/presets/mistral/index.ts b/packages/core/src/providers/presets/mistral/index.ts similarity index 87% rename from src/main/presets/mistral/index.ts rename to packages/core/src/providers/presets/mistral/index.ts index ff351f4..e12bc2b 100644 --- a/src/main/presets/mistral/index.ts +++ b/packages/core/src/providers/presets/mistral/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const mistralProviderAccountConfig: ProviderAccountConfig = { connectors: [ diff --git a/src/main/presets/moonshot/index.ts b/packages/core/src/providers/presets/moonshot/index.ts similarity index 95% rename from src/main/presets/moonshot/index.ts rename to packages/core/src/providers/presets/moonshot/index.ts index d6887f0..b4ea02d 100644 --- a/src/main/presets/moonshot/index.ts +++ b/packages/core/src/providers/presets/moonshot/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const moonshotGlobalProviderAccountConfig: ProviderAccountConfig = { connectors: [ diff --git a/src/main/presets/openai/index.ts b/packages/core/src/providers/presets/openai/index.ts similarity index 93% rename from src/main/presets/openai/index.ts rename to packages/core/src/providers/presets/openai/index.ts index e2d5cf9..a4ea97f 100644 --- a/src/main/presets/openai/index.ts +++ b/packages/core/src/providers/presets/openai/index.ts @@ -1,4 +1,4 @@ -import { defaultProviderAccountConfig, type ProviderPreset } from "../../../shared/provider-presets"; +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; export const openaiProviderPreset: ProviderPreset = { account: defaultProviderAccountConfig, diff --git a/src/main/presets/openrouter/index.ts b/packages/core/src/providers/presets/openrouter/index.ts similarity index 90% rename from src/main/presets/openrouter/index.ts rename to packages/core/src/providers/presets/openrouter/index.ts index 86d56da..7570322 100644 --- a/src/main/presets/openrouter/index.ts +++ b/packages/core/src/providers/presets/openrouter/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const openRouterProviderAccountConfig: ProviderAccountConfig = { connectors: [ diff --git a/packages/core/src/providers/presets/qiniu-ai/index.ts b/packages/core/src/providers/presets/qiniu-ai/index.ts new file mode 100644 index 0000000..36deee3 --- /dev/null +++ b/packages/core/src/providers/presets/qiniu-ai/index.ts @@ -0,0 +1,35 @@ +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; + +export const qiniuAiProviderPreset: ProviderPreset = { + account: defaultProviderAccountConfig, + aliases: ["qiniu", "qiniu ai", "qiniu cloud ai", "qiniu yun ai", "qiniu yun", "七牛云", "七牛云ai", "七牛云 ai", "modelink"], + endpoints: [ + { + baseUrl: "https://api.qnaigc.com", + label: "China mainland OpenAI", + protocols: ["openai_chat_completions"], + websiteUrl: "https://s.qiniu.com/AVjMVf" + }, + { + baseUrl: "https://api.qnaigc.com/bypass/openai/v1", + label: "China mainland OpenAI Responses", + protocols: ["openai_responses"], + websiteUrl: "https://s.qiniu.com/AVjMVf" + }, + { + baseUrl: "https://api.qnaigc.com", + label: "China mainland Anthropic", + protocols: ["anthropic_messages"], + websiteUrl: "https://s.qiniu.com/AVjMVf" + }, + { + baseUrl: "https://api.qnaigc.com/bypass/vertex/v1", + label: "China mainland Gemini Generate", + protocols: ["gemini_generate_content"], + websiteUrl: "https://s.qiniu.com/AVjMVf" + } + ], + id: "qiniu-ai", + name: "七牛云 AI", + websiteUrl: "https://s.qiniu.com/AVjMVf" +}; diff --git a/src/main/presets/runapi/index.ts b/packages/core/src/providers/presets/runapi/index.ts similarity index 91% rename from src/main/presets/runapi/index.ts rename to packages/core/src/providers/presets/runapi/index.ts index 1f19acb..5f982ab 100644 --- a/src/main/presets/runapi/index.ts +++ b/packages/core/src/providers/presets/runapi/index.ts @@ -1,4 +1,4 @@ -import { defaultProviderAccountConfig, type ProviderPreset } from "../../../shared/provider-presets"; +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; export const runApiProviderPreset: ProviderPreset = { account: defaultProviderAccountConfig, diff --git a/src/main/presets/siliconflow/index.ts b/packages/core/src/providers/presets/siliconflow/index.ts similarity index 89% rename from src/main/presets/siliconflow/index.ts rename to packages/core/src/providers/presets/siliconflow/index.ts index 737c338..a4af567 100644 --- a/src/main/presets/siliconflow/index.ts +++ b/packages/core/src/providers/presets/siliconflow/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const siliconFlowProviderAccountConfig: ProviderAccountConfig = { connectors: [ diff --git a/src/main/presets/teamorouter/index.ts b/packages/core/src/providers/presets/teamorouter/index.ts similarity index 92% rename from src/main/presets/teamorouter/index.ts rename to packages/core/src/providers/presets/teamorouter/index.ts index aa19e75..e7909fa 100644 --- a/src/main/presets/teamorouter/index.ts +++ b/packages/core/src/providers/presets/teamorouter/index.ts @@ -1,4 +1,4 @@ -import { defaultProviderAccountConfig, type ProviderPreset } from "../../../shared/provider-presets"; +import { defaultProviderAccountConfig, type ProviderPreset } from "@ccr/core/providers/presets/types"; export const teamoRouterProviderPreset: ProviderPreset = { account: defaultProviderAccountConfig, diff --git a/src/shared/provider-presets.ts b/packages/core/src/providers/presets/types.ts similarity index 97% rename from src/shared/provider-presets.ts rename to packages/core/src/providers/presets/types.ts index e004fff..c4811ff 100644 --- a/src/shared/provider-presets.ts +++ b/packages/core/src/providers/presets/types.ts @@ -1,4 +1,4 @@ -import type { GatewayProviderProtocol, ProviderAccountConfig } from "./app"; +import type { GatewayProviderProtocol, ProviderAccountConfig } from "@ccr/core/contracts/app"; export type ProviderPresetEndpoint = { baseUrl: string; diff --git a/packages/core/src/providers/presets/utils.ts b/packages/core/src/providers/presets/utils.ts new file mode 100644 index 0000000..e1e7f65 --- /dev/null +++ b/packages/core/src/providers/presets/utils.ts @@ -0,0 +1,147 @@ +import { + customProviderPresetId, + type ProviderIdentitySafetyIssue, + type ProviderPreset, + type ProviderPresetEndpoint +} from "@ccr/core/providers/presets/types"; +import { providerUrlWithDefaultScheme } from "@ccr/core/providers/url"; + +export function findProviderPresetInList( + presets: ProviderPreset[], + id: string | undefined +): ProviderPreset | undefined { + if (!id || id === customProviderPresetId) { + return undefined; + } + return presets.find((preset) => preset.id === id); +} + +export function findProviderPresetByBaseUrlInList( + presets: ProviderPreset[], + baseUrl: string +): ProviderPreset | undefined { + return presets.find((preset) => + providerPresetMatchesBaseUrl(preset, baseUrl) + ); +} + +export function findProviderPresetByIdentityInList( + presets: ProviderPreset[], + name: string | undefined +): ProviderPreset | undefined { + return findProviderPresetsByIdentity(presets, name)[0]; +} + +export function primaryProviderPresetEndpoint(preset: ProviderPreset): ProviderPresetEndpoint | undefined { + return preset.endpoints[0]; +} + +export function providerIdentitySafetyIssueInList( + _presets: ProviderPreset[], + input: { + baseUrl: string; + name?: string; + presetId?: string; + } +): ProviderIdentitySafetyIssue | undefined { + void input; + return undefined; +} + +export function providerApiKeySafetyIssueInList( + _presets: ProviderPreset[], + input: { + apiKey?: string; + baseUrl: string; + name?: string; + presetId?: string; + } +): ProviderIdentitySafetyIssue | undefined { + void input; + return undefined; +} + +export function providerPresetMatchesBaseUrl(preset: ProviderPreset, baseUrl: string): boolean { + return preset.endpoints.some((endpoint) => providerEndpointMatchesBaseUrl(endpoint.baseUrl, baseUrl)); +} + +export function providerEndpointCanReceiveProviderApiKeyInList( + _presets: ProviderPreset[], + input: { + apiKey?: string; + endpoint: string; + providerName?: string; + providerPresetId?: string; + } +): ProviderIdentitySafetyIssue | undefined { + void input; + return undefined; +} + +function findProviderPresetsByIdentity(presets: ProviderPreset[], name: string | undefined): ProviderPreset[] { + const normalizedName = normalizeProviderIdentityText(name); + if (!normalizedName) { + return []; + } + + return presets + .map((preset) => ({ + preset, + score: providerPresetIdentityMatchScore(preset, normalizedName) + })) + .filter((item) => item.score > 0) + .sort((left, right) => right.score - left.score) + .map((item) => item.preset); +} + +function providerPresetIdentityMatchScore(preset: ProviderPreset, normalizedName: string): number { + const identities = [preset.id, preset.name, ...preset.aliases] + .map(normalizeProviderIdentityText) + .filter(Boolean); + + return Math.max(0, ...identities.map((identity) => { + if (normalizedName === identity) { + return 10_000 + identity.length; + } + if (identity.length >= 4 && normalizedName.includes(identity)) { + return identity.length; + } + return 0; + })); +} + +function providerEndpointMatchesBaseUrl(endpointBaseUrl: string, baseUrl: string): boolean { + const endpoint = parseProviderPresetUrl(endpointBaseUrl); + const candidate = parseProviderPresetUrl(baseUrl); + if (!endpoint || !candidate) { + return false; + } + if (candidate.protocol !== endpoint.protocol || candidate.host !== endpoint.host) { + return false; + } + + const endpointPath = normalizeProviderPresetPath(endpoint.pathname); + const candidatePath = normalizeProviderPresetPath(candidate.pathname); + return endpointPath === "/" || + candidatePath === "/" || + candidatePath === endpointPath || + candidatePath.startsWith(`${endpointPath}/`) || + endpointPath.startsWith(`${candidatePath}/`); +} + +function parseProviderPresetUrl(value: string): URL | undefined { + try { + return new URL(providerUrlWithDefaultScheme(value.trim())); + } catch { + return undefined; + } +} + +function normalizeProviderPresetPath(value: string): string { + const trimmed = value.replace(/\/+$/, ""); + return trimmed || "/"; +} + +function normalizeProviderIdentityText(value: string | undefined): string { + return value?.trim().toLowerCase().replace(/[^a-z0-9\u4e00-\u9fff]+/g, "") ?? ""; +} diff --git a/src/main/presets/zai-global-coding/index.ts b/packages/core/src/providers/presets/zai-global-coding/index.ts similarity index 94% rename from src/main/presets/zai-global-coding/index.ts rename to packages/core/src/providers/presets/zai-global-coding/index.ts index d757fcc..24c0719 100644 --- a/src/main/presets/zai-global-coding/index.ts +++ b/packages/core/src/providers/presets/zai-global-coding/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig, ProviderAccountMappingConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig, ProviderAccountMappingConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const zaiQuotaMapping: ProviderAccountMappingConfig = { meters: [ diff --git a/src/main/presets/zai-global-general/index.ts b/packages/core/src/providers/presets/zai-global-general/index.ts similarity index 94% rename from src/main/presets/zai-global-general/index.ts rename to packages/core/src/providers/presets/zai-global-general/index.ts index 44612fd..377b564 100644 --- a/src/main/presets/zai-global-general/index.ts +++ b/packages/core/src/providers/presets/zai-global-general/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig, ProviderAccountMappingConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig, ProviderAccountMappingConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const zaiQuotaMapping: ProviderAccountMappingConfig = { meters: [ diff --git a/src/main/presets/zhipu-cn-coding/index.ts b/packages/core/src/providers/presets/zhipu-cn-coding/index.ts similarity index 94% rename from src/main/presets/zhipu-cn-coding/index.ts rename to packages/core/src/providers/presets/zhipu-cn-coding/index.ts index a28dda1..04540d2 100644 --- a/src/main/presets/zhipu-cn-coding/index.ts +++ b/packages/core/src/providers/presets/zhipu-cn-coding/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig, ProviderAccountMappingConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig, ProviderAccountMappingConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const zhipuQuotaMapping: ProviderAccountMappingConfig = { meters: [ diff --git a/src/main/presets/zhipu-cn-general/index.ts b/packages/core/src/providers/presets/zhipu-cn-general/index.ts similarity index 94% rename from src/main/presets/zhipu-cn-general/index.ts rename to packages/core/src/providers/presets/zhipu-cn-general/index.ts index c0c0e52..2db2f5d 100644 --- a/src/main/presets/zhipu-cn-general/index.ts +++ b/packages/core/src/providers/presets/zhipu-cn-general/index.ts @@ -1,5 +1,5 @@ -import type { ProviderAccountConfig, ProviderAccountMappingConfig } from "../../../shared/app"; -import type { ProviderPreset } from "../../../shared/provider-presets"; +import type { ProviderAccountConfig, ProviderAccountMappingConfig } from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; const zhipuQuotaMapping: ProviderAccountMappingConfig = { meters: [ diff --git a/src/main/provider-probe.ts b/packages/core/src/providers/probe.ts similarity index 91% rename from src/main/provider-probe.ts rename to packages/core/src/providers/probe.ts index aaf6d1f..3f6c7bd 100644 --- a/src/main/provider-probe.ts +++ b/packages/core/src/providers/probe.ts @@ -10,15 +10,20 @@ import type { GatewayProviderProbeRequest, GatewayProviderProbeResult, GatewayProviderProtocol -} from "../shared/app"; -import { providerApiKeySafetyIssue } from "./presets"; -import { fetchWithSystemProxy } from "./system-proxy-fetch"; +} from "@ccr/core/contracts/app"; +import { providerApiKeySafetyIssue } from "@ccr/core/providers/presets/index"; +import { fetchWithSystemProxy } from "@ccr/core/proxy/system-proxy-fetch"; import { compactProviderUrl, parseProviderBaseUrl, providerBaseUrlForProtocol, type ParsedProviderBaseUrl -} from "../shared/provider-url"; +} from "@ccr/core/providers/url"; +import { + detectedProviderFromHeaders, + newApiKeyUsageAccountConfig, + type DetectedProviderKind +} from "@ccr/core/providers/new-api"; type ModelSource = NonNullable; @@ -27,6 +32,8 @@ type ParsedProviderUrl = ParsedProviderBaseUrl & { }; type FetchJsonResult = { + detectedProvider?: DetectedProviderKind; + headers?: Record; payload?: unknown; status?: number; text: string; @@ -226,16 +233,21 @@ async function resolveGatewayProviderProbe(request: GatewayProviderProbeRequest) : typedModels; const protocolResults = await probeProtocols(parsed, request.apiKey, models, protocols, mode); const detectedProtocol = detectProtocol(parsed, protocolResults, modelProbe.source, protocols); + const normalizedBaseUrl = detectedProtocol + ? resolveProbeBaseUrl(parsed, detectedProtocol, protocolResults, modelProbe) + : parsed.normalizedInputBaseUrl; + const detectedProvider = detectProvider(protocolResults); + const account = detectedProvider === "new-api" ? newApiKeyUsageAccountConfig(normalizedBaseUrl) : undefined; return { + ...(account ? { account } : {}), capabilities: capabilitiesFromProtocolResults(protocolResults), + ...(detectedProvider ? { detectedProvider } : {}), detectedProtocol, modelDisplayNames: modelProbe.modelDisplayNames, modelSource: modelProbe.source, models: modelProbe.models, - normalizedBaseUrl: detectedProtocol - ? resolveProbeBaseUrl(parsed, detectedProtocol, protocolResults, modelProbe) - : parsed.normalizedInputBaseUrl, + normalizedBaseUrl, protocols: protocolResults }; } @@ -327,21 +339,30 @@ function providerProbeCapabilities( probe: GatewayProviderProbeResult ): GatewayProviderCapability[] { const detectedCapabilities = mergeProviderCapabilities(probe.capabilities ?? []); - if (detectedCapabilities.length > 0) { - return detectedCapabilities; - } + const presetCapabilities = providerProbePresetCapabilities(candidate); + return mergeProviderCapabilities(detectedCapabilities, presetCapabilities); +} +function providerProbePresetCapabilities(candidate: GatewayProviderProbeCandidate): GatewayProviderCapability[] { if (candidate.source !== "preset") { return []; } - return candidate.protocols.map((type) => ({ - baseUrl: probe.normalizedBaseUrl || candidate.baseUrl, + return uniqueProtocols(candidate.declaredProtocols ?? []).map((type) => ({ + baseUrl: providerProbeCandidateBaseUrlForProtocol(candidate.baseUrl, type), source: "preset" as const, type })); } +function providerProbeCandidateBaseUrlForProtocol(baseUrl: string, protocol: GatewayProviderProtocol): string { + try { + return providerBaseUrlForProtocol(parseProviderBaseUrl(baseUrl), protocol); + } catch { + return baseUrl.trim(); + } +} + function mergeProviderCapabilities(...groups: GatewayProviderCapability[][]): GatewayProviderCapability[] { const seen = new Set(); const capabilities: GatewayProviderCapability[] = []; @@ -444,7 +465,7 @@ async function fetchModelsForSource(parsed: ParsedProviderUrl, source: ModelSour }; } - const result = await requestJson(withGeminiKey(`${parsed.geminiBaseUrl}/v1beta/models`, apiKey), { + const result = await requestJson(withGeminiKey(geminiApiEndpoint(parsed.geminiBaseUrl, "models"), apiKey), { headers: { ...geminiHeaders(apiKey) }, @@ -491,6 +512,7 @@ async function probeProtocolSupport( const supported = isProviderProtocolEndpointSupportedForProbe(result.status, message, protocol, parsed.hints); const probeResult = { baseUrl: candidate.baseUrl, + ...(result.detectedProvider ? { detectedProvider: result.detectedProvider } : {}), endpoint: candidate.endpoint, message, protocol, @@ -539,6 +561,7 @@ async function probeProtocolConnectivity( const supported = isProtocolSupported(result.status, message, protocol); const probeResult = { baseUrl: candidate.baseUrl, + ...(result.detectedProvider ? { detectedProvider: result.detectedProvider } : {}), endpoint: candidate.endpoint, message, protocol, @@ -663,7 +686,10 @@ async function requestJson(url: string, init: RequestInit): Promise item.detectedProvider)?.detectedProvider; +} + +function responseHeadersRecord(headers: Headers): Record { + const record: Record = {}; + headers.forEach((value, key) => { + record[key] = value; + }); + return record; +} + function parseProviderUrl(value: string): ParsedProviderUrl { const parsed = parseProviderBaseUrl(value); const url = new URL(parsed.normalizedInputBaseUrl); @@ -724,11 +762,11 @@ function endpointsForProtocol( return [ { baseUrl: parsed.geminiBaseUrl, - endpoint: `${parsed.geminiBaseUrl}/v1beta/interactions` + endpoint: geminiApiEndpoint(parsed.geminiBaseUrl, "interactions", "v1beta") }, { baseUrl: parsed.geminiBaseUrl, - endpoint: `${parsed.geminiBaseUrl}/v1/interactions` + endpoint: geminiApiEndpoint(parsed.geminiBaseUrl, "interactions", "v1") } ]; } @@ -737,11 +775,19 @@ function endpointsForProtocol( return [ { baseUrl: parsed.geminiBaseUrl, - endpoint: `${parsed.geminiBaseUrl}/v1beta/models/${encodedModel}:generateContent` + endpoint: geminiApiEndpoint(parsed.geminiBaseUrl, `models/${encodedModel}:generateContent`) } ]; } +function geminiApiEndpoint(baseUrl: string, path: string, defaultVersion: "v1" | "v1beta" = "v1beta"): string { + const normalizedBaseUrl = baseUrl.replace(/\/+$/, ""); + if (/\/v1(?:beta)?$/i.test(normalizedBaseUrl)) { + return `${normalizedBaseUrl}/${path}`; + } + return `${normalizedBaseUrl}/${defaultVersion}/${path}`; +} + function withGeminiKey(url: string, apiKey: string | undefined): string { if (!apiKey) { return url; @@ -1047,18 +1093,7 @@ function isProtocolSupported( if (/not found|unknown endpoint|unknown route|no route/.test(normalized)) { return false; } - if (protocol === "openai_responses") { - return /model|max_output|max output|input|required/.test(normalized); - } - if (protocol === "openai_chat_completions" || protocol === "anthropic_messages") { - return /model|max_tokens|messages|required/.test(normalized); - } - if (protocol === "gemini_generate_content") { - return /contents|generatecontentrequest|generationconfig/.test(normalized); - } - if (protocol === "gemini_interactions") { - return /model|input|required|interaction|generation_config|generationconfig|system_instruction/.test(normalized); - } + return true; } return false; diff --git a/src/shared/provider-url.ts b/packages/core/src/providers/url.ts similarity index 89% rename from src/shared/provider-url.ts rename to packages/core/src/providers/url.ts index b105f2b..e3f66b3 100644 --- a/src/shared/provider-url.ts +++ b/packages/core/src/providers/url.ts @@ -1,4 +1,4 @@ -import type { GatewayProviderProtocol } from "./app"; +import type { GatewayProviderProtocol } from "@ccr/core/contracts/app"; export type ParsedProviderBaseUrl = { anthropicBaseUrl: string; @@ -39,7 +39,7 @@ export function parseProviderBaseUrl(value: string): ParsedProviderBaseUrl { return { anthropicBaseUrl, anthropicBaseUrlCandidates, - geminiBaseUrl: rootBaseUrl, + geminiBaseUrl: providerGeminiBaseUrl(normalizedInputBaseUrl, rootBaseUrl), normalizedInputBaseUrl, openaiBaseUrl, openaiBaseUrlCandidates, @@ -126,6 +126,27 @@ function stripProviderApiVersion(value: string): string { return compactProviderUrl(url); } +function providerGeminiBaseUrl(normalizedInputBaseUrl: string, rootBaseUrl: string): string { + return isVersionedVertexBypassBaseUrl(normalizedInputBaseUrl) + ? normalizedInputBaseUrl + : rootBaseUrl; +} + +function isVersionedVertexBypassBaseUrl(value: string): boolean { + try { + const url = new URL(value); + const segments = url.pathname + .split("/") + .map((segment) => segment.trim().toLowerCase()) + .filter(Boolean); + return segments.includes("bypass") && + segments.includes("vertex") && + /^(v1|v1beta)$/.test(segments[segments.length - 1] ?? ""); + } catch { + return false; + } +} + function stripNestedProviderApiVersion(pathname: string): string { return pathname.replace(/(\/v[0-9][a-z0-9-]*)\/v1$/i, "$1") || "/"; } diff --git a/src/server/proxy/certificates.ts b/packages/core/src/proxy/certificates.ts similarity index 99% rename from src/server/proxy/certificates.ts rename to packages/core/src/proxy/certificates.ts index ea5ae91..57bb1d6 100644 --- a/src/server/proxy/certificates.ts +++ b/packages/core/src/proxy/certificates.ts @@ -4,7 +4,7 @@ import net from "node:net"; import os from "node:os"; import path from "node:path"; import forge from "node-forge"; -import { CERTDIR, PROXY_CA_CERT_DER_FILE, PROXY_CA_CERT_FILE, PROXY_CA_KEY_FILE } from "../../main/constants"; +import { CERTDIR, PROXY_CA_CERT_DER_FILE, PROXY_CA_CERT_FILE, PROXY_CA_KEY_FILE } from "@ccr/core/config/constants"; const pki = forge.pki; const certificateDirectoryMode = 0o700; diff --git a/src/server/proxy/service.ts b/packages/core/src/proxy/service.ts similarity index 99% rename from src/server/proxy/service.ts rename to packages/core/src/proxy/service.ts index 4db90ff..8c8cfa0 100644 --- a/src/server/proxy/service.ts +++ b/packages/core/src/proxy/service.ts @@ -21,10 +21,10 @@ import type { ProxyNetworkSnapshot, ProxyRouteTarget, ProxyStatus -} from "../../shared/app"; -import { PROXY_CA_CERT_FILE } from "../../main/constants"; -import { windowsSystemCommand } from "../../main/windows-system"; -import { pluginService, type GatewayPluginProxyRouteMatch } from "../../main/plugins/service"; +} from "@ccr/core/contracts/app"; +import { PROXY_CA_CERT_FILE } from "@ccr/core/config/constants"; +import { windowsSystemCommand } from "@ccr/core/platform/windows-system"; +import { pluginService, type GatewayPluginProxyRouteMatch } from "@ccr/core/plugins/service"; import { createCertificateForHost, ensureProxyCertificateAuthority, @@ -36,8 +36,8 @@ import { readProxyCertificateFingerprintSha256, readProxyCertificateAuthority, type CertificateAuthority -} from "./certificates"; -import { formatUpstreamProxy, readCurrentSystemUpstreamProxy, systemProxyManager, type UpstreamProxyConfig, type UpstreamProxyServer } from "./system-proxy"; +} from "@ccr/core/proxy/certificates"; +import { formatUpstreamProxy, readCurrentSystemUpstreamProxy, systemProxyManager, type UpstreamProxyConfig, type UpstreamProxyServer } from "@ccr/core/proxy/system-proxy"; type MitmServer = { host: string; diff --git a/src/main/system-proxy-fetch.ts b/packages/core/src/proxy/system-proxy-fetch.ts similarity index 97% rename from src/main/system-proxy-fetch.ts rename to packages/core/src/proxy/system-proxy-fetch.ts index fd6d941..f1e10bc 100644 --- a/src/main/system-proxy-fetch.ts +++ b/packages/core/src/proxy/system-proxy-fetch.ts @@ -1,7 +1,7 @@ import { ProxyAgent, type Dispatcher } from "undici"; -import { loadAppConfig } from "./config"; -import { readCurrentSystemUpstreamProxy, systemProxyManager, type UpstreamProxyConfig, type UpstreamProxyServer } from "../server/proxy/system-proxy"; -import type { AppConfig } from "../shared/app"; +import { loadAppConfig } from "@ccr/core/config/config"; +import { readCurrentSystemUpstreamProxy, systemProxyManager, type UpstreamProxyConfig, type UpstreamProxyServer } from "@ccr/core/proxy/system-proxy"; +import type { AppConfig } from "@ccr/core/contracts/app"; type FetchInitWithDispatcher = RequestInit & { dispatcher?: Dispatcher; diff --git a/src/server/proxy/system-proxy.ts b/packages/core/src/proxy/system-proxy.ts similarity index 99% rename from src/server/proxy/system-proxy.ts rename to packages/core/src/proxy/system-proxy.ts index 90d91eb..c17f7e8 100644 --- a/src/server/proxy/system-proxy.ts +++ b/packages/core/src/proxy/system-proxy.ts @@ -1,9 +1,9 @@ import { execFile } from "node:child_process"; import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs"; import path from "node:path"; -import type { ProxySystemStatus } from "../../shared/app"; -import { DATADIR } from "../../main/constants"; -import { windowsSystemCommand } from "../../main/windows-system"; +import type { ProxySystemStatus } from "@ccr/core/contracts/app"; +import { DATADIR } from "@ccr/core/config/constants"; +import { windowsSystemCommand } from "@ccr/core/platform/windows-system"; export type UpstreamProxyServer = { host: string; diff --git a/packages/core/src/proxy/undici-proxy-agent.ts b/packages/core/src/proxy/undici-proxy-agent.ts new file mode 100644 index 0000000..e94e364 --- /dev/null +++ b/packages/core/src/proxy/undici-proxy-agent.ts @@ -0,0 +1 @@ +export { ProxyAgent } from "undici"; diff --git a/src/main/app-paths.ts b/packages/core/src/runtime/app-paths.ts similarity index 78% rename from src/main/app-paths.ts rename to packages/core/src/runtime/app-paths.ts index 5307b13..874977f 100644 --- a/src/main/app-paths.ts +++ b/packages/core/src/runtime/app-paths.ts @@ -33,6 +33,24 @@ export function resolveRuntimeAppPath(name: RuntimePathName): string { return fallbackUserDataDir(); } +export function resolveRuntimeConfigDir(): string { + if (process.platform === "win32") { + return path.join(resolveRuntimeAppPath("appData"), APP_STORAGE_NAME); + } + return path.join(resolveRuntimeAppPath("home"), `.${APP_STORAGE_NAME}`); +} + +export function resolveRuntimeDataDir(): string { + const configured = readConfiguredPath("userData"); + if (configured) { + return configured; + } + if (process.platform === "win32") { + return resolveRuntimeConfigDir(); + } + return path.join(resolveRuntimeConfigDir(), "app-data"); +} + function readConfiguredPath(name: RuntimePathName): string | undefined { const key = name === "home" ? homeDirEnv @@ -59,8 +77,5 @@ function fallbackAppDataDir(): string { } function fallbackUserDataDir(): string { - if (process.platform === "win32") { - return path.join(fallbackAppDataDir(), APP_STORAGE_NAME); - } - return path.join(LEGACY_CONFIGDIR, "app-data"); + return resolveRuntimeDataDir(); } diff --git a/src/main/storage-migration.ts b/packages/core/src/storage/migration.ts similarity index 100% rename from src/main/storage-migration.ts rename to packages/core/src/storage/migration.ts diff --git a/src/main/sqlite-native.ts b/packages/core/src/storage/sqlite-native.ts similarity index 100% rename from src/main/sqlite-native.ts rename to packages/core/src/storage/sqlite-native.ts diff --git a/src/main/usage-normalization.ts b/packages/core/src/usage/normalization.ts similarity index 97% rename from src/main/usage-normalization.ts rename to packages/core/src/usage/normalization.ts index a3dfa0b..e2355b8 100644 --- a/src/main/usage-normalization.ts +++ b/packages/core/src/usage/normalization.ts @@ -1,4 +1,4 @@ -import type { GatewayProviderProtocol } from "../shared/app"; +import type { GatewayProviderProtocol } from "@ccr/core/contracts/app"; export type UsageTokenAccounting = { cacheReadTokens?: number; diff --git a/src/main/usage-store.ts b/packages/core/src/usage/store.ts similarity index 83% rename from src/main/usage-store.ts rename to packages/core/src/usage/store.ts index 45cd1f9..1df1839 100644 --- a/src/main/usage-store.ts +++ b/packages/core/src/usage/store.ts @@ -1,10 +1,12 @@ -import { mkdirSync } from "node:fs"; +import { copyFileSync, existsSync, mkdirSync, rmSync } from "node:fs"; import { EventEmitter } from "node:events"; -import { dirname } from "node:path"; -import { USAGE_DB_FILE } from "./constants"; -import { estimateUsageCostUsd } from "./model-pricing-service"; -import { createBetterSqliteDatabase, type BetterSqliteDatabase } from "./sqlite-native"; -import { normalizeUsageInputTokens } from "./usage-normalization"; +import { randomBytes } from "node:crypto"; +import { tmpdir } from "node:os"; +import { dirname, join } from "node:path"; +import { REQUEST_LOGS_DB_FILE, USAGE_DB_FILE } from "@ccr/core/config/constants"; +import { estimateUsageCostUsd } from "@ccr/core/models/pricing-service"; +import { createBetterSqliteDatabase, type BetterSqliteDatabase } from "@ccr/core/storage/sqlite-native"; +import { normalizeUsageInputTokens } from "@ccr/core/usage/normalization"; import type { GatewayProviderProtocol, UsageComparisonRow, @@ -13,7 +15,7 @@ import type { UsageStatsRange, UsageStatsSnapshot, UsageTotals -} from "../shared/app"; +} from "@ccr/core/contracts/app"; type SqlDatabase = BetterSqliteDatabase; type SqlValue = bigint | Buffer | number | string | null; @@ -59,6 +61,10 @@ type UsageStatsQueryOptions = { includeProxy?: boolean; }; +type UsageStoreOptions = { + requestLogDbFile?: string; +}; + type UsageWhereClause = { params: SqlValue[]; where: string; @@ -90,6 +96,7 @@ type UsageSnapshot = UsageNumbers & { }; const usageEvents = new EventEmitter(); +const usageStatsRanges = new Set(["today", "24h", "7d", "30d"]); const emptyTotals: UsageTotals = { avgDurationMs: 0, cacheRatio: 0, @@ -106,8 +113,12 @@ const emptyTotals: UsageTotals = { export class UsageStore { private database?: SqlDatabase; private initPromise?: Promise; + private readonly requestLogDbFile?: string; + private requestLogBackfillFailureLogged = false; - constructor(private readonly dbFile: string) {} + constructor(private readonly dbFile: string, options: UsageStoreOptions = {}) { + this.requestLogDbFile = options.requestLogDbFile; + } async record(event: UsageEventInput): Promise { const database = await this.getDatabase(); @@ -175,10 +186,12 @@ export class UsageStore { usageEvents.emit("recorded"); } - async getStats(range: UsageStatsRange = "7d", filter: UsageStatsFilter = {}): Promise { + async getStats(range: UsageStatsRange | null | undefined = "7d", filter: UsageStatsFilter | null | undefined = {}): Promise { const database = await this.getDatabase(); const now = new Date(); - const since = getRangeSince(range, now); + const normalizedRange = normalizeUsageRange(range); + const since = getRangeSince(normalizedRange, now); + this.backfillFromRequestLogs(database, since); const query = buildUsageWhereClause(since, filter); return { @@ -186,15 +199,16 @@ export class UsageStore { generatedAt: now.toISOString(), models: readModelRows(database, query), providerModels: readProviderModelRows(database, query), - range, + range: normalizedRange, recentRequests: readRecentRequestRows(database, query), - series: readUsageSeries(database, range, now, query), + series: readUsageSeries(database, normalizedRange, now, query), totals: readUsageTotals(database, query) }; } - async getTotalsSince(since: Date, filter: UsageStatsFilter = {}, options: UsageStatsQueryOptions = {}): Promise { + async getTotalsSince(since: Date, filter: UsageStatsFilter | null | undefined = {}, options: UsageStatsQueryOptions | null | undefined = {}): Promise { const database = await this.getDatabase(); + this.backfillFromRequestLogs(database, since); return readUsageTotals(database, buildUsageWhereClause(since, filter, options)); } @@ -242,9 +256,100 @@ export class UsageStore { this.database = database; return database; } + + private backfillFromRequestLogs(database: SqlDatabase, since: Date): void { + const requestLogDbFile = this.requestLogDbFile; + if (!requestLogDbFile || !existsSync(requestLogDbFile)) { + return; + } + + let tempRequestLogDbFile: string | undefined; + try { + try { + this.backfillFromAttachedRequestLog(database, requestLogDbFile, since); + } catch { + tempRequestLogDbFile = copySqliteDatabaseToTemp(requestLogDbFile); + this.backfillFromAttachedRequestLog(database, tempRequestLogDbFile, since); + } + this.requestLogBackfillFailureLogged = false; + } catch (error) { + if (!this.requestLogBackfillFailureLogged) { + console.warn(`[usage] Failed to backfill usage from request logs: ${formatError(error)}`); + this.requestLogBackfillFailureLogged = true; + } + } finally { + if (tempRequestLogDbFile) { + cleanupSqliteTempCopy(tempRequestLogDbFile); + } + } + } + + private backfillFromAttachedRequestLog(database: SqlDatabase, requestLogDbFile: string, since: Date): void { + database.exec(`ATTACH DATABASE ${sqlString(requestLogDbFile)} AS request_log_source`); + try { + database.prepare(` + INSERT INTO usage_events ( + created_at, + request_id, + client, + method, + path, + model, + provider, + credential_id, + status_code, + duration_ms, + input_tokens, + output_tokens, + cache_read_tokens, + cache_write_tokens, + total_tokens, + cost_usd, + cost_source + ) + SELECT + logs.created_at, + logs.request_id, + logs.client, + logs.method, + logs.path, + logs.model, + logs.provider, + logs.credential_id, + logs.status_code, + logs.duration_ms, + logs.input_tokens, + logs.output_tokens, + logs.cache_read_tokens, + logs.cache_write_tokens, + logs.total_tokens, + logs.cost_usd, + 'request_log' + FROM request_log_source.request_logs AS logs + WHERE logs.source_usage_id IS NULL + AND logs.path NOT LIKE ? + AND logs.created_at >= ? + AND NOT EXISTS ( + SELECT 1 + FROM usage_events AS existing + WHERE ( + logs.request_id <> '' + AND existing.request_id = logs.request_id + ) OR ( + logs.request_id = '' + AND existing.created_at = logs.created_at + AND existing.path = logs.path + AND existing.model = logs.model + ) + ) + `).run("%/count_tokens%", since.toISOString()); + } finally { + database.exec("DETACH DATABASE request_log_source"); + } + } } -export const usageStore = new UsageStore(USAGE_DB_FILE); +export const usageStore = new UsageStore(USAGE_DB_FILE, { requestLogDbFile: REQUEST_LOGS_DB_FILE }); export function onUsageRecorded(listener: () => void): () => void { usageEvents.on("recorded", listener); @@ -284,16 +389,16 @@ function ensureUsageSchema(database: SqlDatabase): void { database.exec("CREATE INDEX IF NOT EXISTS usage_events_credential_created_at_idx ON usage_events(credential_id, created_at)"); } -export async function getUsageStats(range?: UsageStatsRange, filter?: UsageStatsFilter): Promise { +export async function getUsageStats(range?: UsageStatsRange | null, filter?: UsageStatsFilter | null): Promise { try { return await usageStore.getStats(range, filter); } catch (error) { console.warn(`[usage] Failed to read usage stats: ${formatError(error)}`); - return emptySnapshot(range ?? "7d"); + return emptySnapshot(normalizeUsageRange(range)); } } -export async function getTodayUsageTotals(filter?: UsageStatsFilter, options?: UsageStatsQueryOptions): Promise { +export async function getTodayUsageTotals(filter?: UsageStatsFilter | null, options?: UsageStatsQueryOptions | null): Promise { try { return await usageStore.getTotalsSince(floorDay(new Date()), filter, options); } catch (error) { @@ -302,7 +407,7 @@ export async function getTodayUsageTotals(filter?: UsageStatsFilter, options?: U } } -export async function getUsageTotalsSince(since: Date, filter?: UsageStatsFilter, options?: UsageStatsQueryOptions): Promise { +export async function getUsageTotalsSince(since: Date, filter?: UsageStatsFilter | null, options?: UsageStatsQueryOptions | null): Promise { try { return await usageStore.getTotalsSince(since, filter, options); } catch (error) { @@ -346,19 +451,21 @@ export async function recordGatewayUsageCapture(input: UsageCaptureInput): Promi function buildUsageWhereClause( since: Date, - filter: UsageStatsFilter, - options: UsageStatsQueryOptions = {} + filter: UsageStatsFilter | null | undefined, + options: UsageStatsQueryOptions | null | undefined = {} ): UsageWhereClause { + const normalizedFilter = normalizeUsageFilter(filter); + const normalizedOptions = normalizeUsageQueryOptions(options); const where = ["created_at >= ?"]; const params: SqlValue[] = [since.toISOString()]; - const credential = normalizeFilterValue(filter.credential); - const provider = normalizeFilterValue(filter.provider); - const model = normalizeFilterValue(filter.model); + const credential = normalizeFilterValue(normalizedFilter.credential); + const provider = normalizeFilterValue(normalizedFilter.provider); + const model = normalizeFilterValue(normalizedFilter.model); if (provider) { where.push("provider = ?"); params.push(provider); - } else if (!options.includeProxy && filter.includeProxy !== true) { + } else if (!normalizedOptions.includeProxy && normalizedFilter.includeProxy !== true) { where.push("provider <> ?"); params.push("proxy"); } @@ -377,6 +484,26 @@ function buildUsageWhereClause( }; } +function normalizeUsageRange(range: UsageStatsRange | null | undefined): UsageStatsRange { + return range && usageStatsRanges.has(range) ? range : "7d"; +} + +function normalizeUsageFilter(filter: UsageStatsFilter | null | undefined): UsageStatsFilter { + if (!isRecord(filter)) { + return {}; + } + return { + credential: typeof filter.credential === "string" ? filter.credential : undefined, + includeProxy: filter.includeProxy === true, + model: typeof filter.model === "string" ? filter.model : undefined, + provider: typeof filter.provider === "string" ? filter.provider : undefined + }; +} + +function normalizeUsageQueryOptions(options: UsageStatsQueryOptions | null | undefined): UsageStatsQueryOptions { + return isRecord(options) && options.includeProxy === true ? { includeProxy: true } : {}; +} + function configureSqliteDatabase(database: SqlDatabase): void { database.pragma("journal_mode = WAL"); database.pragma("synchronous = NORMAL"); @@ -387,6 +514,28 @@ function queryRows(database: SqlDatabase, sql: string, params: SqlValue[] = []): return database.prepare(sql).all(...params) as Record[]; } +function sqlString(value: string): string { + return `'${value.replace(/'/g, "''")}'`; +} + +function copySqliteDatabaseToTemp(file: string): string { + const target = join(tmpdir(), `ccr-request-logs-${process.pid}-${Date.now()}-${randomBytes(4).toString("hex")}.sqlite`); + copyFileSync(file, target); + for (const suffix of ["-wal", "-shm"]) { + const source = `${file}${suffix}`; + if (existsSync(source)) { + copyFileSync(source, `${target}${suffix}`); + } + } + return target; +} + +function cleanupSqliteTempCopy(file: string): void { + for (const item of [file, `${file}-wal`, `${file}-shm`]) { + rmSync(item, { force: true }); + } +} + function toStoredUsageEvent(row: Record): StoredUsageEvent { return { cacheReadTokens: normalizeCount(row.cache_read_tokens), diff --git a/src/main/web-management-server.ts b/packages/core/src/web/management-server.ts similarity index 92% rename from src/main/web-management-server.ts rename to packages/core/src/web/management-server.ts index 6b31ff3..cf3f787 100644 --- a/src/main/web-management-server.ts +++ b/packages/core/src/web/management-server.ts @@ -5,29 +5,29 @@ import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "no import net from "node:net"; import os from "node:os"; import path from "node:path"; -import { pathToFileURL } from "node:url"; import packageJson from "../../package.json"; -import { loadPersistedAppSetting, replacePersistedAppSetting } from "./app-config-store"; -import { scanBotHandoffBluetoothTargets, scanBotHandoffWifiTargets } from "./bot-handoff-scan-service"; -import { cancelBotGatewayQrLogin, startBotGatewayQrLogin, waitBotGatewayQrLogin } from "./bot-gateway-qr-login-service"; -import { syncClaudeAppGatewayConfig, restoreClaudeAppGatewayConfig } from "./claude-app-gateway-service"; -import { loadAppConfig, saveApiKeysConfig, saveAppConfig } from "./config"; -import { API_KEYS_DB_FILE, APP_CONFIG_DB_FILE, APP_NAME, CONFIGDIR, CONFIG_FILE, DATADIR, GATEWAY_CONFIG_FILE, LEGACY_CONFIG_FILE, ONBOARDING_FINISHED_FILE, PROXY_CA_CERT_FILE, REQUEST_LOGS_DB_FILE, USAGE_DB_FILE } from "./constants"; -import { detectProviderIcon } from "./provider-icons"; -import { fetchProviderManifest } from "./provider-manifest-service"; -import { getLocalAgentProviderCandidates, importLocalAgentProvider } from "./local-agent-provider-service"; -import { getProviderCatalogModels } from "./provider-model-catalog"; -import { getProviderPresets } from "./presets"; -import { checkGatewayProviderConnectivity, probeGatewayProvider, probeGatewayProviderCandidates } from "./provider-probe"; -import { applyProfileConfig } from "./profile-service"; -import { getProfileOpenCommand, getProfileRuntimeStatus, openProfileFromCcr, stopProfileFromCcr } from "./profile-launch-service"; -import { ensureProxyCertificateAuthority } from "../server/proxy/certificates"; -import { proxyService } from "../server/proxy/service"; -import { listMcpServerTools } from "../server/mcp/tool-discovery"; -import { getAgentAnalysis, getAgentTracePayload, getRequestLogDetail, getRequestLogs } from "./request-log-store"; -import { getUsageStats } from "./usage-store"; -import { gatewayService } from "../server/gateway/service"; -import { getProviderAccountSnapshots, invalidateProviderAccountSnapshotCache, resetCodexRateLimitCredit, testProviderAccountConnector } from "./provider-account-service"; +import { loadPersistedAppSetting, replacePersistedAppSetting } from "@ccr/core/config/app-config-store"; +import { scanBotHandoffBluetoothTargets, scanBotHandoffWifiTargets } from "@ccr/core/agents/bot-gateway/handoff-scan-service"; +import { cancelBotGatewayQrLogin, startBotGatewayQrLogin, waitBotGatewayQrLogin } from "@ccr/core/agents/bot-gateway/qr-login-service"; +import { syncClaudeAppGatewayConfig, restoreClaudeAppGatewayConfig } from "@ccr/core/agents/claude-app/gateway-service"; +import { loadAppConfig, saveApiKeysConfig, saveAppConfig } from "@ccr/core/config/config"; +import { API_KEYS_DB_FILE, APP_CONFIG_DB_FILE, APP_NAME, CONFIGDIR, CONFIG_FILE, DATADIR, GATEWAY_CONFIG_FILE, LEGACY_CONFIG_FILE, ONBOARDING_FINISHED_FILE, PROXY_CA_CERT_FILE, REQUEST_LOGS_DB_FILE, USAGE_DB_FILE } from "@ccr/core/config/constants"; +import { detectProviderIcon } from "@ccr/core/providers/icons"; +import { fetchProviderManifest } from "@ccr/core/providers/manifest-service"; +import { getLocalAgentProviderCandidates, importLocalAgentProvider, probeLocalAgentProvider } from "@ccr/core/agents/local-providers/service"; +import { getProviderCatalogModels } from "@ccr/core/providers/model-catalog"; +import { getProviderPresets } from "@ccr/core/providers/presets/index"; +import { checkGatewayProviderConnectivity, probeGatewayProvider, probeGatewayProviderCandidates } from "@ccr/core/providers/probe"; +import { applyProfileConfig } from "@ccr/core/profiles/service"; +import { getProfileOpenCommand, getProfileRuntimeStatus, openProfileFromCcr, stopProfileFromCcr } from "@ccr/core/profiles/launch-service"; +import { ensureProxyCertificateAuthority } from "@ccr/core/proxy/certificates"; +import { proxyService } from "@ccr/core/proxy/service"; +import { listMcpServerTools } from "@ccr/core/mcp/tool-discovery"; +import { getAgentAnalysis, getAgentTracePayload, getRequestLogDetail, getRequestLogs } from "@ccr/core/observability/request-log-store"; +import { getUsageStats } from "@ccr/core/usage/store"; +import { gatewayService } from "@ccr/core/gateway/service"; +import { shouldRestartGatewayForRuntimeConfigChange } from "@ccr/core/gateway/runtime-change"; +import { getProviderAccountSnapshots, invalidateProviderAccountSnapshotCache, resetCodexRateLimitCredit, testProviderAccountConnector } from "@ccr/core/providers/account-service"; import type { AgentAnalysisFilter, AgentAnalysisTracePayloadRequest, @@ -47,6 +47,7 @@ import type { GatewayProviderProbeRequest, GatewayStatus, LocalAgentProviderImportRequest, + LocalAgentProviderProbeRequest, PluginDependency, PluginDirectorySelection, PluginMarketplaceEntry, @@ -62,9 +63,10 @@ import type { RequestLogListFilter, UsageStatsFilter, UsageStatsRange -} from "../shared/app"; +} from "@ccr/core/contracts/app"; export type WebManagementServerOptions = { + authToken?: string; host?: string; open?: boolean; port?: number; @@ -124,7 +126,7 @@ const pluginMarketplace: PluginMarketplaceEntry[] = [ export async function startWebManagementServer(options: WebManagementServerOptions = {}): Promise { const host = options.host?.trim() || readEnvString("CCR_WEB_HOST") || defaultWebHost; const requestedPort = options.port ?? readEnvPort("CCR_WEB_PORT") ?? defaultWebPort; - const authToken = randomBytes(32).toString("base64url"); + const authToken = options.authToken?.trim() || readEnvString("CCR_WEB_AUTH_TOKEN") || randomBytes(32).toString("base64url"); let security: WebManagementSecurityContext | undefined; const server = createServer((request, response) => { if (!security) { @@ -246,7 +248,7 @@ const rpcHandlers: Record = { const synced = await syncClaudeAppGatewayConfig(baseConfig); const savedConfig = synced.config; let runtimeStatus = gatewayService.getStatus(); - if (synced.configChanged || shouldRestartForRuntimeChange(previousConfig, savedConfig) || runtimeStatus.state !== "running") { + if (synced.configChanged || shouldRestartGatewayForRuntimeConfigChange(previousConfig, savedConfig) || runtimeStatus.state !== "running") { runtimeStatus = await gatewayService.start(savedConfig); } else { gatewayService.updateConfig(savedConfig); @@ -276,6 +278,13 @@ const rpcHandlers: Record = { getAppInfo: () => getCliAppInfo(), getConfig: () => loadAppConfig(), getGatewayStatus: () => gatewayService.getStatus(), + getServiceIdentity: (serviceToken) => ({ + pid: process.pid, + serviceTokenConfigured: Boolean(process.env.CCR_SERVICE_INSTANCE_TOKEN?.trim()), + serviceTokenMatches: typeof serviceToken === "string" && + Boolean(serviceToken.trim()) && + serviceToken === process.env.CCR_SERVICE_INSTANCE_TOKEN + }), getLocalAgentProviderCandidates: () => getLocalAgentProviderCandidates(), getOnboardingFinished: async () => Boolean(readString(await loadPersistedAppSetting(onboardingFinishedAtSettingKey)) || existsSync(ONBOARDING_FINISHED_FILE)), getPluginMarketplace: () => pluginMarketplace, @@ -332,6 +341,7 @@ const rpcHandlers: Record = { logProfileApplyResult(await applyProfileConfig(config)); return openProfileFromCcr(config, request as ProfileOpenRequest); }, + probeLocalAgentProvider: (request) => probeLocalAgentProvider(request as LocalAgentProviderProbeRequest), probeProvider: (request) => probeGatewayProvider(request as GatewayProviderProbeRequest), probeProviderCandidates: (request) => probeGatewayProviderCandidates(request as GatewayProviderProbeCandidatesRequest), quitApp: async () => { @@ -378,7 +388,7 @@ const rpcHandlers: Record = { const syncedClaudeAppConfig = await syncClaudeAppGatewayConfig(savedConfig); savedConfig = syncedClaudeAppConfig.config; let runtimeStatus = gatewayService.getStatus(); - if (syncedClaudeAppConfig.configChanged || shouldRestartForRuntimeChange(previousConfig, savedConfig)) { + if (syncedClaudeAppConfig.configChanged || shouldRestartGatewayForRuntimeConfigChange(previousConfig, savedConfig)) { runtimeStatus = await gatewayService.start(savedConfig); } else { gatewayService.updateConfig(savedConfig); @@ -470,27 +480,6 @@ function logProfileApplyResult(result: ProfileApplyResult): void { } } -function shouldRestartForRuntimeChange(previousConfig: AppConfig, nextConfig: AppConfig): boolean { - return ( - previousConfig.gateway.enabled !== nextConfig.gateway.enabled || - previousConfig.gateway.host !== nextConfig.gateway.host || - previousConfig.gateway.port !== nextConfig.gateway.port || - previousConfig.gateway.coreHost !== nextConfig.gateway.coreHost || - previousConfig.gateway.corePort !== nextConfig.gateway.corePort || - previousConfig.proxy.enabled !== nextConfig.proxy.enabled || - previousConfig.proxy.host !== nextConfig.proxy.host || - previousConfig.proxy.mode !== nextConfig.proxy.mode || - previousConfig.proxy.port !== nextConfig.proxy.port || - previousConfig.proxy.systemProxy !== nextConfig.proxy.systemProxy || - JSON.stringify(previousConfig.proxy.targets) !== JSON.stringify(nextConfig.proxy.targets) || - JSON.stringify(previousConfig.agent) !== JSON.stringify(nextConfig.agent) || - JSON.stringify(previousConfig.Providers) !== JSON.stringify(nextConfig.Providers) || - JSON.stringify(previousConfig.plugins) !== JSON.stringify(nextConfig.plugins) || - JSON.stringify(previousConfig.providerPlugins) !== JSON.stringify(nextConfig.providerPlugins) || - JSON.stringify(previousConfig.virtualModelProfiles) !== JSON.stringify(nextConfig.virtualModelProfiles) - ); -} - function getCliAppInfo(): AppInfo { return { appConfigDbFile: APP_CONFIG_DB_FILE, @@ -1040,20 +1029,38 @@ async function revealFile(file: string): Promise { await execDetached("explorer.exe", ["/select,", file]); return; } - await openSystemExternal(pathToFileURL(path.dirname(file)).toString()); + await execDetached("xdg-open", [path.dirname(file)]); } -function openSystemExternal(target: string): Promise { - if (!target || target === "about:blank") { +export function openSystemExternal(target: string): Promise { + const url = normalizeExternalHttpTarget(target); + if (!url) { return Promise.resolve(); } if (process.platform === "darwin") { - return execDetached("/usr/bin/open", [target]); + return execDetached("/usr/bin/open", [url]); } if (process.platform === "win32") { - return execDetached("cmd.exe", ["/d", "/s", "/c", "start", "", target]); + return execDetached("rundll32.exe", ["url.dll,FileProtocolHandler", url]); } - return execDetached("xdg-open", [target]); + return execDetached("xdg-open", [url]); +} + +export function normalizeExternalHttpTarget(target: unknown): string | undefined { + const trimmed = typeof target === "string" ? target.trim() : ""; + if (!trimmed || trimmed === "about:blank") { + return undefined; + } + let url: URL; + try { + url = new URL(trimmed); + } catch { + throw new Error("External URL must be a valid absolute URL."); + } + if (url.protocol !== "http:" && url.protocol !== "https:") { + throw new Error("Only http and https URLs can be opened."); + } + return url.toString(); } function execDetached(command: string, args: string[]): Promise { diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json new file mode 100644 index 0000000..1f70006 --- /dev/null +++ b/packages/core/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "rootDir": "src" + }, + "include": ["src/**/*.ts", "src/**/*.d.ts"] +} diff --git a/assets/logo.png b/packages/electron/assets/logo.png similarity index 100% rename from assets/logo.png rename to packages/electron/assets/logo.png diff --git a/assets/tray-cyan.png b/packages/electron/assets/tray-cyan.png similarity index 100% rename from assets/tray-cyan.png rename to packages/electron/assets/tray-cyan.png diff --git a/assets/tray-orange.png b/packages/electron/assets/tray-orange.png similarity index 100% rename from assets/tray-orange.png rename to packages/electron/assets/tray-orange.png diff --git a/assets/tray-violet.png b/packages/electron/assets/tray-violet.png similarity index 100% rename from assets/tray-violet.png rename to packages/electron/assets/tray-violet.png diff --git a/assets/tray.png b/packages/electron/assets/tray.png similarity index 100% rename from assets/tray.png rename to packages/electron/assets/tray.png diff --git a/packages/electron/package.json b/packages/electron/package.json new file mode 100644 index 0000000..1e55555 --- /dev/null +++ b/packages/electron/package.json @@ -0,0 +1,13 @@ +{ + "name": "@claude-code-router/electron", + "version": "3.0.11", + "private": true, + "description": "Claude Code Router Electron desktop shell.", + "main": "dist/main/main.js", + "dependencies": { + "better-sqlite3": "^12.11.1" + }, + "devDependencies": { + "electron-updater": "^6.8.9" + } +} diff --git a/src/main/app-menu.ts b/packages/electron/src/main/app-menu.ts similarity index 98% rename from src/main/app-menu.ts rename to packages/electron/src/main/app-menu.ts index de2f219..b601dbc 100644 --- a/src/main/app-menu.ts +++ b/packages/electron/src/main/app-menu.ts @@ -1,5 +1,5 @@ import { app, dialog, Menu, type BrowserWindow, type MenuItemConstructorOptions } from "electron"; -import { APP_NAME, IPC_CHANNELS } from "./constants"; +import { APP_NAME, IPC_CHANNELS } from "@ccr/core/config/constants"; import windowsManager from "./windows"; export function setupApplicationMenu(): void { diff --git a/src/main/bot-gateway-qr-window-service.ts b/packages/electron/src/main/bot-gateway-qr-window-service.ts similarity index 98% rename from src/main/bot-gateway-qr-window-service.ts rename to packages/electron/src/main/bot-gateway-qr-window-service.ts index d020130..a65d490 100644 --- a/src/main/bot-gateway-qr-window-service.ts +++ b/packages/electron/src/main/bot-gateway-qr-window-service.ts @@ -4,7 +4,7 @@ import type { BotGatewayQrWindowCloseResult, BotGatewayQrWindowOpenRequest, BotGatewayQrWindowOpenResult -} from "../shared/app"; +} from "@ccr/core/contracts/app"; const qrWindows = new Map(); diff --git a/packages/electron/src/main/browser-automation-mcp.ts b/packages/electron/src/main/browser-automation-mcp.ts new file mode 100644 index 0000000..10f8558 --- /dev/null +++ b/packages/electron/src/main/browser-automation-mcp.ts @@ -0,0 +1,3544 @@ +import type { IncomingMessage, ServerResponse } from "node:http"; +import { randomUUID } from "node:crypto"; +import type { Event as ElectronEvent, WebContents } from "electron"; +import { loadAppConfig } from "@ccr/core/config/config"; +import type { + BuiltInBrowserAutomationHandoff, + BuiltInBrowserAutomationHandoffKind, + BuiltInBrowserState, + BuiltInBrowserTabState +} from "@ccr/core/contracts/app"; +import type { BrowserAutomationMcpIntegration } from "@ccr/core/gateway/service"; +import { BROWSER_AUTOMATION_MCP_PATH } from "@ccr/core/mcp/toolhub-config"; +import { builtInBrowserService, type BrowserAutomationEvent } from "./built-in-browser"; +import { chromeLoginImportService } from "./chrome-login-import"; + +type JsonPrimitive = boolean | null | number | string; +type JsonValue = JsonPrimitive | JsonValue[] | { [key: string]: JsonValue }; + +type JsonRpcRequest = { + id?: null | number | string; + jsonrpc?: string; + method?: string; + params?: unknown; +}; + +type JsonRpcResponse = + | { + id: null | number | string; + jsonrpc: "2.0"; + result: JsonValue; + } + | { + error: { + code: number; + data?: JsonValue; + message: string; + }; + id: null | number | string; + jsonrpc: "2.0"; + }; + +type McpTool = { + description: string; + inputSchema: JsonValue; + name: string; + tags?: string[]; + title?: string; +}; + +type ToolCallResult = { + content: Array<{ text: string; type: "text" }>; + isError?: boolean; +}; + +type BrowserTarget = { + axNodeId?: string; + backendNodeId?: number; + exact?: boolean; + index?: number; + ref?: string; + role?: string; + selector?: string; + text?: string; +}; + +type BrowserSessionRef = { + frameId?: string; + sessionId: string; + tabId: string; + userId?: string; +}; + +type SnapshotOptions = { + limit?: number; + maxElements: number; + maxText?: number; + offset?: number; +}; + +type AttachedSession = { + attachedAt: number; + leaseId: string; + observeOnly: boolean; + ref: BrowserSessionRef; +}; + +type EventSubscription = { + channels: Set; + dropped: boolean; + events: BrowserAutomationEvent[]; + ref?: BrowserSessionRef; + redactTextInput: boolean; + sampleMouseMove: boolean; + startedAt: number; + subscriptionId: string; + unsubscribe: () => void; +}; + +type AxSnapshotResult = { + handoff?: BuiltInBrowserAutomationHandoff; + handoffRequired?: boolean; + humanHelp?: Record; + humanHelpRequired?: boolean; + nextAction?: "human_help"; + nodes: Array>; + scope: string; + session: BrowserSessionRef; + title: string; + url: string; +}; + +type BrowserHandoffDetection = { + kind: BuiltInBrowserAutomationHandoffKind; + message: string; + reason: string; +}; + +type ReadinessResult = { + matched: boolean; + matchedEvent?: string; + navigationError?: { + errorCode?: number; + errorDescription?: string; + url?: string; + }; + readinessUrl?: string; + timedOut: boolean; +}; + +type ReadinessEvent = { + errorCode?: number; + errorDescription?: string; + isMainFrame?: boolean; + type: string; + url?: string; +}; + +type NavigationReadinessContext = { + expectedUrl?: string; + previousUrl?: string; +}; + +const protocolVersion = "2024-11-05"; +const automationEventReplayMs = 15_000; +const defaultAxSnapshotLimit = 60; +const defaultSnapshotMaxElements = 80; +const defaultSnapshotMaxText = 3_000; +const defaultEventAwaitTimeoutMs = 10_000; +const defaultJavascriptTimeoutMs = 8_000; +const maxSnapshotTextLimit = 20_000; +const maxSnapshotTextOffset = 1_000_000_000; +const maxMcpRequestBytes = 2 * 1024 * 1024; +const maxSubscriptionEvents = 512; +const maxToolResultChars = 60_000; +const maxToolResultArrayItems = 120; +const maxToolResultStringChars = 2_000; +const maxToolResultObjectKeys = 120; +const maxSnapshotResultElements = 80; +const maxAxSnapshotResultNodes = 80; +const maxBrowserResultTextChars = maxSnapshotTextLimit; +const defaultWaitTimeoutMs = 10_000; + +const sessionSchema = objectSchema({ + frameId: { description: "Optional frame id. CCR currently targets the main frame.", type: "string" }, + sessionId: { description: "Browser automation session id.", type: "string" }, + tabId: { description: "Built-in browser tab id.", type: "string" }, + userId: { description: "Optional logical user id.", type: "string" } +}, ["sessionId", "tabId"]); + +const cursorSchema = objectSchema({ + dropped: { description: "Whether earlier events were dropped before this cursor.", type: "boolean" }, + seq: { description: "Last observed event sequence.", type: "number" }, + subscriptionId: { description: "Event subscription id.", type: "string" }, + ts: { description: "Last observed event timestamp.", type: "number" } +}, ["subscriptionId", "seq"]); + +const targetSchema = objectSchema({ + axNodeId: { description: "Accessibility node id returned by browser_ax_snapshot/query. In CCR this is a stable element ref.", type: "string" }, + backendNodeId: { description: "Reserved for CDP-compatible clients. CSS/ref targeting is preferred in CCR.", type: "number" }, + exact: { description: "Match text/name exactly instead of by substring.", type: "boolean" }, + index: { description: "Zero-based match index when text/role resolves multiple elements.", minimum: 0, type: "number" }, + ref: { description: "Element ref returned by browser_snapshot. Refs are CSS selectors.", type: "string" }, + role: { description: "Accessible or implicit role such as button, link, textbox, combobox, checkbox.", type: "string" }, + selector: { description: "CSS selector. Used directly when provided.", type: "string" }, + text: { description: "Visible text, accessible name, placeholder, label, or value to match.", type: "string" } +}); + +const browserAutomationTools: McpTool[] = [ + ...browserPublicAutomationTools(), + ...browserLegacyAliasTools() +].filter((tool, index, tools) => tools.findIndex((candidate) => candidate.name === tool.name) === index); + +function browserPublicAutomationTools(): McpTool[] { + return [ + { + description: "Open a URL or attach an existing CCR built-in browser tab and create an automation session.", + inputSchema: objectSchema({ + observeOnly: { description: "If true, action tools reject this session.", type: "boolean" }, + tabId: { description: "Existing tab id to attach.", type: "string" }, + timeoutMs: { description: "Optional navigation timeout in milliseconds.", type: "number" }, + url: { description: "Optional URL or search query to open.", type: "string" }, + userId: { description: "Optional logical user id.", type: "string" }, + waitUntil: { description: "Readiness condition. Default/recommended: interactive, which waits until the page is inspectable/actionable and avoids long-lived network requests. network_idle is rarely appropriate for SPAs, Google, mail, chat, auth, or streaming pages.", enum: ["none", "interactive", "domcontentloaded", "load", "network_idle"], type: "string" }, + windowId: { description: "Ignored in CCR; included for agentic-browser compatibility.", type: "string" } + }), + name: "browser_session_open", + tags: ["browser", "automation", "session", "open", "tab"], + title: "Open Browser Automation Session" + }, + { + description: "Detach and release a browser automation session. Does not close the tab.", + inputSchema: objectSchema({ session: sessionSchema }, ["session"]), + name: "browser_session_close", + tags: ["browser", "automation", "session", "close"], + title: "Close Browser Automation Session" + }, + { + description: "Create a new CCR built-in browser tab. Accepts an existing session or the fixed CCR browser window id.", + inputSchema: objectSchema({ + activate: { description: "Whether the new tab should become active. Defaults to true.", type: "boolean" }, + session: sessionSchema, + url: { description: "Optional URL or search query.", type: "string" }, + windowId: { description: "Ignored in CCR; included for compatibility.", type: "string" } + }), + name: "browser_tab_create", + tags: ["browser", "automation", "tab", "create"], + title: "Create Browser Tab" + }, + { + description: "List all CCR built-in browser tabs with active, loading, URL, title, and navigation state.", + inputSchema: objectSchema({ + session: sessionSchema, + windowId: { description: "Ignored in CCR; included for compatibility.", type: "string" } + }), + name: "browser_tab_list", + tags: ["browser", "automation", "tab", "list"], + title: "List Browser Tabs" + }, + { + description: "Activate an existing CCR built-in browser tab.", + inputSchema: objectSchema({ + session: sessionSchema, + tabId: { description: "Tab id to activate. Defaults to session.tabId.", type: "string" } + }), + name: "browser_tab_activate", + tags: ["browser", "automation", "tab", "activate", "focus"], + title: "Activate Browser Tab" + }, + { + description: "Close a CCR built-in browser tab.", + inputSchema: objectSchema({ + session: sessionSchema, + tabId: { description: "Tab id to close. Defaults to session.tabId.", type: "string" } + }), + name: "browser_tab_close", + tags: ["browser", "automation", "tab", "close"], + title: "Close Browser Tab" + }, + { + description: "Navigate the session tab or a specified tab to a URL or search query.", + inputSchema: objectSchema({ + session: sessionSchema, + tabId: { description: "Optional tab id. Defaults to session.tabId or active tab.", type: "string" }, + timeoutMs: { description: "Optional navigation timeout in milliseconds.", maximum: 120000, minimum: 100, type: "number" }, + url: { description: "URL or search query to load.", type: "string" }, + waitUntil: { description: "Readiness condition. Default/recommended: interactive, which waits until the page is inspectable/actionable and avoids long-lived network requests. network_idle is rarely appropriate for SPAs, Google, mail, chat, auth, or streaming pages.", enum: ["none", "interactive", "domcontentloaded", "load", "network_idle"], type: "string" } + }, ["url"]), + name: "browser_navigate", + tags: ["browser", "automation", "navigate", "tab", "url"], + title: "Navigate Browser Tab" + }, + { + description: "Go back in the session tab or a specified tab.", + inputSchema: objectSchema({ session: sessionSchema, tabId: { type: "string" } }), + name: "browser_tab_go_back", + tags: ["browser", "automation", "tab", "back"], + title: "Browser Tab Back" + }, + { + description: "Go forward in the session tab or a specified tab.", + inputSchema: objectSchema({ session: sessionSchema, tabId: { type: "string" } }), + name: "browser_tab_go_forward", + tags: ["browser", "automation", "tab", "forward"], + title: "Browser Tab Forward" + }, + { + description: "Reload the session tab or a specified tab.", + inputSchema: objectSchema({ session: sessionSchema, tabId: { type: "string" } }), + name: "browser_tab_reload", + tags: ["browser", "automation", "tab", "reload"], + title: "Reload Browser Tab" + }, + { + description: "Read a condensed accessibility-oriented page snapshot. Nodes include axNodeId/ref, role, name, value, text, and rect.", + inputSchema: objectSchema({ + includeIgnored: { description: "Included for compatibility; CCR returns visible/high-signal nodes.", type: "boolean" }, + limit: { description: "Maximum nodes to return.", maximum: 300, minimum: 1, type: "number" }, + maxDepth: { description: "Included for compatibility.", type: "number" }, + rootAxNodeId: { description: "Optional root node/ref to scope the snapshot.", type: "string" }, + scope: { description: "full or outline. CCR returns the same compact shape for both.", enum: ["full", "outline"], type: "string" }, + session: sessionSchema + }, ["session"]), + name: "browser_ax_snapshot", + tags: ["browser", "automation", "accessibility", "snapshot", "dom", "page"], + title: "Browser Accessibility Snapshot" + }, + { + description: "Search the page accessibility outline by role, accessible name, visible text, label, placeholder, or value.", + inputSchema: objectSchema({ + includeIgnored: { description: "Included for compatibility; CCR searches visible/high-signal nodes.", type: "boolean" }, + limit: { description: "Maximum matches.", maximum: 300, minimum: 1, type: "number" }, + name: { description: "Accessible name filter.", type: "string" }, + role: { description: "Role filter such as button, link, textbox, combobox.", type: "string" }, + rootAxNodeId: { description: "Optional root node/ref to scope the query.", type: "string" }, + session: sessionSchema, + text: { description: "Visible text/value/description filter.", type: "string" } + }, ["session"]), + name: "browser_ax_query", + tags: ["browser", "automation", "accessibility", "query", "find"], + title: "Query Browser Accessibility Tree" + }, + { + description: "Click an element resolved by axNodeId/ref, CSS selector, role, or text.", + inputSchema: objectSchema({ force: { type: "boolean" }, session: sessionSchema, target: targetSchema }, ["session", "target"]), + name: "browser_element_click", + tags: ["browser", "automation", "element", "click"], + title: "Click Browser Element" + }, + { + description: "Set text into an input, textarea, contenteditable, or textbox-like element.", + inputSchema: objectSchema({ + replace: { description: "Replace existing text. Defaults to true.", type: "boolean" }, + session: sessionSchema, + target: targetSchema, + text: { type: "string" } + }, ["session", "target", "text"]), + name: "browser_element_input", + tags: ["browser", "automation", "element", "input", "type", "form"], + title: "Input Browser Element" + }, + { + description: "Select an option on a native select by value or visible label.", + inputSchema: objectSchema({ + exact: { type: "boolean" }, + session: sessionSchema, + target: targetSchema, + value: { description: "Requested option value or visible label.", type: "string" } + }, ["session", "target", "value"]), + name: "browser_element_select", + tags: ["browser", "automation", "element", "select", "form"], + title: "Select Browser Element Option" + }, + { + description: "Press a keyboard key against a resolved target or the current focused element.", + inputSchema: objectSchema({ + key: { description: "Keyboard key, e.g. Enter, Tab, Escape, ArrowDown.", type: "string" }, + session: sessionSchema, + target: targetSchema + }, ["session", "key"]), + name: "browser_element_press", + tags: ["browser", "automation", "element", "press", "keyboard"], + title: "Press Browser Element Key" + }, + { + description: "Scroll the page or a target element.", + inputSchema: objectSchema({ + amount: { description: "Scroll amount in CSS pixels.", type: "number" }, + direction: { description: "Scroll direction.", enum: ["up", "down"], type: "string" }, + session: sessionSchema, + target: targetSchema + }, ["session"]), + name: "browser_element_scroll", + tags: ["browser", "automation", "element", "scroll"], + title: "Scroll Browser Element" + }, + { + description: "Subscribe to browser automation events such as tab, navigation, DOM-ready, runtime, and loading signals.", + inputSchema: objectSchema({ + channels: { description: "Event channels: tab, navigation, dom, runtime, dialog, download, input, focus, selection, handoff.", items: { type: "string" }, type: "array" }, + redactTextInput: { type: "boolean" }, + sampleMouseMove: { type: "boolean" }, + session: sessionSchema + }, ["session", "channels"]), + name: "browser_events_subscribe", + tags: ["browser", "automation", "events", "subscribe"], + title: "Subscribe Browser Events" + }, + { + description: "Read buffered browser automation events from a subscription.", + inputSchema: objectSchema({ + cursor: cursorSchema, + limit: { maximum: 200, minimum: 1, type: "number" }, + subscriptionId: { type: "string" } + }, ["subscriptionId"]), + name: "browser_events_read", + tags: ["browser", "automation", "events", "read"], + title: "Read Browser Events" + }, + { + description: "Wait for browser automation events matching kind, tabId, URL pattern, title pattern, or summary pattern.", + inputSchema: objectSchema({ + coalesceMs: { description: "Small delay after a first match to collect related events.", type: "number" }, + cursor: cursorSchema, + kinds: { items: { type: "string" }, type: "array" }, + maxEvents: { maximum: 50, minimum: 1, type: "number" }, + summaryPattern: { type: "string" }, + tabId: { type: "string" }, + timeoutMs: { maximum: 120000, minimum: 100, type: "number" }, + titlePattern: { type: "string" }, + urlPattern: { type: "string" }, + subscriptionId: { type: "string" } + }, ["subscriptionId"]), + name: "browser_events_await", + tags: ["browser", "automation", "events", "await", "wait"], + title: "Await Browser Events" + }, + { + description: "Unsubscribe from browser automation events and release the subscription.", + inputSchema: objectSchema({ subscriptionId: { type: "string" } }, ["subscriptionId"]), + name: "browser_events_unsubscribe", + tags: ["browser", "automation", "events", "unsubscribe"], + title: "Unsubscribe Browser Events" + }, + { + description: "Handle a currently open JavaScript alert/confirm/prompt dialog using Chromium CDP.", + inputSchema: objectSchema({ + accept: { type: "boolean" }, + promptText: { type: "string" }, + session: sessionSchema + }, ["session", "accept"]), + name: "browser_dialog_handle", + tags: ["browser", "automation", "dialog", "alert", "confirm", "prompt"], + title: "Handle Browser Dialog" + }, + { + description: "Request human intervention for the current browser task. Shows the hidden browser window and displays the requested action in the top toolbar.", + inputSchema: objectSchema({ + kind: { + description: "Type of help needed.", + enum: ["login_required", "verification_code", "human_verification", "blocked", "other"], + type: "string" + }, + message: { description: "Short instruction shown in the top toolbar.", type: "string" }, + reason: { description: "Why automation is blocked.", type: "string" }, + session: sessionSchema, + tabId: { description: "Optional tab id. Defaults to session.tabId or active tab.", type: "string" } + }, ["reason"]), + name: "browser_handoff_request", + tags: ["browser", "automation", "human", "handoff", "intervention"], + title: "Request Browser Human Handoff" + }, + { + description: "Read the current browser human handoff status.", + inputSchema: objectSchema({}), + name: "browser_handoff_status", + tags: ["browser", "automation", "human", "handoff"], + title: "Browser Handoff Status" + }, + { + description: "Wait until the user clicks Done or Hide on the current browser handoff toolbar. Use after browser_handoff_request or a tool result with humanHelpRequired.", + inputSchema: objectSchema({ + handoffId: { description: "Optional handoff id returned by browser_handoff_request or humanHelp.handoff.", type: "string" }, + session: sessionSchema, + tabId: { description: "Optional tab id. Defaults to session.tabId.", type: "string" }, + timeoutMs: { description: "Maximum wait time in milliseconds.", maximum: 600000, minimum: 100, type: "number" } + }), + name: "browser_handoff_wait", + tags: ["browser", "automation", "human", "handoff", "wait"], + title: "Wait For Browser Human Handoff" + }, + { + description: "Clear the current browser human handoff prompt.", + inputSchema: objectSchema({ + status: { enum: ["completed", "dismissed"], type: "string" } + }), + name: "browser_handoff_clear", + tags: ["browser", "automation", "human", "handoff"], + title: "Clear Browser Handoff" + }, + { + description: "Ask the user to confirm importing Chrome cookies and localStorage for selected domains into CCR's in-app browser. Opens a browser confirmation page; the Chrome extension performs the import after user confirmation.", + inputSchema: objectSchema({ + domain: { description: "Single domain to import, such as github.com. Used with domains if both are provided.", type: "string" }, + domains: { description: "Domains to import. If omitted, CCR derives the current tab hostname.", items: { type: "string" }, type: "array" }, + openConfirmationPage: { description: "Open the system browser confirmation page. Defaults to true.", type: "boolean" }, + session: sessionSchema, + tabId: { description: "Optional tab id used to derive a domain when domain/domains are omitted.", type: "string" }, + target: { description: "Target CCR browser storage partition.", enum: ["browser", "browser-and-web-search"], type: "string" } + }), + name: "browser_chrome_login_import", + tags: ["browser", "automation", "chrome", "login", "import", "cookies", "localStorage"], + title: "Import Chrome Login State" + }, + { + description: "Read the status of a Chrome login import job created by browser_chrome_login_import.", + inputSchema: objectSchema({ + jobId: { description: "Chrome login import job id.", type: "string" } + }, ["jobId"]), + name: "browser_chrome_login_import_status", + tags: ["browser", "automation", "chrome", "login", "import", "status"], + title: "Chrome Login Import Status" + } + ]; +} + +function browserLegacyAliasTools(): McpTool[] { + return [ + { + description: "Open or focus the CCR built-in browser window. Optionally navigate the active tab to a URL.", + inputSchema: objectSchema({ + url: { description: "Optional URL or search query to load in the active tab.", type: "string" } + }), + name: "browser_open", + tags: ["browser", "automation", "open", "focus"], + title: "Open Browser" + }, + { + description: "List CCR built-in browser tabs, including active tab, URL, title, and loading state.", + inputSchema: objectSchema({}), + name: "browser_tabs", + tags: ["browser", "automation", "tabs"], + title: "List Browser Tabs" + }, + { + description: "Open a new CCR built-in browser tab. Optionally load a URL or search query.", + inputSchema: objectSchema({ + url: { description: "Optional URL or search query to load in the new tab.", type: "string" } + }), + name: "browser_tab_new", + tags: ["browser", "automation", "tab"], + title: "New Browser Tab" + }, + { + description: "Focus a CCR built-in browser tab by tabId.", + inputSchema: objectSchema({ + tabId: { description: "Tab id returned by browser_tabs or browser_tab_new.", type: "string" } + }, ["tabId"]), + name: "browser_tab_activate", + tags: ["browser", "automation", "tab", "focus"], + title: "Activate Browser Tab" + }, + { + description: "Close a CCR built-in browser tab by tabId.", + inputSchema: objectSchema({ + tabId: { description: "Tab id returned by browser_tabs or browser_tab_new.", type: "string" } + }, ["tabId"]), + name: "browser_tab_close", + tags: ["browser", "automation", "tab"], + title: "Close Browser Tab" + }, + { + description: "Navigate a CCR built-in browser tab to a URL or search query.", + inputSchema: objectSchema({ + tabId: { description: "Optional tab id. Defaults to the active tab.", type: "string" }, + url: { description: "URL or search query to load.", type: "string" } + }, ["url"]), + name: "browser_navigate", + tags: ["browser", "automation", "navigate", "url"], + title: "Navigate Browser" + }, + { + description: "Capture page text plus interactable element refs for browser automation. Use returned refs for browser_click, browser_type, browser_select, browser_press_key, or browser_scroll.", + inputSchema: objectSchema({ + limit: { description: "Maximum page text characters to include. Overrides maxText when both are provided.", maximum: maxSnapshotTextLimit, minimum: 0, type: "number" }, + maxElements: { description: "Maximum interactable elements to include.", maximum: 300, minimum: 1, type: "number" }, + maxText: { description: "Legacy alias for limit.", maximum: maxSnapshotTextLimit, minimum: 0, type: "number" }, + offset: { description: "Starting character offset into the normalized page text.", maximum: maxSnapshotTextOffset, minimum: 0, type: "number" }, + tabId: { description: "Optional tab id. Defaults to the active tab.", type: "string" } + }), + name: "browser_snapshot", + tags: ["browser", "automation", "snapshot", "accessibility", "dom", "page"], + title: "Browser Page Snapshot" + }, + { + description: "Click an element in the CCR built-in browser by ref, CSS selector, role, or visible text.", + inputSchema: objectSchema({ + tabId: { description: "Optional tab id. Defaults to the active tab.", type: "string" }, + target: targetSchema + }, ["target"]), + name: "browser_click", + tags: ["browser", "automation", "click", "element"], + title: "Click Browser Element" + }, + { + description: "Type text into an input, textarea, select-like textbox, or contenteditable element in the CCR built-in browser.", + inputSchema: objectSchema({ + replaceExisting: { description: "Replace existing text. Defaults to true.", type: "boolean" }, + tabId: { description: "Optional tab id. Defaults to the active tab.", type: "string" }, + target: targetSchema, + text: { description: "Text to type.", type: "string" } + }, ["target", "text"]), + name: "browser_type", + tags: ["browser", "automation", "type", "input", "form"], + title: "Type In Browser Element" + }, + { + description: "Choose an option in a select element by value or visible label.", + inputSchema: objectSchema({ + exact: { description: "Match label exactly instead of by substring.", type: "boolean" }, + label: { description: "Visible option label to choose.", type: "string" }, + tabId: { description: "Optional tab id. Defaults to the active tab.", type: "string" }, + target: targetSchema, + value: { description: "Option value to choose.", type: "string" } + }, ["target"]), + name: "browser_select", + tags: ["browser", "automation", "select", "form"], + title: "Select Browser Option" + }, + { + description: "Press a keyboard key in the CCR built-in browser. Optionally focus an element first.", + inputSchema: objectSchema({ + key: { description: "Electron keyCode, for example Enter, Tab, Escape, Backspace, ArrowDown.", type: "string" }, + tabId: { description: "Optional tab id. Defaults to the active tab.", type: "string" }, + target: targetSchema + }, ["key"]), + name: "browser_press_key", + tags: ["browser", "automation", "keyboard", "press"], + title: "Press Browser Key" + }, + { + description: "Scroll the page or a target element in the CCR built-in browser.", + inputSchema: objectSchema({ + deltaX: { description: "Horizontal scroll delta in pixels.", type: "number" }, + deltaY: { description: "Vertical scroll delta in pixels.", type: "number" }, + tabId: { description: "Optional tab id. Defaults to the active tab.", type: "string" }, + target: targetSchema + }), + name: "browser_scroll", + tags: ["browser", "automation", "scroll"], + title: "Scroll Browser" + }, + { + description: "Wait until a browser page condition is true: URL includes/matches, selector is visible, or text is visible.", + inputSchema: objectSchema({ + selector: { description: "CSS selector that must be visible.", type: "string" }, + tabId: { description: "Optional tab id. Defaults to the active tab.", type: "string" }, + text: { description: "Text that must be visible in document body.", type: "string" }, + timeoutMs: { description: "Maximum wait time in milliseconds.", maximum: 120000, minimum: 100, type: "number" }, + urlIncludes: { description: "Substring that must appear in the URL.", type: "string" }, + urlMatches: { description: "JavaScript regular expression that must match the URL.", type: "string" } + }), + name: "browser_wait_for", + tags: ["browser", "automation", "wait", "url", "selector", "text"], + title: "Wait For Browser Page" + }, + { + description: "Agentic-browser-compatible alias for browser_handoff_request. Request human help for login, verification, CAPTCHA, or other manual-only blockers.", + inputSchema: objectSchema({ + browserSessionId: { type: "string" }, + kind: { enum: ["login_required", "verification_code", "human_verification", "blocked", "other"], type: "string" }, + message: { type: "string" }, + reason: { type: "string" }, + tabId: { type: "string" } + }, ["reason", "kind"]), + name: "askHumanHelp", + tags: ["browser", "automation", "human", "handoff", "intervention"], + title: "Ask Human Help" + } + ]; +} + +class BrowserAutomationMcpService implements BrowserAutomationMcpIntegration { + private readonly sessions = new Map(); + private readonly subscriptions = new Map(); + + async handleBrowserAutomationMcpRequest(request: IncomingMessage, response: ServerResponse): Promise { + response.setHeader("MCP-Protocol-Version", protocolVersion); + const path = request.url ? new URL(request.url, "http://127.0.0.1").pathname : "/"; + + if (request.method === "GET" && (path === BROWSER_AUTOMATION_MCP_PATH || path === `${BROWSER_AUTOMATION_MCP_PATH}/`)) { + sendJson(response, 200, { + endpoint: BROWSER_AUTOMATION_MCP_PATH, + name: "ccr-browser-automation", + protocol: "mcp", + transport: "streamable-http" + }); + return; + } + + if (request.method !== "POST") { + sendJson(response, 405, { error: { message: "Browser automation MCP endpoint only supports GET and POST." } }); + return; + } + + let payload: unknown; + try { + payload = JSON.parse((await readRequestBody(request, maxMcpRequestBytes)).toString("utf8")) as unknown; + } catch (error) { + sendJson(response, 400, jsonRpcError(null, -32700, `Invalid JSON-RPC request: ${formatError(error)}`)); + return; + } + + const requests = Array.isArray(payload) ? payload : [payload]; + const responses = await Promise.all(requests.map((item) => this.handleJsonRpcRequest(item))); + const filtered = responses.filter((item): item is JsonRpcResponse => Boolean(item)); + if (filtered.length === 0) { + response.writeHead(204); + response.end(); + return; + } + + sendJson(response, 200, Array.isArray(payload) ? filtered : filtered[0]); + } + + async stopBrowserAutomationMcpServer(): Promise { + for (const subscription of this.subscriptions.values()) { + subscription.unsubscribe(); + } + this.subscriptions.clear(); + this.sessions.clear(); + // The gateway owns this MCP route. Browser tabs remain user-visible state and are + // intentionally not closed when the gateway restarts. + } + + private async handleJsonRpcRequest(payload: unknown): Promise { + if (!isRecord(payload)) { + return jsonRpcError(null, -32600, "JSON-RPC request must be an object."); + } + + const request = payload as JsonRpcRequest; + const id = request.id ?? null; + if (request.id === undefined && request.method?.startsWith("notifications/")) { + return undefined; + } + if (request.jsonrpc !== "2.0" || !request.method) { + return jsonRpcError(id, -32600, "Invalid JSON-RPC 2.0 request."); + } + + try { + switch (request.method) { + case "initialize": + return jsonRpcResult(id, { + capabilities: { + tools: {} + }, + protocolVersion, + serverInfo: { + name: "ccr-browser-automation", + title: "CCR Browser Automation", + version: "1.0.0" + } + }); + case "ping": + return jsonRpcResult(id, {}); + case "tools/list": + return jsonRpcResult(id, { tools: browserAutomationTools as unknown as JsonValue }); + case "tools/call": + return jsonRpcResult(id, await this.callTool(request.params) as unknown as JsonValue); + default: + return jsonRpcError(id, -32601, `Unsupported MCP method: ${request.method}`); + } + } catch (error) { + return jsonRpcError(id, -32603, formatError(error)); + } + } + + private async callTool(params: unknown): Promise { + if (!isRecord(params) || typeof params.name !== "string") { + throw new Error("tools/call params must include a tool name."); + } + const args = isRecord(params.arguments) ? params.arguments : {}; + try { + const result = await this.runTool(params.name, args); + return textResult(formatToolResult(params.name, result)); + } catch (error) { + return { + ...textResult(formatError(error)), + isError: true + }; + } + } + + private async runTool(name: string, args: Record): Promise { + switch (name) { + case "browser_session_open": + return await this.openSession(args); + case "browser_session_close": + return this.closeSession(args); + case "browser_tab_create": + return await this.createTab(args); + case "browser_tab_list": + await this.ensureBrowserOpen(); + return browserWindowState(); + case "browser_tab_activate": { + await this.ensureBrowserOpen(); + const session = this.resolveOptionalSession(args); + const tabId = readString(args.tabId) || session?.ref.tabId; + if (!tabId) { + throw new Error("browser_tab_activate requires tabId or session."); + } + const state = builtInBrowserService.selectAutomationTab(tabId); + return { + ...browserWindowState(state), + tab: summarizeTab(requiredTabState(state, tabId), state.activeTabId) + }; + } + case "browser_tab_close": { + await this.ensureBrowserOpen(); + const session = this.resolveOptionalSession(args); + this.assertCanMutate(session); + const tabId = readString(args.tabId) || session?.ref.tabId; + if (!tabId) { + throw new Error("browser_tab_close requires tabId or session."); + } + const state = builtInBrowserService.closeAutomationTab(tabId); + this.removeSessionsForTab(tabId); + return browserWindowState(state); + } + case "browser_navigate": { + await this.ensureBrowserOpen(); + const session = this.resolveOptionalSession(args); + this.assertCanMutate(session); + const tabId = readString(args.tabId) || session?.ref.tabId || builtInBrowserService.getAutomationState().activeTabId; + if (!tabId) { + throw new Error("browser_navigate could not resolve an active tab."); + } + const url = requiredString(args.url, "browser_navigate requires url."); + const waitUntil = normalizeWaitUntil(readString(args.waitUntil), "interactive"); + const readiness = await waitForReadiness( + builtInBrowserService.getAutomationWebContents(tabId), + waitUntil, + clampInteger(readNumber(args.timeoutMs) ?? defaultWaitTimeoutMs, 100, 120000), + () => builtInBrowserService.navigateAutomationTab(url, tabId), + url + ); + const state = builtInBrowserService.getAutomationState(); + const webContents = builtInBrowserService.getAutomationWebContents(tabId); + const handoff = await maybeRequestHandoffAfterNavigation(webContents, readiness, { + requestedUrl: url, + session: session?.ref, + tabId, + waitUntil + }); + return { + ...browserWindowState(state), + ...(handoff ? humanHelpResultFields(handoff) : {}), + session: session?.ref, + tab: summarizeTab(requiredTabState(state, tabId), state.activeTabId), + ...readiness + }; + } + case "browser_tab_go_back": { + await this.ensureBrowserOpen(); + const session = this.resolveOptionalSession(args); + this.assertCanMutate(session); + return browserWindowState(builtInBrowserService.goBackAutomationTab(readString(args.tabId) || session?.ref.tabId)); + } + case "browser_tab_go_forward": { + await this.ensureBrowserOpen(); + const session = this.resolveOptionalSession(args); + this.assertCanMutate(session); + return browserWindowState(builtInBrowserService.goForwardAutomationTab(readString(args.tabId) || session?.ref.tabId)); + } + case "browser_tab_reload": { + await this.ensureBrowserOpen(); + const session = this.resolveOptionalSession(args); + this.assertCanMutate(session); + return browserWindowState(builtInBrowserService.reloadAutomationTab(readString(args.tabId) || session?.ref.tabId)); + } + case "browser_ax_snapshot": { + await this.ensureBrowserOpen(); + const session = this.requireSession(args); + return await captureAxSnapshot( + builtInBrowserService.getAutomationWebContents(session.ref.tabId), + session.ref, + { + limit: clampInteger(readNumber(args.limit) ?? defaultAxSnapshotLimit, 1, 300), + rootAxNodeId: readString(args.rootAxNodeId), + scope: readString(args.scope) === "outline" ? "outline" : "full" + } + ); + } + case "browser_ax_query": { + await this.ensureBrowserOpen(); + const session = this.requireSession(args); + return await queryAxSnapshot( + builtInBrowserService.getAutomationWebContents(session.ref.tabId), + session.ref, + { + limit: clampInteger(readNumber(args.limit) ?? 50, 1, 300), + name: readString(args.name), + role: readString(args.role), + rootAxNodeId: readString(args.rootAxNodeId), + text: readString(args.text) + } + ); + } + case "browser_element_click": { + await this.ensureBrowserOpen(); + const session = this.requireSession(args); + this.assertCanMutate(session); + const webContents = builtInBrowserService.getAutomationWebContents(session.ref.tabId); + const result = await runTargetAction(webContents, "click", readTarget(args.target)); + return await pageActionResult(webContents, session.ref, "click", result); + } + case "browser_element_input": { + await this.ensureBrowserOpen(); + const session = this.requireSession(args); + this.assertCanMutate(session); + const webContents = builtInBrowserService.getAutomationWebContents(session.ref.tabId); + const result = await runTargetAction(webContents, "type", readTarget(args.target), { + replaceExisting: args.replace !== false, + text: typeof args.text === "string" ? args.text : "" + }); + return await pageActionResult(webContents, session.ref, "input", result); + } + case "browser_element_select": { + await this.ensureBrowserOpen(); + const session = this.requireSession(args); + this.assertCanMutate(session); + const value = requiredString(args.value, "browser_element_select requires value."); + const webContents = builtInBrowserService.getAutomationWebContents(session.ref.tabId); + const result = await runTargetAction(webContents, "select", readTarget(args.target), { + exact: args.exact === true, + label: value, + value + }); + return await pageActionResult(webContents, session.ref, "select", result); + } + case "browser_element_press": { + await this.ensureBrowserOpen(); + const session = this.requireSession(args); + this.assertCanMutate(session); + const webContents = builtInBrowserService.getAutomationWebContents(session.ref.tabId); + const result = await pressKey( + webContents, + requiredString(args.key, "browser_element_press requires key."), + isRecord(args.target) ? readTarget(args.target) : undefined + ); + return await pageActionResult(webContents, session.ref, "press", result); + } + case "browser_element_scroll": { + await this.ensureBrowserOpen(); + const session = this.requireSession(args); + this.assertCanMutate(session); + const amount = Math.abs(readNumber(args.amount) ?? 700); + const direction = readString(args.direction) === "up" ? "up" : "down"; + const webContents = builtInBrowserService.getAutomationWebContents(session.ref.tabId); + const result = await runTargetAction( + webContents, + "scroll", + isRecord(args.target) ? readTarget(args.target) : undefined, + { + deltaX: 0, + deltaY: direction === "up" ? -amount : amount + } + ); + return await pageActionResult(webContents, session.ref, "scroll", result); + } + case "browser_events_subscribe": + await this.ensureBrowserOpen(); + return this.subscribeEvents(args); + case "browser_events_read": + return this.readEvents(args); + case "browser_events_await": + return await this.awaitEvents(args); + case "browser_events_unsubscribe": + return this.unsubscribeEvents(args); + case "browser_dialog_handle": { + await this.ensureBrowserOpen(); + const session = this.requireSession(args); + this.assertCanMutate(session); + const webContents = builtInBrowserService.getAutomationWebContents(session.ref.tabId); + return await handleJavaScriptDialog(webContents, args.accept === true, readString(args.promptText), session.ref); + } + case "browser_handoff_request": + case "askHumanHelp": + await this.ensureBrowserOpen(); + return this.requestHandoff(args); + case "browser_handoff_status": + await this.ensureBrowserOpen(); + return { + handoff: builtInBrowserService.getAutomationState().automationHandoff, + state: browserWindowState() + }; + case "browser_handoff_wait": + await this.ensureBrowserOpen(); + return await this.waitForHandoff(args); + case "browser_handoff_clear": + return { + handoff: undefined, + state: builtInBrowserService.resolveAutomationHandoff(readString(args.status) === "dismissed" ? "dismissed" : "completed") + }; + case "browser_chrome_login_import": { + await this.ensureBrowserOpen(); + const session = this.resolveOptionalSession(args); + const domains = resolveChromeLoginImportDomains(args, session?.ref.tabId); + const job = await chromeLoginImportService.createJob({ + domains, + openConfirmationPage: args.openConfirmationPage !== false, + target: readString(args.target) === "browser-and-web-search" ? "browser-and-web-search" : "browser" + }); + return { + humanHelpRequired: true, + job, + nextAction: "user_confirm_chrome_import", + state: browserWindowState(), + summary: `Opened Chrome login import confirmation for ${job.domains.join(", ")}.` + }; + } + case "browser_chrome_login_import_status": { + const jobId = requiredString(args.jobId, "browser_chrome_login_import_status requires jobId."); + const job = chromeLoginImportService.getJob(jobId); + if (!job) { + throw new Error(`Chrome login import job was not found: ${jobId}`); + } + return { job }; + } + case "browser_open": { + const state = await this.ensureBrowserVisible(); + const url = readString(args.url); + return url ? await builtInBrowserService.navigateAutomationTab(url, state.activeTabId) : builtInBrowserService.getAutomationState(); + } + case "browser_tabs": + await this.ensureBrowserOpen(); + return builtInBrowserService.getAutomationState(); + case "browser_tab_new": { + await this.ensureBrowserOpen(); + const tab = builtInBrowserService.createAutomationTab(readString(args.url) || undefined); + return { state: builtInBrowserService.getAutomationState(), tab }; + } + case "browser_snapshot": + await this.ensureBrowserOpen(); + return await captureSnapshotWithHandoff( + builtInBrowserService.getAutomationWebContents(readString(args.tabId)), + readString(args.tabId), + { + limit: clampInteger(readNumber(args.limit) ?? readNumber(args.maxText) ?? defaultSnapshotMaxText, 0, maxSnapshotTextLimit), + maxElements: clampInteger(readNumber(args.maxElements) ?? defaultSnapshotMaxElements, 1, 300), + offset: clampInteger(readNumber(args.offset) ?? 0, 0, maxSnapshotTextOffset) + } + ); + case "browser_click": + await this.ensureBrowserOpen(); + return await runTargetAction( + builtInBrowserService.getAutomationWebContents(readString(args.tabId)), + "click", + readTarget(args.target) + ); + case "browser_type": + await this.ensureBrowserOpen(); + return await runTargetAction( + builtInBrowserService.getAutomationWebContents(readString(args.tabId)), + "type", + readTarget(args.target), + { + replaceExisting: args.replaceExisting !== false, + text: typeof args.text === "string" ? args.text : "" + } + ); + case "browser_select": + await this.ensureBrowserOpen(); + return await runTargetAction( + builtInBrowserService.getAutomationWebContents(readString(args.tabId)), + "select", + readTarget(args.target), + { + exact: args.exact === true, + label: readString(args.label), + value: readString(args.value) + } + ); + case "browser_press_key": + await this.ensureBrowserOpen(); + return await pressKey( + builtInBrowserService.getAutomationWebContents(readString(args.tabId)), + requiredString(args.key, "browser_press_key requires key."), + isRecord(args.target) ? readTarget(args.target) : undefined + ); + case "browser_scroll": + await this.ensureBrowserOpen(); + return await runTargetAction( + builtInBrowserService.getAutomationWebContents(readString(args.tabId)), + "scroll", + isRecord(args.target) ? readTarget(args.target) : undefined, + { + deltaX: readNumber(args.deltaX) ?? 0, + deltaY: readNumber(args.deltaY) ?? 700 + } + ); + case "browser_wait_for": + await this.ensureBrowserOpen(); + return await waitForPageCondition( + builtInBrowserService.getAutomationWebContents(readString(args.tabId)), + { + selector: readString(args.selector), + text: readString(args.text), + timeoutMs: clampInteger(readNumber(args.timeoutMs) ?? defaultWaitTimeoutMs, 100, 120000), + urlIncludes: readString(args.urlIncludes), + urlMatches: readString(args.urlMatches) + } + ); + default: + throw new Error(`Unknown browser automation tool: ${name}`); + } + } + + private async ensureBrowserOpen(): Promise { + await builtInBrowserService.openHidden(await loadAppConfig()); + return builtInBrowserService.getAutomationState(); + } + + private async ensureBrowserVisible(): Promise { + await builtInBrowserService.open(await loadAppConfig()); + return builtInBrowserService.getAutomationState(); + } + + private async openSession(args: Record): Promise { + let state = await this.ensureBrowserOpen(); + const url = readString(args.url); + const requestedTabId = readString(args.tabId); + const previousActiveTabId = state.activeTabId; + let tabId = requestedTabId; + let createdTab = false; + + if (tabId && !state.tabs.some((tab) => tab.id === tabId)) { + throw new Error(`Browser tab was not found: ${tabId}`); + } + + if (!tabId && url) { + const tab = builtInBrowserService.createAutomationTab(); + tabId = tab.id; + createdTab = true; + } else if (!tabId) { + tabId = state.activeTabId || builtInBrowserService.createAutomationTab().id; + createdTab = !state.activeTabId; + } else if (state.activeTabId !== tabId) { + builtInBrowserService.selectAutomationTab(tabId); + } + + if (!tabId) { + throw new Error("Unable to resolve browser tab for automation session."); + } + + const waitUntil = normalizeWaitUntil(readString(args.waitUntil), url ? "interactive" : "none"); + const timeoutMs = clampInteger(readNumber(args.timeoutMs) ?? defaultWaitTimeoutMs, 100, 120000); + const webContents = builtInBrowserService.getAutomationWebContents(tabId); + const readiness = await waitForReadiness( + webContents, + waitUntil, + timeoutMs, + url ? () => builtInBrowserService.navigateAutomationTab(url, tabId) : undefined, + url + ); + state = builtInBrowserService.getAutomationState(); + const tab = requiredTabState(state, tabId); + const ref: BrowserSessionRef = { + sessionId: randomUUID(), + tabId, + ...(readString(args.userId) ? { userId: readString(args.userId) } : {}) + }; + const attached: AttachedSession = { + attachedAt: Date.now(), + leaseId: randomUUID(), + observeOnly: args.observeOnly === true, + ref + }; + this.sessions.set(ref.sessionId, attached); + const handoff = await maybeRequestHandoffAfterNavigation(webContents, readiness, { + requestedUrl: url, + session: ref, + tabId, + waitUntil + }); + + return { + session: ref, + attachedAt: attached.attachedAt, + createdTab, + ...(handoff ? humanHelpResultFields(handoff) : {}), + matched: readiness.matched, + matchedEvent: readiness.matchedEvent, + ...(readiness.navigationError ? { navigationError: readiness.navigationError } : {}), + previousActiveTabId, + readinessUrl: readiness.readinessUrl, + tabId, + timedOut: readiness.timedOut, + title: tab.title, + url: tab.url, + waitUntil, + windowId: builtInBrowserService.getAutomationWindowId() + }; + } + + private closeSession(args: Record): unknown { + const session = this.requireSession(args); + this.sessions.delete(session.ref.sessionId); + for (const [subscriptionId, subscription] of this.subscriptions) { + if (subscription.ref?.sessionId === session.ref.sessionId) { + subscription.unsubscribe(); + this.subscriptions.delete(subscriptionId); + } + } + return { success: true }; + } + + private async createTab(args: Record): Promise { + const state = await this.ensureBrowserOpen(); + const session = this.resolveOptionalSession(args); + this.assertCanMutate(session); + const previousActiveTabId = state.activeTabId; + const tab = builtInBrowserService.createAutomationTab(readString(args.url) || undefined); + if (args.activate === false && previousActiveTabId) { + builtInBrowserService.selectAutomationTab(previousActiveTabId); + } + const nextState = builtInBrowserService.getAutomationState(); + return summarizeTab(requiredTabState(nextState, tab.id), nextState.activeTabId); + } + + private requireSession(args: Record): AttachedSession { + const session = this.resolveOptionalSession(args); + if (!session) { + throw new Error("A valid browser automation session is required."); + } + return session; + } + + private resolveOptionalSession(args: Record): AttachedSession | undefined { + const ref = readSessionRef(args.session); + if (!ref) { + return undefined; + } + const existing = this.sessions.get(ref.sessionId); + if (existing) { + if (existing.ref.tabId !== ref.tabId) { + throw new Error("Browser automation session tabId does not match the attached session."); + } + return existing; + } + const state = builtInBrowserService.getAutomationState(); + if (!state.tabs.some((tab) => tab.id === ref.tabId)) { + throw new Error(`Browser automation session tab was not found: ${ref.tabId}`); + } + const restored: AttachedSession = { + attachedAt: Date.now(), + leaseId: randomUUID(), + observeOnly: false, + ref + }; + this.sessions.set(ref.sessionId, restored); + return restored; + } + + private assertCanMutate(session?: AttachedSession): void { + if (session?.observeOnly) { + throw new Error("This browser automation session is observeOnly and cannot mutate browser state."); + } + } + + private removeSessionsForTab(tabId: string): void { + for (const [sessionId, session] of this.sessions) { + if (session.ref.tabId === tabId) { + this.sessions.delete(sessionId); + } + } + for (const [subscriptionId, subscription] of this.subscriptions) { + if (subscription.ref?.tabId === tabId) { + subscription.unsubscribe(); + this.subscriptions.delete(subscriptionId); + } + } + } + + private subscribeEvents(args: Record): unknown { + const session = this.requireSession(args); + const channels = normalizeEventChannels(readStringArray(args.channels)); + const subscription: EventSubscription = { + channels, + dropped: false, + events: [], + ref: session.ref, + redactTextInput: args.redactTextInput !== false, + sampleMouseMove: args.sampleMouseMove === true, + startedAt: Date.now(), + subscriptionId: randomUUID(), + unsubscribe: () => undefined + }; + const listener = (event: BrowserAutomationEvent) => { + if (!matchesSubscriptionEvent(subscription, event)) { + return; + } + subscription.events.push(event); + if (subscription.events.length > maxSubscriptionEvents) { + subscription.events.splice(0, subscription.events.length - maxSubscriptionEvents); + subscription.dropped = true; + } + }; + subscription.unsubscribe = builtInBrowserService.subscribeAutomationEvents(listener, { + replayRecentMs: automationEventReplayMs + }); + this.subscriptions.set(subscription.subscriptionId, subscription); + + return { + subscription: subscriptionDescriptor(subscription) + }; + } + + private readEvents(args: Record): unknown { + const subscription = this.requireSubscription(args); + const limit = clampInteger(readNumber(args.limit) ?? 100, 1, 200); + const cursorSeq = readCursorSeq(args.cursor); + const events = eventsAfterCursor(subscription, cursorSeq).slice(0, limit); + return { + dropped: subscription.dropped || cursorDropped(subscription, cursorSeq), + events, + nextCursor: makeEventCursor(subscription, events.at(-1)?.seq ?? cursorSeq), + subscriptionId: subscription.subscriptionId + }; + } + + private async awaitEvents(args: Record): Promise { + const subscription = this.requireSubscription(args); + const timeoutMs = clampInteger(readNumber(args.timeoutMs) ?? defaultEventAwaitTimeoutMs, 100, 120000); + const maxEvents = clampInteger(readNumber(args.maxEvents) ?? 10, 1, 50); + const coalesceMs = clampInteger(readNumber(args.coalesceMs) ?? 100, 0, 2000); + const cursorSeq = readCursorSeq(args.cursor); + const deadline = Date.now() + timeoutMs; + let matched: BrowserAutomationEvent[] = []; + + while (Date.now() <= deadline) { + matched = eventsAfterCursor(subscription, cursorSeq) + .filter((event) => matchesAwaitFilter(event, args)) + .slice(0, maxEvents); + if (matched.length > 0) { + if (coalesceMs > 0) { + await sleep(coalesceMs); + matched = eventsAfterCursor(subscription, cursorSeq) + .filter((event) => matchesAwaitFilter(event, args)) + .slice(0, maxEvents); + } + break; + } + await sleep(100); + } + + return { + dropped: subscription.dropped || cursorDropped(subscription, cursorSeq), + event: matched[0], + events: matched, + matched: matched.length > 0, + nextCursor: makeEventCursor(subscription, matched.at(-1)?.seq ?? cursorSeq), + subscriptionId: subscription.subscriptionId, + timedOut: matched.length === 0 + }; + } + + private unsubscribeEvents(args: Record): unknown { + const subscription = this.requireSubscription(args); + subscription.unsubscribe(); + this.subscriptions.delete(subscription.subscriptionId); + return { + ok: true, + subscriptionId: subscription.subscriptionId + }; + } + + private requireSubscription(args: Record): EventSubscription { + const subscriptionId = requiredString(args.subscriptionId, "Browser event subscriptionId is required."); + const subscription = this.subscriptions.get(subscriptionId); + if (!subscription) { + throw new Error(`Browser event subscription was not found: ${subscriptionId}`); + } + return subscription; + } + + private requestHandoff(args: Record): unknown { + const session = this.resolveOptionalSession(args); + const sessionId = session?.ref.sessionId || readString(args.browserSessionId); + const tabId = readString(args.tabId) || session?.ref.tabId; + const handoff = builtInBrowserService.requestAutomationHandoff({ + kind: readHandoffKind(args.kind), + message: readString(args.message), + reason: requiredString(args.reason, "browser_handoff_request requires reason."), + sessionId, + tabId + }); + return { + ...humanHelpResultFields(handoff), + state: browserWindowState() + }; + } + + private async waitForHandoff(args: Record): Promise { + const session = this.resolveOptionalSession(args); + const handoffId = readString(args.handoffId); + const tabId = readString(args.tabId) || session?.ref.tabId; + const timeoutMs = clampInteger(readNumber(args.timeoutMs) ?? 300000, 100, 600000); + + const current = builtInBrowserService.getAutomationState().automationHandoff; + if (!handoffMatches(current, { handoffId, tabId })) { + const recentResolution = findRecentHandoffResolution({ handoffId, tabId }); + if (recentResolution) { + return handoffResolutionResult(recentResolution, undefined, false); + } + return { + handoff: current, + matched: false, + reason: current ? "A browser handoff is pending, but it does not match the requested handoffId/tabId." : "No browser handoff is currently pending.", + state: browserWindowState(), + timedOut: false + }; + } + + return await new Promise((resolve) => { + let settled = false; + const finish = (result: Record) => { + if (settled) { + return; + } + settled = true; + clearTimeout(timer); + unsubscribe(); + resolve(result); + }; + const unsubscribe = builtInBrowserService.subscribeAutomationEvents((event) => { + if (event.kind !== "handoff.completed" && event.kind !== "handoff.dismissed") { + return; + } + if (handoffId && event.handoffId !== handoffId) { + return; + } + if (tabId && event.tabId !== tabId) { + return; + } + finish(handoffResolutionResult(event, current, false)); + }); + const timer = setTimeout(() => { + finish({ + handoff: current, + matched: false, + state: browserWindowState(), + timedOut: true + }); + }, timeoutMs); + }); + } +} + +export const browserAutomationMcpService = new BrowserAutomationMcpService(); + +function browserWindowState(state = builtInBrowserService.getAutomationState()): Record { + return { + activeTabId: state.activeTabId, + tabs: state.tabs.map((tab) => summarizeTab(tab, state.activeTabId)), + windowId: builtInBrowserService.getAutomationWindowId() + }; +} + +function resolveChromeLoginImportDomains(args: Record, fallbackTabId?: string): string[] { + const explicit = uniqueStrings([ + ...readStringArray(args.domains), + ...(readString(args.domain) ? [readString(args.domain) as string] : []) + ].map(normalizeChromeLoginImportDomain).filter((domain): domain is string => Boolean(domain))); + if (explicit.length > 0) { + return explicit; + } + + const state = builtInBrowserService.getAutomationState(); + const tabId = readString(args.tabId) || fallbackTabId || state.activeTabId; + const tab = state.tabs.find((candidate) => candidate.id === tabId) || state.tabs.find((candidate) => candidate.id === state.activeTabId); + const domain = normalizeChromeLoginImportDomain(tab?.url); + if (!domain) { + throw new Error("browser_chrome_login_import requires domains or an active http(s) tab."); + } + return [domain]; +} + +function normalizeChromeLoginImportDomain(value: unknown): string | undefined { + const raw = readString(value)?.toLowerCase(); + if (!raw) { + return undefined; + } + try { + const url = new URL(raw.includes("://") ? raw : `https://${raw}`); + return url.hostname.replace(/^\*\./, "").replace(/^\./, ""); + } catch { + const domain = raw.replace(/^\*\./, "").replace(/^\./, "").split("/")[0]; + return domain && !domain.includes(" ") ? domain : undefined; + } +} + +function summarizeTab(tab: BuiltInBrowserTabState, activeTabId?: string): Record { + return { + canGoBack: tab.canGoBack, + canGoForward: tab.canGoForward, + displayUrl: tab.url, + isActive: tab.id === activeTabId, + isLoading: tab.isLoading, + tabId: tab.id, + title: tab.title, + url: tab.url, + windowId: builtInBrowserService.getAutomationWindowId() + }; +} + +function requiredTabState(state: BuiltInBrowserState, tabId: string): BuiltInBrowserTabState { + const tab = state.tabs.find((candidate) => candidate.id === tabId); + if (!tab) { + throw new Error(`Browser tab was not found: ${tabId}`); + } + return tab; +} + +function readSessionRef(value: unknown): BrowserSessionRef | undefined { + if (!isRecord(value)) { + return undefined; + } + const sessionId = readString(value.sessionId); + const tabId = readString(value.tabId); + if (!sessionId || !tabId) { + return undefined; + } + return { + sessionId, + tabId, + ...(readString(value.frameId) ? { frameId: readString(value.frameId) } : {}), + ...(readString(value.userId) ? { userId: readString(value.userId) } : {}) + }; +} + +async function pageActionResult( + webContents: WebContents, + session: BrowserSessionRef, + action: string, + result: unknown +): Promise> { + const handoff = await maybeRequestPageHandoff(webContents, { + session, + tabId: session.tabId + }); + return { + action, + ...(handoff ? humanHelpResultFields(handoff) : {}), + result, + session, + title: await webContents.getTitle(), + url: webContents.getURL() + }; +} + +async function captureAxSnapshot( + webContents: WebContents, + session: BrowserSessionRef, + options: { limit: number; rootAxNodeId?: string; scope: string } +): Promise { + const snapshot = await captureSnapshot(webContents, { + maxElements: options.limit, + maxText: options.scope === "outline" ? 0 : defaultSnapshotMaxText + }); + const record = isRecord(snapshot) ? snapshot : {}; + const title = readString(record.title) || await webContents.getTitle(); + const url = readString(record.url) || webContents.getURL(); + const elements = Array.isArray(record.elements) ? record.elements.filter(isRecord) : []; + const elementNodes = elements.map((element, index) => axNodeFromSnapshotElement(element, index)); + const rootNode = { + axNodeId: "document", + childAxNodeIds: elementNodes.map((node) => String(node.axNodeId)), + ignored: false, + name: title || url, + role: "document", + url + }; + let nodes: Array> = [rootNode, ...elementNodes]; + if (options.rootAxNodeId && options.rootAxNodeId !== "document") { + nodes = nodes.filter((node) => node.axNodeId === options.rootAxNodeId || node.ref === options.rootAxNodeId); + } + const result: AxSnapshotResult = { + nodes: nodes.slice(0, options.limit), + scope: options.scope, + session, + title, + url + }; + const handoff = await maybeRequestPageHandoff(webContents, { + session, + snapshot, + tabId: session.tabId + }); + return handoff ? { ...result, ...humanHelpResultFields(handoff) } : result; +} + +async function queryAxSnapshot( + webContents: WebContents, + session: BrowserSessionRef, + options: { limit: number; name?: string; role?: string; rootAxNodeId?: string; text?: string } +): Promise> { + const snapshot = await captureAxSnapshot(webContents, session, { + limit: 300, + rootAxNodeId: options.rootAxNodeId, + scope: "outline" + }); + const role = options.role?.toLowerCase(); + const name = options.name?.toLowerCase(); + const text = options.text?.toLowerCase(); + const matches = snapshot.nodes + .filter((node) => node.role !== "document") + .filter((node) => { + if (role && String(node.role || "").toLowerCase() !== role) { + return false; + } + if (name && !String(node.name || "").toLowerCase().includes(name)) { + return false; + } + if (text) { + const haystack = [ + node.name, + node.value, + node.description, + node.text, + node.placeholder + ].join(" ").toLowerCase(); + if (!haystack.includes(text)) { + return false; + } + } + return true; + }) + .slice(0, options.limit); + return { + ...(snapshot.handoff ? humanHelpResultFields(snapshot.handoff) : {}), + matches, + session, + title: snapshot.title, + url: snapshot.url + }; +} + +function axNodeFromSnapshotElement(element: Record, index: number): Record { + const ref = readString(element.ref) || `element-${index}`; + const text = readString(element.text); + const name = readString(element.name) || text || readString(element.placeholder) || ref; + const description = text && text !== name ? text : undefined; + return { + axNodeId: ref, + backendNodeId: readNumber(element.backendNodeId), + checked: element.checked === true ? true : undefined, + description, + disabled: element.disabled === true ? true : undefined, + href: readString(element.href), + ignored: false, + index, + name, + placeholder: readString(element.placeholder), + rect: isRecord(element.rect) ? element.rect : undefined, + ref, + role: readString(element.role) || readString(element.tag) || "generic", + tag: readString(element.tag), + text: description, + value: readString(element.value) + }; +} + +async function waitForReadiness( + webContents: WebContents, + waitUntil: string, + timeoutMs: number, + requestNavigation?: () => Promise, + expectedUrl?: string +): Promise { + if (waitUntil === "none") { + if (requestNavigation) { + await requestNavigation(); + } + return { matched: true, matchedEvent: "none", readinessUrl: safeWebContentsUrl(webContents), timedOut: false }; + } + if (webContents.isDestroyed()) { + return { matched: false, matchedEvent: "destroyed", timedOut: false }; + } + if (requestNavigation) { + const readiness = waitForNextReadinessEvent(webContents, waitUntil, timeoutMs, { + expectedUrl: normalizeNavigationUrlForMatch(expectedUrl), + previousUrl: safeWebContentsUrl(webContents) + }); + try { + await requestNavigation(); + } catch (error) { + return navigationFailureResult("navigation_request_failed", { + errorDescription: formatError(error), + url: normalizeNavigationUrlForMatch(expectedUrl) || safeWebContentsUrl(webContents) + }); + } + return await readiness; + } + + const deadline = Date.now() + timeoutMs; + while (Date.now() <= deadline) { + if (webContents.isDestroyed()) { + return { matched: false, matchedEvent: "destroyed", timedOut: false }; + } + + if (!webContents.isLoading()) { + const readinessUrl = safeWebContentsUrl(webContents); + if (isChromiumErrorPage(readinessUrl)) { + return navigationFailureResult("chrome-error", { + errorDescription: "Chromium displayed an internal error page.", + url: readinessUrl + }); + } + if (waitUntil === "interactive") { + const interactive = await interactiveReadinessResult(webContents, readinessUrl); + if (interactive) { + return interactive; + } + } + if (waitUntil === "domcontentloaded") { + return { matched: true, matchedEvent: "domcontentloaded", readinessUrl, timedOut: false }; + } + if (waitUntil === "load") { + return { matched: true, matchedEvent: "load", readinessUrl, timedOut: false }; + } + if (waitUntil === "network_idle") { + const idle = await waitForNoLoadingStart(webContents, Math.min(500, Math.max(0, deadline - Date.now()))); + if (idle && !webContents.isDestroyed() && !webContents.isLoading()) { + return { matched: true, matchedEvent: "network_idle", readinessUrl: safeWebContentsUrl(webContents), timedOut: false }; + } + } + } + + const event = await waitForReadinessEvent(webContents, Math.max(0, deadline - Date.now())); + if (event.type === "timeout") { + break; + } + if (event.type === "destroyed") { + return { matched: false, matchedEvent: "destroyed", timedOut: false }; + } + if (event.type === "did-fail-load" && event.errorCode !== -3) { + return navigationFailureResult("did-fail-load", event); + } + const eventUrl = event.url || safeWebContentsUrl(webContents); + if (isChromiumErrorPage(eventUrl)) { + return navigationFailureResult("chrome-error", { + errorDescription: "Chromium displayed an internal error page.", + url: eventUrl + }); + } + if (waitUntil === "interactive" && isInteractiveReadinessEvent(event)) { + const interactive = await interactiveReadinessResult(webContents, eventUrl); + if (interactive) { + return interactive; + } + } + if (waitUntil === "domcontentloaded" && event.type === "dom-ready") { + return { matched: true, matchedEvent: "domcontentloaded", readinessUrl: eventUrl, timedOut: false }; + } + if (waitUntil === "load" && (event.type === "did-finish-load" || event.type === "did-stop-loading") && !webContents.isDestroyed() && !webContents.isLoading()) { + return { matched: true, matchedEvent: "load", readinessUrl: eventUrl, timedOut: false }; + } + if (waitUntil === "network_idle" && (event.type === "did-finish-load" || event.type === "did-stop-loading") && !webContents.isDestroyed() && !webContents.isLoading()) { + const idle = await waitForNoLoadingStart(webContents, Math.min(500, Math.max(0, deadline - Date.now()))); + if (idle && !webContents.isDestroyed() && !webContents.isLoading()) { + return { matched: true, matchedEvent: "network_idle", readinessUrl: safeWebContentsUrl(webContents), timedOut: false }; + } + } + } + if (waitUntil === "interactive" || waitUntil === "network_idle") { + const fallback = await interactiveReadinessResult( + webContents, + undefined, + waitUntil === "network_idle" ? "interactive_after_network_idle_timeout" : "interactive" + ); + if (fallback) { + return fallback; + } + } + return { + matched: false, + matchedEvent: webContents.isDestroyed() ? "destroyed" : undefined, + timedOut: !webContents.isDestroyed() + }; +} + +async function waitForNextReadinessEvent( + webContents: WebContents, + waitUntil: string, + timeoutMs: number, + context: NavigationReadinessContext +): Promise { + const deadline = Date.now() + timeoutMs; + let navigationStarted = false; + let lastNavigationUrl: string | undefined; + + while (Date.now() <= deadline) { + if (webContents.isDestroyed()) { + return { matched: false, matchedEvent: "destroyed", timedOut: false }; + } + + const event = await waitForReadinessEvent(webContents, Math.max(0, deadline - Date.now())); + if (event.type === "timeout") { + break; + } + if (event.type === "destroyed") { + return { matched: false, matchedEvent: "destroyed", timedOut: false }; + } + + const eventUrl = event.url || safeWebContentsUrl(webContents); + if (isNavigationStartEvent(event)) { + if (event.isMainFrame !== false && isRelevantNavigationUrl(eventUrl, context)) { + navigationStarted = true; + lastNavigationUrl = eventUrl; + } + continue; + } + + if (event.type === "did-fail-load") { + if (event.errorCode === -3) { + continue; + } + if (event.isMainFrame !== false && (navigationStarted || isRelevantNavigationUrl(eventUrl, context))) { + return navigationFailureResult("did-fail-load", event); + } + continue; + } + + if (!navigationStarted) { + continue; + } + + if (isChromiumErrorPage(eventUrl)) { + return navigationFailureResult("chrome-error", { + errorDescription: "Chromium displayed an internal error page.", + url: eventUrl + }); + } + if (waitUntil === "interactive" && isInteractiveReadinessEvent(event)) { + const interactive = await interactiveReadinessResult(webContents, eventUrl || lastNavigationUrl); + if (interactive) { + return interactive; + } + } + if (waitUntil === "domcontentloaded" && event.type === "dom-ready") { + return { matched: true, matchedEvent: "domcontentloaded", readinessUrl: eventUrl || lastNavigationUrl, timedOut: false }; + } + if (waitUntil === "load" && (event.type === "did-finish-load" || event.type === "did-stop-loading") && !webContents.isDestroyed() && !webContents.isLoading()) { + return { matched: true, matchedEvent: "load", readinessUrl: eventUrl || lastNavigationUrl, timedOut: false }; + } + if (waitUntil === "network_idle" && (event.type === "did-finish-load" || event.type === "did-stop-loading") && !webContents.isDestroyed() && !webContents.isLoading()) { + const idle = await waitForNoLoadingStart(webContents, Math.min(500, Math.max(0, deadline - Date.now()))); + if (idle && !webContents.isDestroyed() && !webContents.isLoading()) { + return { matched: true, matchedEvent: "network_idle", readinessUrl: safeWebContentsUrl(webContents) || lastNavigationUrl, timedOut: false }; + } + } + } + if (waitUntil === "interactive" || waitUntil === "network_idle") { + const fallback = await interactiveReadinessResult( + webContents, + lastNavigationUrl, + waitUntil === "network_idle" ? "interactive_after_network_idle_timeout" : "interactive" + ); + if (fallback && (navigationStarted || isRelevantNavigationUrl(fallback.readinessUrl, context))) { + return fallback; + } + } + return { + matched: false, + matchedEvent: webContents.isDestroyed() ? "destroyed" : undefined, + timedOut: !webContents.isDestroyed() + }; +} + +function waitForReadinessEvent(webContents: WebContents, timeoutMs: number): Promise { + return new Promise((resolve) => { + let settled = false; + const finish = (event: ReadinessEvent) => { + if (settled) { + return; + } + settled = true; + clearTimeout(timer); + webContents.off("did-navigate", onDidNavigate); + webContents.off("did-redirect-navigation", onDidRedirectNavigation); + webContents.off("did-fail-load", onDidFailLoad); + webContents.off("did-finish-load", onDidFinishLoad); + webContents.off("did-start-navigation", onDidStartNavigation); + webContents.off("did-start-loading", onDidStartLoading); + webContents.off("did-stop-loading", onDidStopLoading); + webContents.off("dom-ready", onDomReady); + webContents.off("destroyed", onDestroyed); + resolve(event); + }; + const onDidFailLoad = ( + _event: ElectronEvent, + errorCode: number, + errorDescription: string, + validatedUrl: string, + isMainFrame?: boolean + ) => finish({ + errorCode, + errorDescription, + isMainFrame, + type: "did-fail-load", + url: validatedUrl || safeWebContentsUrl(webContents) + }); + const onDidFinishLoad = () => finish({ type: "did-finish-load", url: safeWebContentsUrl(webContents) }); + const onDidNavigate = (_event: ElectronEvent, url: string) => finish({ isMainFrame: true, type: "did-navigate", url }); + const onDidRedirectNavigation = (_event: ElectronEvent, url: string, isInPlace?: boolean, isMainFrame?: boolean) => { + finish({ isMainFrame, type: isInPlace ? "did-navigate-in-page" : "did-redirect-navigation", url }); + }; + const onDidStartNavigation = (_event: ElectronEvent, url: string, isInPlace?: boolean, isMainFrame?: boolean) => { + finish({ isMainFrame, type: isInPlace ? "did-navigate-in-page" : "did-start-navigation", url }); + }; + const onDidStartLoading = () => finish({ type: "did-start-loading", url: safeWebContentsUrl(webContents) }); + const onDidStopLoading = () => finish({ type: "did-stop-loading", url: safeWebContentsUrl(webContents) }); + const onDomReady = () => finish({ type: "dom-ready", url: safeWebContentsUrl(webContents) }); + const onDestroyed = () => finish({ type: "destroyed" }); + const timer = setTimeout(() => finish({ type: "timeout" }), Math.max(0, timeoutMs)); + + webContents.once("did-navigate", onDidNavigate); + webContents.once("did-redirect-navigation", onDidRedirectNavigation); + webContents.once("did-fail-load", onDidFailLoad); + webContents.once("did-finish-load", onDidFinishLoad); + webContents.once("did-start-navigation", onDidStartNavigation); + webContents.once("did-start-loading", onDidStartLoading); + webContents.once("did-stop-loading", onDidStopLoading); + webContents.once("dom-ready", onDomReady); + webContents.once("destroyed", onDestroyed); + }); +} + +function waitForNoLoadingStart(webContents: WebContents, timeoutMs: number): Promise { + return new Promise((resolve) => { + let settled = false; + const finish = (idle: boolean) => { + if (settled) { + return; + } + settled = true; + clearTimeout(timer); + webContents.off("did-start-loading", onDidStartLoading); + webContents.off("destroyed", onDestroyed); + resolve(idle); + }; + const onDidStartLoading = () => finish(false); + const onDestroyed = () => finish(false); + const timer = setTimeout(() => finish(true), Math.max(0, timeoutMs)); + webContents.once("did-start-loading", onDidStartLoading); + webContents.once("destroyed", onDestroyed); + }); +} + +async function interactiveReadinessResult( + webContents: WebContents, + fallbackUrl?: string, + matchedEvent = "interactive" +): Promise { + if (webContents.isDestroyed()) { + return undefined; + } + const readinessUrl = safeWebContentsUrl(webContents) || fallbackUrl; + if (!isUsableInteractiveUrl(readinessUrl)) { + return undefined; + } + const readyState = await documentReadyState(webContents); + if (readyState === "interactive" || readyState === "complete" || !webContents.isLoading()) { + return { matched: true, matchedEvent, readinessUrl, timedOut: false }; + } + return undefined; +} + +async function documentReadyState(webContents: WebContents): Promise { + try { + const value = await executeJavaScriptWithTimeout( + webContents, + "document.readyState", + 1000, + "Document readiness check" + ); + return typeof value === "string" ? value : undefined; + } catch { + return undefined; + } +} + +function isInteractiveReadinessEvent(event: ReadinessEvent): boolean { + return event.type === "dom-ready" || + event.type === "did-finish-load" || + event.type === "did-stop-loading"; +} + +function isUsableInteractiveUrl(value: string | undefined): value is string { + return Boolean(value) && !isBlankPageUrl(value) && !isChromiumErrorPage(value); +} + +function navigationFailureResult(matchedEvent: string, event: Pick): ReadinessResult { + return { + matched: false, + matchedEvent, + navigationError: { + ...(event.errorCode !== undefined ? { errorCode: event.errorCode } : {}), + ...(event.errorDescription ? { errorDescription: event.errorDescription } : {}), + ...(event.url ? { url: event.url } : {}) + }, + readinessUrl: event.url, + timedOut: false + }; +} + +function isNavigationStartEvent(event: ReadinessEvent): boolean { + return event.type === "did-start-navigation" || + event.type === "did-redirect-navigation" || + event.type === "did-navigate"; +} + +function isRelevantNavigationUrl(url: string | undefined, context: NavigationReadinessContext): boolean { + if (!url) { + return false; + } + const normalizedUrl = normalizeUrlForComparison(url); + if (!normalizedUrl) { + return false; + } + if (context.expectedUrl && urlsMatchForNavigation(normalizedUrl, context.expectedUrl)) { + return true; + } + if (isChromiumErrorPage(normalizedUrl)) { + return true; + } + if (isBlankPageUrl(normalizedUrl)) { + return isBlankPageUrl(context.expectedUrl); + } + if (!context.previousUrl) { + return true; + } + return !urlsMatchForNavigation(normalizedUrl, context.previousUrl); +} + +function normalizeNavigationUrlForMatch(value: string | undefined): string | undefined { + const trimmed = value?.trim(); + if (!trimmed) { + return undefined; + } + if (isBlankPageUrl(trimmed) || isChromiumErrorPage(trimmed)) { + return trimmed; + } + if (/^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed)) { + return normalizeUrlForComparison(trimmed); + } + if (/^(localhost|127\.0\.0\.1|\[::1\])(?::\d+)?(?:\/|$)/i.test(trimmed) || trimmed.includes(".")) { + return normalizeUrlForComparison(`https://${trimmed}`); + } + return normalizeUrlForComparison(`https://www.google.com/search?q=${encodeURIComponent(trimmed)}`); +} + +function normalizeUrlForComparison(value: string | undefined): string | undefined { + const trimmed = value?.trim(); + if (!trimmed) { + return undefined; + } + try { + const url = new URL(trimmed); + url.hash = ""; + return url.toString(); + } catch { + return trimmed; + } +} + +function urlsMatchForNavigation(left: string | undefined, right: string | undefined): boolean { + if (!left || !right) { + return false; + } + const normalizedLeft = normalizeUrlForComparison(left); + const normalizedRight = normalizeUrlForComparison(right); + if (!normalizedLeft || !normalizedRight) { + return false; + } + if (normalizedLeft === normalizedRight) { + return true; + } + try { + const leftUrl = new URL(normalizedLeft); + const rightUrl = new URL(normalizedRight); + return leftUrl.protocol === rightUrl.protocol && + leftUrl.hostname === rightUrl.hostname && + leftUrl.pathname === rightUrl.pathname && + leftUrl.search === rightUrl.search; + } catch { + return normalizedLeft === normalizedRight; + } +} + +function isBlankPageUrl(value: string | undefined): boolean { + return value === "about:blank"; +} + +function isChromiumErrorPage(value: string | undefined): boolean { + return value === "chrome-error://chromewebdata/"; +} + +function safeWebContentsUrl(webContents: WebContents): string | undefined { + if (webContents.isDestroyed()) { + return undefined; + } + try { + return webContents.getURL(); + } catch { + return undefined; + } +} + +function normalizeWaitUntil(value: string | undefined, fallback: string): string { + const normalized = (value || fallback).toLowerCase().replace(/[-\s]/g, "_"); + if (normalized === "auto" || normalized === "interactive" || normalized === "ready") { + return "interactive"; + } + if (normalized === "dom_ready" || normalized === "domcontentloaded") { + return "domcontentloaded"; + } + if (normalized === "networkidle" || normalized === "network_idle") { + return "network_idle"; + } + if (normalized === "none" || normalized === "load") { + return normalized; + } + return fallback; +} + +function readHandoffKind(value: unknown): BuiltInBrowserAutomationHandoffKind { + const kind = readString(value); + if ( + kind === "blocked" || + kind === "human_verification" || + kind === "login_required" || + kind === "other" || + kind === "verification_code" + ) { + return kind; + } + return "other"; +} + +function normalizeEventChannels(values: string[]): Set { + const normalized = values + .map((value) => value.toLowerCase().trim()) + .filter(Boolean); + if (normalized.length === 0) { + return new Set(["tab", "navigation", "dom", "runtime", "dialog", "download", "input", "focus", "selection", "handoff"]); + } + return new Set(normalized); +} + +function matchesSubscriptionEvent(subscription: EventSubscription, event: BrowserAutomationEvent): boolean { + const channel = eventChannel(event.kind); + if (!subscription.channels.has(channel) && !subscription.channels.has(event.kind) && !subscription.channels.has("*")) { + return false; + } + if (!subscription.ref) { + return true; + } + if (!event.tabId || event.tabId === subscription.ref.tabId) { + return true; + } + return channel === "tab"; +} + +function eventChannel(kind: string): string { + if (kind.startsWith("tab.")) return "tab"; + if (kind.startsWith("page.navigation") || kind.startsWith("page.loading")) return "navigation"; + if (kind === "page.dom_ready") return "dom"; + if (kind.startsWith("runtime.")) return "runtime"; + if (kind.startsWith("dialog.")) return "dialog"; + if (kind.startsWith("download.")) return "download"; + if (kind.startsWith("handoff.")) return "handoff"; + if (kind.startsWith("input.")) return "input"; + if (kind.startsWith("focus.")) return "focus"; + if (kind.startsWith("selection.")) return "selection"; + return kind.split(".")[0] || kind; +} + +function subscriptionDescriptor(subscription: EventSubscription): Record { + return { + channels: [...subscription.channels], + cursor: makeEventCursor(subscription), + redactTextInput: subscription.redactTextInput, + sampleMouseMove: subscription.sampleMouseMove, + session: subscription.ref, + startedAt: subscription.startedAt, + subscriptionId: subscription.subscriptionId + }; +} + +function findRecentHandoffResolution(filter: { handoffId?: string; tabId?: string }): BrowserAutomationEvent | undefined { + const events = builtInBrowserService.getAutomationEvents({ replayRecentMs: automationEventReplayMs }); + for (let index = events.length - 1; index >= 0; index -= 1) { + const event = events[index]; + if (event.kind !== "handoff.completed" && event.kind !== "handoff.dismissed") { + continue; + } + if (filter.handoffId && event.handoffId !== filter.handoffId) { + continue; + } + if (filter.tabId && event.tabId !== filter.tabId) { + continue; + } + return event; + } + return undefined; +} + +function handoffResolutionResult( + event: BrowserAutomationEvent, + handoff: BuiltInBrowserAutomationHandoff | undefined, + timedOut: boolean +): Record { + return { + event, + handoff, + matched: !timedOut, + state: browserWindowState(), + status: event.handoffStatus || (event.kind === "handoff.completed" ? "completed" : "dismissed"), + timedOut, + title: event.title, + url: event.url + }; +} + +function eventsAfterCursor(subscription: EventSubscription, cursorSeq?: number): BrowserAutomationEvent[] { + const seq = cursorSeq ?? 0; + return subscription.events.filter((event) => event.seq > seq); +} + +function cursorDropped(subscription: EventSubscription, cursorSeq?: number): boolean { + if (cursorSeq === undefined || subscription.events.length === 0) { + return subscription.dropped; + } + return subscription.dropped && cursorSeq < subscription.events[0].seq - 1; +} + +function makeEventCursor(subscription: EventSubscription, seq?: number): Record { + const lastEvent = subscription.events.findLast((event) => seq === undefined || event.seq <= seq) || subscription.events.at(-1); + return { + dropped: subscription.dropped, + seq: seq ?? lastEvent?.seq ?? 0, + subscriptionId: subscription.subscriptionId, + ts: lastEvent?.ts ?? subscription.startedAt + }; +} + +function readCursorSeq(value: unknown): number | undefined { + if (!isRecord(value)) { + return undefined; + } + return readNumber(value.seq); +} + +function matchesAwaitFilter(event: BrowserAutomationEvent, args: Record): boolean { + const match = isRecord(args.match) ? args.match : args; + const kinds = readStringArray(match.kinds); + const kind = readString(match.kind); + if (kind && event.kind !== kind) { + return false; + } + if (kinds.length > 0 && !kinds.includes(event.kind)) { + return false; + } + const tabId = readString(match.tabId); + if (tabId && event.tabId !== tabId) { + return false; + } + const windowId = readString(match.windowId); + if (windowId && event.windowId !== windowId) { + return false; + } + return stringMatchesPattern(event.url, readString(match.urlPattern)) + && stringMatchesPattern(event.title, readString(match.titlePattern)) + && stringMatchesPattern(event.summary, readString(match.summaryPattern)); +} + +function stringMatchesPattern(value: string | undefined, pattern: string | undefined): boolean { + if (!pattern) { + return true; + } + const haystack = value || ""; + try { + return new RegExp(pattern).test(haystack); + } catch { + return haystack.toLowerCase().includes(pattern.toLowerCase()); + } +} + +async function handleJavaScriptDialog( + webContents: WebContents, + accept: boolean, + promptText: string | undefined, + session: BrowserSessionRef +): Promise> { + let attachedHere = false; + try { + if (!webContents.debugger.isAttached()) { + webContents.debugger.attach("1.3"); + attachedHere = true; + } + await withTimeout(webContents.debugger.sendCommand("Page.enable"), defaultJavascriptTimeoutMs, "Timed out enabling browser dialog handling."); + await withTimeout( + webContents.debugger.sendCommand("Page.handleJavaScriptDialog", { + accept, + ...(promptText !== undefined ? { promptText } : {}) + }), + defaultJavascriptTimeoutMs, + "Timed out handling browser dialog." + ); + return { + accepted: accept, + ok: true, + promptText, + session, + title: await webContents.getTitle(), + url: webContents.getURL() + }; + } catch (error) { + throw new Error(`Failed to handle browser dialog: ${formatError(error)}`); + } finally { + if (attachedHere && webContents.debugger.isAttached()) { + try { + webContents.debugger.detach(); + } catch { + // Ignore detach errors after the dialog is resolved. + } + } + } +} + +async function executeJavaScriptWithTimeout( + webContents: WebContents, + script: string, + timeoutMs: number, + label: string +): Promise { + if (webContents.isDestroyed()) { + throw new Error(`${label} failed because the browser tab is destroyed.`); + } + return await withTimeout( + webContents.executeJavaScript(script, true) as Promise, + timeoutMs, + `${label} timed out after ${timeoutMs}ms.` + ); +} + +async function withTimeout(promise: Promise, timeoutMs: number, message: string): Promise { + let timer: ReturnType | undefined; + try { + return await Promise.race([ + promise, + new Promise((_resolve, reject) => { + timer = setTimeout(() => reject(new Error(message)), Math.max(0, timeoutMs)); + }) + ]); + } finally { + if (timer) { + clearTimeout(timer); + } + } +} + +async function captureSnapshot(webContents: WebContents, options: SnapshotOptions): Promise { + return await executeJavaScriptWithTimeout( + webContents, + `(${snapshotScript})(${JSON.stringify(options)})`, + defaultJavascriptTimeoutMs, + "Browser snapshot" + ) as unknown; +} + +async function captureSnapshotWithHandoff( + webContents: WebContents, + tabId: string | undefined, + options: SnapshotOptions +): Promise { + const snapshot = await captureSnapshot(webContents, options); + const handoff = await maybeRequestPageHandoff(webContents, { + snapshot, + tabId + }); + if (!handoff || !isRecord(snapshot)) { + return snapshot; + } + return { + ...snapshot, + ...humanHelpResultFields(handoff) + }; +} + +async function maybeRequestHandoffAfterNavigation( + webContents: WebContents, + readiness: ReadinessResult, + options: { + requestedUrl?: string; + session?: BrowserSessionRef; + tabId?: string; + waitUntil?: string; + } +): Promise { + if (webContents.isDestroyed()) { + return undefined; + } + + if (!readiness.navigationError) { + const pageHandoff = await maybeRequestPageHandoff(webContents, { + session: options.session, + tabId: options.tabId + }); + if (pageHandoff) { + return pageHandoff; + } + } + + return maybeRequestNavigationHandoff(webContents, readiness, options); +} + +function maybeRequestNavigationHandoff( + webContents: WebContents, + readiness: ReadinessResult, + options: { + requestedUrl?: string; + session?: BrowserSessionRef; + tabId?: string; + waitUntil?: string; + } +): BuiltInBrowserAutomationHandoff | undefined { + if (readiness.matched || webContents.isDestroyed()) { + return undefined; + } + + const tabId = options.tabId || options.session?.tabId; + const existing = existingHandoffForTab(tabId); + if (existing) { + return existing; + } + + const currentUrl = safeWebContentsUrl(webContents); + const target = options.requestedUrl || readiness.readinessUrl || currentUrl || "the requested page"; + const error = readiness.navigationError; + const reason = error + ? `Browser navigation was blocked or failed while opening ${target}${error.errorCode !== undefined ? ` (error ${error.errorCode})` : ""}${error.errorDescription ? `: ${error.errorDescription}` : "."}` + : `Browser automation did not reach ${options.waitUntil || "the requested readiness state"} while opening ${target}.`; + + return builtInBrowserService.requestAutomationHandoff({ + kind: "blocked", + message: "Please inspect this browser page and complete or retry the blocked step, then click Done.", + reason, + sessionId: options.session?.sessionId, + tabId + }); +} + +async function maybeRequestPageHandoff( + webContents: WebContents, + options: { + session?: BrowserSessionRef; + snapshot?: unknown; + tabId?: string; + } = {} +): Promise { + if (webContents.isDestroyed()) { + return undefined; + } + + let snapshot = options.snapshot; + if (snapshot === undefined) { + try { + snapshot = await captureSnapshot(webContents, { + maxElements: 20, + maxText: 1200 + }); + } catch { + snapshot = undefined; + } + } + + const detection = detectPageHandoff(snapshot, { + title: await webContents.getTitle(), + url: webContents.getURL() + }); + if (!detection) { + return undefined; + } + + const tabId = options.tabId || options.session?.tabId; + const existing = existingHandoffForTab(tabId); + if (existing) { + return existing; + } + + return builtInBrowserService.requestAutomationHandoff({ + kind: detection.kind, + message: detection.message, + reason: detection.reason, + sessionId: options.session?.sessionId, + tabId + }); +} + +function existingHandoffForTab(tabId: string | undefined): BuiltInBrowserAutomationHandoff | undefined { + const existing = builtInBrowserService.getAutomationState().automationHandoff; + if (existing && (!tabId || existing.tabId === tabId)) { + return existing; + } + return undefined; +} + +function handoffMatches( + handoff: BuiltInBrowserAutomationHandoff | undefined, + filter: { handoffId?: string; tabId?: string } +): boolean { + if (!handoff) { + return false; + } + if (filter.handoffId && handoff.id !== filter.handoffId) { + return false; + } + if (filter.tabId && handoff.tabId !== filter.tabId) { + return false; + } + return true; +} + +function detectPageHandoff(snapshot: unknown, fallback: { title?: string; url?: string }): BrowserHandoffDetection | undefined { + const record = isRecord(snapshot) ? snapshot : {}; + const title = readString(record.title) || fallback.title || ""; + const url = readString(record.url) || fallback.url || ""; + const signal = pageHandoffSignal(record, title, url); + if (isChromiumErrorPage(url)) { + return { + kind: "blocked", + message: "Please inspect this browser error page and retry or complete the blocked step, then click Done.", + reason: "Chromium displayed an internal error page for this navigation." + }; + } + if (!signal) { + return undefined; + } + + const verificationCode = /verification code|security code|one[-\s]?time code|2[-\s]?step|two[-\s]?step|authenticator|check your (?:phone|email)|enter the code/.test(signal); + if (verificationCode) { + return { + kind: "verification_code", + message: "Please enter the verification code in this browser window, then click Done.", + reason: `The page appears to require a verification code: ${title || url || "current page"}.` + }; + } + + const cloudflare = signal.includes("cloudflare") || /\bray id\s*:/.test(signal); + const botVerification = /performing security verification|security verification|verif(?:y|ies|ying)[^.\n]{0,80}(?:not a bot|human)|not a bot|not a robot|human verification|are you human|checking your browser|security check/.test(signal); + const challenge = /captcha|hcaptcha|recaptcha|turnstile|cf-challenge|cf-turnstile/.test(signal); + const justAMoment = title.trim().toLowerCase() === "just a moment..." || signal.includes("just a moment..."); + if (challenge || (cloudflare && (botVerification || justAMoment))) { + return { + kind: "human_verification", + message: "Please complete the security verification in this browser window, then click Done.", + reason: `The page appears to be a human verification or bot-protection challenge: ${title || url || "current page"}.` + }; + } + + const loginUrl = /(?:^|[/.?=&_-])(?:login|signin|sign-in|accounts)(?:[/.?=&_-]|$)/.test(url.toLowerCase()) || + /accounts\.google\.com|mail\.google\.com/.test(url.toLowerCase()); + const loginTitle = /\bsign in\b|\blog in\b|\blogin\b|google accounts|account login/.test(title.toLowerCase()); + const credentialFields = /email or phone|email address|username|password|forgot (?:email|password)|create account|\bnext\b/.test(signal); + if ((loginUrl || loginTitle) && credentialFields) { + return { + kind: "login_required", + message: "Please sign in in this browser window, then click Done.", + reason: `The page appears to require a human login: ${title || url || "current page"}.` + }; + } + + return undefined; +} + +function humanHelpResultFields(handoff: BuiltInBrowserAutomationHandoff): Record { + return { + handoff, + handoffRequired: true, + humanHelp: { + aliasTool: "askHumanHelp", + instruction: "Browser automation needs human help. The browser window has been shown with a top toolbar instruction. Call browser_handoff_wait to receive the user's Done/Hide result before continuing automation.", + handoffId: handoff.id, + message: handoff.message, + reason: handoff.reason, + required: true, + status: "requested", + tool: "browser_handoff_wait" + }, + humanHelpRequired: true, + nextAction: "human_help" + }; +} + +function pageHandoffSignal(record: Record, title: string, url: string): string { + const parts = [title, url, rawString(record.text)]; + const activeElement = isRecord(record.activeElement) ? record.activeElement : undefined; + if (activeElement) { + parts.push(rawString(activeElement.name), rawString(activeElement.text), rawString(activeElement.role)); + } + const elements = Array.isArray(record.elements) ? record.elements : []; + for (const element of elements.slice(0, 40)) { + if (!isRecord(element)) { + continue; + } + parts.push( + rawString(element.name), + rawString(element.text), + rawString(element.role), + rawString(element.tag), + rawString(element.href) + ); + } + return parts + .filter((part): part is string => Boolean(part)) + .join("\n") + .replace(/\s+/g, " ") + .toLowerCase(); +} + +async function runTargetAction( + webContents: WebContents, + action: "click" | "focus" | "scroll" | "select" | "type", + target?: BrowserTarget, + value: Record = {} +): Promise { + const result = await executeJavaScriptWithTimeout( + webContents, + `(${targetActionScript})(${JSON.stringify({ action, target, value })})`, + defaultJavascriptTimeoutMs, + `Browser target action ${action}` + ) as { error?: string; ok?: boolean }; + if (!result?.ok) { + throw new Error(result?.error || `Browser target action failed: ${action}`); + } + return result; +} + +async function pressKey(webContents: WebContents, key: string, target?: BrowserTarget): Promise { + if (target) { + await runTargetAction(webContents, "focus", target); + } + webContents.sendInputEvent({ keyCode: key, type: "keyDown" }); + webContents.sendInputEvent({ keyCode: key, type: "keyUp" }); + return { + key, + ok: true, + title: await webContents.getTitle(), + url: webContents.getURL() + }; +} + +async function waitForPageCondition( + webContents: WebContents, + condition: { + selector?: string; + text?: string; + timeoutMs: number; + urlIncludes?: string; + urlMatches?: string; + } +): Promise { + const deadline = Date.now() + condition.timeoutMs; + let last: unknown; + while (Date.now() <= deadline) { + try { + last = await executeJavaScriptWithTimeout( + webContents, + `(${waitForConditionScript})(${JSON.stringify(condition)})`, + Math.max(100, Math.min(1000, deadline - Date.now())), + "Browser wait condition check" + ) as unknown; + if (isRecord(last) && last.matched === true) { + return last; + } + } catch (error) { + last = { + error: formatError(error), + matched: false + }; + } + await sleep(150); + } + return { + last, + matched: false, + timedOut: true, + title: await webContents.getTitle(), + url: webContents.getURL() + }; +} + +const snapshotScript = function(options: { limit?: number; maxElements: number; maxText?: number; offset?: number }) { + const maxElements = Math.max(1, Math.min(300, Math.floor(options.maxElements || 80))); + const textLimitInput = options.limit ?? options.maxText ?? 3000; + const textLimit = Math.max(0, Math.min(20000, Math.floor(textLimitInput))); + const requestedTextOffset = Math.max(0, Math.floor(options.offset || 0)); + const refAttribute = "data-ccr-browser-ref"; + const elementSelector = [ + "a[href]", + "button", + "input", + "textarea", + "select", + "summary", + "[role]", + "[contenteditable='true']", + "[contenteditable='plaintext-only']", + "[tabindex]:not([tabindex='-1'])" + ].join(","); + + function visible(el: Element) { + const style = window.getComputedStyle(el); + const rect = el.getBoundingClientRect(); + return style.display !== "none" && + style.visibility !== "hidden" && + Number(style.opacity || "1") > 0 && + rect.width > 0 && + rect.height > 0; + } + + function cssEscape(value: string) { + return window.CSS && typeof window.CSS.escape === "function" + ? window.CSS.escape(value) + : value.replace(/[^a-zA-Z0-9_-]/g, "\\$&"); + } + + function uniqueIdSelector(id: string) { + if (!id) return ""; + const selector = `#${cssEscape(id)}`; + try { + return document.querySelectorAll(selector).length === 1 ? selector : ""; + } catch { + return ""; + } + } + + function refFor(el: Element) { + const win = window as Window & { __ccrBrowserRefSeq?: number }; + const existing = el.getAttribute(refAttribute); + if (existing) { + return `[${refAttribute}="${cssEscape(existing)}"]`; + } + for (let attempt = 0; attempt < 1000; attempt += 1) { + win.__ccrBrowserRefSeq = (win.__ccrBrowserRefSeq || 0) + 1; + const nextRef = `ccr-${win.__ccrBrowserRefSeq}`; + const selector = `[${refAttribute}="${cssEscape(nextRef)}"]`; + if (!document.querySelector(selector)) { + el.setAttribute(refAttribute, nextRef); + return selector; + } + } + + const idSelector = uniqueIdSelector((el as HTMLElement).id || ""); + if (idSelector) return idSelector; + const parts: string[] = []; + let current: Element | null = el; + while (current && current.nodeType === 1 && current !== document.documentElement && parts.length < 8) { + const tag = current.tagName.toLowerCase(); + const parent: HTMLElement | null = current.parentElement; + if (!parent) { + parts.unshift(tag); + break; + } + const parentIdSelector = uniqueIdSelector(parent.id || ""); + const sameTag = Array.from(parent.children).filter((child): child is Element => child instanceof Element && child.tagName === current!.tagName); + const index = sameTag.indexOf(current) + 1; + parts.unshift(`${tag}:nth-of-type(${Math.max(index, 1)})`); + if (parentIdSelector) { + parts.unshift(parentIdSelector); + break; + } + current = parent; + } + return parts.join(" > "); + } + + function text(el: Element) { + return ((el as HTMLElement).innerText || el.textContent || "").replace(/\s+/g, " ").trim(); + } + + function labelText(el: Element) { + const labelledBy = el.getAttribute("aria-labelledby"); + if (labelledBy) { + const value = labelledBy + .split(/\s+/) + .map((id) => document.getElementById(id)?.innerText || "") + .join(" ") + .replace(/\s+/g, " ") + .trim(); + if (value) return value; + } + const id = (el as HTMLInputElement).id; + if (id) { + const label = document.querySelector(`label[for="${cssEscape(id)}"]`); + if (label) return text(label); + } + const wrappingLabel = el.closest("label"); + return wrappingLabel ? text(wrappingLabel) : ""; + } + + function unsafeField(el: Element) { + const input = el as HTMLInputElement; + const haystack = [ + input.type, + input.name, + input.id, + input.autocomplete, + el.getAttribute("aria-label"), + labelText(el) + ].join(" ").toLowerCase(); + return /\b(password|secret|token|api[-_ ]?key|bearer|credential)\b/.test(haystack); + } + + function valueOf(el: Element) { + if (!(el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement)) { + return ""; + } + if (unsafeField(el)) { + return ""; + } + return el.value || ""; + } + + function roleOf(el: Element) { + const explicit = el.getAttribute("role"); + if (explicit) return explicit; + const tag = el.tagName.toLowerCase(); + const input = el as HTMLInputElement; + if (tag === "a") return "link"; + if (tag === "button") return "button"; + if (tag === "textarea") return "textbox"; + if (tag === "select") return "combobox"; + if (tag === "summary") return "button"; + if (tag === "input") { + if (["button", "submit", "reset"].includes(input.type)) return "button"; + if (input.type === "checkbox") return "checkbox"; + if (input.type === "radio") return "radio"; + if (input.type === "range") return "slider"; + return "textbox"; + } + if (el.getAttribute("contenteditable")) return "textbox"; + return ""; + } + + function nameOf(el: Element) { + const input = el as HTMLInputElement; + return ( + el.getAttribute("aria-label") || + labelText(el) || + el.getAttribute("alt") || + el.getAttribute("title") || + input.placeholder || + (input.type && ["button", "submit", "reset"].includes(input.type) ? input.value : "") || + text(el) + ).replace(/\s+/g, " ").trim(); + } + + const elements = Array.from(document.querySelectorAll(elementSelector)) + .filter(visible) + .slice(0, maxElements) + .map((el, index) => { + const rect = el.getBoundingClientRect(); + return { + checked: el instanceof HTMLInputElement && ["checkbox", "radio"].includes(el.type) ? el.checked : undefined, + disabled: (el as HTMLButtonElement | HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement).disabled || undefined, + href: el instanceof HTMLAnchorElement ? el.href : undefined, + index, + name: nameOf(el).slice(0, 240), + placeholder: (el as HTMLInputElement).placeholder || undefined, + rect: { + height: Math.round(rect.height), + width: Math.round(rect.width), + x: Math.round(rect.x), + y: Math.round(rect.y) + }, + ref: refFor(el), + role: roleOf(el), + tag: el.tagName.toLowerCase(), + text: text(el).slice(0, 180), + value: valueOf(el) || undefined + }; + }); + + const pageText = (document.body?.innerText || "").replace(/\s+\n/g, "\n").replace(/\n{3,}/g, "\n\n").trim(); + const textOffset = Math.min(requestedTextOffset, pageText.length); + const textWindow = pageText.slice(textOffset, textOffset + textLimit); + const textNextOffset = textOffset + textWindow.length; + + return { + activeElement: document.activeElement ? { + name: nameOf(document.activeElement).slice(0, 240), + ref: refFor(document.activeElement), + role: roleOf(document.activeElement), + tag: document.activeElement.tagName.toLowerCase() + } : undefined, + elements, + text: textWindow, + textHasMore: textNextOffset < pageText.length, + textLength: pageText.length, + textLimit, + textNextOffset, + textOffset, + textRemaining: Math.max(0, pageText.length - textNextOffset), + textReturned: textWindow.length, + textRequestedOffset: requestedTextOffset !== textOffset ? requestedTextOffset : undefined, + title: document.title, + url: location.href + }; +}; + +const targetActionScript = function(request: { + action: "click" | "focus" | "scroll" | "select" | "type"; + target?: BrowserTarget; + value?: Record; +}) { + function visible(el: Element) { + const style = window.getComputedStyle(el); + const rect = el.getBoundingClientRect(); + return style.display !== "none" && style.visibility !== "hidden" && rect.width > 0 && rect.height > 0; + } + function text(el: Element) { + return ((el as HTMLElement).innerText || el.textContent || "").replace(/\s+/g, " ").trim(); + } + function cssEscape(value: string) { + return window.CSS && typeof window.CSS.escape === "function" + ? window.CSS.escape(value) + : value.replace(/[^a-zA-Z0-9_-]/g, "\\$&"); + } + function labelText(el: Element) { + const id = (el as HTMLInputElement).id; + if (id) { + const label = document.querySelector(`label[for="${cssEscape(id)}"]`); + if (label) return text(label); + } + const wrappingLabel = el.closest("label"); + return wrappingLabel ? text(wrappingLabel) : ""; + } + function roleOf(el: Element) { + const explicit = el.getAttribute("role"); + if (explicit) return explicit.toLowerCase(); + const tag = el.tagName.toLowerCase(); + const input = el as HTMLInputElement; + if (tag === "a") return "link"; + if (tag === "button") return "button"; + if (tag === "textarea") return "textbox"; + if (tag === "select") return "combobox"; + if (tag === "summary") return "button"; + if (tag === "input") { + if (["button", "submit", "reset"].includes(input.type)) return "button"; + if (input.type === "checkbox") return "checkbox"; + if (input.type === "radio") return "radio"; + return "textbox"; + } + if (el.getAttribute("contenteditable")) return "textbox"; + return ""; + } + function nameOf(el: Element) { + const input = el as HTMLInputElement; + return ( + el.getAttribute("aria-label") || + labelText(el) || + el.getAttribute("alt") || + el.getAttribute("title") || + input.placeholder || + input.value || + text(el) + ).replace(/\s+/g, " ").trim(); + } + function summarize(el: Element) { + const rect = el.getBoundingClientRect(); + return { + name: nameOf(el).slice(0, 240), + rect: { + height: Math.round(rect.height), + width: Math.round(rect.width), + x: Math.round(rect.x), + y: Math.round(rect.y) + }, + role: roleOf(el), + tag: el.tagName.toLowerCase(), + text: text(el).slice(0, 180) + }; + } + function selectorElement(selector: string) { + try { + return document.querySelector(selector); + } catch { + return null; + } + } + function matchesText(value: string, needle: string, exact?: boolean) { + const left = value.trim().toLowerCase(); + const right = needle.trim().toLowerCase(); + return exact ? left === right : left.includes(right); + } + function findTarget(target?: BrowserTarget) { + if (!target && request.action !== "scroll") return null; + const directSelector = target?.selector || target?.ref || target?.axNodeId; + if (directSelector) { + return selectorElement(directSelector); + } + const selector = [ + "a[href]", + "button", + "input", + "textarea", + "select", + "summary", + "[role]", + "[contenteditable='true']", + "[contenteditable='plaintext-only']", + "[tabindex]:not([tabindex='-1'])" + ].join(","); + const candidates = Array.from(document.querySelectorAll(selector)).filter(visible); + const role = target?.role?.trim().toLowerCase(); + const needle = target?.text?.trim(); + const matches = candidates.filter((el) => { + if (role && roleOf(el) !== role) return false; + if (!needle) return true; + const haystack = [ + nameOf(el), + text(el), + (el as HTMLInputElement).placeholder || "", + (el as HTMLInputElement).value || "" + ].join(" "); + return matchesText(haystack, needle, target?.exact); + }); + return matches[Math.max(0, Math.floor(target?.index || 0))] || null; + } + function dispatchValueEvents(el: Element) { + el.dispatchEvent(new Event("input", { bubbles: true })); + el.dispatchEvent(new Event("change", { bubbles: true })); + } + + const el = findTarget(request.target); + if (!el && request.action !== "scroll") { + return { error: "No matching browser element found.", ok: false }; + } + if (el) { + el.scrollIntoView({ block: "center", inline: "center" }); + if (el instanceof HTMLElement) { + el.focus({ preventScroll: true }); + } + } + + if (request.action === "focus") { + return { element: el ? summarize(el) : undefined, ok: true }; + } + + if (request.action === "click") { + if (!(el instanceof HTMLElement)) { + return { error: "Matched element is not clickable.", ok: false }; + } + el.click(); + return { element: summarize(el), ok: true }; + } + + if (request.action === "type") { + const nextText = typeof request.value?.text === "string" ? request.value.text : ""; + const replaceExisting = request.value?.replaceExisting !== false; + if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) { + el.value = replaceExisting ? nextText : `${el.value}${nextText}`; + dispatchValueEvents(el); + return { element: summarize(el), ok: true, value: el.type === "password" ? "" : el.value }; + } + if (el instanceof HTMLElement && el.isContentEditable) { + if (replaceExisting) { + el.textContent = nextText; + } else { + el.textContent = `${el.textContent || ""}${nextText}`; + } + dispatchValueEvents(el); + return { element: summarize(el), ok: true }; + } + return { error: "Matched element cannot receive typed text.", ok: false }; + } + + if (request.action === "select") { + if (!(el instanceof HTMLSelectElement)) { + return { error: "Matched element is not a select.", ok: false }; + } + const requestedValue = typeof request.value?.value === "string" ? request.value.value : ""; + const requestedLabel = typeof request.value?.label === "string" ? request.value.label : ""; + const exact = request.value?.exact === true; + const option = Array.from(el.options).find((candidate) => { + if (requestedValue && candidate.value === requestedValue) return true; + if (!requestedLabel) return false; + return matchesText(candidate.textContent || "", requestedLabel, exact); + }); + if (!option) { + return { error: "No matching select option found.", ok: false }; + } + el.value = option.value; + dispatchValueEvents(el); + return { element: summarize(el), label: option.textContent || "", ok: true, value: option.value }; + } + + if (request.action === "scroll") { + const deltaX = typeof request.value?.deltaX === "number" ? request.value.deltaX : 0; + const deltaY = typeof request.value?.deltaY === "number" ? request.value.deltaY : 700; + if (el instanceof HTMLElement) { + el.scrollBy({ behavior: "auto", left: deltaX, top: deltaY }); + return { element: summarize(el), ok: true }; + } + window.scrollBy({ behavior: "auto", left: deltaX, top: deltaY }); + return { ok: true, scrollX: window.scrollX, scrollY: window.scrollY }; + } + + return { error: "Unsupported browser target action.", ok: false }; +}; + +const waitForConditionScript = function(condition: { + selector?: string; + text?: string; + urlIncludes?: string; + urlMatches?: string; +}) { + const checks: Array<{ matched: boolean; type: string }> = []; + if (condition.urlIncludes) { + checks.push({ matched: location.href.includes(condition.urlIncludes), type: "urlIncludes" }); + } + if (condition.urlMatches) { + let matched = false; + try { + matched = new RegExp(condition.urlMatches).test(location.href); + } catch { + matched = false; + } + checks.push({ matched, type: "urlMatches" }); + } + if (condition.selector) { + let matched = false; + try { + const el = document.querySelector(condition.selector); + if (el) { + const style = window.getComputedStyle(el); + const rect = el.getBoundingClientRect(); + matched = style.display !== "none" && style.visibility !== "hidden" && rect.width > 0 && rect.height > 0; + } + } catch { + matched = false; + } + checks.push({ matched, type: "selector" }); + } + if (condition.text) { + const pageText = (document.body?.innerText || "").toLowerCase(); + checks.push({ matched: pageText.includes(condition.text.toLowerCase()), type: "text" }); + } + return { + checks, + matched: checks.length > 0 && checks.every((check) => check.matched), + title: document.title, + url: location.href + }; +}; + +function readTarget(value: unknown): BrowserTarget { + if (!isRecord(value)) { + throw new Error("A browser target object is required."); + } + return { + axNodeId: readString(value.axNodeId), + backendNodeId: readNumber(value.backendNodeId), + exact: value.exact === true, + index: clampInteger(readNumber(value.index) ?? 0, 0, 10000), + ref: readString(value.ref) || readString(value.axNodeId), + role: readString(value.role), + selector: readString(value.selector), + text: readString(value.text) + }; +} + +function requiredString(value: unknown, message: string): string { + const text = readString(value); + if (!text) { + throw new Error(message); + } + return text; +} + +function readString(value: unknown): string | undefined { + return typeof value === "string" && value.trim() ? value.trim() : undefined; +} + +function readStringArray(value: unknown): string[] { + return Array.isArray(value) ? value.filter((item): item is string => typeof item === "string" && item.trim().length > 0) : []; +} + +function uniqueStrings(values: string[]): string[] { + return [...new Set(values)]; +} + +function readNumber(value: unknown): number | undefined { + return typeof value === "number" && Number.isFinite(value) ? value : undefined; +} + +function clampInteger(value: number, min: number, max: number): number { + return Math.min(max, Math.max(min, Math.trunc(value))); +} + +function objectSchema(properties: Record, required: string[] = []): JsonValue { + return { + additionalProperties: false, + properties, + required, + type: "object" + }; +} + +type CompactResultOptions = { + maxArrayItems: number; + maxDepth: number; + maxObjectKeys: number; + maxStringChars: number; +}; + +function formatToolResult(toolName: string, result: unknown): string { + const compacted = compactToolResult(toolName, result); + const serialized = stringifyToolResult(compacted); + if (serialized.length <= maxToolResultChars) { + return serialized; + } + + const tighter = compactJsonValue(compacted, { + maxArrayItems: 50, + maxDepth: 6, + maxObjectKeys: 80, + maxStringChars: 600 + }); + const tightSerialized = stringifyToolResult({ + guidance: largeResultGuidance(toolName), + maxChars: maxToolResultChars, + originalChars: serialized.length, + result: tighter, + tool: toolName, + truncated: true + }); + if (tightSerialized.length <= maxToolResultChars) { + return tightSerialized; + } + + return stringifyToolResult({ + guidance: largeResultGuidance(toolName), + maxChars: maxToolResultChars, + originalChars: serialized.length, + preview: truncateString(tightSerialized, 12_000), + tool: toolName, + truncated: true + }); +} + +function compactToolResult(toolName: string, result: unknown): unknown { + if (toolName === "browser_snapshot") { + return compactSnapshotResult(result); + } + if (toolName === "browser_ax_snapshot") { + return compactAxSnapshotResult(result); + } + if (toolName === "browser_ax_query") { + return compactArrayResult(result, "matches", 80, 600); + } + if (toolName === "browser_events_read" || toolName === "browser_events_await") { + return compactArrayResult(result, "events", 80, 800); + } + return compactJsonValue(result, defaultCompactResultOptions()); +} + +function compactSnapshotResult(result: unknown): unknown { + if (!isRecord(result)) { + return compactJsonValue(result, defaultCompactResultOptions()); + } + + const elements = Array.isArray(result.elements) ? result.elements : []; + const text = rawString(result.text); + const compacted: Record = {}; + for (const [key, value] of Object.entries(result)) { + if (key === "elements" || key === "text") { + continue; + } + compacted[key] = compactJsonValue(value, { + maxArrayItems: 40, + maxDepth: 5, + maxObjectKeys: 60, + maxStringChars: 600 + }); + } + + if (text !== undefined) { + compacted.text = truncateString(text, maxBrowserResultTextChars); + } + compacted.elements = elements + .slice(0, maxSnapshotResultElements) + .map((element) => compactJsonValue(element, { + maxArrayItems: 20, + maxDepth: 4, + maxObjectKeys: 40, + maxStringChars: 500 + })); + compacted.elementCount = elements.length; + + const truncated: Record = {}; + if (text !== undefined && text.length > maxBrowserResultTextChars) { + truncated.textChars = text.length - maxBrowserResultTextChars; + } + if (elements.length > maxSnapshotResultElements) { + truncated.elements = elements.length - maxSnapshotResultElements; + } + if (Object.keys(truncated).length > 0) { + compacted.truncated = truncated; + } + return compacted; +} + +function compactAxSnapshotResult(result: unknown): unknown { + if (!isRecord(result)) { + return compactJsonValue(result, defaultCompactResultOptions()); + } + + const nodes = Array.isArray(result.nodes) ? result.nodes : []; + const compacted: Record = {}; + for (const [key, value] of Object.entries(result)) { + if (key === "nodes") { + continue; + } + compacted[key] = compactJsonValue(value, { + maxArrayItems: 40, + maxDepth: 5, + maxObjectKeys: 60, + maxStringChars: 400 + }); + } + compacted.nodes = nodes + .slice(0, maxAxSnapshotResultNodes) + .map((node) => compactJsonValue(node, { + maxArrayItems: 80, + maxDepth: 5, + maxObjectKeys: 40, + maxStringChars: 260 + })); + compacted.nodeCount = nodes.length; + if (nodes.length > maxAxSnapshotResultNodes) { + compacted.truncated = { + nodes: nodes.length - maxAxSnapshotResultNodes + }; + } + return compacted; +} + +function compactArrayResult(result: unknown, key: string, maxItems: number, maxStringChars: number): unknown { + if (!isRecord(result)) { + return compactJsonValue(result, defaultCompactResultOptions()); + } + + const items = Array.isArray(result[key]) ? result[key] : []; + const compacted: Record = {}; + for (const [entryKey, value] of Object.entries(result)) { + if (entryKey === key) { + continue; + } + compacted[entryKey] = compactJsonValue(value, { + maxArrayItems: 40, + maxDepth: 5, + maxObjectKeys: 60, + maxStringChars + }); + } + compacted[key] = items + .slice(0, maxItems) + .map((item) => compactJsonValue(item, { + maxArrayItems: 40, + maxDepth: 5, + maxObjectKeys: 60, + maxStringChars + })); + compacted[`${key}Count`] = items.length; + if (items.length > maxItems) { + compacted.truncated = { + [key]: items.length - maxItems + }; + } + return compacted; +} + +function compactJsonValue( + value: unknown, + options: CompactResultOptions, + depth = 0, + seen: WeakSet = new WeakSet() +): unknown { + if (value === null || typeof value === "boolean" || typeof value === "number") { + return value; + } + if (typeof value === "string") { + return truncateString(value, options.maxStringChars); + } + if (typeof value === "bigint") { + return value.toString(); + } + if (typeof value === "undefined" || typeof value === "function" || typeof value === "symbol") { + return undefined; + } + if (typeof value !== "object") { + return String(value); + } + if (seen.has(value)) { + return "[Circular]"; + } + if (depth >= options.maxDepth) { + return { + reason: "Maximum result depth reached.", + truncated: true + }; + } + + seen.add(value); + if (Array.isArray(value)) { + const limit = Math.max(0, options.maxArrayItems); + const items = value + .slice(0, limit) + .map((item) => compactJsonValue(item, options, depth + 1, seen)); + if (value.length > limit) { + items.push({ + omittedItems: value.length - limit, + truncated: true + }); + } + seen.delete(value); + return items; + } + + const entries = Object.entries(value); + const compacted: Record = {}; + for (const [key, entryValue] of entries.slice(0, options.maxObjectKeys)) { + compacted[key] = compactJsonValue(entryValue, options, depth + 1, seen); + } + if (entries.length > options.maxObjectKeys) { + compacted.truncatedKeys = entries.length - options.maxObjectKeys; + } + seen.delete(value); + return compacted; +} + +function defaultCompactResultOptions(): CompactResultOptions { + return { + maxArrayItems: maxToolResultArrayItems, + maxDepth: 8, + maxObjectKeys: maxToolResultObjectKeys, + maxStringChars: maxToolResultStringChars + }; +} + +function stringifyToolResult(value: unknown): string { + return JSON.stringify(value, null, 2) || "null"; +} + +function rawString(value: unknown): string | undefined { + return typeof value === "string" ? value : undefined; +} + +function truncateString(value: string, maxChars: number): string { + if (value.length <= maxChars) { + return value; + } + let suffix = "\n[truncated]"; + for (let index = 0; index < 2; index += 1) { + const keep = Math.max(0, maxChars - suffix.length); + suffix = `\n[truncated ${value.length - keep} chars]`; + } + return `${value.slice(0, Math.max(0, maxChars - suffix.length))}${suffix}`; +} + +function largeResultGuidance(toolName: string): string { + if (toolName === "browser_snapshot") { + return "Result was compacted. Re-run browser_snapshot with lower maxElements/limit, page text with offset/limit, or use browser_ax_query to fetch targeted elements."; + } + if (toolName === "browser_ax_snapshot") { + return "Result was compacted. Re-run browser_ax_snapshot with lower limit or scope=outline, or use browser_ax_query with role/name/text filters."; + } + if (toolName === "browser_ax_query") { + return "Result was compacted. Re-run browser_ax_query with a lower limit or narrower role/name/text filters."; + } + if (toolName === "browser_events_read" || toolName === "browser_events_await") { + return "Result was compacted. Read events with a lower limit/maxEvents or a more specific cursor/filter."; + } + return "Result was compacted before returning to the MCP client. Use narrower arguments or lower limits for more detail."; +} + +function textResult(text: string): ToolCallResult { + return { + content: [{ text, type: "text" }] + }; +} + +function jsonRpcResult(id: null | number | string, result: JsonValue): JsonRpcResponse { + return { + id, + jsonrpc: "2.0", + result + }; +} + +function jsonRpcError(id: null | number | string, code: number, message: string): JsonRpcResponse { + return { + error: { + code, + message + }, + id, + jsonrpc: "2.0" + }; +} + +function sendJson(response: ServerResponse, status: number, payload: unknown): void { + const body = `${JSON.stringify(payload)}\n`; + response.writeHead(status, { + "content-length": Buffer.byteLength(body), + "content-type": "application/json; charset=utf-8" + }); + response.end(body); +} + +function readRequestBody(request: IncomingMessage, maxBytes: number): Promise { + return new Promise((resolve, reject) => { + const chunks: Buffer[] = []; + let total = 0; + request.on("data", (chunk: Buffer | string) => { + const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk); + total += buffer.byteLength; + if (total > maxBytes) { + reject(new Error("MCP request body is too large.")); + request.destroy(); + return; + } + chunks.push(buffer); + }); + request.on("end", () => resolve(Buffer.concat(chunks))); + request.on("error", reject); + }); +} + +function sleep(ms: number): Promise { + return new Promise((resolve) => setTimeout(resolve, ms)); +} + +function isRecord(value: unknown): value is Record { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + +function formatError(error: unknown): string { + return error instanceof Error ? error.message : String(error); +} diff --git a/src/main/browser-preload.ts b/packages/electron/src/main/browser-preload.ts similarity index 67% rename from src/main/browser-preload.ts rename to packages/electron/src/main/browser-preload.ts index f479d88..9d571ff 100644 --- a/src/main/browser-preload.ts +++ b/packages/electron/src/main/browser-preload.ts @@ -1,16 +1,19 @@ import { contextBridge, ipcRenderer, type IpcRendererEvent } from "electron"; -import { IPC_CHANNELS } from "../shared/ipc-channels"; -import type { BuiltInBrowserState } from "../shared/app"; +import { IPC_CHANNELS } from "@ccr/core/contracts/ipc-channels"; +import type { BuiltInBrowserState, ChromeLoginImportJob, ChromeLoginImportRequest } from "@ccr/core/contracts/app"; contextBridge.exposeInMainWorld("ccrBrowser", { back: (tabId?: string) => ipcRenderer.invoke(IPC_CHANNELS.browserBack, tabId) as Promise, closeTab: (tabId: string) => ipcRenderer.invoke(IPC_CHANNELS.browserCloseTab, tabId) as Promise, forward: (tabId?: string) => ipcRenderer.invoke(IPC_CHANNELS.browserForward, tabId) as Promise, + getChromeLoginImport: (id: string) => ipcRenderer.invoke(IPC_CHANNELS.browserGetChromeLoginImport, id) as Promise, getState: () => ipcRenderer.invoke(IPC_CHANNELS.browserGetState) as Promise, navigate: (url: string, tabId?: string) => ipcRenderer.invoke(IPC_CHANNELS.browserNavigate, url, tabId) as Promise, newTab: (url?: string) => ipcRenderer.invoke(IPC_CHANNELS.browserNewTab, url) as Promise, reload: (tabId?: string) => ipcRenderer.invoke(IPC_CHANNELS.browserReload, tabId) as Promise, + resolveAutomationHandoff: (status: "completed" | "dismissed") => ipcRenderer.invoke(IPC_CHANNELS.browserResolveAutomationHandoff, status) as Promise, selectTab: (tabId: string) => ipcRenderer.invoke(IPC_CHANNELS.browserSelectTab, tabId) as Promise, + startChromeLoginImport: (request: ChromeLoginImportRequest) => ipcRenderer.invoke(IPC_CHANNELS.browserStartChromeLoginImport, request) as Promise, onStateChanged: (callback: (state: BuiltInBrowserState) => void) => { const handler = (_event: IpcRendererEvent, state: BuiltInBrowserState) => callback(state); ipcRenderer.on(IPC_CHANNELS.browserStateChanged, handler); diff --git a/src/main/built-in-browser.ts b/packages/electron/src/main/built-in-browser.ts similarity index 52% rename from src/main/built-in-browser.ts rename to packages/electron/src/main/built-in-browser.ts index d845d5a..c941016 100644 --- a/src/main/built-in-browser.ts +++ b/packages/electron/src/main/built-in-browser.ts @@ -1,4 +1,5 @@ import { randomUUID } from "node:crypto"; +import { EventEmitter } from "node:events"; import { BrowserWindow, clipboard, @@ -10,28 +11,64 @@ import { WebContentsView, type ContextMenuParams, type IpcMainInvokeEvent, - type MenuItemConstructorOptions + type MenuItemConstructorOptions, + type WebContents } from "electron"; import path from "node:path"; import { pathToFileURL } from "node:url"; -import type { AppConfig, BuiltInBrowserState, BuiltInBrowserTabState, GatewayPluginAppConfig, InstalledBrowserApp } from "../shared/app"; -import { IPC_CHANNELS } from "../shared/ipc-channels"; -import { APP_NAME } from "./constants"; -import { pluginService } from "./plugins/service"; -import { proxyService } from "../server/proxy/service"; +import type { + AppConfig, + BuiltInBrowserAutomationHandoff, + BuiltInBrowserAutomationHandoffKind, + BuiltInBrowserState, + BuiltInBrowserTabState, + ChromeLoginImportRequest, + GatewayPluginAppConfig, + InstalledBrowserApp +} from "@ccr/core/contracts/app"; +import { IPC_CHANNELS } from "@ccr/core/contracts/ipc-channels"; +import { APP_NAME } from "@ccr/core/config/constants"; +import { pluginService } from "@ccr/core/plugins/service"; +import { chromeLoginImportService } from "./chrome-login-import"; type BrowserTab = BuiltInBrowserTabState & { view: WebContentsView; }; -const browserChromeHeight = 82; +export type BrowserAutomationEvent = { + errorCode?: number; + errorDescription?: string; + handoffId?: string; + handoffStatus?: "completed" | "dismissed"; + kind: string; + seq: number; + summary?: string; + tabId?: string; + title?: string; + ts: number; + url?: string; + windowId?: string; +}; + +export type BrowserAutomationEventListener = (event: BrowserAutomationEvent) => void; + +const browserChromeBaseHeight = 82; +const browserHandoffToolbarHeight = 44; const browserHomeUrl = "about:blank"; const browserPartition = "persist:ccr-built-in-browser"; +const browserAutomationWindowId = "ccr-built-in-browser"; +const maxAutomationEventHistory = 512; +const maxAutomationEventAgeMs = 60_000; const titleBarHeight = 46; class BuiltInBrowserService { private activeTabId?: string; private apps: InstalledBrowserApp[] = []; + private automationHandoff?: BuiltInBrowserAutomationHandoff; + private automationEventSeq = 0; + private readonly automationEvents = new EventEmitter(); + private readonly automationEventHistory: BrowserAutomationEvent[] = []; + private hideWindowAfterAutomationHandoff = false; private proxyConfigKey = ""; private tabOrder: string[] = []; private tabs = new Map(); @@ -44,10 +81,7 @@ class BuiltInBrowserService { async open(config: AppConfig): Promise { await this.syncProxy(config); - const window = this.window && !this.window.isDestroyed() ? this.window : this.createWindow(); - if (this.tabs.size === 0) { - this.createTab(browserHomeUrl); - } + const window = this.ensureWindow(); if (window.isMinimized()) { window.restore(); } @@ -57,28 +91,18 @@ class BuiltInBrowserService { this.sendState(); } + async openHidden(config: AppConfig): Promise { + await this.syncProxy(config); + this.ensureWindow(); + this.layoutActiveView(); + this.sendState(); + } + async syncProxy(config: AppConfig): Promise { this.syncApps(config); const browserSession = session.fromPartition(browserPartition); - if (config.proxy.enabled) { - await proxyService.refreshUpstreamProxyFromCurrentSystem(); - } - const proxyStatus = proxyService.getStatus(); - const shouldUseProxy = Boolean( - config.proxy.enabled && - proxyStatus.state === "running" && - proxyStatus.endpoint - ); - const proxyConfig = shouldUseProxy - ? { - mode: "fixed_servers" as const, - proxyBypassRules: "<-loopback>", - proxyRules: electronProxyRules(proxyStatus.endpoint) - } - : { - mode: "direct" as const - }; + const proxyConfig = { mode: "system" as const }; const nextKey = JSON.stringify(proxyConfig); if (nextKey === this.proxyConfigKey) { return; @@ -100,9 +124,211 @@ class BuiltInBrowserService { async clearProxy(): Promise { const browserSession = session.fromPartition(browserPartition); - await browserSession.setProxy({ mode: "direct" }); + const proxyConfig = { mode: "system" as const }; + await browserSession.setProxy(proxyConfig); await browserSession.forceReloadProxyConfig(); - this.proxyConfigKey = JSON.stringify({ mode: "direct" }); + this.proxyConfigKey = JSON.stringify(proxyConfig); + } + + getAutomationState(): BuiltInBrowserState { + return this.getState(); + } + + getAutomationWindowId(): string { + return browserAutomationWindowId; + } + + getAutomationEvents(options: { replayRecentMs?: number } = {}): BrowserAutomationEvent[] { + const replayRecentMs = Math.max(0, Math.floor(options.replayRecentMs ?? 0)); + const cutoff = replayRecentMs > 0 ? Date.now() - replayRecentMs : 0; + this.pruneAutomationEventHistory(); + return this.automationEventHistory + .filter((event) => event.ts >= cutoff) + .map((event) => ({ ...event })); + } + + requestAutomationHandoff(request: { + kind?: BuiltInBrowserAutomationHandoffKind; + message?: string; + reason?: string; + sessionId?: string; + tabId?: string; + }): BuiltInBrowserAutomationHandoff { + const existingWindow = this.window && !this.window.isDestroyed() ? this.window : undefined; + if (!this.automationHandoff) { + this.hideWindowAfterAutomationHandoff = !existingWindow || !existingWindow.isVisible() || existingWindow.isMinimized(); + } + const tab = this.getTab(request.tabId); + if (request.tabId && tab?.id) { + this.selectTab(request.tabId); + } + const targetTab = tab || this.getTab(); + const handoff: BuiltInBrowserAutomationHandoff = { + id: randomUUID(), + kind: request.kind || "other", + message: request.message?.trim() || defaultAutomationHandoffMessage(request.kind), + ...(request.reason?.trim() ? { reason: request.reason.trim() } : {}), + requestedAt: Date.now(), + ...(request.sessionId?.trim() ? { sessionId: request.sessionId.trim() } : {}), + status: "pending", + tabId: targetTab?.id || request.tabId || this.activeTabId + }; + this.automationHandoff = handoff; + this.layoutActiveView(); + this.showAutomationWindow(); + this.sendState(); + this.emitAutomationEvent({ + handoffId: handoff.id, + kind: "handoff.requested", + summary: handoff.message, + tabId: handoff.tabId, + title: targetTab?.title, + url: targetTab?.url + }); + return handoff; + } + + resolveAutomationHandoff(status: "completed" | "dismissed" = "completed"): BuiltInBrowserState { + const handoff = this.automationHandoff; + const shouldHideWindow = this.hideWindowAfterAutomationHandoff; + this.automationHandoff = undefined; + this.hideWindowAfterAutomationHandoff = false; + this.layoutActiveView(); + this.sendState(); + if (handoff) { + const tab = this.getTab(handoff.tabId); + if (shouldHideWindow) { + this.hideAutomationWindow(); + } + this.emitAutomationEvent({ + handoffId: handoff.id, + handoffStatus: status, + kind: status === "completed" ? "handoff.completed" : "handoff.dismissed", + summary: status === "completed" ? "User completed the requested browser handoff." : "User dismissed the requested browser handoff.", + tabId: handoff.tabId, + title: tab?.title, + url: tab?.url + }); + } + return this.getState(); + } + + subscribeAutomationEvents( + listener: BrowserAutomationEventListener, + options: { replayRecentMs?: number } = {} + ): () => void { + this.automationEvents.on("event", listener); + const replayRecentMs = Math.max(0, Math.floor(options.replayRecentMs ?? 0)); + if (replayRecentMs > 0) { + const cutoff = Date.now() - replayRecentMs; + this.pruneAutomationEventHistory(); + for (const event of this.automationEventHistory) { + if (event.ts >= cutoff) { + listener(event); + } + } + } + return () => this.automationEvents.off("event", listener); + } + + createAutomationTab(url = browserHomeUrl): BuiltInBrowserTabState { + const tab = this.createTab(url); + const { view: _view, ...state } = tab; + return state; + } + + selectAutomationTab(tabId: string): BuiltInBrowserState { + this.selectTab(tabId); + return this.getState(); + } + + closeAutomationTab(tabId: string): BuiltInBrowserState { + this.closeTab(tabId); + return this.getState(); + } + + async navigateAutomationTab(url: string, tabId?: string): Promise { + const tab = this.getTab(tabId); + if (!tab) { + throw new Error("Browser tab was not found."); + } + + const nextUrl = normalizeBrowserUrl(url); + tab.url = nextUrl; + if (tab.id === this.activeTabId) { + this.layoutActiveView(); + } + this.sendState(); + void tab.view.webContents.loadURL(nextUrl).catch((error) => { + this.emitAutomationEvent({ + kind: "page.load_failed", + summary: `Navigation request failed: ${formatError(error)}`, + tabId: tab.id, + title: tab.title, + url: nextUrl + }); + }); + this.emitAutomationEvent({ + kind: "page.navigation_requested", + summary: `Navigation requested: ${nextUrl}`, + tabId: tab.id, + title: tab.title, + url: nextUrl + }); + return this.getState(); + } + + goBackAutomationTab(tabId?: string): BuiltInBrowserState { + const tab = this.getTab(tabId); + tab?.view.webContents.navigationHistory.goBack(); + if (tab) { + this.emitAutomationEvent({ + kind: "tab.go_back", + summary: `Go back in tab ${tab.id}.`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); + } + return this.getState(); + } + + goForwardAutomationTab(tabId?: string): BuiltInBrowserState { + const tab = this.getTab(tabId); + tab?.view.webContents.navigationHistory.goForward(); + if (tab) { + this.emitAutomationEvent({ + kind: "tab.go_forward", + summary: `Go forward in tab ${tab.id}.`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); + } + return this.getState(); + } + + reloadAutomationTab(tabId?: string): BuiltInBrowserState { + const tab = this.getTab(tabId); + tab?.view.webContents.reload(); + if (tab) { + this.emitAutomationEvent({ + kind: "tab.reload", + summary: `Reload tab ${tab.id}.`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); + } + return this.getState(); + } + + getAutomationWebContents(tabId?: string): WebContents { + const tab = this.getTab(tabId); + if (!tab || tab.view.webContents.isDestroyed()) { + throw new Error("Browser tab is unavailable."); + } + return tab.view.webContents; } private registerIpcHandlers(): void { @@ -110,6 +336,14 @@ class BuiltInBrowserService { this.assertBrowserSender(event); return this.getState(); }); + ipcMain.handle(IPC_CHANNELS.browserStartChromeLoginImport, async (event, request: ChromeLoginImportRequest) => { + this.assertBrowserSender(event); + return await chromeLoginImportService.createJob(request); + }); + ipcMain.handle(IPC_CHANNELS.browserGetChromeLoginImport, (event, id: string) => { + this.assertBrowserSender(event); + return chromeLoginImportService.getJob(typeof id === "string" ? id : ""); + }); ipcMain.handle(IPC_CHANNELS.browserNewTab, (event, url?: string) => { this.assertBrowserSender(event); this.createTab(url); @@ -145,6 +379,34 @@ class BuiltInBrowserService { this.getTab(tabId)?.view.webContents.reload(); return this.getState(); }); + ipcMain.handle(IPC_CHANNELS.browserResolveAutomationHandoff, (event, status?: string) => { + this.assertBrowserSender(event); + return this.resolveAutomationHandoff(status === "dismissed" ? "dismissed" : "completed"); + }); + } + + private ensureWindow(): BrowserWindow { + const window = this.window && !this.window.isDestroyed() ? this.window : this.createWindow(); + if (this.tabs.size === 0) { + this.createTab(browserHomeUrl); + } + return window; + } + + private showAutomationWindow(): void { + const window = this.ensureWindow(); + if (window.isMinimized()) { + window.restore(); + } + window.show(); + window.focus(); + } + + private hideAutomationWindow(): void { + const window = this.window; + if (window && !window.isDestroyed()) { + window.hide(); + } } private createWindow(): BrowserWindow { @@ -187,15 +449,12 @@ class BuiltInBrowserService { this.window = undefined; } }); - window.once("ready-to-show", () => { - if (!window.isDestroyed()) { - window.show(); - } - }); window.webContents.setWindowOpenHandler(() => ({ action: "deny" })); window.webContents.on("did-finish-load", () => this.sendState()); - void window.loadURL(this.resolveRendererUrl("pages/browser/index.html")); + void window.loadURL(this.resolveRendererUrl("pages/browser/index.html")).catch((error) => { + console.warn(`[browser] Failed to load browser chrome: ${formatError(error)}`); + }); return window; } @@ -225,8 +484,23 @@ class BuiltInBrowserService { this.window?.contentView.addChildView(view); view.setVisible(false); this.selectTab(tab.id); - void view.webContents.loadURL(tab.url); + void view.webContents.loadURL(tab.url).catch((error) => { + this.emitAutomationEvent({ + kind: "page.load_failed", + summary: `Initial tab load failed: ${formatError(error)}`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); + }); this.sendState(); + this.emitAutomationEvent({ + kind: "tab.created", + summary: `Created tab ${tab.id}.`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); return tab; } @@ -234,7 +508,14 @@ class BuiltInBrowserService { const { webContents } = tab.view; webContents.setWindowOpenHandler(({ url }) => { if (isHttpUrl(url)) { - this.createTab(url); + const opened = this.createTab(url); + this.emitAutomationEvent({ + kind: "tab.opened", + summary: `Opened new tab from window.open: ${url}`, + tabId: opened.id, + title: opened.title, + url: opened.url + }); } return { action: "deny" }; }); @@ -244,14 +525,35 @@ class BuiltInBrowserService { webContents.on("page-title-updated", (_event, title) => { tab.title = title || titleFromUrl(tab.url); this.sendState(); + this.emitAutomationEvent({ + kind: "page.title", + summary: `Title updated: ${tab.title}`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); }); webContents.on("did-start-loading", () => { tab.isLoading = true; this.updateTabNavigationState(tab); + this.emitAutomationEvent({ + kind: "page.loading_started", + summary: `Loading started: ${tab.url}`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); }); webContents.on("did-stop-loading", () => { tab.isLoading = false; this.updateTabNavigationState(tab); + this.emitAutomationEvent({ + kind: "page.loading_stopped", + summary: `Loading stopped: ${tab.url}`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); }); webContents.on("did-navigate", (_event, url) => { tab.url = url; @@ -260,6 +562,13 @@ class BuiltInBrowserService { this.layoutActiveView(); } this.updateTabNavigationState(tab); + this.emitAutomationEvent({ + kind: "page.navigation", + summary: `Navigated to ${url}`, + tabId: tab.id, + title: tab.title, + url + }); }); webContents.on("did-navigate-in-page", (_event, url) => { tab.url = url; @@ -267,8 +576,15 @@ class BuiltInBrowserService { this.layoutActiveView(); } this.updateTabNavigationState(tab); + this.emitAutomationEvent({ + kind: "page.navigation_in_page", + summary: `In-page navigation to ${url}`, + tabId: tab.id, + title: tab.title, + url + }); }); - webContents.on("did-fail-load", (_event, errorCode, _errorDescription, validatedUrl) => { + webContents.on("did-fail-load", (_event, errorCode, errorDescription, validatedUrl) => { if (errorCode !== -3) { tab.isLoading = false; tab.url = validatedUrl || tab.url; @@ -276,6 +592,35 @@ class BuiltInBrowserService { this.layoutActiveView(); } this.updateTabNavigationState(tab); + this.emitAutomationEvent({ + errorCode, + errorDescription, + kind: "page.load_failed", + summary: `Load failed (${errorCode}): ${errorDescription}`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); + } + }); + webContents.on("dom-ready", () => { + this.emitAutomationEvent({ + kind: "page.dom_ready", + summary: `DOM ready: ${tab.url}`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); + }); + webContents.on("console-message", (_event, level, message) => { + if (level >= 2) { + this.emitAutomationEvent({ + kind: "runtime.console", + summary: message, + tabId: tab.id, + title: tab.title, + url: tab.url + }); } }); webContents.on("destroyed", () => { @@ -286,6 +631,13 @@ class BuiltInBrowserService { this.activeTabId = this.tabOrder[0]; } this.sendState(); + this.emitAutomationEvent({ + kind: "tab.destroyed", + summary: `Destroyed tab ${tab.id}.`, + tabId: tab.id, + title: tab.title, + url: tab.url + }); } }); } @@ -403,6 +755,13 @@ class BuiltInBrowserService { selected.view.webContents.focus(); } this.sendState(); + this.emitAutomationEvent({ + kind: "tab.activated", + summary: `Activated tab ${tabId}.`, + tabId, + title: selected.title, + url: selected.url + }); } private closeTab(tabId: string): void { @@ -415,6 +774,13 @@ class BuiltInBrowserService { this.tabs.delete(tabId); this.tabOrder = this.tabOrder.filter((id) => id !== tabId); tab.view.webContents.close({ waitForBeforeUnload: false }); + this.emitAutomationEvent({ + kind: "tab.closed", + summary: `Closed tab ${tabId}.`, + tabId, + title: tab.title, + url: tab.url + }); if (this.tabOrder.length === 0) { this.createTab(browserHomeUrl); @@ -440,8 +806,23 @@ class BuiltInBrowserService { if (tab.id === this.activeTabId) { this.layoutActiveView(); } - void tab.view.webContents.loadURL(nextUrl); + void tab.view.webContents.loadURL(nextUrl).catch((error) => { + this.emitAutomationEvent({ + kind: "page.load_failed", + summary: `Navigation request failed: ${formatError(error)}`, + tabId: tab.id, + title: tab.title, + url: nextUrl + }); + }); this.sendState(); + this.emitAutomationEvent({ + kind: "page.navigation_requested", + summary: `Navigation requested: ${nextUrl}`, + tabId: tab.id, + title: tab.title, + url: nextUrl + }); } private getTab(tabId?: string): BrowserTab | undefined { @@ -469,17 +850,22 @@ class BuiltInBrowserService { const { height, width } = window.getContentBounds(); activeTab.view.setVisible(true); activeTab.view.setBounds({ - height: Math.max(0, height - browserChromeHeight), + height: Math.max(0, height - this.browserChromeHeight()), width, x: 0, - y: browserChromeHeight + y: this.browserChromeHeight() }); } + private browserChromeHeight(): number { + return browserChromeBaseHeight + (this.automationHandoff ? browserHandoffToolbarHeight : 0); + } + private getState(): BuiltInBrowserState { return { activeTabId: this.activeTabId, apps: this.apps.map((app) => ({ ...app })), + ...(this.automationHandoff ? { automationHandoff: { ...this.automationHandoff } } : {}), tabs: this.tabOrder .map((id) => this.tabs.get(id)) .filter((tab): tab is BrowserTab => Boolean(tab)) @@ -512,6 +898,27 @@ class BuiltInBrowserService { this.activeTabId = undefined; } + private emitAutomationEvent(event: Omit): void { + const nextEvent: BrowserAutomationEvent = { + ...event, + seq: ++this.automationEventSeq, + ts: Date.now(), + windowId: browserAutomationWindowId + }; + this.automationEventHistory.push(nextEvent); + this.pruneAutomationEventHistory(nextEvent.ts); + this.automationEvents.emit("event", nextEvent); + } + + private pruneAutomationEventHistory(now = Date.now()): void { + while (this.automationEventHistory.length > 0 && now - this.automationEventHistory[0].ts > maxAutomationEventAgeMs) { + this.automationEventHistory.shift(); + } + if (this.automationEventHistory.length > maxAutomationEventHistory) { + this.automationEventHistory.splice(0, this.automationEventHistory.length - maxAutomationEventHistory); + } + } + private resolveRendererUrl(relativeHtmlPath: string): string { return pathToFileURL(path.join(__dirname, "../renderer", relativeHtmlPath)).toString(); } @@ -619,9 +1026,22 @@ function titleFromUrl(value: string): string { } } -function electronProxyRules(endpoint: string): string { - const parsed = new URL(endpoint); - const host = parsed.hostname.includes(":") ? `[${parsed.hostname}]` : parsed.hostname; - const port = parsed.port || (parsed.protocol === "https:" ? "443" : "80"); - return `http=${host}:${port};https=${host}:${port}`; +function defaultAutomationHandoffMessage(kind?: BuiltInBrowserAutomationHandoffKind): string { + if (kind === "login_required") { + return "Please sign in on this page, then click Done."; + } + if (kind === "verification_code") { + return "Please enter the verification code, then click Done."; + } + if (kind === "human_verification") { + return "Please complete the human verification, then click Done."; + } + if (kind === "blocked") { + return "Please resolve the blocker on this page, then click Done."; + } + return "Please complete the requested browser step, then click Done."; +} + +function formatError(error: unknown): string { + return error instanceof Error ? error.message : String(error); } diff --git a/packages/electron/src/main/chrome-login-import.ts b/packages/electron/src/main/chrome-login-import.ts new file mode 100644 index 0000000..850dd17 --- /dev/null +++ b/packages/electron/src/main/chrome-login-import.ts @@ -0,0 +1,593 @@ +import { randomUUID } from "node:crypto"; +import http, { type IncomingMessage, type Server, type ServerResponse } from "node:http"; +import { BrowserWindow, session, shell } from "electron"; +import type { + ChromeLoginImportCookie, + ChromeLoginImportJob, + ChromeLoginImportLocalStorage, + ChromeLoginImportRequest, + ChromeLoginImportResult, + ChromeLoginImportTarget +} from "@ccr/core/contracts/app"; + +type ServerInfo = { + server: Server; + url: string; +}; + +type StoredChromeLoginImportJob = ChromeLoginImportJob; + +type CookieSetDetails = Parameters[0]; + +const browserPartition = "persist:ccr-built-in-browser"; +const webSearchPartition = "persist:ccr-browser-web-search-mcp"; +const importJobTtlMs = 5 * 60_000; +const maxImportRequestBytes = 16 * 1024 * 1024; +const maxStoredErrors = 20; +const localStorageWriteTimeoutMs = 15_000; + +class ChromeLoginImportService { + private readonly jobs = new Map(); + private serverInfo?: ServerInfo; + private serverStartPromise?: Promise; + + async createJob(request: ChromeLoginImportRequest): Promise { + const domains = uniqueStrings(request.domains.map(normalizeImportDomain).filter((item): item is string => Boolean(item))); + if (domains.length === 0) { + throw new Error("At least one Chrome import domain is required."); + } + + const target = normalizeImportTarget(request.target); + const serverInfo = await this.ensureServer(); + const id = randomUUID(); + const now = Date.now(); + const job: StoredChromeLoginImportJob = { + confirmUrl: `${serverInfo.url}/chrome-import/jobs/${id}/confirm`, + createdAt: now, + domains, + endpointUrl: serverInfo.url, + expiresAt: now + importJobTtlMs, + id, + importUrl: `${serverInfo.url}/chrome-import/jobs/${id}`, + status: "pending", + target + }; + this.jobs.set(id, job); + this.pruneJobs(); + if (request.openConfirmationPage) { + await this.openConfirmationPage(job.id); + } + return cloneJob(job); + } + + getJob(id: string): ChromeLoginImportJob | undefined { + const job = this.jobs.get(id); + if (!job) { + return undefined; + } + this.refreshExpiredJob(job); + return cloneJob(job); + } + + async openConfirmationPage(id: string): Promise { + const job = this.jobs.get(id); + if (!job) { + throw new Error("Chrome login import job was not found."); + } + this.refreshExpiredJob(job); + if (job.status !== "pending") { + throw new Error(`Chrome login import job is ${job.status}.`); + } + await shell.openExternal(job.confirmUrl); + return cloneJob(job); + } + + private async ensureServer(): Promise { + if (this.serverInfo) { + return this.serverInfo; + } + if (this.serverStartPromise) { + return this.serverStartPromise; + } + + this.serverStartPromise = new Promise((resolve, reject) => { + const server = http.createServer((request, response) => { + void this.handleRequest(request, response).catch((error) => { + sendJson(response, 500, { error: { message: formatError(error) } }); + }); + }); + server.once("error", reject); + server.listen(0, "127.0.0.1", () => { + server.off("error", reject); + const address = server.address(); + if (!address || typeof address === "string") { + server.close(); + reject(new Error("Chrome login import server failed to start.")); + return; + } + const info = { + server, + url: `http://127.0.0.1:${address.port}` + }; + this.serverInfo = info; + resolve(info); + }); + }).finally(() => { + this.serverStartPromise = undefined; + }); + return this.serverStartPromise; + } + + private async handleRequest(request: IncomingMessage, response: ServerResponse): Promise { + setCorsHeaders(response); + if (request.method === "OPTIONS") { + response.writeHead(204); + response.end(); + return; + } + + const path = request.url ? new URL(request.url, "http://127.0.0.1").pathname : "/"; + const match = path.match(/^\/chrome-import\/jobs\/([^/]+)(?:\/(confirm|cookies))?$/); + if (!match) { + sendJson(response, 404, { error: { message: "Chrome login import endpoint not found." } }); + return; + } + + const id = decodeURIComponent(match[1]); + const job = this.jobs.get(id); + if (!job) { + sendJson(response, 404, { error: { message: "Chrome login import job was not found." } }); + return; + } + this.refreshExpiredJob(job); + if (job.status === "expired") { + sendJson(response, 410, { error: { message: "Chrome login import job expired." }, job: cloneJob(job) }); + return; + } + + const action = match[2]; + if (request.method === "GET" && action === "confirm") { + sendHtml(response, 200, confirmationPageHtml(job)); + return; + } + + if (request.method === "GET" && !action) { + sendJson(response, 200, { job: cloneJob(job) }); + return; + } + + if (request.method === "POST" && action === "cookies") { + if (job.status !== "pending") { + sendJson(response, 409, { + error: { + message: `Chrome login import job is ${job.status}.` + }, + job: cloneJob(job) + }); + return; + } + const payload = await readJsonRequest(request); + const result = await this.importLoginState(job, payload); + sendJson(response, 200, { job: cloneJob(job), result }); + return; + } + + sendJson(response, 405, { error: { message: "Unsupported Chrome login import method." } }); + } + + private async importLoginState(job: StoredChromeLoginImportJob, payload: unknown): Promise { + const importPayload = readImportPayload(payload); + const partitions = targetPartitions(job.target); + const result: ChromeLoginImportResult = { + completedAt: Date.now(), + cookieImported: 0, + cookieSkipped: 0, + domains: [...job.domains], + imported: 0, + localStorageImported: 0, + localStorageSkipped: 0, + partitions, + skipped: 0 + }; + const errors: string[] = []; + + for (const cookie of importPayload.cookies) { + const normalized = normalizeChromeCookie(cookie, job.domains); + if (!normalized) { + result.cookieSkipped += 1; + continue; + } + + try { + await Promise.all(partitions.map((partition) => session.fromPartition(partition).cookies.set(normalized))); + result.cookieImported += 1; + } catch (error) { + result.cookieSkipped += 1; + if (errors.length < maxStoredErrors) { + errors.push(`${normalized.domain || new URL(normalized.url).hostname}:${normalized.name}: ${formatError(error)}`); + } + } + } + + await Promise.all(partitions.map((partition) => session.fromPartition(partition).cookies.flushStore())); + + for (const localStorageEntry of importPayload.localStorage) { + const normalized = normalizeLocalStorageEntry(localStorageEntry, job.domains); + if (!normalized) { + result.localStorageSkipped += 1; + continue; + } + + const itemCount = Object.keys(normalized.items).length; + if (itemCount === 0) { + result.localStorageSkipped += 1; + continue; + } + + try { + await Promise.all(partitions.map((partition) => writeLocalStorage(partition, normalized.origin, normalized.items))); + result.localStorageImported += itemCount; + } catch (error) { + result.localStorageSkipped += itemCount; + if (errors.length < maxStoredErrors) { + errors.push(`${normalized.origin}: localStorage: ${formatError(error)}`); + } + } + } + + result.imported = result.cookieImported + result.localStorageImported; + result.skipped = result.cookieSkipped + result.localStorageSkipped; + if (errors.length > 0) { + result.errors = errors; + } + job.result = result; + job.status = result.imported > 0 || result.skipped > 0 ? "completed" : "failed"; + return result; + } + + private refreshExpiredJob(job: StoredChromeLoginImportJob): void { + if (job.status === "pending" && Date.now() > job.expiresAt) { + job.status = "expired"; + } + } + + private pruneJobs(): void { + const cutoff = Date.now() - importJobTtlMs; + for (const [id, job] of this.jobs) { + this.refreshExpiredJob(job); + if (job.expiresAt < cutoff) { + this.jobs.delete(id); + } + } + } +} + +export const chromeLoginImportService = new ChromeLoginImportService(); + +function targetPartitions(target: ChromeLoginImportTarget): string[] { + return target === "browser-and-web-search" + ? [browserPartition, webSearchPartition] + : [browserPartition]; +} + +function normalizeChromeCookie(cookie: ChromeLoginImportCookie, allowedDomains: string[]): CookieSetDetails | undefined { + if (!isRecord(cookie) || typeof cookie.name !== "string" || typeof cookie.value !== "string") { + return undefined; + } + if (cookie.partitionKey !== undefined) { + return undefined; + } + + const rawDomain = readString(cookie.domain).toLowerCase(); + const cookieHost = normalizeCookieHost(rawDomain); + if (!cookieHost || !allowedDomains.some((domain) => cookieDomainMatches(cookieHost, domain))) { + return undefined; + } + + const path = normalizeCookiePath(cookie.path); + const expirationDate = typeof cookie.expirationDate === "number" && Number.isFinite(cookie.expirationDate) + ? cookie.expirationDate + : undefined; + if (expirationDate !== undefined && expirationDate <= Date.now() / 1000) { + return undefined; + } + + const secure = cookie.secure === true; + const details: CookieSetDetails = { + httpOnly: cookie.httpOnly === true, + name: cookie.name, + path, + secure, + url: cookieUrl(cookieHost, path, secure), + value: cookie.value + }; + if (cookie.hostOnly !== true) { + details.domain = rawDomain || cookieHost; + } + if (expirationDate !== undefined && cookie.session !== true) { + details.expirationDate = expirationDate; + } + const sameSite = normalizeSameSite(cookie.sameSite); + if (sameSite) { + details.sameSite = sameSite; + } + return details; +} + +function normalizeLocalStorageEntry( + entry: ChromeLoginImportLocalStorage, + allowedDomains: string[] +): ChromeLoginImportLocalStorage | undefined { + if (!isRecord(entry) || !isRecord(entry.items)) { + return undefined; + } + + let origin: URL; + try { + origin = new URL(readString(entry.origin)); + } catch { + return undefined; + } + + if (!["http:", "https:"].includes(origin.protocol)) { + return undefined; + } + if (!allowedDomains.some((domain) => cookieDomainMatches(origin.hostname.toLowerCase(), domain))) { + return undefined; + } + + const items: Record = {}; + for (const [key, value] of Object.entries(entry.items)) { + if (typeof key === "string" && typeof value === "string") { + items[key] = value; + } + } + return { + items, + origin: origin.origin + }; +} + +async function writeLocalStorage(partition: string, origin: string, items: Record): Promise { + const window = new BrowserWindow({ + height: 480, + paintWhenInitiallyHidden: true, + show: false, + skipTaskbar: true, + title: "CCR Chrome Login Import", + webPreferences: { + contextIsolation: true, + nodeIntegration: false, + partition, + sandbox: true, + webSecurity: true + }, + width: 640 + }); + try { + await withTimeout(window.webContents.loadURL(`${origin}/`), localStorageWriteTimeoutMs, "Timed out loading localStorage origin."); + const loadedOrigin = new URL(window.webContents.getURL()).origin; + if (loadedOrigin !== origin) { + throw new Error(`Origin redirected to ${loadedOrigin}.`); + } + const entries = Object.entries(items); + await window.webContents.executeJavaScript( + `(() => { + const entries = ${JSON.stringify(entries)}; + for (const [key, value] of entries) { + window.localStorage.setItem(key, value); + } + return entries.length; + })()`, + true + ); + } finally { + if (!window.isDestroyed()) { + window.destroy(); + } + } +} + +function normalizeImportTarget(value: unknown): ChromeLoginImportTarget { + return value === "browser-and-web-search" ? "browser-and-web-search" : "browser"; +} + +function normalizeImportDomain(value: unknown): string | undefined { + const raw = readString(value).toLowerCase(); + if (!raw) { + return undefined; + } + try { + const parsed = new URL(raw.includes("://") ? raw : `https://${raw}`); + return normalizeCookieHost(parsed.hostname); + } catch { + return normalizeCookieHost(raw.replace(/^\*\./, "").split("/")[0] || ""); + } +} + +function normalizeCookieHost(value: string): string | undefined { + const host = value.trim().replace(/^\./, "").toLowerCase(); + if (!host || host.includes("*") || host.includes("/") || host.includes(" ")) { + return undefined; + } + return host; +} + +function normalizeCookiePath(value: unknown): string { + const path = readString(value); + return path.startsWith("/") ? path : "/"; +} + +function cookieUrl(host: string, path: string, secure: boolean): string { + const normalizedPath = path.startsWith("/") ? path : "/"; + return `${secure ? "https" : "http"}://${host}${normalizedPath}`; +} + +function cookieDomainMatches(cookieHost: string, allowedDomain: string): boolean { + return cookieHost === allowedDomain || cookieHost.endsWith(`.${allowedDomain}`); +} + +function normalizeSameSite(value: unknown): CookieSetDetails["sameSite"] | undefined { + return value === "lax" || value === "strict" || value === "no_restriction" || value === "unspecified" + ? value + : undefined; +} + +function readImportPayload(payload: unknown): { + cookies: ChromeLoginImportCookie[]; + localStorage: ChromeLoginImportLocalStorage[]; +} { + if (!isRecord(payload)) { + throw new Error("Chrome login import payload must be an object."); + } + const cookies = Array.isArray(payload.cookies) + ? payload.cookies.filter(isRecord) as ChromeLoginImportCookie[] + : []; + const localStorage = Array.isArray(payload.localStorage) + ? payload.localStorage.filter(isRecord) as ChromeLoginImportLocalStorage[] + : []; + if (cookies.length === 0 && localStorage.length === 0) { + throw new Error("Chrome login import payload must include cookies or localStorage."); + } + return { cookies, localStorage }; +} + +function cloneJob(job: StoredChromeLoginImportJob): ChromeLoginImportJob { + return { + ...job, + domains: [...job.domains], + ...(job.result + ? { + result: { + ...job.result, + domains: [...job.result.domains], + ...(job.result.errors ? { errors: [...job.result.errors] } : {}), + partitions: [...job.result.partitions] + } + } + : {}) + }; +} + +async function readJsonRequest(request: IncomingMessage): Promise { + const chunks: Buffer[] = []; + let total = 0; + for await (const chunk of request) { + const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk); + total += buffer.byteLength; + if (total > maxImportRequestBytes) { + throw new Error("Chrome login import payload is too large."); + } + chunks.push(buffer); + } + return JSON.parse(Buffer.concat(chunks).toString("utf8")) as unknown; +} + +function sendJson(response: ServerResponse, statusCode: number, body: unknown): void { + if (!response.headersSent) { + response.writeHead(statusCode, { "content-type": "application/json" }); + } + response.end(`${JSON.stringify(body)}\n`); +} + +function sendHtml(response: ServerResponse, statusCode: number, body: string): void { + if (!response.headersSent) { + response.writeHead(statusCode, { + "content-security-policy": "default-src 'none'; style-src 'unsafe-inline'; script-src 'none'; connect-src http://127.0.0.1:* http://localhost:*", + "content-type": "text/html; charset=utf-8" + }); + } + response.end(body); +} + +function confirmationPageHtml(job: StoredChromeLoginImportJob): string { + const domains = job.domains.map((domain) => `
    • ${escapeHtml(domain)}
      • `).join(""); + return ` + + + + + CCR Chrome Login Import + + + +
      +

      Import Chrome Login State into CCR

      +

      CCR is requesting permission to import cookies and localStorage for these domains into the in-app browser.

      +
        ${domains}
      + +
      Install or enable the CCR Login Import extension in Chrome to continue.
      +
      + +`; +} + +function setCorsHeaders(response: ServerResponse): void { + response.setHeader("access-control-allow-headers", "content-type, x-ccr-login-import"); + response.setHeader("access-control-allow-methods", "GET, POST, OPTIONS"); + response.setHeader("access-control-allow-origin", "*"); +} + +function uniqueStrings(values: string[]): string[] { + return [...new Set(values)]; +} + +function readString(value: unknown): string { + return typeof value === "string" ? value.trim() : ""; +} + +function isRecord(value: unknown): value is Record { + return Boolean(value) && typeof value === "object" && !Array.isArray(value); +} + +function escapeHtml(value: string): string { + return value.replace(/[&<>"']/g, (char) => { + switch (char) { + case "&": + return "&"; + case "<": + return "<"; + case ">": + return ">"; + case "\"": + return """; + default: + return "'"; + } + }); +} + +function withTimeout(promise: Promise, timeoutMs: number, message: string): Promise { + let timeout: NodeJS.Timeout | undefined; + const timeoutPromise = new Promise((_resolve, reject) => { + timeout = setTimeout(() => reject(new Error(message)), timeoutMs); + }); + return Promise.race([promise, timeoutPromise]).finally(() => { + if (timeout) { + clearTimeout(timeout); + } + }); +} + +function formatError(error: unknown): string { + return error instanceof Error ? error.message : String(error); +} diff --git a/src/main/deep-link.ts b/packages/electron/src/main/deep-link.ts similarity index 88% rename from src/main/deep-link.ts rename to packages/electron/src/main/deep-link.ts index 9304f50..6d6f1cf 100644 --- a/src/main/deep-link.ts +++ b/packages/electron/src/main/deep-link.ts @@ -1,9 +1,9 @@ import { app } from "electron"; import path from "node:path"; -import { appDeepLinkProtocol, createProviderDeepLinkRequest as createSharedProviderDeepLinkRequest, isAppDeepLinkUrl } from "../shared/deep-link"; -import type { ProviderDeepLinkRequest } from "../shared/app"; -import { IPC_CHANNELS } from "./constants"; -import { providerIdentitySafetyIssue } from "./presets"; +import { appDeepLinkProtocol, createProviderDeepLinkRequest as createSharedProviderDeepLinkRequest, isAppDeepLinkUrl } from "@ccr/core/contracts/deep-link"; +import type { ProviderDeepLinkRequest } from "@ccr/core/contracts/app"; +import { IPC_CHANNELS } from "@ccr/core/config/constants"; +import { providerIdentitySafetyIssue } from "@ccr/core/providers/presets/index"; import windowsManager from "./windows"; class DeepLinkService { diff --git a/src/main/electron-web-search-mcp.ts b/packages/electron/src/main/electron-web-search-mcp.ts similarity index 92% rename from src/main/electron-web-search-mcp.ts rename to packages/electron/src/main/electron-web-search-mcp.ts index 8fa90cd..e59ec3a 100644 --- a/src/main/electron-web-search-mcp.ts +++ b/packages/electron/src/main/electron-web-search-mcp.ts @@ -1,13 +1,13 @@ import { BrowserWindow, WebContentsView, app, session, type WebContents } from "electron"; import type { IncomingMessage, ServerResponse } from "node:http"; import { join as pathJoin } from "node:path"; -import { backendService } from "../server/backend-service"; -import type { GatewayMcpServerConfig } from "../shared/app"; +import { backendService } from "@ccr/core/plugins/backend-service"; +import type { GatewayMcpServerConfig } from "@ccr/core/contracts/app"; import type { BrowserWebSearchMcpIntegration, BrowserWebSearchMcpRegistration, BrowserWebSearchProtocolRecord -} from "../server/gateway/service"; +} from "@ccr/core/gateway/service"; type JsonPrimitive = boolean | null | number | string; type JsonValue = JsonPrimitive | JsonValue[] | { [key: string]: JsonValue }; @@ -70,6 +70,7 @@ type BrowserSearchRequest = BrowserSearchInput & { type BrowserSearchResult = { content?: string; + diagnostics?: string[]; snippet?: string; title: string; url: string; @@ -597,11 +598,15 @@ class HiddenBrowserSearchPool { return { ...result, ...(content ? { content } : {}), + ...(!content ? { diagnostics: appendSearchResultDiagnostic(result.diagnostics, "No extractable page content found.") } : {}), ...(snippet ? { snippet } : {}), ...(page.title && page.title.length > result.title.length ? { title: page.title.slice(0, 240) } : {}) }; - } catch { - return result; + } catch (error) { + return { + ...result, + diagnostics: appendSearchResultDiagnostic(result.diagnostics, `Page extraction failed: ${formatError(error)}`) + }; } finally { if (worker) { this.release(worker); @@ -635,7 +640,16 @@ async function pollSearchResults(webContents: WebContents, request: BrowserSearc const deadline = Date.now() + request.timeoutMs; let last: BrowserSearchPageResult = { results: [] }; while (Date.now() < deadline) { - last = await webContents.executeJavaScript(searchResultExtractionScript(request.engine, request.count), true) as BrowserSearchPageResult; + try { + last = await withTimeout( + webContents.executeJavaScript(searchResultExtractionScript(request.engine, request.count), true) as Promise, + Math.max(100, Math.min(1000, deadline - Date.now())), + "Browser search result extraction timed out." + ); + } catch { + await sleep(150); + continue; + } if (last.blocked || (last.results?.length ?? 0) >= Math.min(request.count, 3)) { return last; } @@ -823,18 +837,46 @@ function searchResultExtractionScript(engine: BrowserSearchEngine, count: number const host = url.hostname.toLowerCase(); const path = url.pathname.toLowerCase(); if (host === location.hostname.toLowerCase() && (path === "/" || path === "/search" || path.startsWith("/search/"))) return true; - if (host.includes("google.") && /\\/(preferences|advanced_search|intl|policies|support|sorry)/.test(path)) return true; - if (host.endsWith("bing.com") && /\\/(search|account|profile|images|videos|maps|news)/.test(path)) return true; - if (host.endsWith("duckduckgo.com") && path === "/") return true; + if (host.includes("google.") && /\\/(preferences|advanced_search|intl|policies|support|sorry|search|aclk|imgres)/.test(path)) return true; + if (host.endsWith("bing.com") && /\\/(search|account|profile|images|videos|maps|news|aclick)/.test(path)) return true; + if (host.endsWith("bing.com") && path.startsWith("/ck/")) return true; + if (host.endsWith("duckduckgo.com") && (path === "/" || path.startsWith("/settings") || path.startsWith("/y.js"))) return true; return false; } function resultContainer(anchor, title) { + const root = anchor && anchor.closest("li.b_algo, li.b_ad, div.g, div[data-sokoban-container], div[data-testid='result'], article, .result, .result__body, .web-result"); + if (root) return root; let node = anchor; for (let depth = 0; node && depth < 8; depth += 1, node = node.parentElement) { + if (node.matches && node.matches("nav, header, footer, form, aside")) return undefined; + if (node.matches && node.matches("main, #search, #b_results, #rso")) break; const text = compact(node.textContent || ""); if (text.length > title.length + 40) return node; } - return anchor.closest("li.b_algo, article, div.g, div[data-sokoban-container], div[data-testid='result'], .result, li, div"); + return undefined; + } + function isLikelyOrganicResult(anchor, container) { + if (!anchor || !container) return false; + if (anchor.closest("nav, header, footer, form, aside")) return false; + if (anchor.closest("li.b_algo, div.g, div[data-sokoban-container], div[data-testid='result'], article, .result, .result__body, .web-result")) return true; + const heading = anchor.closest("h1, h2, h3, [role='heading']"); + const searchRegion = anchor.closest("main, #search, #b_results, #rso"); + return Boolean(heading && searchRegion); + } + function isAdOrUtilityResult(anchor, container) { + let node = anchor; + for (let depth = 0; node && depth < 6; depth += 1, node = node.parentElement) { + const attributes = [ + node.getAttribute && node.getAttribute("aria-label"), + node.getAttribute && node.getAttribute("data-text-ad"), + node.getAttribute && node.getAttribute("data-testid"), + node.className + ].filter(Boolean).join(" "); + if (/\\b(?:ad|ads|sponsored|promo|shopping)\\b|广告|赞助|推廣/i.test(attributes)) return true; + } + const firstText = compact(container && container.textContent).slice(0, 180); + if (/^(?:ad|ads|sponsored|promo|shopping)\\b|^(?:广告|赞助|推廣)/i.test(firstText)) return true; + return false; } function cleanSnippetCandidate(value, title, url) { const host = (() => { try { return new URL(url).hostname.replace(/^www\\./, ""); } catch (_) { return ""; } })(); @@ -881,6 +923,7 @@ function searchResultExtractionScript(engine: BrowserSearchEngine, count: number const title = titleFor(anchor, titleOverride); if (!title || title.length < 2) return; const container = resultContainer(anchor, title); + if (!isLikelyOrganicResult(anchor, container) || isAdOrUtilityResult(anchor, container)) return; seen.add(url); results.push({ snippet: snippetFor(anchor, container, title, url), @@ -908,19 +951,22 @@ function searchResultExtractionScript(engine: BrowserSearchEngine, count: number collect(".result__a"); collect("article h2 a[href]"); } + function collectGenericHeadings() { + collect("main h1 a[href], main h2 a[href], main h3 a[href], #search h3, #b_results h2 a[href], #rso h3, article h2 a[href], article h3 a[href]"); + } if (engine === "google") collectGoogle(); if (engine === "bing") collectBing(); if (engine === "duckduckgo") collectDuckDuckGo(); - collect("main a[href], #search a[href], #b_results a[href], article a[href], a[href]"); + collectGenericHeadings(); return { results, title: document.title || "" }; function detectBlocked() { const text = compact(document.body && document.body.innerText).toLowerCase(); if (!text) return ""; - if (text.includes("unusual traffic") || text.includes("detected unusual") || text.includes("not a robot") || text.includes("captcha")) { + if (text.includes("unusual traffic") || text.includes("detected unusual") || text.includes("not a robot") || text.includes("captcha") || text.includes("验证码") || text.includes("人机验证")) { return "Search engine returned an anti-bot or CAPTCHA page."; } - if (text.includes("before you continue to google") || text.includes("consent.google")) { + if (text.includes("before you continue to google") || text.includes("consent.google") || text.includes("cookie consent")) { return "Google returned a consent page instead of search results."; } return ""; @@ -996,11 +1042,16 @@ function formatSearchResponse( `${index + 1}. ${result.title}`, `URL: ${result.url}`, result.snippet ? `Snippet: ${result.snippet}` : "", - result.content ? `Extracted content: ${result.content}` : "" + result.content ? `Extracted content: ${result.content}` : "", + result.diagnostics?.length ? `Diagnostics: ${result.diagnostics.join("; ")}` : "" ].filter(Boolean).join("\n")) ].filter(Boolean).join("\n\n"); } +function appendSearchResultDiagnostic(existing: string[] | undefined, message: string): string[] { + return uniqueStrings([...(existing ?? []), message]); +} + function uniqueSearchResults(results: BrowserSearchResult[]): BrowserSearchResult[] { const seen = new Set(); const unique: BrowserSearchResult[] = []; diff --git a/src/main/ipc.ts b/packages/electron/src/main/ipc.ts similarity index 85% rename from src/main/ipc.ts rename to packages/electron/src/main/ipc.ts index 12cf675..062f754 100644 --- a/src/main/ipc.ts +++ b/packages/electron/src/main/ipc.ts @@ -1,38 +1,38 @@ import { app, BrowserWindow, dialog, ipcMain, nativeImage, shell, type OpenDialogOptions, type Rectangle, type SaveDialogOptions } from "electron"; import { randomUUID } from "node:crypto"; import { existsSync, mkdtempSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs"; -import net from "node:net"; import path from "node:path"; import { deflateSync, inflateSync } from "node:zlib"; -import { loadPersistedAppSetting, replacePersistedAppSetting } from "./app-config-store"; +import { loadPersistedAppSetting, replacePersistedAppSetting } from "@ccr/core/config/app-config-store"; import { builtInBrowserService } from "./built-in-browser"; -import { scanBotHandoffBluetoothTargets, scanBotHandoffWifiTargets } from "./bot-handoff-scan-service"; -import { cancelBotGatewayQrLogin, startBotGatewayQrLogin, waitBotGatewayQrLogin } from "./bot-gateway-qr-login-service"; +import { scanBotHandoffBluetoothTargets, scanBotHandoffWifiTargets } from "@ccr/core/agents/bot-gateway/handoff-scan-service"; +import { cancelBotGatewayQrLogin, startBotGatewayQrLogin, waitBotGatewayQrLogin } from "@ccr/core/agents/bot-gateway/qr-login-service"; import { closeBotGatewayQrWindow, openBotGatewayQrWindow } from "./bot-gateway-qr-window-service"; -import { syncClaudeAppGatewayConfig } from "./claude-app-gateway-service"; -import { loadAppConfig, saveApiKeysConfig, saveAppConfig } from "./config"; -import { API_KEYS_DB_FILE, APP_CONFIG_DB_FILE, APP_NAME, CONFIGDIR, CONFIG_FILE, DATADIR, GATEWAY_CONFIG_FILE, IPC_CHANNELS, LEGACY_CONFIG_FILE, ONBOARDING_FINISHED_FILE, PROXY_CA_CERT_FILE, REQUEST_LOGS_DB_FILE, USAGE_DB_FILE } from "./constants"; +import { syncClaudeAppGatewayConfig } from "@ccr/core/agents/claude-app/gateway-service"; +import { loadAppConfig, saveApiKeysConfig, saveAppConfig } from "@ccr/core/config/config"; +import { API_KEYS_DB_FILE, APP_CONFIG_DB_FILE, APP_NAME, CONFIGDIR, CONFIG_FILE, DATADIR, GATEWAY_CONFIG_FILE, IPC_CHANNELS, LEGACY_CONFIG_FILE, ONBOARDING_FINISHED_FILE, PROXY_CA_CERT_FILE, REQUEST_LOGS_DB_FILE, USAGE_DB_FILE } from "@ccr/core/config/constants"; import { deepLinkService } from "./deep-link"; -import { gatewayService } from "../server/gateway/service"; -import { getProviderAccountSnapshots, invalidateProviderAccountSnapshotCache, resetCodexRateLimitCredit, testProviderAccountConnector } from "./provider-account-service"; -import { detectProviderIcon } from "./provider-icons"; -import { fetchProviderManifest } from "./provider-manifest-service"; -import { getLocalAgentProviderCandidates, importLocalAgentProvider } from "./local-agent-provider-service"; +import { gatewayService } from "@ccr/core/gateway/service"; +import { shouldRestartGatewayForRuntimeConfigChange } from "@ccr/core/gateway/runtime-change"; +import { getProviderAccountSnapshots, invalidateProviderAccountSnapshotCache, resetCodexRateLimitCredit, testProviderAccountConnector } from "@ccr/core/providers/account-service"; +import { detectProviderIcon } from "@ccr/core/providers/icons"; +import { fetchProviderManifest } from "@ccr/core/providers/manifest-service"; +import { getLocalAgentProviderCandidates, importLocalAgentProvider, probeLocalAgentProvider } from "@ccr/core/agents/local-providers/service"; import { isLaunchAtLoginSupported, syncLaunchAtLogin } from "./launch-at-login"; -import { getProviderCatalogModels } from "./provider-model-catalog"; -import { getProviderPresets } from "./presets"; -import { checkGatewayProviderConnectivity, probeGatewayProvider, probeGatewayProviderCandidates } from "./provider-probe"; -import { applyProfileConfig } from "./profile-service"; -import { getProfileOpenCommand, getProfileRuntimeStatus, openProfileFromCcr, stopProfileFromCcr } from "./profile-launch-service"; -import { ensureProxyCertificateAuthority } from "../server/proxy/certificates"; -import { proxyService } from "../server/proxy/service"; -import { listMcpServerTools } from "../server/mcp/tool-discovery"; -import { getAgentAnalysis, getAgentTracePayload, getRequestLogDetail, getRequestLogs } from "./request-log-store"; +import { getProviderCatalogModels } from "@ccr/core/providers/model-catalog"; +import { getProviderPresets } from "@ccr/core/providers/presets/index"; +import { checkGatewayProviderConnectivity, probeGatewayProvider, probeGatewayProviderCandidates } from "@ccr/core/providers/probe"; +import { applyProfileConfig } from "@ccr/core/profiles/service"; +import { desktopCliCommandName, getProfileOpenCommand, getProfileRuntimeStatus, openProfileFromCcr, stopProfileFromCcr } from "@ccr/core/profiles/launch-service"; +import { ensureProxyCertificateAuthority } from "@ccr/core/proxy/certificates"; +import { proxyService } from "@ccr/core/proxy/service"; +import { listMcpServerTools } from "@ccr/core/mcp/tool-discovery"; +import { getAgentAnalysis, getAgentTracePayload, getRequestLogDetail, getRequestLogs } from "@ccr/core/observability/request-log-store"; import trayController from "./tray-controller"; import { appUpdateService } from "./update-service"; -import { getUsageStats } from "./usage-store"; +import { getUsageStats } from "@ccr/core/usage/store"; import windowsManager from "./windows"; -import type { AgentAnalysisFilter, AgentAnalysisTracePayloadRequest, ApiKeyConfig, AppCaptureElementPngRequest, AppCaptureElementPngResult, AppConfig, AppDataExportResult, AppImageExportTargetRequest, AppImageExportTargetResult, AppInfo, AppRenderHtmlPngRequest, AppRenderHtmlPngResult, AppSaveConfigOptions, BotGatewayQrLoginCancelRequest, BotGatewayQrLoginStartRequest, BotGatewayQrLoginWaitRequest, BotGatewayQrWindowCloseRequest, BotGatewayQrWindowOpenRequest, GatewayPluginAppConfig, GatewayProviderConnectivityCheckRequest, GatewayProviderProbeCandidatesRequest, GatewayProviderProbeRequest, GatewayStatus, LocalAgentProviderImportRequest, PluginDependency, PluginDirectorySelection, PluginMarketplaceEntry, ProfileApplyResult, ProfileOpenRequest, ProviderAccountResetRequest, ProviderAccountSnapshotRequestOptions, ProviderAccountTestRequest, ProviderCatalogModelsRequest, ProviderIconDetectionRequest, ProviderManifestFetchRequest, RequestLogListFilter, UsageStatsFilter, UsageStatsRange } from "../shared/app"; +import type { AgentAnalysisFilter, AgentAnalysisTracePayloadRequest, ApiKeyConfig, AppCaptureElementPngRequest, AppCaptureElementPngResult, AppConfig, AppDataExportResult, AppImageExportTargetRequest, AppImageExportTargetResult, AppInfo, AppRenderHtmlPngRequest, AppRenderHtmlPngResult, AppSaveConfigOptions, BotGatewayQrLoginCancelRequest, BotGatewayQrLoginStartRequest, BotGatewayQrLoginWaitRequest, BotGatewayQrWindowCloseRequest, BotGatewayQrWindowOpenRequest, GatewayPluginAppConfig, GatewayProviderConnectivityCheckRequest, GatewayProviderProbeCandidatesRequest, GatewayProviderProbeRequest, GatewayStatus, LocalAgentProviderImportRequest, PluginDependency, PluginDirectorySelection, PluginMarketplaceEntry, ProfileApplyResult, ProfileOpenRequest, ProviderAccountResetRequest, ProviderAccountSnapshotRequestOptions, ProviderAccountTestRequest, ProviderCatalogModelsRequest, ProviderIconDetectionRequest, ProviderManifestFetchRequest, RequestLogListFilter, UsageStatsFilter, UsageStatsRange } from "@ccr/core/contracts/app"; const pluginMarketplace: PluginMarketplaceEntry[] = [ { @@ -93,7 +93,10 @@ ipcMain.handle(IPC_CHANNELS.appGetOnboardingFinished, async () => { ipcMain.handle(IPC_CHANNELS.appGetPendingProviderDeepLinks, () => deepLinkService.consumePendingProviderRequests()); ipcMain.handle(IPC_CHANNELS.appGetLocalAgentProviderCandidates, () => getLocalAgentProviderCandidates()); ipcMain.handle(IPC_CHANNELS.appGetProfileOpenCommand, async (_event, request: ProfileOpenRequest) => { - return getProfileOpenCommand(await loadAppConfig(), request); + return getProfileOpenCommand(await loadAppConfig(), request, { + commandName: desktopCliCommandName, + ensureLauncher: true + }); }); ipcMain.handle(IPC_CHANNELS.appGetProfileRuntimeStatus, () => { return getProfileRuntimeStatus(); @@ -114,6 +117,7 @@ ipcMain.handle(IPC_CHANNELS.appGetUpdateStatus, () => appUpdateService.getStatus ipcMain.handle(IPC_CHANNELS.appGetUsageStats, (_event, range?: UsageStatsRange, filter?: UsageStatsFilter) => getUsageStats(range, filter)); ipcMain.handle(IPC_CHANNELS.appFetchProviderManifest, (_event, request: ProviderManifestFetchRequest) => fetchProviderManifest(request)); ipcMain.handle(IPC_CHANNELS.appImportLocalAgentProvider, (_event, request: LocalAgentProviderImportRequest) => importLocalAgentProvider(request)); +ipcMain.handle(IPC_CHANNELS.appProbeLocalAgentProvider, (_event, request) => probeLocalAgentProvider(request)); ipcMain.handle(IPC_CHANNELS.appInstallProxyCertificate, () => proxyService.installCertificate()); ipcMain.handle(IPC_CHANNELS.appListMcpServerTools, async (_event, serverName: string) => { const name = typeof serverName === "string" ? serverName.trim() : ""; @@ -129,7 +133,6 @@ ipcMain.handle(IPC_CHANNELS.appListMcpServerTools, async (_event, serverName: st }); ipcMain.handle(IPC_CHANNELS.appOpenBuiltInBrowser, async () => { const config = await loadAppConfig(); - await ensureBuiltInBrowserProxyReady(config); await builtInBrowserService.open(config); }); ipcMain.handle(IPC_CHANNELS.appCloseTray, () => { @@ -179,7 +182,7 @@ ipcMain.handle(IPC_CHANNELS.appApplyClaudeAppGateway, async (_event, config?: Ap const savedConfig = synced.config; let runtimeStatus = gatewayService.getStatus(); - if (synced.configChanged || shouldRestartForRuntimeChange(previousConfig, savedConfig) || runtimeStatus.state !== "running") { + if (synced.configChanged || shouldRestartGatewayForRuntimeConfigChange(previousConfig, savedConfig) || runtimeStatus.state !== "running") { runtimeStatus = await gatewayService.start(savedConfig); } else { gatewayService.updateConfig(savedConfig); @@ -274,7 +277,7 @@ ipcMain.handle(IPC_CHANNELS.appSaveConfig, async (_event, config: AppConfig, opt const syncedClaudeAppConfig = await syncClaudeAppGatewayConfig(savedConfig); savedConfig = syncedClaudeAppConfig.config; let runtimeStatus = gatewayService.getStatus(); - if (syncedClaudeAppConfig.configChanged || shouldRestartForRuntimeChange(previousConfig, savedConfig)) { + if (syncedClaudeAppConfig.configChanged || shouldRestartGatewayForRuntimeConfigChange(previousConfig, savedConfig)) { runtimeStatus = await gatewayService.start(savedConfig); } else { gatewayService.updateConfig(savedConfig); @@ -357,178 +360,6 @@ function logProfileApplyResult(result: ProfileApplyResult): void { } } -type ProxyConnectProbeResult = { - detail?: string; - ok: boolean; -}; - -const browserProxyConnectProbeTarget = "claude.ai:443"; -const proxyConnectProbeTimeoutMs = 3000; - -async function ensureBuiltInBrowserProxyReady(config: AppConfig): Promise { - if (!config.proxy.enabled) { - return; - } - - let proxyStatus = proxyService.getStatus(); - if (proxyStatus.state === "running" && proxyStatus.endpoint) { - const probe = await probeProxyConnect(proxyStatus.endpoint); - if (probe.ok) { - return; - } - console.warn(`[browser] Proxy CONNECT probe failed at ${proxyStatus.endpoint}; restarting proxy: ${probe.detail || "unknown error"}`); - } - - const status = await gatewayService.start(config); - if (status.state === "error") { - throw new Error(status.lastError || "Failed to start proxy mode."); - } - - proxyStatus = proxyService.getStatus(); - if (proxyStatus.state !== "running" || !proxyStatus.endpoint) { - throw new Error(proxyStatus.lastError || "Proxy mode is not running."); - } - - const probe = await probeProxyConnect(proxyStatus.endpoint); - if (probe.ok) { - return; - } - - console.warn( - `[browser] Shared proxy endpoint ${proxyStatus.endpoint} still does not accept CONNECT after restart; starting dedicated proxy endpoint: ${probe.detail || "unknown error"}` - ); - const dedicatedProxyConfig = await createBuiltInBrowserProxyConfig(config); - const dedicatedProxyStatus = await proxyService.start(dedicatedProxyConfig); - if (dedicatedProxyStatus.state !== "running" || !dedicatedProxyStatus.endpoint) { - throw new Error(dedicatedProxyStatus.lastError || "Failed to start the dedicated proxy endpoint for the built-in browser."); - } - - const dedicatedProbe = await probeProxyConnect(dedicatedProxyStatus.endpoint); - if (!dedicatedProbe.ok) { - const detail = dedicatedProbe.detail ? `: ${dedicatedProbe.detail}` : ""; - throw new Error(`Proxy mode is running at ${dedicatedProxyStatus.endpoint}, but HTTPS CONNECT is not available${detail}.`); - } -} - -async function createBuiltInBrowserProxyConfig(config: AppConfig): Promise { - return { - ...config, - proxy: { - ...config.proxy, - host: "127.0.0.1", - port: await findAvailableLoopbackPort(), - systemProxy: false - } - }; -} - -function findAvailableLoopbackPort(): Promise { - return new Promise((resolve, reject) => { - const server = net.createServer(); - server.once("error", reject); - server.listen(0, "127.0.0.1", () => { - const address = server.address(); - server.close((error) => { - if (error) { - reject(error); - return; - } - if (!address || typeof address === "string") { - reject(new Error("Failed to allocate a local proxy port.")); - return; - } - resolve(address.port); - }); - }); - }); -} - -function probeProxyConnect(endpoint: string): Promise { - return new Promise((resolve) => { - let parsed: URL; - try { - parsed = new URL(endpoint); - } catch { - resolve({ detail: `Invalid proxy endpoint: ${endpoint}`, ok: false }); - return; - } - - const port = Number(parsed.port || (parsed.protocol === "https:" ? 443 : 80)); - if (!Number.isInteger(port) || port <= 0 || port > 65535) { - resolve({ detail: `Invalid proxy port in endpoint: ${endpoint}`, ok: false }); - return; - } - - const host = parsed.hostname.replace(/^\[|\]$/g, ""); - const socket = net.connect({ host, port }); - let response = ""; - let settled = false; - - const finish = (result: ProxyConnectProbeResult) => { - if (settled) { - return; - } - settled = true; - socket.destroy(); - resolve(result); - }; - const parseResponse = (): ProxyConnectProbeResult | undefined => { - const firstLine = response.split(/\r?\n/, 1)[0]?.trim(); - if (!firstLine) { - return undefined; - } - if (/^HTTP\/1\.[01]\s+200\b/i.test(firstLine)) { - return { ok: true }; - } - if (/^HTTP\/1\.[01]\s+\d{3}\b/i.test(firstLine)) { - return { detail: firstLine, ok: false }; - } - return { detail: `Unexpected response: ${firstLine}`, ok: false }; - }; - - socket.setTimeout(proxyConnectProbeTimeoutMs, () => { - finish({ detail: `Timed out after ${proxyConnectProbeTimeoutMs}ms`, ok: false }); - }); - socket.once("error", (error) => { - finish({ detail: formatError(error), ok: false }); - }); - socket.once("connect", () => { - socket.write(`CONNECT ${browserProxyConnectProbeTarget} HTTP/1.1\r\nHost: ${browserProxyConnectProbeTarget}\r\n\r\n`); - }); - socket.on("data", (chunk) => { - response += chunk.toString("latin1"); - const result = parseResponse(); - if (result) { - finish(result); - } - }); - socket.once("close", () => { - finish(parseResponse() ?? { detail: "Connection closed without a CONNECT response", ok: false }); - }); - }); -} - -function shouldRestartForRuntimeChange(previousConfig: AppConfig, nextConfig: AppConfig): boolean { - return ( - previousConfig.gateway.enabled !== nextConfig.gateway.enabled || - previousConfig.gateway.host !== nextConfig.gateway.host || - previousConfig.gateway.port !== nextConfig.gateway.port || - previousConfig.gateway.coreHost !== nextConfig.gateway.coreHost || - previousConfig.gateway.corePort !== nextConfig.gateway.corePort || - previousConfig.proxy.enabled !== nextConfig.proxy.enabled || - previousConfig.proxy.host !== nextConfig.proxy.host || - previousConfig.proxy.mode !== nextConfig.proxy.mode || - previousConfig.proxy.port !== nextConfig.proxy.port || - previousConfig.proxy.systemProxy !== nextConfig.proxy.systemProxy || - JSON.stringify(previousConfig.proxy.targets) !== JSON.stringify(nextConfig.proxy.targets) || - JSON.stringify(previousConfig.agent) !== JSON.stringify(nextConfig.agent) || - JSON.stringify(previousConfig.Providers) !== JSON.stringify(nextConfig.Providers) || - JSON.stringify(previousConfig.plugins) !== JSON.stringify(nextConfig.plugins) || - JSON.stringify(previousConfig.providerPlugins) !== JSON.stringify(nextConfig.providerPlugins) || - JSON.stringify(previousConfig.virtualModelProfiles) !== JSON.stringify(nextConfig.virtualModelProfiles) - ); -} - async function exportAppData(window: BrowserWindow | null): Promise { const exportedAt = new Date().toISOString(); const result = window diff --git a/src/main/launch-at-login.ts b/packages/electron/src/main/launch-at-login.ts similarity index 70% rename from src/main/launch-at-login.ts rename to packages/electron/src/main/launch-at-login.ts index f79ea65..183cfb4 100644 --- a/src/main/launch-at-login.ts +++ b/packages/electron/src/main/launch-at-login.ts @@ -1,5 +1,5 @@ import { app } from "electron"; -import type { AppConfig } from "../shared/app"; +import type { AppConfig } from "@ccr/core/contracts/app"; export function isLaunchAtLoginSupported(platform = process.platform): boolean { return platform === "darwin" || platform === "win32"; @@ -9,7 +9,12 @@ export function syncLaunchAtLogin(config: Pick): voi if (!isLaunchAtLoginSupported()) { return; } - app.setLoginItemSettings(loginItemSettings(Boolean(config.launchAtLogin))); + const openAtLogin = Boolean(config.launchAtLogin); + const current = app.getLoginItemSettings(); + if (current.openAtLogin === openAtLogin) { + return; + } + app.setLoginItemSettings(loginItemSettings(openAtLogin)); } function loginItemSettings(openAtLogin: boolean): Electron.Settings { diff --git a/src/main/main-app.ts b/packages/electron/src/main/main-app.ts similarity index 94% rename from src/main/main-app.ts rename to packages/electron/src/main/main-app.ts index eb7f7f0..9f3ab9a 100644 --- a/src/main/main-app.ts +++ b/packages/electron/src/main/main-app.ts @@ -1,16 +1,17 @@ import { app, BrowserWindow, dialog, shell } from "electron"; import { setupApplicationMenu } from "./app-menu"; -import { loadAppConfig } from "./config"; -import { restoreClaudeAppGatewayConfig, syncClaudeAppGatewayConfig } from "./claude-app-gateway-service"; +import { loadAppConfig } from "@ccr/core/config/config"; +import { restoreClaudeAppGatewayConfig, syncClaudeAppGatewayConfig } from "@ccr/core/agents/claude-app/gateway-service"; import { deepLinkService } from "./deep-link"; -import { gatewayService } from "../server/gateway/service"; +import { gatewayService } from "@ccr/core/gateway/service"; import "./ipc"; -import { applyProfileConfig } from "./profile-service"; -import { ensureCcrCliLauncher } from "./profile-launch-service"; +import { applyProfileConfig } from "@ccr/core/profiles/service"; +import { ensureCcrCliLauncher } from "@ccr/core/profiles/launch-service"; import { syncLaunchAtLogin } from "./launch-at-login"; -import { proxyService } from "../server/proxy/service"; +import { proxyService } from "@ccr/core/proxy/service"; import trayController from "./tray-controller"; import { appUpdateService } from "./update-service"; +import { browserAutomationMcpService } from "./browser-automation-mcp"; import { browserWebSearchMcpService } from "./electron-web-search-mcp"; import windowsManager from "./windows"; @@ -29,6 +30,7 @@ if (!gotTheLock) { } function startPrimaryInstance(): void { + gatewayService.setBrowserAutomationMcpIntegration(browserAutomationMcpService); gatewayService.setBrowserWebSearchMcpIntegration(browserWebSearchMcpService); deepLinkService.register(); deepLinkService.handleArgv(process.argv); diff --git a/src/main/main.ts b/packages/electron/src/main/main.ts similarity index 72% rename from src/main/main.ts rename to packages/electron/src/main/main.ts index 17baae6..8873d24 100644 --- a/src/main/main.ts +++ b/packages/electron/src/main/main.ts @@ -1,13 +1,18 @@ import { app, dialog } from "electron"; -import path from "node:path"; -import { APP_STORAGE_NAME, setRuntimeAppPaths } from "./app-paths"; -import { copyMissingDirectoryContents, sameFilesystemPath } from "./storage-migration"; +import { mkdirSync } from "node:fs"; +import { resolveRuntimeDataDir, setRuntimeAppPaths } from "@ccr/core/runtime/app-paths"; +import { copyMissingDirectoryContents, sameFilesystemPath } from "@ccr/core/storage/migration"; const appDataPath = app.getPath("appData"); -const userDataPath = configureRuntimeUserDataPath(appDataPath); +const homePath = app.getPath("home"); setRuntimeAppPaths({ appData: appDataPath, - home: app.getPath("home"), + home: homePath +}); +const userDataPath = configureRuntimeUserDataPath(app.getPath("userData")); +setRuntimeAppPaths({ + appData: appDataPath, + home: homePath, userData: userDataPath }); @@ -44,19 +49,15 @@ function reportFatalStartupError(error: unknown): void { app.exit(1); } -function configureRuntimeUserDataPath(appDataPath: string): string { - const currentUserDataPath = app.getPath("userData"); - if (process.platform !== "win32") { +function configureRuntimeUserDataPath(currentUserDataPath: string): string { + const sharedUserDataPath = resolveRuntimeDataDir(); + mkdirSync(sharedUserDataPath, { recursive: true }); + if (sameFilesystemPath(currentUserDataPath, sharedUserDataPath)) { return currentUserDataPath; } - const storageUserDataPath = path.join(appDataPath, APP_STORAGE_NAME); - if (sameFilesystemPath(currentUserDataPath, storageUserDataPath)) { - return currentUserDataPath; - } - - copyMissingDirectoryContents(currentUserDataPath, storageUserDataPath, "Windows app data directory"); - app.setPath("userData", storageUserDataPath); + copyMissingDirectoryContents(currentUserDataPath, sharedUserDataPath, "Electron app data directory"); + app.setPath("userData", sharedUserDataPath); return app.getPath("userData"); } diff --git a/src/main/preload.ts b/packages/electron/src/main/preload.ts similarity index 95% rename from src/main/preload.ts rename to packages/electron/src/main/preload.ts index 4f45200..9d2b392 100644 --- a/src/main/preload.ts +++ b/packages/electron/src/main/preload.ts @@ -1,6 +1,6 @@ -import { contextBridge, ipcRenderer } from "electron"; -import { browserErrorI18nLanguage, formatLocalizedErrorMessage } from "../shared/i18n"; -import { IPC_CHANNELS } from "../shared/ipc-channels"; +import { contextBridge, ipcRenderer, webUtils } from "electron"; +import { browserErrorI18nLanguage, formatLocalizedErrorMessage } from "@ccr/core/contracts/i18n"; +import { IPC_CHANNELS } from "@ccr/core/contracts/ipc-channels"; import type { AgentAnalysisFilter, AgentAnalysisSnapshot, @@ -41,6 +41,8 @@ import type { LocalAgentProviderCandidate, LocalAgentProviderImportRequest, LocalAgentProviderImportResult, + LocalAgentProviderProbeRequest, + LocalAgentProviderProbeResult, PluginDirectorySelection, PluginMarketplaceEntry, ProfileOpenCommandResult, @@ -73,8 +75,8 @@ import type { UsageStatsFilter, UsageStatsRange, UsageStatsSnapshot -} from "../shared/app"; -import type { ProviderPreset } from "../shared/provider-presets"; +} from "@ccr/core/contracts/app"; +import type { ProviderPreset } from "@ccr/core/providers/presets/types"; function invoke(channel: string, ...args: unknown[]): Promise { return ipcRenderer.invoke(channel, ...args).catch((error) => { @@ -106,6 +108,7 @@ contextBridge.exposeInMainWorld("ccr", { getAgentTracePayload: (request: AgentAnalysisTracePayloadRequest) => invoke(IPC_CHANNELS.appGetAgentTracePayload, request) as Promise, getAppInfo: () => invoke(IPC_CHANNELS.appGetInfo) as Promise, getConfig: () => invoke(IPC_CHANNELS.appGetConfig) as Promise, + getFilePath: (file: File) => webUtils.getPathForFile(file), getGatewayStatus: () => invoke(IPC_CHANNELS.appGetGatewayStatus) as Promise, getLocalAgentProviderCandidates: () => invoke(IPC_CHANNELS.appGetLocalAgentProviderCandidates) as Promise, getOnboardingFinished: () => invoke(IPC_CHANNELS.appGetOnboardingFinished) as Promise, @@ -131,6 +134,7 @@ contextBridge.exposeInMainWorld("ccr", { openExternal: (url: string) => invoke(IPC_CHANNELS.appOpenExternal, url) as Promise, openProfile: (request: ProfileOpenRequest) => invoke(IPC_CHANNELS.appOpenProfile, request) as Promise, prepareImageExportTarget: (request: AppImageExportTargetRequest) => invoke(IPC_CHANNELS.appPrepareImageExportTarget, request) as Promise, + probeLocalAgentProvider: (request: LocalAgentProviderProbeRequest) => invoke(IPC_CHANNELS.appProbeLocalAgentProvider, request) as Promise, probeProviderCandidates: (request: GatewayProviderProbeCandidatesRequest) => invoke(IPC_CHANNELS.appProbeProviderCandidates, request) as Promise, probeProvider: (request: GatewayProviderProbeRequest) => invoke(IPC_CHANNELS.appProbeProvider, request) as Promise, quitApp: () => invoke(IPC_CHANNELS.appQuit) as Promise, diff --git a/src/main/tray-controller.ts b/packages/electron/src/main/tray-controller.ts similarity index 98% rename from src/main/tray-controller.ts rename to packages/electron/src/main/tray-controller.ts index 7379dd0..b3d287c 100644 --- a/src/main/tray-controller.ts +++ b/packages/electron/src/main/tray-controller.ts @@ -2,12 +2,12 @@ import { BrowserWindow, Menu, Tray, app, nativeImage, screen } from "electron"; import path from "node:path"; import { pathToFileURL } from "node:url"; import { deflateSync } from "node:zlib"; -import { loadAppConfig } from "./config"; -import { APP_NAME } from "./constants"; -import { getProviderAccountSnapshots } from "./provider-account-service"; -import { getTodayUsageTotals, onUsageRecorded } from "./usage-store"; +import { loadAppConfig } from "@ccr/core/config/config"; +import { APP_NAME } from "@ccr/core/config/constants"; +import { getProviderAccountSnapshots } from "@ccr/core/providers/account-service"; +import { getTodayUsageTotals, onUsageRecorded } from "@ccr/core/usage/store"; import windowsManager from "./windows"; -import type { AppConfig, ProviderAccountMeter, TrayBalanceProgressConfig, TrayIconPreference } from "../shared/app"; +import type { AppConfig, ProviderAccountMeter, TrayBalanceProgressConfig, TrayIconPreference } from "@ccr/core/contracts/app"; const popoverMenuWidth = 420; const popoverPreferredHeight = 740; diff --git a/src/main/update-service.ts b/packages/electron/src/main/update-service.ts similarity index 98% rename from src/main/update-service.ts rename to packages/electron/src/main/update-service.ts index 290ba6a..a507e60 100644 --- a/src/main/update-service.ts +++ b/packages/electron/src/main/update-service.ts @@ -1,8 +1,8 @@ import { app } from "electron"; import { autoUpdater, type ProgressInfo, type UpdateDownloadedEvent, type UpdateInfo } from "electron-updater"; -import { IPC_CHANNELS } from "./constants"; +import { IPC_CHANNELS } from "@ccr/core/config/constants"; import windowsManager from "./windows"; -import type { AppUpdateStatus } from "../shared/app"; +import type { AppUpdateStatus } from "@ccr/core/contracts/app"; type InstallPreparation = () => Promise; type UpdateCheckOptions = { diff --git a/src/main/windows.ts b/packages/electron/src/main/windows.ts similarity index 99% rename from src/main/windows.ts rename to packages/electron/src/main/windows.ts index 634ec51..81f7070 100644 --- a/src/main/windows.ts +++ b/packages/electron/src/main/windows.ts @@ -2,7 +2,7 @@ import { app, BrowserWindow, screen } from "electron"; import { existsSync } from "node:fs"; import path from "node:path"; import { pathToFileURL } from "node:url"; -import { APP_NAME, IPC_CHANNELS, ONBOARDING_FINISHED_FILE } from "./constants"; +import { APP_NAME, IPC_CHANNELS, ONBOARDING_FINISHED_FILE } from "@ccr/core/config/constants"; type WindowName = "main" | string; type WindowBounds = { height: number; width: number; x?: number; y?: number }; diff --git a/packages/electron/tsconfig.json b/packages/electron/tsconfig.json new file mode 100644 index 0000000..1f70006 --- /dev/null +++ b/packages/electron/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "rootDir": "src" + }, + "include": ["src/**/*.ts", "src/**/*.d.ts"] +} diff --git a/packages/ui/package.json b/packages/ui/package.json new file mode 100644 index 0000000..609fab2 --- /dev/null +++ b/packages/ui/package.json @@ -0,0 +1,21 @@ +{ + "name": "@claude-code-router/ui", + "version": "3.0.11", + "private": true, + "description": "Claude Code Router web management UI.", + "dependencies": { + "@dnd-kit/core": "^6.3.1", + "@dnd-kit/sortable": "^10.0.0", + "@dnd-kit/utilities": "^3.2.2", + "baseui": "^16.1.1", + "clsx": "^2.1.1", + "lucide-react": "^1.17.0", + "motion": "^12.40.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "recharts": "^3.8.1", + "styletron-engine-atomic": "^1.6.2", + "styletron-react": "^6.1.1", + "tailwind-merge": "^3.6.0" + } +} diff --git a/src/renderer/assets/agent-logos/claude-code.png b/packages/ui/src/assets/agent-logos/claude-code.png similarity index 100% rename from src/renderer/assets/agent-logos/claude-code.png rename to packages/ui/src/assets/agent-logos/claude-code.png diff --git a/src/renderer/assets/agent-logos/codex.png b/packages/ui/src/assets/agent-logos/codex.png similarity index 100% rename from src/renderer/assets/agent-logos/codex.png rename to packages/ui/src/assets/agent-logos/codex.png diff --git a/src/renderer/assets/agent-logos/zcode.png b/packages/ui/src/assets/agent-logos/zcode.png similarity index 100% rename from src/renderer/assets/agent-logos/zcode.png rename to packages/ui/src/assets/agent-logos/zcode.png diff --git a/packages/ui/src/assets/logo.png b/packages/ui/src/assets/logo.png new file mode 100644 index 0000000..76801d1 Binary files /dev/null and b/packages/ui/src/assets/logo.png differ diff --git a/src/renderer/assets/onboarding/mascot-transition.svg b/packages/ui/src/assets/onboarding/mascot-transition.svg similarity index 100% rename from src/renderer/assets/onboarding/mascot-transition.svg rename to packages/ui/src/assets/onboarding/mascot-transition.svg diff --git a/src/renderer/assets/provider-icons/anthropic.png b/packages/ui/src/assets/provider-icons/anthropic.png similarity index 100% rename from src/renderer/assets/provider-icons/anthropic.png rename to packages/ui/src/assets/provider-icons/anthropic.png diff --git a/src/renderer/assets/provider-icons/bailian.ico b/packages/ui/src/assets/provider-icons/bailian.ico similarity index 100% rename from src/renderer/assets/provider-icons/bailian.ico rename to packages/ui/src/assets/provider-icons/bailian.ico diff --git a/packages/ui/src/assets/provider-icons/claudeapi.png b/packages/ui/src/assets/provider-icons/claudeapi.png new file mode 100644 index 0000000..776ced8 Binary files /dev/null and b/packages/ui/src/assets/provider-icons/claudeapi.png differ diff --git a/packages/ui/src/assets/provider-icons/code0.png b/packages/ui/src/assets/provider-icons/code0.png new file mode 100644 index 0000000..32d81c1 Binary files /dev/null and b/packages/ui/src/assets/provider-icons/code0.png differ diff --git a/src/renderer/assets/provider-icons/deepseek.ico b/packages/ui/src/assets/provider-icons/deepseek.ico similarity index 100% rename from src/renderer/assets/provider-icons/deepseek.ico rename to packages/ui/src/assets/provider-icons/deepseek.ico diff --git a/packages/ui/src/assets/provider-icons/fenno.jpg b/packages/ui/src/assets/provider-icons/fenno.jpg new file mode 100644 index 0000000..364f735 Binary files /dev/null and b/packages/ui/src/assets/provider-icons/fenno.jpg differ diff --git a/src/renderer/assets/provider-icons/gemini.svg b/packages/ui/src/assets/provider-icons/gemini.svg similarity index 100% rename from src/renderer/assets/provider-icons/gemini.svg rename to packages/ui/src/assets/provider-icons/gemini.svg diff --git a/src/renderer/assets/provider-icons/mistral.webp b/packages/ui/src/assets/provider-icons/mistral.webp similarity index 100% rename from src/renderer/assets/provider-icons/mistral.webp rename to packages/ui/src/assets/provider-icons/mistral.webp diff --git a/src/renderer/assets/provider-icons/moonshot.ico b/packages/ui/src/assets/provider-icons/moonshot.ico similarity index 100% rename from src/renderer/assets/provider-icons/moonshot.ico rename to packages/ui/src/assets/provider-icons/moonshot.ico diff --git a/src/renderer/assets/provider-icons/openai.png b/packages/ui/src/assets/provider-icons/openai.png similarity index 100% rename from src/renderer/assets/provider-icons/openai.png rename to packages/ui/src/assets/provider-icons/openai.png diff --git a/src/renderer/assets/provider-icons/openrouter.ico b/packages/ui/src/assets/provider-icons/openrouter.ico similarity index 100% rename from src/renderer/assets/provider-icons/openrouter.ico rename to packages/ui/src/assets/provider-icons/openrouter.ico diff --git a/packages/ui/src/assets/provider-icons/qiniu-ai.png b/packages/ui/src/assets/provider-icons/qiniu-ai.png new file mode 100644 index 0000000..2ff255d Binary files /dev/null and b/packages/ui/src/assets/provider-icons/qiniu-ai.png differ diff --git a/src/renderer/assets/provider-icons/runapi.jpg b/packages/ui/src/assets/provider-icons/runapi.jpg similarity index 100% rename from src/renderer/assets/provider-icons/runapi.jpg rename to packages/ui/src/assets/provider-icons/runapi.jpg diff --git a/src/renderer/assets/provider-icons/siliconflow.png b/packages/ui/src/assets/provider-icons/siliconflow.png similarity index 100% rename from src/renderer/assets/provider-icons/siliconflow.png rename to packages/ui/src/assets/provider-icons/siliconflow.png diff --git a/packages/ui/src/assets/provider-icons/teamorouter.png b/packages/ui/src/assets/provider-icons/teamorouter.png new file mode 100644 index 0000000..55f0c06 Binary files /dev/null and b/packages/ui/src/assets/provider-icons/teamorouter.png differ diff --git a/src/renderer/assets/provider-icons/zai-global-coding.svg b/packages/ui/src/assets/provider-icons/zai-global-coding.svg similarity index 100% rename from src/renderer/assets/provider-icons/zai-global-coding.svg rename to packages/ui/src/assets/provider-icons/zai-global-coding.svg diff --git a/src/renderer/assets/provider-icons/zai-global-general.svg b/packages/ui/src/assets/provider-icons/zai-global-general.svg similarity index 100% rename from src/renderer/assets/provider-icons/zai-global-general.svg rename to packages/ui/src/assets/provider-icons/zai-global-general.svg diff --git a/src/renderer/assets/provider-icons/zhipu-cn-coding.png b/packages/ui/src/assets/provider-icons/zhipu-cn-coding.png similarity index 100% rename from src/renderer/assets/provider-icons/zhipu-cn-coding.png rename to packages/ui/src/assets/provider-icons/zhipu-cn-coding.png diff --git a/src/renderer/assets/provider-icons/zhipu-cn-general.png b/packages/ui/src/assets/provider-icons/zhipu-cn-general.png similarity index 100% rename from src/renderer/assets/provider-icons/zhipu-cn-general.png rename to packages/ui/src/assets/provider-icons/zhipu-cn-general.png diff --git a/packages/ui/src/assets/tray-cyan.png b/packages/ui/src/assets/tray-cyan.png new file mode 100644 index 0000000..b259c8a Binary files /dev/null and b/packages/ui/src/assets/tray-cyan.png differ diff --git a/packages/ui/src/assets/tray-orange.png b/packages/ui/src/assets/tray-orange.png new file mode 100644 index 0000000..8b7b544 Binary files /dev/null and b/packages/ui/src/assets/tray-orange.png differ diff --git a/packages/ui/src/assets/tray-violet.png b/packages/ui/src/assets/tray-violet.png new file mode 100644 index 0000000..65e5d81 Binary files /dev/null and b/packages/ui/src/assets/tray-violet.png differ diff --git a/src/renderer/components/ui/badge.tsx b/packages/ui/src/components/ui/badge.tsx similarity index 100% rename from src/renderer/components/ui/badge.tsx rename to packages/ui/src/components/ui/badge.tsx diff --git a/src/renderer/components/ui/button.tsx b/packages/ui/src/components/ui/button.tsx similarity index 100% rename from src/renderer/components/ui/button.tsx rename to packages/ui/src/components/ui/button.tsx diff --git a/src/renderer/components/ui/card.tsx b/packages/ui/src/components/ui/card.tsx similarity index 100% rename from src/renderer/components/ui/card.tsx rename to packages/ui/src/components/ui/card.tsx diff --git a/src/renderer/components/ui/checkbox.tsx b/packages/ui/src/components/ui/checkbox.tsx similarity index 100% rename from src/renderer/components/ui/checkbox.tsx rename to packages/ui/src/components/ui/checkbox.tsx diff --git a/src/renderer/components/ui/dialog.tsx b/packages/ui/src/components/ui/dialog.tsx similarity index 97% rename from src/renderer/components/ui/dialog.tsx rename to packages/ui/src/components/ui/dialog.tsx index 3f28c94..1d971dd 100644 --- a/src/renderer/components/ui/dialog.tsx +++ b/packages/ui/src/components/ui/dialog.tsx @@ -46,7 +46,7 @@ function Dialog({ return ( { diff --git a/src/renderer/components/ui/input.tsx b/packages/ui/src/components/ui/input.tsx similarity index 100% rename from src/renderer/components/ui/input.tsx rename to packages/ui/src/components/ui/input.tsx diff --git a/src/renderer/components/ui/label.tsx b/packages/ui/src/components/ui/label.tsx similarity index 100% rename from src/renderer/components/ui/label.tsx rename to packages/ui/src/components/ui/label.tsx diff --git a/src/renderer/components/ui/popover.tsx b/packages/ui/src/components/ui/popover.tsx similarity index 100% rename from src/renderer/components/ui/popover.tsx rename to packages/ui/src/components/ui/popover.tsx diff --git a/src/renderer/components/ui/select.tsx b/packages/ui/src/components/ui/select.tsx similarity index 100% rename from src/renderer/components/ui/select.tsx rename to packages/ui/src/components/ui/select.tsx diff --git a/src/renderer/components/ui/switch.tsx b/packages/ui/src/components/ui/switch.tsx similarity index 100% rename from src/renderer/components/ui/switch.tsx rename to packages/ui/src/components/ui/switch.tsx diff --git a/src/renderer/components/ui/textarea.tsx b/packages/ui/src/components/ui/textarea.tsx similarity index 100% rename from src/renderer/components/ui/textarea.tsx rename to packages/ui/src/components/ui/textarea.tsx diff --git a/src/renderer/lib/baseui-provider.tsx b/packages/ui/src/lib/baseui-provider.tsx similarity index 100% rename from src/renderer/lib/baseui-provider.tsx rename to packages/ui/src/lib/baseui-provider.tsx diff --git a/src/renderer/lib/usage-activity.ts b/packages/ui/src/lib/usage-activity.ts similarity index 99% rename from src/renderer/lib/usage-activity.ts rename to packages/ui/src/lib/usage-activity.ts index 4af96aa..bbaae29 100644 --- a/src/renderer/lib/usage-activity.ts +++ b/packages/ui/src/lib/usage-activity.ts @@ -1,4 +1,4 @@ -import type { UsageSeriesPoint } from "../../shared/app"; +import type { UsageSeriesPoint } from "@ccr/core/contracts/app"; export type TokenActivityCell = { date: Date; diff --git a/src/renderer/lib/utils.ts b/packages/ui/src/lib/utils.ts similarity index 100% rename from src/renderer/lib/utils.ts rename to packages/ui/src/lib/utils.ts diff --git a/src/renderer/pages/browser/index.html b/packages/ui/src/pages/browser/index.html similarity index 100% rename from src/renderer/pages/browser/index.html rename to packages/ui/src/pages/browser/index.html diff --git a/src/renderer/pages/browser/main.tsx b/packages/ui/src/pages/browser/main.tsx similarity index 62% rename from src/renderer/pages/browser/main.tsx rename to packages/ui/src/pages/browser/main.tsx index bcb44d6..11b5e90 100644 --- a/src/renderer/pages/browser/main.tsx +++ b/packages/ui/src/pages/browser/main.tsx @@ -1,7 +1,7 @@ import { useEffect, useMemo, useState, type FormEvent } from "react"; import { createRoot } from "react-dom/client"; -import { ArrowLeft, ArrowRight, Globe2, LoaderCircle, Plus, RotateCw, Search, X } from "lucide-react"; -import type { BuiltInBrowserState } from "../../../shared/app"; +import { ArrowLeft, ArrowRight, Check, KeyRound, LoaderCircle, Plus, RotateCw, Search, UserRound, X } from "lucide-react"; +import type { BuiltInBrowserState, ChromeLoginImportJob, ChromeLoginImportRequest } from "@ccr/core/contracts/app"; declare global { interface Window { @@ -9,11 +9,14 @@ declare global { back: (tabId?: string) => Promise; closeTab: (tabId: string) => Promise; forward: (tabId?: string) => Promise; + getChromeLoginImport: (id: string) => Promise; getState: () => Promise; navigate: (url: string, tabId?: string) => Promise; newTab: (url?: string) => Promise; reload: (tabId?: string) => Promise; + resolveAutomationHandoff: (status: "completed" | "dismissed") => Promise; selectTab: (tabId: string) => Promise; + startChromeLoginImport: (request: ChromeLoginImportRequest) => Promise; onStateChanged: (callback: (state: BuiltInBrowserState) => void) => () => void; }; } @@ -29,10 +32,12 @@ function BrowserChrome() { const [state, setState] = useState(emptyState); const [addressDraft, setAddressDraft] = useState(""); const [homeDraft, setHomeDraft] = useState(""); + const [chromeImportJob, setChromeImportJob] = useState(); const activeTab = useMemo( () => state.tabs.find((tab) => tab.id === state.activeTabId), [state.activeTabId, state.tabs] ); + const handoff = state.automationHandoff; const homeVisible = activeTab?.url === browserHomeUrl; useEffect(() => { @@ -57,6 +62,25 @@ function BrowserChrome() { setHomeDraft(""); }, [activeTab?.id]); + useEffect(() => { + if (!chromeImportJob || chromeImportJob.status !== "pending") { + return; + } + const interval = window.setInterval(() => { + void window.ccrBrowser?.getChromeLoginImport(chromeImportJob.id).then((job) => { + if (!job) { + setChromeImportJob(undefined); + return; + } + setChromeImportJob(job); + if (job.status === "completed" && activeTab?.id && activeTabMatchesImport(activeTab.url, job.domains)) { + void run(window.ccrBrowser?.reload(activeTab.id)); + } + }); + }, 2000); + return () => window.clearInterval(interval); + }, [activeTab?.id, activeTab?.url, chromeImportJob]); + async function run(action: Promise | undefined): Promise { if (!action) { return; @@ -79,8 +103,53 @@ function BrowserChrome() { void run(window.ccrBrowser?.navigate(url, activeTab?.id)); } + async function startChromeLoginImport() { + const defaultDomain = activeTabDomain(activeTab?.url); + const rawDomains = window.prompt("Chrome domain(s) to import. Separate multiple domains with commas.", defaultDomain); + if (!rawDomains) { + return; + } + const domains = parseImportDomains(rawDomains); + if (domains.length === 0) { + return; + } + const job = await window.ccrBrowser?.startChromeLoginImport({ domains, openConfirmationPage: true }); + if (!job) { + return; + } + setChromeImportJob(job); + } + + function chromeImportTitle(): string { + if (!chromeImportJob) { + return "Import login from Chrome"; + } + if (chromeImportJob.status === "completed") { + return `Chrome import complete: ${chromeImportJob.result?.imported ?? 0} imported, ${chromeImportJob.result?.skipped ?? 0} skipped`; + } + if (chromeImportJob.status === "expired") { + return "Chrome import expired"; + } + if (chromeImportJob.status === "failed") { + return "Chrome import failed"; + } + return "Chrome import pending. Confirm it in the browser window."; + } + + async function handleChromeImportButton() { + if (chromeImportJob?.status === "pending") { + try { + await navigator.clipboard.writeText(chromeImportJob.confirmUrl); + } catch { + window.prompt("Open this Chrome import confirmation URL.", chromeImportJob.confirmUrl); + } + return; + } + await startChromeLoginImport(); + } + return ( -
      +
      @@ -149,8 +218,45 @@ function BrowserChrome() { spellCheck={false} value={addressDraft} /> + + {handoff ? ( +
      +
      + + {handoff.message} + {handoff.reason ? {handoff.reason} : null} +
      +
      + + +
      +
      + ) : null} + {homeVisible ? (
      @@ -189,6 +295,42 @@ function BrowserChrome() { const root = createRoot(document.getElementById("root") as HTMLElement); root.render(); +function activeTabDomain(url: string | undefined): string { + if (!url || url === browserHomeUrl) { + return ""; + } + try { + return new URL(url).hostname; + } catch { + return ""; + } +} + +function activeTabMatchesImport(url: string | undefined, domains: string[]): boolean { + const host = activeTabDomain(url).toLowerCase(); + return Boolean(host && domains.some((domain) => host === domain || host.endsWith(`.${domain}`))); +} + +function parseImportDomains(value: string): string[] { + return [...new Set(value + .split(/[,\n]/) + .map((item) => normalizeImportDomain(item)) + .filter((item): item is string => Boolean(item)))]; +} + +function normalizeImportDomain(value: string): string | undefined { + const raw = value.trim().toLowerCase(); + if (!raw) { + return undefined; + } + try { + return new URL(raw.includes("://") ? raw : `https://${raw}`).hostname; + } catch { + const domain = raw.replace(/^\*\./, "").split("/")[0]; + return domain && !domain.includes(" ") ? domain : undefined; + } +} + const style = document.createElement("style"); style.textContent = ` :root { @@ -231,6 +373,10 @@ style.textContent = ` width: 100%; } + .browser-shell.has-handoff { + grid-template-rows: 38px 44px 44px minmax(0, 1fr); + } + .tabs-row { -webkit-app-region: drag; align-items: end; @@ -325,7 +471,7 @@ style.textContent = ` border-bottom: 1px solid color-mix(in srgb, CanvasText 12%, transparent); display: grid; gap: 4px; - grid-template-columns: 32px 32px 32px minmax(0, 1fr); + grid-template-columns: 32px 32px 32px minmax(0, 1fr) 32px; padding: 6px 10px; } @@ -339,6 +485,11 @@ style.textContent = ` opacity: 0.4; } + .icon-button.active-import { + background: color-mix(in srgb, #0f766e 16%, transparent); + color: color-mix(in srgb, #0f766e 82%, CanvasText); + } + input { background: color-mix(in srgb, CanvasText 4%, Canvas); border: 1px solid color-mix(in srgb, CanvasText 12%, transparent); @@ -355,6 +506,79 @@ style.textContent = ` border-color: color-mix(in srgb, #2563eb 70%, CanvasText 30%); } + .automation-handoff { + -webkit-app-region: drag; + align-items: center; + background: color-mix(in srgb, #f59e0b 16%, Canvas); + border-bottom: 1px solid color-mix(in srgb, #92400e 24%, transparent); + display: grid; + gap: 10px; + grid-template-columns: minmax(0, 1fr) auto; + min-width: 0; + padding: 6px 10px; + } + + .handoff-copy { + align-items: center; + color: color-mix(in srgb, #78350f 76%, CanvasText); + display: flex; + gap: 8px; + min-width: 0; + } + + .handoff-message, + .handoff-reason { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .handoff-message { + font-size: 13px; + font-weight: 700; + } + + .handoff-reason { + color: color-mix(in srgb, CanvasText 58%, transparent); + font-size: 12px; + } + + .handoff-actions { + -webkit-app-region: no-drag; + align-items: center; + display: flex; + flex: 0 0 auto; + gap: 6px; + } + + .handoff-button { + align-items: center; + background: color-mix(in srgb, CanvasText 5%, Canvas); + border: 1px solid color-mix(in srgb, CanvasText 12%, transparent); + border-radius: 7px; + display: inline-flex; + gap: 5px; + height: 30px; + justify-content: center; + min-width: 0; + padding: 0 9px; + white-space: nowrap; + } + + .handoff-button:hover { + background: color-mix(in srgb, CanvasText 9%, Canvas); + } + + .handoff-button.primary { + background: #166534; + border-color: #166534; + color: white; + } + + .handoff-button.primary:hover { + background: #14532d; + } + .home-page { align-items: flex-start; background: @@ -487,6 +711,24 @@ style.textContent = ` .installed-apps { grid-template-columns: 1fr; } + + .automation-handoff { + gap: 6px; + grid-template-columns: minmax(0, 1fr) auto; + } + + .handoff-reason { + display: none; + } + + .handoff-button span { + display: none; + } + + .handoff-button { + padding: 0 8px; + width: 32px; + } } @keyframes spin { diff --git a/src/renderer/pages/home/App.tsx b/packages/ui/src/pages/home/App.tsx similarity index 95% rename from src/renderer/pages/home/App.tsx rename to packages/ui/src/pages/home/App.tsx index be2163d..d557b14 100644 --- a/src/renderer/pages/home/App.tsx +++ b/packages/ui/src/pages/home/App.tsx @@ -17,27 +17,27 @@ import { isCursorProxyPluginConfig, isMacPlatform, isPlainRecord, isProfileDraftSubmittable, isProviderNameDuplicate, isProviderProbeCandidateReady, isTraySupportedPlatform, isRoutingRewriteDraftRowValid, - LayoutGroup, mergeModelDisplayNames, mergeProviderCapabilities, mergeProviderModelLists, modelDescriptionsForModels, modelDisplayNamesForModels, + LayoutGroup, mergeModelDisplayNames, mergeModelMetadata, mergeProviderModelLists, modelDescriptionsForModels, modelDisplayNamesForModels, modelMetadataForModels, navigation, NavigationId, normalizeApiKeys, normalizeBotGatewaySavedConfigs, normalizeConfig, normalizeLanguagePreference, normalizeObservabilityConfig, normalizeOverviewWidgets, - normalizeProfileItem, normalizeProfileScope, normalizeProviderBaseUrl, normalizeRouterBuiltInRules, normalizeRouterFallbackConfig, normalizeThemePreference, normalizeTrayBalanceProgressConfig, normalizeTrayIconPreference, + normalizeProfileItem, normalizeProfileScope, normalizeProviderBaseUrl, normalizeRouterBuiltInRules, normalizeRouterFallbackConfig, normalizeThemePreference, normalizeToolHubConfig, normalizeTrayBalanceProgressConfig, normalizeTrayIconPreference, normalizeTrayWidgets, normalizeTrayWindowModules, normalizeVirtualModelDraftPatch, numberValue, OnboardingReadinessOptions, OnboardingStepId, onboardingStepOrder, OverviewWidgetConfig, parsePluginAppsSettingsText, parsePluginConfigSettingsText, parseProviderAccountDraft, providerCredentialsFromDraft, persistLanguagePreference, PluginMarketplaceEntry, PluginRoutingConfigTarget, pluginSettingsConfigFromDraft, PluginSettingsDraft, presetCapabilitiesFromDraft, probeProviderCandidates, probeProviderDeepLinkPayload, profileAgentLabel, profileEnvRowsForAgent, ProfileConfig, ProfileOpenSurface, ProfileRuntimeStatus, profileConfigFromDraft, providerAccountApiKeySafetyIssue, profileOpenCommandFallback, profileOpenSurfaces, ProviderAccountSnapshot, providerApiKeySafetyIssue, ProviderConnectivityCheckReport, ProviderDeepLinkPayload, ProviderDeepLinkRequest, providerIdentitySafetyIssue, providerProbeCandidates, - providerProbeCandidatesApiKeySafetyIssue, providerProbeHasSupportedProtocol, providerProbeInputKey, providerSelectableProtocolsFromProbe, ProxyCertificateStatus, ProxyNetworkSnapshot, proxyRestartMessage, + providerCapabilitiesForProtocols, providerGlobalBaseUrlForProbe, providerProbeCandidatesApiKeySafetyIssue, providerProbeHasSupportedProtocol, providerProbeInputKey, providerSelectableProtocolsFromProbe, ProxyCertificateStatus, ProxyNetworkSnapshot, proxyRestartMessage, ProxyStatus, readLanguagePreference, RequestLogListFilter, RequestLogPage, ResolvedLanguage, ResolvedTheme, resolvePluginInstallPlan, resolveProviderDeepLinkCatalogModels, RouterRule, ServerActionBusy, SettingsPageId, routingRewriteFromDraftRow, setProviderPresets, splitLines, translateAppErrorMessage, translateProxyCertificateMessage, translateText, TrayBalanceProgressConfig, TrayWidgetConfig, uniqueRoutingRuleId, updateApiKeyEditableConfig, UsageStatsFilter, UsageStatsRange, UsageStatsSnapshot, useEffect, useMemo, useReducedMotion, useRef, useState, validateVirtualModelDraft, ViewId, VirtualModelDraft, virtualModelProfileFromDraft -} from "./shared"; +} from "./shared/index"; import { startVisiblePolling } from "./shared/polling"; import { AppDialogStack, LightToast, MainLayout, OnboardingLayout -} from "./components"; +} from "./components/index"; type ProfileOpenDialogState = { busy?: "" | "cli" | "app"; @@ -56,16 +56,38 @@ const providerNamePlaceholder = "__CCR_PROVIDER_NAME__"; const providerNameSlugPlaceholder = "__CCR_PROVIDER_NAME_SLUG__"; const providerInternalNamePlaceholder = "__CCR_PROVIDER_INTERNAL_NAME__"; const localAgentProviderApiKey = "ccr-local-agent-login"; +const localCodexDefaultBaseUrl = "https://chatgpt.com/backend-api/codex"; +const localCodexProviderId = "codex-api"; + +function isLocalCodexProviderDraft(draft: AddProviderDraft): boolean { + return ( + draft.apiKey.trim() === localAgentProviderApiKey && + normalizeProviderBaseUrl(draft.baseUrl) === normalizeProviderBaseUrl(localCodexDefaultBaseUrl) + ); +} + +function localCodexProviderDraftProbeKey(draft: AddProviderDraft): string { + return JSON.stringify([ + draft.apiKey.trim(), + normalizeProviderBaseUrl(draft.baseUrl), + draft.protocol + ]); +} function materializeProviderPluginTemplates( templates: unknown[], providerName: string, - protocol: GatewayProviderConfig["type"] + protocol: GatewayProviderConfig["type"], + providerId: string ): unknown[] { if (templates.length === 0) { return []; } - const internalName = protocol ? `${providerName}::${protocol}` : providerName; + // The core gateway matches provider plugins against the provider's runtime + // identifier (provider.id, or its slug), not the human-readable display name + // — the internal name here must mirror providerCapabilityInternalName() in + // gateway/service.ts or the plugin's auth-header override silently never applies. + const internalName = protocol ? `${providerId}::${protocol}` : providerId; const replacements: Record = { [providerInternalNamePlaceholder]: internalName, [providerNamePlaceholder]: providerName, @@ -646,6 +668,9 @@ function App() { }, [draftConfig.plugins, pluginRoutingConfigTarget]); const providers = useMemo(() => draftConfig.Providers.map((provider, index) => ({ provider, index })), [draftConfig.Providers]); const gatewayEndpoint = gatewayStatus.endpoint || draftConfig.routerEndpoint; + const gatewayStartupError = gatewayStatus.state === "error" + ? translateAppErrorMessage(copy, gatewayStatus.lastError || "Service did not start.") + : ""; const networkCaptureEnabled = draftConfig.proxy.enabled && draftConfig.proxy.captureNetwork; const visibleNavigation = useMemo( () => navigation.filter((item) => @@ -827,12 +852,23 @@ function App() { void checkForAppUpdate(); } - function openUpdateDownloadDialog() { + function openSidebarUpdateDialog() { setUpdateDialogOpen(true); setUpdateActionError(""); if (updateDialogStatus.canDownload || updateDialogStatus.state === "available") { void downloadAppUpdate(); + return; } + if ( + updateDialogStatus.canInstall || + updateDialogStatus.state === "checking" || + updateDialogStatus.state === "downloading" || + updateDialogStatus.state === "downloaded" || + updateDialogStatus.state === "installing" + ) { + return; + } + void checkForAppUpdate(); } async function checkForAppUpdate() { @@ -1088,6 +1124,7 @@ function App() { setProviderDeepLinkBusy(true); let nextPayload = payload; let catalogModelDisplayNames: Record | undefined; + let catalogModelMetadata: ProviderDeepLinkPayload["modelMetadata"] | undefined; let probe: GatewayProviderProbeResult | undefined; if (nextPayload.models.length === 0) { const catalogModels = await resolveProviderDeepLinkCatalogModels(nextPayload); @@ -1096,6 +1133,7 @@ function App() { return; } catalogModelDisplayNames = catalogModels.modelDisplayNames; + catalogModelMetadata = catalogModels.modelMetadata; if (catalogModels.models.length > 0) { nextPayload = { ...nextPayload, @@ -1118,7 +1156,8 @@ function App() { const initialDraftFromPayload = createProviderDraftFromDeepLinkPayload(nextPayload, draftConfig.Providers); const initialDraft = { ...initialDraftFromPayload, - modelDisplayNames: mergeModelDisplayNames(initialDraftFromPayload.modelDisplayNames, catalogModelDisplayNames) + modelDisplayNames: mergeModelDisplayNames(initialDraftFromPayload.modelDisplayNames, catalogModelDisplayNames), + modelMetadata: mergeModelMetadata(initialDraftFromPayload.modelMetadata, catalogModelMetadata) }; setProviderEditIndex(undefined); setProviderImportOpen(true); @@ -1159,6 +1198,7 @@ function App() { ...next, modelDescriptions: patch.modelDescriptions ?? current.modelDescriptions, modelDisplayNames: patch.modelDisplayNames, + modelMetadata: patch.modelMetadata ?? current.modelMetadata, modelsText: mergeProviderModelLists(current.selectedModels, splitLines(next.modelsText)).join("\n"), selectedModels: [], selectedProtocols: patch.selectedProtocols ?? current.selectedProtocols @@ -1182,6 +1222,54 @@ function App() { if (!window.ccr || !providerFormVisible) { return; } + if (isLocalCodexProviderDraft(providerDraft)) { + providerProbeRequestId.current += 1; + const requestId = providerProbeRequestId.current; + const inputKey = localCodexProviderDraftProbeKey(providerDraft); + + setProviderProbeError(""); + if (!window.ccr.probeLocalAgentProvider) { + setProviderProbe(undefined); + setProviderProbeLoading(false); + return undefined; + } + setProviderProbeLoading(true); + + const timer = window.setTimeout(() => { + void window.ccr?.probeLocalAgentProvider?.({ id: localCodexProviderId }) + .then((result) => { + if (providerProbeRequestId.current !== requestId) { + return; + } + setProviderProbe(result.probe); + setProviderDraft((current) => { + if (!isLocalCodexProviderDraft(current) || localCodexProviderDraftProbeKey(current) !== inputKey) { + return current; + } + return applyProviderProbeResult(current, result.probe); + }); + }) + .catch((error) => { + if (providerProbeRequestId.current === requestId) { + setProviderProbe(undefined); + setProviderProbeError(formatError(error)); + } + }) + .finally(() => { + if (providerProbeRequestId.current === requestId) { + setProviderProbeLoading(false); + } + }); + }, 350); + + return () => { + window.clearTimeout(timer); + if (providerProbeRequestId.current === requestId) { + providerProbeRequestId.current += 1; + setProviderProbeLoading(false); + } + }; + } if (providerDraft.providerPlugins.length > 0) { providerProbeRequestId.current += 1; setProviderProbe(undefined); @@ -1357,8 +1445,6 @@ function App() { setProviderProbeError(translateAppErrorMessage(copy, credentials)); return false; } - const fallbackProtocol = probe?.detectedProtocol ?? providerDraft.protocol; - const fallbackBaseUrl = probe?.normalizedBaseUrl || providerDraft.baseUrl; const selectableProtocols = providerSelectableProtocolsFromProbe(probe); const selectedProtocols = providerDraft.selectedProtocols.length > 0 ? providerDraft.selectedProtocols.filter((protocol) => !probe || selectableProtocols.includes(protocol)) @@ -1368,25 +1454,20 @@ function App() { return false; } - const protocolsToSave = selectedProtocols.length > 0 ? selectedProtocols : [fallbackProtocol]; + const protocolsToSave = selectedProtocols.length > 0 ? selectedProtocols : [probe?.detectedProtocol ?? providerDraft.protocol]; + const fallbackProtocol = protocolsToSave.includes(providerDraft.protocol) + ? providerDraft.protocol + : protocolsToSave[0] ?? probe?.detectedProtocol ?? providerDraft.protocol; + const fallbackBaseUrl = providerGlobalBaseUrlForProbe(providerDraft.baseUrl, probe, protocolsToSave); const modelDescriptions = modelDescriptionsForModels(providerDraft.modelDescriptions, models); const modelDisplayNames = modelDisplayNamesForModels(providerDraft.modelDisplayNames, models); - const selectedProtocolSet = new Set(protocolsToSave); - const capabilityCandidates = mergeProviderCapabilities( - presetCapabilitiesFromDraft(providerDraft), - probe?.capabilities ?? [], - protocolsToSave.map((type) => ({ - baseUrl: fallbackBaseUrl, - source: probe?.detectedProtocol ? ("detected" as const) : ("preset" as const), - type - })) - ); - const capabilities = capabilityCandidates.filter((capability) => selectedProtocolSet.has(capability.type)); + const modelMetadata = modelMetadataForModels(providerDraft.modelMetadata, models); + const capabilities = providerCapabilitiesForProtocols(providerDraft.baseUrl, protocolsToSave, probe, presetCapabilitiesFromDraft(providerDraft)); const primaryCapability = capabilities.find((capability) => capability.type === fallbackProtocol) ?? capabilities[0]; const protocol = primaryCapability?.type ?? fallbackProtocol; - const baseUrl = primaryCapability?.baseUrl ?? fallbackBaseUrl; + const baseUrl = fallbackBaseUrl; const keySafetyIssue = providerApiKeySafetyIssue({ apiKey: providerDraft.apiKey, @@ -1431,20 +1512,24 @@ function App() { return false; } + const existingProvider = providerEditIndex !== undefined ? draftConfig.Providers[providerEditIndex] : undefined; + const providerId = existingProvider?.id ?? providerNameSlug(providerName); const provider: GatewayProviderConfig = { - api_base_url: normalizeProviderBaseUrl(baseUrl, protocol), + api_base_url: normalizeProviderBaseUrl(baseUrl), api_key: providerDraft.apiKey.trim(), capabilities: capabilities.length > 0 ? capabilities : undefined, account: accountConfig, credentials: credentials.length > 0 ? credentials : undefined, icon: providerDraft.icon.trim() || undefined, + id: providerId, modelDescriptions, modelDisplayNames, + modelMetadata, models, name: providerName, type: protocol }; - const importedProviderPlugins = materializeProviderPluginTemplates(providerDraft.providerPlugins, providerName, protocol); + const importedProviderPlugins = materializeProviderPluginTemplates(providerDraft.providerPlugins, providerName, protocol, providerId); const wasImport = providerImportOpen; const next = buildConfigUpdate((config) => { @@ -2103,6 +2188,20 @@ function App() { })); } + function changeToolHubConfig(patch: Partial) { + updateConfig((config) => ({ + ...config, + toolHub: normalizeToolHubConfig({ + ...config.toolHub, + ...patch, + llm: { + ...config.toolHub.llm, + ...(patch.llm ?? {}) + } + }) + })); + } + function openBotSettingsWithAddDialog() { setSettingsInitialPage("bots"); setSettingsBotAddRequestKey((current) => current + 1); @@ -2764,6 +2863,7 @@ function App() {
      {activeView === "onboarding" ? ( setActiveView("server")} onOpenSettings={openSettingsDialog} onSelectNavigationItem={selectNavigationItem} onToggleSidebar={() => setSidebarOpen((current) => !current)} @@ -3134,15 +3236,18 @@ function App() { onChangeLanguage: changeLanguagePreference, onChangeObservability: changeObservabilityConfig, onChangeTheme: changeThemePreference, + onChangeToolHub: changeToolHubConfig, onChangeTrayBalanceProgress: changeTrayBalanceProgress, onChangeTrayIcon: changeTrayIconPreference, onChangeTrayWidgets: changeTrayWidgets, onClose: () => setSettingsOpen(false), observability: draftConfig.observability, profiles: draftConfig.profile.profiles, + providers: draftConfig.Providers, systemLanguage, systemTheme, themePreference: draftConfig.theme || "system", + toolHub: draftConfig.toolHub, providerAccountSnapshots, trayBalanceProgress: normalizeTrayBalanceProgressConfig(draftConfig.trayBalanceProgress), trayIconPreference: draftConfig.trayIcon || "random", diff --git a/src/renderer/pages/home/components/api-keys.tsx b/packages/ui/src/pages/home/components/api-keys.tsx similarity index 99% rename from src/renderer/pages/home/components/api-keys.tsx rename to packages/ui/src/pages/home/components/api-keys.tsx index 231ab72..d1b6d44 100644 --- a/src/renderer/pages/home/components/api-keys.tsx +++ b/packages/ui/src/pages/home/components/api-keys.tsx @@ -7,7 +7,7 @@ import { formatApiKeyExpiration, formatApiKeyLimits, Input, KeyRound, limitWindowOptions, LimitWindowPreset, motion, Pencil, Plus, Search, SelectControl, translateOptions, Trash2, useAppText, useMemo, useState, X -} from "../shared"; +} from "../shared/index"; export function ApiKeysView({ addApiKey, apiKeys, diff --git a/src/renderer/pages/home/components/dashboard.tsx b/packages/ui/src/pages/home/components/dashboard.tsx similarity index 99% rename from src/renderer/pages/home/components/dashboard.tsx rename to packages/ui/src/pages/home/components/dashboard.tsx index e1e2cd9..310d111 100644 --- a/src/renderer/pages/home/components/dashboard.tsx +++ b/packages/ui/src/pages/home/components/dashboard.tsx @@ -21,7 +21,7 @@ import { UsageSeriesPoint, UsageStatsRange, UsageStatsSnapshot, usageStatusTone, UsageTotals, useAppText, useEffect, useMemo, useRef, useSensor, useSensors, useSortable, useState, X, XAxis, YAxis -} from "../shared"; +} from "../shared/index"; import { buildTokenActivity, type TokenActivityCell } from "@/lib/usage-activity"; import { ShareCardWidget } from "./share-cards"; import { Cloud, Rocket } from "lucide-react"; @@ -3705,7 +3705,7 @@ function ToolPayloadDialog({ : undefined; return ( - !open && onClose()} open> + !open && onClose()} open>
      diff --git a/src/renderer/pages/home/components/dialog-stack.tsx b/packages/ui/src/pages/home/components/dialog-stack.tsx similarity index 98% rename from src/renderer/pages/home/components/dialog-stack.tsx rename to packages/ui/src/pages/home/components/dialog-stack.tsx index b254698..cc33a3f 100644 --- a/src/renderer/pages/home/components/dialog-stack.tsx +++ b/packages/ui/src/pages/home/components/dialog-stack.tsx @@ -1,5 +1,5 @@ import type { ComponentProps, ReactElement } from "react"; -import { AnimatePresence, DialogStackLayer } from "../shared"; +import { AnimatePresence, DialogStackLayer } from "../shared/index"; import { AddApiKeyDialog, ApiKeyCreatedDialog, EditApiKeyDialog } from "./api-keys"; import { ConfigureClaudeDesignDialog, DeleteExtensionDialog, PluginSettingsDialog } from "./extensions"; import { AddProfileDialog, ProfileOpenDialog } from "./profiles"; diff --git a/src/renderer/pages/home/components/extensions.tsx b/packages/ui/src/pages/home/components/extensions.tsx similarity index 99% rename from src/renderer/pages/home/components/extensions.tsx rename to packages/ui/src/pages/home/components/extensions.tsx index 0535a16..05e8b00 100644 --- a/src/renderer/pages/home/components/extensions.tsx +++ b/packages/ui/src/pages/home/components/extensions.tsx @@ -7,7 +7,7 @@ import { Label, motion, normalizeClaudeDesignRuleTypeChange, PluginSettingsDraft, Plus, RouteTargetControl, Search, SelectControl, Settings, TextAreaControl, Toggle, translateOptions, Trash2, useAppText, useMemo, useState, X -} from "../shared"; +} from "../shared/index"; export function ExtensionsView({ configureExtension, config, diff --git a/src/renderer/pages/home/components/feedback.tsx b/packages/ui/src/pages/home/components/feedback.tsx similarity index 97% rename from src/renderer/pages/home/components/feedback.tsx rename to packages/ui/src/pages/home/components/feedback.tsx index 14782ec..182818b 100644 --- a/src/renderer/pages/home/components/feedback.tsx +++ b/packages/ui/src/pages/home/components/feedback.tsx @@ -1,7 +1,7 @@ import { AnimatePresence, AppToast, Check, motion, motionEase, reducedMotionTransition, useReducedMotion -} from "../shared"; +} from "../shared/index"; export function LightToast({ toast }: { toast?: AppToast }) { const shouldReduceMotion = useReducedMotion(); diff --git a/src/renderer/pages/home/components/index.ts b/packages/ui/src/pages/home/components/index.ts similarity index 100% rename from src/renderer/pages/home/components/index.ts rename to packages/ui/src/pages/home/components/index.ts diff --git a/src/renderer/pages/home/components/layout.tsx b/packages/ui/src/pages/home/components/layout.tsx similarity index 77% rename from src/renderer/pages/home/components/layout.tsx rename to packages/ui/src/pages/home/components/layout.tsx index 2dfca05..5affef5 100644 --- a/src/renderer/pages/home/components/layout.tsx +++ b/packages/ui/src/pages/home/components/layout.tsx @@ -1,11 +1,11 @@ import type { ComponentProps } from "react"; import { - AnimatedIconSwap, AnimatePresence, AppConfig, AppCopy, Button, cn, EndpointTitleBar, + AnimatedIconSwap, AnimatePresence, AppConfig, AppCopy, Button, Check, CircleAlert, cn, EndpointTitleBar, AppUpdateStatus, Download, GatewayStatus, listSpringTransition, LucideIcon, motion, motionEase, - LoaderCircle, NavigationId, PanelLeftClose, PanelLeftOpen, + LoaderCircle, NavigationId, PanelLeftClose, PanelLeftOpen, RefreshCw, reducedMotionTransition, ServiceControlButton, Settings, ViewId, - ViewMotionShell, viewUsesInternalScroll -} from "../shared"; + useAppText, ViewMotionShell, viewUsesInternalScroll +} from "../shared/index"; import { ApiKeysView } from "./api-keys"; import { AgentAnalysisView, OverviewView } from "./dashboard"; import { ExtensionsView } from "./extensions"; @@ -38,15 +38,20 @@ type MainViewProps = { }; export function OnboardingLayout({ + gatewayStartupError, loaded, onboarding }: { + gatewayStartupError?: string; loaded: boolean; onboarding: ComponentProps; }) { return (
      +
      + +
      {loaded ? : null}
      ); @@ -58,12 +63,14 @@ export function MainLayout({ copy, gatewayActionBusy, gatewayEndpoint, + gatewayStartupError, gatewayStatus, isMac, needsTrafficLightSafeArea, agentAnalysisEnabled, networkCaptureEnabled, - onDownloadUpdate, + onOpenUpdate, + onOpenServerSettings, onOpenSettings, onSelectNavigationItem, onToggleSidebar, @@ -82,11 +89,13 @@ export function MainLayout({ copy: AppCopy; gatewayActionBusy: boolean; gatewayEndpoint: string; + gatewayStartupError?: string; gatewayStatus: GatewayStatus; isMac: boolean; needsTrafficLightSafeArea: boolean; networkCaptureEnabled: boolean; - onDownloadUpdate: () => void; + onOpenUpdate: () => void; + onOpenServerSettings: () => void; onOpenSettings: () => void; onSelectNavigationItem: (id: NavigationId) => void; onToggleSidebar: () => void; @@ -99,15 +108,24 @@ export function MainLayout({ requestLogsEnabled: boolean; visibleNavigation: MainNavigationItem[]; }) { - const windowControlSafeAreaWidth = isMac ? 152 : 88; - const showUpdateDownloadButton = - updateStatus.supported && - (updateStatus.state === "available" || updateStatus.state === "downloading" || updateStatus.state === "downloaded"); - const updateDownloadLabel = updateStatus.state === "downloaded" + const showUpdateButton = updateStatus.supported; + const windowControlSafeAreaWidth = showUpdateButton + ? (isMac ? 188 : 124) + : (isMac ? 152 : 88); + const updateBusy = + updateActionBusy || + updateStatus.state === "checking" || + updateStatus.state === "downloading" || + updateStatus.state === "installing"; + const updateLabel = updateStatus.state === "downloaded" ? copy.text["Update ready to install"] ?? "Update ready to install" : updateStatus.state === "downloading" ? copy.text["Downloading update"] ?? "Downloading update" - : copy.text["Download update"] ?? "Download update"; + : updateStatus.state === "checking" + ? copy.text["Checking for updates"] ?? "Checking for updates" + : updateStatus.state === "available" + ? copy.text["Download update"] ?? "Download update" + : copy.text["Check for updates"] ?? "Check for updates"; return ( <> @@ -132,17 +150,25 @@ export function MainLayout({ onClick={toggleGatewayService} state={gatewayStatus.state} /> - {showUpdateDownloadButton ? ( + {showUpdateButton ? ( ) : null}
      @@ -238,6 +264,11 @@ export function MainLayout({ gatewayStatus={gatewayStatus} />
      +
      void; +}) { + const t = useAppText(); + const detail = message?.trim(); + if (!detail) { + return null; + } + + return ( +
      + +
      +
      {t("Service failed to start")}
      +
      {detail}
      +
      + {onOpenServerSettings ? ( + + ) : null} +
      + ); +} + function MainViewSwitch({ activeView, agentAnalysisEnabled, diff --git a/src/renderer/pages/home/components/network-logs.tsx b/packages/ui/src/pages/home/components/network-logs.tsx similarity index 99% rename from src/renderer/pages/home/components/network-logs.tsx rename to packages/ui/src/pages/home/components/network-logs.tsx index c209c4f..79b5303 100644 --- a/src/renderer/pages/home/components/network-logs.tsx +++ b/packages/ui/src/pages/home/components/network-logs.tsx @@ -13,7 +13,7 @@ import { RequestLogPage, requestLogPageSizeOptions, RequestLogStatusFilter, requestLogStatusOptions, Search, Select, translateOptions, Trash2, useAppNumberLocale, useAppText, useCallback, useEffect, useMemo, useRef, useState -} from "../shared"; +} from "../shared/index"; type NetworkRequestTab = "body" | "header" | "query" | "raw" | "summary"; type NetworkResponseTab = "body" | "header" | "raw"; diff --git a/src/renderer/pages/home/components/onboarding.tsx b/packages/ui/src/pages/home/components/onboarding.tsx similarity index 99% rename from src/renderer/pages/home/components/onboarding.tsx rename to packages/ui/src/pages/home/components/onboarding.tsx index d2ee1b6..9700048 100644 --- a/src/renderer/pages/home/components/onboarding.tsx +++ b/packages/ui/src/pages/home/components/onboarding.tsx @@ -5,7 +5,7 @@ import { LoaderCircle, onboardingMascotSpriteUrl, OnboardingReadinessOptions, OnboardingStepId, onboardingStepOrder, ProviderConnectivityCheckReport, reducedMotionTransition, useAppText, useReducedMotion, useState, UserRound, X -} from "../shared"; +} from "../shared/index"; import { AddProviderForm } from "./providers"; import { AddProfileForm } from "./profiles"; diff --git a/src/renderer/pages/home/components/profiles.tsx b/packages/ui/src/pages/home/components/profiles.tsx similarity index 93% rename from src/renderer/pages/home/components/profiles.tsx rename to packages/ui/src/pages/home/components/profiles.tsx index 6e1ad5f..6228749 100644 --- a/src/renderer/pages/home/components/profiles.tsx +++ b/packages/ui/src/pages/home/components/profiles.tsx @@ -6,10 +6,10 @@ import { normalizeProfileScope, normalizeProfileSurface, parseProfileModelValue, Pencil, Plus, PopoverContent, profileAgentLabel, profileAgentOptions, ProfileConfig, profileModelDisplayValue, profileModelMatchesQuery, profileModelProviderMatchesQuery, profileModelOptionDisplayName, profileModelProviderOptions, profileOpenSurfaces, profileScopeLabel, profileScopeOptions, profileSummaryItems, profileSurfaceLabel, profileSurfaceOptions, - Play, Power, RefreshCw, Search, Select, SelectControl, Terminal, Toggle, translateOptions, Trash2, useAppErrorText, useAppText, type ProfileOpenSurface, type ProfileRuntimeStatus, type ReactNode, type VirtualModelProfileConfig, + Play, Power, RefreshCw, Search, Select, SelectControl, Terminal, Toggle, translateOptions, Trash2, useAppErrorText, useAppText, type ProfileOpenSurface, type ProfileRuntimeStatus, type ReactDragEvent, type ReactNode, type VirtualModelProfileConfig, copyTextToClipboard, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, X -} from "../shared"; +} from "../shared/index"; type ProfileActionBusy = { profileId: string; @@ -774,10 +774,41 @@ export function AddProfileForm({ virtualModelProfiles?: VirtualModelProfileConfig[]; }) { const t = useAppText(); + const [appPathDragActive, setAppPathDragActive] = useState(false); + const appPathLabel = profileAppPathLabel(draft.agent); + const showAppPathField = draft.surface !== "cli" && Boolean(appPathLabel); + const handleAppPathDrop = useCallback((event: ReactDragEvent) => { + if (!showAppPathField) { + return; + } + event.preventDefault(); + event.stopPropagation(); + setAppPathDragActive(false); + const appPath = appPathFromDropEvent(event); + if (appPath) { + onChange({ appPath }); + } + }, [onChange, showAppPathField]); + const handleAppPathDragOver = useCallback((event: ReactDragEvent) => { + if (!showAppPathField) { + return; + } + event.preventDefault(); + event.dataTransfer.dropEffect = "copy"; + setAppPathDragActive(true); + }, [showAppPathField]); + const handleAppPathDragLeave = useCallback(() => { + setAppPathDragActive(false); + }, []); return ( <> -
      +
      onChange({ agent })} @@ -816,6 +847,20 @@ export function AddProfileForm({ value={draft.surface} /> + {showAppPathField && appPathLabel ? ( + +
      + onChange({ appPath: event.target.value })} + /> +
      +       + ) : null} {draft.agent === "claude-code" ? ( <> @@ -884,6 +929,63 @@ export function AddProfileForm({ ); } +function profileAppPathLabel(agent: ProfileConfig["agent"]): "CLAUDE_APP_PATH" | "CHATGPT_APP_PATH" | undefined { + if (agent === "claude-code") { + return "CLAUDE_APP_PATH"; + } + if (agent === "codex") { + return "CHATGPT_APP_PATH"; + } + return undefined; +} + +function appPathFromDropEvent(event: ReactDragEvent): string { + for (const file of Array.from(event.dataTransfer.files ?? [])) { + const path = filePathFromDroppedFile(file); + if (path) { + return path; + } + } + return appPathFromDroppedText( + event.dataTransfer.getData("text/uri-list") || + event.dataTransfer.getData("text/plain") + ); +} + +function filePathFromDroppedFile(file: File): string { + try { + const bridgedPath = window.ccr?.getFilePath?.(file)?.trim(); + if (bridgedPath) { + return bridgedPath; + } + } catch { + // Fall through to Electron versions that still expose File.path. + } + const legacyPath = (file as File & { path?: string }).path?.trim(); + return legacyPath || ""; +} + +function appPathFromDroppedText(value: string): string { + const line = value + .split(/\r?\n/) + .map((item) => item.trim()) + .find((item) => item && !item.startsWith("#")) || ""; + if (!line) { + return ""; + } + if (!line.startsWith("file:")) { + return line; + } + try { + const pathname = decodeURIComponent(new URL(line).pathname); + return /^\/[A-Za-z]:\//.test(pathname) + ? pathname.slice(1) + : pathname; + } catch { + return ""; + } +} + const ADD_BOT_SELECT_VALUE = "__add_bot__"; const HANDOFF_TARGET_NONE_VALUE = "__ccr_handoff_target_none__"; diff --git a/src/renderer/pages/home/components/providers.tsx b/packages/ui/src/pages/home/components/providers.tsx similarity index 90% rename from src/renderer/pages/home/components/providers.tsx rename to packages/ui/src/pages/home/components/providers.tsx index 8c50a3c..2cf7b32 100644 --- a/src/renderer/pages/home/components/providers.tsx +++ b/packages/ui/src/pages/home/components/providers.tsx @@ -5,20 +5,20 @@ import { compareProviderAccountSnapshots, copyTextToClipboard, createDefaultProviderAccountDraft, createModelCatalogItems, createProviderAccountDraftFromConfig, createProviderCredentialDraft, customProviderPresetId, defaultProviderAccountConfigForPreset, Dialog, DialogBody, DialogContent, DialogFooter, DialogHeader, DialogTitle, ExternalLink, Field, findProviderPreset, formatProviderAccountMeterValue, GatewayProviderConfig, - GatewayProviderProbeResult, getProviderPresets, Globe, inferProviderNameFromBaseUrl, Input, KeyValueRowsControl, Label, + GatewayProviderProbeResult, getProviderPresets, Globe, inferProviderNameFromBaseUrl, Info, Input, KeyValueRowsControl, Label, Layers3, LoaderCircle, localAgentProviderIconUrls, mergeProviderModelLists, modelCatalogItemMatchesQuery, motion, Pencil, Plus, PopoverContent, primaryProviderAccountMeter, primaryProviderPresetEndpoint, providerAccountConnectorApiKeySafetyIssue, providerAccountConnectorExample, ProviderAccountDraftMode, providerAccountModeOptions, ProviderAccountSnapshot, - providerAccountSnapshotCredentialLabel, providerAccountSnapshotLabel, ProviderAccountTestPath, + providerAccountConnectorsTextWithNewApiUserBalanceTemplate, providerAccountSnapshotCredentialLabel, providerAccountSnapshotLabel, ProviderAccountTestPath, ProviderAccountTestResult, providerBaseUrl, providerCapabilitiesSummary, ProviderCredentialDraft, ProviderDeepLinkPayload, ProviderDeepLinkRequest, providerDraftSafetyIssue, providerCredentialDraftPatchFromJson, providerHttpJsonConnectorFromDraft, - ProviderConnectivityCheckReport, providerDeepLinkDisplayIcon, providerListItemKey, providerMatchesQuery, ProviderPreset, providerPresetIconUrls, providerProbeHasSupportedProtocol, - providerModelDisplayName, providerModelDisplayTitle, providerSelectableProtocolsFromProbe, providerUsageFieldPatch, ProviderUsageFieldTarget, providerUsageMethodOptions, Search, SelectControl, + ProviderConnectivityCheckReport, providerCapabilityBaseUrlForProtocol, providerDeepLinkDisplayIcon, providerListItemKey, providerMatchesQuery, ProviderPreset, providerPresetIconUrls, providerProbeHasSupportedProtocol, + providerDisplayIcon, providerGlobalBaseUrlForProbe, providerModelDisplayName, providerModelDisplayTitle, providerSelectableProtocolsFromProbe, providerUsageFieldPatch, ProviderUsageFieldTarget, providerUsageMethodOptions, Search, SelectControl, resolveProviderDeepLinkPreset, ShieldCheck, splitLines, splitModelTagInput, Switch, Textarea, translatedProviderProtocolLabel, translateOptions, translateProbeProtocolMessage, Trash2, uniqueProviderName, uniqueProviderProtocols, useAppErrorText, useAppText, useEffect, useMemo, useRef, useState, X, isPlainRecord -} from "../shared"; -import { providerUrlWithDefaultScheme } from "../../../../shared/provider-url"; -import type { LocalAgentProviderCandidate } from "../../../../shared/app"; +} from "../shared/index"; +import { providerUrlWithDefaultScheme } from "@ccr/core/providers/url"; +import type { LocalAgentProviderCandidate } from "@ccr/core/contracts/app"; export function ProvidersView({ accountSnapshots, addProvider, editProvider, notify, providers, removeProvider }: { accountSnapshots: ProviderAccountSnapshot[]; addProvider: () => void; @@ -111,24 +111,25 @@ export function ProvidersView({ accountSnapshots, addProvider, editProvider, not
      - {visibleProviders.map(({ provider, index }) => { - const itemKey = providerListItemKey(provider, index); - const expanded = expandedProviders.has(itemKey); + {visibleProviders.map(({ provider, index }) => { + const itemKey = providerListItemKey(provider, index); + const expanded = expandedProviders.has(itemKey); const providerAccountSnapshots = accountSnapshotsByProvider.get(provider.name) ?? []; - return ( - -
      toggleProvider(provider, index)} - onKeyDown={(event) => { - if (event.key === "Enter" || event.key === " ") { - event.preventDefault(); - toggleProvider(provider, index); - } - }} - role="button" - tabIndex={0} - > + const providerIconUrl = providerDisplayIcon(provider); + return ( + +
      toggleProvider(provider, index)} + onKeyDown={(event) => { + if (event.key === "Enter" || event.key === " ") { + event.preventDefault(); + toggleProvider(provider, index); + } + }} + role="button" + tabIndex={0} + >
      +
      {provider.name || t("Unnamed")}
      @@ -608,12 +610,6 @@ export function ProviderDeepLinkDialog({
      ) : null} - {showExternalProviderWarnings ? ( -
      - - {t("Only enter an API key issued for this endpoint. Official provider keys must only be used with official endpoints.")} -
      - ) : null}
      @@ -1196,6 +1192,7 @@ function LocalAgentProviderImportPanel({ icon: result.provider.icon ?? "", modelDescriptions: result.provider.modelDescriptions, modelDisplayNames: result.provider.modelDisplayNames, + modelMetadata: result.provider.modelMetadata, modelSearch: "", modelsText: result.provider.models.join("\n"), name: result.provider.name?.trim() || inferProviderNameFromBaseUrl(result.provider.baseUrl), @@ -1356,6 +1353,7 @@ export function AddProviderForm({ const t = useAppText(); const [advancedOpen, setAdvancedOpen] = useState(mode === "edit"); const [iconDetecting, setIconDetecting] = useState(false); + const [protocolProbeDetails, setProtocolProbeDetails] = useState(); const iconDetectionRequestRef = useRef(0); const onChangeRef = useRef(onChange); const hasModelCatalog = Boolean(probe?.models.length); @@ -1363,8 +1361,11 @@ export function AddProviderForm({ const customEndpoint = draft.presetId === customProviderPresetId; const importMode = Boolean(importProvider); const showBaseUrl = customEndpoint || mode === "edit"; - const detectedProtocol = probe?.detectedProtocol ?? draft.protocol; - const detectedBaseUrl = probe?.normalizedBaseUrl || draft.baseUrl; + const selectedDisplayProtocols = uniqueProviderProtocols(draft.selectedProtocols); + const detectedProtocol = selectedDisplayProtocols.length === 1 + ? selectedDisplayProtocols[0] + : probe?.detectedProtocol ?? draft.protocol; + const detectedBaseUrl = providerCapabilityBaseUrlForProtocol(draft.baseUrl, detectedProtocol, probe); const safetyIssue = providerDraftSafetyIssue(draft, detectedBaseUrl); const localAgentImport = draft.providerPlugins.length > 0; const providerPresetOptions = [ @@ -1373,6 +1374,7 @@ export function AddProviderForm({ ...getProviderPresets().map((preset) => ({ label: t(preset.name), preset, value: preset.id })) ]; const selectableProtocols = providerSelectableProtocolsFromProbe(probe); + const protocolProbeRows = useMemo(() => uniqueProviderProbeProtocolRows(probe?.protocols ?? []), [probe]); const configuredModels = mergeProviderModelLists(draft.selectedModels, splitLines(draft.modelsText)); const hasConnectivityCheckInputs = Boolean( !localAgentImport && @@ -1385,6 +1387,32 @@ export function AddProviderForm({ onChangeRef.current = onChange; }, [onChange]); + useEffect(() => { + setProtocolProbeDetails(undefined); + }, [probe]); + + useEffect(() => { + if (!protocolProbeDetails) { + return; + } + const close = () => setProtocolProbeDetails(undefined); + const closeOnEscape = (event: KeyboardEvent) => { + if (event.key === "Escape") { + close(); + } + }; + document.addEventListener("mousedown", close); + document.addEventListener("scroll", close, true); + window.addEventListener("resize", close); + window.addEventListener("keydown", closeOnEscape); + return () => { + document.removeEventListener("mousedown", close); + document.removeEventListener("scroll", close, true); + window.removeEventListener("resize", close); + window.removeEventListener("keydown", closeOnEscape); + }; + }, [protocolProbeDetails]); + useEffect(() => { onIconDetectingChange?.(iconDetecting); return () => { @@ -1434,6 +1462,7 @@ export function AddProviderForm({ icon: "", modelDescriptions: undefined, modelDisplayNames: undefined, + modelMetadata: undefined, modelSearch: "", presetId, providerPlugins: [], @@ -1450,6 +1479,7 @@ export function AddProviderForm({ icon: "", modelDescriptions: undefined, modelDisplayNames: undefined, + modelMetadata: undefined, modelSearch: "", presetId, providerPlugins: [], @@ -1470,6 +1500,7 @@ export function AddProviderForm({ icon: "", modelDescriptions: undefined, modelDisplayNames: preset?.defaultModelDisplayNames, + modelMetadata: undefined, modelSearch: "", modelsText: draft.modelsText.trim() || preset?.defaultModels?.join("\n") || "", name: mode === "add" && preset && generatedName ? uniqueProviderName(providers, t(preset.name)) : draft.name, @@ -1481,6 +1512,20 @@ export function AddProviderForm({ }, true); } + function toggleProtocolProbeDetails( + itemKey: string, + item: GatewayProviderProbeResult["protocols"][number], + button: HTMLButtonElement + ) { + const rect = button.getBoundingClientRect(); + const position = providerProtocolProbeTooltipPosition(rect); + setProtocolProbeDetails((current) => current?.key === itemKey ? undefined : { + item, + key: itemKey, + ...position + }); + } + return ( <>
      @@ -1524,10 +1569,6 @@ export function AddProviderForm({ ) : null} onChange({ apiKey: event.target.value }, true)} /> -
      - - {t("Only enter an API key issued for this endpoint. Official provider keys must only be used with official endpoints.")} -
      {safetyIssue ? (
      @@ -1653,17 +1694,6 @@ export function AddProviderForm({ {advancedOpen ? (
      - {selectedPreset && !customEndpoint && mode === "add" ? ( - - onChange({ baseUrl: event.target.value }, true)} /> - - ) : null} - - - - - -
      - {probe?.protocols.length ? ( + {protocolProbeRows.length ? (
      - {probe.protocols.map((item) => { + {protocolProbeRows.map((item) => { + const available = item.supported; const selectable = item.supported && selectableProtocols.includes(item.protocol); const checked = selectable && draft.selectedProtocols.includes(item.protocol); + const itemKey = `${item.protocol}-${item.endpoint}`; return ( -
      +
      {translatedProviderProtocolLabel(item.protocol, t)} - - {item.supported ? t("Available") : t("Unavailable")} + + {available ? t("Available") : t("Unavailable")} + - {translateProbeProtocolMessage(item.message, t)}
      ); })} @@ -1718,6 +1766,14 @@ export function AddProviderForm({ ) : null} + {protocolProbeDetails ? ( + + ) : null}
      {error ?
      {error}
      : null} @@ -1725,6 +1781,78 @@ export function AddProviderForm({ ); } +type ProviderProtocolProbeDetailsState = { + item: GatewayProviderProbeResult["protocols"][number]; + key: string; + left: number; + top: number; +}; + +function uniqueProviderProbeProtocolRows( + protocols: GatewayProviderProbeResult["protocols"] +): GatewayProviderProbeResult["protocols"] { + const rows = new Map(); + for (const item of protocols) { + const key = `${item.protocol}\n${item.endpoint}`; + const current = rows.get(key); + if (!current || (!current.supported && item.supported)) { + rows.set(key, item); + } + } + return [...rows.values()]; +} + +function providerProtocolProbeTooltipPosition(rect: DOMRect): { left: number; top: number } { + const margin = 12; + const tooltipWidth = 260; + const tooltipHeight = 160; + const left = Math.min( + Math.max(margin, rect.right - tooltipWidth), + window.innerWidth - tooltipWidth - margin + ); + const below = rect.bottom + 8; + const above = rect.top - tooltipHeight - 8; + const top = below + tooltipHeight > window.innerHeight && above > margin + ? above + : Math.min(below, window.innerHeight - tooltipHeight - margin); + return { + left, + top: Math.max(margin, top) + }; +} + +function ProtocolProbeDetailsTooltip({ + item, + left, + t, + top +}: { + item: GatewayProviderProbeResult["protocols"][number]; + left: number; + t: (value: string) => string; + top: number; +}) { + const status = item.status === undefined ? "-" : `HTTP ${item.status}`; + const message = translateProbeProtocolMessage(item.message, t) || "-"; + + return ( +
      event.stopPropagation()} + role="tooltip" + style={{ left, top }} + > +
      {t("Protocol detection details")}
      +
      + {t("HTTP status")} + {status} + {t("Error message")} + {message} +
      +
      + ); +} + function ProviderCredentialSettings({ draft, onChange @@ -1946,7 +2074,12 @@ function ProviderUsageSettings({ const [testLoading, setTestLoading] = useState(false); const [testResult, setTestResult] = useState(); const [testError, setTestError] = useState(""); + const [newApiUserId, setNewApiUserId] = useState(""); const modeOptions = translateOptions(providerAccountModeOptions, t); + const globalBaseUrl = providerGlobalBaseUrlForProbe(draft.baseUrl, probe, draft.selectedProtocols); + const showNewApiUserBalanceTemplate = probe?.detectedProvider === "new-api" || + draft.accountConnectorsText.includes("new-api-key-usage") || + draft.accountConnectorsText.includes("new-api-user-self"); useEffect(() => { setTestResult(undefined); @@ -1965,7 +2098,7 @@ function ProviderUsageSettings({ } const safetyIssue = providerAccountConnectorApiKeySafetyIssue(connector, { apiKey: draft.apiKey, - baseUrl: (probe?.normalizedBaseUrl || draft.baseUrl).trim(), + baseUrl: globalBaseUrl, providerName: draft.name.trim(), providerPresetId: draft.presetId }); @@ -1996,6 +2129,16 @@ function ProviderUsageSettings({ onChange(providerUsageFieldPatch(target, path)); } + function insertNewApiUserBalanceTemplate() { + onChange({ + accountConnectorsText: providerAccountConnectorsTextWithNewApiUserBalanceTemplate( + draft.accountConnectorsText, + globalBaseUrl, + newApiUserId + ) + }); + } + return (
      @@ -2114,23 +2257,40 @@ function ProviderUsageSettings({ ) : null} {draft.accountMode === "raw" ? ( - -