xiaodcs-copilot-api 2.3.9-public.3 → 2.5.1-public.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "xiaodcs-copilot-api",
-  "version": "2.3.9-public.3",
+  "version": "2.5.1-public.2",
   "description": "XiaoDcs copilot-api package built from the same Edge source with Responses recovery and Codex integrations.",
   "keywords": [
     "github-copilot",
@@ -24,7 +24,8 @@
   },
   "files": [
     "dist",
-    "pages"
+    "pages",
+    "qoder-bridge/README.md"
   ],
   "publishConfig": {
     "access": "public"
@@ -35,25 +36,32 @@
     "dev": "NODE_USE_SYSTEM_CA=1 bun run --watch ./src/main.ts",
     "knip": "knip-bun",
     "lint": "eslint --cache",
-    "lint:all": "eslint --cache .",
+    "lint:all": "bun run lint && bun run --cwd desktop lint",
+    "lint:desktop": "bun run --cwd desktop lint",
     "prepack": "bun run build",
     "prepare": "simple-git-hooks",
     "release": "bumpp && bun publish --access public",
-    "start": "NODE_USE_SYSTEM_CA=1 NODE_ENV=production bun run ./src/main.ts",
+    "start": "bun run build && NODE_USE_SYSTEM_CA=1 NODE_ENV=production node ./dist/main.js",
     "test:ci": "bash scripts/test-ci.sh",
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "typecheck:all": "bun run typecheck && bun run --cwd desktop typecheck",
+    "typecheck:desktop": "bun run --cwd desktop typecheck"
   },
   "simple-git-hooks": {
     "pre-commit": "bunx lint-staged"
   },
   "lint-staged": {
-    "*": "bun run lint --fix"
+    "*": "bun run lint --fix",
+    "desktop/**/*": "eslint --config desktop/eslint.config.mjs --cache --fix"
   },
   "overrides": {
     "@hono/node-server": "^1.19.15",
     "rolldown": "1.0.0-rc.18"
   },
   "dependencies": {
+    "@azure/identity": "^4.13.2",
+    "@clack/prompts": "^1.7.0",
+    "@fastify/busboy": "^3.2.2",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "citty": "^0.1.6",
     "clipboardy": "^5.0.0",
@@ -67,7 +75,8 @@
     "tiny-invariant": "^1.3.3",
     "undici": "^7.29.0",
     "winreg": "^1.2.5",
-    "zod": "^4.1.11"
+    "zod": "^4.1.11",
+    "@qoder-ai/qoder-agent-sdk": "1.0.31"
   },
   "devDependencies": {
     "@eslint/js": "^9.37.0",
@@ -93,5 +102,8 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "ea1d517754230221b0984334920ee45b4f3d2127"
+  "trustedDependencies": [
+    "@qoder-ai/qoder-agent-sdk"
+  ],
+  "gitHead": "489f9ba568de8258057d74c52b9b74d12439ec5b"
 }

package/pages/index.html

@@ -423,9 +423,12 @@
                 id="token-usage-period"
                 class="select-control input-focus"
               >
-                <option value="day">Day</option>
-                <option value="week">Week</option>
-                <option value="month">Month</option>
+                <option value="today">Today</option>
+                <option value="this_week">This week</option>
+                <option value="last_7_days">Last 7 days</option>
+                <option value="this_month">This month</option>
+                <option value="last_30_days">Last 30 days</option>
+                <option value="lifetime">Lifetime</option>
               </select>
             </div>
             <button id="fetch-button" type="submit" class="primary-action">
@@ -463,13 +466,21 @@
         });
 
         const DEFAULT_ENDPOINT = "http://localhost:4141/usage";
-        const DEFAULT_TOKEN_USAGE_PERIOD = "day";
+        const DEFAULT_TOKEN_USAGE_PERIOD = "today";
         const DEFAULT_TOKEN_USAGE_EVENTS_PAGE_SIZE = 20;
+        const MAX_LIFETIME_TREND_POINTS = 180;
         const ALL_METRICS_VALUE = "__all__";
         const ALL_MODELS_VALUE = "__all__";
         const LEGACY_API_KEY_STORAGE_KEY = "copilot-api.usage-viewer.x-api-key";
         const CREDENTIAL_STORAGE_PREFIX = "copilot-api.usage-viewer.credential.";
-        const VALID_PERIODS = new Set(["day", "week", "month"]);
+        const VALID_PERIODS = new Set([
+          "today",
+          "this_week",
+          "last_7_days",
+          "this_month",
+          "last_30_days",
+          "lifetime",
+        ]);
         const EMPTY_TOKEN_USAGE_TOTALS = {
           cache_creation_input_tokens: 0,
           cache_read_input_tokens: 0,
@@ -495,7 +506,7 @@
           tokenUsageSummaryError: null,
           tokenUsageEventsError: null,
           tokenUsagePeriod: DEFAULT_TOKEN_USAGE_PERIOD,
-          tokenUsageTrendDayIndex: null,
+          tokenUsageTrendDay: null,
           tokenUsageTrendMetric: ALL_METRICS_VALUE,
           tokenUsageTrendModel: ALL_MODELS_VALUE,
         };
@@ -536,10 +547,17 @@
           );
         }
 
+        const LEGACY_PERIODS = {
+          day: "today",
+          week: "last_7_days",
+          month: "last_30_days",
+        };
+
         function normalizePeriod(value) {
-          return VALID_PERIODS.has(value)
-            ? value
-            : DEFAULT_TOKEN_USAGE_PERIOD;
+          if (VALID_PERIODS.has(value)) {
+            return value;
+          }
+          return LEGACY_PERIODS[value] || DEFAULT_TOKEN_USAGE_PERIOD;
         }
 
         function getSelectedPeriod() {
@@ -895,20 +913,40 @@
           return trimmed || "—";
         }
 
+        function formatRangeDate(value) {
+          const date = new Date(value);
+          if (!Number.isFinite(date.getTime())) {
+            return "N/A";
+          }
+          const options = { day: "numeric", month: "short" };
+          if (date.getFullYear() !== new Date().getFullYear()) {
+            options.year = "numeric";
+          }
+          return date.toLocaleDateString("en-US", options);
+        }
+
+        function formatRangeText(range) {
+          const start = formatRangeDate(range.start_ms);
+          const end = formatRangeDate(range.end_ms - 1);
+          return start === end ? start : `${start} - ${end}`;
+        }
+
         function renderTokenUsageRangeText(period, range) {
           const labels = {
-            day: "Day window",
-            week: "Last 7 days",
-            month: "Last 30 days",
+            today: "Today",
+            this_week: "This week",
+            last_7_days: "Last 7 days",
+            this_month: "This month",
+            last_30_days: "Last 30 days",
+            lifetime: "Lifetime",
           };
+          const label = labels[period] || labels.today;
 
-          if (!range) {
-            return labels[period] || labels.day;
+          if (!range || range.end_ms <= range.start_ms) {
+            return label;
           }
 
-          return `${labels[period] || labels.day}: ${formatDateTime(
-            range.start_ms
-          )} - ${formatDateTime(range.end_ms)}`;
+          return `${label}: ${formatRangeText(range)}`;
         }
 
         /**
@@ -1334,8 +1372,46 @@
           return parts.length === 3 ? `${parts[1]}/${parts[2]}` : value;
         }
 
+        function getTokenUsageTrendDays(dailySummary, selectedModel) {
+          const days = dailySummary?.days || [];
+          if (
+            state.tokenUsagePeriod !== "lifetime"
+            || days.length <= MAX_LIFETIME_TREND_POINTS
+          ) {
+            return days;
+          }
+
+          const usageIndexes = days.reduce((indexes, day, index) => {
+            if (getDailyTrendTotals(day, selectedModel).request_count > 0) {
+              indexes.push(index);
+            }
+            return indexes;
+          }, []);
+          if (usageIndexes.length >= MAX_LIFETIME_TREND_POINTS) {
+            const step =
+              (usageIndexes.length - 1) / (MAX_LIFETIME_TREND_POINTS - 1);
+            return Array.from(
+              { length: MAX_LIFETIME_TREND_POINTS },
+              (_, index) => days[usageIndexes[Math.round(index * step)]]
+            );
+          }
+          const indexes = new Set(usageIndexes);
+          const sampleCount = Math.max(
+            1,
+            MAX_LIFETIME_TREND_POINTS - usageIndexes.length
+          );
+          const step = (days.length - 1) / (sampleCount - 1 || 1);
+          for (let index = 0; index < sampleCount; index += 1) {
+            indexes.add(Math.round(index * step));
+          }
+          return [...indexes]
+            .sort((left, right) => left - right)
+            .slice(0, MAX_LIFETIME_TREND_POINTS)
+            .map((index) => days[index]);
+        }
+
         function renderTokenUsageDailyTrend(dailySummary, error) {
-          if (state.tokenUsagePeriod === "day") {
+          if (state.tokenUsagePeriod === "today") {
             return "";
           }
 
@@ -1435,7 +1511,6 @@
         }
 
         function renderTokenUsageTrendChart(dailySummary, selectedModel) {
-          const days = dailySummary?.days || [];
           const metrics = getTokenUsageTrendMetrics();
           const visibleMetrics =
             state.tokenUsageTrendMetric === ALL_METRICS_VALUE
@@ -1443,6 +1518,7 @@
               : metrics.filter(
                   (metric) => metric.key === state.tokenUsageTrendMetric
                 );
+          const days = getTokenUsageTrendDays(dailySummary, selectedModel);
           const hasUsage = days.some(
             (day) => getDailyTrendTotals(day, selectedModel).request_count > 0
           );
@@ -1451,11 +1527,12 @@
               ? index
               : latest;
           }, -1);
+          const selectedDayIndex = days.findIndex(
+            (day) => day.date === state.tokenUsageTrendDay
+          );
           const activeIndex =
-            Number.isInteger(state.tokenUsageTrendDayIndex)
-              && state.tokenUsageTrendDayIndex >= 0
-              && state.tokenUsageTrendDayIndex < days.length
-              ? state.tokenUsageTrendDayIndex
+            selectedDayIndex >= 0
+              ? selectedDayIndex
               : latestUsageIndex >= 0
                 ? latestUsageIndex
                 : Math.max(0, days.length - 1);
@@ -1544,7 +1621,7 @@
                     value
                   )}" r="2.5" fill="${
                     metric.color
-                  }" data-trend-day-index="${index}">
+                  }" data-trend-day="${escapeHtml(day.date)}">
                     <title>${escapeHtml(
                       `${formatChartDate(day.date)} ${metric.label}: ${formatNumber(
                         value
@@ -1588,7 +1665,7 @@
               ].join("\n");
               return `<rect x="${hitStart}" y="${padding.top}" width="${
                 hitEnd - hitStart
-              }" height="${plotHeight}" fill="transparent" style="cursor: pointer;" data-trend-day-index="${index}">
+              }" height="${plotHeight}" fill="transparent" style="cursor: pointer;" data-trend-day="${escapeHtml(day.date)}">
                 <title>${escapeHtml(title)}</title>
               </rect>`;
             })
@@ -2153,14 +2230,11 @@
             return;
           }
 
-          const trendPoint = event.target.closest("[data-trend-day-index]");
+          const trendPoint = event.target.closest("[data-trend-day]");
           if (trendPoint) {
-            const index = Number.parseInt(
-              trendPoint.getAttribute("data-trend-day-index") || "",
-              10
-            );
-            if (Number.isFinite(index) && index >= 0) {
-              state.tokenUsageTrendDayIndex = index;
+            const day = trendPoint.getAttribute("data-trend-day");
+            if (day) {
+              state.tokenUsageTrendDay = day;
               render();
             }
             return;

package/qoder-bridge/README.md

@@ -0,0 +1,112 @@
+# Qoder SDK → copilot-api
+
+Qoder 已内置到 npm 包中，支持文本与图片输入的 Chat Completions、SSE、模型目录和 Credits 查询。账号额度由 Qoder 计量，不会转移到 GitHub Copilot。
+
+## npm 安装与配置
+
+推荐 Node 24 LTS。普通包使用：
+
+```sh
+npm install -g xiaodcs-copilot-api
+copilot-api auth login --provider qoder
+copilot-api auth keys --add <你生成的网关密钥>
+copilot-api start
+```
+
+Edge 包对应 `npm install -g xiaodcs-copilot-api-edge`，命令替换为 `copilot-api-edge`。这些步骤适用于包含本次内置适配的版本；本次代码修改尚未发布到 npm。
+
+登录命令会提示输入 [Qoder PAT](https://qoder.com/account/integrations)，并通过现有配置写入机制保存到 `~/.local/share/copilot-api/config.json`（文件权限 0600）。指定 `--api-home` 或 `COPILOT_API_HOME` 时使用对应目录，配置不会随 npm 包升级丢失。交互终端中的 PAT 输入会隐藏，不会打印到日志。
+
+也可以把以下条目合并进已有配置；`apiKey` 是 **Qoder PAT**，与客户端访问网关的密钥分开：
+
+```json
+{
+  "providers": {
+    "qoder": {
+      "enabled": true,
+      "apiKey": "<Qoder PAT>"
+    }
+  }
+}
+```
+
+Qoder 默认使用 `openai-compatible` 协议和内置 SDK。登录命令写入的 `baseUrl: "qoder://sdk"` 是内部标记，不是需要启动的网络地址。用户不必安装单独的 bridge、创建 `.env.local`、配置 bridge key 或监听额外端口。主进程按需创建 SDK 会话，正常启动一个网关即可。
+
+npm 会安装固定版本的官方 SDK 及其匹配 Worker runtime；需要允许依赖的安装脚本和下载网络访问。使用 Bun 安装时，仓库已信任 SDK 的安装脚本。禁用安装脚本的环境需在允许脚本后重新安装包。无需预先安装全局 Qoder CLI。`QODER_PROXY` 可为 SDK 指定代理，否则使用 `HTTPS_PROXY` / `HTTP_PROXY`。
+
+## 调用
+
+客户端 Base URL 使用网关的 `http://127.0.0.1:4141/v1`，API Key 使用网关密钥，模型使用 `qoder/<模型 ID>`。
+
+```sh
+curl -H "Authorization: Bearer $COPILOT_API_KEY" http://127.0.0.1:4141/qoder/v1/models
+curl -H "Authorization: Bearer $COPILOT_API_KEY" http://127.0.0.1:4141/qoder/usage
+curl -N http://127.0.0.1:4141/v1/chat/completions \
+  -H "Authorization: Bearer $COPILOT_API_KEY" \
+  -H 'Content-Type: application/json' \
+  -d '{"model":"qoder/performance","messages":[{"role":"user","content":"Reply with OK only."}],"stream":true,"stream_options":{"include_usage":true}}'
+```
+
+`performance` 以账号实际模型目录为准。`/qoder/usage` 返回账号 Credits 快照；Chat Completions 的 `qoder_usage.total_credits` 返回本次会话用量。SDK 未提供有效 token 计数时，OpenAI `usage` 省略或为 null，不估算计费数据。
+
+每个请求使用独立临时目录与会话，禁用内置本地工具、技能和插件；仅注册请求提供的客户端 MCP 工具。最多并发 2 个 SDK 会话，每个请求 120 秒；客户端断开会取消对应请求。历史消息以 JSON 文字加图片编号重建，system/developer 通过 SDK systemPrompt 提供。
+
+支持客户端 function 工具调用：SDK 请求工具时将调用返回给客户端执行，下一次请求携带工具结果继续。集成网关通过现有 Responses → Messages → Chat 转换支持 Codex；独立 bridge 仍提供 Chat Completions 端点。已实测 Codex 终端工具往返、JSON 和 SSE 工具结果回传。
+
+Qoder 路由自动移除 Codex 默认附带的 provider-native web search 声明并告知模型不可用；显式强制搜索仍报错，客户端提供的搜索工具不受影响。暂不支持图片生成/编辑、结构化输出、强制指定工具、parallel_tool_calls=false（带工具时）及 temperature/max_tokens 等采样参数。max_completion_tokens 仅接受不小于 SDK 原生 32000 上限的值，不伪装可配置更小的生成上限。工具交接时 SDK 会话中止，因此可能没有最终 usage；缺失不表示免费。
+
+模型目录公开 SDK 默认窗口、可选窗口、输入上限和输出上限。provider 的 extraBody.context_window 可以选择 SDK 实际支持的窗口；未指定则保留默认。Codex 客户端预算应从默认总窗口扣除 32000 输出预留并受 max_input_tokens 约束，不能直接按模型最大可选 1M 宣传。默认未声明的 auto/efficient/lite 按最小可选 128000 保守计算。
+
+## 图片输入
+
+用户消息的 `content` 支持 OpenAI `image_url`，包括 Base64 data URL 和公网 HTTPS 图片。图片作为 SDK 原生图片块发送，历史消息中的图片用编号保留与文字的对应关系。支持 PNG、JPEG、WebP、GIF；每次请求最多 4 张、每张 5 MiB、图片合计 15 MiB。`detail` 可省略或使用 `auto`；不支持 `high`/`low` 映射。
+
+例如发送到网关 `/v1/chat/completions`：
+
+```json
+{
+  "model": "qoder/performance",
+  "messages": [{
+    "role": "user",
+    "content": [
+      {"type": "text", "text": "描述这张图片"},
+      {"type": "image_url", "image_url": {"url": "data:image/png;base64,<图片的 Base64>"}}
+    ]
+  }],
+  "stream": true
+}
+```
+
+HTTPS 下载仅接受公网 IP、443 端口，最多 3 次重定向；每跳重新检查地址并固定连接 IP，不向图片网站发送 PAT、网关密钥或 Cookie。下载使用直接 HTTPS 连接，不采用 SDK 的 `QODER_PROXY`。如果本机代理的 Fake-IP DNS 把域名解析为 `198.18.*` 等保留地址，请改用 Base64，或为图片域名配置真实 DNS 解析。本机实测 HTTPS 链接因这一 DNS 条件被拒绝；Base64 经真实网关和 Qoder 的流式识图已通过。
+
+## 从源码启动
+
+```sh
+bun install --frozen-lockfile
+bun run start --api-home=/你的配置目录 start --port 4141
+```
+
+`bun run start` 先构建再使用 Node 运行。推荐 Node 24 LTS。不要用 `bun run src/main.ts` 启动 Qoder：本机 Bun 1.3.6 的 SDK Worker 会立即关闭 transport，导致模型目录返回 502。npm 安装后的命令默认使用 Node，不受这个源码启动问题影响。
+
+同时启动两个配置时，先执行一次 `bun run build`，再分别运行 `node dist/main.js --api-home=... start --port 4141` 和 `node dist/main.js start --port 4142`，避免并发构建同一个 dist 目录。启动会单独打印 `Qoder models (数量)`；发现失败会打印警告，不影响其他 provider 启动。
+
+## 从旧实验配置迁移
+
+重新运行 `auth login --provider qoder` 并输入原来的 PAT 即可。它会替换旧的本地 HTTP bridge 配置，保留其他 provider 和已有模型配置。原 `.env.local` 不会自动导入；主网关的内置模式只使用 `providers.qoder.apiKey`，不读取实验 PAT 环境变量。
+
+旧的 `baseUrl: "http://127.0.0.1:4343"` 配置仍保留 HTTP 转发兼容性。源码中的独立 sidecar 是开发调试入口，不是 npm 用户的必需步骤。
+
+## 开发验证
+
+```sh
+bun install --frozen-lockfile
+bun run lint --fix qoder-bridge/*.ts src/services/qoder/*.ts
+bun run typecheck
+bun test --coverage tests/qoder-transport.test.ts qoder-bridge/bridge.test.ts qoder-bridge/images.test.ts
+bun qoder-bridge/integration-integrated.ts
+bun run test:ci
+bun run build
+npm pack --ignore-scripts
+```
+
+集成脚本使用随机端口和模拟 SDK，不调用真实模型。npm 安装产物的真实 PAT 验证记录见 [验证报告](../docs/sync-v2.5.1-qoder-validation.md)。

package/dist/auth-Bu4MXadr.js

@@ -1,2 +0,0 @@
-import { t as auth } from "./auth-BiVetBYt.js";
-export { auth };

package/dist/mcp-server-DQ4r-fAy.js

@@ -1,2 +0,0 @@
-import { t as runMcpServer } from "./mcp-server-BeNu_Edl.js";
-export { runMcpServer };

package/dist/models-YMUf33c-.js

@@ -1,88 +0,0 @@
-import { K as state } from "./token-D9svRIYW.js";
-//#region src/lib/models.ts
-/**
-* Converts a Copilot upstream model ID to a client-friendly ID that Claude Code
-* and Claude Desktop recognize (dots in version replaced with hyphens).
-* e.g. "claude-sonnet-4.6" -> "claude-sonnet-4-6"
-* Non-Claude models are returned unchanged.
-*/
-const toClientModelId = (modelId) => {
-	const normalized = normalizeSdkModelId(modelId);
-	if (!normalized) return modelId;
-	const versionHyphenated = normalized.version.replaceAll(".", "-");
-	return `claude-${normalized.family}-${versionHyphenated}`;
-};
-const findEndpointModel = (sdkModelId) => {
-	const models = state.models?.data ?? [];
-	const exactMatch = models.find((m) => m.id === sdkModelId);
-	if (exactMatch) return exactMatch;
-	const normalized = normalizeSdkModelId(sdkModelId);
-	if (!normalized) return;
-	const modelName = `claude-${normalized.family}-${normalized.version}`;
-	const model = models.find((m) => m.id === modelName);
-	if (model) return model;
-};
-/**
-* Finds the latest available model for a given Claude family (e.g. "opus",
-* "sonnet", "haiku") among the models currently cached in `state.models`.
-* "Latest" is determined by the highest semantic version parsed from the model
-* ID. Returns `undefined` when no model of that family is available.
-*/
-const getLatestModelForFamily = (family) => {
-	const models = state.models?.data ?? [];
-	let best;
-	for (const model of models) {
-		const normalized = normalizeSdkModelId(model.id);
-		if (!normalized || normalized.family !== family) continue;
-		const [majorPart, minorPart = "0"] = normalized.version.split(".");
-		const major = Number.parseInt(majorPart, 10);
-		const minor = Number.parseInt(minorPart, 10);
-		if (Number.isNaN(major) || Number.isNaN(minor)) continue;
-		if (!best || major > best.major || major === best.major && minor > best.minor) best = {
-			model,
-			major,
-			minor
-		};
-	}
-	return best?.model;
-};
-/**
-* Normalizes an SDK model ID to extract the model family and version.
-* this method from github copilot extension
-* Examples:
-* - "claude-opus-4-5-20251101" -> { family: "opus", version: "4.5" }
-* - "claude-3-5-sonnet-20241022" -> { family: "sonnet", version: "3.5" }
-* - "claude-sonnet-4-20250514" -> { family: "sonnet", version: "4" }
-* - "claude-haiku-3-5-20250514" -> { family: "haiku", version: "3.5" }
-* - "claude-haiku-4.5" -> { family: "haiku", version: "4.5" }
-*/
-const normalizeSdkModelId = (sdkModelId) => {
-	const withoutDate = sdkModelId.toLowerCase().replace(/-\d{8}$/, "");
-	const pattern1 = withoutDate.match(/^claude-(\w+)-(\d+)\.(\d+)$/);
-	if (pattern1) return {
-		family: pattern1[1],
-		version: `${pattern1[2]}.${pattern1[3]}`
-	};
-	const pattern2 = withoutDate.match(/^claude-(\w+)-(\d+)-(\d+)$/);
-	if (pattern2) return {
-		family: pattern2[1],
-		version: `${pattern2[2]}.${pattern2[3]}`
-	};
-	const pattern3 = withoutDate.match(/^claude-(\d+)-(\d+)-(\w+)$/);
-	if (pattern3) return {
-		family: pattern3[3],
-		version: `${pattern3[1]}.${pattern3[2]}`
-	};
-	const pattern4 = withoutDate.match(/^claude-(\w+)-(\d+)$/);
-	if (pattern4) return {
-		family: pattern4[1],
-		version: pattern4[2]
-	};
-	const pattern5 = withoutDate.match(/^claude-(\d+)-(\w+)$/);
-	if (pattern5) return {
-		family: pattern5[2],
-		version: pattern5[1]
-	};
-};
-//#endregion
-export { toClientModelId as i, getLatestModelForFamily as n, normalizeSdkModelId as r, findEndpointModel as t };