@codeworksh/cli 0.0.1-dev.20260923102823 → 0.0.1-dev.20260925125202

package/{error-DG5INUkQ.mjs → error-D0C5K2Av.mjs}

@@ -1,27 +1,27 @@
 import { createRequire, registerHooks } from "node:module";
 import { Cause, Clock, Config, Context, Crypto, DateTime, Deferred, Duration, Effect, Encoding, Exit, Fiber, FiberSet, FileSystem, Layer, LayerMap, Option, Path, Predicate, PubSub, Queue, Ref, Result, Schedule, Schema, SchemaIssue, Scope, Semaphore, Stream, String as String$1 } from "effect";
 import { Message, Model, llm, stream } from "@codeworksh/aikit";
-import path from "node:path";
-import * as os from "node:os";
-import { homedir, tmpdir } from "node:os";
-import { fileURLToPath, pathToFileURL } from "node:url";
-import fs, { statSync } from "node:fs";
-import npa from "npm-package-arg";
 import { MessageID as ID, SessionID as ID$1 } from "@codeworksh/plugin/ids";
 import { Migrator, SqlClient, SqlError, SqlSchema } from "effect/unstable/sql";
 import { uuidv7 } from "uuidv7";
 import { SqliteClient, SqliteMigrator } from "@effect/sql-sqlite-node";
+import * as os from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { NodeChildProcessSpawner, NodeCrypto, NodeFileSystem, NodePath, NodeSocket } from "@effect/platform-node";
 import { posix } from "@codeworksh/plugin/posix";
 import { Model as Model$1, VariantSchema } from "effect/unstable/schema";
 import { MemoryProvider, RealFSProvider, SqliteProvider, create } from "@platformatic/vfs";
+import fs, { statSync } from "node:fs";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { Buffer as Buffer$1 } from "node:buffer";
 import { Bash } from "just-bash";
 import { SandboxDriver as SandboxDriver$3, SandboxProvider } from "@codeworksh/plugin/sandbox";
 import { DirectoryNotFoundError, DirectoryNotFoundError as DirectoryNotFoundError$1, Info, NotDirectoryError, NotDirectoryError as NotDirectoryError$1, Service, Service as Service$8 } from "@codeworksh/plugin/location";
 import { generateModels } from "@codeworksh/aikit/modelgen";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import path from "node:path";
 import { Script, constants } from "node:vm";
+import npa from "npm-package-arg";
 import * as AikitFailure from "@codeworksh/aikit/failure";
 import { JsonGitHubCopilotAuthStorage, getGitHubCopilotApiKey } from "@codeworksh/aikit/oauth/github/copilot";
 import { JsonOpenAICodexAuthStorage, getOpenAICodexApiKey } from "@codeworksh/aikit/oauth/openai/codex";
@@ -29,21 +29,10 @@ import "@codeworksh/plugin/tool/error";
 import { parse, printParseErrorCode } from "jsonc-parser";
 import { Rpc, RpcClient, RpcGroup, RpcSerialization } from "effect/unstable/rpc";
 //#region \0rolldown/runtime.js
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esmMin = (fn, res, err) => () => {
-	if (err) throw err[0];
-	try {
-		return fn && (res = fn(fn = 0)), res;
-	} catch (e) {
-		throw err = [e], e;
-	}
-};
-var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __exportAll = (all, no_symbols) => {
 	let target = {};
 	for (var name in all) __defProp(target, name, {
@@ -64,12 +53,6 @@ var __copyProps = (to, from, except, desc) => {
 	return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-var __toCommonJS = (mod) => __hasOwnProp.call(mod, "module.exports") ? mod["module.exports"] : __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
 //#region ../harness/src/schema.ts
 var schema_exports$8 = /* @__PURE__ */ __exportAll({});
@@ -6451,8 +6434,8 @@ const options = (dir, cache) => Effect.suspend(() => {
 });
 const npmOptions = (dir, cache) => Effect.gen(function* () {
 	const config = yield* Effect.tryPromise(async () => {
-		const { default: Config } = await import("./lib-BCUUrctP.mjs").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
-		const { definitions, flatten, nerfDarts, shorthands } = (await import("./definitions-XbglYT7Q.mjs").then((m) => /* @__PURE__ */ __toESM(m.default, 1))).default;
+		const { default: Config } = await import("@npmcli/config");
+		const { definitions, flatten, nerfDarts, shorthands } = (await import("@npmcli/config/lib/definitions/index.js")).default;
 		const created = new Config({
 			npmPath: fileURLToPath(new URL("..", import.meta.url)),
 			cwd: dir,
@@ -6568,7 +6551,7 @@ const entrypoint = (directory, name) => Effect.gen(function* () {
 });
 const reify = Effect.fn("PluginNpm.reify")(function* ({ target, into, cache, from }) {
 	const flat = yield* options(from, cache);
-	const { Arborist } = yield* Effect.promise(() => import("./lib-CNtGmPS7.mjs").then((m) => /* @__PURE__ */ __toESM(m.default, 1)));
+	const { Arborist } = yield* Effect.promise(() => import("@npmcli/arborist"));
 	const settings = {
 		...flat,
 		...target.mutable ? {
@@ -6662,7 +6645,7 @@ const probe = Effect.fn("PluginNpm.probe")(function* (target, cache, from) {
 		noGitRevCache: true,
 		_isRoot: true
 	};
-	const { default: pacote } = yield* Effect.promise(() => import("./lib-DHoZNIet.mjs").then((n) => /* @__PURE__ */ __toESM(n.t(), 1)));
+	const { default: pacote } = yield* Effect.promise(() => import("pacote"));
 	return yield* Effect.tryPromise({
 		try: async () => target.kind === "registry" ? (await pacote.manifest(target.spec, opts)).version : commitIn(await pacote.resolve(target.spec, opts)),
 		catch: (cause) => new InstallError({
@@ -7282,6 +7265,12 @@ const Manifest = Schema.Struct({
 	name: Schema.optional(Schema.String),
 	exports: Schema.optional(Schema.Unknown)
 });
+const readManifest = (manifestPath) => fileSystem.readFileString(manifestPath).pipe(Effect.flatMap(Schema.decodeUnknownEffect(Schema.fromJsonString(Manifest))));
+/**
+* The name a local package declares, read without importing it: the alias the catalog registers
+* for it, so a `{ package }` entry and a command naming the package both reach it.
+*/
+const localName = (location) => readManifest(hostPath.join(location, "package.json")).pipe(Effect.map((manifest) => manifest.name), Effect.orElseSucceed(() => void 0));
 const localUrl = Effect.fn("PluginLoader.localUrl")(function* (location, origin) {
 	const escapes = (message) => new SourceError({
 		reason: "plugin-escapes-root",
@@ -7292,7 +7281,7 @@ const localUrl = Effect.fn("PluginLoader.localUrl")(function* (location, origin)
 	if ((yield* fileSystem.stat(location)).type !== "Directory") return { url: yield* Effect.try(() => resolveModule(location, hostPath.dirname(location))) };
 	const manifestPath = hostPath.join(location, "package.json");
 	if (!(yield* fileSystem.exists(manifestPath))) return { url: yield* Effect.try(() => resolveModule("./index", location)) };
-	const manifest = yield* fileSystem.readFileString(manifestPath).pipe(Effect.flatMap(Schema.decodeUnknownEffect(Schema.fromJsonString(Manifest))));
+	const manifest = yield* readManifest(manifestPath);
 	if (manifest.exports !== void 0) {
 		const name = manifest.name;
 		if (!name) return yield* escapes("a local package with exports must declare its name");
@@ -7568,7 +7557,9 @@ const select = Effect.fn("PluginCatalog.select")(function* (references, pool) {
 * walks those entries against the loaded set. Two things can be settled right there, and they are
 * the same question asked twice:
 *
-* 1. a settings entry names a module that is not loaded, and the store holds it;
+* 1. a settings entry names a module that is not loaded, and the store holds it -- or it is loaded
+*    from another file's artifact than the one that owns it in this view, and the store holds
+*    the owner's;
 * 2. a loaded module is not the newest generation the store has.
 *
 * The second is what makes `plugin update` finish. Without it the question is "is this entry
@@ -7587,8 +7578,16 @@ const select = Effect.fn("PluginCatalog.select")(function* (references, pool) {
 const follow = Effect.fn("PluginCatalog.follow")(function* (references, pool, options, filed) {
 	let moved = false;
 	for (const reference of references) {
-		if (typeof reference !== "string" || pool.aliases.has(reference)) continue;
-		if (Option.isSome(yield* filed(reference, anchor$1(options.declared?.get(reference), options.hostDir)))) {
+		if (typeof reference !== "string") continue;
+		const owner = options.declared?.get(reference);
+		const from = anchor$1(owner, options.hostDir);
+		const id = pool.aliases.get(reference);
+		if (id !== void 0) {
+			const origin = pool.origins.get(id);
+			if (owner === void 0 || origin?.reference !== reference) continue;
+			if (anchor$1(origin.file, options.hostDir) === from) continue;
+		}
+		if (Option.isSome(yield* filed(reference, from))) {
 			moved = true;
 			break;
 		}
@@ -8321,7 +8320,7 @@ const make$5 = (tools) => {
 			if (before.value !== void 0 && !Schema.is(schema_exports.ToolBeforeResult)(before.value)) return yield* failureOutcome(call, Cause.die(/* @__PURE__ */ new Error("beforeToolCall returned an invalid result")), "beforeToolCall failed");
 			if (before.value?.block) {
 				const now = yield* Effect.clockWith((clock) => clock.currentTimeMillis);
-				return errored(call, [text(before.value.reason || "Tool execution was blocked")], now);
+				return errored(call, [text(before.value?.reason || "Tool execution was blocked")], now);
 			}
 		}
 		const latest = yield* Ref.make(Option.none());
@@ -8630,6 +8629,12 @@ const layer$7 = Layer.effect(Service$3, Effect.gen(function* () {
 }));
 //#endregion
 //#region ../harness/src/settings/settings.ts
+/**
+* An app-level `--user-config-dir` as the absolute directory it names: `~` is the user's home, and
+* a relative spelling is relative to `hostCwd` -- never to a session's `hostDir`, which is not
+* where the flag was typed.
+*/
+const userConfigDir = (raw, hostCwd) => hostPath.resolve(hostCwd, expandTilde(raw, hostPath));
 /** The settings files a directory may hold, in the order it is searched. */
 const settingsIn = (directory) => [hostPath.join(directory, "settings.jsonc"), hostPath.join(directory, "settings.json")];
 /** A directory and every ancestor above it, nearest first. */
@@ -8679,13 +8684,7 @@ const projectRoot = Effect.fn("Settings.projectRoot")(function* (from, home) {
 * no project layer at all, which is what a session with no host directory gets.
 */
 function paths(input) {
-	const expanded = input.custom === void 0 ? void 0 : expandTilde(input.custom, hostPath);
-	const explicit = expanded === void 0 ? void 0 : input.from === void 0 ? expanded : hostPath.resolve(input.from, expanded);
-	return [
-		settingsIn(input.home),
-		input.root === void 0 ? [] : settingsIn(hostPath.join(input.root, appConfigDir)),
-		...explicit === void 0 ? [] : [settingsIn(explicit)]
-	];
+	return [settingsIn(input.userConfigDir ?? input.home), input.root === void 0 ? [] : settingsIn(hostPath.join(input.root, appConfigDir))];
 }
 var SettingsError = class extends Schema.TaggedError()("SettingsError", {
 	path: Schema.String,
@@ -8763,8 +8762,7 @@ const load$1 = Effect.fn("Settings.load")(function* (options) {
 	const files = paths({
 		home: options.home,
 		root,
-		...options.hostDir === void 0 ? {} : { from: hostPath.resolve(options.hostDir) },
-		...options.userConfigDir === void 0 ? {} : { custom: options.userConfigDir }
+		...options.userConfigDir === void 0 ? {} : { userConfigDir: options.userConfigDir }
 	});
 	let settings = merge(schema_exports$1.defaults);
 	let declared = schema_exports$1.defaults.declared;
@@ -8790,6 +8788,20 @@ const load$1 = Effect.fn("Settings.load")(function* (options) {
 		declared
 	};
 });
+/**
+* Each module reference once, owned by the **last** file to declare it (D6).
+*
+* The owner is not bookkeeping: its `.npmrc` chain keys the store artifact. The CLI that installs
+* a reference and the runtime that loads it must pick the same owner, or `plugin update` refreshes
+* an artifact the runtime never reads. Only a string entry loads a module, so only a string entry
+* owns one -- a `{ package }` patch in another file configures it and must not move its registry.
+* A reference keeps the position of its first declaration.
+*/
+const modules = (declared) => {
+	const owners = /* @__PURE__ */ new Map();
+	for (const one of declared) if (typeof one.entry === "string") owners.set(one.entry, one);
+	return owners;
+};
 const layer$6 = (options = {}) => Layer.effect(Service$2, Effect.gen(function* () {
 	const global = yield* Service$17;
 	return Service$2.of({ load: (hostDir) => load$1({
@@ -8833,8 +8845,14 @@ const resolver = (input) => typeof input === "string" ? () => input : input;
 * `references` says which entries the config pass walks. It is a function of the settings that
 * exchange read, so a caller that pinned an explicit list keeps it and everyone else follows the
 * files.
+*
+* `pool` is the **process view**: what boot loaded from the user layers. A session in a project
+* runs from that project's own view, a pool created from the process view the first time the
+* project is seen and moved only by its own sessions. The same spec can be owned by different
+* files -- and so name different registries -- in two views; one shared pool could hold only one of
+* those builds, and sessions in different projects would keep evicting each other's.
 */
-const layer$5 = (options, pool, references, follow, rebuild) => {
+const layer$5 = (options, pool, references, follow, rebuild, viewOf = () => Effect.undefined) => {
 	return Layer.effect(Service$1, Effect.gen(function* () {
 		const runtime = yield* Service$3;
 		const sessions = yield* Service$14;
@@ -8849,10 +8867,31 @@ const layer$5 = (options, pool, references, follow, rebuild) => {
 			id,
 			...origin.file === void 0 ? {} : { file: origin.file }
 		});
-		const activate = Effect.fn("State.activatePlugins")(function* (next) {
-			const previous = yield* Ref.get(pool);
-			yield* eventRegistry.replace([...next.plugins.values()]);
-			yield* Ref.set(pool, next);
+		/** Project root to its view. The process view is `pool` itself. */
+		const views = /* @__PURE__ */ new Map();
+		/** Created from the process view on first use; called under `loading`, so never twice. */
+		const poolOf = Effect.fnUntraced(function* (root) {
+			if (root === void 0) return pool;
+			const existing = views.get(root);
+			if (existing !== void 0) return existing;
+			const created = yield* Ref.make(yield* Ref.get(pool));
+			views.set(root, created);
+			return created;
+		});
+		const everyView = () => [[void 0, pool], ...views];
+		/**
+		* Every plugin some view runs, one per ID. Event types are process-wide, and two views
+		* holding two builds of one plugin register its namespace once.
+		*/
+		const union = Effect.fnUntraced(function* (target, next) {
+			const plugins = /* @__PURE__ */ new Map();
+			for (const [, ref] of everyView()) for (const [id, plugin] of ref === target ? next.plugins : (yield* Ref.get(ref)).plugins) plugins.set(id, plugin);
+			return plugins;
+		});
+		const activate = Effect.fn("State.activatePlugins")(function* (target, next) {
+			const previous = yield* Ref.get(target);
+			yield* eventRegistry.replace([...(yield* union(target, next)).values()]);
+			yield* Ref.set(target, next);
 			for (const [id, origin] of next.origins) {
 				if (next.plugins.get(id) === previous.plugins.get(id)) continue;
 				yield* updated(origin, id, "loaded");
@@ -8872,16 +8911,21 @@ const layer$5 = (options, pool, references, follow, rebuild) => {
 		});
 		return Service$1.of({
 			reload: Effect.gen(function* () {
-				const rebuilt = yield* rebuild().pipe(Effect.flatMap(activate), loading.withPermits(1), Effect.result);
-				if (rebuilt._tag === "Failure") {
-					yield* Effect.logWarning(`plugin reload failed, keeping the previous set: ${rebuilt.failure.message}`);
-					yield* publishFailed(rebuilt.failure);
-					return {
-						plugins: (yield* Ref.get(pool)).plugins.size,
-						failure: rebuilt.failure.message
-					};
+				const failures = /* @__PURE__ */ new Map();
+				for (const [root, target] of everyView()) {
+					const rebuilt = yield* Ref.get(target).pipe(Effect.flatMap((current) => rebuild(root, current)), Effect.flatMap((next) => activate(target, next)), loading.withPermits(1), Effect.result);
+					if (rebuilt._tag === "Failure") failures.set(rebuilt.failure.message, rebuilt.failure);
 				}
-				return { plugins: rebuilt.success.plugins.size };
+				for (const failure of failures.values()) {
+					yield* Effect.logWarning(`plugin reload failed, keeping the previous set: ${failure.message}`);
+					yield* publishFailed(failure);
+				}
+				const plugins = (yield* union(pool, yield* Ref.get(pool))).size;
+				const [first] = failures.keys();
+				return first === void 0 ? { plugins } : {
+					plugins,
+					failure: first
+				};
 			}),
 			snapshot: Effect.fn("State.snapshot")(function* (sessionId) {
 				const sessionOptions = Option.getOrElse(yield* runtime.get(sessionId), () => ({}));
@@ -8906,10 +8950,12 @@ const layer$5 = (options, pool, references, follow, rebuild) => {
 					cause
 				});
 				const loaded = yield* Effect.gen(function* () {
-					const current = yield* Ref.get(pool);
-					const moved = yield* follow(refs, current, loadedSettings).pipe(Effect.tapError((cause) => publishFailed(cause, sessionId)));
+					const root = yield* viewOf(hostDir);
+					const target = yield* poolOf(root);
+					const current = yield* Ref.get(target);
+					const moved = yield* follow(refs, current, loadedSettings, root).pipe(Effect.tapError((cause) => publishFailed(cause, sessionId)));
 					if (Option.isNone(moved)) return current;
-					return yield* activate(moved.value);
+					return yield* activate(target, moved.value);
 				}).pipe(loading.withPermits(1), Effect.mapError(failed));
 				const chosen = yield* select(refs, loaded).pipe(Effect.mapError(failed));
 				for (const reference of chosen.missing) {
@@ -9398,23 +9444,28 @@ const layer$2 = Layer.provideMerge(layer$3, layer$24);
 //#endregion
 //#region ../harness/src/effect/harness.ts
 const layer$1 = (options = {}) => Layer.unwrap(Effect.gen(function* () {
-	const paths = yield* resolve$3(options.home === void 0 ? {} : { home: options.home });
 	const hostCwd = options.hostCwd ?? process.cwd();
+	const paths = yield* resolve$3(options.home === void 0 ? {} : { home: hostPath.resolve(hostCwd, expandTilde(options.home, hostPath)) });
 	const global = layerWith(paths);
-	const settingsOptions = options.userConfigDir === void 0 ? {} : { userConfigDir: hostPath.resolve(hostCwd, expandTilde(options.userConfigDir, hostPath)) };
+	const settingsOptions = options.userConfigDir === void 0 ? {} : { userConfigDir: userConfigDir(options.userConfigDir, hostCwd) };
 	const config = yield* load$1({
 		...settingsOptions,
 		home: paths.home
 	});
 	const references = (settings) => options.plugins ?? [...builtins, ...settings.plugins];
-	/** Reference to the file that declared it, for failures that should name one. */
-	const declaredIn = (settings) => new Map(settings.declared.flatMap((one) => typeof one.entry === "string" ? [[one.entry, one.file]] : "package" in one.entry ? [[one.entry.package, one.file]] : []));
+	/** Reference to the file that owns it: the `.npmrc` anchor, and what a failure names. */
+	const declaredIn = (settings) => new Map(Array.from(modules(settings.declared), ([reference, one]) => [reference, one.file]));
 	const catalogOptions = {
 		builtins,
 		cache: paths.cache,
 		hostDir: hostCwd
 	};
-	const filed = (reference, from) => parse$2(reference, hostCwd).pipe(Effect.flatMap((target) => target.kind === "local" ? fileSystem.exists(target.path).pipe(Effect.map((there) => there ? Option.some({}) : Option.none())) : resolve$2(target, paths.cache, from).pipe(Effect.map((entry) => Option.fromUndefinedOr(entry)))), Effect.orElseSucceed(() => Option.none()));
+	/**
+	* The host directory a view resolves against: a project view's is the root its sessions'
+	* `hostDir` led to; only the process view falls back to `hostCwd`.
+	*/
+	const hostDirOf = (root) => root ?? hostCwd;
+	const filed = (reference, from) => parse$2(reference, from).pipe(Effect.flatMap((target) => target.kind === "local" ? fileSystem.exists(target.path).pipe(Effect.map((there) => there ? Option.some({}) : Option.none())) : resolve$2(target, paths.cache, from).pipe(Effect.map((entry) => Option.fromUndefinedOr(entry)))), Effect.orElseSucceed(() => Option.none()));
 	const resolveOnly = {
 		...catalogOptions,
 		install: required
@@ -9423,22 +9474,25 @@ const layer$1 = (options = {}) => Layer.unwrap(Effect.gen(function* () {
 		...resolveOnly,
 		declared: declaredIn(config)
 	}));
-	const followStore = (refs, current, settings) => follow(refs, current, {
+	const followStore = (refs, current, settings, root) => follow(refs, current, {
 		...resolveOnly,
+		hostDir: hostDirOf(root),
 		declared: declaredIn(settings)
 	}, filed);
+	/** A session's view is its project root; one with no project runs from the process view. */
+	const viewOf = (hostDir) => hostDir === void 0 ? Effect.undefined : projectRoot(hostDir, paths.home).pipe(Effect.orElseSucceed(() => void 0));
 	let reloads = 0;
-	const rebuild = () => Effect.gen(function* () {
+	const rebuild = (root, loaded) => Effect.gen(function* () {
 		reloads += 1;
 		const current = yield* load$1({
 			...settingsOptions,
-			home: paths.home
+			home: paths.home,
+			...root === void 0 ? {} : { hostDir: root }
 		});
-		const loaded = yield* Ref.get(pool);
 		const retained = [];
 		const configured = references(current);
 		for (const origin of loaded.origins.values()) {
-			if (configured.includes(origin.reference) || Option.isSome(yield* filed(origin.reference, anchor$1(origin.file, hostCwd)))) {
+			if (configured.includes(origin.reference) || Option.isSome(yield* filed(origin.reference, anchor$1(origin.file, hostDirOf(root))))) {
 				retained.push(origin);
 				continue;
 			}
@@ -9450,6 +9504,7 @@ const layer$1 = (options = {}) => Layer.unwrap(Effect.gen(function* () {
 		for (const [reference, file] of declaredIn(current)) known.set(reference, file);
 		return yield* load$2(accumulated, {
 			...resolveOnly,
+			hostDir: hostDirOf(root),
 			declared: known,
 			reload: reloads
 		});
@@ -9462,7 +9517,7 @@ const layer$1 = (options = {}) => Layer.unwrap(Effect.gen(function* () {
 	const authFile$1 = authFile(options.home === void 0 ? void 0 : paths.home);
 	const open = options.llm ?? openWith(authFile$1 === void 0 ? {} : { authFile: authFile$1 });
 	const loop = layer$4({ request: make$6(open) });
-	return layer$11.pipe(Layer.provideMerge(layer$8.pipe(Layer.provide(loop))), Layer.provideMerge(layer$5({}, pool, references, followStore, rebuild)), Layer.provideMerge(layer$6(settingsOptions)), Layer.provideMerge(layer$7), Layer.provideMerge(sandboxes), Layer.provideMerge(layer$23), Layer.provideMerge(layer$2), Layer.provideMerge(layer$26), Layer.provideMerge(layer$10(definitions)), Layer.provideMerge(database), Layer.provideMerge(global), Layer.provideMerge(layer$9({
+	return layer$11.pipe(Layer.provideMerge(layer$8.pipe(Layer.provide(loop))), Layer.provideMerge(layer$5({}, pool, references, followStore, rebuild, viewOf)), Layer.provideMerge(layer$6(settingsOptions)), Layer.provideMerge(layer$7), Layer.provideMerge(sandboxes), Layer.provideMerge(layer$23), Layer.provideMerge(layer$2), Layer.provideMerge(layer$26), Layer.provideMerge(layer$10(definitions)), Layer.provideMerge(database), Layer.provideMerge(global), Layer.provideMerge(layer$9({
 		home: paths.home,
 		watch: options.watchModels ?? false
 	})));
@@ -10316,6 +10371,6 @@ const reportFailure = (error) => writeError(renderError(error)).pipe(Effect.andT
 	process.exitCode = 1;
 })));
 //#endregion
-export { refresh$1 as $, stop as A, __toESM as At, check as B, link as C, ID$1 as Ct, list as D, __exportAll as Dt, drivers as E, __esmMin as Et, projectRoot as F, parse$2 as G, resolve$2 as H, anchor$1 as I, LoadError as J, probe as K, canonical as L, Service$1 as M, load$1 as N, register as O, __require as Ot, paths as P, providers as Q, definition$1 as R, get as S, resolve$3 as St, create$2 as T, __commonJSMin as Tt, update as U, required as V, lock as W, StoreError as X, SourceError as Y, models as Z, Connected as _, schema_exports$6 as _t, addUsage as a, Service$14 as at, attach as b, Service$17 as bt, terminalColumns as c, layer$24 as ct, writeOut as d, layer$26 as dt, sync as et, layer as f, LLMEnded as ft, OAuthError$1 as g, instance_exports as gt, Api as h, Prompt as ht, reportFailure as i, sandbox$1 as it, layer$1 as j, resolve as k, __toCommonJS as kt, usage as l, Service$16 as lt, run as m, TurnEnded as mt, OAuthError as n, Service$5 as nt, emptyUsage as o, SessionNotFoundError as ot, make as p, LLMTextDelta as pt, InstallError as q, renderError as r, sandbox as rt, header as s, SessionNotLinkedError as st, InvalidInputError as t, Service$4 as tt, writeError as u, SubscriptionOverflowError as ut, Core as v, layer$27 as vt, relink as w, schema_exports$8 as wt, create$1 as x, authFile as xt, encode as y, path$1 as yt, inspect as z };
+export { SourceError as $, stop as A, definition$1 as B, link as C, path$1 as Ct, list as D, ID$1 as Dt, drivers as E, resolve$3 as Et, paths as F, required as G, localName as H, projectRoot as I, lock as J, resolve$2 as K, userConfigDir as L, Service$1 as M, load$1 as N, register as O, schema_exports$8 as Ot, modules as P, LoadError as Q, anchor$1 as R, get as S, layer$27 as St, create$2 as T, authFile as Tt, check as U, inspect as V, digest as W, probe as X, parse$2 as Y, InstallError as Z, Connected as _, LLMTextDelta as _t, addUsage as a, Service$4 as at, attach as b, instance_exports as bt, terminalColumns as c, sandbox$1 as ct, writeOut as d, SessionNotLinkedError as dt, StoreError as et, layer as f, layer$24 as ft, OAuthError$1 as g, LLMEnded as gt, Api as h, layer$26 as ht, reportFailure as i, sync as it, layer$1 as j, resolve as k, usage as l, Service$14 as lt, run as m, SubscriptionOverflowError as mt, OAuthError as n, providers as nt, emptyUsage as o, Service$5 as ot, make as p, Service$16 as pt, update as q, renderError as r, refresh$1 as rt, header as s, sandbox as st, InvalidInputError as t, models as tt, writeError as u, SessionNotFoundError as ut, Core as v, TurnEnded as vt, relink as w, Service$17 as wt, create$1 as x, schema_exports$6 as xt, encode as y, Prompt as yt, canonical as z };
 
-//# sourceMappingURL=error-DG5INUkQ.mjs.map
+//# sourceMappingURL=error-D0C5K2Av.mjs.map