zen-gitsync 2.18.26 → 2.19.1

package/src/ui/server/routes/git/aiDiffSummary.js

@@ -38,7 +38,9 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import express from 'express';
 import { callLlmStream } from '../workbench/llmClient.js';
+import { buildModelFallbackChain, modelLabel, runWithModelFallback } from '../../../../utils/aiModelFallback.js';
 import { ensureWithinCwd } from '../../utils/pathGuard.js';
+import logger from '../../utils/logger.js';
 import { createThinkFilter } from '../../../../cli/ai/streamFilter.js';
 import { AI_DIFF_SUMMARIES_DIR } from '../../../../paths.js';
 
@@ -365,22 +367,24 @@ export function registerAiDiffSummaryRoutes({
         return res.end();
       }
 
-      // 取默认模型
-      let model;
+      // 候选链 = 默认模型打头 + 其余已配置模型；默认模型额度用完 / 限流时自动换下一个
+      let chain;
       try {
         const rawConfig = await configManager.readRawConfigFile();
         const models = Array.isArray(rawConfig.models) ? rawConfig.models : [];
-        model = models.find(m => m.isDefault) || models[0];
+        chain = buildModelFallbackChain(models);
       } catch (err) {
         send({ type: 'error', error: '读取 AI 配置失败: ' + err.message, code: 'CONFIG_ERR' });
         finished = true;
         return res.end();
       }
-      if (!model) {
+      if (chain.length === 0) {
         send({ type: 'error', error: '未配置 AI 模型', code: 'NO_MODEL' });
         finished = true;
         return res.end();
       }
+      // 缓存键只认「默认模型」：换到备用模型只是兜底，不该让同一份 diff 再缓存一条
+      const model = chain[0];
 
       const cwd = getCwd();
       let cacheKey = '';
@@ -437,14 +441,25 @@ export function registerAiDiffSummaryRoutes({
         summaryText += content;
         send({ type: 'delta', content });
       });
-      const { aborted } = await callLlmStreamImpl(
-        model,
-        prompt,
-        (delta) => {
-          if (delta.content) contentStream.feed(delta.content);
-        },
-        { maxTokens: 1500, systemPrompt, signal: abortController.signal }
+      // 已经推过内容就不能换模型（会重复输出半截总结）
+      const { result: streamResult } = await runWithModelFallback(
+        chain,
+        (candidate) => callLlmStreamImpl(
+          candidate,
+          prompt,
+          (delta) => {
+            if (delta.content) contentStream.feed(delta.content);
+          },
+          { maxTokens: 1500, systemPrompt, signal: abortController.signal }
+        ),
+        {
+          isFatal: () => summaryText.length > 0,
+          onFallback: ({ from, to, error }) => logger.warn(
+            `[ai-diff-summary] 模型 ${modelLabel(from)} 调用失败(${error?.message || error}),改用 ${modelLabel(to)}`
+          ),
+        }
       );
+      const aborted = Boolean(streamResult?.aborted);
 
       if (aborted) {
         finished = true;

package/src/ui/server/routes/peerSettings.js

@@ -0,0 +1,164 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// 「跨机器」设置面板的后端：本机身份 + 对端清单的读写与探活。
+//
+// 挂在**主服务**上（127.0.0.1 + Origin 守卫），不是 peer 端口 —— peer 端口是给
+// 别的机器用的（要令牌），这组接口是给本机界面用的（不需要令牌，也拿不到对方机器的
+// 东西）。两套路由同名会混淆，所以这里统一用 /api/peer-settings 前缀。
+//
+// 唯一会返回令牌明文的地方就是 GET /api/peer-settings：配对时用户必须能复制它到
+// 另一台机器。它只在 127.0.0.1 上、只给本机界面看。
+
+import { asyncRoute, HttpError } from '../utils/asyncRoute.js';
+import logger from '../utils/logger.js';
+import {
+  ensureSelf,
+  readState,
+  updateSelf,
+  upsertPeer,
+  removePeer,
+  rotateSelfToken,
+  PEER_DEFAULT_PORT
+} from '../../../peer/store.js';
+import { fetchPeerInfo } from '../../../peer/client.js';
+import { applyPeerRuntime, isPeerRunning } from '../utils/peerRuntime.js';
+
+const PROBE_TIMEOUT_MS = 2500;
+
+/** 对端在线探测：失败不抛，只标记 offline（面板要能一眼看出"连不上"）。 */
+async function probe(peer) {
+  try {
+    const info = await fetchPeerInfo(peer, { timeoutMs: PROBE_TIMEOUT_MS });
+    return { online: true, remoteName: info.name || '', version: info.version || '', remoteId: info.id || '' };
+  } catch (err) {
+    return { online: false, error: String(err?.message || err) };
+  }
+}
+
+export function registerPeerSettingsRoutes({ app }) {
+  /**
+   * GET /api/peer-settings
+   * 本机身份 + 对端清单（附带一次并发探活）。
+   */
+  app.get('/api/peer-settings', asyncRoute(async (req, res) => {
+    const state = await ensureSelf();
+    const peers = state.peers || [];
+    const probed = await Promise.all(peers.map(async (p) => ({ ...p, ...(await probe(p)) })));
+
+    // 昵称**以对方自报为准**（对方在它自己的设置里改了就跟着变）。
+    // 变了顺手落盘：否则对方改名后、下次它离线时又显示回旧名字。
+    const rows = await Promise.all(probed.map(async (p) => {
+      const remoteName = p.online ? String(p.remoteName || '').trim() : '';
+      if (remoteName && remoteName !== p.name) {
+        await upsertPeer({ id: p.id, name: remoteName, url: p.url, token: p.token }).catch(() => {});
+      }
+      return {
+        id: p.id,
+        name: remoteName || p.name,
+        url: p.url,
+        online: p.online,
+        version: p.version || '',
+        error: p.error || ''
+      };
+    }));
+
+    res.json({ success: true, running: isPeerRunning(), self: state.self, peers: rows });
+  }));
+
+  /** POST /api/peer-settings/self —— 改昵称 / 头像 / 端口 / 开关。 */
+  app.post('/api/peer-settings/self', asyncRoute(async (req, res) => {
+    const body = req.body || {};
+    if (body.port !== undefined) {
+      const port = Number(body.port);
+      if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+        throw new HttpError(400, '端口必须是 1-65535 的整数');
+      }
+    }
+    const state = await updateSelf({
+      name: typeof body.name === 'string' ? body.name : undefined,
+      avatar: typeof body.avatar === 'string' ? body.avatar.slice(0, 200) : undefined,
+      port: body.port !== undefined ? Number(body.port) : undefined,
+      enabled: typeof body.enabled === 'boolean' ? body.enabled : undefined
+    });
+    // 立刻生效：开/关/换端口都当场应用，设置面板里的开关不该要求重启进程。
+    try {
+      await applyPeerRuntime(state.self);
+    } catch (err) {
+      // 起不来就别假装开着：回滚开关，把真实原因交给用户
+      if (state.self.enabled) await updateSelf({ enabled: false });
+      throw new HttpError(400, `peer 端口 ${state.self.port} 起不来：${err?.message || err}`);
+    }
+    res.json({ success: true, running: isPeerRunning(), self: state.self });
+  }));
+
+  /** POST /api/peer-settings/token —— 重新生成令牌（旧的立即失效）。 */
+  app.post('/api/peer-settings/token', asyncRoute(async (req, res) => {
+    const state = await rotateSelfToken();
+    logger.info('[peer-settings] 令牌已重置');
+    // 必须重启监听：运行中的实例持有的是**旧令牌**的闭包，不换就不生效
+    try {
+      await applyPeerRuntime(state.self);
+    } catch (err) {
+      logger.warn(`[peer-settings] 令牌已换但监听未重启: ${err?.message || err}`);
+    }
+    res.json({ success: true, running: isPeerRunning(), self: state.self });
+  }));
+
+  /**
+   * POST /api/peer-settings/peers —— 添加（或覆盖）一台对端。
+   * 先真连一次：连不上/令牌错当场报错，别让用户以为加好了。
+   */
+  app.post('/api/peer-settings/peers', asyncRoute(async (req, res) => {
+    const rawUrl = String(req.body?.url || '').trim();
+    const token = String(req.body?.token || '').trim();
+    if (!rawUrl) throw new HttpError(400, '请填对端地址');
+    if (!token) throw new HttpError(400, '请填对端令牌');
+
+    const url = (rawUrl.startsWith('http') ? rawUrl : `http://${rawUrl}`).replace(/\/+$/, '');
+    let info;
+    try {
+      info = await fetchPeerInfo({ url, token }, { timeoutMs: 5000 });
+    } catch (err) {
+      throw new HttpError(400, `连不上对端：${err?.message || err}`);
+    }
+    // 昵称由**对方**决定（它在自己的设置里写什么就叫什么），本机只在对方没设时退回地址。
+    // 这里允许显式传 name，是给将来"本地备注"留的口子；界面不再问用户填。
+    const name = String(req.body?.name || '').trim() || String(info.name || '').trim() || url;
+    const state = await upsertPeer({ id: info.id || '', name, url, token });
+    res.json({ success: true, peer: { id: info.id || '', name, url, online: true, version: info.version || '' }, count: state.peers.length });
+  }));
+
+  /** DELETE /api/peer-settings/peers/:ref —— 移除（ref 可以是 id 或昵称）。 */
+  app.delete('/api/peer-settings/peers/:ref', asyncRoute(async (req, res) => {
+    const { removed, peer } = await removePeer(decodeURIComponent(req.params.ref));
+    if (!removed) throw new HttpError(404, '没有这台对端');
+    res.json({ success: true, peer: { id: peer.id, name: peer.name } });
+  }));
+
+  /** POST /api/peer-settings/peers/:ref/test —— 单独重测一台。 */
+  app.post('/api/peer-settings/peers/:ref/test', asyncRoute(async (req, res) => {
+    const ref = decodeURIComponent(req.params.ref).toLowerCase();
+    const state = await readState();
+    const peer = (state.peers || []).find((p) => p.id.toLowerCase() === ref || p.name.toLowerCase() === ref || p.url.toLowerCase() === ref);
+    if (!peer) throw new HttpError(404, '没有这台对端');
+    const result = await probe(peer);
+    res.json({ success: true, ...result });
+  }));
+
+  /** GET /api/peer-settings/defaults —— 面板第一次打开时给默认值（端口号）。 */
+  app.get('/api/peer-settings/defaults', (req, res) => {
+    res.json({ success: true, port: PEER_DEFAULT_PORT });
+  });
+}

package/src/ui/server/routes/projectStartupAi.js

@@ -43,6 +43,7 @@ import { callLlmJson } from './workbench/llmClient.js';
 import { stripThinkingBlocks } from './workbench/jsonParse.js';
 import { buildProjectEntries, canonicalProjectPath } from './workbench/projectRegistry.js';
 import { TASKS_FILE, readJson } from './workbench/shared.js';
+import { buildModelFallbackChain, modelLabel, runWithModelFallback } from '../../../utils/aiModelFallback.js';
 import logger from '../utils/logger.js';
 
 /** 扫描深度与 npm 面板保持一致,否则模型会推荐面板里根本点不到的包 */
@@ -544,16 +545,17 @@ export function registerProjectStartupAiRoutes({ app, configManager, getCurrentP
       return res.status(400).json({ success: false, code: 'NO_PROJECT', error: '无法确定当前项目目录' });
     }
 
-    // 取默认模型(isDefault 优先,否则第一个),与提交信息生成 / 目录解读同一口径
-    let model;
+    // 候选链 = 默认模型打头 + 其余已配置模型。默认模型额度用完 / 被限流时换下一个，
+    // 而不是让整个「AI 启动建议」面板直接不可用
+    let chain;
     try {
       const rawConfig = await configManager.readRawConfigFile();
       const models = Array.isArray(rawConfig.models) ? rawConfig.models : [];
-      model = models.find(m => m.isDefault) || models[0];
+      chain = buildModelFallbackChain(models);
     } catch (err) {
       return res.status(500).json({ success: false, code: 'CONFIG_ERR', error: '读取 AI 配置失败: ' + err.message });
     }
-    if (!model) {
+    if (chain.length === 0) {
       return res.status(200).json({ success: false, code: 'NO_MODEL', error: '未配置 AI 模型' });
     }
 
@@ -569,18 +571,26 @@ export function registerProjectStartupAiRoutes({ app, configManager, getCurrentP
 
       const zh = !locale.startsWith('en');
       const prompt = buildStartupPrompt(facts, locale);
-      const raw = await callLlmJson(model, prompt, {
-        timeoutMs: 120000,
-        maxTokens: 2000,
-        systemPrompt: zh ? SYSTEM_PROMPT_ZH : SYSTEM_PROMPT_EN,
-      });
+      const { result: raw, model: usedModel } = await runWithModelFallback(
+        chain,
+        (candidate) => callLlmJson(candidate, prompt, {
+          timeoutMs: 120000,
+          maxTokens: 2000,
+          systemPrompt: zh ? SYSTEM_PROMPT_ZH : SYSTEM_PROMPT_EN,
+        }),
+        {
+          onFallback: ({ from, to, error }) => logger.warn(
+            `[project-startup] 模型 ${modelLabel(from)} 调用失败(${error?.message || error}),改用 ${modelLabel(to)}`
+          ),
+        }
+      );
 
       const suggestions = validateSuggestions(raw?.suggestions, facts, projectRoot, locale);
-      logger.info(`[project-startup] ${suggestions.length} 条建议(扫描 ${facts.dirs.length} 个目录,模型 ${model.model})`);
+      logger.info(`[project-startup] ${suggestions.length} 条建议(扫描 ${facts.dirs.length} 个目录,模型 ${usedModel.model})`);
       res.json({
         success: true,
         suggestions,
-        model: model.model,
+        model: usedModel.model,
         analyzedAt: Date.now(),
         scannedDirs: facts.dirs.length,
       });

package/src/ui/server/routes/recentDirectoriesAiSummary.js

@@ -37,6 +37,7 @@ import express from 'express';
 import { callLlmStream } from './workbench/llmClient.js';
 import { createThinkFilter } from '../../../cli/ai/streamFilter.js';
 import { normalizeDirKey } from '../utils/directoryGitState.js';
+import { buildModelFallbackChain, modelLabel, runWithModelFallback } from '../../../utils/aiModelFallback.js';
 import logger from '../utils/logger.js';
 
 /** 一次最多解读多少个目录,与 /api/recent_directories/git-state 的上限保持一致 */
@@ -276,18 +277,18 @@ export function registerRecentDirectoriesSummaryRoutes({ app, configManager }) {
         return res.end();
       }
 
-      // 取默认模型(isDefault 优先,否则第一个),与提交信息生成同一口径
-      let model;
+      // 候选链 = 默认模型打头,其余已配置模型跟上(默认模型额度用完也不会整块不可用)
+      let chain;
       try {
         const rawConfig = await configManager.readRawConfigFile();
         const models = Array.isArray(rawConfig.models) ? rawConfig.models : [];
-        model = models.find(m => m.isDefault) || models[0];
+        chain = buildModelFallbackChain(models);
       } catch (err) {
         send({ type: 'error', error: '读取 AI 配置失败: ' + err.message, code: 'CONFIG_ERR' });
         finished = true;
         return res.end();
       }
-      if (!model) {
+      if (chain.length === 0) {
         send({ type: 'error', error: '未配置 AI 模型', code: 'NO_MODEL' });
         finished = true;
         return res.end();
@@ -302,18 +303,30 @@ export function registerRecentDirectoriesSummaryRoutes({ app, configManager }) {
         send({ type: 'delta', content });
       });
 
-      const { aborted } = await callLlmStream(
-        model,
-        prompt,
-        (delta) => {
-          if (delta.content) contentStream.feed(delta.content);
-        },
+      // 已经往 SSE 里推过内容就不能换模型（会重复输出半截说明），只有「一个字都还没吐」
+      // 时才允许重试下一个
+      const { result } = await runWithModelFallback(
+        chain,
+        (candidate) => callLlmStream(
+          candidate,
+          prompt,
+          (delta) => {
+            if (delta.content) contentStream.feed(delta.content);
+          },
+          {
+            maxTokens: MAX_SUMMARY_TOKENS,
+            systemPrompt: zh ? SYSTEM_PROMPT_ZH : SYSTEM_PROMPT_EN,
+            signal: abortController.signal,
+          }
+        ),
         {
-          maxTokens: MAX_SUMMARY_TOKENS,
-          systemPrompt: zh ? SYSTEM_PROMPT_ZH : SYSTEM_PROMPT_EN,
-          signal: abortController.signal,
+          isFatal: () => summaryText.length > 0,
+          onFallback: ({ from, to, error }) => logger.warn(
+            `[recent_directories/summary] 模型 ${modelLabel(from)} 调用失败(${error?.message || error}),改用 ${modelLabel(to)}`
+          ),
         }
       );
+      const aborted = Boolean(result?.aborted);
 
       if (aborted) {
         // 前端主动断开(关弹窗/切目录):不是错误,也不必补一条 error 事件