zcode-pro 1.3.1 → 1.4.1

package/src/host/webdav.mjs

@@ -6,7 +6,7 @@
 // ZCODEPRO_SYNC_FORCE_FETCH=1 可强制走 fetch（排障/测试用）。
 import { spawn, spawnSync } from 'node:child_process';
 import { mkdtemp } from 'node:fs/promises'; // fs 的 mkdtemp 是回调版，await 它会把 undefined 当回调
-import { readFileSync, rmSync } from 'node:fs';
+import { readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
@@ -88,15 +88,17 @@ function fetchErrText(err) {
 // curl 不可用时的兜底实现：返回值约定与 curl 版一致（{ ok, httpCode, body, error,
 // redirectUrl }，HTTP 4xx/5xx 也算 ok）。凭据走 Authorization 头；proxyUrl 在这条
 // 路径不生效（fetch 不读代理环境变量，调用方仍照传以免改签名）；redirect 不跟随
-// （对齐 curl 不带 -L），302 的目标地址放 redirectUrl
-async function fetchWebdavRequest({ method, url, login = '', password = '', uploadFile = null, timeoutMs = 45000, headers = [] }) {
+//（对齐 curl 不带 -L），302 的目标地址放 redirectUrl。
+// downloadFile：GET 二进制落到文件（背景图库同步下载用），此时 body 为空串。
+// contentType：PUT 的 Content-Type，缺省 application/json（历史行为），null = 不带
+async function fetchWebdavRequest({ method, url, login = '', password = '', uploadFile = null, timeoutMs = 45000, headers = [], contentType, downloadFile = null }) {
   // curl 路径的 headers 是 ["Depth: 1"] 字符串数组，fetch 要对象：按第一个冒号拆开
   const hdrs = {};
   for (const h of headers) {
     const i = h.indexOf(':');
     if (i > 0) hdrs[h.slice(0, i).trim()] = h.slice(i + 1).trim();
   }
-  if (method === 'PUT') hdrs['Content-Type'] = 'application/json';
+  if (method === 'PUT') hdrs['Content-Type'] = contentType !== undefined ? contentType : 'application/json';
   if (login || password) hdrs['Authorization'] = 'Basic ' + Buffer.from(`${login}:${password}`).toString('base64');
   try {
     const res = await fetch(url, {
@@ -106,6 +108,10 @@ async function fetchWebdavRequest({ method, url, login = '', password = '', uplo
       signal: AbortSignal.timeout(Math.max(10000, timeoutMs)),
       body: method === 'PUT' && uploadFile ? readFileSync(uploadFile) : undefined,
     });
+    if (downloadFile) {
+      writeFileSync(downloadFile, Buffer.from(await res.arrayBuffer()));
+      return { ok: true, httpCode: res.status, body: '', error: '', redirectUrl: res.headers.get('location') || '' };
+    }
     const body = await res.text().catch(() => '');
     return { ok: true, httpCode: res.status, body, error: '', redirectUrl: res.headers.get('location') || '' };
   } catch (err) {
@@ -118,20 +124,22 @@ async function fetchWebdavRequest({ method, url, login = '', password = '', uplo
 // 返回 { ok, httpCode, body, error, redirectUrl }：ok 表示 curl 本身执行成功
 // （HTTP 4xx/5xx 也算 ok，由调用方看 httpCode 分支）；error 为中文原因；
 // redirectUrl 为重定向目标（请求不跟随重定向，302 时才有值）。
-export async function webdavRequest({ method, url, login = '', password = '', uploadFile = null, proxyUrl = '', timeoutMs = 45000, headers = [] }) {
+export async function webdavRequest({ method, url, login = '', password = '', uploadFile = null, proxyUrl = '', timeoutMs = 45000, headers = [], contentType, downloadFile = null }) {
   const curl = findCurl();
-  if (!curl) return fetchWebdavRequest({ method, url, login, password, uploadFile, timeoutMs, headers });
+  if (!curl) return fetchWebdavRequest({ method, url, login, password, uploadFile, timeoutMs, headers, contentType, downloadFile });
   const dir = await mkdtemp(join(tmpdir(), 'zcodepro-webdav-'));
   const bodyFile = join(dir, 'body');
   try {
     const args = ['-sS', '--connect-timeout', '10', '--max-time', String(Math.max(10, Math.ceil(timeoutMs / 1000))),
-      '-w', '%{http_code} %{redirect_url}', '-o', bodyFile, '--config', '-'];
+      '-w', '%{http_code} %{redirect_url}', '-o', downloadFile || bodyFile, '--config', '-'];
     for (const hd of headers) {
       // 头只能是这里拼好的固定字符串（Depth: 1 等），带换行的一律丢弃
       if (typeof hd === 'string' && hd && !/[\r\n]/.test(hd)) args.push('-H', hd);
     }
     if (method === 'PUT' && uploadFile) {
-      args.push('-H', 'Content-Type: application/json', '-T', uploadFile);
+      const ct = contentType !== undefined ? contentType : 'application/json';
+      if (ct) args.push('-H', 'Content-Type: ' + ct);
+      args.push('-T', uploadFile);
     } else {
       args.push('-X', method);
     }
@@ -171,9 +179,9 @@ export async function webdavRequest({ method, url, login = '', password = '', up
 
 // PUT 前确保云端目录存在：409（父目录缺失）时逐段 MKCOL 再重试一次。
 // 已存在的目录 MKCOL 多半回 405，忽略即可——这里是尽力而为，最终成败仍看 PUT。
-export async function webdavPutWithMkcol({ url, login, password, uploadFile, proxyUrl, timeoutMs }) {
+export async function webdavPutWithMkcol({ url, login, password, uploadFile, proxyUrl, timeoutMs, contentType }) {
   const auth = { login, password, proxyUrl };
-  const first = await webdavRequest({ method: 'PUT', url, uploadFile, ...auth, timeoutMs });
+  const first = await webdavRequest({ method: 'PUT', url, uploadFile, contentType, ...auth, timeoutMs });
   if (!first.ok || (first.httpCode >= 200 && first.httpCode < 300) || first.httpCode !== 409) return first;
   try {
     const u = new URL(url);
@@ -185,7 +193,7 @@ export async function webdavPutWithMkcol({ url, login, password, uploadFile, pro
       await webdavRequest({ method: 'MKCOL', url: cur, ...auth, timeoutMs: 15000 });
     }
   } catch { /* URL 解析失败：直接重试原 PUT */ }
-  return webdavRequest({ method: 'PUT', url, uploadFile, ...auth, timeoutMs });
+  return webdavRequest({ method: 'PUT', url, uploadFile, contentType, ...auth, timeoutMs });
 }
 
 // 解析 PROPFIND（Depth: 1）的 multistatus 响应，只取文件条目：各网盘的命名空间

package/src/inject/core.js

@@ -9,6 +9,7 @@ export const HELPER_URL = BOOT.helperUrl || 'http://127.0.0.1:47889';
 function liveBoot() {
   return (typeof window !== 'undefined' && window.__ZCODEPRO__) || BOOT;
 }
+export { liveBoot };
 
 export function rpc(path, options = {}) {
   const boot = liveBoot();
@@ -24,17 +25,28 @@ export function rpc(path, options = {}) {
     .catch((err) => ({ ok: false, error: String(err && err.message || err) }));
 }
 
-// 配置缓存：菜单每次打开时拉取，保证设置弹窗里的开关即时生效
+// 配置缓存：菜单每次打开时拉取，保证设置弹窗里的开关即时生效。
+// 并发合并：config-changed 事件的多个监听方会同时 getConfig(true)（绕过
+// 缓存），不合并时一次保存触发 N 个并发全量拉取（每个都是 helper 读盘+序列化）
 let configCache = { value: null, at: 0 };
+let configInflight = null;
 export async function getConfig(force = false) {
   const now = Date.now();
   if (!force && configCache.value && now - configCache.at < 3000) return configCache.value;
-  const res = await rpc('/config');
-  if (res.ok && res.config) {
-    configCache = { value: res.config, at: now };
-    return res.config;
-  }
-  return configCache.value || { features: {} };
+  if (configInflight) return configInflight;
+  configInflight = (async () => {
+    try {
+      const res = await rpc('/config');
+      if (res.ok && res.config) {
+        configCache = { value: res.config, at: Date.now() };
+        return res.config;
+      }
+      return configCache.value || { features: {} };
+    } finally {
+      configInflight = null;
+    }
+  })();
+  return configInflight;
 }
 export function clearConfigCache() { configCache = { value: null, at: 0 }; }
 
@@ -53,7 +65,7 @@ export const DEFAULT_SHORTCUTS = {
 export const STATUS_SESSION_IDS = new Set(['ctx', 'sessionCost', 'questions']);
 export const STATUS_GLOBAL_IDS = new Set(['todayTokens', 'todayCost', 'totalTokens', 'totalCost', 'tasks']);
 
-// 状态栏统计项的默认清单（顺序即默认显示顺序）；设置 → 样式 → 状态栏里
+// 状态栏统计项的默认清单（顺序即默认显示顺序）；设置 → 外观 → 状态栏里
 // 可调顺序与显隐，配置存在 config.statusBar.items（整表覆盖）
 // 每轮回答统计项（turn-usage.js）：回答末尾标注的三段，各自可显隐（顺序固定）
 export const DEFAULT_TURN_ITEMS = [
@@ -106,7 +118,7 @@ export function isNewProjectSidebar() {
 const zh = {
   settingsTitle: 'ZCode Pro',
   tabFeatures: '功能',
-  tabStyles: '样式',
+  tabStyles: '外观',
   tabProxy: '代理',
   tabBehavior: '行为',
   tabAgents: '全局提示词',
@@ -187,8 +199,6 @@ const zh = {
   syncVerDeleteDesc: '将删除云端的这份备份，不可恢复：',
   syncVerDeleted: '已删除云端备份',
   syncVerSaved: '已保存到',
-  devMode: '开发模式',
-  devModeRowDesc: '开启后出现“重载 ZCode Pro”按钮；也可给启动器设环境变量 ZCODEPRO_DEV=1 启用。此标签页仅在开发模式生效时显示。',
   devModeDesc: '开发调试用：改完 zcode-pro 代码后不必重启 ZCode，点“重载 ZCode Pro”即可加载新代码。流程为自动构建（需在源码目录运行）→ 以新进程重启 ZCode Pro（本地助手与注入脚本都换新）→ 所有 ZCode 窗口自动刷新并重新注入；ZCode 本体与已打开的会话不受影响。',
   devReload: '重载 ZCode Pro',
   devReloading: '重载中…',
@@ -296,13 +306,65 @@ const zh = {
   featureNewtabPanelsDesc: '官方“新标签页”只列官方面板与推荐的官方插件，此功能把第三方市场插件（headroom、rtk 等）的面板卡片加进去，点击在侧边面板打开。',
   ntpDescSuffix: '插件面板',
   ntpNeedSession: '先打开一个任务会话，再从新标签页打开插件面板',
-  featureStatusBarDesc: '主界面底部右下角显示统计项：上下文占用、会话/今日/累计 token、任务数等；各项的顺序与显隐在“样式 → 状态栏”里调整。',
-  tabStylesPane: '样式调整',
+  featureStatusBarDesc: '提问输入框右下角和每轮回答最后显示统计项。',
+  tabStylesPane: '样式',
   tabStatusPane: '状态栏',
+  themeColorsPane: '主题',
+  themeBgRegions: '分区背景',
+  themeBgRegionFollow: '无背景',
+  themeBgRegionLeft: '左侧边栏',
+  themeBgRegionCenter: '中间区域',
+  themeBgRegionRight: '右侧边栏',
+  themeBgPane: '背景图',
+  themeSkinTitle: '皮肤',
+  themeSkinDesc: '知名编辑器主题配色，自动匹配 ZCode 的浅色 / 深色模式；默认保持 ZCode 原样，自定义在下方自行调色。',
+  themeSkinCustom: '自定义',
+  themeCustomTitle: '自定义主题',
+  themeCustomHint: '改颜色即实时生效（自动切到自定义皮肤）；浅色、深色各配一次，选好 5 个颜色即可生成整套界面配色。',
+  themeCustomLight: '浅色',
+  themeCustomDark: '深色',
+  themeCustomBg: '背景',
+  themeCustomCard: '卡片',
+  themeCustomFg: '正文',
+  themeCustomMuted: '次级文字',
+  themeCustomAccent: '强调色',
+  themeBgDesc: '背景来源可选本地图库、文件夹（定时轮换）或网址（定时刷新），左栏 / 中栏 / 右栏可分区独立设置；侧栏、会话流、输入框透出背景，弹窗菜单保持不透明保可读。本地图库随 WebDAV 同步上传（覆盖式，不留历史版本）。',
+  themeBgModeNone: '无背景',
+  themeBgModeLibrary: '本地图库',
+  themeBgModeFolder: '文件夹',
+  themeBgModeUrl: '网址',
+  themeBgLibrary: '我的图库',
+  themeBgUpload: '上传图片',
+  themeBgEmpty: '还没有上传图片，支持 png / jpg / webp / gif / bmp / avif，单张 10MB 以内',
+  themeBgDelete: '删除',
+  themeBgNoneHint: '选择一种背景来源；文件夹可定时轮换，网址可配合随机图 API 定时刷新。',
+  themeBgFolderPick: '浏览',
+  themeBgFolderPickTitle: '选择背景图文件夹',
+  themeBgFolderHint: '选择一个装壁纸的文件夹，图片原地读取不复制。',
+  themeBgFolderRandom: '随机顺序',
+  themeBgIntervalHint: '切换间隔（分钟）',
+  themeBgIntervalUnit: '分钟，0 = 不切换',
+  themeBgFolderCount: '文件夹里有 {n} 张图片，定时轮换中。',
+  themeBgFolderMissing: '文件夹不存在或里面没有图片。',
+  themeBgUrlHint: '定时刷新适合随机图 API（每次请求返回不同图）；刷新时带缓存参数避免命中缓存。',
+  themeBgUrlIntervalHint: '刷新间隔（分钟）',
+  themeBgUrlInvalid: '网址需以 http(s):// 开头',
+  themeBgFit: '缩放方式',
+  themeBgFitCover: '填满',
+  themeBgFitContain: '适应',
+  themeBgFitFill: '拉伸',
+  themeBgFitTile: '平铺',
+  themeBgMask: '遮罩不透明度',
+  themeBgMaskHint: '数值越高，图片越向主题背景色淡化，文字对比越清晰',
+  themeBgMaskHint2: '图片向主题背景色淡化的程度',
+  themeBgBlur: '图片模糊',
+  themeBgPanel: '面板不透明度',
+  themeBgPanelHint: '侧栏、面板与标签栏的不透明程度。越低，透出的图片越多。',
+  themeBgDeletedActive: '当前背景已删除，已自动停用背景',
   sbItemCtx: '上下文占用',
   sbItemQuestions: '提问次数',
   sbMaster: '启用统计',
-  sbMasterDesc: '总开关：关闭后底部状态栏与每轮回答的用量标注一起停用。',
+  sbMasterDesc: '总开关：关闭后输入框右下角的统计行与每轮回答的用量标注一起停用。',
   sbGroupSession: '会话统计（跟随当前会话）',
   sbGroupGlobal: '总统计',
   sbGroupTurn: '每轮统计（回答末尾）',
@@ -515,7 +577,7 @@ const zh = {
   aliasMigrateDesc: '当前 ZCode 已支持修改项目名称（项目“更多”菜单 → 编辑项目），自定义别名功能已停用。可把已保存的别名写入官方项目名称，勾选要迁移的项目；迁移只改项目名称，磁盘目录不受影响。',
   aliasMigrateItemHint: '迁移后将作为项目名称保存（可随时在“编辑项目”中再改）。仅无标记的条目可勾选；已迁移、已并入、项目已删除、本机不存在（旧机器路径）以及项目已重命名的都不可勾选——要改这些项目的名字，直接用项目“更多”菜单里的“编辑项目”。',
   aliasMigrateStateDone: '已迁移',
-  aliasMigrateStateMerged: '已并入「{name}」',
+  aliasMigrateStateMerged: '已并入“{name}”',
   aliasMigrateStateDeleted: '项目已删除',
   aliasMigrateStateMissing: '本机不存在',
   aliasMigrateStateRenamed: '项目已重命名',
@@ -563,7 +625,7 @@ const zh = {
 const en = {
   settingsTitle: 'ZCode Pro',
   tabFeatures: 'Features',
-  tabStyles: 'Styles',
+  tabStyles: 'Appearance',
   tabProxy: 'Proxy',
   tabBehavior: 'Behavior',
   tabAgents: 'Global Prompt',
@@ -644,8 +706,6 @@ const en = {
   syncVerDeleteDesc: 'This backup will be deleted from the server and cannot be recovered: ',
   syncVerDeleted: 'Backup deleted from the server.',
   syncVerSaved: 'Saved to',
-  devMode: 'Developer mode',
-  devModeRowDesc: 'Shows the "Reload ZCode Pro" button; can also be enabled with the ZCODEPRO_DEV=1 environment variable. This tab is visible only while developer mode is active.',
   devModeDesc: 'For development: after changing zcode-pro code, click "Reload ZCode Pro" instead of restarting ZCode. It builds automatically (when running from the source repo), restarts the ZCode Pro launcher process (fresh helper and injected script), and every ZCode window refreshes and re-injects. The ZCode app itself and all sessions stay untouched.',
   devReload: 'Reload ZCode Pro',
   devReloading: 'Reloading…',
@@ -753,13 +813,65 @@ const en = {
   featureNewtabPanelsDesc: "The built-in \"new tab page\" only lists built-in panels and recommended official plugins; this adds cards for third-party marketplace plugin panels (headroom, rtk, …) that open in the side pane.",
   ntpDescSuffix: 'plugin panel',
   ntpNeedSession: 'Open a task session first, then open plugin panels from the new tab page',
-  featureStatusBarDesc: 'Shows statistics at the bottom-right of the main view: context usage, session/today/total tokens, task count, etc.; reorder or hide each item under "Styles → Status bar".',
+  featureStatusBarDesc: 'Shows statistics at the bottom-right of the input box and at the end of each answer.',
   tabStylesPane: 'Styles',
   tabStatusPane: 'Status bar',
+  themeColorsPane: 'Theme',
+  themeBgRegions: 'Regional backgrounds',
+  themeBgRegionFollow: 'None',
+  themeBgRegionLeft: 'Left sidebar',
+  themeBgRegionCenter: 'Center area',
+  themeBgRegionRight: 'Right sidebar',
+  themeBgPane: 'Background',
+  themeSkinTitle: 'Skins',
+  themeSkinDesc: 'Famous editor theme palettes, auto-matching ZCode\u2019s light / dark mode; "Default" keeps ZCode as-is, "Custom" is tuned below.',
+  themeSkinCustom: 'Custom',
+  themeCustomTitle: 'Custom theme',
+  themeCustomHint: 'Color changes apply live (auto-switches to the custom skin); set light and dark separately — pick 5 colors and the whole palette is derived.',
+  themeCustomLight: 'Light',
+  themeCustomDark: 'Dark',
+  themeCustomBg: 'Background',
+  themeCustomCard: 'Card',
+  themeCustomFg: 'Text',
+  themeCustomMuted: 'Muted text',
+  themeCustomAccent: 'Accent',
+  themeBgDesc: 'Sources: local library, folder (rotate on a timer) or URL (refresh on a timer); left / center / right regions can each have their own. Sidebar, chat and composer reveal the background while menus and dialogs stay opaque. The library uploads with the zcode-pro sync group (overwrite, no history versions).',
+  themeBgModeNone: 'None',
+  themeBgModeLibrary: 'Library',
+  themeBgModeFolder: 'Folder',
+  themeBgModeUrl: 'URL',
+  themeBgLibrary: 'My library',
+  themeBgUpload: 'Upload',
+  themeBgEmpty: 'No images yet. png / jpg / webp / gif / bmp / avif, up to 10MB each',
+  themeBgDelete: 'Delete',
+  themeBgNoneHint: 'Pick a background source; folders rotate on a timer, URLs refresh on a timer for random-image APIs.',
+  themeBgFolderPick: 'Browse',
+  themeBgFolderPickTitle: 'Choose a wallpaper folder',
+  themeBgFolderHint: 'Pick a folder of wallpapers; images are read in place, not copied.',
+  themeBgFolderRandom: 'Random order',
+  themeBgIntervalHint: 'Switch interval (minutes)',
+  themeBgIntervalUnit: 'min, 0 = off',
+  themeBgFolderCount: '{n} images in the folder, rotating on the timer.',
+  themeBgFolderMissing: 'Folder missing or contains no images.',
+  themeBgUrlHint: 'Timed refresh suits random-image APIs (each request returns a new image); a cache-buster is appended on refresh.',
+  themeBgUrlIntervalHint: 'Refresh interval (minutes)',
+  themeBgUrlInvalid: 'URL must start with http(s)://',
+  themeBgFit: 'Fit',
+  themeBgFitCover: 'Fill',
+  themeBgFitContain: 'Fit',
+  themeBgFitFill: 'Stretch',
+  themeBgFitTile: 'Tile',
+  themeBgMask: 'Mask opacity',
+  themeBgMaskHint: 'Higher values fade the image toward the theme background color for clearer text',
+  themeBgMaskHint2: 'How much the image fades toward the theme background color',
+  themeBgBlur: 'Image blur',
+  themeBgPanel: 'Panel opacity',
+  themeBgPanelHint: 'Opacity of sidebar, panels and tab bar. Lower reveals more of the image.',
+  themeBgDeletedActive: 'Active background was deleted; background disabled',
   sbItemCtx: 'Context usage',
   sbItemQuestions: 'Questions asked',
   sbMaster: 'Enable statistics',
-  sbMasterDesc: 'Master switch: turning this off disables both the status bar and per-turn labels.',
+  sbMasterDesc: 'Master switch: turning this off disables both the input-box statistics and per-turn labels.',
   sbGroupSession: 'Session statistics (follows current session)',
   sbGroupGlobal: 'Global statistics',
   sbGroupTurn: 'Per-turn statistics (answer rows)',