dsh-office-tools 1.0.4 → 1.0.6

package/README.md

@@ -61,6 +61,8 @@ pnpm install && pnpm run check   # typecheck + tests + build
 pnpm run test:e2e                # real-composition E2E (sandbox-policy + fs-sandbox + tools)
 ```
 
-Compatibility: DSH `>=0.1.0-rc.6`; exact per-release records live in `package.json` (`dsh.compatibility.dshReleases`).
+Compatibility: the declared DSH 0.1.x ranges and `>=0.2.0-rc.1 <0.3.0-0`; exact tested releases live in `package.json` (`dsh.compatibility.dshReleases`). CI exercises both 0.1.2-rc.1 and 0.2.0-rc.1. DSH 0.3.x is not declared supported.
+
+Generated packages are limited to 50 MiB. Up to 200 PPT slides (including an optional title slide) are accepted; linked images remain external. See [architecture and migration plan](docs/ARCHITECTURE.zh.md) for the binary-write seam needed for true embedding.
 
 Further reading: [DEVELOPMENT.md](docs/DEVELOPMENT.md) · [ROADMAP.md](docs/ROADMAP.md) · [hub-registration.md](docs/hub-registration.md) · MIT [License](LICENSE)

package/README.zh.md

@@ -61,6 +61,8 @@ pnpm install && pnpm run check   # typecheck + tests + build
 pnpm run test:e2e                # 真实组合 E2E（sandbox-policy + fs-sandbox + tools）
 ```
 
-兼容性：DSH `>=0.1.0-rc.6`；逐版本的精确兼容记录见 `package.json`（`dsh.compatibility.dshReleases`）。
+兼容性：声明的 DSH 0.1.x 区间，以及 `>=0.2.0-rc.1 <0.3.0-0`；逐版本的实测记录见 `package.json`（`dsh.compatibility.dshReleases`）。CI 验证 0.1.2-rc.1 和 0.2.0-rc.1，尚未声明支持 DSH 0.3.x。
+
+生成文件最多 50 MiB；PPT 最多 200 页（包含可选封面）。图片仍为外部链接。分层架构与真实图片嵌入的迁移方案见 [架构分析](docs/ARCHITECTURE.zh.md)。
 
 更多文档：[DEVELOPMENT.md](docs/DEVELOPMENT.md) · [ROADMAP.md](docs/ROADMAP.md) · [hub-registration.md](docs/hub-registration.md) · MIT [License](LICENSE)

package/dsh.plugin.json

@@ -1,10 +1,10 @@
 {
   "id": "dsh-office-tools",
-  "version": "1.0.0",
+  "version": "1.0.6",
   "main": "lib/index.js",
   "description": "Office tools for the model: create, read, and update Word (.docx), Excel (.xlsx), and PowerPoint (.pptx) files inside the session workspace through the official DSH filesystem service.",
   "engines": {
-    "dsh": ">=0.1.0-rc.6"
+    "dsh": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0 || >=0.2.0-rc.1 <0.3.0-0"
   },
   "contributes": {
     "tools": [

package/lib/index.js

@@ -52,15 +52,49 @@ var DOS_DATE = 2026 - 1980 << 9 | 1 << 5 | 1;
 var LOCAL_HEADER_BYTES = 30;
 var CENTRAL_HEADER_BYTES = 46;
 var EOCD_BYTES = 22;
-var MAX_PLAN_PAD = 65536;
+var MAX_SAFE_U16 = 32639;
+var CRC_SUFFIX_BYTES = 8;
+function nextSafeField(value) {
+  let candidate = value;
+  for (let byte = 0; byte < 4; byte += 1) {
+    const unit = 2 ** (8 * byte);
+    if (Math.floor(candidate / unit) % 256 > 127) {
+      const band = unit * 256;
+      candidate = (Math.floor(candidate / band) + 1) * band;
+    }
+  }
+  if (!safeField(candidate)) throw new Error("ASCII-safe ZIP field exceeds its representable range");
+  return candidate;
+}
+function safeCrcSuffix(state) {
+  for (let variant = 0; variant < 256; variant += 1) {
+    let folded = state;
+    let suffix = "";
+    for (let bit = 0; bit < CRC_SUFFIX_BYTES; bit += 1) {
+      const byte = variant & 1 << bit ? 9 : 32;
+      suffix += String.fromCharCode(byte);
+      folded = crcFold(folded, byte);
+    }
+    const crc = (folded ^ 4294967295) >>> 0;
+    if (safeField(crc)) return { suffix, crc };
+  }
+  throw new Error("internal error: trailing XML whitespace cannot produce a byte-safe CRC");
+}
 function extraField(total) {
   if (total === 0) return "";
   return u16(0) + u16(total - 4) + "\0".repeat(total - 4);
 }
 function feasibleExtraLength(end) {
   if (safeField(end)) return 0;
-  for (let total = 4; total <= 127; total += 1) {
-    if (safeField(end + total)) return total;
+  let total = nextSafeField(Math.max(4, nextSafeField(end) - end));
+  while (total <= MAX_SAFE_U16) {
+    if (!safeField(total - 4)) {
+      total = nextSafeField(total + 4);
+      continue;
+    }
+    const next = nextSafeField(end + total);
+    if (next === end + total) return total;
+    total = nextSafeField(total + next - (end + total));
   }
   return void 0;
 }
@@ -69,49 +103,46 @@ function planEntries(parts) {
   let offset = 0;
   for (const part of parts) {
     assertAscii(part.name, "zip entry name");
+    assertAscii(part.content, "zip entry content");
     const nameLength = part.name.length;
     const headerSize = LOCAL_HEADER_BYTES + nameLength;
     const baseLength = part.content.length;
-    const minEnd = offset + headerSize + baseLength;
-    let chosen;
-    let state = contentCrcState(part.content);
-    for (let pad = 0; pad <= MAX_PLAN_PAD && chosen === void 0; pad += 1) {
-      if (pad > 0) state = crcFold(state, 10);
-      const length = baseLength + pad;
-      if (!safeField(length)) continue;
-      const crc = (state ^ 4294967295) >>> 0;
-      if (!safeField(crc)) continue;
-      const extraLength = feasibleExtraLength(minEnd + pad);
-      if (extraLength === void 0) continue;
-      const content = pad === 0 ? part.content : part.content + "\n".repeat(pad);
-      chosen = { content, crc, extraLength, end: minEnd + pad + extraLength };
+    if (!safeField(nameLength) || nameLength > MAX_SAFE_U16) {
+      throw new Error(`zip entry name is too long or has a non-byte-safe length: "${part.name}"`);
     }
-    if (chosen === void 0) {
-      throw new Error(`cannot lay out an ASCII-safe zip entry for "${part.name}" (offset=${offset})`);
+    let length = nextSafeField(baseLength + CRC_SUFFIX_BYTES);
+    let extraLength;
+    for (; ; ) {
+      const end = offset + headerSize + length;
+      if (end > MAX_OFFICE_FILE_BYTES) throw new Error("generated Office package exceeds the 50 MiB write budget");
+      extraLength = feasibleExtraLength(end);
+      if (extraLength !== void 0) break;
+      length = nextSafeField(length + Math.max(1, nextSafeField(end) - end - MAX_SAFE_U16));
     }
+    const pad = length - baseLength - CRC_SUFFIX_BYTES;
+    let state = contentCrcState(part.content);
+    for (let index = 0; index < pad; index += 1) state = crcFold(state, 10);
+    const { suffix, crc } = safeCrcSuffix(state);
     planned.push({
       name: part.name,
-      content: chosen.content,
-      crc: chosen.crc,
+      content: part.content + "\n".repeat(pad) + suffix,
+      crc,
       offset,
-      localExtraLength: chosen.extraLength,
+      localExtraLength: extraLength,
       commentLength: 0,
       centralExtraLength: 0
     });
-    offset = chosen.end;
+    offset += headerSize + extraLength + length;
   }
   const baseDirectorySize = planned.reduce((sum, entry) => sum + CENTRAL_HEADER_BYTES + entry.name.length, 0);
-  const extraCandidates = [0];
-  for (let total = 4; total <= 127; total += 1) extraCandidates.push(total);
   let commentLength = -1;
   let centralExtraLength = -1;
-  outer: for (const extra of extraCandidates) {
-    for (let comment = 0; comment <= 127; comment += 1) {
-      if (safeField(baseDirectorySize + extra + comment)) {
-        centralExtraLength = extra;
-        commentLength = comment;
-        break outer;
-      }
+  for (let comment = 0; comment <= MAX_SAFE_U16; comment = nextSafeField(comment + 1)) {
+    const extra = feasibleExtraLength(baseDirectorySize + comment);
+    if (extra !== void 0) {
+      centralExtraLength = extra;
+      commentLength = comment;
+      break;
     }
   }
   if (commentLength < 0 || centralExtraLength < 0) {
@@ -125,10 +156,29 @@ function planEntries(parts) {
   return { entries: planned, directoryOffset: offset };
 }
 function buildAsciiZip(parts) {
-  if (parts.length === 0 || parts.length > 127) {
-    throw new Error(`an ASCII-safe package holds 1..127 entries, got ${parts.length}`);
-  }
-  const plan = planEntries(parts);
+  if (parts.length === 0 || parts.length > MAX_SAFE_U16) {
+    throw new Error(`an ASCII-safe package holds 1..${MAX_SAFE_U16} entries, got ${parts.length}`);
+  }
+  const count = nextSafeField(parts.length);
+  const names = new Set(parts.map((part) => part.name));
+  if (names.size !== parts.length) throw new Error("cannot write a zip archive with duplicate entry names");
+  const expanded = [...parts];
+  const paddingNames = [];
+  for (let index = 1; expanded.length < count; index += 1) {
+    const name2 = `dshPadding/pad${index}.xml`;
+    if (names.has(name2)) continue;
+    names.add(name2);
+    paddingNames.push(name2);
+    expanded.push({ name: name2, content: '<padding xmlns="urn:dsh-office-tools:padding"/>' });
+  }
+  const typesIndex = expanded.findIndex((part) => part.name === "[Content_Types].xml");
+  if (paddingNames.length > 0 && typesIndex >= 0 && !/<Default\b[^>]*\bExtension=["']xml["']/i.test(expanded[typesIndex].content)) {
+    const original = expanded[typesIndex];
+    const overrides = paddingNames.map((name2) => `<Override PartName="/${name2}" ContentType="application/xml"/>`).join("");
+    if (!/<\/(?:\w+:)?Types\s*>/.test(original.content)) throw new Error("cannot add padding parts to malformed content types");
+    expanded[typesIndex] = { ...original, content: original.content.replace(/<\/(?:\w+:)?Types\s*>/, `${overrides}$&`) };
+  }
+  const plan = planEntries(expanded);
   const planned = plan.entries;
   const local = [];
   const central = [];
@@ -187,6 +237,9 @@ function buildAsciiZip(parts) {
   if (!safeField(directorySize) || !safeField(directoryOffset)) {
     throw new Error("internal error: the planned central directory fields are not ASCII-safe");
   }
+  if (directoryOffset + directorySize + EOCD_BYTES > MAX_OFFICE_FILE_BYTES) {
+    throw new Error("generated Office package exceeds the 50 MiB write budget");
+  }
   const eocd = [
     "PK",
     u16(0),
@@ -1391,6 +1444,7 @@ async function buildPptxText(args, exec, ctx, deck) {
   }
   const slideCount = builds.length;
   if (slideCount === 0) throw new Error("ppt_create needs a title or at least one slide");
+  if (slideCount > 200) throw new Error("too many slides including the title slide (maximum 200)");
   for (const [slideIndex, build] of builds.entries()) {
     const images = build.spec.images ?? [];
     build.images = [];
@@ -1465,7 +1519,7 @@ function sketchSlide(widthIn, heightIn, elements) {
     }
   };
   for (const element of elements) {
-    const label = element.type === "image" ? "IMG" : (element.text ?? element.type).split(/\s+/)[0]?.slice(0, 10) || element.type;
+    const label = element.type === "image" ? "IMG" : element.type === "graphicFrame" ? "FRAME" : (element.text ?? element.type).split(/\s+/)[0]?.slice(0, 10) || element.type;
     drawRect(element.xIn, element.yIn, element.wIn, element.hIn, label);
   }
   const border = [];
@@ -1532,16 +1586,12 @@ function extractElements(slideXmlText) {
     };
     if (block.startsWith("<p:pic")) {
       const descr = block.match(PICTURE_DESCR)?.[1];
-      elements.push({ type: "image", ...base, alt: descr === void 0 ? void 0 : decodeXmlEntities(descr) });
+      elements.push(descr === void 0 ? { type: "image", ...base } : { type: "image", ...base, alt: decodeXmlEntities(descr) });
       continue;
     }
     if (block.startsWith("<p:graphicFrame")) {
       const table = extractTables(block)[0];
-      elements.push({
-        type: "table",
-        ...base,
-        text: table === void 0 ? void 0 : `${table.length}x${table[0]?.length ?? 0}`
-      });
+      elements.push(table === void 0 ? { type: "graphicFrame", ...base } : { type: "table", ...base, text: `${table.length}x${table[0]?.length ?? 0}` });
       continue;
     }
     const text = extractParagraphs(stripTables(block), false).join(" | ");
@@ -1593,7 +1643,7 @@ var ELEMENT_SCHEMA = {
   type: "object",
   additionalProperties: false,
   properties: {
-    type: { type: "string", required: true, description: "Element kind: text, bullets, image, or table." },
+    type: { type: "string", required: true, description: "Element kind: text, bullets, image, table, or graphicFrame (an OLE object, chart, or other non-table frame)." },
     xIn: { type: "number", required: true, description: "Left edge in inches from the slide origin." },
     yIn: { type: "number", required: true, description: "Top edge in inches from the slide origin." },
     wIn: { type: "number", required: true, description: "Width in inches." },

package/lib/types/tools/ppt.d.ts

@@ -44,7 +44,7 @@ interface PptCreateArgs {
 }
 /** One placed element, echoed by create and parsed back by read. */
 export interface SlideElementBox {
-    type: 'text' | 'bullets' | 'image' | 'table';
+    type: 'text' | 'bullets' | 'image' | 'table' | 'graphicFrame';
     xIn: number;
     yIn: number;
     wIn: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-office-tools",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "DSH model-facing Office tools: create, read, and update Word (.docx), Excel (.xlsx), and PowerPoint (.pptx) files inside the session workspace, entirely through the official DSH filesystem service.",
   "license": "MIT",
   "type": "module",
@@ -18,14 +18,15 @@
       "patch": "./cordis.patch.yml"
     },
     "compatibility": {
-      "dsh": ">=0.1.0-rc.6",
+      "dsh": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0 || >=0.2.0-rc.1 <0.3.0-0",
       "dshReleases": {
         "0.1.1-rc.2": "compatible",
         "0.1.2-alpha.4": "compatible",
         "0.1.2-alpha.5": "compatible",
         "0.1.2-rc.1": "compatible",
         "0.1.5-rc.1": "compatible",
-        "0.1.5-rc.2": "compatible"
+        "0.1.5-rc.2": "compatible",
+        "0.2.0-rc.1": "compatible"
       }
     }
   },
@@ -48,11 +49,11 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0",
-    "@deepseek-ai/dsh-fs": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0"
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-fs": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0 || >=0.2.0-rc.1 <0.3.0-0",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-rc.0 || ^0.1.2-alpha.0 || ^0.1.5-alpha.0 || >=0.2.0-rc.1 <0.3.0-0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -87,8 +88,10 @@
     "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
     "@deepseek-ai/schemastery": "^3.18.2",
     "@types/node": "^24.0.0",
+    "@types/semver": "7.7.1",
     "esbuild": "^0.25.0",
     "jszip": "^3.10.1",
+    "semver": "7.8.5",
     "typescript": "^5.6.0",
     "vitest": "^4.1.8",
     "xlsx": "^0.18.5"
@@ -150,7 +153,8 @@
         "0.1.2-alpha.5",
         "0.1.2-rc.1",
         "0.1.5-rc.1",
-        "0.1.5-rc.2"
+        "0.1.5-rc.2",
+        "0.2.0-rc.1"
       ]
     },
     "capability": {