scream-code 0.14.9 → 0.15.1

package/dist/{dispatch-1ojfKMwf.mjs → dispatch-ATQMQq1p.mjs}

@@ -575,7 +575,7 @@ function createToolMessage(toolCallId, output) {
 }
 //#endregion
 //#region ../../packages/ltod/src/rate-limit-utils.ts
-const QUOTA_EXHAUSTED_BACKOFF_MS = 1800 * 1e3;
+const QUOTA_EXHAUSTED_BACKOFF_MS = 30 * 1e3;
 const RATE_LIMIT_EXCEEDED_BACKOFF_MS = 30 * 1e3;
 const MODEL_CAPACITY_BASE_MS = 45 * 1e3;
 const MODEL_CAPACITY_JITTER_MS = 30 * 1e3;
@@ -605,9 +605,9 @@ function parseRateLimitReason(errorMessage) {
 /**
 * Backoff in ms for a given reason. MODEL_CAPACITY gets jitter to avoid
 * thundering herd. UNKNOWN (a classified 429 with no recognized reason)
-* uses the short 20s SERVER_ERROR backoff — a 30min x ~9 attempt hang
-* would be far worse than a failed turn, and UNKNOWN is not evidence of
-* quota exhaustion.
+* uses the short 20s SERVER_ERROR backoff — a long quota backoff on an
+* unrecoverable error would hang a turn for far longer than the value of
+* retrying, and UNKNOWN is not evidence of quota exhaustion.
 */
 function calculateRateLimitBackoffMs(reason) {
 	switch (reason) {
@@ -765,14 +765,9 @@ var APIEmptyResponseError = class extends ChatProviderError {
 function isRetryableGenerateError(error) {
 	if (error instanceof APIConnectionError$3 || error instanceof APITimeoutError) return true;
 	if (error instanceof APIEmptyResponseError) return true;
-	if (error instanceof APIProviderRateLimitError) return error.reason !== "QUOTA_EXHAUSTED";
-	return error instanceof APIStatusError && [
-		429,
-		500,
-		502,
-		503,
-		504
-	].includes(error.statusCode);
+	if (error instanceof APIProviderRateLimitError) return true;
+	if (error instanceof APIStatusError) return error.statusCode === 429 || error.statusCode === 408 || error.statusCode >= 500 && error.statusCode < 600;
+	return false;
 }
 const CONTEXT_OVERFLOW_MESSAGE_PATTERNS = [
 	/context[ _-]?length/,
@@ -47489,12 +47484,9 @@ async function chatWithRetry(input) {
 			logRequestFailure(input, error, attempt, maxAttempts);
 			throw error;
 		}
-		if (error instanceof APIProviderRateLimitError && error.reason === "QUOTA_EXHAUSTED") {
-			logRequestFailure(input, error, attempt, maxAttempts);
-			throw error;
-		}
-		if (attempt >= maxAttempts || !input.llm.isRetryableError(error)) {
-			logRequestFailure(input, error, attempt, maxAttempts);
+		const attemptLimit = error instanceof APIProviderRateLimitError && error.reason === "QUOTA_EXHAUSTED" ? Math.min(3, maxAttempts) : maxAttempts;
+		if (attempt >= attemptLimit || !input.llm.isRetryableError(error)) {
+			logRequestFailure(input, error, attempt, attemptLimit);
 			throw error;
 		}
 		const delayMs = computeDelayMs(error, delays, attempt);
@@ -47506,7 +47498,7 @@ async function chatWithRetry(input) {
 			stepUuid: input.stepUuid,
 			failedAttempt: attempt,
 			nextAttempt: attempt + 1,
-			maxAttempts,
+			maxAttempts: attemptLimit,
 			delayMs,
 			...retryErrorFields(error)
 		});
@@ -65283,7 +65275,7 @@ var import_yauzl = (/* @__PURE__ */ __commonJSMin(((exports) => {
 	var EventEmitter$3 = __require("events").EventEmitter;
 	var Transform$1 = __require("stream").Transform;
 	var PassThrough$2 = __require("stream").PassThrough;
-	var Writable = __require("stream").Writable;
+	var Writable$1 = __require("stream").Writable;
 	exports.fromBuffer = fromBuffer;
 	function fromBuffer(buffer, options, callback) {
 		if (typeof options === "function") {
@@ -65807,7 +65799,7 @@ var import_yauzl = (/* @__PURE__ */ __commonJSMin(((exports) => {
 			start: position,
 			end: position + length
 		});
-		var writeStream = new Writable();
+		var writeStream = new Writable$1();
 		var written = 0;
 		writeStream._write = function(chunk, encoding, cb) {
 			chunk.copy(buffer, offset + written, 0, chunk.length);
@@ -65976,9 +65968,9 @@ async function hasManifest(dir) {
 	const dirManifest = path.join(dir, ".scream-plugin", "plugin.json");
 	const claudeDirManifest = path.join(dir, ".claude-plugin", "plugin.json");
 	const skillMd = path.join(dir, "SKILL.md");
-	return await isFile$2(rootManifest) || await isFile$2(dirManifest) || await isFile$2(claudeDirManifest) || await isFile$2(skillMd);
+	return await isFile$3(rootManifest) || await isFile$3(dirManifest) || await isFile$3(claudeDirManifest) || await isFile$3(skillMd);
 }
-async function isFile$2(p) {
+async function isFile$3(p) {
 	try {
 		return (await stat(p)).isFile();
 	} catch {
@@ -66441,12 +66433,12 @@ async function parseManifest(pluginRoot) {
 	const rootJsonPath = path.join(pluginRoot, SCREAM_PLUGIN_ROOT_PATH);
 	const dirJsonPath = path.join(pluginRoot, SCREAM_PLUGIN_DIR_PATH);
 	const claudeDirJsonPath = path.join(pluginRoot, CLAUDE_PLUGIN_DIR_PATH);
-	const rootJsonExists = await isFile$1(rootJsonPath);
-	const dirJsonExists = await isFile$1(dirJsonPath);
-	const claudeDirJsonExists = await isFile$1(claudeDirJsonPath);
+	const rootJsonExists = await isFile$2(rootJsonPath);
+	const dirJsonExists = await isFile$2(dirJsonPath);
+	const claudeDirJsonExists = await isFile$2(claudeDirJsonPath);
 	if (!rootJsonExists && !dirJsonExists && !claudeDirJsonExists) {
 		const skillMdPath = path.join(pluginRoot, BARE_SKILL_PATH);
-		if (await isFile$1(skillMdPath)) return {
+		if (await isFile$2(skillMdPath)) return {
 			manifest: {
 				name: path.basename(pluginRoot),
 				skills: [pluginRoot]
@@ -66524,7 +66516,7 @@ async function parseManifest(pluginRoot) {
 	}
 	let skills = await resolveSkillsField(pluginRoot, raw["skills"], diagnostics);
 	if (raw["skills"] === void 0) {
-		if (await isFile$1(path.join(pluginRoot, "SKILL.md"))) skills = [pluginRoot];
+		if (await isFile$2(path.join(pluginRoot, "SKILL.md"))) skills = [pluginRoot];
 	}
 	const skillInstructions = typeof raw["skillInstructions"] === "string" ? raw["skillInstructions"] : void 0;
 	const config = typeof raw["config"] === "object" && raw["config"] !== null && !Array.isArray(raw["config"]) ? raw["config"] : void 0;
@@ -66856,7 +66848,7 @@ async function discoverSkillDirs(root, maxDepth) {
 		for (const entry of entries) {
 			if (!entry.isDirectory()) continue;
 			const child = path.join(dir, entry.name);
-			if (await isFile$1(path.join(child, BARE_SKILL_PATH))) found.push(child);
+			if (await isFile$2(path.join(child, BARE_SKILL_PATH))) found.push(child);
 			await walk(child, depth + 1);
 		}
 	}
@@ -66866,7 +66858,7 @@ async function discoverSkillDirs(root, maxDepth) {
 	for (const dir of sorted) if (!result.some((parent) => dir.startsWith(parent + path.sep))) result.push(dir);
 	return result;
 }
-async function isFile$1(p) {
+async function isFile$2(p) {
 	try {
 		return (await stat(p)).isFile();
 	} catch {
@@ -67863,7 +67855,10 @@ async function keepNewestBackupOnly(backupsForId) {
 async function recordFrom(input) {
 	const { parsed } = input;
 	const hasError = parsed.diagnostics.some((d) => d.severity === "error");
-	const skills = hasError || parsed.manifest === void 0 ? [] : await discoverPluginSkills(input.id, parsed.manifest);
+	const discovery = hasError || parsed.manifest === void 0 ? {
+		skills: [],
+		diagnostics: []
+	} : await discoverPluginSkills(input.id, parsed.manifest);
 	return {
 		id: input.id,
 		root: input.root,
@@ -67875,13 +67870,13 @@ async function recordFrom(input) {
 		originalSource: input.originalSource,
 		capabilities: input.capabilities,
 		github: input.github,
-		skills,
-		skillCount: skills.length,
+		skills: discovery.skills,
+		skillCount: discovery.skills.length,
 		manifest: parsed.manifest,
 		manifestKind: parsed.manifestKind,
 		manifestPath: parsed.manifestPath,
 		shadowedManifestPath: parsed.shadowedManifestPath,
-		diagnostics: parsed.diagnostics,
+		diagnostics: [...parsed.diagnostics, ...discovery.diagnostics],
 		skillInstructions: parsed.manifest?.skillInstructions
 	};
 }
@@ -67911,11 +67906,26 @@ async function discoverPluginSkills(pluginId, manifest) {
 			instructions: manifest?.skillInstructions
 		}
 	}));
-	if (roots.length === 0) return [];
-	return (await discoverSkills({ roots })).map((skill) => ({
-		name: skill.name,
-		description: skill.description
-	}));
+	if (roots.length === 0) return {
+		skills: [],
+		diagnostics: []
+	};
+	const diagnostics = [];
+	return {
+		skills: (await discoverSkills({
+			roots,
+			onWarning: (message) => {
+				diagnostics.push({
+					severity: "warn",
+					message
+				});
+			}
+		})).map((skill) => ({
+			name: skill.name,
+			description: skill.description
+		})),
+		diagnostics
+	};
 }
 function recordToInfo(record) {
 	return {
@@ -77142,7 +77152,7 @@ function describeError(error) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/state/inspect-own-assets.md
-var inspect_own_assets_default = "Use this tool to inspect the agent's own persistent assets: skills, MCP server declarations, configuration files, the memory store, and the knowledge base. It reports what exists, where it lives, and whether it looks valid.\n\n**When to use:**\n- The user asks \"what skills do you have?\", \"show me your mcp config\", \"how is your memory set up?\", \"where is your knowledge base?\"\n- Auditing your own configuration and data (e.g. checking whether mcp.json parses, whether skill frontmatter is intact)\n\n**Inventory questions — this tool is the single answering view.** When the user asks what you have, in ANY wording (skills / plugins / capabilities / MCP / tools / 技能 / 插件 / 能力), treat it as one intent and answer from this inventory: it reports the skill packages in the three standard skill scopes (user, plugin-managed, project) with live `invocable` status from the skill registry, plus MCP declarations. Skills discovered from non-standard locations (nested directories, `.agents/skills`) may not appear here. Pair it with the system-prompt skills section for the \"callable right now\" view. Division of labor: **InspectOwnAssets = inventory (read-only)**, **ManagePlugin = changes (install/enable/remove)**, **Skill tool = invocation**.\n\nYou must NOT modify any of these assets unless the user explicitly asks you to — this tool is strictly read-only.\n\n**When NOT to use:**\n- Reading the user's workspace files — use `read` / `glob` / `grep` instead\n- Writing or editing anything — this tool is strictly read-only\n\n**How to use:**\n- Call with no arguments (or `scope: \"all\"`) to inspect everything\n- Narrow with `scope: \"skills\"` / `\"mcp\"` / `\"config\"` / `\"memory\"` / `\"knowledge\"` to inspect a single category\n\nThis tool never writes, creates, or modifies any file.\n";
+var inspect_own_assets_default = "Use this tool to inspect the agent's own persistent assets: skills, MCP server declarations, configuration files, the memory store, and the knowledge base. It reports what exists, where it lives, and whether it looks valid.\n\n**When to use:**\n- The user asks \"what skills do you have?\", \"show me your mcp config\", \"how is your memory set up?\", \"where is your knowledge base?\", \"检查技能/插件状态\"\n- Auditing your own configuration and data (e.g. checking whether mcp.json parses, why a skill is not usable, which plugin directories are unregistered)\n\n**Inventory questions — this tool is the single answering view.** When the user asks what you have, in ANY wording (skills / plugins / capabilities / MCP / tools / 技能 / 插件 / 能力), treat it as one intent and answer from this inventory: it reports the skill packages in the three standard skill scopes (user, plugin-managed, project) with live `invocable` status from the skill registry, plus MCP declarations. Every \"not invocable\" entry carries its concrete reason (registered but not invocable / broken frontmatter with the parse message / unregistered), and plugin-managed entries show whether their directory is registered in the plugin table, with unregistered directories listed separately — so a status question is answered by this single call, no need to consult ManagePlugin for the same facts. Skills discovered from non-standard locations (nested directories, `.agents/skills`) may not appear here. Pair it with the system-prompt skills section for the \"callable right now\" view. Division of labor: **InspectOwnAssets = inventory (read-only)**, **ManagePlugin = changes (install/enable/remove)**, **Skill tool = invocation**.\n\nYou must NOT modify any of these assets unless the user explicitly asks you to — this tool is strictly read-only.\n\n**When NOT to use:**\n- Reading the user's workspace files — use `read` / `glob` / `grep` instead\n- Writing or editing anything — this tool is strictly read-only\n\n**How to use:**\n- Call with no arguments (or `scope: \"all\"`) to inspect everything\n- Narrow with `scope: \"skills\"` / `\"mcp\"` / `\"config\"` / `\"memory\"` / `\"knowledge\"` to inspect a single category\n\nThis tool never writes, creates, or modifies any file.\n";
 const InspectOwnAssetsInputSchema = z.object({ scope: z.enum([
 	"all",
 	"skills",
@@ -77151,8 +77161,14 @@ const InspectOwnAssetsInputSchema = z.object({ scope: z.enum([
 	"memory",
 	"knowledge"
 ]).optional().describe("Which self-assets to inspect: 'all' (default) reports everything; narrow to 'skills', 'mcp', 'config', 'memory', or 'knowledge'.") });
-/** Bytes to read from the head of a file when checking frontmatter. */
-const FRONTMATTER_READ_LIMIT = 32 * 1024;
+/**
+* Skills larger than this are reported as broken rather than parsed. Real
+* skill bundles are a few KB; the cap exists only to guard against reading a
+* pathological file (e.g. a multi-GB binary misnamed SKILL.md) in one shot.
+*/
+const SKILL_FILE_READ_LIMIT = 4 * 1024 * 1024;
+/** Recursion bound for counting nested SKILL.md files inside unregistered dirs. */
+const ORPHAN_SCAN_DEPTH = 4;
 /**
 * Common documentation files shipped inside skill/plugin bundles are not
 * skills; matched case-insensitively against top-level flat `.md` entries
@@ -77192,34 +77208,73 @@ function describeFile(info) {
 	if (!info.exists) return "missing";
 	return `${info.size} bytes`;
 }
-/** Frontmatter check (bounded read): starts with `---` and contains a `name:` line. */
-async function checkFrontmatter(path) {
-	let handle;
+async function isFile$1(path) {
 	try {
-		handle = await open(path, "r");
-		const buffer = Buffer.alloc(FRONTMATTER_READ_LIMIT);
-		const { bytesRead } = await handle.read(buffer, 0, FRONTMATTER_READ_LIMIT, 0);
-		const head = buffer.subarray(0, bytesRead).toString("utf-8").split("\n").slice(0, 25);
-		if (head[0]?.trim() !== "---") return "missing";
-		return head.some((line) => /^name\s*:/.test(line)) ? "ok" : "broken";
+		return (await stat(path)).isFile();
 	} catch {
-		return "missing";
-	} finally {
-		await handle?.close().catch(() => {});
+		return false;
 	}
 }
-/** True if a directory is a directory-based skill (contains SKILL.md). */
-async function isSkillDir(dir) {
+/**
+* Parse a skill file the same way the registry does (`skill/parser`), so the
+* inventory's status and names agree with what is actually invocable: a file
+* whose frontmatter fails YAML parsing is `broken` with the real message, not
+* a heuristic "ok" based on the presence of a `name:` line.
+*/
+async function parseSkillEntry(path, fallbackName, requireFrontmatter) {
+	let info;
 	try {
-		return (await stat(join$1(dir, "SKILL.md"))).isFile();
+		info = await stat(path);
 	} catch {
-		return false;
+		return {
+			name: fallbackName,
+			frontmatter: "missing"
+		};
+	}
+	if (info.size > SKILL_FILE_READ_LIMIT) return {
+		name: fallbackName,
+		frontmatter: "ok"
+	};
+	let text;
+	try {
+		text = await readFile(path, "utf8");
+	} catch {
+		return {
+			name: fallbackName,
+			frontmatter: "missing"
+		};
+	}
+	if (text.split(/\r?\n/, 1)[0]?.trim() !== "---") {
+		if (requireFrontmatter) return {
+			name: fallbackName,
+			frontmatter: "missing"
+		};
+		return {
+			name: fallbackName,
+			frontmatter: "ok"
+		};
+	}
+	try {
+		return {
+			name: (await parseSkillFromFile({
+				skillMdPath: path,
+				skillDirName: fallbackName,
+				source: "user"
+			})).name,
+			frontmatter: "ok"
+		};
+	} catch (error) {
+		return {
+			name: fallbackName,
+			frontmatter: "broken",
+			reason: error instanceof SkillParseError ? error.message : error instanceof Error ? error.message : String(error)
+		};
 	}
 }
 /**
-* List skill entries under a managed skills directory, mirroring the loader's
-* rules: skip dot-entries, node_modules and README.md; directory skills must
-* contain SKILL.md; flat skills are non-README `.md` files.
+* List skill entries under a skills directory, mirroring the loader's rules:
+* skip dot-entries, node_modules and README.md; directory skills must contain
+* SKILL.md; flat skills are non-README `.md` files (frontmatter optional).
 */
 async function listSkills(dir) {
 	let entries;
@@ -77232,36 +77287,141 @@ async function listSkills(dir) {
 	for (const entry of entries) {
 		if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
 		if (entry.isDirectory()) {
-			if (!await isSkillDir(join$1(dir, entry.name))) continue;
 			const skillMd = join$1(dir, entry.name, "SKILL.md");
-			const fm = await checkFrontmatter(skillMd);
-			const skillName = await readSkillName(skillMd) ?? entry.name;
+			if (!await isFile$1(skillMd)) continue;
+			const parsed = await parseSkillEntry(skillMd, entry.name, true);
 			out.push({
-				name: skillName,
+				...parsed,
 				path: skillMd,
-				kind: "dir",
-				frontmatter: fm
+				kind: "dir"
 			});
 		} else if (entry.isFile() && entry.name.endsWith(".md")) {
 			if (DOCUMENTATION_MARKDOWN_LOWER.has(entry.name.toLowerCase())) continue;
 			const path = join$1(dir, entry.name);
-			const skillName = await readSkillName(path) ?? entry.name.slice(0, -3);
+			const parsed = await parseSkillEntry(path, entry.name.slice(0, -3), false);
 			out.push({
-				name: skillName,
+				...parsed,
 				path,
-				kind: "flat",
-				frontmatter: "ok"
+				kind: "flat"
 			});
 		}
 	}
 	return out.toSorted((a, b) => a.name.localeCompare(b.name));
 }
-function buildInvocableNameSet(agent) {
-	return new Set((agent.skills?.registry.listInvocableSkills() ?? []).map((s) => s.name));
+/** Count every SKILL.md reachable under `dirPath` (inclusive), depth-limited. */
+async function countNestedSkillFiles(dirPath, depth) {
+	if (depth > ORPHAN_SCAN_DEPTH) return 0;
+	let entries;
+	try {
+		entries = await readdir(dirPath, { withFileTypes: true });
+	} catch {
+		return 0;
+	}
+	let count = 0;
+	for (const entry of entries) {
+		if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
+		if (entry.isDirectory()) count += await countNestedSkillFiles(join$1(dirPath, entry.name), depth + 1);
+		else if (entry.name === "SKILL.md") count++;
+	}
+	return count;
 }
-function formatSkillEntry(entry, invocable) {
+/**
+* Describe an unregistered directory under the managed plugins root so the
+* inventory can surface things the plugin table cannot see: orphan skill
+* bundles, nested skill trees, and dormant code plugins (entryPoint) that
+* would run arbitrary code on install+activate.
+*/
+async function describeUnregisteredDir(dirPath) {
+	const parts = [];
+	const topLevelSkillMd = await isFile$1(join$1(dirPath, "SKILL.md"));
+	const totalSkills = await countNestedSkillFiles(dirPath, 0);
+	if (topLevelSkillMd) parts.push(totalSkills > 1 ? `skill bundle (${totalSkills} SKILL.md)` : "skill bundle");
+	else if (totalSkills > 0) parts.push(`${totalSkills} nested skills (not registered)`);
+	try {
+		const manifestText = await readFile(join$1(dirPath, "scream.plugin.json"), "utf8");
+		let hasEntryPoint = false;
+		try {
+			const manifest = JSON.parse(manifestText);
+			hasEntryPoint = typeof manifest.entryPoint === "string" && manifest.entryPoint.length > 0;
+		} catch {
+			parts.push("scream.plugin.json (unparseable)");
+			return parts.join("; ");
+		}
+		parts.push(hasEntryPoint ? "code plugin (entryPoint)" : "manifest but not registered");
+	} catch {}
+	if (parts.length === 0) parts.push("no manifest or skill files");
+	return parts.join("; ");
+}
+/**
+* Plugin-managed skills live under `<managedDir>/<plugin>/SKILL.md`. When the
+* plugin table (via `agent.toolServices.plugins`) is reachable, entries carry
+* their registration status and unregistered directories are reported in a
+* dedicated section; without it, the listing falls back to a pure file scan.
+*/
+async function listManagedSkills(managedDir, records) {
+	let plugins;
+	try {
+		plugins = await readdir(managedDir, { withFileTypes: true });
+	} catch {
+		return {
+			entries: [],
+			orphanLines: []
+		};
+	}
+	const entries = [];
+	const orphanLines = [];
+	for (const plugin of plugins) {
+		if (!plugin.isDirectory() || plugin.name.startsWith(".")) continue;
+		const dirPath = join$1(managedDir, plugin.name);
+		const skillMd = join$1(dirPath, "SKILL.md");
+		const record = records?.get(plugin.name);
+		if (records === void 0 || record === void 0) {
+			if (records === void 0) {
+				if (!await isFile$1(skillMd)) continue;
+				const parsed = await parseSkillEntry(skillMd, plugin.name, true);
+				entries.push({
+					...parsed,
+					path: skillMd,
+					kind: "dir",
+					plugin: plugin.name
+				});
+			} else if (await isFile$1(skillMd)) orphanLines.push(`- ${plugin.name} — ${await describeUnregisteredDir(dirPath)} — \`${dirPath}\``);
+			else if (await isFile$1(join$1(dirPath, "scream.plugin.json"))) orphanLines.push(`- ${plugin.name} — ${await describeUnregisteredDir(dirPath)} — \`${dirPath}\``);
+			else if (await countNestedSkillFiles(dirPath, 0) > 0) orphanLines.push(`- ${plugin.name} — ${await describeUnregisteredDir(dirPath)} — \`${dirPath}\``);
+			continue;
+		}
+		if (await isFile$1(skillMd)) {
+			const parsed = await parseSkillEntry(skillMd, plugin.name, true);
+			entries.push({
+				...parsed,
+				path: skillMd,
+				kind: "dir",
+				plugin: plugin.name,
+				registered: true
+			});
+		}
+	}
+	return {
+		entries,
+		orphanLines
+	};
+}
+/**
+* Traffic-light status for a skill entry. The registry is the single source of
+* truth for what is callable; everything else is a disk-side explanation.
+*/
+function classify(entry, invocableNames, registeredNames) {
+	const variants = [entry.name];
+	if (entry.plugin !== void 0) variants.push(`${entry.plugin}:${entry.name}`);
+	if (variants.some((v) => invocableNames.has(v))) return "invocable";
+	if (variants.some((v) => registeredNames.has(v))) return "not invocable — registered but not invocable";
+	if (entry.frontmatter === "broken") return `not invocable — broken: ${entry.reason ?? "frontmatter failed to parse"}`;
+	return "not invocable — unregistered";
+}
+function formatSkillEntry(entry, status) {
 	const origin = entry.plugin === void 0 ? "" : ` — plugin: ${entry.plugin}`;
-	return `- ${entry.name} — ${entry.kind === "dir" ? "dir" : "flat"} — ${entry.frontmatter} — ${invocable ? "invocable" : "not invocable"}${origin} — \`${entry.path}\``;
+	const registration = entry.registered === true ? " — registered" : "";
+	return `- ${entry.name} — ${entry.kind} — ${entry.frontmatter} — ${status}${origin}${registration} — \`${entry.path}\``;
 }
 async function inspectConfig(home, userHome) {
 	const items = [
@@ -77282,88 +77442,45 @@ async function inspectSkills(home, userHome, cwd, agent) {
 		userHomeDir: userHome,
 		workDir: cwd
 	});
-	const invocableNames = buildInvocableNameSet(agent);
+	const registry = agent.skills?.registry;
+	const invocableNames = new Set((registry?.listInvocableSkills() ?? []).map((s) => s.name));
+	const registeredNames = new Set((registry?.listSkills?.() ?? []).map((s) => s.name));
+	const manager = agent.toolServices?.plugins;
+	const pluginRecords = manager === void 0 ? void 0 : new Map(manager.list().map((r) => [r.id, r]));
 	const sections = ["## Skills", ""];
 	let invocableCount = 0;
 	let totalCount = 0;
-	const isInvocable = (entry) => invocableNames.has(entry.name) || entry.plugin !== void 0 && invocableNames.has(`${entry.plugin}:${entry.name}`);
-	const track = (entry, invocable) => {
+	const track = (entry) => {
 		totalCount++;
-		if (invocable) invocableCount++;
-		return formatSkillEntry(entry, invocable);
+		if (classify(entry, invocableNames, registeredNames) === "invocable") invocableCount++;
+		return formatSkillEntry(entry, classify(entry, invocableNames, registeredNames));
 	};
 	const userEntries = await listSkills(userDir);
 	sections.push(`User skills (${userDir}): ${userEntries.length === 0 ? "none" : ""}`);
-	sections.push(...userEntries.map((e) => track(e, isInvocable(e))));
+	sections.push(...userEntries.map(track));
 	const extraDir = join$1(home, "plugins", "managed");
-	const extraEntries = await listManagedSkills(extraDir);
+	const managed = await listManagedSkills(extraDir, pluginRecords);
 	sections.push("");
-	sections.push(`Plugin-managed skills (${extraDir}): ${extraEntries.length === 0 ? "none" : ""}`);
-	sections.push(...extraEntries.map((e) => track(e, isInvocable(e))));
+	sections.push(`Plugin-managed skills (${extraDir}): ${managed.entries.length === 0 ? "none" : ""}`);
+	sections.push(...managed.entries.map(track));
+	if (pluginRecords !== void 0) for (const record of pluginRecords.values()) {
+		const warns = record.diagnostics.filter((d) => d.severity === "warn");
+		if (warns.length === 0) continue;
+		sections.push(`plugin ${record.id}: warnings: [${warns.map((d) => d.message).join(" | ")}]`);
+	}
+	if (managed.orphanLines.length > 0) {
+		sections.push("");
+		sections.push(`Unregistered plugin dirs (${extraDir}):`);
+		sections.push(...managed.orphanLines);
+	}
 	const projectEntries = await listSkills(projectDir);
 	sections.push("");
 	sections.push(`Project skills (${projectDir}): ${projectEntries.length === 0 ? "none" : ""}`);
-	sections.push(...projectEntries.map((e) => track(e, isInvocable(e))));
+	sections.push(...projectEntries.map((e) => track(e)));
 	sections.push("");
-	sections.push(`Invocable now: ${invocableCount}/${totalCount} (against the live skill registry; entries marked "not invocable" exist on disk but are disabled, shadowed, renamed, or broken)`);
+	sections.push(`Invocable now: ${invocableCount}/${totalCount} (against the live skill registry; entries marked "not invocable" carry their reason — registered-but-not, broken frontmatter, or unregistered)`);
 	return sections.join("\n");
 }
-/**
-* Extracts the skill name from SKILL.md frontmatter (best effort) so the
-* inventory name matches what the skill registry holds; returns null when
-* frontmatter is missing or has no name line.
-*/
-async function readSkillName(path) {
-	let handle;
-	try {
-		handle = await open(path, "r");
-		const buffer = Buffer.alloc(FRONTMATTER_READ_LIMIT);
-		const { bytesRead } = await handle.read(buffer, 0, FRONTMATTER_READ_LIMIT, 0);
-		const head = buffer.subarray(0, bytesRead).toString("utf-8").split("\n").slice(0, 25);
-		if (head[0]?.trim() !== "---") return null;
-		for (const line of head.slice(1)) {
-			if (line.trim() === "---") break;
-			const m = /^name\s*:\s*(.+)$/.exec(line);
-			if (m !== null) {
-				const value = m[1].trim().replaceAll(/^["']|["']$/g, "");
-				return value.length > 0 ? value : null;
-			}
-		}
-		return null;
-	} catch {
-		return null;
-	} finally {
-		await handle?.close().catch(() => {});
-	}
-}
-/**
-* List plugin-managed skills: each `<dir>/SKILL.md` under a managed plugin
-* directory is a skill entry (Extra source, mirroring plugin/manager.ts).
-*/
-async function listManagedSkills(managedDir) {
-	let plugins;
-	try {
-		plugins = await readdir(managedDir, { withFileTypes: true });
-	} catch {
-		return [];
-	}
-	const out = [];
-	for (const plugin of plugins) {
-		if (!plugin.isDirectory() || plugin.name.startsWith(".")) continue;
-		const skillMd = join$1(managedDir, plugin.name, "SKILL.md");
-		if (!await isSkillDir(join$1(managedDir, plugin.name))) continue;
-		const fm = await checkFrontmatter(skillMd);
-		const skillName = await readSkillName(skillMd) ?? plugin.name;
-		out.push({
-			name: skillName,
-			path: skillMd,
-			kind: "dir",
-			frontmatter: fm,
-			plugin: plugin.name
-		});
-	}
-	return out.toSorted((a, b) => a.name.localeCompare(b.name));
-}
 /** mcp.json files larger than this are reported as oversize and not parsed. */
 const MCP_CONFIG_SIZE_LIMIT = 1024 * 1024;
 async function inspectMcp(home, cwd) {
@@ -122932,24 +123049,28 @@ var ScreamCore = class {
 		return this.config;
 	}
 	async setScreamConfig(input) {
-		const config = mergeConfigPatch(readConfigFile(this.configPath), input);
-		await writeConfigFile(this.configPath, config);
-		return this.config = loadRuntimeConfig(this.configPath);
+		return this.enqueueConfigMutation(async () => {
+			const config = mergeConfigPatch(readConfigFile(this.configPath), input);
+			await writeConfigFile(this.configPath, config);
+			return this.config = loadRuntimeConfig(this.configPath);
+		});
 	}
 	async removeScreamProvider(input) {
-		const config = readConfigFile(this.configPath);
-		delete config.providers[input.providerId];
-		let removedDefault = false;
-		const existingModels = config.models ?? {};
-		for (const [key, model] of Object.entries(existingModels)) if (typeof model === "object" && model !== null && !Array.isArray(model) && model["provider"] === input.providerId) {
-			delete existingModels[key];
-			if (config.defaultModel === key) removedDefault = true;
-		}
-		config.models = existingModels;
-		if (removedDefault) config.defaultModel = void 0;
-		if (config.defaultProvider === input.providerId) config.defaultProvider = void 0;
-		await writeConfigFile(this.configPath, config);
-		return this.config = loadRuntimeConfig(this.configPath);
+		return this.enqueueConfigMutation(async () => {
+			const config = readConfigFile(this.configPath);
+			delete config.providers[input.providerId];
+			let removedDefault = false;
+			const existingModels = config.models ?? {};
+			for (const [key, model] of Object.entries(existingModels)) if (typeof model === "object" && model !== null && !Array.isArray(model) && model["provider"] === input.providerId) {
+				delete existingModels[key];
+				if (config.defaultModel === key) removedDefault = true;
+			}
+			config.models = existingModels;
+			if (removedDefault) config.defaultModel = void 0;
+			if (config.defaultProvider === input.providerId) config.defaultProvider = void 0;
+			await writeConfigFile(this.configPath, config);
+			return this.config = loadRuntimeConfig(this.configPath);
+		});
 	}
 	setRuntimeSystemPrompt({ sessionId, ...payload }) {
 		return this.sessionApi(sessionId).setRuntimeSystemPrompt(payload);
@@ -123491,6 +123612,23 @@ var ScreamCore = class {
 	reloadProviderManager() {
 		return this.config = loadRuntimeConfig(this.configPath);
 	}
+	/**
+	* Serialize config-file mutations. Both setScreamConfig and
+	* removeScreamProvider are read-modify-write cycles that read the file
+	* synchronously and then await the write; two calls issued together (e.g.
+	* cycling thinking levels plus confirming a model in the picker fire
+	* back-to-back setConfig patches) would otherwise read the SAME stale
+	* snapshot, and the later write silently reverts the earlier patch — a
+	* lost update that makes e.g. a just-selected default model flip back to
+	* the old one. The queue guarantees each cycle re-reads after the
+	* previous write completed.
+	*/
+	configMutationQueue = Promise.resolve();
+	enqueueConfigMutation(mutate) {
+		const run = this.configMutationQueue.then(mutate, mutate);
+		this.configMutationQueue = run.catch(() => void 0);
+		return run;
+	}
 	async refreshSessionRuntimeConfig(session, config) {
 		const api = new SessionAPIImpl(session);
 		const requested = (await api.getModel({ agentId: "main" })).trim();
@@ -130679,11 +130817,10 @@ async function changeThinkingLevel(host, alias, level) {
 	}
 	const prevLevel = host.state.appState.thinkingLevel;
 	const isActiveModel = alias === host.state.appState.model;
+	const session = host.session;
 	if (isActiveModel && level !== prevLevel) {
-		const session = host.session;
 		try {
-			if (session === void 0) await host.authFlow.activateModelAfterLogin(alias, level);
-			else await session.setThinking(level);
+			if (session !== void 0) await session.setThinking(level);
 		} catch (error) {
 			const msg = formatErrorMessage(error);
 			host.showError(`Failed to set thinking: ${msg}`);
@@ -130699,7 +130836,7 @@ async function changeThinkingLevel(host, alias, level) {
 		host.showError(`Failed to save thinking default: ${msg}`);
 		return;
 	}
-	const status = isActiveModel && level !== prevLevel ? `Thinking set to ${level} for ${alias}.` : persisted ? `Saved thinking ${level} as default for ${alias}.` : `Thinking already ${level} for ${alias}.`;
+	const status = isActiveModel && level !== prevLevel ? session === void 0 ? persisted ? `No active session - thinking ${level} for ${alias} saved as default.` : `No active session - thinking ${level} was NOT saved (${alias} is not the default model, so its level applies only when a new session selects it).` : `Thinking set to ${level} for ${alias}.` : persisted ? `Saved thinking ${level} as default for ${alias}.` : `Thinking already ${level} for ${alias}.`;
 	host.showStatus(status, host.state.theme.colors.success);
 }
 async function persistThinkingDefault(host, alias, level) {
@@ -130728,18 +130865,16 @@ async function performModelSwitch(host, alias, thinkingLevel) {
 	const prevThinkingLevel = host.state.appState.thinkingLevel;
 	const modelChanged = alias !== prevModel;
 	const thinkingChanged = thinkingLevel !== prevThinkingLevel;
-	const needsSessionActivation = modelChanged || thinkingChanged;
-	const overflow = alias !== prevModel ? contextOverflowForModel(host.state.appState, alias) : null;
+	const session = host.session;
+	const overflow = session !== void 0 && alias !== prevModel ? contextOverflowForModel(host.state.appState, alias) : null;
 	if (overflow !== null) {
 		host.showNotice("Storm Breaker（风暴守护者）", `无法切换到模型「${alias}」：当前会话上下文 ${formatTokenCount$1(overflow.currentTokens)} 已超出该模型上限 ${formatTokenCount$1(overflow.maxContextTokens)}。建议先执行 /compact 压缩上下文，或选择上下文窗口更大的模型。`);
 		return;
 	}
-	const session = host.session;
 	let effectiveAlias = alias;
 	let effectiveThinking = thinkingLevel;
 	try {
-		if (session === void 0 && needsSessionActivation) await host.authFlow.activateModelAfterLogin(alias, thinkingLevel);
-		else if (session !== void 0) {
+		if (session !== void 0) {
 			if (modelChanged) await session.setModel(alias);
 			if (thinkingChanged) await session.setThinking(thinkingLevel);
 			const confirmed = await session.getStatus().catch(() => null);
@@ -130762,12 +130897,13 @@ async function performModelSwitch(host, alias, thinkingLevel) {
 		persisted = await persistModelSelection(host, alias, thinkingLevel);
 	} catch (error) {
 		const msg = formatErrorMessage(error);
-		host.showError(`Switched to ${effectiveAlias}, but failed to save default: ${msg}`);
+		host.showError(`${session === void 0 ? "Selected" : "Switched to"} ${effectiveAlias}, but failed to save default: ${msg}`);
 		return;
 	}
 	const hasHistory = host.state.appState.contextTokens > 0;
 	const cacheWarning = modelChanged && hasHistory ? " Note: switching models invalidates the existing prompt cache - use /new to avoid extra token costs." : "";
 	const status = (() => {
+		if (session === void 0 && (modelChanged || thinkingChanged)) return `No active session - ${effectiveAlias} (thinking ${effectiveThinking}) saved as default. It applies when you start a new session.`;
 		if (modelChanged) return `Switched to ${effectiveAlias} with thinking ${effectiveThinking}.${cacheWarning}`;
 		if (thinkingChanged) return `Thinking set to ${effectiveThinking} for ${effectiveAlias}.`;
 		if (persisted) return `Saved ${effectiveAlias} with thinking ${effectiveThinking} as default.`;