@copylee/dsh-office 0.2.0 → 0.2.1

package/README.md

@@ -19,6 +19,7 @@
 | Word 原生公式 | AI 在文字里用 `$...$`（行内）和 `$$...$$`（单独一行）写 LaTeX，插件转成 Word 原生公式（分式、根号、上下标、希腊字母、求和、积分、上划线等常用写法）；单独一行的公式末尾加 `\tag{1}` 即在右侧对齐编号 |
 | 填模板 | 报告模板常把正文放在大单元格里。这类表格会按段落展开给模型看，正文、公式、表格都写进单元格里面，而不是堆到文档末尾；新写的正文沿用旁边正文的字体、字号和行距 |
 | 规范的图表题注 | 插入表格或图片时给出题注，插件按规范排：自动编号（“表 1”“图 1”，是 Word 题注域，增删后自动重排）、居中、表题在上、图题在下；图表前后留出段间距，图片居中 |
+| 不被自带技能带偏 | DSH 桌面版自带的 Office 技能会让模型写脚本生成文件，这样你看不到过程，文件开着时还会写入失败。插件在模型第一次加载这些技能时把它引回来，确有需要（批量转换、应用打不开的文件）再次请求即放行 |
 | 交付前整体视觉检查 | 保存时如果 AI 改完之后还没看过成品，保存结果会自动附上各页（最多 8 页）的渲染图让它过一遍，有问题先修再保存 |
 | 批量编辑 | `office_edit` 一次调用按顺序执行一批修改（写一整篇文档、填一张表加公式加图表、做几页幻灯片），中途某一项失败就停下并报告已完成哪些 |
 | 改错位置的防护 | Word 按“段落编号 + 这段开头的文字”定位。你刚改过导致编号对不上时，这一步会被拒绝并要求重新读取；改写和删除段落必须带开头文字 |
@@ -79,6 +80,7 @@ AI 只有在调用保存时才写入文件，不会替你关闭文档。
 | 逐字写入 | 开 | 文字像打字一样逐步出现；关闭后写得最快 |
 | 迷你卡片 | 开 | AI 编辑时在右下角显示带“跟随”“逐字”开关的小卡片。在卡片上切换过的开关，到 DSH 重启前以卡片为准 |
 | 交付前整体视觉检查 | 开 | 保存时自动把各页渲染图交给 AI 检查；会多用一些 token |
+| 优先在真实 Office 里操作 | 开 | DSH 桌面版自带 office-docx / office-xlsx / office-pptx 技能，用脚本生成文件。开启后，AI 第一次想加载这些技能时会被引回本插件（对应的 Office 应用已安装时才拦）；它再次请求时放行 |
 | 打开文档时显示到前台 | 开 | 关闭后文档仍会打开，只是不抢当前窗口 |
 | 核对排版的图片宽度 | 1100 像素 | `office_render` 给模型的图片宽度；越大越清晰，也越费 token |
 

package/helper/OfficeHelper.cs

@@ -560,6 +560,13 @@ static class Program
         }
         Dictionary<string, object> info = Info(kind, doc, Active(kind, app));
         info["how"] = how;
+        if (a.Flag("card", false))
+        {
+            if (!cardStarted) { cardStarted = true; Card.Start(); }
+            Following = Card.FollowChosen ? Following : a.Flag("follow", false);
+            Typing = Card.TypingChosen ? Typing : a.Flag("typing", false);
+            Card.Report("AI 打开了 " + (string)doc.Name);
+        }
         return info;
     }
 
@@ -1068,7 +1075,11 @@ static class Program
     {
         string where = op.Str("where", op.Has("para") ? "after" : "end");
         // A new, empty document: its one empty paragraph is where the text goes, wherever the operation points.
-        if ((int)doc.Paragraphs.Count == 1 && (string)doc.Paragraphs[1].Range.Text == "\r") return doc.Paragraphs[1];
+        if ((int)doc.Paragraphs.Count == 1 && (string)doc.Paragraphs[1].Range.Text == "\r")
+        {
+            op.Raw("para"); op.Raw("expect");
+            return doc.Paragraphs[1];
+        }
         if (where == "end")
         {
             dynamic last = doc.Paragraphs.Last;

package/lib/client.js

@@ -41,6 +41,7 @@ window.__ModuleLoader__.load({
 			typing: true,
 			card: true,
 			finalCheck: true,
+			preferLive: true,
 			showOnOpen: true,
 			renderWidth: 1100
 		};
@@ -54,6 +55,7 @@ window.__ModuleLoader__.load({
 				typing: typeof out.typing === "boolean" ? out.typing : DEFAULTS.typing,
 				card: typeof out.card === "boolean" ? out.card : DEFAULTS.card,
 				finalCheck: typeof out.finalCheck === "boolean" ? out.finalCheck : DEFAULTS.finalCheck,
+				preferLive: typeof out.preferLive === "boolean" ? out.preferLive : DEFAULTS.preferLive,
 				showOnOpen: typeof out.showOnOpen === "boolean" ? out.showOnOpen : DEFAULTS.showOnOpen,
 				renderWidth: typeof width === "number" && Number.isFinite(width) ? Math.min(2e3, Math.max(600, Math.round(width))) : DEFAULTS.renderWidth
 			};
@@ -526,6 +528,16 @@ window.__ModuleLoader__.load({
 				onChange: (value) => {
 					change("finalCheck", value);
 				}
+			})), h("div", { style: S.toggleRow }, h("div", { style: S.toggleText }, "优先在真实 Office 里操作", h("span", { style: {
+				...S.hint,
+				fontWeight: 400
+			} }, "DSH 自带的 office-docx / office-xlsx / office-pptx 技能是用脚本生成文件，你看不到过程，公式和排版也由脚本决定。开启后，AI 第一次想加载这些技能时会被引回本插件（对应的 Office 应用已安装时才拦）；它确有需要而再次请求时放行。")), h(Switch, {
+				checked: settings.preferLive,
+				disabled,
+				label: "优先在真实 Office 里操作",
+				onChange: (value) => {
+					change("preferLive", value);
+				}
 			})), h("div", { style: S.toggleRow }, h("div", { style: S.toggleText }, "打开文档时显示到前台", h("span", { style: {
 				...S.hint,
 				fontWeight: 400

package/lib/index.js

@@ -223,12 +223,31 @@ var HelperClient = class {
 };
 //#endregion
 //#region lib/types/prompt.js
+/** The host's file-based Office skills, and the app each one stands in for. */
+const FILE_SKILLS = {
+	"office-docx": "word",
+	"office-xlsx": "excel",
+	"office-pptx": "ppt"
+};
+const APPS = {
+	word: "Microsoft Word",
+	excel: "Microsoft Excel",
+	ppt: "Microsoft PowerPoint"
+};
+/** What the model is told the first time it reaches for one of those skills. */
+function redirectText(skill, app) {
+	return [
+		`Not loaded: ${APPS[app]} is installed on this computer, so do this work inside it with the office_ tools instead of building the file with a script.`,
+		"Call office_open with the absolute path (a path that does not exist yet creates the document; the app is started for you if it is not running), then office_read, office_edit, office_render, office_save. The user watches the document take shape in the window and can edit alongside; formulas, captions and layout are done by the app itself.",
+		`Only if the task truly cannot be done that way (converting many files in bulk, a file the app cannot open, no document to show), call skill "${skill}" again and it will load.`
+	].join("\n");
+}
 /** System-prompt section: when to reach for the office_ tools, in as few tokens as will do. */
 function promptText() {
 	return [
 		"# Office documents (Word, Excel, PowerPoint)",
 		"The office_ tools work inside the real Office apps on this computer: the document is open in its window, every change you make appears there at once, and the user can read and edit alongside you.",
-		"- For any .docx / .xlsx / .pptx work, call office_open first, then office_read, then office_edit. Prefer this over writing the file with scripts or libraries: an open file cannot be overwritten, and the user would not see the work.",
+		"- For any Word, Excel or PowerPoint work, creating a new document included, start with office_open (it starts the app if it is not running, and a path that does not exist yet creates the file), then office_read and office_edit. Do not load the office-docx / office-xlsx / office-pptx skills and do not write the file with a script: an open file cannot be overwritten, and the user would not see the work.",
 		"- Put all the changes you can into one office_edit call; it runs them in order.",
 		"- The user may edit while you work. Read again before editing a part you have not just read, and pass \"expect\" on Word paragraphs.",
 		"- Use these tools, not python-docx / openpyxl / python-pptx or other file libraries, whenever the document is to be worked on in the user's Office app or is already open there; and check the result with office_render, not by converting the file with another renderer, which lays it out differently from Word.",
@@ -253,6 +272,7 @@ const DEFAULTS = {
 	typing: true,
 	card: true,
 	finalCheck: true,
+	preferLive: true,
 	showOnOpen: true,
 	renderWidth: 1100
 };
@@ -266,6 +286,7 @@ function resolveConfig(raw) {
 		typing: typeof out.typing === "boolean" ? out.typing : DEFAULTS.typing,
 		card: typeof out.card === "boolean" ? out.card : DEFAULTS.card,
 		finalCheck: typeof out.finalCheck === "boolean" ? out.finalCheck : DEFAULTS.finalCheck,
+		preferLive: typeof out.preferLive === "boolean" ? out.preferLive : DEFAULTS.preferLive,
 		showOnOpen: typeof out.showOnOpen === "boolean" ? out.showOnOpen : DEFAULTS.showOnOpen,
 		renderWidth: typeof width === "number" && Number.isFinite(width) ? Math.min(2e3, Math.max(600, Math.round(width))) : DEFAULTS.renderWidth
 	};
@@ -5875,7 +5896,7 @@ function formatStatus(apps) {
 			continue;
 		}
 		if (!app.running) {
-			lines.push(`${name}: not running`);
+			lines.push(`${name}: installed, not running (office_open starts it)`);
 			continue;
 		}
 		if (app.error) {
@@ -6199,10 +6220,14 @@ function createTools(host) {
 				...app === void 0 ? {} : { app },
 				...path === void 0 ? {} : { path }
 			});
+			const { showOnOpen, follow, typing, card } = host.settings();
 			const doc = await helper.call("open", {
 				app: kind,
 				...path === void 0 ? {} : { path },
-				show: host.settings().showOnOpen
+				show: showOnOpen,
+				follow,
+				typing,
+				card
 			}, 8e4);
 			current = {
 				app: kind,
@@ -6436,6 +6461,10 @@ const Config = z.object({
 		"zh-CN": { $description: "交付前整体视觉检查：保存时如果 AI 改完后还没看过成品，自动把各页渲染成图片给它检查" },
 		"en-US": { $description: "Whole-document visual check: on save, show the AI every page if it has not looked since its last edits" }
 	}),
+	preferLive: z.boolean().default(true).volatile().i18n({
+		"zh-CN": { $description: "优先在真实 Office 里操作：AI 想加载 DSH 自带的 office-docx / xlsx / pptx 技能（用脚本改文件）时，先把它引回本插件" },
+		"en-US": { $description: "Prefer the real Office app: when the AI reaches for the host's file-based office skills, point it back to this plugin first" }
+	}),
 	showOnOpen: z.boolean().default(true).volatile().i18n({
 		"zh-CN": { $description: "打开文档时把它的窗口带到前台" },
 		"en-US": { $description: "Bring the document window to the front when it is opened" }
@@ -6485,6 +6514,28 @@ function apply(ctx, config = {}) {
 		}
 	});
 	for (const tool of tools) ctx.effect(() => ctx.tools.register(tool), `office: tool ${tool.name}`);
+	let installed;
+	const installedApps = () => {
+		installed ??= helper.call("status", {}, 3e4).then((apps) => new Set(apps.filter((app) => app.installed).map((app) => app.app))).catch(() => {
+			installed = void 0;
+			return /* @__PURE__ */ new Set();
+		});
+		return installed;
+	};
+	const redirected = /* @__PURE__ */ new Set();
+	ctx.on("tools/pre-execute", async (exec, next) => {
+		if (exec.name !== "skill" || !settings().preferLive) return next();
+		const skill = String(exec.arguments?.name ?? "");
+		const app = FILE_SKILLS[skill];
+		if (app === void 0) return next();
+		const key = `${exec.agent?.session?.id ?? "default"}:${skill}`;
+		if (redirected.has(key) || !(await installedApps()).has(app)) return next();
+		redirected.add(key);
+		return {
+			kind: "deny",
+			reason: redirectText(skill, app)
+		};
+	});
 	ctx.inject(["webServer"], (webCtx) => {
 		const handler = async (_req, res) => {
 			let body;

package/lib/types/index.d.ts

@@ -9,6 +9,7 @@ export interface Config {
     typing?: boolean;
     card?: boolean;
     finalCheck?: boolean;
+    preferLive?: boolean;
     showOnOpen?: boolean;
     renderWidth?: number;
 }

package/lib/types/prompt.d.ts

@@ -1,2 +1,6 @@
+/** The host's file-based Office skills, and the app each one stands in for. */
+export declare const FILE_SKILLS: Record<string, 'word' | 'excel' | 'ppt'>;
+/** What the model is told the first time it reaches for one of those skills. */
+export declare function redirectText(skill: string, app: 'word' | 'excel' | 'ppt'): string;
 /** System-prompt section: when to reach for the office_ tools, in as few tokens as will do. */
 export declare function promptText(): string;

package/lib/types/settings.d.ts

@@ -14,6 +14,8 @@ export interface Settings {
     card: boolean;
     /** On save, show the model every page as it is now if it has not looked since its last edits. */
     finalCheck: boolean;
+    /** Turn the model away from the host's file-based Office skills when the real app is installed. */
+    preferLive: boolean;
     /** Bring the document's window to the front when office_open opens it. */
     showOnOpen: boolean;
     /** Width in pixels of the pictures office_render gives the model. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@copylee/dsh-office",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "DeepSeek Harness Office 插件（Windows）：AI 直接在你打开的 Word / Excel / PowerPoint 里改文档，改动实时出现在窗口中，你可以同时编辑；读结构、批量编辑、渲染成图核对、保存。",
   "type": "module",
   "author": "copylee",