@minidoll/agentkit-dsh-plugin 0.1.0 → 0.1.2

package/dist/index.js

@@ -170,45 +170,9 @@ function findProjectRoot(candidates, sessionCwd) {
 }
 
 // src/inject.ts
-import { randomUUID } from "node:crypto";
 import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync2 } from "node:fs";
 import { join as join4 } from "node:path";
 var MAX_CONTEXT_BYTES = 900;
-var factoryLoader = null;
-async function loadFactory() {
-  factoryLoader ??= (async () => {
-    try {
-      const pkg = "@deepseek-ai/dsh-llm";
-      const mod = await import(pkg);
-      return typeof mod.createUserMessage === "function" ? mod.createUserMessage : null;
-    } catch {
-      return null;
-    }
-  })();
-  return factoryLoader;
-}
-function handcraft(text) {
-  return {
-    role: "user",
-    id: randomUUID(),
-    content: [{ type: "text", text }],
-    source: { kind: "user" }
-  };
-}
-function assertUserMessage(value) {
-  if (typeof value !== "object" || value === null) return false;
-  const m = value;
-  if (m.role !== "user") return false;
-  if (typeof m.id !== "string" || m.id === "") return false;
-  const src = m.source;
-  if (src === void 0 || src.kind !== "user") return false;
-  const content = m.content;
-  if (!Array.isArray(content) || content.length === 0) return false;
-  return content.every((b) => {
-    const blk = b;
-    return blk.type === "text" && typeof blk.text === "string" && blk.text.length > 0;
-  });
-}
 var INJECT_CONFIG_REL = ".agent/inject.json";
 function injectEnabled(root) {
   if (process.env.AGENTKIT_CONTEXT_INJECT === "1") return true;
@@ -286,16 +250,16 @@ function buildInjectText(input) {
 \u2026\uFF08\u5DF2\u622A\u65AD\uFF09`;
   return text;
 }
-async function buildAdditionalContexts(input) {
+async function buildInjectBlock(input) {
   try {
     if (!injectEnabled(input.root)) {
       input.trace?.("inject skipped: disabled (no .agent/inject.json / env)");
-      return { ok: false, reason: "inject disabled (no .agent/inject.json / env)" };
+      return { ok: false, reason: "inject disabled" };
     }
     const key = `${input.sessionId ?? ""}|${input.filePath ?? ""}`;
     if (injected.has(key)) {
       input.trace?.("inject skipped: already injected for this session+file");
-      return { ok: false, reason: "already injected for this session+file" };
+      return { ok: false, reason: "already injected" };
     }
     const text = buildInjectText({
       root: input.root,
@@ -304,19 +268,16 @@ async function buildAdditionalContexts(input) {
     });
     if (text === null) {
       input.trace?.("inject skipped: nothing to inject for this path");
-      return { ok: false, reason: "nothing to inject for this path" };
+      return { ok: false, reason: "nothing to inject" };
     }
-    const factory = await loadFactory();
-    const msg = factory !== null ? factory({ content: [{ type: "text", text }], source: { kind: "user" } }) : handcraft(text);
-    if (!assertUserMessage(msg)) {
-      input.trace?.(`inject rejected: shape check failed (${factory !== null ? "factory" : "handcraft"})`);
-      return { ok: false, reason: "shape check failed" };
+    const block = { type: "text", text };
+    if (block.type !== "text" || typeof block.text !== "string" || block.text.length === 0) {
+      input.trace?.("inject rejected: bad text block");
+      return { ok: false, reason: "bad text block" };
     }
     injected.add(key);
-    input.trace?.(
-      `inject ok: ${String(text.length)}B via ${factory !== null ? "factory" : "handcraft"}`
-    );
-    return { ok: true, messages: [msg] };
+    input.trace?.(`inject ok: ${String(text.length)}B as tool-result content block`);
+    return { ok: true, block };
   } catch (err) {
     input.trace?.(`inject skipped: ${err.message}`);
     return { ok: false, reason: err.message };
@@ -507,13 +468,13 @@ function createProjectHooksPlugin(ctx) {
       });
       const filePath = inside[0];
       const sessionId = exec.agent?.session?.id ?? null;
-      const r = await buildAdditionalContexts({
+      const r = await buildInjectBlock({
         root,
         ...filePath !== void 0 ? { filePath } : {},
         ...sessionId !== null ? { sessionId } : {},
         trace: (line) => trace(process.env.DSH_HOME ?? join6(homedir(), ".dsh"), line)
       });
-      return r.ok && r.messages !== void 0 ? r.messages : null;
+      return r.ok ? r : null;
     } catch (err) {
       trace(
         process.env.DSH_HOME ?? join6(homedir(), ".dsh"),
@@ -522,12 +483,15 @@ function createProjectHooksPlugin(ctx) {
       return null;
     }
   };
-  const handle = async (event, exec) => {
+  const handle = async (event, exec, result) => {
     try {
       const decision = await runHooks(event, exec);
       if (event === "PostToolUse" && decision.kind === "allow") {
         const injected2 = await tryInjectContext(exec);
-        if (injected2 !== null) return { kind: "accept", additionalContexts: injected2 };
+        if (injected2 !== null && injected2.block !== void 0) {
+          const original = Array.isArray(result?.content) ? result.content.filter((b) => typeof b === "object" && b !== null) : [];
+          return { kind: "accept", content: [...original, injected2.block] };
+        }
       }
       return decision;
     } catch (err) {
@@ -653,7 +617,7 @@ function createProjectHooksPlugin(ctx) {
     return decision;
   };
   ctx.on("tools/pre-execute", (exec) => handle("PreToolUse", exec));
-  ctx.on("tools/post-execute", (exec) => handle("PostToolUse", exec));
+  ctx.on("tools/post-execute", (exec, result) => handle("PostToolUse", exec, result));
   return state;
 }
 function apply(ctx) {

package/dist/inject.d.ts

@@ -12,12 +12,24 @@ interface TextBlock {
  * 拿不到时**照抄契约**手工构造 —— 形状必须与 `dsh-llm` 的
  * `MessageBase`/`UserMessage`/`TextBlock` 完全一致。
  */
+/**
+ * 注入消息的自定义 producer kind（2026-10-30 真机问题的修复）。
+ *
+ * `dsh-llm` 的类型注释写得很清楚：
+ *   "user messages carry **any producer's kind**, and consumers fall through
+ *    unknown kinds. There is no shared catch-all `plugin` kind."
+ *
+ * 此前我用 `{kind:'user'}` —— 于是 UI 把它当成**真用户输入**，
+ * 渲染进了 Think/推理区，把正常结论挤到折叠区里。
+ * 改成自定义 kind 后，消费者按"未知来源"走默认路径，不会误当用户输入。
+ */
+export declare const SOURCE_KIND = "agentkit-context";
 export interface UserMessageLike {
     role: 'user';
     id: string;
     content: TextBlock[];
     source: {
-        kind: 'user';
+        kind: string;
     };
 }
 /**

package/dist/inject.js

@@ -30,6 +30,25 @@ import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 /** 注入内容的硬上限（字节）。超过就截断 —— 注入不是"越多越好"。 */
 export const MAX_CONTEXT_BYTES = 900;
+/**
+ * 构造一条合法的 UserMessage。
+ *
+ * `createUserMessage` 拿得到就用它（id 由官方生成，最保险）；
+ * 拿不到时**照抄契约**手工构造 —— 形状必须与 `dsh-llm` 的
+ * `MessageBase`/`UserMessage`/`TextBlock` 完全一致。
+ */
+/**
+ * 注入消息的自定义 producer kind（2026-10-30 真机问题的修复）。
+ *
+ * `dsh-llm` 的类型注释写得很清楚：
+ *   "user messages carry **any producer's kind**, and consumers fall through
+ *    unknown kinds. There is no shared catch-all `plugin` kind."
+ *
+ * 此前我用 `{kind:'user'}` —— 于是 UI 把它当成**真用户输入**，
+ * 渲染进了 Think/推理区，把正常结论挤到折叠区里。
+ * 改成自定义 kind 后，消费者按"未知来源"走默认路径，不会误当用户输入。
+ */
+export const SOURCE_KIND = 'agentkit-context';
 /** 尝试加载官方工厂（结果缓存；拿不到就是 null，不重试）。 */
 let factoryLoader = null;
 async function loadFactory() {
@@ -54,7 +73,7 @@ function handcraft(text) {
         role: 'user',
         id: randomUUID(),
         content: [{ type: 'text', text }],
-        source: { kind: 'user' },
+        source: { kind: SOURCE_KIND },
     };
 }
 /**
@@ -71,7 +90,7 @@ export function assertUserMessage(value) {
     if (typeof m.id !== 'string' || m.id === '')
         return false;
     const src = m.source;
-    if (src === undefined || src.kind !== 'user')
+    if (src === undefined || src.kind !== SOURCE_KIND)
         return false;
     const content = m.content;
     if (!Array.isArray(content) || content.length === 0)
@@ -229,7 +248,7 @@ export async function buildAdditionalContexts(input) {
         }
         const factory = await loadFactory();
         const msg = factory !== null
-            ? factory({ content: [{ type: 'text', text }], source: { kind: 'user' } })
+            ? factory({ content: [{ type: 'text', text }], source: { kind: SOURCE_KIND } })
             : handcraft(text);
         if (!assertUserMessage(msg)) {
             // 形状不合法 ⇒ **不注入**（而不是把坏形状交给宿主，那正是事故）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minidoll/agentkit-dsh-plugin",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "DeepSeek Harness 插件：项目自包含的 lifecycle hooks（配置随仓库走，per-session 发现）",
   "license": "MIT",
   "type": "module",