dsh-capability-panel 1.1.0 → 1.1.1

package/lib/index.d.ts

@@ -98,6 +98,8 @@ interface HostServices {
    * part of a listener still has to contain its own failures.
    */
   listener: (payload: AgentCreatedPayload) => void | Promise<void>): void;
+  /** Fired when a blank session's preset switch commits (never at creation). */
+  on(event: 'agent-preset/selected', listener: (sessionId: unknown, presetId: unknown) => void | Promise<void>): void;
   on(event: 'tools/result', listener: (exec: {
     name?: unknown;
     arguments?: unknown;

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/loopback.ts","../src/host/types.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;AACiB,UAAA,YAAA,CAAY;;;oBAGT;ECeH;AAIjB;AASA;;EACU,SAAA,MAAA,CAAA,EAAA;IACqB,SAAA,aAAA,CAAA,EAAA,MAAA;EAAO,CAAA;AA8BtC;;;;AAwBmD,UArElC,aAAA,CAqEkC;EACqB,GAAA,CAAA,SAAA,EAAA,MAAA,CAAA,EArE9C,SAqE8C,GAAA,SAAA;;AAAD,UAlEtD,eAAA,CAkEsD;EAGtD,SAAA,EAAA,EAAA,MAAY;EAMZ,SAAA,KAAA,EAAA,QAAmB,GAAA,MAAA;EAOnB,SAAA,IAAA,CAAA,EAAY,MAAA;EAKR,SAAA,IAAA,CAAA,EAAA,MAAA;EAAmB,SAAA,WAAA,CAAA,EAAA,MAAA;EAAuB,SAAA,MAAA,CAAA,EAAA,MAAA;;AAIlC,UAlFZ,mBAAA,CAkFY;EACJ,IAAA,EAAA,EAlFf,OAkFe,CAlFP,eAkFO,EAAA,CAAA;EACF,cAAA,CAAA,EAAA,CAAA,EAAA,MAAA,CAAA,EAlFQ,OAkFR,CAAA,OAAA,CAAA;EACD,cAAA,CAAA,QAAA,EAAA,OAAA,CAAA,EAAA,MAAA,GAAA,SAAA;;UArDL;SACR;;;;;;4BAMmB;;UAGX,eAAA;;;;MAE8E,kBAAkB;;UAWhG,aAAA;;;;MACkC,iBAAiB;;;;MACJ,QAAQ;;UAGvD,YAAA;4BACW;;;;;;;;;;;;UAKX,mBAAA;kBACC;;;0BAEsB;;;;UAIvB,YAAA;;;;;qBAKI,qBAAmB,uBAAuB;;;uBAGxC;6BACM;yBACJ;uBACF;sBACD;;;;;;;;sBASE,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;iBAcrC;;;;SACT;;;;;;;UAqBQ,mBAAA;;;;;UAIA,SAAA;;;;;;;;;;;;;;;;;;;;UAeA,YAAA;;;;;;;;;;UASA,mBAAA;;;;;;;;UASA,cAAA,SAAqB;;;;;UAMrB,kBAAA;qCACoB;;;;;AD7MrC;iBESgB,KAAA,MAAW;cA0Bd"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/loopback.ts","../src/host/types.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;AACiB,UAAA,YAAA,CAAY;;;oBAGT;ECeH;AAIjB;AASA;;EACU,SAAA,MAAA,CAAA,EAAA;IACqB,SAAA,aAAA,CAAA,EAAA,MAAA;EAAO,CAAA;AA8BtC;;;;AAwBmD,UArElC,aAAA,CAqEkC;EACqB,GAAA,CAAA,SAAA,EAAA,MAAA,CAAA,EArE9C,SAqE8C,GAAA,SAAA;;AAAD,UAlEtD,eAAA,CAkEsD;EAGtD,SAAA,EAAA,EAAA,MAAY;EAMZ,SAAA,KAAA,EAAA,QAAmB,GAAA,MAAA;EAOnB,SAAA,IAAA,CAAA,EAAY,MAAA;EAKR,SAAA,IAAA,CAAA,EAAA,MAAA;EAAmB,SAAA,WAAA,CAAA,EAAA,MAAA;EAAuB,SAAA,MAAA,CAAA,EAAA,MAAA;;AAIlC,UAlFZ,mBAAA,CAkFY;EACJ,IAAA,EAAA,EAlFf,OAkFe,CAlFP,eAkFO,EAAA,CAAA;EACF,cAAA,CAAA,EAAA,CAAA,EAAA,MAAA,CAAA,EAlFQ,OAkFR,CAAA,OAAA,CAAA;EACD,cAAA,CAAA,QAAA,EAAA,OAAA,CAAA,EAAA,MAAA,GAAA,SAAA;;UArDL;SACR;;;;;;4BAMmB;;UAGX,eAAA;;;;MAE8E,kBAAkB;;UAWhG,aAAA;;;;MACkC,iBAAiB;;;;MACJ,QAAQ;;UAGvD,YAAA;4BACW;;;;;;;;;;;;UAKX,mBAAA;kBACC;;;0BAEsB;;;;UAIvB,YAAA;;;;;qBAKI,qBAAmB,uBAAuB;;;uBAGxC;6BACM;yBACJ;uBACF;sBACD;;;;;;;;sBASE,+BAA+B;;iGAKS;;;;;;;;;;;;;;;;;;;;;;;;iBAc9C;;;;SACT;;;;;;;UAqBQ,mBAAA;;;;;UAIA,SAAA;;;;;;;;;;;;;;;;;;;;UAeA,YAAA;;;;;;;;;;UASA,mBAAA;;;;;;;;UASA,cAAA,SAAqB;;;;;UAMrB,kBAAA;qCACoB;;;;;ADlNrC;iBESgB,KAAA,MAAW;cA0Bd"}

package/lib/index.js

@@ -360,33 +360,60 @@ function createCapabilityController(ctx, appendStats, blockedCounts) {
 		}
 		if (maskedAny) ensurePromptNote(agent, ensureState());
 	};
+	const mutationQueues = /* @__PURE__ */ new Map();
+	const enqueue = (sessionId, op) => {
+		const next = (mutationQueues.get(sessionId) ?? Promise.resolve()).then(op, op);
+		mutationQueues.set(sessionId, next.then(() => void 0, () => void 0));
+		return next;
+	};
+	const restoreImpl = async (sessionId, overrides) => {
+		const groups = [
+			["skill", overrides.skills],
+			["mcp-server", overrides.mcpServers],
+			["mcp-tool", overrides.mcpTools],
+			["system-tool", overrides.systemTools]
+		];
+		for (const [kind, positions] of groups) for (const [name, enabled] of Object.entries(positions)) {
+			if (states.get(sessionId)?.userToggled.has(`${kind}:${name}`) === true) continue;
+			try {
+				if (kind === "skill") await setSkill(sessionId, name, enabled);
+				else if (kind === "mcp-server") setServer(sessionId, name, enabled);
+				else setTool(sessionId, name, enabled, kind === "system-tool");
+			} catch {}
+		}
+		const st = states.get(sessionId);
+		if (st !== void 0 && st.userToggled.size === 0 && st.skills.size === 0 && st.mcpServers.size === 0 && st.mcpTools.size === 0 && st.systemTools.size === 0) {
+			st.noteDispose?.();
+			delete st.noteDispose;
+			states.delete(sessionId);
+		}
+	};
 	return {
 		states,
 		state: (sessionId) => states.get(sessionId),
-		seed,
-		async restore(sessionId, overrides) {
-			const groups = [
-				["skill", overrides.skills],
-				["mcp-server", overrides.mcpServers],
-				["mcp-tool", overrides.mcpTools],
-				["system-tool", overrides.systemTools]
-			];
-			for (const [kind, positions] of groups) for (const [name, enabled] of Object.entries(positions)) {
-				if (states.get(sessionId)?.userToggled.has(`${kind}:${name}`) === true) continue;
-				try {
-					if (kind === "skill") await setSkill(sessionId, name, enabled);
-					else if (kind === "mcp-server") setServer(sessionId, name, enabled);
-					else setTool(sessionId, name, enabled, kind === "system-tool");
-				} catch {}
-			}
+		seed: (sessionId, defaults) => enqueue(sessionId, () => seed(sessionId, defaults)),
+		restore: (sessionId, overrides) => enqueue(sessionId, () => restoreImpl(sessionId, overrides)),
+		reseed: (sessionId, defaults, overrides) => enqueue(sessionId, async () => {
 			const st = states.get(sessionId);
-			if (st !== void 0 && st.userToggled.size === 0 && st.skills.size === 0 && st.mcpServers.size === 0 && st.mcpTools.size === 0 && st.systemTools.size === 0) {
+			if (st !== void 0) {
+				for (const map of [
+					st.systemTools,
+					st.mcpServers,
+					st.mcpTools,
+					st.skills
+				]) {
+					for (const dispose of map.values()) dispose();
+					map.clear();
+				}
 				st.noteDispose?.();
 				delete st.noteDispose;
+				st.userToggled.clear();
 				states.delete(sessionId);
 			}
-		},
-		async set(sessionId, kind, name, enabled) {
+			if (defaults.tools.length > 0 || defaults.skills.length > 0) await seed(sessionId, defaults);
+			if (overrides !== void 0) await restoreImpl(sessionId, overrides);
+		}),
+		set: (sessionId, kind, name, enabled) => enqueue(sessionId, async () => {
 			stateFor(sessionId).userToggled.add(`${kind}:${name}`);
 			if (kind === "skill") await setSkill(sessionId, name, enabled);
 			else if (kind === "mcp-server") setServer(sessionId, name, enabled);
@@ -397,7 +424,7 @@ function createCapabilityController(ctx, appendStats, blockedCounts) {
 				kind: enabled ? "enable" : "disable",
 				name: `${kind}:${name}`
 			});
-		}
+		})
 	};
 }
 
@@ -450,6 +477,27 @@ function registerPresetEnforcement(ctx, capabilities, presetTools, sessionOverri
 			return;
 		}
 	});
+	/**
+	* A preset switch lands AFTER creation (the session header records the
+	* composing preset at creation, and the picker's select() recomposes the
+	* blank session later): the first agent/created seeded the ORIGINAL
+	* preset's defaults, so the new preset's defaults must re-seed on top of a
+	* clean slate. Session overrides replay last — the user's own switches in
+	* this session outrank either preset's defaults.
+	*/
+	ctx.on("agent-preset/selected", (sessionId, presetId) => {
+		try {
+			if (typeof sessionId !== "string" || typeof presetId !== "string") return void 0;
+			const defaults = presetTools.defaultsFor(presetId) ?? {
+				tools: [],
+				skills: []
+			};
+			const overrides = sessionOverrides.overridesFor(sessionId);
+			return capabilities.reseed(sessionId, defaults, overrides);
+		} catch {
+			return;
+		}
+	});
 }
 
 //#endregion
@@ -1035,21 +1083,18 @@ function createPresetToolController(ctx, access) {
 			presets: await Promise.all(presets.map(async (preset) => {
 				let entries = [];
 				let skillRows = [];
+				let mountError;
 				if (preset.broken === void 0) {
 					let scope;
 					try {
 						scope = await agentPresets.standingKeyFor(preset.id);
 						entries = toolSummaries(tools, scope);
-					} catch (error) {
-						throw new HttpError(503, `preset "${preset.id}" tools are unavailable: ${errorMessage(error)}`);
-					}
-					if (skills !== void 0) {
-						const disabledSkills = new Set(stored.presetSkills[preset.id] ?? []);
-						try {
+						if (skills !== void 0) {
+							const disabledSkills = new Set(stored.presetSkills[preset.id] ?? []);
 							skillRows = await presetSkillRows(skills, scope, disabledSkills, cwd, presetDirs);
-						} catch (error) {
-							throw new HttpError(503, `preset "${preset.id}" skills are unavailable: ${errorMessage(error)}`);
 						}
+					} catch (error) {
+						mountError = errorMessage(error);
 					}
 				}
 				const disabled = new Set(configured[preset.id] ?? []);
@@ -1083,7 +1128,7 @@ function createPresetToolController(ctx, access) {
 					name: preset.name ?? preset.id,
 					trust: preset.trust,
 					...preset.description === void 0 ? {} : { description: preset.description },
-					...preset.broken === void 0 ? {} : { broken: preset.broken },
+					...preset.broken !== void 0 ? { broken: preset.broken } : mountError === void 0 ? {} : { broken: `failed to mount: ${mountError}` },
 					skills: skillRows,
 					mcp,
 					systemTools