@minidoll/agentkit-dsh-plugin 0.1.1 → 0.1.3

package/dist/index.js

@@ -170,46 +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 SOURCE_KIND = "agentkit-context";
-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: SOURCE_KIND }
-  };
-}
-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 !== SOURCE_KIND) 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;
@@ -225,19 +188,35 @@ function injectEnabled(root) {
 }
 var injected = /* @__PURE__ */ new Set();
 var PATH_RULES = [
-  { pattern: /^contracts\//, hint: "\u5951\u7EA6\u53D8\u66F4\uFF1A\u5B9E\u73B0\u5FC5\u987B\u540C\u6B65\uFF08AGENTS \u94C1\u5F8B\uFF09\uFF0C\u5E76\u5728\u4EA4\u63A5\u5355\u58F0\u660E\u5951\u7EA6\u5F71\u54CD\u4E0E\u8BC1\u636E\u7EA7\u522B L1-L4" },
-  { pattern: /^docs\/rules\//, hint: "\u89C4\u5219\u6587\u6863\uFF1A\u6539\u5B83\u7B49\u4E8E\u6539\u6240\u6709\u4EBA\u7684\u884C\u4E3A\u7EA6\u675F \u2014\u2014 \u5148\u786E\u8BA4\u4E0E protocol.yml / AGENTS.md \u4E0D\u51B2\u7A81" },
-  { pattern: /^docs\/design\//, hint: '\u8BBE\u8BA1\u6587\u6863\uFF1A\u9700\u4E0E codemap \u91CC\u7684\u6A21\u5757\u5BF9\u5E94\uFF08M4 \u4F1A\u6821\u9A8C"\u6587\u6863\u63D0\u5230\u8BE5\u6A21\u5757"\uFF09' },
-  { pattern: /^\.agent\/decisions\/\d{4}-/, hint: "ADR\uFF1Aaccepted \u7684\u6709\u7EA6\u675F\u529B \u2014\u2014 \u8981\u63A8\u7FFB\u5148\u5199\u65B0 ADR \u6807 superseded\uFF0C\u4E0D\u8981\u76F4\u63A5\u6539\u65E7\u7ED3\u8BBA" },
-  { pattern: /^AGENTS\.md$/, hint: "AGENTS.md \u662F\u6D3E\u751F\u6587\u4EF6\uFF08\u7531 protocol.yml \u751F\u6210\uFF09\u2014\u2014 \u6539\u5B83\u8BF7\u6539 protocol.yml \u518D akit sync" }
+  {
+    pattern: /^contracts\//,
+    hint: "\u5951\u7EA6\u53D8\u66F4\uFF1A\u5B9E\u73B0\u5FC5\u987B\u540C\u6B65\uFF08AGENTS \u94C1\u5F8B\uFF09\uFF0C\u5E76\u5728\u4EA4\u63A5\u5355\u58F0\u660E\u5951\u7EA6\u5F71\u54CD\u4E0E\u8BC1\u636E\u7EA7\u522B L1-L4"
+  },
+  {
+    pattern: /^docs\/rules\//,
+    hint: "\u89C4\u5219\u6587\u6863\uFF1A\u6539\u5B83\u7B49\u4E8E\u6539\u6240\u6709\u4EBA\u7684\u884C\u4E3A\u7EA6\u675F \u2014\u2014 \u5148\u786E\u8BA4\u4E0E protocol.yml / AGENTS.md \u4E0D\u51B2\u7A81"
+  },
+  {
+    pattern: /^docs\/design\//,
+    hint: '\u8BBE\u8BA1\u6587\u6863\uFF1A\u9700\u4E0E codemap \u91CC\u7684\u6A21\u5757\u5BF9\u5E94\uFF08M4 \u4F1A\u6821\u9A8C"\u6587\u6863\u63D0\u5230\u8BE5\u6A21\u5757"\uFF09'
+  },
+  {
+    pattern: /^\.agent\/decisions\/\d{4}-/,
+    hint: "ADR\uFF1Aaccepted \u7684\u6709\u7EA6\u675F\u529B \u2014\u2014 \u8981\u63A8\u7FFB\u5148\u5199\u65B0 ADR \u6807 superseded\uFF0C\u4E0D\u8981\u76F4\u63A5\u6539\u65E7\u7ED3\u8BBA"
+  },
+  {
+    pattern: /^AGENTS\.md$/,
+    hint: "AGENTS.md \u662F\u6D3E\u751F\u6587\u4EF6\uFF08\u7531 protocol.yml \u751F\u6210\uFF09\u2014\u2014 \u6539\u5B83\u8BF7\u6539 protocol.yml \u518D akit sync"
+  }
 ];
 function buildInjectText(input) {
   const lines = [];
   const rels = [];
   if (input.filePath !== void 0 && input.filePath !== "") rels.push(input.filePath);
   for (const p of input.extraPaths ?? []) if (p !== "") rels.push(p);
+  const norm = (p) => String(p).replace(/\\/g, "/").replace(/^\.\//, "");
   for (const raw of rels) {
-    const rel = String(raw).replace(/\\/g, "/").replace(/^\.\//, "");
+    const rel = norm(raw);
     for (const rule of PATH_RULES) {
       if (rule.pattern.test(rel)) {
         lines.push(`- \u7EAA\u5F8B\uFF1A${rule.hint}`);
@@ -247,12 +226,12 @@ function buildInjectText(input) {
     if (lines.length > 0) break;
   }
   for (const raw of rels) {
-    const rel = String(raw).replace(/\\/g, "/").replace(/^\.\//, "");
+    const rel = norm(raw);
     try {
       const cm = join4(input.root, ".agent", "codemap.json");
       if (!existsSync4(cm)) break;
       const map = JSON.parse(readFileSync3(cm, "utf8"));
-      const mod = (map.modules ?? []).find((m) => String(m.path ?? "").replace(/^\.\//, "") === rel);
+      const mod = (map.modules ?? []).find((m) => norm(m.path ?? "") === rel);
       if (mod !== void 0) {
         if (mod.purpose !== void 0 && mod.purpose !== "") lines.push(`- \u6A21\u5757\u804C\u8D23\uFF08codemap\uFF09\uFF1A${mod.purpose}`);
         if (mod.doc !== void 0 && mod.doc !== "") lines.push(`- \u8BBE\u8BA1\u6587\u6863\uFF1A${mod.doc}`);
@@ -287,16 +266,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,
@@ -305,19 +284,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: SOURCE_KIND } }) : 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 };
@@ -508,13 +484,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"),
@@ -523,12 +499,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) {
@@ -654,7 +633,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/package.json

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