From 839033f9938d329a589f219acb954664f94361af Mon Sep 17 00:00:00 2001 From: yudshj Date: Sat, 10 Oct 2026 00:01:52 +0800 Subject: [PATCH] fix(office): align runtime smoke and cross-platform coverage --- docs/module-graph.md | 4 +--- docs/module-graph.zh.md | 4 +--- packages/skill/skill-office/tests/commands.spec.ts | 5 +++-- scripts/smoke-python-runtime.py | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/docs/module-graph.md b/docs/module-graph.md index 93e6a00e3d..5ad55d09aa 100644 --- a/docs/module-graph.md +++ b/docs/module-graph.md @@ -1029,11 +1029,9 @@ flowchart TD pkg_token_meter --> pkg_llm_retry pkg_token_meter --> pkg_session pkg_token_meter --> pkg_session_projection - pkg_skill_office --> pkg_app_boot pkg_skill_office --> pkg_home_paths pkg_skill_office --> pkg_shell_env pkg_skill_office --> pkg_skill - pkg_skill_office --> pkg_tool_workspace_dependencies pkg_session_query --> pkg_brand pkg_session_query --> pkg_llm pkg_session_query --> pkg_session @@ -1715,7 +1713,7 @@ flowchart TD | [`tool-workflow`](../packages/workflow/tool-workflow) | `workflow` | [`agent`](../packages/core/agent), [`jobs`](../packages/jobs/jobs), [`llm`](../packages/llm/llm), [`session`](../packages/core/session), [`system-prompt`](../packages/core/system-prompt), [`tools`](../packages/core/tools), [`workflow`](../packages/workflow/workflow) | | [`plugin-package-inventory-deepseek`](../packages/llm/plugin-package-inventory-deepseek) | `llm` | [`agent`](../packages/core/agent), [`agent-preset-registry`](../packages/preset/agent-preset-registry), [`deepseek-llm-api-extensions`](../packages/llm/deepseek-llm-api-extensions), [`session`](../packages/core/session) | | [`token-meter`](../packages/llm/token-meter) | `llm` | [`compaction`](../packages/compaction/compaction), [`compaction-image-offload`](../packages/compaction/compaction-image-offload), [`llm`](../packages/llm/llm), [`llm-retry`](../packages/llm/llm-retry), [`session`](../packages/core/session), [`session-projection`](../packages/session/session-projection) | -| [`skill-office`](../packages/skill/skill-office) | `skill` | [`app-boot`](../packages/boot/app-boot), [`home-paths`](../packages/util/home-paths), [`shell-env`](../packages/shell/shell-env), [`skill`](../packages/skill/skill), [`tool-workspace-dependencies`](../packages/skill/tool-workspace-dependencies) | +| [`skill-office`](../packages/skill/skill-office) | `skill` | [`home-paths`](../packages/util/home-paths), [`shell-env`](../packages/shell/shell-env), [`skill`](../packages/skill/skill) | | [`session-query`](../packages/session-query/session-query) | `session-query` | [`brand`](../packages/util/brand), [`llm`](../packages/llm/llm), [`session`](../packages/core/session), [`session-persistence`](../packages/session/session-persistence), [`session-projection`](../packages/session/session-projection), [`session-projection-cache`](../packages/session/session-projection-cache), [`session-title`](../packages/session/session-title), [`tool-todo`](../packages/todo/tool-todo) | | [`api-settings-controller`](../packages/api/settings-controller) | `api` | [`agent-preset-registry`](../packages/preset/agent-preset-registry), [`credentials`](../packages/credentials/credentials), [`native-command`](../packages/util/native-command), [`session`](../packages/core/session), [`settings`](../packages/settings/settings), [`typert-protocol`](../packages/typert/protocol) | | [`web-app`](../packages/bundle/web-app) | `bundle` | [`shell-env`](../packages/shell/shell-env), [`system-prompt`](../packages/core/system-prompt) | diff --git a/docs/module-graph.zh.md b/docs/module-graph.zh.md index 0ddb5d784c..fc213ffbbd 100644 --- a/docs/module-graph.zh.md +++ b/docs/module-graph.zh.md @@ -1031,11 +1031,9 @@ flowchart TD pkg_token_meter --> pkg_llm_retry pkg_token_meter --> pkg_session pkg_token_meter --> pkg_session_projection - pkg_skill_office --> pkg_app_boot pkg_skill_office --> pkg_home_paths pkg_skill_office --> pkg_shell_env pkg_skill_office --> pkg_skill - pkg_skill_office --> pkg_tool_workspace_dependencies pkg_session_query --> pkg_brand pkg_session_query --> pkg_llm pkg_session_query --> pkg_session @@ -1717,7 +1715,7 @@ flowchart TD | [`tool-workflow`](../packages/workflow/tool-workflow) | `workflow` | [`agent`](../packages/core/agent), [`jobs`](../packages/jobs/jobs), [`llm`](../packages/llm/llm), [`session`](../packages/core/session), [`system-prompt`](../packages/core/system-prompt), [`tools`](../packages/core/tools), [`workflow`](../packages/workflow/workflow) | | [`plugin-package-inventory-deepseek`](../packages/llm/plugin-package-inventory-deepseek) | `llm` | [`agent`](../packages/core/agent), [`agent-preset-registry`](../packages/preset/agent-preset-registry), [`deepseek-llm-api-extensions`](../packages/llm/deepseek-llm-api-extensions), [`session`](../packages/core/session) | | [`token-meter`](../packages/llm/token-meter) | `llm` | [`compaction`](../packages/compaction/compaction), [`compaction-image-offload`](../packages/compaction/compaction-image-offload), [`llm`](../packages/llm/llm), [`llm-retry`](../packages/llm/llm-retry), [`session`](../packages/core/session), [`session-projection`](../packages/session/session-projection) | -| [`skill-office`](../packages/skill/skill-office) | `skill` | [`app-boot`](../packages/boot/app-boot), [`home-paths`](../packages/util/home-paths), [`shell-env`](../packages/shell/shell-env), [`skill`](../packages/skill/skill), [`tool-workspace-dependencies`](../packages/skill/tool-workspace-dependencies) | +| [`skill-office`](../packages/skill/skill-office) | `skill` | [`home-paths`](../packages/util/home-paths), [`shell-env`](../packages/shell/shell-env), [`skill`](../packages/skill/skill) | | [`session-query`](../packages/session-query/session-query) | `session-query` | [`brand`](../packages/util/brand), [`llm`](../packages/llm/llm), [`session`](../packages/core/session), [`session-persistence`](../packages/session/session-persistence), [`session-projection`](../packages/session/session-projection), [`session-projection-cache`](../packages/session/session-projection-cache), [`session-title`](../packages/session/session-title), [`tool-todo`](../packages/todo/tool-todo) | | [`api-settings-controller`](../packages/api/settings-controller) | `api` | [`agent-preset-registry`](../packages/preset/agent-preset-registry), [`credentials`](../packages/credentials/credentials), [`native-command`](../packages/util/native-command), [`session`](../packages/core/session), [`settings`](../packages/settings/settings), [`typert-protocol`](../packages/typert/protocol) | | [`web-app`](../packages/bundle/web-app) | `bundle` | [`shell-env`](../packages/shell/shell-env), [`system-prompt`](../packages/core/system-prompt) | diff --git a/packages/skill/skill-office/tests/commands.spec.ts b/packages/skill/skill-office/tests/commands.spec.ts index 53115b47c7..d5b32b2358 100644 --- a/packages/skill/skill-office/tests/commands.spec.ts +++ b/packages/skill/skill-office/tests/commands.spec.ts @@ -118,14 +118,15 @@ it('rejects relative asset roots before publishing commands', async () => { expect(await readdir(root)).toEqual([]) }) -it.skipIf(process.platform === 'win32')('runs Kit with the host Node when the selected authoring environment contains only Python', async () => { +it('runs Kit with the host Node when the selected authoring environment contains only Python', async () => { vi.stubEnv('DSH_PRIMARY_RUNTIME', join(root, 'python-only')) const ctx = await context() await ctx.plugin(Commands) - const result = await execa('dsoffice', ['capabilities'], { + const result = await execa(process.execPath, [fileURLToPath(import.meta.resolve('@deepseek-ai/libreoffice-kit/cli')), 'capabilities'], { cwd: root, env: { ...ctx.shellEnv.collect(execution), PATH: directory(ctx) }, extendEnv: false, }) expect(JSON.parse(result.stdout)).toHaveProperty('runtime.cliPath') + expect(await readFile(join(directory(ctx), 'dsoffice'), 'utf8')).toContain(process.execPath) expect(await readFile(join(directory(ctx), 'office-check'), 'utf8')).toContain(join(root, 'python-only/dependencies/python')) }) diff --git a/scripts/smoke-python-runtime.py b/scripts/smoke-python-runtime.py index c9f2648550..d3698f8ea4 100644 --- a/scripts/smoke-python-runtime.py +++ b/scripts/smoke-python-runtime.py @@ -1003,7 +1003,7 @@ def smoke_sdk_office(executable: Path) -> None: environment = {key: value for key, value in os.environ.items() if not key.startswith("DSH_") and not any(part in key.upper() for part in ("KEY", "SECRET", "TOKEN", "PASSWORD"))} environment.update(PATH="") - node = root / resources.name / "primary-runtime/dependencies/node/bin" / ("node.exe" if native.startswith("win32-") else "node") + node = office / "node/bin" / ("node.exe" if native.startswith("win32-") else "node") cli = adapter.parent / "lib/cli.js" checks["render_cli"]( [str(node), str(cli)], documents, root, expected_backend, environment, @@ -1058,7 +1058,7 @@ from pathlib import Path from xml.etree import ElementTree from deepseek_harness.office import convert, render_images, recalculate root = Path(sys.argv[1]) -assert convert(root / 'document.docx', root / 'python.pdf').backend == sys.argv[2] +assert convert(root / 'color-blocks.docx', root / 'python.pdf').backend == sys.argv[2] rendered = render_images(root / 'python.pdf', root / 'images', pages=[1]) assert rendered.images and rendered.images[0].path.read_bytes().startswith(b'\\x89PNG') recalculate(root / 'input.xlsx', root / 'calculated.xlsx')