llmz 0.8.0 → 0.9.1

package/dist/{common-pgJjFu2Y.js → common-DuEhn6u3.js}

@@ -1,5 +1,5 @@
 import { n as __exportAll } from "./rolldown-runtime-EAsCxrDo.js";
-import { r as hasTopLevelReturn } from "./compiler-CW1VjQsn.js";
+import { r as hasTopLevelReturn } from "./compiler-BPl-5CXh.js";
 import JSON5 from "json5";
 import { jsonrepair } from "jsonrepair";
 //#region src/message-stream/types.ts
@@ -63,6 +63,7 @@ var StreamingMessageParser = class {
 	_currentReady = false;
 	_counter = 0;
 	_finished = false;
+	_ended = false;
 	_directiveBuffer = "";
 	_nameBuffer = "";
 	_propsBuffer = "";
@@ -74,6 +75,8 @@ var StreamingMessageParser = class {
 	_pendingWhitespace = "";
 	_preambleHeader;
 	_closingFenceTicks;
+	_lineStart = true;
+	_exampleDelimiter = "";
 	constructor(options = {}) {
 		this._maxPropsLength = options.maxPropsLength ?? 1e5;
 	}
@@ -88,7 +91,7 @@ var StreamingMessageParser = class {
 	push(chunk) {
 		if (this._finished) throw new Error("Parser has already finished. Call reset() before parsing a new stream.");
 		const events = [];
-		for (const char of chunk) this._processChar(char, events);
+		for (const char of chunk) this._processOutputChar(char, events);
 		this._flushBodyDelta(events);
 		return events;
 	}
@@ -102,6 +105,9 @@ var StreamingMessageParser = class {
 		if (this._finished) return [];
 		this._finished = true;
 		const events = [];
+		if (/^"""\s*$/.test(this._exampleDelimiter)) this._discardExampleDelimiter(events);
+		else if (reason === "end") this._flushExampleDelimiter(events);
+		else this._exampleDelimiter = "";
 		if (this._closingFenceTicks !== void 0 && this._closingFenceTicks !== 3) this._skipUnexpectedText(events);
 		this._closingFenceTicks = void 0;
 		const status = reason === "interrupted" ? "interrupted" : void 0;
@@ -138,6 +144,7 @@ var StreamingMessageParser = class {
 		this._currentReady = false;
 		this._counter = 0;
 		this._finished = false;
+		this._ended = false;
 		this._directiveBuffer = "";
 		this._nameBuffer = "";
 		this._propsBuffer = "";
@@ -149,6 +156,50 @@ var StreamingMessageParser = class {
 		this._pendingWhitespace = "";
 		this._preambleHeader = void 0;
 		this._closingFenceTicks = void 0;
+		this._lineStart = true;
+		this._exampleDelimiter = "";
+	}
+	_processOutputChar(char, events) {
+		const lineStart = this._lineStart;
+		this._lineStart = char === "\n" || lineStart && (char === " " || char === "	" || char === "\r");
+		if (this._exampleDelimiter) {
+			if (this._exampleDelimiter.includes("\n")) {
+				if (isWhitespace(char)) {
+					this._exampleDelimiter += char;
+					return;
+				}
+				if (char === "■") this._discardExampleDelimiter(events);
+				else this._flushExampleDelimiter(events);
+			} else {
+				const candidate = this._exampleDelimiter + char;
+				if (/^(?:"{1,2}|"""[ \t]*\r?)$/.test(candidate)) {
+					this._exampleDelimiter = candidate;
+					return;
+				}
+				if (/^"""[ \t]*\r?\n$/.test(candidate)) {
+					this._exampleDelimiter = candidate;
+					if (this._state !== "body") this._discardExampleDelimiter(events);
+					return;
+				}
+				this._flushExampleDelimiter(events);
+			}
+		}
+		if (lineStart && char === "\"" && (this._state === "idle" || this._state === "skip" || this._state === "body-wait" || this._state === "body")) {
+			this._exampleDelimiter = char;
+			return;
+		}
+		this._processChar(char, events);
+	}
+	_flushExampleDelimiter(events) {
+		for (const char of this._exampleDelimiter) this._processChar(char, events);
+		this._exampleDelimiter = "";
+	}
+	_discardExampleDelimiter(events) {
+		this._exampleDelimiter = "";
+		this._diagnostic(events, {
+			code: "example-delimiter",
+			message: "Discarded a triple-quote example delimiter"
+		});
 	}
 	_processChar(char, events) {
 		if (this._closingFenceTicks !== void 0) {
@@ -160,9 +211,18 @@ var StreamingMessageParser = class {
 			this._closingFenceTicks = void 0;
 			this._skipUnexpectedText(events);
 		}
+		if (this._ended) {
+			if (this._state === "skip" || isWhitespace(char)) return;
+			if (char === "`") {
+				this._closingFenceTicks = 1;
+				return;
+			}
+			this._skipUnexpectedText(events);
+			return;
+		}
 		switch (this._state) {
 			case "idle":
-				if (char === "■") this._beginItem();
+				if (char === "■") this._beginItem(events);
 				else if (!isWhitespace(char)) {
 					const last = this._items.at(-1);
 					if (char === "`" && (last === null || last === void 0 ? void 0 : last.kind) === "next" && last.status === "complete") {
@@ -178,7 +238,7 @@ var StreamingMessageParser = class {
 				else if (char === "■") {
 					this._endDirective(events, void 0);
 					this._completeCurrent(events);
-					this._beginItem();
+					this._beginItem(events);
 				} else if (char === "\n") this._endDirective(events, "\n");
 				else if (isWhitespace(char)) this._endDirective(events, " ");
 				else if (char === "{") this._endDirective(events, "{");
@@ -188,7 +248,7 @@ var StreamingMessageParser = class {
 				if (char === "■") {
 					this._endName(events);
 					this._completeCurrent(events);
-					this._beginItem();
+					this._beginItem(events);
 				} else if (char === "{") {
 					this._endName(events);
 					this._afterHeaderChar(char, events);
@@ -209,7 +269,7 @@ var StreamingMessageParser = class {
 			case "body-wait":
 				if (char === "■") {
 					this._completeCurrent(events);
-					this._beginItem();
+					this._beginItem(events);
 				} else if (!isWhitespace(char)) {
 					this._startBody(events);
 					this._appendBody(char);
@@ -220,7 +280,7 @@ var StreamingMessageParser = class {
 					this._pendingWhitespace = "";
 					this._flushBodyDelta(events);
 					this._completeCurrent(events);
-					this._beginItem();
+					this._beginItem(events);
 				} else this._appendBody(char);
 				return;
 			case "skip":
@@ -233,7 +293,7 @@ var StreamingMessageParser = class {
 					}
 					return;
 				}
-				if (char === "■") this._beginItem();
+				if (char === "■") this._beginItem(events);
 				return;
 		}
 	}
@@ -250,7 +310,7 @@ var StreamingMessageParser = class {
 		const item = this._current;
 		if (char === "■") {
 			this._completeCurrent(events);
-			this._beginItem();
+			this._beginItem(events);
 			return;
 		}
 		if (char === "{" && (item.kind === "send" || item.kind === "next")) {
@@ -292,7 +352,7 @@ var StreamingMessageParser = class {
 			else if (char === "■" && this._propsBroken) {
 				this._failProps(events, "props were interrupted by a new block");
 				this._completeCurrent(events);
-				this._beginItem();
+				this._beginItem(events);
 			}
 			return;
 		}
@@ -300,14 +360,18 @@ var StreamingMessageParser = class {
 		else if (char === "■") {
 			this._failProps(events, "props were interrupted by a new block");
 			this._completeCurrent(events);
-			this._beginItem();
+			this._beginItem(events);
 		} else if (char === "{" || char === "[") this._propsDepth++;
 		else if (char === "}" || char === "]") {
 			this._propsDepth--;
 			if (this._propsDepth <= 0) this._endProps(events);
 		}
 	}
-	_beginItem() {
+	_beginItem(events) {
+		if (this._ended) {
+			this._skipUnexpectedText(events);
+			return;
+		}
 		const item = {
 			id: `item-${this._counter++}`,
 			kind: "unknown",
@@ -506,6 +570,7 @@ var StreamingMessageParser = class {
 		if (!item) return;
 		this._ready(events);
 		if (item.status !== "invalid") item.status = forcedStatus ?? "complete";
+		if (item.kind === "next" && item.status === "complete") this._ended = true;
 		events.push({
 			type: "item-complete",
 			item
@@ -516,7 +581,7 @@ var StreamingMessageParser = class {
 	_skipUnexpectedText(events) {
 		this._diagnostic(events, {
 			code: "unexpected-text",
-			message: "Encountered text outside of a ■ block"
+			message: this._ended ? "Discarded content after terminal ■next" : "Encountered text outside of a ■ block"
 		});
 		this._state = "skip";
 	}
@@ -533,17 +598,163 @@ var StreamingMessageParser = class {
 	}
 };
 //#endregion
+//#region src/message-stream/response-parser.ts
+/** One wire format: a complete ■start … ■end envelope containing valid blocks. */
+var ResponseParser = class {
+	_parser = new StreamingMessageParser();
+	_mode = "detect";
+	_discardPrefixLine = false;
+	_prefixDiagnostics = [];
+	_prefix = "";
+	_boundary = "";
+	_closed = false;
+	_finished = false;
+	_failure;
+	_trailer = "";
+	get framed() {
+		return this._mode === "framed";
+	}
+	get valid() {
+		return this._finished && this._closed && !this._failure;
+	}
+	get items() {
+		return this.valid ? this._parser.items : [];
+	}
+	get diagnostics() {
+		return [
+			...this._prefixDiagnostics,
+			...this._parser.diagnostics,
+			...this._trailingDiagnostics,
+			...this._failure ? [this._failure] : []
+		];
+	}
+	push(chunk) {
+		if (this._finished) throw new Error("Response parser has already finished");
+		const events = [];
+		let forward = "";
+		const flush = () => {
+			if (forward) events.push(...this._parser.push(forward));
+			forward = "";
+		};
+		for (const char of chunk) {
+			if (this._mode === "detect") {
+				if (this._discardPrefixLine) {
+					if (char === "\n") this._discardPrefixLine = false;
+					continue;
+				}
+				if (!this._prefix && /\s/.test(char)) continue;
+				this._prefix += char;
+				const trimmed = this._prefix.trimEnd();
+				if (char === "\n" && trimmed === "\"\"\"") {
+					events.push(...this._parser.push(this._prefix));
+					this._prefix = "";
+				} else if (char === "\n" && trimmed === "■start") {
+					this._mode = "framed";
+					this._prefix = "";
+				} else if (!"■start".startsWith(this._prefix) && !/^■start[ \t\r]*$/.test(this._prefix) && !/^"{1,3}[ \t\r]*$/.test(this._prefix)) {
+					if (!this._prefixDiagnostics.length) {
+						const diagnostic = {
+							code: "unexpected-text",
+							message: "Discarded text before ■start"
+						};
+						this._prefixDiagnostics.push(diagnostic);
+						events.push({
+							type: "diagnostic",
+							diagnostic
+						});
+					}
+					this._prefix = "";
+					this._discardPrefixLine = char !== "\n";
+				}
+				continue;
+			}
+			if (this._closed) {
+				this._trailer += char;
+				continue;
+			}
+			if (this._boundary || char === "■") {
+				this._boundary += char;
+				if (this._boundary === "■end") {
+					flush();
+					events.push(...this._parser.finish());
+					this._boundary = "";
+					this._closed = true;
+				} else if (!"■end".startsWith(this._boundary)) {
+					forward += this._boundary;
+					this._boundary = "";
+				}
+			} else forward += char;
+		}
+		flush();
+		return events;
+	}
+	finish(stopReason) {
+		if (this._finished) return [];
+		this._finished = true;
+		const events = [];
+		if (this._mode === "detect") {
+			if (this._prefix.trim() === "■start") this._mode = "framed";
+			else this._fail("Missing ■start: every response must begin with the response envelope");
+			this._prefix = "";
+		}
+		if (this.framed) {
+			if (!this._boundary && stopReason === "stop") this._closed = true;
+			else if (this._boundary) events.push(...this._parser.push(this._boundary));
+			events.push(...this._parser.finish());
+			const trailer = this._trailer.trim();
+			if (!this._closed) this._fail("Missing ■end: the response envelope is incomplete");
+			else if (this._parser.diagnostics.some((d) => d.code !== "example-delimiter")) this._fail("The response envelope contains malformed protocol blocks");
+			if (!this._failure) this._validateBlocks();
+			if (trailer === "\"\"\"") {
+				const parser = new StreamingMessageParser();
+				events.push(...parser.push(trailer), ...parser.finish());
+				this._trailingDiagnostics = parser.diagnostics;
+			} else if (trailer) {
+				const diagnostic = {
+					code: "unexpected-text",
+					message: "Discarded content after ■end"
+				};
+				this._trailingDiagnostics.push(diagnostic);
+				events.push({
+					type: "diagnostic",
+					diagnostic
+				});
+			}
+			if (this._failure) events.push({
+				type: "diagnostic",
+				diagnostic: this._failure
+			});
+		} else if (this._failure) events.push({
+			type: "diagnostic",
+			diagnostic: this._failure
+		});
+		return events;
+	}
+	_trailingDiagnostics = [];
+	_validateBlocks() {
+		const items = this._parser.items;
+		const runs = items.filter((item) => item.kind === "run");
+		const next = items.findIndex((item) => item.kind === "next");
+		const run = items.findIndex((item) => item.kind === "run");
+		if (runs.length > 1 || run >= 0 && items.slice(run + 1).some((item) => item.kind === "send")) this._fail("Use at most one ■run, after all messages; never send a message after code");
+		else if (run >= 0 && hasTopLevelReturn(items[run].body ?? "")) {
+			if (run !== items.length - 1) this._fail("After code returning a result, write ■end and wait for the result");
+		} else if (next < 0 && run < 0) this._fail("Finish with ■next, or return a result from ■run for the next iteration");
+	}
+	_fail(message) {
+		this._failure = {
+			code: "invalid-envelope",
+			message
+		};
+	}
+};
+//#endregion
 //#region src/prompts/common.ts
 var common_exports = /* @__PURE__ */ __exportAll({
 	parseAssistantResponse: () => parseAssistantResponse,
 	replacePlaceholders: () => replacePlaceholders,
 	toParsedAssistantResponse: () => toParsedAssistantResponse
 });
-/** Strips wrapping code fences the model may have added around the whole response. */
-const stripWrappingFences = (text) => text.trim().split("\n").filter((line, index, arr) => {
-	if ((index === 0 || index === arr.length - 1) && line.trim().startsWith("```")) return false;
-	return true;
-}).join("\n");
 /** Builds a {@link ParsedAssistantResponse} from parsed protocol items. */
 const toParsedAssistantResponse = (items, raw, diagnostics = []) => {
 	var _run$body;
@@ -573,10 +784,10 @@ const toParsedAssistantResponse = (items, raw, diagnostics = []) => {
 		} : void 0
 	};
 };
-const parseAssistantResponse = (response) => {
-	const parser = new StreamingMessageParser();
-	parser.push(stripWrappingFences(response));
-	parser.finish();
+const parseAssistantResponse = (response, stopReason) => {
+	const parser = new ResponseParser();
+	parser.push(response);
+	parser.finish(stopReason);
 	return toParsedAssistantResponse(parser.items, response, parser.diagnostics);
 };
 const replacePlaceholders = (prompt, values) => {
@@ -593,4 +804,4 @@ const replacePlaceholders = (prompt, values) => {
 	return replaced.replace(/\n{3,}/g, "\n\n").trim();
 };
 //#endregion
-export { StreamingMessageParser as a, NAME_REGEX as c, toParsedAssistantResponse as i, parseAssistantResponse as n, tryParseJson as o, replacePlaceholders as r, MARKER as s, common_exports as t };
+export { ResponseParser as a, MARKER as c, toParsedAssistantResponse as i, NAME_REGEX as l, parseAssistantResponse as n, StreamingMessageParser as o, replacePlaceholders as r, tryParseJson as s, common_exports as t };

package/dist/compiler/plugins/variable-extraction.d.ts

@@ -1,10 +1,4 @@
 import { type Ctx } from '../ast.js';
 export declare const VariableTrackingFnIdentifier = "__var__";
-/**
- * Tracks user variables so the VM can read their values between iterations:
- * - after each variable declaration: `__var__("a", () => eval("a"));`
- * - at the top of function bodies, for their parameters
- *
- * The `eval` indirection captures the variable lazily in its own scope.
- */
+/** Retain getters only for bindings visible between iterations, never local shadows. */
 export declare function applyVariableTracking(ctx: Ctx, variables: Set<string>): void;

package/dist/{compiler-C-OI9sim.cjs → compiler-BJJUmNS9.cjs}

@@ -349,77 +349,43 @@ function applyToolCallTracking(ctx, calls) {
 //#endregion
 //#region src/compiler/plugins/variable-extraction.ts
 const VariableTrackingFnIdentifier = "__var__";
-/**
-* Tracks user variables so the VM can read their values between iterations:
-* - after each variable declaration: `__var__("a", () => eval("a"));`
-* - at the top of function bodies, for their parameters
-*
-* The `eval` indirection captures the variable lazily in its own scope.
-*/
+const FUNCTION_TYPES$1 = /* @__PURE__ */ new Set([
+	"FunctionDeclaration",
+	"FunctionExpression",
+	"ArrowFunctionExpression"
+]);
+function declaredNames(id) {
+	if (!id) return [];
+	if (id.type === "Identifier") return [id.name];
+	if (id.type === "RestElement") return declaredNames(id.argument);
+	if (id.type === "AssignmentPattern") return declaredNames(id.left);
+	if (id.type === "ArrayPattern") return id.elements.flatMap(declaredNames);
+	if (id.type === "ObjectPattern") return id.properties.flatMap((prop) => declaredNames(prop.type === "RestElement" ? prop.argument : prop.value));
+	return [];
+}
+/** Retain getters only for bindings visible between iterations, never local shadows. */
 function applyVariableTracking(ctx, variables) {
-	const trackerFor = (name) => {
-		if (name.startsWith("__")) return null;
-		variables.add(name);
-		return `${VariableTrackingFnIdentifier}(${JSON.stringify(name)}, () => eval(${JSON.stringify(name)}));`;
-	};
-	const track = (names) => names.map(trackerFor).filter((t) => !!t).join("");
-	const declaredNames = (id) => {
-		if (id.type === "Identifier") return [id.name];
-		if (id.type === "ObjectPattern") {
-			const names = [];
-			for (const prop of id.properties) {
-				if (prop.type !== "Property") continue;
-				if (prop.value.type === "Identifier") names.push(prop.value.name);
-				else if (prop.value.type === "ObjectPattern") names.push(...declaredNames(prop.value));
-				else if (prop.value.type === "AssignmentPattern" && prop.value.left.type === "Identifier") names.push(prop.value.left.name);
-			}
-			return names;
-		}
-		if (id.type === "ArrayPattern") {
-			const names = [];
-			for (const element of id.elements) {
-				if (!element) continue;
-				if (element.type === "Identifier") names.push(element.name);
-				else if (element.type === "RestElement" && element.argument.type === "Identifier") names.push(element.argument.name);
-				else if (element.type === "AssignmentPattern" && element.left.type === "Identifier") names.push(element.left.name);
-			}
-			return names;
-		}
-		return [];
-	};
-	const paramNames = (params) => {
-		const names = [];
-		for (const param of params) if (param.type === "Identifier") names.push(param.name);
-		else if (param.type === "AssignmentPattern" && param.left.type === "Identifier") names.push(param.left.name);
-		else if (param.type === "ObjectPattern") {
-			for (const prop of param.properties) if (prop.type === "Property" && prop.value.type === "Identifier") names.push(prop.value.name);
-		} else if (param.type === "ArrayPattern") {
-			for (const element of param.elements) if ((element === null || element === void 0 ? void 0 : element.type) === "Identifier") names.push(element.name);
-		}
-		return names;
-	};
-	walk(ctx.ast, (node, parent) => {
-		if (node.type === "VariableDeclaration") {
-			if (parent && (parent.type === "ForStatement" || parent.type === "ForInStatement" || parent.type === "ForOfStatement")) return;
-			const trackers = track(node.declarations.flatMap((d) => declaredNames(d.id)));
-			if (trackers) {
-				const semi = ctx.code[node.end - 1] === ";" ? "" : ";";
-				ctx.ms.appendRight(node.end, `${semi}${trackers}`);
-			}
-			return;
-		}
-		if (node.type === "FunctionDeclaration" || node.type === "ArrowFunctionExpression") {
-			const trackers = track(paramNames(node.params));
-			if (!trackers) return;
-			const body = node.body;
-			if (body.type === "BlockStatement") ctx.ms.appendRight(body.start + 1, trackers);
-			else {
-				const expressions = trackers.slice(0, -1).replaceAll(";", ",");
-				ctx.ms.prependLeft(body.start, `(${expressions}, (`);
-				ctx.ms.appendRight(body.end, "))");
-			}
+	const wrapper = ctx.ast.body.find((node) => {
+		var _node$id;
+		return node.type === "FunctionDeclaration" && ((_node$id = node.id) === null || _node$id === void 0 ? void 0 : _node$id.name) === "__fn__";
+	});
+	const root = (wrapper === null || wrapper === void 0 ? void 0 : wrapper.body) ?? ctx.ast;
+	const varBindings = /* @__PURE__ */ new Set();
+	const track = (names) => names.map((name) => `${VariableTrackingFnIdentifier}(${JSON.stringify(name)}, () => eval(${JSON.stringify(name)}));`).join("");
+	walk(root, (node, parent, ancestors) => {
+		if (node.type !== "VariableDeclaration" || ancestors.some((ancestor) => FUNCTION_TYPES$1.has(ancestor.type) || ancestor.type === "StaticBlock")) return;
+		if (node.kind !== "var" && parent !== root) return;
+		const names = node.declarations.flatMap((declaration) => declaredNames(declaration.id)).filter((name) => !name.startsWith("__"));
+		for (const name of names) variables.add(name);
+		if (node.kind === "var" && parent !== root) for (const name of names) varBindings.add(name);
+		else if (node.declarations.length > 1) ctx.ms.appendLeft(node.start, track(names));
+		else {
+			const semi = ctx.code[node.end - 1] === ";" ? "" : ";";
+			ctx.ms.appendRight(node.end, semi + track(names));
 		}
 	});
+	const entry = root.body.find((node) => !node.directive);
+	if (entry && varBindings.size) ctx.ms.appendLeft(entry.start, track([...varBindings]));
 }
 //#endregion
 //#region src/compiler/compiler.ts

package/dist/{compiler-CW1VjQsn.js → compiler-BPl-5CXh.js}

@@ -316,77 +316,43 @@ function applyToolCallTracking(ctx, calls) {
 //#endregion
 //#region src/compiler/plugins/variable-extraction.ts
 const VariableTrackingFnIdentifier = "__var__";
-/**
-* Tracks user variables so the VM can read their values between iterations:
-* - after each variable declaration: `__var__("a", () => eval("a"));`
-* - at the top of function bodies, for their parameters
-*
-* The `eval` indirection captures the variable lazily in its own scope.
-*/
+const FUNCTION_TYPES$1 = /* @__PURE__ */ new Set([
+	"FunctionDeclaration",
+	"FunctionExpression",
+	"ArrowFunctionExpression"
+]);
+function declaredNames(id) {
+	if (!id) return [];
+	if (id.type === "Identifier") return [id.name];
+	if (id.type === "RestElement") return declaredNames(id.argument);
+	if (id.type === "AssignmentPattern") return declaredNames(id.left);
+	if (id.type === "ArrayPattern") return id.elements.flatMap(declaredNames);
+	if (id.type === "ObjectPattern") return id.properties.flatMap((prop) => declaredNames(prop.type === "RestElement" ? prop.argument : prop.value));
+	return [];
+}
+/** Retain getters only for bindings visible between iterations, never local shadows. */
 function applyVariableTracking(ctx, variables) {
-	const trackerFor = (name) => {
-		if (name.startsWith("__")) return null;
-		variables.add(name);
-		return `${VariableTrackingFnIdentifier}(${JSON.stringify(name)}, () => eval(${JSON.stringify(name)}));`;
-	};
-	const track = (names) => names.map(trackerFor).filter((t) => !!t).join("");
-	const declaredNames = (id) => {
-		if (id.type === "Identifier") return [id.name];
-		if (id.type === "ObjectPattern") {
-			const names = [];
-			for (const prop of id.properties) {
-				if (prop.type !== "Property") continue;
-				if (prop.value.type === "Identifier") names.push(prop.value.name);
-				else if (prop.value.type === "ObjectPattern") names.push(...declaredNames(prop.value));
-				else if (prop.value.type === "AssignmentPattern" && prop.value.left.type === "Identifier") names.push(prop.value.left.name);
-			}
-			return names;
-		}
-		if (id.type === "ArrayPattern") {
-			const names = [];
-			for (const element of id.elements) {
-				if (!element) continue;
-				if (element.type === "Identifier") names.push(element.name);
-				else if (element.type === "RestElement" && element.argument.type === "Identifier") names.push(element.argument.name);
-				else if (element.type === "AssignmentPattern" && element.left.type === "Identifier") names.push(element.left.name);
-			}
-			return names;
-		}
-		return [];
-	};
-	const paramNames = (params) => {
-		const names = [];
-		for (const param of params) if (param.type === "Identifier") names.push(param.name);
-		else if (param.type === "AssignmentPattern" && param.left.type === "Identifier") names.push(param.left.name);
-		else if (param.type === "ObjectPattern") {
-			for (const prop of param.properties) if (prop.type === "Property" && prop.value.type === "Identifier") names.push(prop.value.name);
-		} else if (param.type === "ArrayPattern") {
-			for (const element of param.elements) if ((element === null || element === void 0 ? void 0 : element.type) === "Identifier") names.push(element.name);
-		}
-		return names;
-	};
-	walk(ctx.ast, (node, parent) => {
-		if (node.type === "VariableDeclaration") {
-			if (parent && (parent.type === "ForStatement" || parent.type === "ForInStatement" || parent.type === "ForOfStatement")) return;
-			const trackers = track(node.declarations.flatMap((d) => declaredNames(d.id)));
-			if (trackers) {
-				const semi = ctx.code[node.end - 1] === ";" ? "" : ";";
-				ctx.ms.appendRight(node.end, `${semi}${trackers}`);
-			}
-			return;
-		}
-		if (node.type === "FunctionDeclaration" || node.type === "ArrowFunctionExpression") {
-			const trackers = track(paramNames(node.params));
-			if (!trackers) return;
-			const body = node.body;
-			if (body.type === "BlockStatement") ctx.ms.appendRight(body.start + 1, trackers);
-			else {
-				const expressions = trackers.slice(0, -1).replaceAll(";", ",");
-				ctx.ms.prependLeft(body.start, `(${expressions}, (`);
-				ctx.ms.appendRight(body.end, "))");
-			}
+	const wrapper = ctx.ast.body.find((node) => {
+		var _node$id;
+		return node.type === "FunctionDeclaration" && ((_node$id = node.id) === null || _node$id === void 0 ? void 0 : _node$id.name) === "__fn__";
+	});
+	const root = (wrapper === null || wrapper === void 0 ? void 0 : wrapper.body) ?? ctx.ast;
+	const varBindings = /* @__PURE__ */ new Set();
+	const track = (names) => names.map((name) => `${VariableTrackingFnIdentifier}(${JSON.stringify(name)}, () => eval(${JSON.stringify(name)}));`).join("");
+	walk(root, (node, parent, ancestors) => {
+		if (node.type !== "VariableDeclaration" || ancestors.some((ancestor) => FUNCTION_TYPES$1.has(ancestor.type) || ancestor.type === "StaticBlock")) return;
+		if (node.kind !== "var" && parent !== root) return;
+		const names = node.declarations.flatMap((declaration) => declaredNames(declaration.id)).filter((name) => !name.startsWith("__"));
+		for (const name of names) variables.add(name);
+		if (node.kind === "var" && parent !== root) for (const name of names) varBindings.add(name);
+		else if (node.declarations.length > 1) ctx.ms.appendLeft(node.start, track(names));
+		else {
+			const semi = ctx.code[node.end - 1] === ";" ? "" : ";";
+			ctx.ms.appendRight(node.end, semi + track(names));
 		}
 	});
+	const entry = root.body.find((node) => !node.directive);
+	if (entry && varBindings.size) ctx.ms.appendLeft(entry.start, track([...varBindings]));
 }
 //#endregion
 //#region src/compiler/compiler.ts

package/dist/{component-BXS8vAwO.cjs → component-CPKXe6Ca.cjs}

@@ -1,5 +1,5 @@
-const require_compiler = require("./compiler-C-OI9sim.cjs");
-const require_jsx = require("./jsx-D5Y2cPo-.cjs");
+const require_compiler = require("./compiler-BJJUmNS9.cjs");
+const require_jsx = require("./jsx-BJ6GWXI2.cjs");
 //#region src/component.ts
 var component_exports = /* @__PURE__ */ require_compiler.__exportAll({
 	Component: () => Component,

package/dist/{component-Dq7ZLdvy.js → component-DGG7d_Mz.js}

@@ -1,5 +1,5 @@
 import { n as __exportAll } from "./rolldown-runtime-EAsCxrDo.js";
-import { n as isAnyJsxComponent, r as isJsxComponent, t as createJsxComponent } from "./jsx-B0iYyvfr.js";
+import { n as isAnyJsxComponent, r as isJsxComponent, t as createJsxComponent } from "./jsx-CIgdGGVs.js";
 //#region src/component.ts
 var component_exports = /* @__PURE__ */ __exportAll({
 	Component: () => Component,