pi2dsh 0.2.0 → 0.3.0

package/dist/host.mjs

@@ -1,6 +1,6 @@
 
-import { t as applyPiPackage } from "./runtime-D84Hv_3m.mjs";
-import { t as resolvePiPackage } from "./source-D7Ir-rPT.mjs";
+import { t as applyPiPackage } from "./runtime-oLd2EInK.mjs";
+import { t as resolvePiPackage } from "./source-0sA5z08z.mjs";
 import { createRequire } from "node:module";
 import { cp, mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, join, relative } from "node:path";

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/analyzer.ts","../src/compatibility.ts","../src/generator.ts","../src/mcp-config.ts","../src/source.ts"],"mappings":";;;;iBAgbsB,eAAe,KAAK,oBAAoB,QAAQ;;;UC9a5D;EACR,OAAO;EACP;;cAKW;cAKA;cAKA;cASA,mBAAmB,SAAS,eAAe,SAAS,eAAe;cAoMnE,eAAe,SAAS,eAAe;cA2BvC,kBAAkB,SAAS,eAAe;cA+B1C,WAAW,SAAS,eAAe;cAgHnC,aAAa,SAAS,eAAe;iBA6FlC,WAAW,iBAAiB;iBAI5B,aAAa,gBAAgB;iBAO7B,kBAAkB,qBAAqB,uBAAuB;iBAS9D,uBAAuB,mBAAmB;iBAI1C,yBAAyB,mBAAmB;;;iBChMtC,eACpB,KAAK,mBACL,SAAS,kBACR;EAAU;EAAgB,QAAQ;EAAqB;;;;KCrTrD,gBAAgB;UAEJ;EACf;EACA;EACA;EACA;EACA;EACA,MAAM;EACN;EACA;EACA,UAAU;EACV;;UAGe;EACf;EACA;;UAGe;EACf,SAAS;EACT,SAAS;EACT,UAAU;EACV;;iBA6Cc,oBAAoB,aAAa;EAA8B,SAAS,YAAY;EAAc;;iBAoElG,mBAAmB,aAAa,wBAA4B;;iBAsD5D,eAAe,QAAQ;;;iBClFjB,iBAAiB,gBAAgB,eAAsB,QAAQ"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/analyzer.ts","../src/compatibility.ts","../src/generator.ts","../src/mcp-config.ts","../src/source.ts"],"mappings":";;;;iBAgbsB,eAAe,KAAK,oBAAoB,QAAQ;;;UC9a5D;EACR,OAAO;EACP;;cAKW;cAKA;cAKA;cASA,mBAAmB,SAAS,eAAe,SAAS,eAAe;cAoMnE,eAAe,SAAS,eAAe;cA2BvC,kBAAkB,SAAS,eAAe;cA+B1C,WAAW,SAAS,eAAe;cAgHnC,aAAa,SAAS,eAAe;iBA6FlC,WAAW,iBAAiB;iBAI5B,aAAa,gBAAgB;iBAO7B,kBAAkB,qBAAqB,uBAAuB;iBAS9D,uBAAuB,mBAAmB;iBAI1C,yBAAyB,mBAAmB;;;iBC/KtC,eACpB,KAAK,mBACL,SAAS,kBACR;EAAU;EAAgB,QAAQ;EAAqB;;;;KCtUrD,gBAAgB;UAEJ;EACf;EACA;EACA;EACA;EACA;EACA,MAAM;EACN;EACA;EACA,UAAU;EACV;;UAGe;EACf;EACA;;UAGe;EACf,SAAS;EACT,SAAS;EACT,UAAU;EACV;;iBA6Cc,oBAAoB,aAAa;EAA8B,SAAS,YAAY;EAAc;;iBAoElG,mBAAmB,aAAa,wBAA4B;;iBAsD5D,eAAe,QAAQ;;;iBC5EjB,iBAAiB,gBAAgB,eAAsB,QAAQ"}

package/dist/index.mjs

@@ -1,5 +1,5 @@
 
-import { _ as ruleForHostImport, a as analyzePackage, c as EVENT_RULES, d as PI_CODING_AGENT_PACKAGES, f as PI_TUI_PACKAGES, g as ruleForEvent, h as ruleForContextProperty, i as generateBundle, l as HOST_IMPORT_RULES, m as ruleForApi, n as convertPiMcpConfig, o as API_RULES, p as UI_CONTEXT_RULES, r as renderMcpPatch, s as CONTEXT_RULES, t as collectPiMcpServers, u as PI_AI_PACKAGES, v as ruleForUiContextProperty } from "./mcp-config-jL9w70It.mjs";
-import { t as resolvePiPackage } from "./source-D7Ir-rPT.mjs";
+import { _ as ruleForHostImport, a as analyzePackage, c as EVENT_RULES, d as PI_CODING_AGENT_PACKAGES, f as PI_TUI_PACKAGES, g as ruleForEvent, h as ruleForContextProperty, i as generateBundle, l as HOST_IMPORT_RULES, m as ruleForApi, n as convertPiMcpConfig, o as API_RULES, p as UI_CONTEXT_RULES, r as renderMcpPatch, s as CONTEXT_RULES, t as collectPiMcpServers, u as PI_AI_PACKAGES, v as ruleForUiContextProperty } from "./mcp-config-gqg7GJEE.mjs";
+import { t as resolvePiPackage } from "./source-0sA5z08z.mjs";
 import { applyPiHost, generateHostBundle, manifestForInstalled } from "./host.mjs";
 export { API_RULES, CONTEXT_RULES, EVENT_RULES, HOST_IMPORT_RULES, PI_AI_PACKAGES, PI_CODING_AGENT_PACKAGES, PI_TUI_PACKAGES, UI_CONTEXT_RULES, analyzePackage, applyPiHost, collectPiMcpServers, convertPiMcpConfig, generateBundle, generateHostBundle, manifestForInstalled, renderMcpPatch, resolvePiPackage, ruleForApi, ruleForContextProperty, ruleForEvent, ruleForHostImport, ruleForUiContextProperty };

package/dist/{mcp-config-jL9w70It.mjs → mcp-config-gqg7GJEE.mjs}

@@ -555,11 +555,16 @@ function localReferences(path, text) {
 	const values = /* @__PURE__ */ new Map();
 	const createRequireNames = /* @__PURE__ */ new Set(["createRequire"]);
 	const requireNames = /* @__PURE__ */ new Set(["require"]);
-	const add = (kind, specifier) => {
-		if (specifier.startsWith(".") || specifier.startsWith("#")) values.set(`${kind}:${specifier}`, {
+	const add = (kind, specifier, lazy) => {
+		if (!specifier.startsWith(".") && !specifier.startsWith("#")) return;
+		const key = `${kind}:${specifier}`;
+		const existing = values.get(key);
+		if (existing === void 0) values.set(key, {
 			kind,
-			specifier
+			specifier,
+			lazy
 		});
+		else if (existing.lazy && !lazy) existing.lazy = false;
 	};
 	function collectRequireAliases(node) {
 		if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier) && (node.moduleSpecifier.text === "node:module" || node.moduleSpecifier.text === "module") && node.importClause?.namedBindings !== void 0 && ts.isNamedImports(node.importClause.namedBindings)) {
@@ -569,14 +574,14 @@ function localReferences(path, text) {
 	}
 	collectRequireAliases(source);
 	function visit(node) {
-		if ((ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) && node.moduleSpecifier !== void 0 && ts.isStringLiteral(node.moduleSpecifier)) add("module", node.moduleSpecifier.text);
-		else if (ts.isImportEqualsDeclaration(node) && ts.isExternalModuleReference(node.moduleReference) && ts.isStringLiteral(node.moduleReference.expression)) add("module", node.moduleReference.expression.text);
+		if ((ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) && node.moduleSpecifier !== void 0 && ts.isStringLiteral(node.moduleSpecifier)) add("module", node.moduleSpecifier.text, false);
+		else if (ts.isImportEqualsDeclaration(node) && ts.isExternalModuleReference(node.moduleReference) && ts.isStringLiteral(node.moduleReference.expression)) add("module", node.moduleReference.expression.text, false);
 		else if (ts.isCallExpression(node) && node.arguments.length > 0 && (node.expression.kind === ts.SyntaxKind.ImportKeyword || ts.isIdentifier(node.expression) && requireNames.has(node.expression.text))) {
 			const specifier = literalModule(node.arguments[0]);
-			if (specifier !== void 0) add("module", specifier);
+			if (specifier !== void 0) add("module", specifier, insideFunctionBody(node));
 		} else if (ts.isNewExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "URL" && isImportMetaUrl(node.arguments?.[1])) {
 			const specifier = literalModule(node.arguments?.[0]);
-			if (specifier !== void 0) add("asset", specifier);
+			if (specifier !== void 0) add("asset", specifier, false);
 		}
 		ts.forEachChild(node, visit);
 	}
@@ -584,18 +589,41 @@ function localReferences(path, text) {
 	return [...values.values()];
 }
 function externalPackage(specifier) {
-	if (specifier.startsWith(".") || specifier.startsWith("/") || specifier.startsWith("#") || specifier.startsWith("node:") || builtinModules.includes(specifier)) return void 0;
+	if (specifier.startsWith(".") || specifier.startsWith("/") || specifier.startsWith("#") || specifier.startsWith("node:") || specifier.startsWith("bun:") || builtinModules.includes(specifier)) return void 0;
 	const parts = specifier.split("/");
 	return specifier.startsWith("@") ? parts.slice(0, 2).join("/") : parts[0];
 }
+function insideTry(node) {
+	let current = node.parent;
+	while (current !== void 0) {
+		if (ts.isTryStatement(current)) return true;
+		if (ts.isFunctionLike(current)) return false;
+		current = current.parent;
+	}
+	return false;
+}
+function insideFunctionBody(node) {
+	let current = node.parent;
+	while (current !== void 0) {
+		if (ts.isFunctionLike(current)) return true;
+		current = current.parent;
+	}
+	return false;
+}
 function runtimeExternalPackages(path, text) {
 	const source = ts.createSourceFile(path, text, ts.ScriptTarget.Latest, true, sourceKind(path));
-	const packages = /* @__PURE__ */ new Set();
+	const packages = /* @__PURE__ */ new Map();
 	const createRequireNames = /* @__PURE__ */ new Set(["createRequire"]);
 	const requireNames = /* @__PURE__ */ new Set(["require"]);
-	const add = (specifier) => {
+	const add = (specifier, lazy) => {
 		const name = externalPackage(specifier);
-		if (name !== void 0 && name.length > 0) packages.add(name);
+		if (name === void 0 || name.length === 0) return;
+		const existing = packages.get(name);
+		if (existing === void 0) packages.set(name, {
+			name,
+			lazy
+		});
+		else if (existing.lazy && !lazy) existing.lazy = false;
 	};
 	function collectRequireAliases(node) {
 		if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier) && (node.moduleSpecifier.text === "node:module" || node.moduleSpecifier.text === "module") && node.importClause?.namedBindings !== void 0 && ts.isNamedImports(node.importClause.namedBindings)) {
@@ -609,17 +637,19 @@ function runtimeExternalPackages(path, text) {
 			const clause = node.importClause;
 			const named = clause?.namedBindings;
 			const namedImportsAreTypeOnly = named !== void 0 && ts.isNamedImports(named) && named.elements.length > 0 && named.elements.every((element) => element.isTypeOnly);
-			if (clause === void 0 || !clause.isTypeOnly && (clause.name !== void 0 || !namedImportsAreTypeOnly)) add(node.moduleSpecifier.text);
-		} else if (ts.isExportDeclaration(node) && !node.isTypeOnly && node.moduleSpecifier !== void 0 && ts.isStringLiteral(node.moduleSpecifier)) add(node.moduleSpecifier.text);
-		else if (ts.isImportEqualsDeclaration(node) && !node.isTypeOnly && ts.isExternalModuleReference(node.moduleReference) && ts.isStringLiteral(node.moduleReference.expression)) add(node.moduleReference.expression.text);
+			if (clause === void 0 || !clause.isTypeOnly && (clause.name !== void 0 || !namedImportsAreTypeOnly)) add(node.moduleSpecifier.text, false);
+		} else if (ts.isExportDeclaration(node) && !node.isTypeOnly && node.moduleSpecifier !== void 0 && ts.isStringLiteral(node.moduleSpecifier)) add(node.moduleSpecifier.text, false);
+		else if (ts.isImportEqualsDeclaration(node) && !node.isTypeOnly && ts.isExternalModuleReference(node.moduleReference) && ts.isStringLiteral(node.moduleReference.expression)) add(node.moduleReference.expression.text, false);
 		else if (ts.isCallExpression(node) && node.arguments.length > 0 && (node.expression.kind === ts.SyntaxKind.ImportKeyword || ts.isIdentifier(node.expression) && requireNames.has(node.expression.text))) {
-			const specifier = literalModule(node.arguments[0]);
-			if (specifier !== void 0) add(specifier);
+			if (!insideTry(node)) {
+				const specifier = literalModule(node.arguments[0]);
+				if (specifier !== void 0) add(specifier, insideFunctionBody(node));
+			}
 		}
 		ts.forEachChild(node, visit);
 	}
 	visit(source);
-	return [...packages];
+	return [...packages.values()];
 }
 function inside(rootDir, path) {
 	const pathRelative = relative(rootDir, path);
@@ -714,34 +744,56 @@ async function expandAsset(path, rootDir) {
 	return output;
 }
 async function collectLocalClosure(rootDir, entries) {
-	const queue = entries.map((path) => resolve(path));
-	const closure = /* @__PURE__ */ new Set();
-	const issues = [];
 	const importsMap = await packageImportsMap(rootDir);
+	const graph = /* @__PURE__ */ new Map();
+	const issues = [];
+	const queue = entries.map((path) => resolve(path));
 	while (queue.length > 0) {
 		const source = queue.shift();
-		if (closure.has(source)) continue;
+		if (graph.has(source)) continue;
 		if (!inside(rootDir, source)) throw new Error(`extension source escapes the Pi package: ${source}`);
 		const info = await lstat(source);
 		if (info.isSymbolicLink()) throw new Error(`refusing to copy symbolic link from Pi package: ${source}`);
 		if (!info.isFile()) throw new Error(`extension closure contains a non-file path: ${source}`);
-		closure.add(source);
+		const edges = [];
+		graph.set(source, edges);
 		if (!SCRIPT_EXTENSIONS.has(extname(source))) continue;
 		const text = await readFile(source, "utf8");
-		for (const reference of localReferences(source, text)) try {
-			if (reference.kind === "module") queue.push(await resolveModule(source, reference.specifier, rootDir, importsMap));
-			else queue.push(...await expandAsset(resolve(dirname(source), reference.specifier), rootDir));
-		} catch (error) {
-			issues.push({
-				file: source,
-				kind: reference.kind,
-				specifier: reference.specifier,
-				detail: error instanceof Error ? error.message : String(error)
-			});
+		for (const reference of localReferences(source, text)) {
+			const lazy = reference.lazy || reference.kind === "asset";
+			try {
+				const targets = reference.kind === "module" ? [await resolveModule(source, reference.specifier, rootDir, importsMap)] : await expandAsset(resolve(dirname(source), reference.specifier), rootDir);
+				edges.push({
+					lazy,
+					targets
+				});
+				queue.push(...targets);
+			} catch (error) {
+				issues.push({
+					file: source,
+					kind: reference.kind,
+					specifier: reference.specifier,
+					detail: error instanceof Error ? error.message : String(error),
+					lazy
+				});
+			}
 		}
 	}
+	const loadTimeFiles = /* @__PURE__ */ new Set();
+	const loadQueue = entries.map((path) => resolve(path)).filter((path) => graph.has(path));
+	while (loadQueue.length > 0) {
+		const source = loadQueue.shift();
+		if (loadTimeFiles.has(source)) continue;
+		loadTimeFiles.add(source);
+		for (const edge of graph.get(source) ?? []) {
+			if (edge.lazy) continue;
+			for (const target of edge.targets) if (!loadTimeFiles.has(target)) loadQueue.push(target);
+		}
+	}
+	for (const issue of issues) if (!loadTimeFiles.has(issue.file)) issue.lazy = true;
 	return {
-		files: [...closure].sort(),
+		files: [...graph.keys()].sort(),
+		loadTimeFiles,
 		issues
 	};
 }
@@ -1021,24 +1073,29 @@ async function analyzePackage(pkg) {
 		line: 1,
 		detail: "No ExtensionAPI use was statically proven across the local module closure; conversion fails closed instead of claiming compatibility."
 	});
-	for (const issue of extensionClosure.issues) findings.push({
-		capability: `${issue.kind}(${issue.specifier})`,
-		level: "fatal",
-		file: relative(pkg.rootDir, issue.file).replaceAll("\\", "/"),
-		line: 1,
-		detail: `The local extension closure is incomplete: ${issue.detail}`
-	});
+	for (const issue of extensionClosure.issues) {
+		const lazyIssue = issue.lazy || issue.kind === "asset";
+		findings.push({
+			capability: `${issue.kind}(${issue.specifier})`,
+			level: lazyIssue ? "partial" : "fatal",
+			file: relative(pkg.rootDir, issue.file).replaceAll("\\", "/"),
+			line: 1,
+			detail: lazyIssue ? `Unresolved reference on a lazy path: ${issue.detail}. Extension load is unaffected; if the feature that evaluates it runs, it fails the same way under Pi (published file layout is preserved).` : `The local extension closure is incomplete: ${issue.detail}`
+		});
+	}
 	const declaredDependencies = dependencyNames(pkg.packageJson);
 	for (const file of extensionClosure.files.filter((candidate) => SCRIPT_EXTENSIONS.has(extname(candidate)))) {
 		const text = await readFile(file, "utf8");
-		for (const packageName of runtimeExternalPackages(file, text)) {
-			if (PI_HOST_PACKAGES.has(packageName) || declaredDependencies.has(packageName)) continue;
+		const lazyFile = !extensionClosure.loadTimeFiles.has(file);
+		for (const use of runtimeExternalPackages(file, text)) {
+			if (PI_HOST_PACKAGES.has(use.name) || declaredDependencies.has(use.name)) continue;
+			const lazyUse = use.lazy || lazyFile;
 			findings.push({
-				capability: `undeclared-runtime-dependency(${packageName})`,
-				level: "fatal",
+				capability: lazyUse ? `optional-lazy-dependency(${use.name})` : `undeclared-runtime-dependency(${use.name})`,
+				level: lazyUse ? "partial" : "fatal",
 				file: relative(pkg.rootDir, file).replaceAll("\\", "/"),
 				line: 1,
-				detail: `The extension imports ${JSON.stringify(packageName)} at runtime, but the Pi package does not declare it as a dependency.`
+				detail: lazyUse ? `The extension imports ${JSON.stringify(use.name)} only on a lazily-evaluated path without declaring it; the feature that needs it asks for the module at call time, exactly as under Pi (install ${use.name} to use that feature).` : `The extension imports ${JSON.stringify(use.name)} at load time, but the Pi package does not declare it as a dependency.`
 			});
 		}
 	}
@@ -1129,11 +1186,12 @@ async function copyExtensions(pkg, outDir) {
 	const copied = [];
 	const runtimePackages = /* @__PURE__ */ new Set();
 	const closure = await collectLocalClosure(pkg.rootDir, pkg.resources.extensions);
-	if (closure.issues.length > 0) throw new Error(`cannot snapshot extension closure:\n${closure.issues.map((issue) => `- ${issue.file}: ${issue.detail}`).join("\n")}`);
+	for (const issue of closure.issues) console.warn(`pi2dsh: unresolved ${issue.kind} reference ${JSON.stringify(issue.specifier)} from ${relative(pkg.rootDir, issue.file)} (${issue.lazy ? "lazy path — fails at feature use, as under Pi" : "load-time path"})`);
 	for (const source of closure.files) {
 		if (SCRIPT_EXTENSIONS.has(extname(source))) {
 			const text = await readFile(source, "utf8");
-			for (const packageName of runtimeExternalPackages(source, text)) runtimePackages.add(packageName);
+			const lazyFile = !closure.loadTimeFiles.has(source);
+			for (const use of runtimeExternalPackages(source, text)) if (!use.lazy && !lazyFile || use.name in stringRecord$1(pkg.packageJson.dependencies)) runtimePackages.add(use.name);
 		}
 		const targetRelative = `vendor/${relative(pkg.rootDir, source).replaceAll("\\", "/")}`;
 		const target = join(outDir, targetRelative);
@@ -1141,14 +1199,16 @@ async function copyExtensions(pkg, outDir) {
 		await cp(source, target, { dereference: false });
 		if (pkg.resources.extensions.map((entry) => resolve(entry)).includes(source)) copied.push(targetRelative);
 	}
+	const skillScriptPackages = /* @__PURE__ */ new Set();
 	for (const source of pkg.resources.skills) {
 		if (!SCRIPT_EXTENSIONS.has(extname(source))) continue;
 		const text = await readFile(source, "utf8");
-		for (const packageName of runtimeExternalPackages(source, text)) runtimePackages.add(packageName);
+		for (const use of runtimeExternalPackages(source, text)) skillScriptPackages.add(use.name);
 	}
 	return {
 		entries: copied,
-		runtimePackages
+		runtimePackages,
+		skillScriptPackages
 	};
 }
 async function copySkills(pkg, outDir) {
@@ -1230,7 +1290,9 @@ function generatedPackageJson(pkg, generatedName, runtimeSpec, runtimePackages,
 			jiti: "^2.7.0",
 			"get-east-asian-width": "^1.6.0",
 			marked: "^16.4.1",
-			typebox: "^1.0.4"
+			typebox: "^1.0.4",
+			"cross-spawn": "^7.0.6",
+			diff: "^9.0.0"
 		} : {},
 		...hasSkills ? { "@deepseek-ai/dsh-skill-filesystem": "^0.1.0-rc.6" } : {},
 		...runtimeSpec !== void 0 ? { pi2dsh: runtimeSpec } : {}
@@ -1342,6 +1404,8 @@ async function generateBundle(pkg, options) {
 	};
 	const runtimeSpec = options.runtimeSpec;
 	if (runtimeSpec === void 0) await copyEmbeddedRuntime(outDir);
+	const optionalSkillDeps = [...extensionSnapshot.skillScriptPackages].filter((name) => !SHIMMED_PI_HOST_PACKAGES.has(name) && !(name in stringRecord$1(pkg.packageJson.dependencies)));
+	if (optionalSkillDeps.length > 0) console.warn(`pi2dsh: skill helper scripts reference ${optionalSkillDeps.join(", ")}; install them only if you use those skills`);
 	await Promise.all([
 		writeFile(join(outDir, "package.json"), `${JSON.stringify(generatedPackageJson(pkg, packageName, runtimeSpec, extensionSnapshot.runtimePackages, skillDirs.length > 0), null, 2)}\n`),
 		writeFile(join(outDir, "pi2dsh.manifest.json"), `${JSON.stringify(manifest, null, 2)}\n`),
@@ -1532,4 +1596,4 @@ function renderMcpPatch(result) {
 //#endregion
 export { ruleForHostImport as _, analyzePackage as a, EVENT_RULES as c, PI_CODING_AGENT_PACKAGES as d, PI_TUI_PACKAGES as f, ruleForEvent as g, ruleForContextProperty as h, generateBundle as i, HOST_IMPORT_RULES as l, ruleForApi as m, convertPiMcpConfig as n, API_RULES as o, UI_CONTEXT_RULES as p, renderMcpPatch as r, CONTEXT_RULES as s, collectPiMcpServers as t, PI_AI_PACKAGES as u, ruleForUiContextProperty as v };
 
-//# sourceMappingURL=mcp-config-jL9w70It.mjs.map
+//# sourceMappingURL=mcp-config-gqg7GJEE.mjs.map