dsh-log-slicer 0.1.1 → 0.1.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 变更记录
 
+## 0.1.3
+
+0.1.2 装进 profile 之后，重启没有任何反应——两个工具都没出现。查下来两处：
+
+- **修**：注册的 definition 少了 `output`。宿主 `register()` 的硬要求是 `output = { schema, render }`，`render` 返回 ContentBlock[]；只有 `name/description/parameters/execute` 会被直接拒。
+- **修**：`@deepseek-ai/dsh-tools` 只是 peerDependency，装进 profile 后未必解析得到（实测 `ERR_MODULE_NOT_FOUND`）。原来解析不到就抛错，而 `apply` 又把异常吞掉了，于是整个插件静默失效。现在解析不到就自己构造一份同形状的 definition：少了参数校验，注册与调用照常。
+
+两条一起解释了"CLI 能跑、装成插件是哑的"。
+
+## 0.1.2
+
+- **修**：`package.json` 里补上 `dsh.bundle.patch`，指向 `./cordis.patch.yml`。少了这一行，装成插件时宿主既不会读那个 patch，也就不会把两个工具注册进会话——CLI 照样能用，装成插件却是哑的。这是装进 profile 时才发现的问题。
+
 ## 0.1.1
 
 三处都是第一次真用（拿 2026-10-31 上午那段去切）时暴露出来的。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-log-slicer",
-  "version": "0.1.1",
-  "description": "Slice one section out of a DeepSeek Harness session log: verbatim turns, images, catalog row, backups and a verification hash — one command, dry-run by default.",
+  "version": "0.1.3",
+  "description": "Slice one section out of a DeepSeek Harness session log: verbatim turns, images, catalog row, backups and a verification hash 鈥?one command, dry-run by default.",
   "keywords": [
     "dsh",
     "dsh-plugin",
@@ -47,6 +47,11 @@
       "optional": true
     }
   },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  },
   "scripts": {
     "test": "node --test"
   }

package/src/index.js

@@ -5,10 +5,17 @@
  *   log_probe  看日志里有什么（轮次、时间、可用的锚点），只读、便宜
  *   log_slice  切一节出来；默认 dry-run，写盘要 apply === true
  *
- * 契约（对着 @deepseek-ai/dsh-tools 的用法）：
+ * 契约（对着 @deepseek-ai/dsh-tools 的 README 与 register() 的实现核对过）：
  *   - export const inject = ['tools']
- *   - apply(ctx) 里 ctx.tools.register(defineTool({...spec, execute}))
- *   - apply 的异常一律吞掉：最坏是插件不工作，不能让应用起不来
+ *   - 注册的 definition 必须带 output = { schema, render }，缺了会被 register() 直接拒
+ *   - execute 返回的是"规范值"（JSON），render(args, value) 把它渲染成 ContentBlock[]
+ *
+ * 这里有一个实际的坑：装进 profile 之后，`@deepseek-ai/dsh-tools` 未必能从插件目录
+ * 解析到（它只是 peerDependency，宿主也没有把它放进 profile 的 node_modules）。
+ * 所以这里两手准备：能拿到 defineTool 就用它（带参数校验），拿不到就自己构造一份
+ * 同样形状的 definition —— 少了参数校验，但注册与调用都正常。
+ *
+ * apply 的异常一律吞掉：最坏是插件不工作，不能让应用起不来。
  */
 
 import fs from 'node:fs';
@@ -19,22 +26,6 @@ import { indexRow, insertIndexRow, backupFile, appendSection, sha256Hex16, today
 export const name = 'dsh-log-slicer';
 export const inject = ['tools'];
 
-async function loadDefineTool() {
-  try {
-    const mod = await import('@deepseek-ai/dsh-tools');
-    if (mod?.defineTool) return mod.defineTool;
-  } catch {
-    /* 落到环境变量 */
-  }
-  const override = process.env.DSH_TOOLS_PATH;
-  if (override) {
-    const { pathToFileURL } = await import('node:url');
-    const mod = await import(pathToFileURL(override).href);
-    if (mod?.defineTool) return mod.defineTool;
-  }
-  throw new Error('cannot resolve @deepseek-ai/dsh-tools (set DSH_TOOLS_PATH for local dev)');
-}
-
 export const probeSpec = {
   name: 'log_probe',
   description: [
@@ -88,76 +79,157 @@ export const sliceSpec = {
   },
 };
 
-async function registerAll(ctx) {
-  const defineTool = await loadDefineTool();
+/** 把本文件的简写参数表转成 JSON Schema（defineTool 那条路会自己转，这条路自己转）。 */
+export function toJsonSchema(parameters = {}) {
+  const properties = {};
+  const required = [];
+  for (const [key, raw] of Object.entries(parameters)) {
+    const { required: isRequired, ...rest } = raw;
+    properties[key] = { ...rest };
+    if (isRequired) required.push(key);
+  }
+  const schema = { type: 'object', properties, additionalProperties: false };
+  if (required.length) schema.required = required;
+  return schema;
+}
+
+/** 拿 defineTool；拿不到返回 null（装进 profile 时很可能拿不到）。 */
+async function loadDefineTool() {
+  try {
+    const mod = await import('@deepseek-ai/dsh-tools');
+    if (typeof mod?.defineTool === 'function') return mod.defineTool;
+  } catch {
+    /* 落到下面的自造 */
+  }
+  const override = process.env.DSH_TOOLS_PATH;
+  if (override) {
+    try {
+      const { pathToFileURL } = await import('node:url');
+      const mod = await import(pathToFileURL(override).href);
+      if (typeof mod?.defineTool === 'function') return mod.defineTool;
+    } catch {
+      /* 一样落到自造 */
+    }
+  }
+  return null;
+}
 
-  const probe = defineTool({
-    ...probeSpec,
+/** 与 defineTool 产出同形状的 definition：register() 只要求 output.schema + output.render。 */
+export function plainTool({ name: toolName, description, parameters, execute }) {
+  return {
+    name: toolName,
+    description,
+    parameters: toJsonSchema(parameters),
+    output: {
+      schema: { type: 'string' },
+      render: (_args, value) => [{ type: 'text', text: String(value ?? '') }],
+    },
     async execute(args = {}) {
-      const limit = Math.max(1, Math.min(500, Number(args.limit) || 40));
-      const width = Math.max(10, Math.min(400, Number(args.width) || 60));
-      const built = buildSection({ kind: 'chat', title: 'probe', logPath: args.logPath });
-      const turns = built.segment.length ? built.segment : [];
-      const lines = turns.slice(-limit).map((t, i) => {
-        const who = t.who === 'user' ? 'you' : 'me';
-        const when = t.ts ? new Date(Number(t.ts) || t.ts).toLocaleString() : '';
-        const body = String(t.text || '').replace(/\s+/g, ' ').slice(0, width);
-        return `${turns.length - Math.min(limit, turns.length) + i + 1}. [${who}] ${when} ${body}`;
-      });
-      return {
-        text:
-          `# ${built.log}\n` +
-          `# ${built.frames} frames (${built.failedFrames} failed) / ${built.totalTurns} turns\n\n` +
-          lines.join('\n'),
-      };
+      return execute(args);
     },
-  });
+  };
+}
 
-  const slice = defineTool({
-    ...sliceSpec,
-    async execute(args = {}) {
-      const built = buildSection({
-        kind: args.kind === 'work' ? 'work' : 'chat',
-        title: args.title,
-        from: args.from,
-        to: args.to,
-        logPath: args.logPath,
-      });
-      const head =
-        `# ${built.log}\n` +
-        `# ${built.frames} frames (${built.failedFrames} failed) / ${built.totalTurns} turns\n` +
-        `# sliced ${built.segment.length} turns (you ${built.counts.you} / me ${built.counts.me})\n`;
-      if (args.apply !== true) {
-        return { text: `${head}\n===== markdown (dry-run) =====\n\n${built.markdown}` };
-      }
-      if (!args.file) throw new Error('apply=true requires "file"');
+function define(defineTool, spec, execute) {
+  if (defineTool) {
+    return defineTool({
+      name: spec.name,
+      description: spec.description,
+      parameters: spec.parameters,
+      output: {
+        schema: { type: 'string' },
+        render: (_args, value) => [{ type: 'text', text: String(value ?? '') }],
+      },
+      async execute(args) {
+        return execute(args);
+      },
+    });
+  }
+  return plainTool({ ...spec, execute });
+}
 
-      const target = path.resolve(args.file);
-      const tag = args.tag || '自动整理之前';
-      const backup = fs.existsSync(target) ? backupFile(target, tag) : null;
-      const { after } = appendSection(target, built.markdown);
-      const row = indexRow(args.volume || path.basename(target, '.md'), args.title, built.counts.you);
-      let indexBackup = null;
-      let indexPath = null;
-      if (args.index && fs.existsSync(args.index)) {
-        indexPath = path.resolve(args.index);
-        indexBackup = backupFile(indexPath, tag);
-        const updated = insertIndexRow(fs.readFileSync(indexPath, 'utf8'), row, args.volume || path.basename(target, '.md'));
-        fs.writeFileSync(indexPath, updated, 'utf8');
-      }
-      const line = `| ${today()} | ${path.basename(target)}（+${built.counts.you} 轮） | ${after} | \`${sha256Hex16(target)}\` | 本体＝原件，两处一致 |`;
-      return {
-        text:
-          `${head}\nwritten: ${target}\n` +
-          (backup ? `backup: ${backup}\n` : '') +
-          (indexBackup ? `backup: ${indexBackup}\n` : '') +
-          (indexPath ? `index: ${indexPath}\n` : '') +
-          `bytes: ${after}\nrow: ${row}\nverification: ${line}`,
-      };
-    },
+async function probe({ logPath, limit, width } = {}) {
+  const n = Math.max(1, Math.min(500, Number(limit) || 40));
+  const w = Math.max(10, Math.min(400, Number(width) || 60));
+  const built = buildSection({ kind: 'chat', title: 'probe', logPath });
+  const turns = built.segment.length ? built.segment : [];
+  const start = turns.length - Math.min(n, turns.length);
+  const lines = turns.slice(-n).map((t, i) => {
+    const who = t.who === 'user' ? 'you' : 'me';
+    const when = t.ts ? new Date(Number(t.ts) || t.ts).toLocaleString() : '';
+    const body = String(t.text || '').replace(/\s+/g, ' ').slice(0, w);
+    return `${start + i + 1}. [${who}] ${when} ${body}`;
+  });
+  return [
+    `# ${built.log}`,
+    `# ${built.frames} frames (${built.failedFrames} failed) / ${built.totalTurns} turns`,
+    '',
+    lines.join('\n'),
+  ].join('\n');
+}
+
+async function slice(args = {}) {
+  const built = buildSection({
+    kind: args.kind === 'work' ? 'work' : 'chat',
+    title: args.title,
+    from: args.from,
+    to: args.to,
+    logPath: args.logPath,
   });
+  const head = [
+    `# ${built.log}`,
+    `# ${built.frames} frames (${built.failedFrames} failed) / ${built.totalTurns} turns`,
+    `# sliced ${built.segment.length} turns (you ${built.counts.you} / me ${built.counts.me})`,
+  ].join('\n');
+
+  const pointerNote = built.pointerLines?.length
+    ? `\n# note: ${built.pointerLines.length} turn(s) look like pointers to a file, not the words themselves —` +
+      '\n# copy the real paragraphs from that file; if they are grading-3, do not quote them at all.' +
+      '\n#   ' + built.pointerLines.map((l) => l.text).join('\n#   ')
+    : '';
+
+  if (args.apply !== true) {
+    return `${head}${pointerNote}\n\n===== markdown (dry-run) =====\n\n${built.markdown}`;
+  }
+  if (!args.file) throw new Error('apply=true requires "file"');
+
+  const target = path.resolve(args.file);
+  const tag = args.tag || '自动整理之前';
+  const backup = fs.existsSync(target) ? backupFile(target, tag) : null;
+  const { after } = appendSection(target, built.markdown);
+  const volume = args.volume || path.basename(target, '.md');
+  const row = indexRow(volume, args.title, built.counts.you);
+  let indexBackup = null;
+  let indexPath = null;
+  if (args.index && fs.existsSync(args.index)) {
+    indexPath = path.resolve(args.index);
+    indexBackup = backupFile(indexPath, tag);
+    const updated = insertIndexRow(fs.readFileSync(indexPath, 'utf8'), row, volume);
+    fs.writeFileSync(indexPath, updated, 'utf8');
+  }
+  const line = `| ${today()} | ${path.basename(target)}（+${built.counts.you} 轮） | ${after} | \`${sha256Hex16(target)}\` | 本体＝原件，两处一致 |`;
+  return [
+    head,
+    pointerNote,
+    '',
+    `written: ${target}`,
+    backup ? `backup: ${backup}` : '',
+    indexBackup ? `backup: ${indexBackup}` : '',
+    indexPath ? `index: ${indexPath}` : '',
+    `bytes: ${after}`,
+    `row: ${row}`,
+    `verification: ${line}`,
+  ]
+    .filter(Boolean)
+    .join('\n');
+}
 
-  const disposers = [ctx.tools.register(probe), ctx.tools.register(slice)];
+async function registerAll(ctx) {
+  const defineTool = await loadDefineTool();
+  const disposers = [
+    ctx.tools.register(define(defineTool, probeSpec, probe)),
+    ctx.tools.register(define(defineTool, sliceSpec, slice)),
+  ];
   return () => {
     for (const d of disposers.reverse()) d?.();
   };