@dsh-workbench/module-tools 1.2.4 → 1.2.6

package/README.md

@@ -351,3 +351,7 @@ dry-run、真发后的元数据与发布失败回滚。
 | 判据红了怎么读 | [REVIEW.md](../core/skills/workbench-module-diy/REVIEW.md) |
 | 最小可安装样本 | [module-hello](../module-hello/README.md) |
 | 契约类型与共享组件 | [shared](../shared/README.md) |
+
+模块的 `apply(ctx)` / `mount(deps)` 只拿工作台自己的类型（`HostContext` / `ClientContext` /
+`ToolDefinition` / `ToolRegistry` / `ToolRunContext`，都在 `@dsh-workbench/core/contract`）；
+要用 dsh 的官方类型，把对应包放进**模块自己的** `devDependencies`，不要放进 `dependencies`。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/module-tools",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "模块包的构建与门禁工具：build（单文件 ESM 宿主侧 + 套 loader 壳的浏览器侧）、check（契约/产物边界/源码边界/卡片渲染）。模块包不再各带一份构建脚本。",
   "license": "MIT",
   "type": "module",
@@ -33,7 +33,7 @@
     "semver": "^7.8.5",
     "typescript": "5.9.3",
     "typescript-eslint": "^8.71.0",
-    "@dsh-workbench/shared": "1.2.4"
+    "@dsh-workbench/shared": "1.2.6"
   },
   "repository": {
     "type": "git",

package/template-diy/src/__tests__/plugin.test.ts.tpl

@@ -2,7 +2,7 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { afterAll, describe, expect, it, vi } from 'vitest';
-import type { DshToolDefinition, DshToolRunContext } from '@dsh-workbench/core/contract';
+import type { ToolDefinition, ToolRunContext } from '@dsh-workbench/core/contract';
 import { createFlowHost, createLongTaskHost, type LongTaskBase } from '@dsh-workbench/shared/host';
 
 vi.mock('@dsh-workbench/core/client', () => ({
@@ -90,7 +90,7 @@ interface OverviewAnswer {
 
 interface Harness {
   readonly mounted: Mounted;
-  readonly tools: DshToolDefinition[];
+  readonly tools: ToolDefinition[];
 }
 
 const scratch = mkdtempSync(join(tmpdir(), 'dsh-wb-diy-'));
@@ -104,7 +104,7 @@ afterAll(() => {
 });
 
 function harness(): Harness {
-  const tools: DshToolDefinition[] = [];
+  const tools: ToolDefinition[] = [];
   const longTasks = createLongTaskHost({ scope: 'plugin-test', unit: '__UNIT__', bump: () => {} });
   const files = new Map<string, Map<string, unknown>>();
   const storeFor = (workspace: string | null) => {
@@ -126,7 +126,7 @@ function harness(): Harness {
     get: (target: string) =>
       target === 'tools'
         ? {
-            register(tool: DshToolDefinition) {
+            register(tool: ToolDefinition) {
               tools.push(tool);
               return () => {};
             },
@@ -150,7 +150,7 @@ function harness(): Harness {
   return { mounted: hostFace().mount(deps), tools };
 }
 
-function toolOf(h: Harness, name: string): DshToolDefinition | undefined {
+function toolOf(h: Harness, name: string): ToolDefinition | undefined {
   return h.tools.find((tool) => tool.name === name);
 }
 
@@ -208,7 +208,7 @@ async function settled(h: Harness, id: string): Promise<LongTaskBase | null> {
 
 const execContext = {
   agent: { session: { id: 'session-1', header: { cwd: join(scratch, 'sample') } } },
-} as unknown as DshToolRunContext;
+} as unknown as ToolRunContext;
 
 describe('__NAME__ 的面', () => {
   it('插件名就是包名', () => {
@@ -294,7 +294,7 @@ describe('宿主侧的长任务与工具', () => {
     const tool = toolOf(h, DECLARED_TOOLS.run.name);
     const started = (await tool?.execute({}, execContext)) as { ok: boolean; runId: string };
     await settled(h, started.runId);
-    const again = (await tool?.execute({ runId: started.runId }, {} as DshToolRunContext)) as { ok: boolean; runId: string };
+    const again = (await tool?.execute({ runId: started.runId }, {} as ToolRunContext)) as { ok: boolean; runId: string };
     expect(again.runId).toBe(started.runId);
   });
 
@@ -309,7 +309,7 @@ describe('宿主侧的长任务与工具', () => {
   it('没有工作区时工具说清楚，不抛', async () => {
     const h = harness();
     h.mounted.registerTools();
-    const answer = (await toolOf(h, DECLARED_TOOLS.run.name)?.execute({}, {} as DshToolRunContext)) as { ok: boolean; text: string };
+    const answer = (await toolOf(h, DECLARED_TOOLS.run.name)?.execute({}, {} as ToolRunContext)) as { ok: boolean; text: string };
     expect(answer.ok).toBe(false);
     expect(answer.text).toContain('工作区');
   });

package/template-diy/src/host/notes.ts.tpl

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto';
-import type { DshToolDefinition, UnitMountDeps } from '@dsh-workbench/core/contract';
+import type { ToolDefinition, UnitMountDeps } from '@dsh-workbench/core/contract';
 import { TEXT_OUTPUT, recordOf, sessionWorkspace, textOf } from '@dsh-workbench/shared/host';
 import { DECLARED_TOOLS } from '../declared-tools';
 import {
@@ -24,7 +24,7 @@ export interface NotesResult {
 export interface Notes {
   list(workspace: string): Note[];
   add(workspace: string, rawText: unknown): NotesResult;
-  readonly tool: DshToolDefinition;
+  readonly tool: ToolDefinition;
   handle(payload: unknown): unknown;
 }
 
@@ -48,7 +48,7 @@ export function createNotes(deps: UnitMountDeps): Notes {
     return { ok: true, note, notes };
   };
 
-  const tool: DshToolDefinition = {
+  const tool: ToolDefinition = {
     name: DECLARED_TOOLS.addNote.name,
     description: '往当前工作区的模块笔记里加一条（最多 20 条，只写本模块自己的文件夹，不动平台）。',
     parameters: {

package/template-diy/src/host/sample.ts.tpl

@@ -1,4 +1,4 @@
-import type { DshToolDefinition, UnitMountDeps } from '@dsh-workbench/core/contract';
+import type { ToolDefinition, UnitMountDeps } from '@dsh-workbench/core/contract';
 import {
   TEXT_OUTPUT,
   createFlowTask,
@@ -25,7 +25,7 @@ export interface StartResult {
 
 export interface Sample {
   readonly runs: LongTaskRegistry<LongTaskBase> | undefined;
-  readonly runTool: DshToolDefinition;
+  readonly runTool: ToolDefinition;
   startFromPayload(payload: unknown): StartResult;
 }
 
@@ -78,7 +78,7 @@ export function createSample(deps: UnitMountDeps): Sample {
     return { ok: true, runId: run.id, status: run.status, text: headlineOf(run) };
   };
 
-  const runTool: DshToolDefinition = flowTask?.tool ?? {
+  const runTool: ToolDefinition = flowTask?.tool ?? {
     name: DECLARED_TOOLS.run.name,
     description: runDescription,
     parameters: { type: 'object', properties: {}, additionalProperties: true },

package/template-diy/src/host.ts.tpl

@@ -1,4 +1,4 @@
-import type { DshToolRegistry, UnitModuleFace } from '@dsh-workbench/core/contract';
+import type { ToolRegistry, UnitModuleFace } from '@dsh-workbench/core/contract';
 import {
   defineUnitHostPlugin,
   factOfRoute,
@@ -60,7 +60,7 @@ const face: UnitModuleFace = {
         },
       },
       registerTools: () => {
-        const tools = (deps.ctx.get as (name: string) => DshToolRegistry | undefined)('tools');
+        const tools = deps.ctx.get<ToolRegistry>('tools');
         if (tools === undefined) {
           deps.logger?.warn?.(`[${UNIT_ID}] 外壳没有提供 tools 服务：这两把工具注册不进去`);
           return [];