cc-viewer 1.6.293 → 1.6.295

package/server/routes/im.js

@@ -15,11 +15,16 @@
 // reports its own in-process adapter (deps.im.getBridgeStatus) — that's what the manager probes.
 import { getDescriptor, loadConfig, loadState, saveConfig } from '../lib/im-config.js';
 import { findRecentLog } from '../lib/interceptor-core.js';
+import { readSenders } from '../lib/im-senders.js';
+import { readImClaudeMd, writeImClaudeMd, MAX_CLAUDE_MD_CHARS } from '../lib/im-claude-md.js';
+import { imDir } from '../lib/im-lock.js';
+import { listSkills, moveSkill } from '../lib/skills-api.js';
+import { importSkillTo } from './skills.js';
 import { LOG_DIR } from '../../findcc.js';
 import { join, basename } from 'node:path';
 
 const JSON_HEADERS = { 'Content-Type': 'application/json' };
-const IM_RE = /^\/api\/im\/([a-z0-9_-]+)\/(status|config|test|process|logs)$/;
+const IM_RE = /^\/api\/im\/([a-z0-9_-]+)\/(status|config|test|process|logs|senders|claude-md|skills|skills\/toggle|skills\/import)$/;
 
 /** Resolve a known platform id from the URL, or null (→ 404) for an unknown one. */
 function platformOf(url) {
@@ -126,10 +131,15 @@ function imConfigPost(req, res, parsedUrl, isLocal, deps) {
       }
     }
     const saved = saveConfig(id, incoming);
+    // applyProcess（默认 true，保持旧调用方语义）：前端 onBlur 自动保存传 false → 仅存盘、不驱动进程，
+    // 否则每次输入框失焦都会重启 worker。显式「启动/停止」按钮则不传（=true），沿用下述驱动逻辑。
+    // 注：applyProcess 是未知字段，saveConfig/normalize 不会把它写盘。
     // 驱动进程管理器（替代旧的在进程 reloadBridge）：启用→重启 worker（吸收新凭证），停用→停 worker。
     try {
-      if (saved.enabled) await deps.im.restartProcess(id);
-      else await deps.im.stopProcess(id);
+      if (incoming.applyProcess !== false) {
+        if (saved.enabled) await deps.im.restartProcess(id);
+        else await deps.im.stopProcess(id);
+      }
     } catch (e) {
       // 进程操作失败不应阻塞配置保存的响应，但必须记录——否则 worker 起不来时用户看到乐观的
       // running:true 却毫无线索（spawn 失败 / EACCES on process.out.log 等）。
@@ -209,10 +219,114 @@ function imLogs(req, res, parsedUrl, isLocal, deps) {
   res.end(JSON.stringify({ project, latest }));
 }
 
+// 发送者身份映射（senderId → {name, avatar, ts}）：供「对话记录」按 senderId 显示真实姓名+头像。
+// loopback-only：姓名/头像属个人信息，不向局域网暴露（与 config/test/process 同级）。
+function imSenders(req, res, parsedUrl, isLocal, deps) {
+  const id = platformOf(parsedUrl.pathname);
+  if (!id) { notFound(res); return; }
+  if (!isLocal) { loopbackOnly(res); return; }
+  res.writeHead(200, JSON_HEADERS);
+  res.end(JSON.stringify({ platform: id, senders: readSenders(id) }));
+}
+
+// 「模型性格定义」= 该 IM worker 工作目录下的 CLAUDE.md。loopback-only：本地文件内容、admin-only。
+// CLAUDE.md 仅在 worker 启动时读取一次，故保存后需重启该 IM worker 才生效（前端据此提示用户）。
+function imClaudeMdGet(req, res, parsedUrl, isLocal, deps) {
+  const id = platformOf(parsedUrl.pathname);
+  if (!id) { notFound(res); return; }
+  if (!isLocal) { loopbackOnly(res); return; }
+  try {
+    res.writeHead(200, JSON_HEADERS);
+    res.end(JSON.stringify({ platform: id, content: readImClaudeMd(id) }));
+  } catch (e) {
+    res.writeHead(500, JSON_HEADERS);
+    res.end(JSON.stringify({ error: String(e?.message || e) }));
+  }
+}
+
+function imClaudeMdPost(req, res, parsedUrl, isLocal, deps) {
+  const id = platformOf(parsedUrl.pathname);
+  if (!id) { notFound(res); return; }
+  if (!isLocal) { loopbackOnly(res); return; }
+  readBody(req, deps, (body) => {
+    let incoming;
+    try { incoming = JSON.parse(body); }
+    catch { res.writeHead(400, JSON_HEADERS); res.end(JSON.stringify({ error: 'Invalid JSON' })); return; }
+    if (typeof incoming.content !== 'string') {
+      res.writeHead(400, JSON_HEADERS); res.end(JSON.stringify({ error: 'content must be a string' })); return;
+    }
+    if (incoming.content.length > MAX_CLAUDE_MD_CHARS) {
+      res.writeHead(413, JSON_HEADERS); res.end(JSON.stringify({ error: 'content too large' })); return;
+    }
+    try {
+      writeImClaudeMd(id, incoming.content);
+      res.writeHead(200, JSON_HEADERS);
+      res.end(JSON.stringify({ ok: true, platform: id }));
+    } catch (e) {
+      res.writeHead(500, JSON_HEADERS);
+      res.end(JSON.stringify({ error: String(e?.message || e) }));
+    }
+  });
+}
+
+// 「${IM} SKILL 管理」= 该 IM worker 工作目录下的 .claude/skills/。loopback-only（本地文件操作、admin-only）。
+// 复用 skills-api 的 listSkills/moveSkill（按 projectDir 参数化）+ skills.js 的 importSkillTo（按 skillsRoot 参数化）。
+// IM worker 仅在启动时读取 skills，故增删/启停后需重启该 IM worker 才生效（前端提示用户）。
+function imSkills(req, res, parsedUrl, isLocal, deps) {
+  const id = platformOf(parsedUrl.pathname);
+  if (!id) { notFound(res); return; }
+  if (!isLocal) { loopbackOnly(res); return; }
+  try {
+    const dir = imDir(id);
+    // projectDir 与 homeDir 都指向 IM 目录：两次扫描命中同一 .claude/skills（user+project 重复），
+    // 过滤 source==='project' 去重并排除 plugin/builtin → 恰好是该 IM 自己的 skills(+skills-skip)。
+    const skills = listSkills({ projectDir: dir, homeDir: dir }).filter((s) => s.source === 'project');
+    res.writeHead(200, JSON_HEADERS);
+    res.end(JSON.stringify({ platform: id, skills }));
+  } catch (e) {
+    res.writeHead(500, JSON_HEADERS);
+    res.end(JSON.stringify({ error: String(e?.message || e) }));
+  }
+}
+
+function imSkillsToggle(req, res, parsedUrl, isLocal, deps) {
+  const id = platformOf(parsedUrl.pathname);
+  if (!id) { notFound(res); return; }
+  if (!isLocal) { loopbackOnly(res); return; }
+  readBody(req, deps, (body) => {
+    let incoming;
+    try { incoming = JSON.parse(body); }
+    catch { res.writeHead(400, JSON_HEADERS); res.end(JSON.stringify({ error: 'Invalid JSON' })); return; }
+    try {
+      moveSkill({ source: 'project', name: incoming.name, enable: !!incoming.enable, projectDir: imDir(id) });
+      res.writeHead(200, JSON_HEADERS);
+      res.end(JSON.stringify({ ok: true }));
+    } catch (err) {
+      const statusMap = { INVALID_NAME: 400, INVALID_SOURCE: 400, PATH_ESCAPE: 400, SYMLINK: 400, SOURCE_MISSING: 404, DEST_CONFLICT: 409 };
+      const status = statusMap[err?.code] || 500;
+      res.writeHead(status, JSON_HEADERS);
+      res.end(JSON.stringify({ error: err?.message || 'internal_error', code: err?.code || 'unknown' }));
+    }
+  });
+}
+
+function imSkillsImport(req, res, parsedUrl, isLocal, deps) {
+  const id = platformOf(parsedUrl.pathname);
+  if (!id) { notFound(res); return; }
+  if (!isLocal) { loopbackOnly(res); return; }
+  importSkillTo(req, res, { skillsRoot: join(imDir(id), '.claude', 'skills'), windowsReserved: deps.WINDOWS_RESERVED_NAMES });
+}
+
 export const imRoutes = [
   { predicate: imPredicate('status', 'GET'), handler: imStatus },
   { predicate: imPredicate('config', 'POST'), handler: imConfigPost },
   { predicate: imPredicate('test', 'POST'), handler: imTestPost },
   { predicate: imPredicate('process', 'POST'), handler: imProcessPost },
   { predicate: imPredicate('logs', 'GET'), handler: imLogs },
+  { predicate: imPredicate('senders', 'GET'), handler: imSenders },
+  { predicate: imPredicate('claude-md', 'GET'), handler: imClaudeMdGet },
+  { predicate: imPredicate('claude-md', 'POST'), handler: imClaudeMdPost },
+  { predicate: imPredicate('skills', 'GET'), handler: imSkills },
+  { predicate: imPredicate('skills/toggle', 'POST'), handler: imSkillsToggle },
+  { predicate: imPredicate('skills/import', 'POST'), handler: imSkillsImport },
 ];

package/server/routes/project-meta.js

@@ -4,6 +4,23 @@ import { join } from 'node:path';
 import { PACKAGE_JSON } from '../_paths.js';
 import { LOG_DIR } from '../../findcc.js';
 import { _projectName } from '../interceptor.js';
+import { detectHomebrewInstall } from '../lib/updater.js';
+
+// 判定当前 cc-viewer 的安装渠道，供前端精准匹配升级命令。
+//   - electron：桌面版（in-process server），走 GitHub Releases 重新下载安装包。
+//   - brew：Homebrew Cellar 布局命中 → `brew upgrade cc-viewer`（npm install -g 会跟 Cellar 打架）。
+//   - npm：默认兜底 → `npm install -g cc-viewer --registry=...`（指定官方源避免镜像滞后拿到旧版本）。
+// deps 仅供单测注入；失败安全：detect 抛异常时回落到 npm（不会误导 brew 用户走 npm）。
+export function getInstallMethod({
+  electron = process.versions && process.versions.electron,
+  detect = detectHomebrewInstall,
+} = {}) {
+  if (electron) return 'electron';
+  try {
+    if (detect()) return 'brew';
+  } catch { /* 探测失败 → 回落 npm */ }
+  return 'npm';
+}
 
 function projectName(req, res) {
   res.writeHead(200, { 'Content-Type': 'application/json' });
@@ -20,7 +37,7 @@ function versionInfo(req, res) {
   try {
     const pkg = JSON.parse(readFileSync(PACKAGE_JSON, 'utf-8'));
     res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ version: pkg.version }));
+    res.end(JSON.stringify({ version: pkg.version, installMethod: getInstallMethod() }));
   } catch {
     res.writeHead(500, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: 'Failed to read version' }));

package/server/routes/skills.js

@@ -44,16 +44,177 @@ function skillsToggle(req, res) {
   });
 }
 
-// Skill 上传/导入 API —— 接受 .zip 或 SKILL.md（忽略大小写），写入用户级 ~/.claude/skills/{name}/
-// 设计要点：
-//  · 100MB 上限，跟 /api/upload 一致；
-//  · 扩展名白名单只放 zip / md（忽略大小写）；其他类型直接 415；
-//  · zip 内必须含 SKILL.md（任意子目录、忽略大小写），找最浅的那个所在目录作为 skill 根；
-//  · skill 名优先取 SKILL.md frontmatter 的 name，回落到 zip / md 文件名（去扩展名）；
-//  · 名字必须通过 validateSkillName，目标目录已存在则 409 拒绝（前端引导用户改 zip 名）。
-function skillsImport(req, res, parsedUrl, isLocal, deps) {
+// ─── Skill 上传/导入：可复用核心（供用户级 /api/skills/import 与 IM 级 /api/im/:platform/skills/import 共用）───
+// 设计要点（与原实现一致）：
+//  · 扩展名白名单只放 zip / md（忽略大小写）；其他类型 415；
+//  · zip 内必须含 SKILL.md（任意子目录、忽略大小写），取最浅的那个所在目录作为 skill 根；
+//  · skill 名优先取 SKILL.md frontmatter 的 name，回落 zip 根目录名 / 文件名（去扩展名）；
+//  · zip bomb 防护：单文件 ≤50MB，总解压 ≤200MB；拒绝 symlink entry。
+
+const parseNameFromMd = (text) => {
+  const m = /^---\s*\n([\s\S]*?)\n---/.exec(text);
+  if (!m) return null;
+  const nm = /^name\s*:\s*(.*)$/m.exec(m[1]);
+  if (!nm) return null;
+  return nm[1].trim().replace(/^["']|["']$/g, '');
+};
+
+const fallbackBaseName = (filename, stripExt) => {
+  let n = filename.replace(/^.*[\\/]/, '');
+  if (stripExt) n = n.replace(/\.[^.]+$/, '');
+  return n;
+};
+
+/**
+ * 解析一段 multipart body（已组装好的 Buffer）→ { skillName, files: [{relPath, data}] }。
+ * 抛 { status, code } 形式的错误（与原 skillsImport 一致），由调用方映射 HTTP。
+ */
+export async function parseSkillUpload(buf, boundary, windowsReservedRe) {
+  const headerEnd = buf.indexOf('\r\n\r\n');
+  if (headerEnd === -1) throw Object.assign(new Error('Malformed multipart'), { status: 400 });
+  const headerStr = buf.slice(0, headerEnd).toString();
+  const nameMatch = headerStr.match(/filename="([^"]+)"/);
+  if (!nameMatch) throw Object.assign(new Error('No filename'), { status: 400 });
+  // NFKC 规范化 + 控制字符/路径分隔符过滤 + 零宽和方向覆盖字符过滤（防止 homoglyph / RLO 混淆）
+  const originalName = nameMatch[1]
+    .normalize('NFKC')
+    .replace(/[\x00-\x1f/\\]/g, '_')
+    .replace(/[​-‏‪-‮⁠]/g, '');
+  // Windows 保留设备名守卫。
+  {
+    const base = originalName.split('.')[0].trim().toLowerCase();
+    if (windowsReservedRe && windowsReservedRe.test(base)) {
+      throw Object.assign(new Error('Reserved filename not allowed'), { status: 400 });
+    }
+  }
+  const lower = originalName.toLowerCase();
+  const isZip = lower.endsWith('.zip');
+  const isMd = lower.endsWith('.md');
+  if (!isZip && !isMd) {
+    throw Object.assign(new Error('Unsupported file type'), { status: 415, code: 'INVALID_TYPE' });
+  }
+  const bodyStart = headerEnd + 4;
+  const closingBoundary = Buffer.from('\r\n--' + boundary);
+  const bodyEnd = buf.indexOf(closingBoundary, bodyStart);
+  const fileData = bodyEnd !== -1 ? buf.slice(bodyStart, bodyEnd) : buf.slice(bodyStart);
+
+  let skillName = null;
+  let skillFiles = []; // { relPath, data }
+
+  if (isMd) {
+    const text = fileData.toString('utf8');
+    skillName = parseNameFromMd(text) || fallbackBaseName(originalName, true);
+    skillFiles = [{ relPath: 'SKILL.md', data: fileData }];
+  } else {
+    const AdmZip = (await import('adm-zip')).default;
+    let zip;
+    try {
+      zip = new AdmZip(fileData);
+    } catch {
+      throw Object.assign(new Error('Invalid zip archive'), { status: 400, code: 'INVALID_ZIP' });
+    }
+    const entries = zip.getEntries();
+    const MAX_PER_FILE = 50 * 1024 * 1024;
+    const MAX_TOTAL_UNCOMPRESSED = 200 * 1024 * 1024;
+    let totalUncompressed = 0;
+    for (const e of entries) {
+      if (e.isDirectory) continue;
+      const unixMode = (e.attr >>> 16) & 0xffff;
+      if ((unixMode & 0o170000) === 0o120000) {
+        throw Object.assign(new Error('Symlinks not allowed in zip'), { status: 400, code: 'INVALID_ZIP' });
+      }
+      const sizeRaw = e.header?.size || 0;
+      if (sizeRaw > MAX_PER_FILE) {
+        throw Object.assign(new Error('File too large in archive'), { status: 400, code: 'ZIP_BOMB' });
+      }
+      totalUncompressed += sizeRaw;
+      if (totalUncompressed > MAX_TOTAL_UNCOMPRESSED) {
+        throw Object.assign(new Error('Archive expands too large'), { status: 400, code: 'ZIP_BOMB' });
+      }
+    }
+    let bestSkillEntry = null;
+    let bestDepth = Infinity;
+    for (const e of entries) {
+      if (e.isDirectory) continue;
+      const en = e.entryName;
+      const base = en.split('/').pop() || '';
+      if (base.toLowerCase() === 'skill.md') {
+        const depth = en.split('/').length;
+        if (depth < bestDepth) { bestDepth = depth; bestSkillEntry = e; }
+      }
+    }
+    if (!bestSkillEntry) {
+      throw Object.assign(new Error('SKILL.md not found in zip'), { status: 400, code: 'MISSING_SKILL_MD' });
+    }
+    const lastSlash = bestSkillEntry.entryName.lastIndexOf('/');
+    const skillRootPrefix = lastSlash >= 0 ? bestSkillEntry.entryName.slice(0, lastSlash + 1) : '';
+    const skillMdText = bestSkillEntry.getData().toString('utf8');
+    skillName = parseNameFromMd(skillMdText)
+      || (skillRootPrefix ? skillRootPrefix.replace(/\/$/, '').split('/').pop() : null)
+      || fallbackBaseName(originalName, true);
+
+    // 二次校验：header.size 来自 zip 中央目录是攻击者可控的（可谎报 size=0），用真实 data.length 复核。
+    let actualTotal = 0;
+    for (const e of entries) {
+      if (e.isDirectory) continue;
+      if (skillRootPrefix && !e.entryName.startsWith(skillRootPrefix)) continue;
+      const rel = skillRootPrefix ? e.entryName.slice(skillRootPrefix.length) : e.entryName;
+      if (!rel || rel.includes('..')) continue;
+      const data = e.getData();
+      if (data.length > MAX_PER_FILE) {
+        throw Object.assign(new Error('File actual size too large'), { status: 400, code: 'ZIP_BOMB' });
+      }
+      actualTotal += data.length;
+      if (actualTotal > MAX_TOTAL_UNCOMPRESSED) {
+        throw Object.assign(new Error('Archive actual size too large'), { status: 400, code: 'ZIP_BOMB' });
+      }
+      const finalRel = rel.split('/').pop().toLowerCase() === 'skill.md'
+        ? rel.replace(/[^/]*$/, 'SKILL.md')
+        : rel;
+      skillFiles.push({ relPath: finalRel, data });
+    }
+  }
+
+  if (!validateSkillName(skillName)) {
+    throw Object.assign(new Error(`Invalid skill name: ${skillName}`), { status: 400, code: 'INVALID_NAME' });
+  }
+  return { skillName, files: skillFiles };
+}
+
+/**
+ * 把解析出的 skill 文件写入 <skillsRoot>/<skillName>/。原子 mkdir（已存在→409 EXISTS）+ 路径包含校验。
+ * @returns {string} targetDir
+ */
+export function writeSkillFiles(skillsRoot, skillName, files) {
+  mkdirSync(skillsRoot, { recursive: true });
+  const targetDir = join(skillsRoot, skillName);
+  // 原子创建：不带 recursive 让 mkdir 在已存在时直接抛 EEXIST，消除 TOCTOU 竞争窗口。
+  try {
+    mkdirSync(targetDir);
+  } catch (err) {
+    if (err.code === 'EEXIST') {
+      throw Object.assign(new Error(`Skill already exists: ${skillName}`), { status: 409, code: 'EXISTS' });
+    }
+    throw err;
+  }
+  // 二次防御：resolved + sep 后缀比较，防止 prefix 攻击。
+  const resolvedTarget = resolve(targetDir) + sep;
+  for (const f of files) {
+    const dest = join(targetDir, f.relPath);
+    if (!resolve(dest).startsWith(resolvedTarget)) continue;
+    mkdirSync(dirname(dest), { recursive: true });
+    writeFileSync(dest, f.data);
+  }
+  return targetDir;
+}
+
+/**
+ * 处理一次 skill 上传请求（流式读 body + 大小守卫 + 解析 + 写入 + 应答）。
+ * 用户级与 IM 级 import 共用，差异只在 skillsRoot。
+ */
+export function importSkillTo(req, res, { skillsRoot, windowsReserved }) {
   const contentType = req.headers['content-type'] || '';
-  // boundary 用 [^;]+ 终止避免吞掉后续 Content-Type 参数；长度封顶 200 防止超长串撑爆 buffer 比对。
+  // boundary 用 [^;]+ 终止避免吞掉后续参数；长度封顶 200 防止超长串撑爆 buffer 比对。
   const boundaryMatch = contentType.match(/boundary=([^;]+)/);
   if (!boundaryMatch || boundaryMatch[1].length > 200) {
     res.writeHead(400, { 'Content-Type': 'application/json' });
@@ -85,162 +246,8 @@ function skillsImport(req, res, parsedUrl, isLocal, deps) {
   req.on('end', async () => {
     if (aborted) return;
     try {
-      const buf = Buffer.concat(chunks);
-      const headerEnd = buf.indexOf('\r\n\r\n');
-      if (headerEnd === -1) throw Object.assign(new Error('Malformed multipart'), { status: 400 });
-      const headerStr = buf.slice(0, headerEnd).toString();
-      const nameMatch = headerStr.match(/filename="([^"]+)"/);
-      if (!nameMatch) throw Object.assign(new Error('No filename'), { status: 400 });
-      // NFKC 规范化 + 控制字符/路径分隔符过滤 + 零宽和方向覆盖字符过滤（防止 homoglyph / RLO 混淆）
-      const originalName = nameMatch[1]
-        .normalize('NFKC')
-        .replace(/[\x00-\x1f/\\]/g, '_')
-        .replace(/[​-‏‪-‮⁠]/g, '');
-      // Windows 保留设备名守卫（见 WINDOWS_RESERVED_NAMES 注释）。
-      {
-        const base = originalName.split('.')[0].trim().toLowerCase();
-        if (deps.WINDOWS_RESERVED_NAMES.test(base)) {
-          throw Object.assign(new Error('Reserved filename not allowed'), { status: 400 });
-        }
-      }
-      const lower = originalName.toLowerCase();
-      const isZip = lower.endsWith('.zip');
-      const isMd = lower.endsWith('.md');
-      if (!isZip && !isMd) {
-        throw Object.assign(new Error('Unsupported file type'), { status: 415, code: 'INVALID_TYPE' });
-      }
-      const bodyStart = headerEnd + 4;
-      const closingBoundary = Buffer.from('\r\n--' + boundary);
-      const bodyEnd = buf.indexOf(closingBoundary, bodyStart);
-      const fileData = bodyEnd !== -1 ? buf.slice(bodyStart, bodyEnd) : buf.slice(bodyStart);
-
-      const skillsRoot = join(getClaudeConfigDir(), 'skills');
-      mkdirSync(skillsRoot, { recursive: true });
-
-      // 简单 frontmatter name 解析：抓 `name: xxx` 单行（与 skills-api.js 的 description 解析风格保持一致，最小实现）
-      const parseNameFromMd = (text) => {
-        const m = /^---\s*\n([\s\S]*?)\n---/.exec(text);
-        if (!m) return null;
-        const nm = /^name\s*:\s*(.*)$/m.exec(m[1]);
-        if (!nm) return null;
-        return nm[1].trim().replace(/^["']|["']$/g, '');
-      };
-
-      const fallbackBaseName = (filename, stripExt) => {
-        let n = filename.replace(/^.*[\\/]/, '');
-        if (stripExt) n = n.replace(/\.[^.]+$/, '');
-        return n;
-      };
-
-      let skillName = null;
-      let skillFiles = []; // { relPath, data }
-
-      if (isMd) {
-        const text = fileData.toString('utf8');
-        skillName = parseNameFromMd(text) || fallbackBaseName(originalName, true);
-        skillFiles = [{ relPath: 'SKILL.md', data: fileData }];
-      } else {
-        // zip：用 adm-zip 解压到内存，校验 SKILL.md 存在（忽略大小写），找最浅的 SKILL.md 所在目录作为 skill 根
-        const AdmZip = (await import('adm-zip')).default;
-        let zip;
-        try {
-          zip = new AdmZip(fileData);
-        } catch {
-          throw Object.assign(new Error('Invalid zip archive'), { status: 400, code: 'INVALID_ZIP' });
-        }
-        const entries = zip.getEntries();
-        // zip bomb 防护：单文件 ≤50MB，总解压 ≤200MB；以及拒绝 symlink entry
-        // adm-zip 不直接暴露 isSymbolicLink，需用 attr 高 16 位的 unix mode 判断 0o120000
-        const MAX_PER_FILE = 50 * 1024 * 1024;
-        const MAX_TOTAL_UNCOMPRESSED = 200 * 1024 * 1024;
-        let totalUncompressed = 0;
-        for (const e of entries) {
-          if (e.isDirectory) continue;
-          const unixMode = (e.attr >>> 16) & 0xffff;
-          if ((unixMode & 0o170000) === 0o120000) {
-            throw Object.assign(new Error('Symlinks not allowed in zip'), { status: 400, code: 'INVALID_ZIP' });
-          }
-          const sizeRaw = e.header?.size || 0;
-          if (sizeRaw > MAX_PER_FILE) {
-            throw Object.assign(new Error('File too large in archive'), { status: 400, code: 'ZIP_BOMB' });
-          }
-          totalUncompressed += sizeRaw;
-          if (totalUncompressed > MAX_TOTAL_UNCOMPRESSED) {
-            throw Object.assign(new Error('Archive expands too large'), { status: 400, code: 'ZIP_BOMB' });
-          }
-        }
-        // 找所有 SKILL.md（忽略大小写）的 entry，挑最浅的
-        let bestSkillEntry = null;
-        let bestDepth = Infinity;
-        for (const e of entries) {
-          if (e.isDirectory) continue;
-          const en = e.entryName;
-          const base = en.split('/').pop() || '';
-          if (base.toLowerCase() === 'skill.md') {
-            const depth = en.split('/').length;
-            if (depth < bestDepth) { bestDepth = depth; bestSkillEntry = e; }
-          }
-        }
-        if (!bestSkillEntry) {
-          throw Object.assign(new Error('SKILL.md not found in zip'), { status: 400, code: 'MISSING_SKILL_MD' });
-        }
-        // skill 根 = SKILL.md 所在目录（如果在 zip 根则空字符串）
-        const lastSlash = bestSkillEntry.entryName.lastIndexOf('/');
-        const skillRootPrefix = lastSlash >= 0 ? bestSkillEntry.entryName.slice(0, lastSlash + 1) : '';
-        const skillMdText = bestSkillEntry.getData().toString('utf8');
-        skillName = parseNameFromMd(skillMdText)
-          || (skillRootPrefix ? skillRootPrefix.replace(/\/$/, '').split('/').pop() : null)
-          || fallbackBaseName(originalName, true);
-
-        // 收集 skill 根下的所有文件，规范化 relPath（去掉 root prefix）
-        // 二次校验：header.size 来自 zip 中央目录是攻击者可控的（可谎报 size=0），
-        // 上面 zip bomb 检查已用 header.size 做"廉价初检"快速拒绝；这里 getData() 后用真实 data.length 复核，
-        // 防止恶意 zip 在 header 上撒谎绕过总大小限制。任一阶段超额都抛 ZIP_BOMB。
-        let actualTotal = 0;
-        for (const e of entries) {
-          if (e.isDirectory) continue;
-          if (skillRootPrefix && !e.entryName.startsWith(skillRootPrefix)) continue;
-          const rel = skillRootPrefix ? e.entryName.slice(skillRootPrefix.length) : e.entryName;
-          if (!rel || rel.includes('..')) continue;
-          const data = e.getData();
-          if (data.length > MAX_PER_FILE) {
-            throw Object.assign(new Error('File actual size too large'), { status: 400, code: 'ZIP_BOMB' });
-          }
-          actualTotal += data.length;
-          if (actualTotal > MAX_TOTAL_UNCOMPRESSED) {
-            throw Object.assign(new Error('Archive actual size too large'), { status: 400, code: 'ZIP_BOMB' });
-          }
-          // SKILL.md 统一规范化大小写
-          const finalRel = rel.split('/').pop().toLowerCase() === 'skill.md'
-            ? rel.replace(/[^/]*$/, 'SKILL.md')
-            : rel;
-          skillFiles.push({ relPath: finalRel, data });
-        }
-      }
-
-      if (!validateSkillName(skillName)) {
-        throw Object.assign(new Error(`Invalid skill name: ${skillName}`), { status: 400, code: 'INVALID_NAME' });
-      }
-      const targetDir = join(skillsRoot, skillName);
-      // 原子创建：不带 recursive 让 mkdir 在已存在时直接抛 EEXIST，消除 existsSync 与 mkdirSync 之间的 TOCTOU 竞争窗口。
-      // skillsRoot 已在前面 mkdirSync(skillsRoot, { recursive: true }) 兜底创建，所以这里 join 出的 parent 一定存在。
-      try {
-        mkdirSync(targetDir);
-      } catch (err) {
-        if (err.code === 'EEXIST') {
-          throw Object.assign(new Error(`Skill already exists: ${skillName}`), { status: 409, code: 'EXISTS' });
-        }
-        throw err;
-      }
-      // 二次防御：resolved + sep 后缀比较，防止 prefix 攻击
-      // (e.g. dest=/skills/my-skill-evil/x 不能以 /skills/my-skill 单独 startsWith 通过)
-      const resolvedTarget = resolve(targetDir) + sep;
-      for (const f of skillFiles) {
-        const dest = join(targetDir, f.relPath);
-        if (!resolve(dest).startsWith(resolvedTarget)) continue;
-        mkdirSync(dirname(dest), { recursive: true });
-        writeFileSync(dest, f.data);
-      }
+      const { skillName, files } = await parseSkillUpload(Buffer.concat(chunks), boundary, windowsReserved);
+      const targetDir = writeSkillFiles(skillsRoot, skillName, files);
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.end(JSON.stringify({ ok: true, name: skillName, path: targetDir }));
     } catch (err) {
@@ -254,6 +261,14 @@ function skillsImport(req, res, parsedUrl, isLocal, deps) {
   });
 }
 
+// Skill 上传/导入 API —— 接受 .zip 或 SKILL.md（忽略大小写），写入用户级 ~/.claude/skills/{name}/
+function skillsImport(req, res, parsedUrl, isLocal, deps) {
+  importSkillTo(req, res, {
+    skillsRoot: join(getClaudeConfigDir(), 'skills'),
+    windowsReserved: deps.WINDOWS_RESERVED_NAMES,
+  });
+}
+
 export const skillsRoutes = [
   { method: 'GET', match: 'exact', path: '/api/skills', handler: skillsList },
   { method: 'POST', match: 'exact', path: '/api/skills/toggle', handler: skillsToggle },

package/server/routes/workspaces.js

@@ -1,8 +1,8 @@
 // Workspace routes (moved verbatim from server.js handleRequest).
-import { existsSync, statSync, unwatchFile } from 'node:fs';
+import { existsSync, statSync } from 'node:fs';
 import { basename } from 'node:path';
 import { LOG_FILE, initForWorkspace, resetWorkspace } from '../interceptor.js';
-import { watchLogFile, getWatchedFiles } from '../lib/log-watcher.js';
+import { watchLogFile, unwatchAll } from '../lib/log-watcher.js';
 import { readClaudeProjectModel } from '../lib/context-watcher.js';
 import { countLogEntries, streamRawEntriesAsync } from '../lib/log-stream.js';
 
@@ -30,7 +30,7 @@ function workspacesLaunch(req, res, parsedUrl, isLocal, deps) {
       }
 
       const { registerWorkspace } = await import('../workspace-registry.js');
-      registerWorkspace(wsPath);
+      await registerWorkspace(wsPath);
 
       // Electron multi-tab 模式：管理 server 只触发 callback，不做日志初始化
       // 所有日志相关操作（initForWorkspace、watchLogFile、spawnClaude）由 tab-worker 子进程负责
@@ -107,7 +107,7 @@ function workspacesAdd(req, res, parsedUrl, isLocal, deps) {
         return;
       }
       const { registerWorkspace } = await import('../workspace-registry.js');
-      const entry = registerWorkspace(wsPath);
+      const entry = await registerWorkspace(wsPath);
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.end(JSON.stringify({ ok: true, workspace: entry }));
     } catch (err) {
@@ -120,8 +120,8 @@ function workspacesAdd(req, res, parsedUrl, isLocal, deps) {
 function workspacesDelete(req, res, parsedUrl) {
   const url = parsedUrl.pathname;
   const id = url.split('/').pop();
-  import('../workspace-registry.js').then(({ removeWorkspace }) => {
-    const removed = removeWorkspace(id);
+  import('../workspace-registry.js').then(async ({ removeWorkspace }) => {
+    const removed = await removeWorkspace(id);
     res.writeHead(200, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ ok: removed }));
   }).catch(err => {
@@ -138,10 +138,7 @@ function workspacesStop(req, res, parsedUrl, isLocal, deps) {
     // 接续原有清理流程
 
     // 停止日志监听
-    for (const logFile of getWatchedFiles().keys()) {
-      unwatchFile(logFile);
-    }
-    getWatchedFiles().clear();
+    unwatchAll();
 
     // 重置 interceptor 状态
     resetWorkspace();