@lmzhen/dsh-tool-skill-manage 0.3.78 → 0.3.80

package/lib/index.js

@@ -1,7 +1,7 @@
 import { effectiveSessionPolicy } from "@lmzhen/dsh-evolution-approval";
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
-import { DEFAULT_SKILL_LIMITS, DSH_AUTHORING_STANDARDS, SKILLS_GUIDANCE, SKILLS_GUIDANCE_SECTION_ORDER, SKILL_ACTION_REQUIRED_FIELDS, authoringFeedback, callingScope, clampedNumber, computeDedupGroups, contentHash, evolutionIoAdapter, isPresent, isReviewChannelSession, isUnknown, newSkillLibrary, parseFrontmatter, probePresent, probeUnknown, resolveOrigins } from "@lmzhen/dsh-evolution-core";
+import { DEFAULT_SKILL_LIMITS, DSH_AUTHORING_STANDARDS, SKILLS_GUIDANCE, SKILLS_GUIDANCE_SECTION_ORDER, SKILL_ACTION_REQUIRED_FIELDS, authoringFeedback, callingScope, clampedNumber, computeDedupGroups, contentHash, evolutionIoAdapter, isPresent, isUnknown, newSkillLibrary, parseFrontmatter, probePresent, probeUnknown, resolveExecOrigins } from "@lmzhen/dsh-evolution-core";
 //#region lib/types/index.js
 /**
 * Model-facing skill_manage tool over ctx.evolutionIo + ctx.skillUsage.
@@ -72,6 +72,26 @@ function apply(ctx, rawConfig = {}) {
 	});
 	if (numericClamped.length > 0) ctx.logger.warn(`tool-skill-manage: ${numericClamped.join(", ")} provided an invalid value; falling back to the default`);
 	let crossSourceViewWarned = false;
+	const crossSourceRefusal = async (rawName, phase = "stage") => {
+		const replay = phase === "replay";
+		if (typeof rawName !== "string" || rawName === "") return null;
+		const probe = await catalogWinner(rawName);
+		if (isUnknown(probe)) {
+			if (rawConfig.strictCrossSource === true) return replay ? `Refused: the cross-source check could not be performed — ${probe.reason}. Reject this staged write, fix the catalog view, and re-stage "${rawName}".` : `Refused: the cross-source check could not be performed — ${probe.reason}. Fix the catalog view (or drop strictCrossSource) before writing "${rawName}".`;
+			if (!crossSourceViewWarned) {
+				crossSourceViewWarned = true;
+				ctx.logger.warn(`skill_manage: cross-source check skipped for this session — ${probe.reason}`);
+			}
+			return null;
+		}
+		if (isPresent(probe) && probe.value !== void 0 && probe.value.provider !== "dsh-evolution") {
+			const winner = probe.value;
+			const message = `skill "${rawName}" resolves to a higher-priority "${winner.source}" skill (provider "${winner.provider}"); this write lands on the family copy, which the catalog does NOT serve — edit the "${winner.source}" copy or rename.`;
+			if (rawConfig.strictCrossSource === true) return `Refused: ${message}`;
+			ctx.logger.warn(`skill_manage: ${message}`);
+		}
+		return null;
+	};
 	const catalogWinner = async (name) => {
 		const catalog = ctx.get("skills");
 		if (catalog === void 0) return probeUnknown("the skills service is not mounted");
@@ -305,32 +325,17 @@ function apply(ctx, rawConfig = {}) {
 		isConcurrencySafe: () => false,
 		async execute(args, exec) {
 			let operation = args;
-			const origins = resolveOrigins(exec.agent?.session?.header.origin, isReviewChannelSession(exec.agent?.session?.id));
+			const origins = resolveExecOrigins(exec);
 			const reviewOrigin = origins.approval;
 			const libraryOrigin = origins.library;
 			const sessionPolicy = effectiveSessionPolicy(ctx, exec.agent?.session);
 			if (typeof args.name === "string" && args.name !== "" && args.action !== "list" && args.action !== "review" && args.action !== "pin" && args.action !== "unpin") {
-				const probe = await catalogWinner(args.name);
-				if (isUnknown(probe)) {
-					if (rawConfig.strictCrossSource === true) return {
-						ok: false,
-						message: `Refused: the cross-source check could not be performed — ${probe.reason}. Fix the catalog view (or drop strictCrossSource) before writing "${args.name}".`,
-						skills: []
-					};
-					if (!crossSourceViewWarned) {
-						crossSourceViewWarned = true;
-						ctx.logger.warn(`skill_manage: cross-source check skipped for this session — ${probe.reason}`);
-					}
-				} else if (isPresent(probe) && probe.value !== void 0 && probe.value.provider !== "dsh-evolution") {
-					const winner = probe.value;
-					const message = `skill "${args.name}" resolves to a higher-priority "${winner.source}" skill (provider "${winner.provider}"); this write lands on the family copy, which the catalog does NOT serve — edit the "${winner.source}" copy or rename.`;
-					if (rawConfig.strictCrossSource === true) return {
-						ok: false,
-						message: `Refused: ${message}`,
-						skills: []
-					};
-					ctx.logger.warn(`skill_manage: ${message}`);
-				}
+				const refusal = await crossSourceRefusal(args.name);
+				if (refusal !== null) return {
+					ok: false,
+					message: refusal,
+					skills: []
+				};
 			}
 			const approval = ctx.get("evolutionApproval");
 			if (approval && args.action !== "list" && args.action !== "review" && args.action !== "pin" && args.action !== "unpin") {
@@ -374,7 +379,17 @@ function apply(ctx, rawConfig = {}) {
 	ctx.inject(["evolutionApproval"], (approvalCtx) => {
 		const dispose = approvalCtx.evolutionApproval.registerRunner("skill", (args) => {
 			const wrapped = args ?? {};
-			return executeCore(wrapped.operation ?? {}, wrapped.libraryOrigin ?? wrapped.origin ?? "background_review");
+			const operation = wrapped.operation ?? {};
+			const replayAction = operation.action;
+			if (replayAction !== "list" && replayAction !== "review" && replayAction !== "pin" && replayAction !== "unpin") return crossSourceRefusal(operation.name, "replay").then((refusal) => {
+				if (refusal !== null) return {
+					ok: false,
+					message: `${refusal} (re-checked at approve time: the catalog ranking changed while the write was staged)`,
+					skills: []
+				};
+				return executeCore(operation, wrapped.libraryOrigin ?? wrapped.origin ?? "background_review");
+			});
+			return executeCore(operation, wrapped.libraryOrigin ?? wrapped.origin ?? "background_review");
 		});
 		approvalCtx.effect(() => dispose, "tool-skill-manage.approval-runner");
 	});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-tool-skill-manage",
   "description": "Model-facing skill_manage tool (community build)",
-  "version": "0.3.78",
+  "version": "0.3.80",
   "publishConfig": {
     "access": "public"
   },
@@ -27,24 +27,24 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.78",
-    "@lmzhen/dsh-evolution-core": "^0.3.78"
+    "@lmzhen/dsh-evolution-approval": "^0.3.80",
+    "@lmzhen/dsh-evolution-core": "^0.3.80"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-skill": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-system-prompt": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
-    "@lmzhen/dsh-evolution-io": "^0.3.78",
-    "@lmzhen/dsh-skill-usage": "^0.3.78"
+    "@lmzhen/dsh-evolution-io": "^0.3.80",
+    "@lmzhen/dsh-skill-usage": "^0.3.80"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-agent-loop-testkit": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-skill": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-system-prompt": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
-    "@lmzhen/dsh-evolution-core": "^0.3.78",
-    "@lmzhen/dsh-evolution-io": "^0.3.78",
-    "@lmzhen/dsh-skill-usage": "^0.3.78"
+    "@lmzhen/dsh-evolution-core": "^0.3.80",
+    "@lmzhen/dsh-evolution-io": "^0.3.80",
+    "@lmzhen/dsh-skill-usage": "^0.3.80"
   }
 }