draftgo-cli 3.0.35 → 3.0.38

package/src/projectMap.js

@@ -1,86 +1,30 @@
 'use strict';
 
+const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const parse5 = require('parse5');
-
-function exists(p) {
-  try { fs.accessSync(p); return true; } catch { return false; }
-}
-
-function readTextSafe(p) {
-  try { return fs.readFileSync(p, 'utf8'); } catch { return ''; }
-}
-
-function readJsonSafe(projectDir, rel) {
-  const abs = path.join(projectDir, rel);
-  try {
-    const raw = fs.readFileSync(abs, 'utf8');
-    const parsed = JSON.parse(raw);
-    return { ok: true, path: rel, items: Array.isArray(parsed) ? parsed : [], raw: parsed };
-  } catch (err) {
-    return { ok: false, path: rel, items: [], error: err.message };
-  }
-}
+const { loadManifest, absolutePath } = require('./worktree/manifest');
+const { mediaType } = require('./worktree/types');
 
 function normalizeRoute(route) {
   if (!route || typeof route !== 'string') return '';
   const clean = route.trim();
-  if (!clean) return '';
-  if (/^https?:\/\//i.test(clean) || clean.startsWith('#') || clean.startsWith('mailto:')) return '';
+  if (!clean || /^https?:\/\//i.test(clean) || clean.startsWith('#') || clean.startsWith('mailto:')) return '';
   return clean.startsWith('/') ? clean : `/${clean}`;
 }
 
-function relToAbs(projectDir, rel) {
-  if (!rel || typeof rel !== 'string') return null;
-  const clean = rel.replace(/\\/g, '/');
-  return path.isAbsolute(clean) ? clean : path.join(projectDir, clean);
-}
-
-function findGeneratedFile(projectDir, dirRel, prefix, exts) {
-  const dir = path.join(projectDir, dirRel);
-  if (!exists(dir)) return null;
-  const files = fs.readdirSync(dir).filter((f) => {
-    if (!f.startsWith(prefix)) return false;
-    return exts.some((ext) => f.endsWith(ext));
-  });
-  return files.length ? path.join(dirRel, files[0]).replace(/\\/g, '/') : null;
-}
-
-function itemFile(projectDir, section, item) {
-  if (!item || typeof item !== 'object') return null;
-  const direct = item.html_file || item.code_file || item.file;
-  if (direct && exists(relToAbs(projectDir, direct))) return direct.replace(/\\/g, '/');
-  const id = item.id == null ? '' : String(item.id);
-  if (!id) return null;
-  if (section === 'pages') return findGeneratedFile(projectDir, '.draftgo/pages', `page_${id}_`, ['.html']);
-  if (section === 'navigations') return findGeneratedFile(projectDir, '.draftgo/navigations', `nav_${id}_`, ['.html']);
-  return null;
-}
-
 function extractRoutes(html) {
   const routes = new Set();
   if (!html) return routes;
   let document;
-  try {
-    document = parse5.parse(html);
-  } catch {
-    return routes;
-  }
+  try { document = parse5.parse(html); } catch { return routes; }
   const visit = (node) => {
-    for (const attr of node.attrs || []) {
-      if (attr.name === 'href' || attr.name === 'data-page-route') {
-        const route = normalizeRoute(attr.value);
+    for (const attribute of node.attrs || []) {
+      if (attribute.name === 'href' || attribute.name === 'data-page-route') {
+        const route = normalizeRoute(attribute.value);
         if (route) routes.add(route);
       }
-      if (attr.name.startsWith('on')) {
-        const re = /\b(?:App\.)?(?:navigate|go|openPage)\s*\(\s*["']([^"']+)["']/g;
-        let match;
-        while ((match = re.exec(attr.value))) {
-          const route = normalizeRoute(match[1]);
-          if (route) routes.add(route);
-        }
-      }
     }
     for (const child of node.childNodes || []) visit(child);
   };
@@ -88,392 +32,93 @@ function extractRoutes(html) {
   return routes;
 }
 
-function extractScriptBindings(code) {
-  const bindings = { routes: [], events: [], schedules: [] };
-  if (!code) return bindings;
-  let match;
-  const routeRe = /@route\(\s*["']([A-Za-z]+)\s+([^"']+)["']\s*\)/g;
-  while ((match = routeRe.exec(code))) bindings.routes.push(`${match[1].toUpperCase()} ${match[2]}`);
-  const eventRe = /@on\(\s*["']([^"']+)["']\s*\)/g;
-  while ((match = eventRe.exec(code))) bindings.events.push(match[1]);
-  const scheduledRe = /@scheduled\(\s*["']([^"']+)["']\s*\)/g;
-  while ((match = scheduledRe.exec(code))) bindings.schedules.push(match[1]);
-  const goRouteRe = /\.Route\(\s*["']([A-Za-z]+)["']\s*,\s*["']([^"']+)["']/g;
-  while ((match = goRouteRe.exec(code))) bindings.routes.push(`${match[1].toUpperCase()} ${match[2]}`);
-  const goEventRe = /\.On\(\s*["']([^"']+)["']/g;
-  while ((match = goEventRe.exec(code))) bindings.events.push(match[1]);
-  const goScheduleRe = /\.Schedule\(\s*["']([^"']+)["']/g;
-  while ((match = goScheduleRe.exec(code))) bindings.schedules.push(match[1]);
-  return bindings;
+function extractScriptBindings() {
+  return { routes: [], events: [], schedules: [] };
 }
 
-function pageKey(page) {
-  if (page && page.id != null) return `page:${page.id}`;
-  return `page:${normalizeRoute(page && page.route) || page && page.title || 'new'}`;
+function htmlParseErrors(html) {
+  const errors = [];
+  try {
+    parse5.parse(html, { onParseError(error) {
+      if (error.code !== 'missing-doctype') errors.push({
+        code: error.code || 'html-parse-error', line: error.startLine || null, column: error.startCol || null,
+      });
+    } });
+  } catch (error) {
+    errors.push({ code: error.message || 'html-parse-error', line: null, column: null });
+  }
+  return errors;
 }
 
-function addRouteRefs(refs, route, source) {
-  const clean = normalizeRoute(route);
-  if (!clean) return;
-  if (!refs.has(clean)) refs.set(clean, new Set());
-  refs.get(clean).add(source);
+function sha256File(file) {
+  const hash = crypto.createHash('sha256');
+  hash.update(fs.readFileSync(file));
+  return hash.digest('hex');
 }
 
-function classifyPageArea(item) {
-  const route = normalizeRoute(item && item.route);
-  const title = String((item && item.title) || '');
-  const tag = String((item && item.tag) || '');
-  const text = `${route} ${title} ${tag}`;
-
-  if (!route) return 'unknown';
-  if (route === '/' || /(^|[\s/])(home|index|首页|主页)([\s/]|$)/i.test(text)) return 'home';
-  if (/^\/(login|setup|install|register)(\/|$)/i.test(route) || /(系统|内置|平台配置|基础配置)/.test(text)) return 'system';
-  if (/^\/admin(\/|$)/i.test(route) || /(管理|后台|运营|审核|权限|控制台|配置)/.test(text)) return 'admin';
-  if (/(业务|内容|案例|产品|新闻|订单|客户|会员|课程|活动|资料|下载|预约|表单|详情|列表|列表页|工作台|中心|门户|商城|服务)/.test(text)) return 'business';
-  return 'unknown';
+function decodeTextFile(file, contentType) {
+  const match = String(contentType || '').match(/;\s*charset\s*=\s*[']?([^;'\s]+)/i);
+  const charset = match ? match[1] : 'utf-8';
+  return new TextDecoder(charset, { fatal: true }).decode(fs.readFileSync(file));
 }
 
-function normalizeHtmlSkeleton(html) {
-  if (!html) return '';
-  let out = html;
-  out = out.replace(/<!--([\s\S]*?)-->/g, '');
-  out = out.replace(/<script\b[\s\S]*?<\/script>/gi, '<script></script>');
-  out = out.replace(/<style\b[\s\S]*?<\/style>/gi, '<style></style>');
-  out = out.replace(/\b(data-page-route|href|id|for|aria-label|aria-labelledby|aria-describedby|title|value|name|placeholder)\s*=\s*("[^"]*"|'[^']*')/gi, '$1=""');
-  out = out.replace(/\b(class|style)\s*=\s*("[^"]*"|'[^']*')/gi, '$1=""');
-  out = out.replace(/>[^<]*</g, '><');
-  out = out.replace(/\s+/g, ' ');
-  return out.trim();
+function classifyPageArea(entry) {
+  const route = normalizeRoute(entry.route);
+  if (route === '/') return 'home';
+  if (/^\/(login|setup|install|register)(\/|$)/i.test(route)) return 'system';
+  if (/^\/admin(\/|$)/i.test(route)) return 'admin';
+  return route ? 'business' : 'unknown';
 }
 
-function collectPageGroups(pages) {
+function collectGroups(pages) {
   const groups = { home: [], admin: [], business: [], system: [], unknown: [] };
-  for (const page of pages) {
-    const key = groups[page.area] ? page.area : 'unknown';
-    groups[key].push(page);
-  }
+  for (const page of pages) groups[page.area || 'unknown'].push(page);
   return groups;
 }
 
-function summarizePage(projectDir, item) {
-  const file = itemFile(projectDir, 'pages', item);
-  return {
-    id: item.id,
-    title: item.title || '',
-    route: normalizeRoute(item.route),
-    permission: item.permission || null,
-    tag: item.tag || '',
-    html_file: file,
-    area: classifyPageArea(item),
-  };
-}
-
-function summarizeNav(projectDir, item) {
-  const file = itemFile(projectDir, 'navigations', item);
-  return {
-    id: item.id,
-    code: item.code || '',
-    name: item.name || '',
-    status: item.status,
-    html_file: file,
-  };
-}
-
-function summarizeAIHub(item) {
-  const data = item && typeof item.data === 'object' && item.data ? item.data : {};
-  const spec = data.spec && typeof data.spec === 'object' ? data.spec : {};
-  const base = {
-    id: item.id,
-    name: item.name || '',
-    type: item.type || '',
-    status: item.status,
-  };
-
-  if (item.type === 'agent') {
-    const tools = spec.tools && typeof spec.tools === 'object' ? spec.tools : {};
-    const outputFormat = spec.output_format && typeof spec.output_format === 'object' ? spec.output_format : {};
-    const modelSelection = spec.model_selection && typeof spec.model_selection === 'object' ? spec.model_selection : {};
-    return {
-      ...base,
-      mode: spec.mode || 'chat',
-      model_id: spec.model_id || null,
-      model: spec.model || data.model || '',
-      fallback_models: Array.isArray(spec.fallback_models) ? spec.fallback_models : [],
-      output_format: {
-        mode: outputFormat.mode || 'native',
-        json_strategy: outputFormat.json && outputFormat.json.strategy || null,
-        has_schema: Boolean(outputFormat.json && outputFormat.json.schema),
-      },
-      model_selection: {
-        user_selectable: Boolean(modelSelection.user_selectable),
-        on_invalid: modelSelection.on_invalid || 'ignore',
-      },
-      tools: {
-        enabled: Boolean(tools.enabled && Array.isArray(tools.sources) && tools.sources.length),
-        sources: Array.isArray(tools.sources)
-          ? tools.sources.map((s) => ({
-              type: s.type || '',
-              id: s.id,
-              name: s.name || '',
-              tool_filter: Array.isArray(s.tool_filter) ? s.tool_filter : [],
-            }))
-          : [],
-      },
-      skills_count: Array.isArray(spec.skills) ? spec.skills.length : 0,
-    };
-  }
-
-  if (item.type === 'model') {
-    return {
-      ...base,
-      provider: data.provider || 'openai-compatible',
-      models_count: Array.isArray(data.models) ? data.models.length : 0,
-      supports_response_format: data.supports_response_format,
-      supports_json_schema: data.supports_json_schema,
-      image_generation_probe: data.image_generation_probe
-        ? {
-            ok: Boolean(data.image_generation_probe.ok),
-            model: data.image_generation_probe.model || '',
-            tested_at: data.image_generation_probe.tested_at || '',
-          }
-        : null,
-    };
-  }
-
-  if (item.type === 'mcp') {
-    return {
-      ...base,
-      transport: data.transport || '',
-      tools_count: Array.isArray(data.tools) ? data.tools.length : 0,
-      enabled: data.enabled !== false,
-    };
-  }
-
-  if (item.type === 'skill') {
-    return {
-      ...base,
-      enabled: data.enabled !== false,
-      content_length: typeof data.content === 'string' ? data.content.length : 0,
-    };
-  }
-
-  if (item.type === 'prompt') {
-    return {
-      ...base,
-      tags: Array.isArray(item.tags) ? item.tags : [],
-      content_length: typeof data.content === 'string' ? data.content.length : 0,
-    };
-  }
-
-  return base;
-}
-
-function summarizeDoc(item) {
-  return {
-    id: item.id,
-    title: item.title || '',
-    slug: item.slug || '',
-    category_id: item.category_id == null ? null : item.category_id,
-    status: item.status,
-    content_file: item.content_file || null,
-  };
-}
-
-function summarizeDocCategory(item) {
-  return {
-    id: item.id,
-    name: item.name || '',
-    slug: item.slug || '',
-    parent_id: item.parent_id == null ? null : item.parent_id,
-    sort_order: item.sort_order == null ? 0 : item.sort_order,
-    status: item.status,
-  };
-}
-
-function summarizeSystemConfig(item) {
-  return {
-    config_key: item.config_key || '',
-    category: item.category || '',
-    value_type: item.value_type || '',
-    is_sensitive: Boolean(item.is_sensitive),
-    status: item.status,
-  };
-}
-
 function buildProjectMap(projectDir) {
-  const indexes = {
-    pages: readJsonSafe(projectDir, '.draftgo/pages/index.json'),
-    navigations: readJsonSafe(projectDir, '.draftgo/navigations/index.json'),
-    db_meta: readJsonSafe(projectDir, '.draftgo/db_meta/index.json'),
-    custom_scripts: readJsonSafe(projectDir, '.draftgo/custom_scripts/index.json'),
-    aihub: readJsonSafe(projectDir, '.draftgo/aihub/index.json'),
-    docs: readJsonSafe(projectDir, '.draftgo/docs/articles/index.json'),
-    doc_categories: readJsonSafe(projectDir, '.draftgo/doc_categories/index.json'),
-    system_config: readJsonSafe(projectDir, '.draftgo/system_config/index.json'),
-    roles: readJsonSafe(projectDir, '.draftgo/roles/index.json'),
-    users: readJsonSafe(projectDir, '.draftgo/users/index.json'),
-  };
+  const manifest = loadManifest(projectDir);
+  const checkouts = Object.values(manifest.entries).map((entry) => ({ ...entry }));
+  const pages = checkouts.filter((entry) => entry.resource_type === 'pages').map((entry) => ({
+    ...entry, id: entry.resource_id, html_file: entry.local_path, area: classifyPageArea(entry),
+  }));
+  const navigations = checkouts.filter((entry) => entry.resource_type === 'navigations').map((entry) => ({
+    ...entry, id: entry.resource_id, html_file: entry.local_path,
+  }));
+  const docs = checkouts.filter((entry) => entry.resource_type === 'docs').map((entry) => ({
+    ...entry, id: entry.resource_id, content_file: entry.local_path,
+  }));
 
-  const pages = indexes.pages.items.map((p) => summarizePage(projectDir, p));
-  const navigations = indexes.navigations.items.map((n) => summarizeNav(projectDir, n));
   const routeRefs = new Map();
-  const pageGroups = collectPageGroups(pages);
-
-  for (const nav of navigations) {
-    const html = nav.html_file ? readTextSafe(relToAbs(projectDir, nav.html_file)) : '';
-    for (const route of extractRoutes(html)) addRouteRefs(routeRefs, route, `nav:${nav.id || nav.code || nav.name}`);
-  }
-
-  for (const page of pages) {
-    const html = page.html_file ? readTextSafe(relToAbs(projectDir, page.html_file)) : '';
-    for (const route of extractRoutes(html)) addRouteRefs(routeRefs, route, pageKey(page));
+  for (const entry of [...pages, ...navigations]) {
+    const file = absolutePath(projectDir, entry.local_path);
+    if (!fs.existsSync(file)) continue;
+    let source;
+    try { source = decodeTextFile(file, entry.content_type); } catch { continue; }
+    for (const route of extractRoutes(source)) {
+      if (!routeRefs.has(route)) routeRefs.set(route, new Set());
+      routeRefs.get(route).add(`${entry.resource_type}:${entry.resource_id}`);
+    }
   }
-
   return {
     projectDir,
-    indexes: Object.fromEntries(Object.entries(indexes).map(([k, v]) => [k, { ok: v.ok, path: v.path, count: v.items.length }])),
+    manifest_path: '.draftgo/worktree/manifest.json',
+    checkouts,
     pages,
     navigations,
-    db_meta: indexes.db_meta.items.map((m) => ({
-      id: m.id,
-      type: m.type || '',
-      label: m.label || '',
-      fields: m.schema && m.schema.properties ? Object.keys(m.schema.properties) : [],
-    })),
-    custom_scripts: indexes.custom_scripts.items.map((s) => {
-      const codeFile = itemFile(projectDir, 'custom_scripts', s);
-      const bindings = extractScriptBindings(codeFile ? readTextSafe(relToAbs(projectDir, codeFile)) : '');
-      return {
-        id: s.id,
-        name: s.name || '',
-        slug: s.slug || '',
-        mode: s.mode || '',
-        status: s.status,
-        code_file: codeFile,
-        routes: bindings.routes,
-        events: bindings.events,
-        schedules: bindings.schedules,
-      };
-    }),
-    aihub: indexes.aihub.items.map(summarizeAIHub),
-    docs: indexes.docs.items.map(summarizeDoc),
-    doc_categories: indexes.doc_categories.items.map(summarizeDocCategory),
-    system_config: indexes.system_config.items.map(summarizeSystemConfig),
-    roles: indexes.roles.items.map((r) => ({ id: r.id, code: r.code || '', name: r.name || '', status: r.status })),
-    users_count: indexes.users.items.length,
-    pageGroups,
-    routeRefs: Object.fromEntries([...routeRefs.entries()].map(([route, sources]) => [route, [...sources]])),
+    docs,
+    pageGroups: collectGroups(pages),
+    routeRefs: Object.fromEntries([...routeRefs].map(([route, sources]) => [route, [...sources]])),
+    remote_only: ['db_meta', 'aihub', 'system_config', 'roles', 'users', 'doc_categories', 'custom_services'],
   };
 }
 
-function htmlParseErrors(html) {
-  const errors = [];
-  const ignored = new Set(['missing-doctype']);
-  try {
-    parse5.parse(html, {
-      onParseError(error) {
-        if (ignored.has(error.code)) return;
-        errors.push({
-          code: error.code || 'html-parse-error',
-          line: error.startLine || null,
-          column: error.startCol || null,
-        });
-      },
-    });
-  } catch (error) {
-    errors.push({ code: error.message || 'html-parse-error', line: null, column: null });
-  }
-  return errors;
-}
-
-function extractStyleText(html) {
-  const parts = [];
-  if (!html) return '';
-
-  const styleAttr = /\bstyle\s*=\s*(["'])([\s\S]*?)\1/gi;
-  let m;
-  while ((m = styleAttr.exec(html))) parts.push(m[2]);
-
-  const styleBlock = /<style\b[^>]*>([\s\S]*?)<\/style>/gi;
-  while ((m = styleBlock.exec(html))) parts.push(m[1]);
-
-  return parts.join('\n');
-}
-
-function maskDgVarFunctions(css) {
-  let out = '';
-  for (let i = 0; i < css.length; i += 1) {
-    const rest = css.slice(i).toLowerCase();
-    const fnStart = rest.startsWith('var(') ? 'var(' : rest.startsWith('color-mix(') ? 'color-mix(' : null;
-    if (!fnStart) {
-      out += css[i];
-      continue;
-    }
-
-    let j = i + fnStart.length;
-    let depth = 1;
-    while (j < css.length && depth > 0) {
-      if (css[j] === '(') depth += 1;
-      else if (css[j] === ')') depth -= 1;
-      j += 1;
-    }
-
-    const fn = css.slice(i, j);
-    if (/^var\(\s*--dg-/i.test(fn) || /^color-mix\([\s\S]*var\(\s*--dg-/i.test(fn)) {
-      out += ' '.repeat(fn.length);
-    }
-    else out += fn;
-    i = j - 1;
-  }
-  return out;
-}
-
-function hasHardcodedColor(css) {
-  const masked = maskDgVarFunctions(css);
-  return /#[0-9a-f]{3,8}\b/i.test(masked)
-    || /\b(?:rgb|rgba|hsl|hsla|color-mix)\s*\(/i.test(masked);
-}
-
-function hasDarkThemeCoverage(html) {
-  return /\[data-theme\s*=\s*["']dark["']\]/i.test(html)
-    || /\[data-theme\s*~=\s*["']dark["']\]/i.test(html)
-    || /\bdata-theme\s*=\s*["']dark["']/i.test(html);
-}
-
-function reportColorThemeRisk(label, html, addWarning) {
-  const css = extractStyleText(html);
-  if (!css || !hasHardcodedColor(css)) return;
-  if (hasDarkThemeCoverage(html)) return;
-  addWarning('DG-COLOR-001', 'low', `${label} 发现硬编码配色且未看到深色主题覆盖；优先使用系统 var(--dg-*) token，自主配色需兼容浅色与深色。`);
-}
-
-function collectOrphanFiles(projectDir, relDir, indexRel, fileField, prefix, exts) {
-  const dir = path.join(projectDir, relDir);
-  if (!exists(dir)) return [];
-  const index = readJsonSafe(projectDir, indexRel);
-  const indexed = new Set(index.items.map((it) => String(it[fileField] || '').replace(/\\/g, '/')));
-  return fs.readdirSync(dir)
-    .filter((name) => name.startsWith(`${prefix}_`) && exts.includes(path.extname(name)))
-    .map((name) => path.join(relDir, name).replace(/\\/g, '/'))
-    .filter((rel) => !indexed.has(rel));
-}
-
-function reportPaginationHack(label, html, addWarning) {
-  if (/\bApp\.get\s*\(\s*['"]db\/[^'"]+['"]\s*,\s*\{[\s\S]{0,240}\bpage_size\s*:\s*9999\b/i.test(html)) {
-    addWarning('DG-DATA-001', 'high', `${label} 使用 page_size: 9999 拉取 DB 数据；DraftGo 规范是不传 page/page_size 即返回全量。`);
-  }
-}
-
-function needsAdminCompanion(page) {
-  const text = `${page.route || ''} ${page.title || ''} ${page.tag || ''}`;
-  return /(案例|产品|新闻|订单|客户|会员|课程|活动|资料|下载|预约|表单|内容|招聘|发布|审核|上下架|商城)/.test(text);
-}
-
-function isProbablySystemPage(page) {
-  const tag = String(page.tag || '');
-  const title = String(page.title || '');
-  const route = normalizeRoute(page.route);
-  return tag.includes('系统') || title.includes('系统') || ['/login', '/setup'].includes(route);
+function worktreeFiles(projectDir, directory) {
+  const root = path.join(projectDir, '.draftgo', 'worktree', directory);
+  if (!fs.existsSync(root)) return [];
+  return fs.readdirSync(root, { withFileTypes: true })
+    .filter((entry) => entry.isFile())
+    .map((entry) => path.join(root, entry.name));
 }
 
 function analyzeProject(projectDir) {
@@ -485,49 +130,66 @@ function analyzeProject(projectDir) {
     warnings.push(message);
     warningDetails.push({ code, confidence, message });
   };
-  for (const page of map.pages) {
-    const label = `${page.title || '未命名页面'}${page.id != null ? `#${page.id}` : ''}`;
-    if (page.route && page.route !== '/' && !isProbablySystemPage(page)) {
-      const refs = map.routeRefs[page.route] || [];
-      const own = pageKey(page);
-      const externalRefs = refs.filter((source) => source !== own);
-      if (externalRefs.length === 0) {
-        addWarning('DG-ROUTE-001', 'medium', `${label} (${page.route}) 未在导航、首页或其他页面入口中发现绑定引用。`);
-      }
+  const registered = new Set();
+
+  for (const entry of map.checkouts) {
+    let local;
+    let base;
+    try {
+      local = absolutePath(projectDir, entry.local_path);
+      base = absolutePath(projectDir, entry.base_path);
+    } catch (error) {
+      errors.push(`${entry.resource_type} ${entry.resource_id}: ${error.message}`);
+      continue;
     }
-    if (!page.html_file) continue;
-    const html = readTextSafe(relToAbs(projectDir, page.html_file));
-    const parseErrors = htmlParseErrors(html);
-    for (const parseError of parseErrors.slice(0, 5)) {
-      const at = parseError.line ? `（行 ${parseError.line}${parseError.column ? `:${parseError.column}` : ''}）` : '';
-      addWarning('DG-HTML-001', 'high', `${label} HTML 解析提醒：${parseError.code}${at}。`);
+    registered.add(path.resolve(local).toLowerCase());
+    if (!fs.existsSync(local)) {
+      errors.push(`${entry.resource_type} ${entry.resource_id}: local content is missing (${entry.local_path}).`);
+    }
+    if (!fs.existsSync(base)) {
+      errors.push(`${entry.resource_type} ${entry.resource_id}: checkout base is missing (${entry.base_path}).`);
+    } else if (sha256File(base) !== entry.base_hash) {
+      errors.push(`${entry.resource_type} ${entry.resource_id}: checkout base hash does not match the manifest.`);
     }
-  }
 
-  for (const nav of map.navigations) {
-    if (!nav.html_file) continue;
-    const navLabel = `导航${nav.name || nav.code || nav.id || ''}`;
-    const html = readTextSafe(relToAbs(projectDir, nav.html_file));
-    const parseErrors = htmlParseErrors(html);
-    for (const parseError of parseErrors.slice(0, 5)) {
-      const at = parseError.line ? `（行 ${parseError.line}${parseError.column ? `:${parseError.column}` : ''}）` : '';
-      addWarning('DG-HTML-001', 'high', `${navLabel} HTML 解析提醒：${parseError.code}${at}。`);
+    const type = mediaType(entry.content_type);
+    let expectedExtension = entry.file_extension;
+    if (type === 'text/html' || type === 'application/xhtml+xml') expectedExtension = '.html';
+    else if (type === 'text/markdown' || type === 'text/x-markdown') expectedExtension = '.md';
+    else if (type === 'text/plain') expectedExtension = '.txt';
+    if (path.extname(entry.local_path).toLowerCase() !== String(expectedExtension).toLowerCase()) {
+      errors.push(`${entry.resource_type} ${entry.resource_id}: local extension does not preserve ${entry.content_type}.`);
+    }
+    if (fs.existsSync(local) && (type === 'text/html' || type === 'application/xhtml+xml')) {
+      let source;
+      try { source = decodeTextFile(local, entry.content_type); }
+      catch (error) {
+        errors.push(`${entry.resource_type} ${entry.resource_id}: ${error.message}`);
+        continue;
+      }
+      for (const issue of htmlParseErrors(source).slice(0, 20)) {
+        const position = issue.line ? ` at ${issue.line}:${issue.column || 1}` : '';
+        addWarning('DG-HTML-001', 'high', `${entry.resource_type} ${entry.resource_id}: ${issue.code}${position}.`);
+      }
     }
   }
 
-  const orphanGroups = [
-    ['页面', '.draftgo/pages', '.draftgo/pages/index.json', 'html_file', 'page', ['.html']],
-    ['导航', '.draftgo/navigations', '.draftgo/navigations/index.json', 'html_file', 'nav', ['.html']],
-    ['文档', '.draftgo/docs/articles', '.draftgo/docs/articles/index.json', 'content_file', 'article', ['.html', '.md']],
-    ['自定义脚本', '.draftgo/custom_scripts', '.draftgo/custom_scripts/index.json', 'code_file', 'script', ['.py', '.js', '.ts', '.sh', '.go', '.txt']],
-  ];
-  for (const [label, relDir, indexRel, fileField, prefix, exts] of orphanGroups) {
-    const orphans = collectOrphanFiles(projectDir, relDir, indexRel, fileField, prefix, exts);
-    if (orphans.length) {
-      addWarning('DG-ORPHAN-001', 'high', `${label}目录存在 ${orphans.length} 个未登记到 index.json 的文件：${orphans.slice(0, 5).join('、')}。push 不会上传这些文件。`);
+  for (const directory of ['pages', 'navigations', 'docs']) {
+    for (const file of worktreeFiles(projectDir, directory)) {
+      if (!registered.has(path.resolve(file).toLowerCase())) {
+        const relative = path.relative(projectDir, file).replace(/\\/g, '/');
+        addWarning('DG-WORKTREE-ORPHAN', 'high', `Unregistered worktree file: ${relative}.`);
+      }
+    }
+  }
+  for (const page of map.pages) {
+    if (!page.route || page.route === '/' || page.area === 'system') continue;
+    const sources = map.routeRefs[normalizeRoute(page.route)] || [];
+    if (!sources.some((source) => source.startsWith('navigations:'))) {
+      addWarning('DG-ROUTE-001', 'medium',
+        `pages ${page.resource_id}: route ${page.route} is not referenced by a checked-out navigation.`);
     }
   }
-
   return { map, errors, warnings, warningDetails };
 }
 
@@ -537,4 +199,5 @@ module.exports = {
   normalizeRoute,
   extractRoutes,
   extractScriptBindings,
+  htmlParseErrors,
 };