@taloswork/ose-shared 0.1.6 → 0.1.7

package/skills/document/bin/deck-build.cjs

@@ -159,12 +159,61 @@ function derivePins(rows, warnings) {
   });
 }
 
+// packages/core/dist/document/html-escape.js
+function escapeHtml(value) {
+  return String(value).replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
+}
+
 // packages/core/dist/document/deck-build.js
+var SCENES = /* @__PURE__ */ new Set(["hero", "content", "data", "media", "closing"]);
+var DECOR_DENSITIES = /* @__PURE__ */ new Set(["low", "medium", "high"]);
+var SCENE_VARIANTS = ["a", "b", "c"];
+var DEFAULT_SCENE_DENSITY = {
+  hero: "high",
+  content: "low",
+  data: "medium",
+  media: "medium",
+  closing: "high"
+};
+function planDeckVisualRhythm(slides, profiles = {}, rhythm = "auto") {
+  const errors = [];
+  const sceneCounts = /* @__PURE__ */ new Map();
+  const planned = [];
+  const densities = [];
+  slides.forEach((slide, index) => {
+    const profile = slide.intent ? profiles[slide.intent] : void 0;
+    const scene = slide.scene ?? profile?.scene ?? "content";
+    if (!SCENES.has(scene)) {
+      errors.push(`slide ${index + 1}: invalid scene "${scene}"`);
+      planned.push(slide);
+      return;
+    }
+    let density = slide.decorDensity ?? profile?.decorDensity ?? DEFAULT_SCENE_DENSITY[scene];
+    if (!DECOR_DENSITIES.has(density)) {
+      errors.push(`slide ${index + 1}: invalid decorDensity "${density}"`);
+      planned.push(slide);
+      return;
+    }
+    if (rhythm === "auto" && slide.decorDensity === void 0) {
+      const prev = densities.at(-1);
+      const prev2 = densities.at(-2);
+      if (density === "high" && prev === "high" && scene !== "closing")
+        density = "medium";
+      else if (density === "medium" && prev === "medium" && prev2 === "medium")
+        density = "low";
+      else if (density === "low" && prev === "low")
+        density = "medium";
+    }
+    const occurrence = sceneCounts.get(scene) ?? 0;
+    sceneCounts.set(scene, occurrence + 1);
+    const sceneVariant = slide.sceneVariant ?? SCENE_VARIANTS[occurrence % SCENE_VARIANTS.length];
+    densities.push(density);
+    planned.push({ ...slide, scene, decorDensity: density, sceneVariant });
+  });
+  return { slides: planned, errors };
+}
 var SLOT_RE = /\{\{(?![#/])([^{}]*)\}\}/g;
 var BLOCK_RE = /\{\{#([A-Za-z_][\w-]*)\}\}([\s\S]*?)\{\{\/\1\}\}/g;
-function escapeHtml(s) {
-  return String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
 var slotName = (inner) => {
   const bar = inner.indexOf("|");
   return (bar >= 0 ? inner.slice(0, bar) : inner).trim();
@@ -247,6 +296,11 @@ function injectCharts(html, chart, layout, problems) {
 function stripLeadComment(tpl) {
   return tpl.replace(/^\s*<!--[\s\S]*?-->\s*/, "");
 }
+function injectVisualScene(html, slide) {
+  if (!slide.scene || !slide.decorDensity || !slide.sceneVariant)
+    return html;
+  return html.replace(/<section\b/, `<section data-scene="${slide.scene}" data-decor-density="${slide.decorDensity}" data-scene-variant="${slide.sceneVariant}"`);
+}
 function assembleDeck(spec, readLayout) {
   const problems = { warnings: [], errors: [] };
   const sections = [];
@@ -279,6 +333,8 @@ function assembleDeck(spec, readLayout) {
     const chart = figures.chart ?? slide.chart;
     if (chart !== void 0 && !local.errors.length)
       html = injectCharts(html, chart, where, local);
+    if (!local.errors.length)
+      html = injectVisualScene(html, slide);
     problems.warnings.push(...local.warnings);
     problems.errors.push(...local.errors);
     if (!local.errors.length)
@@ -290,7 +346,9 @@ function assembleDeck(spec, readLayout) {
 // packages/core/dist/document/deck-catalog.js
 var KINDS = ["skin", "pack"];
 var MODES = ["light", "dark"];
+var RENDER_MODES = ["classic-v1", "theme-v2"];
 var ID_RE = /^[a-z0-9][a-z0-9-]*$/;
+var COMMIT_RE = /^[0-9a-f]{7,40}$/;
 function isStr(v) {
   return typeof v === "string" && v.length > 0;
 }
@@ -320,6 +378,35 @@ function parseCatalog(raw) {
       groups.push({ id: g.id, name_cn: g.name_cn, sample: g.sample, scenarios: g.scenarios });
     }
   });
+  const collections = [];
+  const rawCollections = o.collections === void 0 ? [] : Array.isArray(o.collections) ? o.collections : [];
+  if (o.collections !== void 0 && !Array.isArray(o.collections))
+    errors.push("catalog.collections must be an array when present");
+  rawCollections.forEach((c, i) => {
+    const at = `collection[${i}]`;
+    const before = errors.length;
+    if (!isStr(c?.id) || !ID_RE.test(c.id))
+      errors.push(`${at}: bad id`);
+    if (!isStr(c?.name_cn))
+      errors.push(`${at}: missing name_cn`);
+    if (!isStr(c?.renderMode) || !RENDER_MODES.includes(c.renderMode))
+      errors.push(`${at}: bad renderMode`);
+    if (!isStrArr(c?.entryIds) || c.entryIds.length === 0)
+      errors.push(`${at}: entryIds must be a non-empty string array`);
+    if (c?.sourceCommit !== void 0 && (!isStr(c.sourceCommit) || !COMMIT_RE.test(c.sourceCommit)))
+      errors.push(`${at}: bad sourceCommit`);
+    if (c?.renderMode === "classic-v1" && c?.sourceCommit === void 0)
+      errors.push(`${at}: classic-v1 requires sourceCommit`);
+    if (errors.length === before) {
+      collections.push({
+        id: c.id,
+        name_cn: c.name_cn,
+        renderMode: c.renderMode,
+        entryIds: c.entryIds,
+        ...c.sourceCommit !== void 0 ? { sourceCommit: c.sourceCommit } : {}
+      });
+    }
+  });
   const entries = [];
   const rawEntries = Array.isArray(o.entries) ? o.entries : [];
   if (!Array.isArray(o.entries))
@@ -359,11 +446,116 @@ function parseCatalog(raw) {
       });
     }
   });
-  return { catalog: errors.length ? null : { groups, entries }, errors };
+  return { catalog: errors.length ? null : { groups, ...collections.length ? { collections } : {}, entries }, errors };
 }
 function resolveEntry(catalog, id) {
   return catalog.entries.find((e) => e.id === id) ?? null;
 }
+function renderModeOf(catalog, id) {
+  return catalog.collections?.find((c) => c.entryIds.includes(id))?.renderMode ?? "theme-v2";
+}
+
+// packages/core/dist/shared/guards.js
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+// packages/core/dist/document/deck-theme-system.js
+var ID_RE2 = /^[a-z0-9][a-z0-9-]*$/;
+var PATH_RE = /^[a-z0-9_./-]+\.css$/i;
+function isSafeCssPath(v) {
+  return typeof v === "string" && PATH_RE.test(v) && !v.startsWith("/") && !v.includes("..");
+}
+function parsePathMap(value, at, errors) {
+  if (!isRecord(value)) {
+    errors.push(`${at} must be an object`);
+    return {};
+  }
+  const out = {};
+  for (const [id, path] of Object.entries(value)) {
+    if (!ID_RE2.test(id))
+      errors.push(`${at}.${id}: bad id`);
+    if (!isSafeCssPath(path)) {
+      errors.push(`${at}.${id}: must be a safe relative .css path`);
+      continue;
+    }
+    out[id] = path;
+  }
+  return out;
+}
+function parseThemeSystem(raw) {
+  const errors = [];
+  if (!isRecord(raw))
+    return { system: null, errors: ["theme system is not an object"] };
+  if (raw.version !== 2)
+    errors.push("theme system version must be 2");
+  if (!isSafeCssPath(raw.componentBase)) {
+    errors.push("componentBase must be a safe relative .css path");
+  }
+  if (!isSafeCssPath(raw.artBase)) {
+    errors.push("artBase must be a safe relative .css path");
+  }
+  const componentProfiles = parsePathMap(raw.componentProfiles, "componentProfiles", errors);
+  const mediaStyles = parsePathMap(raw.mediaStyles, "mediaStyles", errors);
+  const artDirections = parsePathMap(raw.artDirections, "artDirections", errors);
+  const bindings = {};
+  if (!isRecord(raw.bindings))
+    errors.push("bindings must be an object");
+  else {
+    for (const [id, value] of Object.entries(raw.bindings)) {
+      const at = `bindings.${id}`;
+      if (!ID_RE2.test(id))
+        errors.push(`${at}: bad id`);
+      if (!isRecord(value)) {
+        errors.push(`${at} must be an object`);
+        continue;
+      }
+      const componentProfile = value.componentProfile;
+      const mediaStyle = value.mediaStyle;
+      const artDirection = value.artDirection;
+      if (typeof componentProfile !== "string" || !ID_RE2.test(componentProfile))
+        errors.push(`${at}: bad componentProfile`);
+      if (typeof mediaStyle !== "string" || !ID_RE2.test(mediaStyle))
+        errors.push(`${at}: bad mediaStyle`);
+      if (typeof artDirection !== "string" || !ID_RE2.test(artDirection))
+        errors.push(`${at}: bad artDirection`);
+      if (typeof componentProfile === "string" && typeof mediaStyle === "string" && typeof artDirection === "string") {
+        bindings[id] = { componentProfile, mediaStyle, artDirection };
+      }
+    }
+  }
+  if (errors.length)
+    return { system: null, errors };
+  return {
+    system: {
+      version: 2,
+      componentBase: raw.componentBase,
+      artBase: raw.artBase,
+      componentProfiles,
+      mediaStyles,
+      artDirections,
+      bindings
+    },
+    errors
+  };
+}
+function resolveThemeLayers(system, styleId, mediaOverride) {
+  const binding = system.bindings[styleId];
+  if (!binding)
+    return null;
+  const mediaStyle = mediaOverride ?? binding.mediaStyle;
+  const componentPath = system.componentProfiles[binding.componentProfile];
+  const mediaPath = system.mediaStyles[mediaStyle];
+  const artPath = system.artDirections[binding.artDirection];
+  if (!componentPath || !mediaPath || !artPath)
+    return null;
+  return {
+    paths: [system.componentBase, componentPath, mediaPath, system.artBase, artPath],
+    componentProfile: binding.componentProfile,
+    mediaStyle,
+    artDirection: binding.artDirection
+  };
+}
 
 // packages/core/dist/document/deck-motion.js
 var ANIM_EFFECTS = [
@@ -513,20 +705,61 @@ async function main() {
   }
   const skillDir = (0, import_node_path.dirname)((0, import_node_path.dirname)(process.argv[1] || ""));
   const layoutsDir = (0, import_node_path.join)(skillDir, "layouts");
+  if (spec?.themeVersion !== void 0 && spec.themeVersion !== 2) die("themeVersion must be 2 when present", 64);
+  if (spec?.themeVersion === 2 && typeof spec?.style !== "string") die("themeVersion: 2 requires a catalog style id", 64);
+  if (spec?.mediaStyle !== void 0 && (spec.themeVersion !== 2 || typeof spec.mediaStyle !== "string")) {
+    die("mediaStyle must be a string and requires themeVersion: 2", 64);
+  }
+  if (spec?.layoutPack !== void 0 && typeof spec.layoutPack !== "string") die('layoutPack must be a pack id or "none"', 64);
+  if (spec?.decorRhythm !== void 0 && (spec.themeVersion !== 2 || !["auto", "steady"].includes(spec.decorRhythm))) {
+    die("decorRhythm must be auto|steady and requires themeVersion: 2", 64);
+  }
+  if (spec?.themeVersion !== 2 && Array.isArray(spec?.slides) && spec.slides.some((s) => s?.scene !== void 0 || s?.decorDensity !== void 0)) {
+    die("slide scene/decorDensity requires themeVersion: 2", 64);
+  }
   let catalogEntry = null;
   let packLayoutsDir = null;
   const styleId = typeof spec?.style === "string" ? spec.style : null;
-  if (styleId) {
+  let catalog = null;
+  if (styleId || typeof spec?.layoutPack === "string" && spec.layoutPack !== "none") {
     const catalogPath = (0, import_node_path.join)(skillDir, "catalog.json");
     if ((0, import_node_fs.existsSync)(catalogPath)) {
       try {
-        const { catalog } = parseCatalog(JSON.parse((0, import_node_fs.readFileSync)(catalogPath, "utf8")));
+        ({ catalog } = parseCatalog(JSON.parse((0, import_node_fs.readFileSync)(catalogPath, "utf8"))));
         catalogEntry = catalog ? resolveEntry(catalog, styleId) : null;
-        if (catalogEntry?.kind === "pack") packLayoutsDir = (0, import_node_path.join)(skillDir, "packs", catalogEntry.id, "layouts");
       } catch {
       }
     }
   }
+  let layoutPackEntry = null;
+  if (spec?.layoutPack === "none") {
+    layoutPackEntry = null;
+  } else if (typeof spec?.layoutPack === "string") {
+    layoutPackEntry = catalog ? resolveEntry(catalog, spec.layoutPack) : null;
+    if (!layoutPackEntry || layoutPackEntry.kind !== "pack") die(`layoutPack "${spec.layoutPack}" is not a registered pack`, 64);
+  } else if (catalogEntry?.kind === "pack") {
+    layoutPackEntry = catalogEntry;
+    process.stderr.write(`deck-build: legacy compatibility \u2014 style "${styleId}" implicitly enables layoutPack "${styleId}"; set layoutPack:"none" to use shared layouts only
+`);
+  }
+  if (layoutPackEntry) packLayoutsDir = (0, import_node_path.join)(skillDir, "packs", layoutPackEntry.id, "layouts");
+  if (spec?.themeVersion === 2) {
+    if (!catalogEntry) die(`Theme V2 style "${styleId}" is not registered in catalog.json`, 64);
+    if (catalog && renderModeOf(catalog, catalogEntry.id) === "classic-v1") {
+      die(`style "${catalogEntry.id}" is frozen in collection "original-13" as classic-v1; omit themeVersion/mediaStyle/decorRhythm and use a V1 layout`, 64);
+    }
+    const registryPath = (0, import_node_path.join)(skillDir, "theme-system.json");
+    let parsed;
+    try {
+      parsed = parseThemeSystem(JSON.parse((0, import_node_fs.readFileSync)(registryPath, "utf8")));
+    } catch (e) {
+      die(`cannot read Theme V2 registry ${registryPath}: ${e.message}`, 66);
+    }
+    if (!parsed.system) die(`invalid Theme V2 registry: ${parsed.errors.join("; ")}`, 66);
+    if (!resolveThemeLayers(parsed.system, catalogEntry.id, spec.mediaStyle)) {
+      die(`Theme V2 cannot resolve style "${catalogEntry.id}"${spec.mediaStyle ? ` with media style "${spec.mediaStyle}"` : ""}`, 64);
+    }
+  }
   let fromPack = 0, fromShared = 0;
   const readLayout = (id) => {
     if (!/^[a-z0-9-]+$/i.test(id)) return null;
@@ -542,7 +775,30 @@ async function main() {
     if (packLayoutsDir) fromShared++;
     return (0, import_node_fs.readFileSync)(p, "utf8");
   };
-  const { html, warnings, errors } = assembleDeck(spec, readLayout);
+  const profilesPath = (0, import_node_path.join)(layoutsDir, "profiles.json");
+  const profiles = (0, import_node_fs.existsSync)(profilesPath) ? JSON.parse((0, import_node_fs.readFileSync)(profilesPath, "utf8")) : null;
+  let buildSpec = spec;
+  let rhythmErrors = [];
+  if (spec?.themeVersion === 2 && Array.isArray(spec?.slides)) {
+    const planned = planDeckVisualRhythm(spec.slides, profiles?.intents ?? {}, spec.decorRhythm ?? "auto");
+    buildSpec = { ...spec, slides: planned.slides };
+    rhythmErrors = planned.errors;
+  }
+  const { html, warnings, errors } = assembleDeck(buildSpec, readLayout);
+  errors.push(...rhythmErrors);
+  if (profiles) {
+    for (const [i, slide] of (Array.isArray(spec?.slides) ? spec.slides : []).entries()) {
+      if (profiles.themeV2Layouts?.includes(slide?.layout) && spec?.themeVersion !== 2) {
+        errors.push(`slide ${i + 1} (${slide.layout}): this layout requires themeVersion: 2`);
+      }
+      if (slide?.intent === void 0) continue;
+      const profile = profiles?.intents?.[slide.intent];
+      if (!profile) errors.push(`slide ${i + 1}: unknown intent "${slide.intent}"`);
+      else if (!profile.candidates?.includes(slide.layout)) {
+        warnings.push(`slide ${i + 1} (${slide.layout}): intent "${slide.intent}" recommends ${profile.candidates.join(", ")}`);
+      }
+    }
+  }
   for (const w of warnings) process.stderr.write(`deck-build: ${w}
 `);
   if (errors.length) {
@@ -555,7 +811,7 @@ async function main() {
     const ratio = fromShared / resolved;
     if (ratio > 0.4) {
       process.stderr.write(
-        `deck-build: pack-dilution \u2014 ${fromShared}/${resolved} \u9875\uFF08${Math.round(ratio * 100)}%\uFF09\u56DE\u843D\u5230\u5171\u4EAB\u7248\u5F0F\uFF0C\u8D85\u8FC7 40% \u9608\u503C\u3002\u5305 "${styleId}" \u7684\u9875\u9762\u6E05\u5355\u76F8\u5BF9\u672C\u6B21\u5185\u5BB9\u91CF\u504F\u8584\uFF0C\u8003\u8651\u6269\u5305\u6216\u6539\u7528 skin\u3002
+        `deck-build: pack-dilution \u2014 ${fromShared}/${resolved} \u9875\uFF08${Math.round(ratio * 100)}%\uFF09\u56DE\u843D\u5230\u5171\u4EAB\u7248\u5F0F\uFF0C\u8D85\u8FC7 40% \u9608\u503C\u3002\u7248\u5F0F\u5305 "${layoutPackEntry?.id}" \u7684\u9875\u9762\u6E05\u5355\u76F8\u5BF9\u672C\u6B21\u5185\u5BB9\u91CF\u504F\u8584\uFF0C\u8003\u8651\u6269\u5305\u6216\u4F7F\u7528\u5171\u4EAB\u7248\u5F0F\u3002
 `
       );
     }
@@ -592,7 +848,7 @@ async function main() {
     out: outPath,
     slides: Array.isArray(spec?.slides) ? spec.slides.length : 0,
     warnings,
-    next: `html2pptx ${outPath} out.pptx${styleId ? ` --style ${styleId}` : " --style <skin>"}`
+    next: `html2pptx ${outPath} out.pptx${styleId ? ` --style ${styleId}` : " --style <skin>"}${spec?.themeVersion === 2 ? " --theme-v2" : ""}${spec?.mediaStyle ? ` --media-style ${spec.mediaStyle}` : ""}`
   }, null, 1) + "\n");
 }
 main().catch((e) => die(e.message, 1));

package/skills/document/bin/doc-convert.cjs

@@ -315,7 +315,7 @@ var require_BufferList = __commonJS({
         this.head = this.tail = null;
         this.length = 0;
       };
-      BufferList.prototype.join = function join2(s) {
+      BufferList.prototype.join = function join3(s) {
         if (this.length === 0) return "";
         var p = this.head;
         var ret2 = "" + p.data;
@@ -35136,7 +35136,7 @@ var require_buffer_list2 = __commonJS({
         }
       }, {
         key: "join",
-        value: function join2(s) {
+        value: function join3(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret2 = "" + p.data;
@@ -57654,7 +57654,7 @@ var require_polyfills = __commonJS({
       }
       if (platform === "win32") {
         fs.rename = typeof fs.rename !== "function" ? fs.rename : (function(fs$rename) {
-          function rename(from, to, cb2) {
+          function rename2(from, to, cb2) {
             var start = Date.now();
             var backoff = 0;
             fs$rename(from, to, function CB(er) {
@@ -57674,8 +57674,8 @@ var require_polyfills = __commonJS({
               if (cb2) cb2(er);
             });
           }
-          if (Object.setPrototypeOf) Object.setPrototypeOf(rename, fs$rename);
-          return rename;
+          if (Object.setPrototypeOf) Object.setPrototypeOf(rename2, fs$rename);
+          return rename2;
         })(fs.rename);
       }
       fs.read = typeof fs.read !== "function" ? fs.read : (function(fs$read) {
@@ -62361,7 +62361,7 @@ var require_buffer_list3 = __commonJS({
         }
       }, {
         key: "join",
-        value: function join2(s) {
+        value: function join3(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret2 = "" + p.data;
@@ -65727,7 +65727,7 @@ var require_buffer_list4 = __commonJS({
         }
       }, {
         key: "join",
-        value: function join2(s) {
+        value: function join3(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret2 = "" + p.data;
@@ -68523,7 +68523,7 @@ var require_buffer_list5 = __commonJS({
         }
       }, {
         key: "join",
-        value: function join2(s) {
+        value: function join3(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret2 = "" + p.data;
@@ -71393,7 +71393,7 @@ var require_buffer_list6 = __commonJS({
         }
       }, {
         key: "join",
-        value: function join2(s) {
+        value: function join3(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret2 = "" + p.data;
@@ -74182,7 +74182,7 @@ var require_buffer_list7 = __commonJS({
         }
       }, {
         key: "join",
-        value: function join2(s) {
+        value: function join3(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret2 = "" + p.data;
@@ -77172,7 +77172,7 @@ var require_buffer_list8 = __commonJS({
         }
       }, {
         key: "join",
-        value: function join2(s) {
+        value: function join3(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret2 = "" + p.data;
@@ -82364,7 +82364,7 @@ var require_BufferList3 = __commonJS({
         this.head = this.tail = null;
         this.length = 0;
       };
-      BufferList.prototype.join = function join2(s) {
+      BufferList.prototype.join = function join3(s) {
         if (this.length === 0) return "";
         var p = this.head;
         var ret2 = "" + p.data;
@@ -85503,7 +85503,7 @@ var require_dir_writer = __commonJS({
     module2.exports = DirWriter;
     var Writer = require_writer2();
     var inherits2 = require_inherits();
-    var mkdir = require_mkdirp();
+    var mkdir2 = require_mkdirp();
     var path = require("path");
     var collect = require_collect();
     inherits2(DirWriter, Writer);
@@ -85519,7 +85519,7 @@ var require_dir_writer = __commonJS({
     }
     DirWriter.prototype._create = function() {
       var self2 = this;
-      mkdir(self2._path, Writer.dirmode, function(er) {
+      mkdir2(self2._path, Writer.dirmode, function(er) {
         if (er) return self2.error(er);
         self2.ready = true;
         self2.emit("ready");
@@ -85864,7 +85864,7 @@ var require_writer2 = __commonJS({
     var fs = require_graceful_fs();
     var inherits2 = require_inherits();
     var rimraf = require_rimraf();
-    var mkdir = require_mkdirp();
+    var mkdir2 = require_mkdirp();
     var path = require("path");
     var umask = process.platform === "win32" ? 0 : process.umask();
     var getType = require_get_type();
@@ -85970,7 +85970,7 @@ var require_writer2 = __commonJS({
       }
     };
     function create2(self2) {
-      mkdir(path.dirname(self2._path), Writer.dirmode, function(er, made) {
+      mkdir2(path.dirname(self2._path), Writer.dirmode, function(er, made) {
         if (er) return self2.error(er);
         self2._madeDir = made;
         return self2._create();
@@ -148973,6 +148973,7 @@ var require_fontkit_umd = __commonJS({
 });
 
 // apps/admin/data/skills.lib/document/bin-src/doc-convert.mjs
+var import_node_crypto = require("node:crypto");
 var import_node_path2 = require("node:path");
 var import_promises2 = require("node:fs/promises");
 
@@ -152673,7 +152674,7 @@ var require_buffer_list = /* @__PURE__ */ __commonJSMin(((exports2, module2) =>
       },
       {
         key: "join",
-        value: function join2(s) {
+        value: function join3(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret2 = "" + p.data;
@@ -170152,6 +170153,11 @@ async function generateDocument(kind, spec, theme) {
   }
 }
 
+// packages/core/dist/document/html-escape.js
+function escapeHtml(value) {
+  return String(value).replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
+}
+
 // packages/core/dist/document/doc-html.js
 var FONT_STACK = 'TalosCJK, "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Noto Sans CJK SC", "Source Han Sans SC", "WenQuanYi Zen Hei", sans-serif';
 
@@ -170180,9 +170186,6 @@ function htmlShell(bodyHtml, title) {
   const head = `<meta charset="utf-8">` + (title ? `<title>${escapeHtml(title)}</title>` : "") + `<style>${PRINT_STYLE}</style>`;
   return `<!doctype html><html lang="zh"><head>${head}</head><body>${bodyHtml}</body></html>`;
 }
-function escapeHtml(s) {
-  return s.replace(/[&<>"]/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[c]);
-}
 function titleFromFilename(filename) {
   const base = filename.split(/[\\/]/).pop() ?? filename;
   const stem = base.replace(/\.[^.]+$/, "").trim();
@@ -170468,10 +170471,39 @@ async function renderHtmlViaService(html) {
     return null;
   }
 }
-async function renderViaSoffice(input) {
+async function faithfulCachePath(cacheDir, input, raw) {
+  if (!cacheDir) return null;
+  await (0, import_promises2.mkdir)(cacheDir, { recursive: true, mode: 448 });
+  const key = (0, import_node_crypto.createHash)("sha256").update("talos-doc-convert-pdf-v1\0").update((0, import_node_path2.extname)(input).toLowerCase()).update("\0").update(raw).digest("hex");
+  return (0, import_node_path2.join)(cacheDir, `${key}.pdf`);
+}
+async function readCachedPdf(path) {
+  if (!path) return null;
+  const bytes = await (0, import_promises2.readFile)(path).catch(() => null);
+  return bytes && bytes.subarray(0, 5).toString("latin1") === "%PDF-" ? bytes : null;
+}
+async function writeCachedPdf(path, bytes) {
+  if (!path) return;
+  const tmp = `${path}.${process.pid}.tmp`;
+  try {
+    await (0, import_promises2.writeFile)(tmp, bytes, { mode: 384 });
+    await (0, import_promises2.rename)(tmp, path);
+  } finally {
+    await (0, import_promises2.rm)(tmp, { force: true }).catch(() => {
+    });
+  }
+}
+async function renderViaSoffice(input, cachePath) {
   if (!resolveSoffice()) return null;
+  const cached = await readCachedPdf(cachePath);
+  if (cached) return { bytes: cached, cached: true };
   try {
-    return await convertToPdfViaSoffice(input);
+    const bytes = await convertToPdfViaSoffice(input);
+    await writeCachedPdf(cachePath, bytes).catch((e) => {
+      process.stderr.write(`doc-convert: cache write skipped (${e.message})
+`);
+    });
+    return { bytes, cached: false };
   } catch (e) {
     process.stderr.write(`doc-convert: LibreOffice failed (${e.message}); falling back to HTML render
 `);
@@ -170493,8 +170525,13 @@ async function renderViaOfficeService(input, raw) {
   }
 }
 async function main() {
-  const [input, out] = process.argv.slice(2);
-  if (!input || !out) die("usage: doc-convert <in.docx|pptx|xlsx> <out.pdf>", 64);
+  const args = process.argv.slice(2);
+  const cacheIdx = args.indexOf("--cache-dir");
+  const cacheDir = cacheIdx >= 0 ? args[cacheIdx + 1] : process.env.TALOS_OFFICE_CACHE_DIR;
+  const consumed = /* @__PURE__ */ new Set([cacheIdx, cacheIdx >= 0 ? cacheIdx + 1 : -1]);
+  const [input, out] = args.filter((_4, i) => !consumed.has(i));
+  if (!input || !out) die("usage: doc-convert <in.docx|pptx|xlsx> <out.pdf> [--cache-dir <dir>]", 64);
+  if (cacheIdx >= 0 && !cacheDir) die("--cache-dir requires a directory", 64);
   if (!/\.pdf$/i.test(out)) die("output must be a .pdf path", 64);
   let raw;
   try {
@@ -170503,10 +170540,11 @@ async function main() {
     die(`cannot read ${input}: ${e.message}`, 66);
   }
   const buffer = raw.buffer.slice(raw.byteOffset, raw.byteOffset + raw.byteLength);
-  const loBytes = await renderViaSoffice(input);
-  if (loBytes) {
-    await (0, import_promises2.writeFile)(out, Buffer.from(loBytes));
-    process.stdout.write(`wrote ${out} [pdf (libreoffice)]
+  const cachePath = await faithfulCachePath(cacheDir, input, raw).catch((e) => die(`cannot prepare cache: ${e.message}`, 73));
+  const loResult = await renderViaSoffice(input, cachePath);
+  if (loResult) {
+    await (0, import_promises2.writeFile)(out, Buffer.from(loResult.bytes));
+    process.stdout.write(`wrote ${out} [pdf (libreoffice${loResult.cached ? ", cache hit" : ""})]
 `);
     return;
   }

package/skills/document/bin/doc-gen.cjs

@@ -154029,6 +154029,11 @@ async function generateDocument(kind, spec, theme) {
   }
 }
 
+// packages/core/dist/document/html-escape.js
+function escapeHtml(value) {
+  return String(value).replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
+}
+
 // packages/core/dist/document/doc-html.js
 var FONT_STACK = 'TalosCJK, "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Noto Sans CJK SC", "Source Han Sans SC", "WenQuanYi Zen Hei", sans-serif';
 function stackWith(font) {
@@ -154064,7 +154069,7 @@ function foldFullwidthAlnum2(s) {
   return s.replace(/[０-９Ａ-Ｚａ-ｚ]/g, (c) => String.fromCharCode(c.charCodeAt(0) - 65248)).replace(/　/g, " ");
 }
 function norm(s) {
-  return foldFullwidthAlnum2(String(s)).replace(/[&<>"]/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[c]);
+  return escapeHtml(foldFullwidthAlnum2(String(s)));
 }
 function paragraphHtml(text) {
   return `<p>${norm(text).replace(/\r?\n/g, "<br>")}</p>`;
@@ -154191,9 +154196,6 @@ function parseTemplate(src) {
   }
   return walk();
 }
-function escapeHtml(s) {
-  return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
-}
 function resolve(path, scope) {
   if (path === "." || path === "this")
     return scope.ctx;