weir-harness 1.1.4 → 1.1.6

package/lib/client.capability-model.js

@@ -11,20 +11,37 @@ window.__ModuleLoader__.load({
 		// is a function over plain data so the DOM layer stays thin and the
 		// node:test suite covers the semantics.
 
-		/** Applied counts come from the SERVER receipt, never the optimistic draft (12.2). */
+		// Like the SEGMENT-regex mirror below, same-package sync require is
+		// impossible in the ModuleLoader. Mirror src/capabilities/skill-identity.js.
+		function skillIdentityKeyOf(identity) {
+			if (!identity || typeof identity !== "object" || Array.isArray(identity)) return null;
+			const { scope, root, name, provenance, opaqueId } = identity;
+			if (typeof scope !== "string" || typeof root !== "string" || typeof name !== "string") return null;
+			const sorted = provenance == null ? null : Object.fromEntries(Object.keys(provenance).sort().map(key => [key, provenance[key]]));
+			return JSON.stringify([scope, root, name, sorted, sorted === null ? (opaqueId ?? null) : null]);
+		}
+		function skillEntryKeyOf(entry) {
+			if (typeof entry === "string") return "name:" + entry;
+			const key = skillIdentityKeyOf(entry);
+			return key === null ? null : "id:" + key;
+		}
+		const sortSkills = (entries) => [...entries].sort((a, b) => {
+			const left = skillEntryKeyOf(a), right = skillEntryKeyOf(b);
+			return left < right ? -1 : left > right ? 1 : 0;
+		});
+
+		/** Only a complete, warning-free effective receipt proves applied counts. */
 		function badgeStateOf(receipt, draft) {
-			const applied = receipt && receipt.status === "applied"
-				? { skills: Array.isArray(receipt.effective?.skills) ? receipt.effective.skills.length : 0, mcpServers: Array.isArray(receipt.effective?.mcpServers) ? receipt.effective.mcpServers.length : 0 }
-				: { skills: 0, mcpServers: 0 };
 			const warnings = Array.isArray(receipt?.warnings) ? [...receipt.warnings] : [];
-			const draftDirty = Boolean(draft && draft.dirty);
+			const known = receipt?.status === "applied" && warnings.length === 0
+				&& Array.isArray(receipt?.effective?.skills) && Array.isArray(receipt?.effective?.mcpServers);
 			return {
-				applied,
+				applied: known ? { skills: receipt.effective.skills.length, mcpServers: receipt.effective.mcpServers.length } : null,
 				warnings,
 				unavailable: warnings.filter((warning) => typeof warning === "string" && warning.includes("unavailable")),
-				draftDirty,
-				// Distinct from a fresh/loading state (12.2): receipt absent ≠ applied zero.
-				known: Boolean(receipt && receipt.status === "applied"),
+				draftDirty: Boolean(draft && draft.dirty),
+				known,
+				degraded: receipt?.status === "applied" && !known,
 			};
 		}
 
@@ -46,6 +63,7 @@ window.__ModuleLoader__.load({
 				missing: status !== "parsed" && status !== "unknown",
 				selected: Boolean(candidate?.selected),
 				conflict: candidate?.conflict === true,
+				identity: candidate?.identity ?? null,
 			};
 		}
 		function partitionManagerListing(listing) {
@@ -110,32 +128,110 @@ window.__ModuleLoader__.load({
 		// ---- Draft editing (12.3 manager Apply surface) ----
 		/** The edit draft seeded from the server receipt (CAS revision included). */
 		function draftFromReceipt(receipt) {
-			const skills = Array.isArray(receipt?.effective?.skills) ? [...receipt.effective.skills] : [];
+			const skills = Array.isArray(receipt?.effective?.skillIdentities) ? [...receipt.effective.skillIdentities]
+				: Array.isArray(receipt?.effective?.skills) ? [...receipt.effective.skills] : [];
 			const mcpServers = Array.isArray(receipt?.effective?.mcpServers) ? [...receipt.effective.mcpServers] : [];
+			const warnings = Array.isArray(receipt?.warnings) ? receipt.warnings.filter(Boolean).map(String) : [];
+			const digest = receipt?.effective?.digest;
+			const provable = receipt?.status === "applied" && warnings.length === 0 && Number.isSafeInteger(receipt.revision) && receipt.revision >= 0
+				&& Array.isArray(receipt?.effective?.skillIdentities) && Array.isArray(receipt?.effective?.mcpServers)
+				&& typeof digest === "string" && /^[a-f0-9]{64}$/.test(digest);
 			return {
-				skills: [...skills].sort(),
+				skills: sortSkills(skills),
 				mcpServers: [...mcpServers].sort(),
-				applied: { skills: [...skills].sort(), mcpServers: [...mcpServers].sort() },
+				applied: { skills: sortSkills(skills), mcpServers: [...mcpServers].sort(), unresolvedRefs: Array.isArray(receipt?.effective?.unresolvedRefs) ? [...receipt.effective.unresolvedRefs] : [] },
+				unresolvedRefs: Array.isArray(receipt?.effective?.unresolvedRefs) ? [...receipt.effective.unresolvedRefs] : [],
+				...(provable ? { appliedDigest: digest } : {}),
+				appliedSourceIssue: warnings.length ? "unavailable" : provable ? null : "receipt",
 				revision: Number.isSafeInteger(receipt?.revision) ? receipt.revision : 0,
 				dirty: false,
 			};
 		}
+		/** A degraded read is not permission to overwrite a user's staged selection.
+		 * Keep the last CAS base (the server will reject a stale revision) and
+		 * revoke applied-source proof until a complete refresh arrives. */
+		function draftAfterRefresh(current, receipt) {
+			if (!badgeStateOf(receipt, null).known) {
+				if (current) return { ...current, unknownBaseline: true, overwriteConfirmed: false, appliedSourceIssue: "unavailable", appliedDigest: undefined };
+				return receipt?.status === "applied" && Number.isSafeInteger(receipt.revision) && receipt.revision >= 0
+					? { ...draftFromReceipt(receipt), unknownBaseline: true, overwriteConfirmed: false } : null;
+			}
+			const fresh = draftFromReceipt(receipt);
+			if (!current?.dirty) return fresh;
+			const sameBase = current.revision === fresh.revision
+				&& JSON.stringify(current.applied.skills.map(skillEntryKeyOf)) === JSON.stringify(fresh.applied.skills.map(skillEntryKeyOf))
+				&& JSON.stringify(current.applied.mcpServers) === JSON.stringify(fresh.applied.mcpServers);
+			return { ...current, unknownBaseline: current.unknownBaseline === true && !sameBase, overwriteConfirmed: false, appliedSourceIssue: sameBase ? fresh.appliedSourceIssue : "receipt", appliedDigest: sameBase ? fresh.appliedDigest : undefined };
+		}
 
-		/** Toggle one name in the draft; dirty is recomputed against the applied sets. */
+		/** Toggle one entry in the draft; skills compare by identity, MCP by name. */
 		function draftToggle(draft, kind, name) {
+			if (kind === "skills") {
+				const key = skillEntryKeyOf(name);
+				const list = new Map(draft.skills.map(entry => [skillEntryKeyOf(entry), entry]));
+				if (list.has(key)) list.delete(key); else list.set(key, name);
+				const next = { ...draft, overwriteConfirmed: false, skills: sortSkills([...list.values()]) };
+				next.dirty = draftDiffOf(next).any;
+				return next;
+			}
 			const list = new Set(draft[kind]);
 			if (list.has(name)) list.delete(name); else list.add(name);
-			const next = { ...draft, [kind]: [...list].sort() };
+			const next = { ...draft, overwriteConfirmed: false, [kind]: [...list].sort() };
 			const same = (a, b) => a.length === b.length && a.every((value, index) => value === b[index]);
-			next.dirty = !same(next.skills, draft.applied.skills) || !same(next.mcpServers, draft.applied.mcpServers);
+			next.dirty = !same(next.skills.map(skillEntryKeyOf), draft.applied.skills.map(skillEntryKeyOf)) || !same(next.mcpServers, draft.applied.mcpServers);
+			return next;
+		}
+		/** Preflight the complete draft against the unfiltered inventory. Strings are not identities. */
+		function skillDraftConflicts(draft, listing) {
+			const byName = new Map(), names = new Set();
+			for (const entry of Array.isArray(draft?.skills) ? draft.skills : []) {
+				if (typeof entry === "string") { if (entry) names.add(entry); continue; }
+				const key = skillIdentityKeyOf(entry);
+				if (key === null) continue;
+				if (!byName.has(entry.name)) byName.set(entry.name, new Map());
+				byName.get(entry.name).set(key, entry);
+			}
+			const selected = [...byName].filter(([, group]) => group.size > 1).map(([name, group]) => ({ name, identities: [...group.values()] }));
+			const rows = Array.isArray(listing?.skills) ? listing.skills : null;
+			const unresolved = [...names].map(name => {
+				if (!rows) return { name, state: "unavailable", candidates: [] };
+				const candidates = [...new Map(rows.filter(row => row?.status === "parsed" && row.name === name && skillIdentityKeyOf(row.identity) !== null)
+					.map(row => [skillIdentityKeyOf(row.identity), row.identity])).values()];
+				return { name, state: candidates.length > 1 ? "ambiguous" : candidates.length === 1 ? "unique" : "unknown", candidates };
+			});
+			return { selected, unresolved };
+		}
+
+		/** Explicit legacy-name recovery never consumes any other entry or CAS metadata. */
+		function resolveSkillName(draft, name, identity) {
+			if (!draft || typeof name !== "string" || !name || !draft.skills?.includes(name) || (identity !== null && (skillIdentityKeyOf(identity) === null || identity.name !== name))) return draft;
+			const entries = draft.skills.filter(entry => entry !== name);
+			if (identity && !entries.some(entry => skillEntryKeyOf(entry) === skillEntryKeyOf(identity))) entries.push(identity);
+			const next = { ...draft, overwriteConfirmed: false, skills: sortSkills(entries) };
+			next.dirty = draftDiffOf(next).any;
 			return next;
 		}
 
+		/** Scoped ordinal distinguishes same-scope roots without displaying paths or IDs. */
+		function skillSourceLabels(rows) {
+			const labels = new Map(), totals = new Map();
+			for (const row of Array.isArray(rows) ? rows : []) {
+				const key = skillIdentityKeyOf(row.identity);
+				if (key === null || labels.has(key)) continue;
+				const scope = SOURCE_LABELS[row.scopeKey ?? row.scope] ?? row.scopeKey ?? row.scope ?? "unknown";
+				const group = `${row.name}:${scope}`;
+				const number = (totals.get(group) ?? 0) + 1;
+				totals.set(group, number);
+				labels.set(key, { scope, group, number });
+			}
+			for (const [key, item] of labels) labels.set(key, totals.get(item.group) > 1 ? `${item.scope} · source ${item.number}` : item.scope);
+			return Object.fromEntries(labels);
+		}
 		/**
 		 * Map the engine response onto the commit state machine (12.3): applied
 		 * refreshes; revision-conflict shows the current state for re-pick;
-		 * indeterminate stays queryable; missing names surface as
-		 * install/configure; anything else keeps the draft.
+		 * indeterminate stays queryable; structured rejections preserve names;
+		 * anything else keeps the draft.
 		 */
 		function commitOutcomeOf(response) {
 			if (!response || typeof response !== "object") return { phase: "failed", error: "no response", draftKept: true };
@@ -148,7 +244,8 @@ window.__ModuleLoader__.load({
 			if (response.status === "applied") return { phase: "applied", revision: response.revision ?? null, skipped };
 			if (response.status === "revision-conflict") return { phase: "revision-conflict", current: response.current ?? null, draftKept: true };
 			if (response.status === "indeterminate") return { phase: "indeterminate", requestId: response.receipt?.requestId ?? null, queryable: true };
-			if (response.status === "missing") return { phase: "install-or-configure", missing: Array.isArray(response.missing) ? response.missing : [] };
+			if (response.status === "missing") return { phase: "missing", names: Array.isArray(response.missing) ? response.missing.filter(name => typeof name === "string") : [], draftKept: true };
+			if (response.status === "rejected" && response.reason === "same-name-conflict") return { phase: "same-name-conflict", names: Array.isArray(response.conflicts) ? response.conflicts.map(item => item?.name).filter(name => typeof name === "string") : [], draftKept: true };
 			return { phase: "failed", error: String(response.reason ?? response.status ?? "unknown"), draftKept: true };
 		}
 
@@ -189,7 +286,7 @@ window.__ModuleLoader__.load({
 				for (const name of baseSet) if (!currentSet.has(name)) removed += 1;
 				return { added, removed };
 			};
-			const skills = count(draft.skills, draft.applied.skills);
+			const skills = count(draft.skills.map(skillEntryKeyOf), (draft.applied.skills ?? []).map(skillEntryKeyOf));
 			const mcp = count(draft.mcpServers, draft.applied.mcpServers);
 			return {
 				skillsAdded: skills.added,
@@ -222,10 +319,11 @@ window.__ModuleLoader__.load({
 		 * carried for reporting; the CAS base (revision/applied) is kept; preset
 		 * metadata never produces an Apply by itself — dirty is recomputed
 		 * against the applied sets. */
-		function draftFromPreset(document, current) {
+		function draftFromPreset(document, current, resolveName) {
 			const selection = document?.selection ?? {};
 			const clean = (value) => (Array.isArray(value) ? value.map(String) : []).sort();
-			const skills = clean(selection.skills);
+			const skills = sortSkills((Array.isArray(selection.skills) ? selection.skills : []).map(entry =>
+				typeof entry === "string" ? (resolveName?.(entry) ?? entry) : entry));
 			const mcpServers = clean(selection.mcpServers);
 			const unresolvedRefs = Array.isArray(selection.unresolvedRefs) ? [...selection.unresolvedRefs] : [];
 			const applied = current?.applied && Array.isArray(current.applied.skills) && Array.isArray(current.applied.mcpServers)
@@ -237,8 +335,12 @@ window.__ModuleLoader__.load({
 				mcpServers,
 				applied,
 				revision: Number.isSafeInteger(current?.revision) ? current.revision : 0,
+				unknownBaseline: current?.unknownBaseline === true,
+				overwriteConfirmed: false,
+				...(typeof current?.appliedDigest === "string" ? { appliedDigest: current.appliedDigest } : {}),
+				appliedSourceIssue: current?.appliedSourceIssue === null ? null : current?.appliedSourceIssue ?? "receipt",
 				unresolvedRefs,
-				dirty: !same(skills, [...applied.skills].sort()) || !same(mcpServers, [...applied.mcpServers].sort()),
+				dirty: !same(skills.map(skillEntryKeyOf), sortSkills(applied.skills).map(skillEntryKeyOf)) || !same(mcpServers, [...applied.mcpServers].sort()),
 			};
 		}
 
@@ -260,6 +362,12 @@ window.__ModuleLoader__.load({
 			};
 		}
 
+		/** A tombstone or incomplete document cannot be staged as an empty draft. */
+		function loadablePresetOf(response) {
+			const document = response?.document;
+			return response?.status === "ok" && document && document.deleted !== true && document.tombstone !== true
+				&& Array.isArray(document.selection?.skills) && Array.isArray(document.selection?.mcpServers) && Array.isArray(document.selection?.unresolvedRefs);
+		}
 		/** Preset listing grouped by namespace, sorted by display name. */
 		function groupPresets(payload) {
 			const rows = (Array.isArray(payload?.presets) ? payload.presets : []).map(presetRowOf);
@@ -277,7 +385,9 @@ window.__ModuleLoader__.load({
 			if (!response || typeof response !== "object" || response.error === true) return { kind: "error" };
 			if (response.status === "created" || response.status === "edited") return { kind: response.status, presetId: response.presetId ?? null, revision: response.revision ?? null };
 			if (response.status === "deleted") return { kind: "deleted", revision: response.revision ?? null };
-			if (response.status === "name-conflict" || response.status === "rename-required") return { kind: "name-conflict", with: response.with ?? null };
+			if (response.status === "name-conflict" || response.status === "rename-required") return { kind: "name-conflict", with: response.with ?? null, ...(Number.isSafeInteger(response.withRevision) && response.withRevision > 0 ? { withRevision: response.withRevision } : {}) };
+			if (response.status === "source-unavailable") return { kind: "source-unavailable", missing: Array.isArray(response.missing) ? response.missing.filter(name => typeof name === "string") : [] };
+			if (["locked", "unreadable", "unsupported", "source-changed", "absent", "deleted", "confirmation-required", "indeterminate"].includes(response.status)) return { kind: response.status };
 			if (response.status === "revision-conflict") return { kind: "revision-conflict" };
 			if (response.status === "exists") return { kind: "exists", presetId: response.presetId ?? null };
 			if (response.status === "no-workspace") return { kind: "no-workspace" };
@@ -289,15 +399,16 @@ window.__ModuleLoader__.load({
 		 * failure. */
 		function importFeedbackOf(response) {
 			if (!response || typeof response !== "object" || response.error === true) return { kind: "error" };
-			if (response.status === "created") {
+			if (response.status === "created" || response.status === "edited") {
 				return {
-					kind: "created",
+					kind: response.status,
 					presetId: response.presetId ?? null,
 					bound: Number.isSafeInteger(response.bound?.mcpServers) ? response.bound.mcpServers : 0,
 					unresolved: Number.isSafeInteger(response.bound?.unresolvedRefs) ? response.bound.unresolvedRefs : 0,
 				};
 			}
-			if (response.status === "name-conflict" || response.status === "rename-required") return { kind: "name-conflict", with: response.with ?? null };
+			if (response.status === "name-conflict" || response.status === "rename-required") return { kind: "name-conflict", with: response.with ?? null, ...(Number.isSafeInteger(response.withRevision) && response.withRevision > 0 ? { withRevision: response.withRevision } : {}) };
+			if (["locked", "unreadable", "unsupported", "revision-conflict", "confirmation-required", "indeterminate"].includes(response.status)) return { kind: response.status };
 			if (response.status === "rejected") return { kind: "rejected", reason: String(response.reason ?? "rejected") };
 			if (response.status === "no-workspace") return { kind: "no-workspace" };
 			return { kind: "error", status: response.status ?? "unknown" };
@@ -420,11 +531,12 @@ window.__ModuleLoader__.load({
 		 * rollback count (no preset record was created), or a missing target
 		 * root. */
 		function importConfirmOutcomeOf(response) {
-			if (!response || typeof response !== "object" || response.error === true) return { kind: "error" };
-			if (response.status === "created") {
+			if (!response || typeof response !== "object") return { kind: "error" };
+			if (response.error === true) return { kind: "error", ...(Array.isArray(response.installed) ? { installed: response.installed } : {}), ...(response.presetStatus === "unconfirmed" ? { presetStatus: "unconfirmed" } : {}) };
+			if (response.status === "created" || response.status === "edited") {
 				const scopeOf = (value) => (typeof value === "string" && value !== "" ? value : "project");
 				return {
-					kind: "created",
+					kind: response.status,
 					presetId: response.presetId ?? null,
 					bound: Number.isSafeInteger(response.bound?.mcpServers) ? response.bound.mcpServers : 0,
 					unresolved: Number.isSafeInteger(response.bound?.unresolvedRefs)
@@ -449,10 +561,11 @@ window.__ModuleLoader__.load({
 				return { kind: "install-failed", reason: String(response.reason ?? "install-failed"), rolledBack: Number.isSafeInteger(response.rolledBack) && response.rolledBack >= 0 ? response.rolledBack : 0 };
 			}
 			if (response.status === "no-target-root") return { kind: "no-target-root", targetScope: String(response.targetScope ?? "unknown") };
-			if (response.status === "name-conflict" || response.status === "rename-required") return { kind: "name-conflict", with: response.with ?? null };
+			if (response.status === "name-conflict" || response.status === "rename-required") return { kind: "name-conflict", with: response.with ?? null, ...(Number.isSafeInteger(response.withRevision) && response.withRevision > 0 ? { withRevision: response.withRevision } : {}) };
+			if (["locked", "unreadable", "unsupported", "revision-conflict", "confirmation-required", "indeterminate", "commit-failed", "write-failed", "preset-unconfirmed"].includes(response.status)) return { kind: response.status, installed: Array.isArray(response.installed) ? response.installed : [], ...(response.presetStatus === "unconfirmed" ? { presetStatus: "unconfirmed" } : {}) };
 			if (response.status === "no-workspace") return { kind: "no-workspace" };
 			if (response.status === "rejected") return { kind: "rejected", reason: String(response.reason ?? "rejected") };
-			return { kind: "error", status: response.status ?? "unknown" };
+			return { kind: "error", status: response.status ?? "unknown", ...(Array.isArray(response.installed) ? { installed: response.installed } : {}), ...(response.presetStatus === "unconfirmed" ? { presetStatus: "unconfirmed" } : {}) };
 		}
 
 		/** Download filename for the exported package JSON: derived from the
@@ -468,6 +581,8 @@ window.__ModuleLoader__.load({
 			return `${base}.json`;
 		}
 
+		exports.skillIdentityKeyOf = skillIdentityKeyOf;
+		exports.skillEntryKeyOf = skillEntryKeyOf;
 		exports.badgeStateOf = badgeStateOf;
 		exports.skillRowOf = skillRowOf;
 		exports.partitionManagerListing = partitionManagerListing;
@@ -476,8 +591,12 @@ window.__ModuleLoader__.load({
 		exports.closeDirtyDraft = closeDirtyDraft;
 		exports.frameRefreshesSession = frameRefreshesSession;
 		exports.draftFromReceipt = draftFromReceipt;
+		exports.draftAfterRefresh = draftAfterRefresh;
 		exports.draftToggle = draftToggle;
 		exports.commitOutcomeOf = commitOutcomeOf;
+		exports.skillDraftConflicts = skillDraftConflicts;
+		exports.resolveSkillName = resolveSkillName;
+		exports.skillSourceLabels = skillSourceLabels;
 		exports.convergenceHintOf = convergenceHintOf;
 		exports.groupSkillRows = groupSkillRows;
 		exports.filterSkillRows = filterSkillRows;
@@ -486,6 +605,7 @@ window.__ModuleLoader__.load({
 		exports.draftFromPreset = draftFromPreset;
 		exports.presetRowOf = presetRowOf;
 		exports.groupPresets = groupPresets;
+		exports.loadablePresetOf = loadablePresetOf;
 		exports.presetWriteOutcomeOf = presetWriteOutcomeOf;
 		exports.importFeedbackOf = importFeedbackOf;
 		exports.presetExportTextOf = presetExportTextOf;