dsh-mnemon-source-skills 0.5.8 → 0.5.9

package/lib/client.js

@@ -317,7 +317,9 @@ window.__ModuleLoader__.load({
 			"evolution.noAgent": "当前没有可用的任务 Agent",
 			"evolution.drafting": "正在生成草案",
 			"evolution.draftFailed": "草案生成失败：{error}",
-			"evolution.skillGone": "这个技能已不存在。",
+			"evolution.skillGone": "原技能文件已删除、移动或无法读取。请恢复文件，或在新位置打开技能并重新生成草案。",
+			"evolution.originUnavailable": "旧记录未可靠保存原工作区。请切换到原工作区，在技能页打开该技能并重新生成草案；现有草案和证据会保留。",
+			"evolution.currentSkill": "当前技能文件",
 			"evolution.skillChanged": "技能在建议之后被改过，生成草案前会以当前版本为准。",
 			"evolution.adopted": "已采纳",
 			"evolution.openSkill": "查看技能",
@@ -671,7 +673,9 @@ window.__ModuleLoader__.load({
 			"evolution.noAgent": "No task Agent is available",
 			"evolution.drafting": "Drafting",
 			"evolution.draftFailed": "Drafting failed: {error}",
-			"evolution.skillGone": "This skill no longer exists.",
+			"evolution.skillGone": "The original skill file was deleted, moved, or cannot be read. Restore it or open the skill at its new location and generate a new draft.",
+			"evolution.originUnavailable": "The original workspace was not recorded reliably. Select its original workspace, open the skill on the Skills page and generate a new draft; the existing draft and evidence are kept.",
+			"evolution.currentSkill": "Current skill file",
 			"evolution.skillChanged": "The skill changed after this suggestion; the draft starts from its current version.",
 			"evolution.adopted": "Adopted",
 			"evolution.openSkill": "Open skill",
@@ -3748,7 +3752,7 @@ window.__ModuleLoader__.load({
 								className: css.skKicker,
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ActionTag, { action: suggestion.action }), suggestion.status !== "pending" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusTag, { status: suggestion.status })]
 							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: view.skill === void 0 ? suggestion.skillName : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: view.skill === void 0 || view.skillInCatalog === false ? suggestion.skillName : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 								type: "button",
 								className: css.skTitleLink,
 								onClick: () => context.navigate({
@@ -3811,7 +3815,7 @@ window.__ModuleLoader__.load({
 					suggestion.rationale !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Clamp, { text: suggestion.rationale }),
 					suggestion.action === "update" && view.skill === void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 						className: css.skWarn,
-						children: t("evolution.skillGone")
+						children: t(view.resolution === "origin-unavailable" ? "evolution.originUnavailable" : "evolution.skillGone")
 					}),
 					suggestion.action === "update" && view.skill !== void 0 && !view.hashCurrent && suggestion.status === "pending" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 						className: css.skWarn,
@@ -3832,7 +3836,7 @@ window.__ModuleLoader__.load({
 						children: [
 							t("evolution.adopted"),
 							" ",
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							view.skillInCatalog !== false && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 								type: "button",
 								className: css.skLink,
 								onClick: () => context.navigate({
@@ -3843,9 +3847,16 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: css.skFolds,
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Fold, {
+						children: [view.skill !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Fold, {
+							title: t("evolution.currentSkill"),
+							meta: t(`root.${view.skill.root}`),
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: css.skMuted,
+								children: view.skill.path
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SkillMarkdown, { body: view.skill.body })]
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Fold, {
 							title: t("evolution.evidence"),
 							meta: t("evolution.evidenceMeta", {
 								conversations: references.length,
@@ -3884,7 +3895,7 @@ window.__ModuleLoader__.load({
 									})]
 								}, index);
 							})
-						})
+						})]
 					})
 				]
 			});
@@ -3986,16 +3997,21 @@ window.__ModuleLoader__.load({
 				});
 				const started = await context.client.backtest({
 					skillName: draft.skillName,
-					target: { kind: draft.action === "update" ? "current" : "none" }
+					target: {
+						kind: draft.action === "update" ? "current" : "none",
+						...draft.action === "update" ? { draftId: draft.id } : {}
+					}
 				});
 				await context.client.linkRun(draft.id, started.runId);
 			});
 			const redraft = (note) => act(() => context.client.generateDraft({
-				...draft.suggestionId === void 0 ? { skill: draft.skillName } : { suggestionId: draft.suggestionId },
+				draftId: draft.id,
+				...draft.suggestionId === void 0 ? {} : { suggestionId: draft.suggestionId },
 				guidance: note,
 				...route
 			}), () => setRedrafting(null));
 			const ready = draft.status === "ready";
+			const originalAvailable = draft.action !== "update" || view.base !== void 0;
 			const progress = (run) => run === void 0 ? 0 : run.progress.done;
 			const total = (candidate?.progress.total ?? 0) + (baseline?.progress.total ?? 0);
 			const results = /* @__PURE__ */ new Map();
@@ -4029,7 +4045,7 @@ window.__ModuleLoader__.load({
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 								variant: "primary",
 								size: "sm",
-								disabled: !context.writable || busy || editing !== null || running,
+								disabled: !context.writable || busy || editing !== null || running || !originalAvailable,
 								onClick: () => regressed ? setConfirmAdopt(true) : void adopt(),
 								children: t("draft.adopt")
 							}),
@@ -4047,13 +4063,17 @@ window.__ModuleLoader__.load({
 								items: [{
 									id: "edit",
 									label: t("draft.edit")
-								}, ...context.client.canAssist("skill-draft") ? [{
+								}, ...originalAvailable && context.client.canAssist("skill-draft") ? [{
 									id: "redraft",
 									label: t("draft.redraft")
 								}] : []]
 							})
 						] })]
 					}),
+					!originalAvailable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: css.skWarn,
+						children: t(view.resolution === "origin-unavailable" ? "evolution.originUnavailable" : "evolution.skillGone")
+					}),
 					draft.notes !== "" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Clamp, { text: draft.notes }),
 					draft.changes.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MoreList, {
 						items: draft.changes,
@@ -4089,7 +4109,7 @@ window.__ModuleLoader__.load({
 						}), !running && (cases ?? 0) > 0 && context.client.canAssist("skill-backtest") && ready && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 							variant: "ghost",
 							size: "sm",
-							disabled: !context.writable || busy,
+							disabled: !context.writable || busy || !originalAvailable,
 							onClick: () => void backtest(),
 							children: view.runs.length === 0 ? t("draft.runBacktest") : t("draft.rerun")
 						})]

package/lib/contracts.d.ts

@@ -163,6 +163,13 @@ interface EvidenceReference {
 }
 type SuggestionStatus = 'pending' | 'drafting' | 'review' | 'adopted' | 'dismissed' | 'expired' | 'invalidated';
 declare const SUGGESTION_STATUSES: readonly SuggestionStatus[];
+/** A file selected by the Source catalog, independent of the page's storage scope. */
+interface SkillOrigin {
+  path: string;
+  /** The owning project root; absent for user skills. */
+  workspace?: string;
+}
+type SkillResolution = 'available' | 'missing' | 'origin-unavailable';
 interface SkillSuggestion {
   id: string;
   skillName: string;
@@ -177,6 +184,8 @@ interface SkillSuggestion {
   /** For `update`: the SKILL.md the reviewer read, so a later edit invalidates it. */
   skillKey?: string;
   skillFileHash?: string;
+  /** Absent on legacy records; never supplied by the model. */
+  origin?: SkillOrigin;
   sourceSessionId?: string;
   sourceSessionTitle?: string;
   reviewId?: string;
@@ -196,6 +205,8 @@ interface SkillDraft {
   /** For `update`, the SKILL.md hash the draft was written against. */
   baseKey?: string;
   baseHash?: string;
+  /** The file this update replaces; absent on legacy records. */
+  origin?: SkillOrigin;
   /** For `create`, where adopting writes the new bundle. */
   targetRoot?: SkillRootKind;
   content: string;
@@ -467,7 +478,10 @@ interface SuggestionView {
   suggestion: SkillSuggestion;
   /** The loaded file is still the one the reviewer read. */
   hashCurrent: boolean;
-  skill?: SkillSummary;
+  skill?: SkillDocument;
+  resolution?: SkillResolution;
+  /** Whether the selected scope's catalog offers this same file for navigation. */
+  skillInCatalog?: boolean;
   draft?: SkillDraft;
   trajectories: TrajectorySummary[];
 }
@@ -475,6 +489,7 @@ interface DraftView {
   draft: SkillDraft;
   /** The file the draft replaces, as it is now. */
   base?: SkillDocument;
+  resolution?: SkillResolution;
   runs: BacktestRun[];
 }
 /** A string, or the same text per language. */
@@ -623,4 +638,4 @@ interface MarketInstall {
   installedAt: string;
 }
 //#endregion
-export { BacktestRun, CaseResult, CatalogView, DEFAULT_SKILLS_POLICY, type DetectedSource, DraftPreferences, DraftPreferencesView, DraftStatus, DraftView, EVOLUTION_SIGNALS, EvalCase, EvalCheck, EvidencePack, EvidenceReference, EvolutionSignal, LocalizedText, MarketAudit, MarketEntry, MarketInstall, MarketInstallState, MarketItem, MarketPreview, MarketRegistry, MarketRegistryFile, MarketSearchResult, MarketSource, type MarketSourceKind, MarketView, ModelRoute, ReviewLogEntry, ReviewRecordInput, ReviewRecordResult, ReviewScore, RunStatus, RunTarget, RunTargetKind, SKILL_ROOT_KINDS, SKILL_ROOT_RANK, SUGGESTION_STATUSES, SkillCatalog, SkillDocument, SkillDraft, SkillInvocation, SkillProblem, SkillRoot, SkillRootKind, SkillSuggestion, SkillSummary, SkillVersion, SkillVersionReason, SkillsOverview, SkillsPolicy, SuggestionStatus, SuggestionView, Trajectory, TrajectoryAnnotation, TrajectoryStats, TrajectoryStep, TrajectoryStepKind, TrajectorySummary, TrashEntry, TrashRestoreInput, TrashRestorePreview };
+export { BacktestRun, CaseResult, CatalogView, DEFAULT_SKILLS_POLICY, type DetectedSource, DraftPreferences, DraftPreferencesView, DraftStatus, DraftView, EVOLUTION_SIGNALS, EvalCase, EvalCheck, EvidencePack, EvidenceReference, EvolutionSignal, LocalizedText, MarketAudit, MarketEntry, MarketInstall, MarketInstallState, MarketItem, MarketPreview, MarketRegistry, MarketRegistryFile, MarketSearchResult, MarketSource, type MarketSourceKind, MarketView, ModelRoute, ReviewLogEntry, ReviewRecordInput, ReviewRecordResult, ReviewScore, RunStatus, RunTarget, RunTargetKind, SKILL_ROOT_KINDS, SKILL_ROOT_RANK, SUGGESTION_STATUSES, SkillCatalog, SkillDocument, SkillDraft, SkillInvocation, SkillOrigin, SkillProblem, SkillResolution, SkillRoot, SkillRootKind, SkillSuggestion, SkillSummary, SkillVersion, SkillVersionReason, SkillsOverview, SkillsPolicy, SuggestionStatus, SuggestionView, Trajectory, TrajectoryAnnotation, TrajectoryStats, TrajectoryStep, TrajectoryStepKind, TrajectorySummary, TrashEntry, TrashRestoreInput, TrashRestorePreview };

package/lib/index.js

@@ -368,6 +368,33 @@ function rootPath(catalog, kind) {
 	if (root === void 0) throw new Error(kind.startsWith("project") ? "project skill roots need a selected workspace" : "unknown skill root: " + kind);
 	return root.path;
 }
+//#endregion
+//#region src/identity.ts
+function skillOrigin(catalog, skill) {
+	return {
+		path: skill.path,
+		...skill.root.startsWith("project-") ? { workspace: catalog.projectRoot } : {}
+	};
+}
+function validOrigin(key, origin) {
+	return origin !== null && typeof origin === "object" && typeof origin.path === "string" && isAbsolute(origin.path) && (key.startsWith("project-") ? typeof origin.workspace === "string" && isAbsolute(origin.workspace) : origin.workspace === void 0);
+}
+/** Old reviews kept their cwd in the cited trajectory, even before origins existed. */
+function legacySuggestionWorkspace(ledger, suggestion) {
+	if (!suggestion.skillKey?.startsWith("project-")) return void 0;
+	const cited = new Set(suggestion.evidence.map((reference) => reference.trajectoryId));
+	const trajectories = ledger.trajectories.filter((trajectory) => cited.has(trajectory.id) && (suggestion.reviewId === void 0 || trajectory.reviewId === suggestion.reviewId));
+	if (suggestion.reviewId === void 0 && trajectories.length !== cited.size) return void 0;
+	if (trajectories.length === 0 || trajectories.some((trajectory) => typeof trajectory.workspace !== "string" || !isAbsolute(trajectory.workspace))) return void 0;
+	const roots = new Set(trajectories.map((trajectory) => projectRoot(trajectory.workspace)));
+	return roots.size === 1 ? [...roots][0] : void 0;
+}
+/** A name alone, or identical contents in another project, is not an identity. */
+function sameSuggestionSkill(ledger, suggestion, catalog, skill) {
+	if (suggestion.skillKey !== skill.key) return false;
+	if (suggestion.origin !== void 0) return validOrigin(skill.key, suggestion.origin) && resolve(suggestion.origin.path) === resolve(skill.path) && (!skill.root.startsWith("project-") || resolve(suggestion.origin.workspace) === catalog.projectRoot);
+	return !skill.root.startsWith("project-") || legacySuggestionWorkspace(ledger, suggestion) === catalog.projectRoot;
+}
 function emptyLedger() {
 	return {
 		version: 1,
@@ -953,7 +980,9 @@ function admitReview(context, input) {
 			});
 			continue;
 		}
-		if (ledger.suggestions.find((suggestion) => suggestion.skillName === proposal.skillName && suggestion.action === proposal.action && suggestion.status === "dismissed" && suggestion.sourceSessionId === input.review.sessionId && now.getTime() - Date.parse(suggestion.updatedAt) < DISMISSED_COOLDOWN_MS) !== void 0) {
+		const skill = activeSkill(catalog, proposal.skillName);
+		const sameSkill = (suggestion) => suggestion.skillName === proposal.skillName && suggestion.action === proposal.action && (skill === void 0 || sameSuggestionSkill(ledger, suggestion, catalog, skill));
+		if (ledger.suggestions.find((suggestion) => sameSkill(suggestion) && suggestion.status === "dismissed" && suggestion.sourceSessionId === input.review.sessionId && now.getTime() - Date.parse(suggestion.updatedAt) < DISMISSED_COOLDOWN_MS) !== void 0) {
 			skipped.push({
 				skillName: proposal.skillName,
 				action: proposal.action,
@@ -961,8 +990,7 @@ function admitReview(context, input) {
 			});
 			continue;
 		}
-		const skill = activeSkill(catalog, proposal.skillName);
-		const open = ledger.suggestions.find((suggestion) => suggestion.skillName === proposal.skillName && suggestion.action === proposal.action && OPEN_STATUSES.has(suggestion.status));
+		const open = ledger.suggestions.find((suggestion) => sameSkill(suggestion) && OPEN_STATUSES.has(suggestion.status));
 		if (open !== void 0) {
 			open.evidence = [...open.evidence, evidence].slice(-12);
 			open.signals = signals([...open.signals, ...proposal.signals]);
@@ -974,6 +1002,7 @@ function admitReview(context, input) {
 				if (skill !== void 0) {
 					open.skillKey = skill.key;
 					open.skillFileHash = skill.hash;
+					open.origin = skillOrigin(catalog, skill);
 				}
 				updated++;
 			} else skipped.push({
@@ -997,7 +1026,8 @@ function admitReview(context, input) {
 			evidence: [evidence],
 			...skill === void 0 ? {} : {
 				skillKey: skill.key,
-				skillFileHash: skill.hash
+				skillFileHash: skill.hash,
+				origin: skillOrigin(catalog, skill)
 			},
 			sourceSessionId: input.review.sessionId,
 			...input.review.sessionTitle === void 0 ? {} : { sourceSessionTitle: input.review.sessionTitle },
@@ -3073,6 +3103,28 @@ var SkillsService = class {
 	catalog(workspace) {
 		return readCatalog(this.options(workspace));
 	}
+	original(key, origin, legacyWorkspace) {
+		if (key === void 0 || origin !== void 0 && !validOrigin(key, origin) || key.startsWith("project-") && origin === void 0 && legacyWorkspace === void 0) return { resolution: "origin-unavailable" };
+		const catalog = this.catalog(origin?.workspace ?? legacyWorkspace);
+		const skill = catalog.skills.find((candidate) => candidate.key === key && (origin === void 0 || resolve(candidate.path) === resolve(origin.path)));
+		return skill === void 0 ? { resolution: "missing" } : {
+			resolution: "available",
+			skill,
+			origin: skillOrigin(catalog, skill)
+		};
+	}
+	suggestionOriginal(ledger, suggestion) {
+		return this.original(suggestion.skillKey, suggestion.origin, suggestion.origin === void 0 ? legacySuggestionWorkspace(ledger, suggestion) : void 0);
+	}
+	draftOriginal(ledger, draft) {
+		if (draft.origin !== void 0) return this.original(draft.baseKey, draft.origin);
+		const suggestion = ledger.suggestions.find((candidate) => candidate.id === draft.suggestionId && candidate.skillKey === draft.baseKey);
+		return suggestion === void 0 ? this.original(draft.baseKey, void 0) : this.suggestionOriginal(ledger, suggestion);
+	}
+	requireOriginal(original) {
+		if (original.skill !== void 0) return original.skill;
+		throw new Error(original.resolution === "origin-unavailable" ? "The original workspace was not recorded reliably. Open the skill in its original workspace and generate a new draft; the existing draft and evidence are kept." : "The original skill file was deleted, moved, or cannot be read. Restore it or open the skill at its new location and generate a new draft.");
+	}
 	catalogView(workspace) {
 		const catalog = this.catalog(workspace);
 		const ledger = this.store.ledger();
@@ -3170,13 +3222,19 @@ var SkillsService = class {
 		expireSuggestions(ledger, this.clock());
 		const suggestion = ledger.suggestions.find((candidate) => candidate.id === id);
 		if (suggestion === void 0) throw new Error("suggestion not found: " + id);
-		const skill = activeSkill(this.catalog(workspace), suggestion.skillName);
+		const original = suggestion.action === "update" ? this.suggestionOriginal(ledger, suggestion) : void 0;
+		const catalog = this.catalog(workspace);
+		const skill = original === void 0 ? activeSkill(catalog, suggestion.skillName) : original.skill;
 		const draft = suggestion.draftId === void 0 ? void 0 : ledger.drafts.find((candidate) => candidate.id === suggestion.draftId);
 		const cited = new Set(suggestion.evidence.map((reference) => reference.trajectoryId));
 		return {
 			suggestion,
 			hashCurrent: suggestion.action === "create" ? skill === void 0 : skill !== void 0 && skill.hash === suggestion.skillFileHash,
-			...skill === void 0 ? {} : { skill },
+			...original === void 0 ? {} : { resolution: original.resolution },
+			...skill === void 0 ? {} : {
+				skill: readSkillDocument(skill),
+				skillInCatalog: catalog.skills.some((candidate) => candidate.key === skill.key && candidate.path === skill.path)
+			},
 			...draft === void 0 ? {} : { draft },
 			trajectories: ledger.trajectories.filter((entry) => cited.has(entry.id))
 		};
@@ -3205,16 +3263,19 @@ var SkillsService = class {
 		return staleRun(run, this.clock().getTime());
 	}
 	drafts(filter = {}) {
-		return this.store.ledger().drafts.filter((draft) => (filter.suggestionId === void 0 || draft.suggestionId === filter.suggestionId) && (filter.skill === void 0 || draft.skillName === filter.skill));
+		const ledger = this.store.ledger();
+		return ledger.drafts.filter((draft) => (filter.suggestionId === void 0 || draft.suggestionId === filter.suggestionId) && (filter.skill === void 0 || draft.skillName === filter.skill) && (filter.path === void 0 || this.draftOriginal(ledger, draft).skill?.path === filter.path));
 	}
-	draft(workspace, id) {
-		const draft = this.store.ledger().drafts.find((candidate) => candidate.id === id);
+	draft(_workspace, id) {
+		const ledger = this.store.ledger();
+		const draft = ledger.drafts.find((candidate) => candidate.id === id);
 		if (draft === void 0) throw new Error("draft not found: " + id);
-		const catalog = this.catalog(workspace);
-		const base = draft.baseKey === void 0 ? void 0 : catalog.skills.find((skill) => skill.key === draft.baseKey);
+		const original = draft.action === "update" ? this.draftOriginal(ledger, draft) : void 0;
+		const base = original?.skill;
 		const now = this.clock().getTime();
 		return {
 			draft,
+			...original === void 0 ? {} : { resolution: original.resolution },
 			...base === void 0 ? {} : { base: readSkillDocument(base) },
 			runs: draft.runIds.flatMap((id) => {
 				const run = this.store.evals().runs.find((candidate) => candidate.id === id);
@@ -3231,11 +3292,14 @@ var SkillsService = class {
 		const ledger = this.store.ledger();
 		const evals = this.store.evals();
 		const catalog = this.catalog(workspace);
+		const prior = input.draftId === void 0 ? void 0 : ledger.drafts.find((candidate) => candidate.id === input.draftId);
+		if (input.draftId !== void 0 && prior === void 0) throw new Error("draft not found: " + input.draftId);
+		if (prior !== void 0 && input.suggestionId !== void 0 && prior.suggestionId !== input.suggestionId) throw new Error("draft is for another suggestion");
 		const suggestion = input.suggestionId === void 0 ? void 0 : ledger.suggestions.find((candidate) => candidate.id === input.suggestionId);
 		if (input.suggestionId !== void 0 && suggestion === void 0) throw new Error("suggestion not found: " + input.suggestionId);
-		const skillName = suggestion?.skillName ?? input.skill;
+		const skillName = prior?.skillName ?? suggestion?.skillName ?? input.skill;
 		if (skillName === void 0 || !isSkillName(skillName)) throw new Error("a skill name or a suggestion is required");
-		const loaded = activeSkill(catalog, skillName);
+		const loaded = prior?.action === "update" ? this.requireOriginal(this.draftOriginal(ledger, prior)) : suggestion?.action === "update" ? this.requireOriginal(this.suggestionOriginal(ledger, suggestion)) : activeSkill(catalog, skillName);
 		const action = loaded === void 0 ? "create" : "update";
 		const references = suggestion?.evidence ?? ledger.trajectories.filter((entry) => entry.stats.skills.includes(skillName) || entry.suggestionIds.some((id) => ledger.suggestions.find((candidate) => candidate.id === id)?.skillName === skillName)).slice(0, 3).map((entry) => ({
 			trajectoryId: entry.id,
@@ -3273,7 +3337,7 @@ var SkillsService = class {
 				description: clip(skill.description, 200),
 				root: skill.root
 			})),
-			drafts: ledger.drafts.filter((draft) => draft.skillName === skillName).slice(0, 3)
+			drafts: ledger.drafts.filter((draft) => draft.skillName === skillName && (loaded === void 0 ? draft.action === "create" : this.draftOriginal(ledger, draft).skill?.path === loaded.path)).slice(0, 3)
 		};
 	}
 	/** Bump the ledger generation, so the revision moves with every write. */
@@ -3721,11 +3785,18 @@ var SkillsService = class {
 		return this.write(() => {
 			validateSkillContent(input.content, input.skillName);
 			const ledger = this.store.ledger();
-			const loaded = activeSkill(this.catalog(workspace), input.skillName);
+			const catalog = this.catalog(workspace);
 			const now = this.clock().toISOString();
+			const prior = input.draftId === void 0 ? void 0 : ledger.drafts.find((candidate) => candidate.id === input.draftId);
+			if (input.draftId !== void 0 && prior === void 0) throw new Error("draft not found: " + input.draftId);
+			if (prior !== void 0 && (prior.skillName !== input.skillName || prior.suggestionId !== input.suggestionId)) throw new Error("draft is for another skill or suggestion");
 			const suggestion = input.suggestionId === void 0 ? void 0 : ledger.suggestions.find((candidate) => candidate.id === input.suggestionId);
 			if (input.suggestionId !== void 0 && suggestion === void 0) throw new Error("suggestion not found: " + input.suggestionId);
-			for (const draft of ledger.drafts) if (draft.status === "ready" && draft.skillName === input.skillName && draft.suggestionId === input.suggestionId) {
+			if (suggestion !== void 0 && suggestion.skillName !== input.skillName) throw new Error("suggestion is for another skill");
+			const original = prior?.action === "update" ? this.draftOriginal(ledger, prior) : suggestion?.action === "update" ? this.suggestionOriginal(ledger, suggestion) : void 0;
+			const loaded = original === void 0 ? activeSkill(catalog, input.skillName) : this.requireOriginal(original);
+			const origin = loaded === void 0 ? void 0 : original?.origin ?? skillOrigin(catalog, loaded);
+			for (const draft of ledger.drafts) if (draft.status === "ready" && draft.skillName === input.skillName && draft.suggestionId === input.suggestionId && (loaded === void 0 ? draft.action === "create" : this.draftOriginal(ledger, draft).skill?.path === loaded.path)) {
 				draft.status = "discarded";
 				draft.updatedAt = now;
 			}
@@ -3736,7 +3807,8 @@ var SkillsService = class {
 				action: loaded === void 0 ? "create" : "update",
 				...loaded === void 0 ? { targetRoot: input.targetRoot ?? suggestion?.targetRoot ?? DEFAULT_ROOT } : {
 					baseKey: loaded.key,
-					baseHash: loaded.hash
+					baseHash: loaded.hash,
+					origin
 				},
 				content: input.content,
 				notes: clip(input.notes, 2e3),
@@ -3780,12 +3852,14 @@ var SkillsService = class {
 			const catalog = this.catalog(workspace);
 			let key;
 			let previous;
+			let updated;
 			if (draft.action === "update") {
-				const base = catalog.skills.find((skill) => skill.key === draft.baseKey);
-				if (base === void 0) throw new Error(`${draft.skillName} is no longer in ${draft.baseKey?.split(":")[0]}; draft it again`);
+				const original = this.draftOriginal(ledger, draft);
+				const base = this.requireOriginal(original);
 				previous = this.requireHash(base, draft.baseHash);
 				writeFileAtomic(base.path, draft.content);
 				key = base.key;
+				updated = findSkill(this.catalog(original.origin?.workspace), key);
 			} else {
 				const root = input.root ?? draft.targetRoot ?? DEFAULT_ROOT;
 				if (activeSkill(catalog, draft.skillName) !== void 0) throw new Error(`${draft.skillName} exists now; draft it again as an update`);
@@ -3814,7 +3888,7 @@ var SkillsService = class {
 			}
 			this.store.saveLedger(ledger);
 			return {
-				skill: findSkill(this.catalog(workspace), key),
+				skill: updated ?? findSkill(this.catalog(workspace), key),
 				version
 			};
 		});
@@ -3899,7 +3973,9 @@ var SkillsService = class {
 				}
 			};
 		}
-		const loaded = activeSkill(this.catalog(workspace), skillName);
+		const draft = target.draftId === void 0 ? void 0 : this.store.ledger().drafts.find((candidate) => candidate.id === target.draftId && candidate.skillName === skillName);
+		if (target.draftId !== void 0 && draft === void 0) throw new Error("draft not found for this skill");
+		const loaded = draft === void 0 ? activeSkill(this.catalog(workspace), skillName) : this.requireOriginal(this.draftOriginal(this.store.ledger(), draft));
 		if (loaded === void 0) throw new Error(`${skillName} has no file to test; test a draft or no skill`);
 		const document = readSkillDocument(loaded);
 		return {
@@ -3907,7 +3983,8 @@ var SkillsService = class {
 			target: {
 				kind: "current",
 				skillKey: loaded.key,
-				hash: document.hash
+				hash: document.hash,
+				...draft === void 0 ? {} : { draftId: draft.id }
 			}
 		};
 	}
@@ -4754,7 +4831,8 @@ function createSkillsMemorySource(config = {}) {
 								case "run": return service.run(memoryInputText(fields.id, "id", 100));
 								case "drafts": return service.drafts({
 									...optionalText(fields.suggestionId, "suggestionId", 100) === void 0 ? {} : { suggestionId: optionalText(fields.suggestionId, "suggestionId", 100) },
-									...optionalText(fields.skill, "skill", 64) === void 0 ? {} : { skill: optionalText(fields.skill, "skill", 64) }
+									...optionalText(fields.skill, "skill", 64) === void 0 ? {} : { skill: optionalText(fields.skill, "skill", 64) },
+									...optionalText(fields.path, "path", 4096) === void 0 ? {} : { path: optionalText(fields.path, "path", 4096) }
 								});
 								case "draft": return service.draft(root, memoryInputText(fields.id, "id", 100));
 								case "draft-preferences": return service.draftPreferences();
@@ -4764,6 +4842,7 @@ function createSkillsMemorySource(config = {}) {
 								});
 								case "evidence-pack": return service.evidencePack(root, {
 									...optionalText(fields.suggestionId, "suggestionId", 100) === void 0 ? {} : { suggestionId: optionalText(fields.suggestionId, "suggestionId", 100) },
+									...optionalText(fields.draftId, "draftId", 100) === void 0 ? {} : { draftId: optionalText(fields.draftId, "draftId", 100) },
 									...optionalText(fields.skill, "skill", 64) === void 0 ? {} : { skill: optionalText(fields.skill, "skill", 64) }
 								});
 								case "target-content": return service.targetContent(root, memoryInputText(fields.skillName, "skillName", 64), runTarget(fields.target));
@@ -4884,6 +4963,7 @@ function createSkillsMemorySource(config = {}) {
 						case "draft-record":
 							value = await service.recordDraft(root, {
 								...optionalText(fields.suggestionId, "suggestionId", 100) === void 0 ? {} : { suggestionId: optionalText(fields.suggestionId, "suggestionId", 100) },
+								...optionalText(fields.draftId, "draftId", 100) === void 0 ? {} : { draftId: optionalText(fields.draftId, "draftId", 100) },
 								skillName: memoryInputText(fields.skillName, "skillName", 64),
 								content: typeof fields.content === "string" ? fields.content : "",
 								notes: typeof fields.notes === "string" ? fields.notes : "",

package/lib/types/client/api.d.ts

@@ -42,6 +42,7 @@ export interface SkillsPageClient {
     }): Promise<ReviewLogEntry[]>;
     evidencePack(input: {
         suggestionId?: string;
+        draftId?: string;
         skill?: string;
     }): Promise<EvidencePack>;
     createSkill(input: {
@@ -135,6 +136,7 @@ export interface SkillsPageClient {
     canAssist(operation: 'skill-draft' | 'skill-backtest' | 'skill-derive-cases' | 'skill-review-now'): boolean;
     generateDraft(input: {
         suggestionId?: string;
+        draftId?: string;
         skill?: string;
         guidance?: string;
         targetRoot?: SkillRootKind;

package/lib/types/contracts.d.ts

@@ -145,6 +145,13 @@ export interface EvidenceReference {
 }
 export type SuggestionStatus = 'pending' | 'drafting' | 'review' | 'adopted' | 'dismissed' | 'expired' | 'invalidated';
 export declare const SUGGESTION_STATUSES: readonly SuggestionStatus[];
+/** A file selected by the Source catalog, independent of the page's storage scope. */
+export interface SkillOrigin {
+    path: string;
+    /** The owning project root; absent for user skills. */
+    workspace?: string;
+}
+export type SkillResolution = 'available' | 'missing' | 'origin-unavailable';
 export interface SkillSuggestion {
     id: string;
     skillName: string;
@@ -159,6 +166,8 @@ export interface SkillSuggestion {
     /** For `update`: the SKILL.md the reviewer read, so a later edit invalidates it. */
     skillKey?: string;
     skillFileHash?: string;
+    /** Absent on legacy records; never supplied by the model. */
+    origin?: SkillOrigin;
     sourceSessionId?: string;
     sourceSessionTitle?: string;
     reviewId?: string;
@@ -178,6 +187,8 @@ export interface SkillDraft {
     /** For `update`, the SKILL.md hash the draft was written against. */
     baseKey?: string;
     baseHash?: string;
+    /** The file this update replaces; absent on legacy records. */
+    origin?: SkillOrigin;
     /** For `create`, where adopting writes the new bundle. */
     targetRoot?: SkillRootKind;
     content: string;
@@ -449,7 +460,10 @@ export interface SuggestionView {
     suggestion: SkillSuggestion;
     /** The loaded file is still the one the reviewer read. */
     hashCurrent: boolean;
-    skill?: SkillSummary;
+    skill?: SkillDocument;
+    resolution?: SkillResolution;
+    /** Whether the selected scope's catalog offers this same file for navigation. */
+    skillInCatalog?: boolean;
     draft?: SkillDraft;
     trajectories: TrajectorySummary[];
 }
@@ -457,6 +471,7 @@ export interface DraftView {
     draft: SkillDraft;
     /** The file the draft replaces, as it is now. */
     base?: SkillDocument;
+    resolution?: SkillResolution;
     runs: BacktestRun[];
 }
 export type { DetectedSource, MarketSourceKind } from './source-kind.ts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mnemon-source-skills",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "Skills Source for Composable View Memory: DSH skill management, evolution suggestions, evidence trajectories and eval sets.",
   "license": "MIT",
   "type": "module",
@@ -62,7 +62,7 @@
     "@types/node": "^22.0.0",
     "@types/react": "^18.3.0",
     "@types/react-dom": "^18.3.0",
-    "dsh-mnemon": "^0.5.41",
+    "dsh-mnemon": "^0.5.42",
     "jsdom": "^26.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

package/presentation/locales.json

@@ -135,7 +135,9 @@
     "evolution.noAgent": "当前没有可用的任务 Agent",
     "evolution.drafting": "正在生成草案",
     "evolution.draftFailed": "草案生成失败：{error}",
-    "evolution.skillGone": "这个技能已不存在。",
+    "evolution.skillGone": "原技能文件已删除、移动或无法读取。请恢复文件，或在新位置打开技能并重新生成草案。",
+    "evolution.originUnavailable": "旧记录未可靠保存原工作区。请切换到原工作区，在技能页打开该技能并重新生成草案；现有草案和证据会保留。",
+    "evolution.currentSkill": "当前技能文件",
     "evolution.skillChanged": "技能在建议之后被改过，生成草案前会以当前版本为准。",
     "evolution.adopted": "已采纳",
     "evolution.openSkill": "查看技能",
@@ -489,7 +491,9 @@
     "evolution.noAgent": "No task Agent is available",
     "evolution.drafting": "Drafting",
     "evolution.draftFailed": "Drafting failed: {error}",
-    "evolution.skillGone": "This skill no longer exists.",
+    "evolution.skillGone": "The original skill file was deleted, moved, or cannot be read. Restore it or open the skill at its new location and generate a new draft.",
+    "evolution.originUnavailable": "The original workspace was not recorded reliably. Select its original workspace, open the skill on the Skills page and generate a new draft; the existing draft and evidence are kept.",
+    "evolution.currentSkill": "Current skill file",
     "evolution.skillChanged": "The skill changed after this suggestion; the draft starts from its current version.",
     "evolution.adopted": "Adopted",
     "evolution.openSkill": "Open skill",