skilld 0.9.5 → 0.9.6

package/dist/_chunks/detect-imports.mjs

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./chunk.mjs";
 import { _ as writeSections, b as sanitizeMarkdown, h as readCachedSection, y as repairMarkdown } from "./storage.mjs";
-import { d as getPackageRules, o as mapInsert, t as yamlEscape, u as getFilePatterns } from "./yaml.mjs";
+import { o as getFilePatterns, s as getPackageRules, t as yamlEscape } from "./yaml.mjs";
 import { homedir } from "node:os";
 import { dirname, join, relative } from "pathe";
 import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, symlinkSync, unlinkSync, writeFileSync } from "node:fs";
@@ -8,6 +8,7 @@ import { exec, spawn, spawnSync } from "node:child_process";
 import { globby } from "globby";
 import { findDynamicImports, findStaticImports } from "mlly";
 import { createHash } from "node:crypto";
+import { setTimeout } from "node:timers/promises";
 import { promisify } from "node:util";
 import { readFile } from "node:fs/promises";
 import { parseSync } from "oxc-parser";
@@ -1392,58 +1393,39 @@ const TOOL_VERBS = {
 	search_file_content: "Searching"
 };
 function createToolProgress(log) {
-	const pending = /* @__PURE__ */ new Map();
-	let timer = null;
-	let lastEmitted = "";
-	function flush() {
-		const parts = [];
-		for (const [section, { verb, path, count }] of pending) {
-			const suffix = count > 1 ? ` \x1B[90m(+${count - 1})\x1B[0m` : "";
-			parts.push(`\x1B[90m[${section}]\x1B[0m ${verb} ${path}${suffix}`);
-		}
-		const msg = parts.join("  ");
-		if (msg && msg !== lastEmitted) {
+	let lastMsg = "";
+	let repeatCount = 0;
+	function emit(msg) {
+		if (msg === lastMsg) {
+			repeatCount++;
+			log.message(`${msg} \x1B[90m(+${repeatCount})\x1B[0m`);
+		} else {
+			lastMsg = msg;
+			repeatCount = 0;
 			log.message(msg);
-			lastEmitted = msg;
 		}
-		pending.clear();
-		timer = null;
 	}
 	return ({ type, chunk, section }) => {
 		if (type === "text") {
-			log.message(`${section ? `\x1B[90m[${section}]\x1B[0m ` : ""}Writing...`);
+			emit(`${section ? `\x1B[90m[${section}]\x1B[0m ` : ""}Writing...`);
 			return;
 		}
 		if (type !== "reasoning" || !chunk.startsWith("[")) return;
-		const key = section ?? "";
-		const match = chunk.match(/^\[(\w+)(?:,\s\w+)*(?::\s(.+))?\]$/);
+		const match = chunk.match(/^\[([^:[\]]+)(?::\s(.+))?\]$/);
 		if (!match) return;
-		const rawName = match[1];
-		const hint = match[2] ?? "";
-		let verb = TOOL_VERBS[rawName] ?? rawName;
-		let path = hint || "...";
-		if (rawName === "Bash" && hint) {
-			const searchMatch = hint.match(/skilld search\s+"([^"]+)"/);
-			if (searchMatch) {
-				verb = "skilld search:";
-				path = searchMatch[1];
-			} else path = hint.length > 60 ? `${hint.slice(0, 57)}...` : hint;
-		} else path = shortenPath(path);
-		if (rawName === "Write") {
-			if (timer) flush();
+		const names = match[1].split(",").map((n) => n.trim());
+		const hints = match[2]?.split(",").map((h) => h.trim()) ?? [];
+		for (let i = 0; i < names.length; i++) {
+			const rawName = names[i];
+			const hint = hints[i] ?? hints[0] ?? "";
+			const verb = TOOL_VERBS[rawName] ?? rawName;
 			const prefix = section ? `\x1B[90m[${section}]\x1B[0m ` : "";
-			log.message(`${prefix}Writing ${path}`);
-			return;
+			if (rawName === "Bash" && hint) {
+				const searchMatch = hint.match(/skilld search\s+"([^"]+)"/);
+				if (searchMatch) emit(`${prefix}Searching \x1B[36m"${searchMatch[1]}"\x1B[0m`);
+				else emit(`${prefix}Running ${hint.length > 50 ? `${hint.slice(0, 47)}...` : hint}`);
+			} else emit(`${prefix}${verb} \x1B[90m${shortenPath(hint || "...")}\x1B[0m`);
 		}
-		const entry = mapInsert(pending, key, () => ({
-			verb,
-			path,
-			count: 0
-		}));
-		entry.verb = verb;
-		entry.path = path;
-		entry.count++;
-		if (!timer) timer = setTimeout(flush, 400);
 	};
 }
 const CLI_DEFS = [
@@ -1622,13 +1604,16 @@ function optimizeSection(opts) {
 				} catch {}
 			}
 			const raw = (existsSync(outputPath) ? readFileSync(outputPath, "utf-8") : lastWriteContent || accumulatedText).trim();
+			const logsDir = join(skilldDir, "logs");
+			const logName = section.toUpperCase().replace(/-/g, "_");
+			if (debug || stderr && (!raw || code !== 0)) {
+				mkdirSync(logsDir, { recursive: true });
+				if (stderr) writeFileSync(join(logsDir, `${logName}.stderr.log`), stderr);
+			}
 			if (debug) {
-				const logsDir = join(skilldDir, "logs");
 				mkdirSync(logsDir, { recursive: true });
-				const logName = section.toUpperCase().replace(/-/g, "_");
 				if (rawLines.length) writeFileSync(join(logsDir, `${logName}.jsonl`), rawLines.join("\n"));
 				if (raw) writeFileSync(join(logsDir, `${logName}.md`), raw);
-				if (stderr) writeFileSync(join(logsDir, `${logName}.stderr.log`), stderr);
 			}
 			if (!raw && code !== 0) {
 				resolve({
@@ -1739,10 +1724,22 @@ async function optimizeDocs(opts) {
 	}
 	const skilldDir = join(skillDir, ".skilld");
 	mkdirSync(skilldDir, { recursive: true });
+	for (const entry of readdirSync(skilldDir)) {
+		const entryPath = join(skilldDir, entry);
+		try {
+			if (lstatSync(entryPath).isSymbolicLink() && !existsSync(entryPath)) onProgress?.({
+				chunk: `[warn: broken symlink .skilld/${entry}]`,
+				type: "reasoning",
+				text: "",
+				reasoning: ""
+			});
+		} catch {}
+	}
 	const preExistingFiles = new Set(readdirSync(skilldDir));
-	const spawnResults = uncachedSections.length > 0 ? await Promise.allSettled(uncachedSections.map(({ section, prompt }) => {
+	const STAGGER_MS = 3e3;
+	const spawnResults = uncachedSections.length > 0 ? await Promise.allSettled(uncachedSections.map(({ section, prompt }, i) => {
 		const outputFile = SECTION_OUTPUT_FILES[section];
-		return optimizeSection({
+		const run = () => optimizeSection({
 			section,
 			prompt,
 			outputFile,
@@ -1754,32 +1751,71 @@ async function optimizeDocs(opts) {
 			debug,
 			preExistingFiles
 		});
+		if (i === 0) return run();
+		return setTimeout(i * STAGGER_MS).then(run);
 	})) : [];
 	const allResults = [...cachedResults];
 	let totalUsage;
 	let totalCost = 0;
+	const retryQueue = [];
 	for (let i = 0; i < spawnResults.length; i++) {
 		const r = spawnResults[i];
 		const { section, prompt } = uncachedSections[i];
-		if (r.status === "fulfilled") {
-			const result = r.value;
-			allResults.push(result);
-			if (result.wasOptimized && !noCache) setCache(prompt, model, section, result.content);
-			if (result.usage) {
+		if (r.status === "fulfilled" && r.value.wasOptimized) {
+			allResults.push(r.value);
+			if (r.value.usage) {
 				totalUsage = totalUsage ?? {
 					input: 0,
 					output: 0
 				};
-				totalUsage.input += result.usage.input;
-				totalUsage.output += result.usage.output;
+				totalUsage.input += r.value.usage.input;
+				totalUsage.output += r.value.usage.output;
 			}
-			if (result.cost != null) totalCost += result.cost;
-		} else allResults.push({
+			if (r.value.cost != null) totalCost += r.value.cost;
+			if (!noCache) setCache(prompt, model, section, r.value.content);
+		} else retryQueue.push({
+			index: i,
+			section,
+			prompt
+		});
+	}
+	for (const { section, prompt } of retryQueue) {
+		onProgress?.({
+			chunk: `[${section}: retrying...]`,
+			type: "reasoning",
+			text: "",
+			reasoning: "",
+			section
+		});
+		await setTimeout(STAGGER_MS);
+		const result = await optimizeSection({
+			section,
+			prompt,
+			outputFile: SECTION_OUTPUT_FILES[section],
+			skillDir,
+			model,
+			packageName,
+			onProgress,
+			timeout,
+			debug,
+			preExistingFiles
+		}).catch((err) => ({
 			section,
 			content: "",
 			wasOptimized: false,
-			error: String(r.reason)
-		});
+			error: err.message
+		}));
+		allResults.push(result);
+		if (result.wasOptimized && !noCache) setCache(prompt, model, section, result.content);
+		if (result.usage) {
+			totalUsage = totalUsage ?? {
+				input: 0,
+				output: 0
+			};
+			totalUsage.input += result.usage.input;
+			totalUsage.output += result.usage.output;
+		}
+		if (result.cost != null) totalCost += result.cost;
 	}
 	if (version) {
 		const sectionFiles = allResults.filter((r) => r.wasOptimized && r.content).map((r) => ({