@gjermundgaraba/upup 0.3.0 → 0.4.0

package/dist/main.mjs

@@ -20,7 +20,7 @@ import { BACKGROUND_CONTEXT, withAbortSignal } from "@earendil-works/chord/conte
 import { Type } from "@earendil-works/pi-ai";
 import { GenerationTask, Harness, ToolTask, createRegistry, defineDoc, defineExtension, defineTool, hook, section, watchEvents } from "@earendil-works/pi-durable";
 import { openNodeSqliteStorage } from "@earendil-works/pi-durable/storage/sqlite/node";
-import { ChildProcess, ChildProcessSpawner } from "effect/process";
+import { ChildProcess, ChildProcessSpawner, CommandLine } from "effect/process";
 import { Worker } from "node:worker_threads";
 import semver from "semver";
 import tarStream from "tar-stream";
@@ -41,8 +41,9 @@ import { XMLParser } from "fast-xml-parser";
 import { isSea } from "node:sea";
 import * as ActionMcp from "@gjermundgaraba/effect-actions/ActionMcp";
 import * as Action from "@gjermundgaraba/effect-actions/Action";
+import { setup, types } from "xstate/fsm";
 // package.json
-var version$1 = "0.3.0";
+var version$1 = "0.4.0";
 // src/ai/Setup.ts
 const Thinking = Schema.Literals([
 	"off",
@@ -283,7 +284,7 @@ const ordered = (left, right) => Number(right.signedIn) - Number(left.signedIn)
 var AiFailed = class extends Schema.TaggedError()("AiFailed", { issue: Schema.String }) {};
 var Ai = class extends Context.Service()("upup/Ai") {};
 const failed$2 = (cause) => new AiFailed({ issue: cause instanceof Error ? cause.message : String(cause) });
-const make$14 = (models, credentials = store()) => Effect.gen(function* () {
+const make$15 = (models, credentials = store()) => Effect.gen(function* () {
 	const settings = yield* Settings;
 	const catalogue = Effect.promise(async () => {
 		const providers = models.getProviders();
@@ -328,7 +329,7 @@ const make$14 = (models, credentials = store()) => Effect.gen(function* () {
 });
 const layer$7 = Layer.effect(Ai, Effect.suspend(() => {
 	const credentials = store();
-	return make$14(builtinModels({ credentials }), credentials);
+	return make$15(builtinModels({ credentials }), credentials);
 }));
 // src/process/lock.ts
 var LockFailed = class extends Schema.TaggedError()("LockFailed", {
@@ -519,7 +520,7 @@ var CommandFailed = class extends Schema.TaggedError()("CommandFailed", {
 	output: Schema.String
 }) {};
 var Exec = class extends Context.Service()("upup/Exec") {};
-const commandLine = (invocation) => [invocation.command, ...invocation.args].join(" ");
+const commandLine = (invocation) => CommandLine.display([invocation.command, ...invocation.args]);
 const requireSuccess = (run) => (invocation) => run(invocation).pipe(Effect.filterOrFail((output) => output.exitCode === 0, (output) => new CommandFailed({
 	command: commandLine(invocation),
 	cwd: invocation.cwd,
@@ -550,7 +551,7 @@ const layer$6 = Layer.effect(Exec, Effect.gen(function* () {
 	}, Effect.scoped, (effect, invocation) => Effect.mapError(effect, (cause) => new CommandFailed({
 		command: commandLine(invocation),
 		cwd: invocation.cwd,
-		output: cause.message
+		output: Predicate.isError(cause.cause) ? cause.cause.message : cause.reason.description ?? cause.reason._tag
 	})));
 	return Exec.of({
 		run,
@@ -595,14 +596,14 @@ const Installed = Schema.Struct({
 	formulae: Schema.Array(Formula$2),
 	casks: Schema.Array(Cask$1)
 });
-const OutdatedEntry$1 = Schema.Struct({
+const OutdatedEntry = Schema.Struct({
 	name: Schema.String,
 	current_version: Schema.String,
 	pinned: Schema.Boolean
 });
-const Outdated$2 = Schema.Struct({
-	formulae: Schema.Array(OutdatedEntry$1),
-	casks: Schema.Array(OutdatedEntry$1)
+const Outdated$1 = Schema.Struct({
+	formulae: Schema.Array(OutdatedEntry),
+	casks: Schema.Array(OutdatedEntry)
 });
 const brew$1 = (args, refreshMetadata = false) => ({
 	command: "brew",
@@ -653,7 +654,7 @@ const packages = (installed, outdated) => {
 	});
 	return [...formulae, ...casks];
 };
-const make$13 = Effect.gen(function* () {
+const make$14 = Effect.gen(function* () {
 	const exec = yield* Exec;
 	const json = (schema, invocation) => exec.stdout(invocation).pipe(Effect.flatMap(decodeJson(schema, commandLine(invocation))));
 	const list = Effect.gen(function* () {
@@ -662,7 +663,7 @@ const make$13 = Effect.gen(function* () {
 			"--json=v2",
 			"--installed"
 		]));
-		const outdated = yield* json(Outdated$2, brew$1(["outdated", "--json=v2"], true));
+		const outdated = yield* json(Outdated$1, brew$1(["outdated", "--json=v2"], true));
 		return {
 			packages: packages(installed, outdated),
 			notices: []
@@ -695,7 +696,7 @@ const make$13 = Effect.gen(function* () {
 			exitCode: output.exitCode,
 			output: output.stderr
 		});
-		const outdated = yield* decodeJson(Outdated$2, commandLine(invocation))(output.stdout);
+		const outdated = yield* decodeJson(Outdated$1, commandLine(invocation))(output.stdout);
 		return [...outdated.formulae, ...outdated.casks].find((entry) => entry.name === pkg.name)?.current_version;
 	});
 	return {
@@ -797,7 +798,7 @@ const landingKey = (landing) => sha256(JSON.stringify([
 ]));
 const unauditedReasons = {
 	app: "an app update",
-	runtime: "a runtime version the project pins",
+	runtime: "a Node.js runtime version",
 	os: "an operating-system update"
 };
 const unauditable = (pkg) => {
@@ -2268,7 +2269,7 @@ var LookupFailed = class extends Schema.TaggedError()("LookupFailed", {
 	url: Schema.String,
 	issue: Schema.String
 }) {};
-const Release$2 = Schema.fromJsonString(Schema.Struct({
+const Release$3 = Schema.fromJsonString(Schema.Struct({
 	vers: Schema.String,
 	yanked: Schema.Boolean
 }));
@@ -2285,7 +2286,7 @@ const newestRelease = Effect.fn("CratesIndex.newestRelease")(function* (client,
 		issue: error.message
 	});
 	const text = yield* HttpClient.filterStatusOk(client).get(url).pipe(Effect.flatMap((response) => response.text), Effect.mapError(failed));
-	const releases = yield* Effect.forEach(text.split("\n").filter((line) => line.trim().length > 0), (line) => Schema.decodeEffect(Release$2)(line).pipe(Effect.mapError(failed)));
+	const releases = yield* Effect.forEach(text.split("\n").filter((line) => line.trim().length > 0), (line) => Schema.decodeEffect(Release$3)(line).pipe(Effect.mapError(failed)));
 	return newestOffer(current, releases.filter((release) => !release.yanked).map((release) => release.vers));
 });
 // src/registry/Metadata.ts
@@ -6447,7 +6448,7 @@ const githubActionPreparer = (repositoryOf, options = {}) => Effect.fn("githubAc
 const prepareGitHubAction = githubActionPreparer(githubRepository);
 // src/audit/pypi.ts
 const optional = (schema) => Schema.optionalKey(Schema.NullOr(schema));
-const Release$1 = Schema.Struct({ urls: optional(Schema.Array(Schema.Struct({
+const Release$2 = Schema.Struct({ urls: optional(Schema.Array(Schema.Struct({
 	filename: optional(Schema.String),
 	url: optional(Schema.String),
 	packagetype: optional(Schema.String),
@@ -6538,7 +6539,7 @@ const artifactPlan = ([file, reason]) => {
 };
 const resolve$1 = Effect.fn("pypi.resolve")(function* (client, name, version, pythonVersion) {
 	const source = releaseUrl(name, version);
-	const files = ((yield* getJson(client, source, Release$1).pipe(Effect.mapError((error) => new EvidenceUnavailable({
+	const files = ((yield* getJson(client, source, Release$2).pipe(Effect.mapError((error) => new EvidenceUnavailable({
 		source,
 		issue: error.issue
 	})))).urls ?? []).map((file) => ({
@@ -7748,7 +7749,7 @@ const toPackage$1 = ({ uses, resolved, source }) => {
 	};
 };
 const publicTags = (url) => tags(url, { timeout: lsRemoteTimeout }).pipe(Effect.mapError((error) => error.issue), Effect.result);
-const make$12 = (root, origin, readPublic = publicTags) => Effect.gen(function* () {
+const make$13 = (root, origin, readPublic = publicTags) => Effect.gen(function* () {
 	const exec = yield* Exec;
 	const fs = yield* FileSystem.FileSystem;
 	const read = (file) => readText(file).pipe(Effect.provideService(FileSystem.FileSystem, fs));
@@ -7884,7 +7885,7 @@ const discover$4 = Effect.fn("GitHubActions.discover")(function* (dir) {
 		cwd: root
 	}).pipe(Effect.option);
 	const host = Option.isSome(origin) ? hostOf(origin.value.trim()) : void 0;
-	return [yield* make$12(root, host === "github.com" ? void 0 : host)];
+	return [yield* make$13(root, host === "github.com" ? void 0 : host)];
 });
 // src/process/on-path.ts
 const executable = (file) => Effect.promise(async () => await access(file, constants.X_OK).then(() => true, () => false));
@@ -7898,7 +7899,7 @@ const asRoot = (invocation) => [
 ];
 const enablesTouchId = (pam) => pam.split("\n").some((line) => /^\s*auth\s+\S+\s+pam_tid\.so\b/u.test(line));
 const pamFiles = ["/etc/pam.d/sudo_local", "/etc/pam.d/sudo"];
-const make$11 = (interactive) => Effect.gen(function* () {
+const make$12 = (interactive) => Effect.gen(function* () {
 	const exec = yield* Exec;
 	const fs = yield* FileSystem.FileSystem;
 	const asking = yield* SubscriptionRef.make(void 0);
@@ -7957,8 +7958,8 @@ const make$11 = (interactive) => Effect.gen(function* () {
 		answer
 	});
 });
-const layer$4 = Layer.effect(Sudo, make$11(true));
-const layerNoPrompt = Layer.effect(Sudo, make$11(false));
+const layer$4 = Layer.effect(Sudo, make$12(true));
+const layerNoPrompt = Layer.effect(Sudo, make$12(false));
 // src/apps/app-store.ts
 const countryOf = (locale) => (/[@;]rg=(?<region>[a-z]{2})/iu.exec(locale)?.groups?.["region"] ?? /^[a-z]{2,3}[_-](?<region>[a-z]{2})\b/iu.exec(locale)?.groups?.["region"] ?? "us").toLowerCase();
 const Lookup = Schema.Struct({ results: Schema.Array(Schema.Struct({
@@ -8750,7 +8751,7 @@ const locate$3 = Effect.gen(function* () {
 	return Option.isNone(manifest) || !(yield* fs.exists(zip).pipe(Effect.orElseSucceed(() => false))) ? Option.none() : yield* decode(manifest.value, zip);
 });
 // src/apps/swap.ts
-const tools = {
+const tools$2 = {
 	ps: "/bin/ps",
 	ditto: "/usr/bin/ditto",
 	mv: "/bin/mv",
@@ -9242,7 +9243,7 @@ const makeWith = (options) => Effect.gen(function* () {
 		return found;
 	});
 	const queue = yield* Ref.make([]);
-	const using = options.tools ?? tools;
+	const using = options.tools ?? tools$2;
 	const helper = options.sparkle === void 0 ? locate$3.pipe(Effect.provideService(FileSystem.FileSystem, fs)) : Effect.succeed(options.sparkle);
 	const sparkleOf = (pkg, install, build) => {
 		const refused = (reason) => new InstallRefused({
@@ -9442,7 +9443,7 @@ const makeWith = (options) => Effect.gen(function* () {
 		})
 	};
 });
-const make$10 = onPath("brew").pipe(Effect.flatMap((brewInstalled) => makeWith({
+const make$11 = onPath("brew").pipe(Effect.flatMap((brewInstalled) => makeWith({
 	roots: ["/Applications", path.join(homedir(), "Applications")],
 	brew: brewInstalled
 })));
@@ -9468,7 +9469,7 @@ const parseList = (text) => text.split("\n").flatMap((line) => {
 		fromCratesIo: source === void 0
 	}];
 });
-const make$9 = Effect.gen(function* () {
+const make$10 = Effect.gen(function* () {
 	const exec = yield* Exec;
 	const client = yield* HttpClient.HttpClient;
 	const installed = exec.stdout(cargo$1(["install", "--list"])).pipe(Effect.map(parseList));
@@ -9544,18 +9545,30 @@ const locateAll = Effect.fn("locateAll")(function* (dir, nested, manifest, locat
 	const own = yield* locate(dir);
 	const below = yield* Effect.forEach(nested, (from) => Effect.map(Effect.result(locate(from)), (result) => [from, result]), { concurrency: 8 });
 	const found = /* @__PURE__ */ new Map();
+	const claimed = /* @__PURE__ */ new Map();
 	const failed = [];
-	const add = (located) => {
-		if (Option.isSome(located) && !found.has(located.value.root)) found.set(located.value.root, located.value);
+	const add = (from, located) => {
+		if (Option.isNone(located)) return;
+		const { root } = located.value;
+		if (!found.has(root)) found.set(root, located.value);
+		claimed.set(root, [...claimed.get(root) ?? [], from]);
 	};
-	add(own);
+	add(dir, own);
 	const ownRoot = Option.map(own, (located) => located.root);
 	const outside = (located) => Option.isSome(located) && placeOf$1(dir, located.value.root) === "" && !Option.contains(ownRoot, located.value.root);
+	const failures = below.flatMap(([from, result]) => Result.isFailure(result) ? [{
+		from,
+		reason: describeError(result.failure)
+	}] : []);
+	const repeated = (from, reason) => failures.some((other) => other.reason === reason && from.startsWith(`${other.from}${path.sep}`));
 	for (const [from, result] of below) if (Result.isSuccess(result)) {
-		if (!outside(result.success)) add(result.success);
-	} else failed.push(failing(path.join(path.relative(dir, from), manifest), result.failure));
+		if (!outside(result.success)) add(from, result.success);
+	} else if (!repeated(from, describeError(result.failure))) failed.push(failing(path.join(path.relative(dir, from), manifest), result.failure));
 	return {
-		found: [...found.values()],
+		found: [...found.values()].map((located) => ({
+			...located,
+			claimed: claimed.get(located.root) ?? []
+		})),
 		failed
 	};
 });
@@ -9642,10 +9655,11 @@ const entriesOf = (manifest, parsed) => {
 	for (const [name, spec] of Object.entries(parsed.workspace?.dependencies ?? {})) add(["workspace", "dependencies"], name, spec);
 	return entries;
 };
-const cargo = (root, args) => ({
+const cargo = (cwd, args) => ({
 	command: "cargo",
 	args,
-	cwd: root
+	cwd,
+	env: { RUSTUP_AUTO_INSTALL: "0" }
 });
 const parseManifest = (file, text) => Effect.try({
 	try: () => getStaticTOMLValue(parseTOML(text)),
@@ -9670,7 +9684,7 @@ const resolvedByMember = (root, meta) => {
 		return [path.relative(root, pkg.manifest_path), deps];
 	}));
 };
-const make$8 = (root, place = "") => Effect.gen(function* () {
+const make$9 = (root, place = "") => Effect.gen(function* () {
 	const providerName = placed("cargo", place);
 	const exec = yield* Exec;
 	const fs = yield* FileSystem.FileSystem;
@@ -9683,6 +9697,7 @@ const make$8 = (root, place = "") => Effect.gen(function* () {
 			"metadata",
 			"--format-version",
 			"1",
+			"--all-features",
 			"--locked"
 		]);
 		return yield* exec.stdout(invocation).pipe(Effect.flatMap(decodeJson(Metadata, commandLine(invocation))));
@@ -9731,6 +9746,11 @@ const make$8 = (root, place = "") => Effect.gen(function* () {
 		};
 	});
 	const list = Effect.gen(function* () {
+		const lockfile = path.join(root, "Cargo.lock");
+		if (!(yield* fs.exists(lockfile).pipe(Effect.mapError(fileFailed("stat", lockfile))))) return {
+			packages: [],
+			notices: [{ message: "not listed: no Cargo.lock yet" }]
+		};
 		const { declared, notices } = yield* declarations;
 		return {
 			packages: yield* Effect.forEach(declared, ({ pkg }) => newestRelease(client, pkg.artifact, pkg.current).pipe(Effect.map((target) => {
@@ -9812,21 +9832,17 @@ const locate$2 = Effect.fn("CargoWorkspace.locate")(function* (dir) {
 	const exec = yield* Exec;
 	const manifest = yield* findUp(dir, "Cargo.toml");
 	if (Option.isNone(manifest)) return Option.none();
-	const root = yield* exec.stdout({
-		command: "cargo",
-		args: [
-			"locate-project",
-			"--workspace",
-			"--message-format",
-			"plain"
-		],
-		cwd: manifest.value
-	});
+	const root = yield* exec.stdout(cargo(manifest.value, [
+		"locate-project",
+		"--workspace",
+		"--message-format",
+		"plain"
+	]));
 	return Option.some({ root: path.dirname(root.trim()) });
 });
 const discover$3 = Effect.fn("CargoWorkspace.discover")(function* (dir, nested = []) {
 	const { found, failed } = yield* locateAll(dir, nested, "Cargo.toml", locate$2);
-	return [...failed, ...yield* Effect.forEach(found, ({ root }) => make$8(root, placeOf$1(dir, root)))];
+	return [...failed, ...yield* Effect.forEach(found, ({ root }) => make$9(root, placeOf$1(dir, root)))];
 });
 // src/registry/origin.ts
 const trailing = (url) => url.endsWith("/") ? url : `${url}/`;
@@ -9971,14 +9987,15 @@ const fromBuildInfo = (info, file) => {
 		current: main.Version
 	}) : Option.none();
 };
-const make$7 = Effect.gen(function* () {
+const make$8 = Effect.gen(function* () {
 	const exec = yield* Exec;
 	const fs = yield* FileSystem.FileSystem;
-	const goEnv = yield* Effect.cached(exec.stdout(go([
+	const envInvocation = go([
 		"env",
 		"-json",
 		...envKeys
-	])).pipe(Effect.flatMap(decodeGoJson(GoEnv, `go env -json ${envKeys.join(" ")}`))));
+	]);
+	const goEnv = yield* Effect.cached(exec.stdout(envInvocation).pipe(Effect.flatMap(decodeGoJson(GoEnv, commandLine(envInvocation)))));
 	const binDir = goEnv.pipe(Effect.map((env) => env.GOBIN || path.join(env.GOPATH.split(":")[0] ?? env.GOPATH, "bin")));
 	const inspect = Effect.fn("GoInstall.inspect")(function* (dir, file) {
 		const invocation = go([
@@ -10066,6 +10083,7 @@ const make$7 = Effect.gen(function* () {
 });
 // src/go/GoModule.ts
 const ModFile = Schema.Struct({
+	Module: Schema.optionalKey(Schema.Struct({ Path: Schema.String })),
 	Require: Schema.optionalKey(Schema.Array(Schema.Struct({
 		Path: Schema.String,
 		Version: Schema.String,
@@ -10079,7 +10097,10 @@ const Selected = Schema.Struct({
 	Update: Schema.optionalKey(Schema.Struct({ Version: Schema.String })),
 	Error: Schema.optionalKey(Schema.Struct({ Err: Schema.String }))
 });
-const WorkFile = Schema.Struct({ Use: Schema.optionalKey(Schema.Array(Schema.Struct({ DiskPath: Schema.String }))) });
+const WorkFile = Schema.Struct({
+	Use: Schema.optionalKey(Schema.Array(Schema.Struct({ DiskPath: Schema.String }))),
+	Replace: Schema.optionalKey(Schema.Array(Schema.Struct({ Old: Schema.Struct({ Path: Schema.String }) })))
+});
 const goEnv = {
 	GOWORK: "off",
 	GIT_TERMINAL_PROMPT: "0"
@@ -10089,26 +10110,30 @@ const GoProxyEnv = Schema.Struct({
 	GOPRIVATE: Schema.optionalKey(Schema.String),
 	GONOPROXY: Schema.optionalKey(Schema.String)
 });
-const directRequirements = (mod) => {
+const directRequirements = (mod, local) => {
 	const replaced = new Set((mod.Replace ?? []).map((replace) => replace.Old.Path));
-	return (mod.Require ?? []).filter((requirement) => requirement.Indirect !== true && !replaced.has(requirement.Path));
+	return (mod.Require ?? []).filter((requirement) => requirement.Indirect !== true && !replaced.has(requirement.Path) && !local.has(requirement.Path));
 };
-const make$6 = (root, moduleDir, place = "") => Effect.gen(function* () {
+const goIn = (cwd, args) => ({
+	command: "go",
+	args,
+	cwd,
+	env: goEnv
+});
+const readModFile = (exec, cwd) => {
+	const edit = goIn(cwd, [
+		"mod",
+		"edit",
+		"-json"
+	]);
+	return exec.stdout(edit).pipe(Effect.flatMap(decodeGoJson(ModFile, commandLine(edit))));
+};
+const make$7 = (root, moduleDir, place = "", local = /* @__PURE__ */ new Set()) => Effect.gen(function* () {
 	const exec = yield* Exec;
 	const manifest = path.join(place, path.relative(root, path.join(moduleDir, "go.mod")));
-	const go = (args) => ({
-		command: "go",
-		args,
-		cwd: moduleDir,
-		env: goEnv
-	});
+	const go = (args) => goIn(moduleDir, args);
 	const requirements = Effect.gen(function* () {
-		const edit = go([
-			"mod",
-			"edit",
-			"-json"
-		]);
-		return directRequirements(yield* exec.stdout(edit).pipe(Effect.flatMap(decodeGoJson(ModFile, commandLine(edit)))));
+		return directRequirements(yield* readModFile(exec, moduleDir), local);
 	});
 	const selected = Effect.fn("GoModule.selected")(function* (paths, withUpdates) {
 		if (paths.length === 0) return /* @__PURE__ */ new Map();
@@ -10211,36 +10236,56 @@ const discover$2 = Effect.fn("GoModule.discover")(function* (dir, nested = []) {
 	const exec = yield* Exec;
 	const { found, failed } = yield* locateAll(dir, nested, "go.mod", locate$1);
 	const failedWorks = [];
-	const modules = yield* Effect.forEach(found, ({ root, work }) => Effect.gen(function* () {
-		if (!work) return [{
-			root,
-			moduleDir: root
-		}];
-		const edit = {
-			command: "go",
-			args: [
-				"work",
-				"edit",
-				"-json"
-			],
-			cwd: root
-		};
-		const file = yield* exec.stdout(edit).pipe(Effect.flatMap(decodeGoJson(WorkFile, commandLine(edit))), Effect.result);
+	const listed = /* @__PURE__ */ new Set();
+	const modules = yield* Effect.forEach(found, ({ root, work, claimed }) => Effect.gen(function* () {
+		if (!work) {
+			listed.add(root);
+			return [{
+				root,
+				moduleDir: root,
+				local: /* @__PURE__ */ new Set()
+			}];
+		}
 		const place = placeOf$1(dir, root);
-		if (Result.isSuccess(file)) return (file.success.Use ?? []).map((use) => ({
-			root,
-			moduleDir: path.resolve(root, use.DiskPath)
-		})).filter(({ moduleDir }) => place === "" || placeOf$1(dir, moduleDir) !== "");
-		if (place === "") return yield* file.failure;
-		failedWorks.push(failing(path.join(place, "go.work"), file.failure));
+		const scanned = yield* Effect.gen(function* () {
+			const edit = {
+				command: "go",
+				args: [
+					"work",
+					"edit",
+					"-json"
+				],
+				cwd: root
+			};
+			const file = yield* exec.stdout(edit).pipe(Effect.flatMap(decodeGoJson(WorkFile, commandLine(edit))));
+			const used = (file.Use ?? []).map((use) => path.resolve(root, use.DiskPath));
+			for (const moduleDir of used) listed.add(moduleDir);
+			const paths = yield* Effect.forEach(used, (moduleDir) => Effect.gen(function* () {
+				const mod = yield* readModFile(exec, moduleDir);
+				if (mod.Module === void 0) return yield* new OutputMalformed({
+					command: "go mod edit -json",
+					issue: `no module path in ${path.join(moduleDir, "go.mod")}`
+				});
+				return mod.Module.Path;
+			}), { concurrency: 8 });
+			const local = /* @__PURE__ */ new Set([...paths, ...(file.Replace ?? []).map((replace) => replace.Old.Path)]);
+			return used.map((moduleDir) => ({
+				root,
+				moduleDir,
+				local
+			})).filter(({ moduleDir }) => place === "" || placeOf$1(dir, moduleDir) !== "");
+		}).pipe(Effect.result);
+		if (Result.isSuccess(scanned)) return scanned.success;
+		for (const moduleDir of claimed) listed.add(moduleDir);
+		failedWorks.push(failing(path.join(place, "go.work"), scanned.failure));
 		return [];
 	}));
-	const listed = new Set(modules.flat().map(({ moduleDir }) => moduleDir));
 	const outside = nested.flatMap((moduleDir) => listed.has(moduleDir) ? [] : [{
 		root: moduleDir,
-		moduleDir
+		moduleDir,
+		local: /* @__PURE__ */ new Set()
 	}]);
-	const providers = yield* Effect.forEach([...modules.flat(), ...outside], ({ root, moduleDir }) => make$6(root, moduleDir, placeOf$1(dir, root)));
+	const providers = yield* Effect.forEach([...modules.flat(), ...outside], ({ root, moduleDir, local }) => make$7(root, moduleDir, placeOf$1(dir, root), local));
 	return [
 		...failed,
 		...failedWorks,
@@ -10249,7 +10294,7 @@ const discover$2 = Effect.fn("GoModule.discover")(function* (dir, nested = []) {
 });
 // src/inventory/ProviderSource.ts
 var ProviderSource = class extends Context.Service()("upup/ProviderSource") {};
-// src/node/prerelease-line.ts
+// src/node/release-history.ts
 const minutesPerDay = 1440;
 const firstPnpmMajorWithDefaultReleaseAge = 11;
 const gateSettings = {
@@ -10287,16 +10332,18 @@ const exempt = (rules, name, version) => {
 };
 const isPrerelease = (version) => semver.prerelease(version) !== null;
 const lineOf = (version) => (semver.prerelease(version) ?? []).map((part) => Predicate.isNumber(part) ? "#" : part).join(".");
-const prereleaseSuccessor = (name, current, history, gate, now) => {
+const releaseSuccessor = (name, current, history, gate, now) => {
 	const line = lineOf(current);
 	const following = isPrerelease(current);
 	const pinned = Date.parse(history.time[current] ?? "");
 	if (following && Number.isNaN(pinned)) return Result.fail(`${name} ${current} has no publish date, so upup offers it nothing`);
 	const releasedBeforePrereleasePin = (published) => following && !(published > pinned);
+	const latest = semver.valid(history.latest ?? "");
+	const beyondLatest = (candidate) => latest !== null && semver.gt(candidate, latest);
 	let newest;
 	for (const candidate of history.versions) {
 		if (semver.valid(candidate) === null || !semver.gt(candidate, current)) continue;
-		if (isPrerelease(candidate) && lineOf(candidate) !== line) continue;
+		if (isPrerelease(candidate) ? lineOf(candidate) !== line : beyondLatest(candidate)) continue;
 		const published = Date.parse(history.time[candidate] ?? "");
 		if (Number.isNaN(published) || releasedBeforePrereleasePin(published)) continue;
 		if (gate.minutes > 0 && now - published < gate.minutes * 6e4 && !exempt(gate.exclude, name, candidate)) continue;
@@ -10304,35 +10351,64 @@ const prereleaseSuccessor = (name, current, history, gate, now) => {
 	}
 	return Result.succeed(newest);
 };
-const Viewed = Schema.Struct({
+const ViewedRelease = Schema.Struct({
 	versions: Schema.Union([Schema.String, Schema.Array(Schema.String)]),
-	time: Schema.Record(Schema.String, Schema.String)
-});
-const prereleaseOffers = Effect.fn("prereleaseOffers")(function* (pins, manager, run, config) {
+	time: Schema.Record(Schema.String, Schema.String),
+	"dist-tags": Schema.optionalKey(Schema.Struct({ latest: Schema.optionalKey(Schema.String) }))
+});
+const Viewed = Schema.Union([ViewedRelease, Schema.NonEmptyArray(ViewedRelease)]);
+const ViewFailed = Schema.Struct({ error: Schema.Struct({
+	code: Schema.optionalKey(Schema.String),
+	summary: Schema.optionalKey(Schema.String),
+	message: Schema.optionalKey(Schema.String)
+}) });
+const releaseOffers = Effect.fn("releaseOffers")(function* (pins, manager, run, config) {
 	const exec = yield* Exec;
 	const now = yield* Clock.currentTimeMillis;
-	const read = (artifact) => {
+	const read = Effect.fn("releaseOffers.read")(function* (artifact) {
 		const view = run([
 			"view",
 			artifact,
 			"versions",
 			"time",
+			"dist-tags",
 			"--json"
 		]);
-		return exec.stdout(view).pipe(Effect.flatMap(decodeJson(Viewed, commandLine(view))), Effect.map((viewed) => ({
+		const output = yield* exec.run(view);
+		if (output.exitCode !== 0) {
+			const reported = Option.getOrUndefined(Schema.decodeOption(Schema.fromJsonString(ViewFailed))(output.stdout))?.error;
+			if (reported?.code?.includes("404") === true) return [artifact, Result.fail(`${artifact} isn't on the registry, or your credentials can't see it, so upup offers it nothing`)];
+			return yield* new CommandFailed({
+				command: commandLine(view),
+				cwd: view.cwd,
+				exitCode: output.exitCode,
+				output: reported?.summary ?? reported?.message ?? output.stderr
+			});
+		}
+		const decoded = yield* decodeJson(Viewed, commandLine(view))(output.stdout);
+		const viewed = "versions" in decoded ? decoded : decoded[0];
+		const latest = viewed["dist-tags"]?.latest;
+		const history = {
 			versions: [viewed.versions].flat(),
-			time: viewed.time
-		})), Effect.result, Effect.map((history) => [artifact, history]));
-	};
-	const followed = (pin) => isPrerelease(pin.current) || pin.history === true;
-	const artifacts = new Set(pins.flatMap((pin) => followed(pin) ? [pin.artifact] : []));
-	const histories = new Map(yield* Effect.forEach(artifacts, read, { concurrency: 4 }));
-	const version = manager === "pnpm" && artifacts.size > 0 ? yield* exec.stdout(run(["--version"])) : "";
+			time: viewed.time,
+			...latest === void 0 ? {} : { latest }
+		};
+		return [artifact, Result.succeed(history)];
+	});
+	const artifacts = new Set(pins.map((pin) => pin.artifact));
+	const reads = yield* Effect.result(Effect.forEach(artifacts, read, { concurrency: 8 }));
+	const histories = new Map(Result.isSuccess(reads) ? reads.success : []);
+	const notices = Result.isFailure(reads) ? [{ message: `release histories could not be read, so upup offers nothing: ${describeError(reads.failure)}` }] : [];
+	const version = manager === "pnpm" && histories.size > 0 ? yield* exec.stdout(run(["--version"])) : "";
 	const gate = releaseGate(manager, version.trim(), config);
-	return (pin) => {
-		const history = followed(pin) ? histories.get(pin.artifact) : void 0;
-		if (history === void 0) return;
-		return Result.isFailure(history) ? Result.fail(`${pin.artifact}'s release history could not be read, so upup offers it nothing: ${describeError(history.failure)}`) : prereleaseSuccessor(pin.artifact, pin.current, history.success, gate, now);
+	const offer = (pin) => {
+		const history = histories.get(pin.artifact);
+		if (history === void 0) return Result.succeed(void 0);
+		return Result.flatMap(history, (found) => releaseSuccessor(pin.artifact, pin.current, found, gate, now));
+	};
+	return {
+		offer,
+		notices
 	};
 });
 // src/node/script-policy.ts
@@ -10388,7 +10464,7 @@ const Root = Schema.Struct({
 	dependencies: Schema.optionalKey(Schema.Record(Schema.String, Dependency))
 });
 const Listed$1 = Schema.Union([Root, Schema.Array(Root)]);
-const Outdated$1 = Schema.Record(Schema.String, Schema.Struct({ latest: Schema.optionalKey(Schema.String) }));
+const Outdated = Schema.Record(Schema.String, Schema.Struct({ latest: Schema.optionalKey(Schema.String) }));
 const parseListed = (provider, listed) => {
 	const roots = Array.isArray(listed) ? listed : [listed];
 	const pkg = (name, version, runtime) => ({
@@ -10422,7 +10498,7 @@ const makeGlobal = (spec) => Effect.gen(function* () {
 	const latest = Effect.gen(function* () {
 		const outdated = invocation(spec.outdated);
 		const output = yield* exec.run(outdated);
-		const parsed = yield* decodeJson(Outdated$1, commandLine(outdated))(output.stdout).pipe(Effect.catchTag("OutputMalformed", (error) => output.exitCode === 0 ? Effect.fail(error) : Effect.fail(new CommandFailed({
+		const parsed = yield* decodeJson(Outdated, commandLine(outdated))(output.stdout).pipe(Effect.catchTag("OutputMalformed", (error) => output.exitCode === 0 ? Effect.fail(error) : Effect.fail(new CommandFailed({
 			command: commandLine(outdated),
 			cwd: outdated.cwd,
 			exitCode: output.exitCode,
@@ -10436,20 +10512,20 @@ const makeGlobal = (spec) => Effect.gen(function* () {
 			latest,
 			readNpmConfig(spec.config, "/").pipe(Effect.provideService(Exec, exec))
 		], { concurrency: 3 });
-		const offers = yield* prereleaseOffers(packages, spec.config, (args) => ({
+		const { offer, notices: unread } = yield* releaseOffers(packages.filter((pkg) => isPrerelease(pkg.current)), spec.config, (args) => ({
 			command: spec.config,
 			args,
 			cwd: "/"
 		}), config).pipe(Effect.provideService(Exec, exec));
-		const notices = [];
+		const notices = [...unread];
 		return {
 			packages: packages.map(withNpmOrigin(npmRegistries(config))).map((pkg) => {
-				const line = offers(pkg);
-				if (line !== void 0 && Result.isFailure(line)) notices.push({
+				const line = offer(pkg);
+				if (Result.isFailure(line)) notices.push({
 					rowKey: rowKey(pkg),
 					message: line.failure
 				});
-				const target = line === void 0 ? targets.get(pkg.name) : Result.getOrUndefined(line);
+				const target = isPrerelease(pkg.current) ? Result.getOrUndefined(line) : targets.get(pkg.name);
 				return target !== void 0 && isNewerStable(pkg.current, target) ? withTarget(pkg, target) : pkg;
 			}),
 			notices
@@ -10671,7 +10747,7 @@ const scan = Effect.fn("NodePins.scan")(function* (root, dir, nested) {
 	const files = yield* Effect.forEach(versioned.toSorted(), (file) => Effect.map(read(file), (text) => filePin(file, text)));
 	return [...steps, ...files.flat()];
 });
-const make$5 = (root, dir = root, nested = []) => Effect.gen(function* () {
+const make$6 = (root, dir = root, nested = []) => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const client = yield* HttpClient.HttpClient;
 	const context = yield* Effect.context();
@@ -10742,7 +10818,7 @@ const discover$1 = Effect.fn("NodePins.discover")(function* (dir, nested = []) {
 	if (Option.isNone(repository)) return [];
 	const pins = yield* scan(repository.value, dir, nested).pipe(Effect.result);
 	if (Result.isSuccess(pins) && pins.success.length === 0) return [];
-	return [yield* make$5(repository.value, dir, nested)];
+	return [yield* make$6(repository.value, dir, nested)];
 });
 // src/node/selector.ts
 const split = (name, spec) => {
@@ -10794,20 +10870,21 @@ const Manifest = Schema.Struct({
 	optionalDependencies: Schema.optionalKey(Specs)
 });
 const Resolved = Schema.Record(Schema.String, Schema.Struct({ version: Schema.String }));
-const PnpmLock = Schema.Struct({ importers: Schema.optionalKey(Schema.Record(Schema.String, Schema.Struct({
-	dependencies: Schema.optionalKey(Resolved),
-	devDependencies: Schema.optionalKey(Resolved),
-	optionalDependencies: Schema.optionalKey(Resolved)
-}))) });
+const PnpmLock = Schema.Struct({
+	overrides: Schema.optionalKey(Schema.Record(Schema.String, Schema.String)),
+	importers: Schema.optionalKey(Schema.Record(Schema.String, Schema.Struct({
+		dependencies: Schema.optionalKey(Resolved),
+		devDependencies: Schema.optionalKey(Resolved),
+		optionalDependencies: Schema.optionalKey(Resolved)
+	})))
+});
 const PnpmManagerLock = Schema.Struct({ importers: Schema.optionalKey(Schema.Record(Schema.String, Schema.Struct({ packageManagerDependencies: Schema.optionalKey(Resolved) }))) });
 const NpmLock = Schema.Struct({ packages: Schema.Record(Schema.String, Schema.Struct({ version: Schema.optionalKey(Schema.String) })) });
 const Workspace = Schema.Struct({
 	catalog: Schema.optionalKey(Specs),
-	catalogs: Schema.optionalKey(Schema.Record(Schema.String, Specs))
+	catalogs: Schema.optionalKey(Schema.Record(Schema.String, Specs)),
+	overrides: Schema.optionalKey(Specs)
 });
-const OutdatedEntry = Schema.Struct({ latest: Schema.optionalKey(Schema.String) });
-const Outdated = Schema.Record(Schema.String, Schema.Union([OutdatedEntry, Schema.Array(OutdatedEntry)]));
-const NpmError = Schema.Struct({ error: Schema.Struct({ summary: Schema.String }) });
 const PackageJsonFields = Schema.Struct({
 	workspaces: Schema.optionalKey(Schema.Unknown),
 	packageManager: Schema.optionalKey(Schema.String),
@@ -10830,25 +10907,22 @@ const managerEntry = "the package manager's declaration is removed by hand, in p
 const resolvedVersion = (version) => version?.split("(")[0];
 const readJson = (schema, file) => readText(file).pipe(Effect.flatMap((text) => decodeFile(schema, file)(parse$1(text))));
 const exact = (version) => semver.valid(version) === version ? version : void 0;
+const overriddenName = (key) => {
+	const target = key.split(">").at(-1) ?? key;
+	const at = target.indexOf("@", target.startsWith("@") ? 1 : 0);
+	return at === -1 ? target : target.slice(0, at);
+};
 const corepackHashed = (name, algorithm) => {
 	if (algorithm === void 0) return {};
 	if (algorithm === "sha512") return { hashed: true };
 	return { held: `${name}'s packageManager entry carries a ${algorithm} hash, which upup can work out only for sha512; move it by hand` };
 };
-const pinOf = ({ pkg, manager: own }) => ({
-	artifact: pkg.artifact,
-	current: pkg.current,
-	...own === true ? { history: true } : {}
-});
 const editDeclaration = (text, manifest, entry, next) => {
 	if (next === void 0 && entry.pkg.unremovable !== void 0) return Result.fail(entry.pkg.unremovable);
 	if (manifest.endsWith(".yaml") && next !== void 0) return editYamlScalar(text, entry.path, next);
 	return editJson(text, entry.path, next);
 };
-const withoutDependencyKindMarker = (key) => key.replace(/ \([a-z]+\)$/u, "");
-const withoutLockedVersionSuffix = (key) => key.replace(/(?<=.)@[^@/ ]+$/u, "");
-const outdatedName = (key) => withoutLockedVersionSuffix(withoutDependencyKindMarker(key));
-const make$4 = (root, manager, place = "") => Effect.gen(function* () {
+const make$5 = (root, manager, place = "", claimed = []) => Effect.gen(function* () {
 	const providerName = placed(manager, place);
 	const exec = yield* Exec;
 	const fs = yield* FileSystem.FileSystem;
@@ -10929,6 +11003,9 @@ const make$4 = (root, manager, place = "") => Effect.gen(function* () {
 				onNone: () => []
 			})
 		});
+		const lockedDirs = new Set(members.map((member) => path.normalize(member)));
+		const unlocked = claimed.filter((dir) => !lockedDirs.has(path.normalize(dir))).toSorted((a, b) => a.localeCompare(b));
+		if (unlocked.length > 0) notices.push({ message: `not listed: ${unlocked.join(", ")} (not in ${lockfile})` });
 		const catalogLocked = /* @__PURE__ */ new Map();
 		for (const member of members.toSorted((a, b) => a.localeCompare(b))) {
 			const memberDir = member === "." ? "" : member;
@@ -10963,8 +11040,25 @@ const make$4 = (root, manager, place = "") => Effect.gen(function* () {
 				["catalogs", catalog],
 				entries
 			])];
+			const overridden = /* @__PURE__ */ new Map();
+			for (const [key, spec] of Object.entries(workspace.overrides ?? {})) {
+				if (!spec.startsWith("catalog:")) continue;
+				const name = overriddenName(key);
+				const locked = pnpm.value.overrides?.[key];
+				const selector = locked === void 0 ? void 0 : parseSelector(name, locked);
+				if (selector === void 0 || exact(selector.range) === void 0) continue;
+				const id = `${spec.slice(8) || "default"}:${name}`;
+				const versions = overridden.get(id) ?? /* @__PURE__ */ new Set();
+				versions.add(selector.artifact === name ? selector.range : `${selector.artifact}@${selector.range}`);
+				overridden.set(id, versions);
+			}
 			for (const [catalog, catalogPath, entries] of catalogs) for (const [name, spec] of Object.entries(entries)) {
-				const resolved = catalogLocked.get(catalog)?.get(name);
+				const overrides = overridden.get(`${catalog}:${name}`);
+				if (overrides !== void 0 && overrides.size > 1) {
+					notices.push({ message: `${catalog} catalog entry ${name} has conflicting locked overrides; run pnpm install` });
+					continue;
+				}
+				const resolved = catalogLocked.get(catalog)?.get(name) ?? overrides?.values().next().value;
 				if (resolved === void 0) continue;
 				add("pnpm-workspace.yaml", catalogPath.join("."), [...catalogPath, name], name, spec, resolved);
 			}
@@ -11001,53 +11095,20 @@ const make$4 = (root, manager, place = "") => Effect.gen(function* () {
 			notices
 		};
 	}).pipe(Effect.provideService(FileSystem.FileSystem, fs));
-	const latest = Effect.gen(function* () {
-		const workspaces = manager === "npm" && (yield* readJson(PackageJsonFields, path.join(root, "package.json"))).workspaces !== void 0;
-		const outdated = run(manager === "pnpm" ? [
-			"outdated",
-			"-r",
-			"--format",
-			"json"
-		] : [
-			"outdated",
-			"--json",
-			...workspaces ? ["--workspaces", "--include-workspace-root"] : []
-		]);
-		const output = yield* exec.run(outdated);
-		const reported = Schema.decodeOption(Schema.fromJsonString(NpmError))(output.stdout);
-		if (output.exitCode !== 0 && (output.stdout.trim() === "" || Option.isSome(reported))) return yield* new CommandFailed({
-			command: commandLine(outdated),
-			cwd: root,
-			exitCode: output.exitCode,
-			output: Option.isSome(reported) ? reported.value.error.summary : output.stderr
-		});
-		const parsed = yield* decodeJson(Outdated, commandLine(outdated))(output.stdout || "{}");
-		const targets = /* @__PURE__ */ new Map();
-		for (const [key, entries] of Object.entries(parsed)) {
-			const name = outdatedName(key);
-			const newest = [entries].flat().find((entry) => entry.latest !== void 0)?.latest;
-			if (newest !== void 0 && !targets.has(name)) targets.set(name, newest);
-		}
-		return targets;
-	}).pipe(Effect.provideService(FileSystem.FileSystem, fs));
 	const list = Effect.gen(function* () {
-		const [{ declared, notices }, targets, config] = yield* Effect.all([
-			declarations,
-			latest,
-			readNpmConfig(manager, root).pipe(Effect.provideService(Exec, exec))
-		], { concurrency: 3 });
+		const [{ declared, notices }, config] = yield* Effect.all([declarations, readNpmConfig(manager, root).pipe(Effect.provideService(Exec, exec))], { concurrency: 2 });
 		const origin = withNpmOrigin(npmRegistries(config));
-		const offers = yield* prereleaseOffers(declared.flatMap((entry) => entry.held === true ? [] : [pinOf(entry)]), manager, run, config).pipe(Effect.provideService(Exec, exec));
+		const { offer, notices: unread } = yield* releaseOffers(declared.flatMap((entry) => entry.held === true ? [] : [entry.pkg]), manager, run, config).pipe(Effect.provideService(Exec, exec));
 		return {
 			packages: declared.map((entry) => {
 				const pkg = origin(entry.pkg);
 				if (entry.held === true) return pkg;
-				const line = offers(pinOf(entry));
-				if (line !== void 0 && Result.isFailure(line)) notices.push({
+				const line = offer(entry.pkg);
+				if (Result.isFailure(line)) notices.push({
 					rowKey: rowKey(pkg),
 					message: line.failure
 				});
-				const target = line === void 0 ? targets.get(pkg.name) ?? targets.get(pkg.artifact) : Result.getOrUndefined(line);
+				const target = Result.getOrUndefined(line);
 				if (target === void 0 || !isNewerStable(pkg.current, target)) return pkg;
 				const selector = parseSelector(pkg.name, pkg.declaration?.selector ?? "");
 				if (selector === void 0 || moveTo(selector, target) === void 0) {
@@ -11059,7 +11120,7 @@ const make$4 = (root, manager, place = "") => Effect.gen(function* () {
 				}
 				return withTarget(pkg, target);
 			}),
-			notices
+			notices: [...unread, ...notices]
 		};
 	}).pipe(Effect.withSpan(`NodeProject.list`));
 	const find = (pkg) => declarations.pipe(Effect.map(({ declared }) => declared.find((entry) => entry.pkg.id === pkg.id)));
@@ -11230,7 +11291,7 @@ const discover = Effect.fn("NodeProject.discover")(function* (dir, nested = [])
 	const { found, failed } = yield* locateAll(dir, nested, "package.json", locate);
 	const providers = [...failed];
 	const unlisted = [];
-	for (const { root, manager } of found) {
+	for (const { root, manager, claimed } of found) {
 		const place = placeOf$1(dir, root);
 		if (!isManager(manager)) {
 			if (place === "") providers.push(failing(manager, new Unsupported({ reason: `${path.relative(dir, root) || "This"} project uses ${manager}, which upup does not support` })));
@@ -11240,11 +11301,144 @@ const discover = Effect.fn("NodeProject.discover")(function* (dir, nested = [])
 		const lockfile = path.join(root, lockfiles[manager]);
 		const installed = yield* fs.exists(lockfile).pipe(Effect.mapError(fileFailed("stat", lockfile)));
 		if (place !== "" && !installed) unlisted.push(`${place} (no ${lockfiles[manager]} yet)`);
-		else providers.push(yield* make$4(root, manager, place));
+		else {
+			const manifests = yield* Effect.filter(claimed, (from) => fs.exists(path.join(from, "package.json")).pipe(Effect.mapError(fileFailed("stat", from))));
+			providers.push(yield* make$5(root, manager, place, manifests.map((from) => path.relative(root, from))));
+		}
 	}
 	if (unlisted.length > 0) providers.push(notListed(unlisted));
 	return providers;
 });
+// src/node/VpEnv.ts
+const vp$1 = (args) => ({
+	command: "vp",
+	args: ["env", ...args],
+	cwd: "/"
+});
+const defaults = vp$1(["default"]);
+const tools$1 = /* @__PURE__ */ new Set([
+	"node",
+	"npm",
+	"pnpm",
+	"yarn",
+	"bun"
+]);
+const Release$1 = Schema.Struct({
+	version: Schema.String,
+	latest: Schema.Boolean
+});
+const NodeReleases = Schema.Struct({ node: Schema.Array(Release$1) });
+const ManagerReleases = Schema.Struct({ package_managers: Schema.Record(Schema.String, Schema.Array(Release$1)) });
+const malformed$1 = (command, issue) => new OutputMalformed({
+	command: commandLine(command),
+	issue
+});
+const readDefaults = Effect.fn("VpEnv.readDefaults")(function* (output) {
+	const entries = [];
+	const notices = [];
+	let recognized = false;
+	for (const line of output.split("\n").map((text) => text.trim())) {
+		if (line.startsWith("No default Node.js version configured.") || line === "Package manager defaults: not configured") recognized = true;
+		if (!line.startsWith("Default ")) continue;
+		const fields = /^Default (?<name>.+) version: (?<selector>\S+)$/u.exec(line)?.groups;
+		const label = fields?.["name"];
+		const selector = fields?.["selector"];
+		if (label === void 0 || selector === void 0) return yield* malformed$1(defaults, `unrecognized default: ${line}`);
+		recognized = true;
+		const name = label === "Node.js" ? "node" : label;
+		if (tools$1.has(name)) entries.push({
+			name,
+			selector
+		});
+		else notices.push({ message: `Vite+ default ${name} is not supported` });
+	}
+	if (!recognized) return yield* malformed$1(defaults, "no global defaults found");
+	if (entries.length === 0) return {
+		packages: [],
+		notices
+	};
+	const manifest = /^\s+Set via: (?<path>.+)$/mu.exec(output)?.groups?.["path"];
+	if (manifest === void 0) return yield* malformed$1(defaults, "no configuration path found");
+	return {
+		packages: entries.map(({ name, selector }) => {
+			const version = semver.parse(selector);
+			return {
+				provider: "vp-env",
+				id: name,
+				name,
+				ecosystem: name === "node" ? "node" : "npm",
+				artifact: name === "yarn" && version !== null && version.major >= 2 ? "@yarnpkg/cli-dist" : name,
+				current: version?.version ?? selector,
+				declaration: {
+					manifest,
+					section: `${name} default`,
+					selector
+				},
+				description: version === null ? `Managed automatically by Vite+ (${selector})` : "Vite+ global default",
+				unremovable: "Vite+ defaults are cleared with vp env default --unset"
+			};
+		}),
+		notices
+	};
+});
+const make$4 = Effect.gen(function* () {
+	const exec = yield* Exec;
+	const configured = exec.stdout(defaults).pipe(Effect.flatMap(readDefaults));
+	const offer = Effect.fn("VpEnv.offer")(function* (pkg) {
+		const current = semver.parse(pkg.current);
+		if (current === null) return;
+		const withinMajor = pkg.id === "node" || pkg.id === "yarn" && current.major === 1;
+		const command = vp$1([
+			"list-remote",
+			pkg.id,
+			...withinMajor ? [String(current.major)] : [],
+			"--json"
+		]);
+		const output = yield* exec.stdout(command);
+		const releases = pkg.id === "node" ? (yield* decodeJson(NodeReleases, commandLine(command))(output)).node : (yield* decodeJson(ManagerReleases, commandLine(command))(output)).package_managers[pkg.id];
+		if (releases === void 0 || releases.length === 0) return yield* malformed$1(command, `no releases found for ${pkg.name}`);
+		return newestOffer(pkg.current, releases.filter(({ version, latest }) => (withinMajor || latest) && semver.prerelease(version) === null).map(({ version }) => version));
+	});
+	const list = Effect.gen(function* () {
+		const found = yield* configured;
+		const notices = [...found.notices];
+		return {
+			packages: yield* Effect.forEach(found.packages, (pkg) => Effect.gen(function* () {
+				const target = yield* Effect.result(offer(pkg));
+				if (Result.isFailure(target)) {
+					notices.push({
+						rowKey: rowKey(pkg),
+						message: describeError(target.failure)
+					});
+					return pkg;
+				}
+				return target.success === void 0 ? pkg : withTarget(pkg, target.success);
+			})),
+			notices
+		};
+	}).pipe(Effect.withSpan("VpEnv.list"));
+	const observe = Effect.fn("VpEnv.observe")(function* (pkg) {
+		return Option.fromUndefinedOr((yield* configured).packages.find((candidate) => candidate.id === pkg.id));
+	});
+	const unchanged = Effect.fn("VpEnv.unchanged")(function* (pkg) {
+		const current = yield* observe(pkg);
+		if (Option.isNone(current) || current.value.current !== pkg.current || current.value.declaration?.selector !== pkg.declaration?.selector) return yield* new InstallRefused({
+			package: pkg.name,
+			reason: "the Vite+ default changed; refresh before updating"
+		});
+	});
+	return {
+		name: "vp-env",
+		mode: "system",
+		list,
+		observe,
+		update: Effect.fn("VpEnv.update")(function* (pkg, target) {
+			yield* exec.stdout(vp$1(["install", `${pkg.id}@${target}`]));
+			yield* unchanged(pkg);
+			yield* exec.stdout(vp$1(["default", `${pkg.id}@${target}`]));
+		})
+	};
+});
 // src/node/VpSelf.ts
 const vp = (args) => ({
 	command: "vp",
@@ -11272,6 +11466,10 @@ const make$3 = Effect.gen(function* () {
 		mode: "system",
 		list: Effect.gen(function* () {
 			const output = yield* exec.stdout(check$1);
+			if (output.includes("Homebrew manages this installation.")) return {
+				packages: [],
+				notices: []
+			};
 			const { latest, current } = /found vite-plus@(?<latest>\S+) \(current: (?<current>\S+)\)/u.exec(output)?.groups ?? {};
 			if (latest === void 0 || current === void 0) return yield* malformed(check$1);
 			const pkg = vitePlus(current);
@@ -11615,14 +11813,15 @@ const make = Effect.gen(function* () {
 const system$1 = [
 	["softwareupdate", make$1],
 	["apt-get", make$2],
-	["brew", make$13],
-	["codesign", make$10],
+	["brew", make$14],
+	["codesign", make$11],
 	["npm", makeNpm],
 	["pnpm", makePnpm],
 	["vp", makeVp],
 	["vp", make$3],
-	["cargo", make$9],
-	["go", make$7],
+	["vp", make$4],
+	["cargo", make$10],
+	["go", make$8],
 	["uv", make]
 ];
 const available = (entries) => Effect.filter([...new Set(entries.map(([command]) => command))], onPath).pipe(Effect.map((found) => entries.filter(([command]) => found.includes(command))));
@@ -12491,18 +12690,17 @@ const runProvider = Effect.fn("Engine.runProvider")(function* (provider, targets
 		key: rowKey(target.pkg),
 		outcome
 	}))));
-	const checked = [];
+	const applied = [];
 	for (const target of targets) {
 		if (yield* stopped) {
 			yield* finish(target, Outcome.NotStarted());
 			continue;
 		}
-		const result = yield* check(target, emit);
-		if (Result.isFailure(result)) yield* finish(target, result.failure);
-		else checked.push([target, result.success]);
-	}
-	const applied = [];
-	for (const [target, attempt] of checked) {
+		const checked = yield* check(target, emit);
+		if (Result.isFailure(checked)) {
+			yield* finish(target, checked.failure);
+			continue;
+		}
 		if (yield* stopped) {
 			yield* finish(target, Outcome.NotStarted());
 			continue;
@@ -12511,7 +12709,7 @@ const runProvider = Effect.fn("Engine.runProvider")(function* (provider, targets
 			key: rowKey(target.pkg),
 			phase: "applying"
 		}));
-		const result = yield* Effect.result(withDecisions(attempt));
+		const result = yield* Effect.result(withDecisions(checked.success));
 		if (Result.isFailure(result)) yield* finish(target, failedAs(result.failure, false));
 		else if (provider.reconcile === void 0) yield* finish(target, yield* verify(target, emit));
 		else applied.push(target);
@@ -12656,15 +12854,236 @@ const updateTools = (home) => Action.implement(UpdateActions, Effect.gen(functio
 }));
 // src/mcp.ts
 const instructions = "upup reads the tools installed on this machine and the registry dependencies of a project, audits offered updates with the user's chosen model, and applies or removes them. Start with list_packages; every other tool takes its package keys. Before updating, look at package_changes or run audit_packages and poll audit_reports until no Audit is running; operating-system updates (ecosystem macos or apt) can't be audited and have no changes to read; app updates (ecosystem sparkle, electron, appstore or app) can't be audited either, and package_changes gives their release notes when the app's feed has any; ask the user to quit an open app before updating it; the Node.js versions a project pins (ecosystem node) can't be audited either and are edited in place. update_packages and remove_packages change the user's machine or project and cannot be undone by upup: confirm them with the user, and ask before passing allowScripts.";
-const serve = (home) => ActionMcp.runStdio([
+const tools = (home) => [
 	inventoryTools(home),
 	auditTools(home),
 	updateTools(home)
-], {
+];
+const serverInfo = {
 	name: "upup",
 	version: version$1,
 	instructions
+};
+const serve = (home) => ActionMcp.runStdio(tools(home), serverInfo);
+// src/session/operation.ts
+const machine$1 = setup({
+	schemas: { events: {
+		Run: types(),
+		Stop: types(),
+		Ask: types(),
+		Answer: types(),
+		Finish: types()
+	} },
+	states: {
+		Idle: { schemas: { context: types() } },
+		Running: { schemas: { context: types() } },
+		Asking: { schemas: { context: types() } }
+	}
+}).createFSM({
+	initial: "Idle",
+	context: {
+		stopping: false,
+		decision: void 0
+	},
+	states: {
+		Idle: { on: { Run: { target: "Running" } } },
+		Running: { on: {
+			Stop: { context: { stopping: true } },
+			Ask: ({ event }) => ({
+				target: "Asking",
+				context: { decision: event.decision }
+			}),
+			Finish: {
+				target: "Idle",
+				context: { stopping: false }
+			}
+		} },
+		Asking: { on: {
+			Stop: { context: { stopping: true } },
+			Answer: {
+				target: "Running",
+				context: { decision: void 0 }
+			},
+			Finish: {
+				target: "Idle",
+				context: {
+					stopping: false,
+					decision: void 0
+				}
+			}
+		} }
+	}
+});
+const step$1 = (snapshot, event) => {
+	const [next] = machine$1.transition(snapshot, event);
+	return [next, next !== snapshot];
+};
+// src/session/sign-in.ts
+const machine = setup({
+	schemas: { events: {
+		SaveKey: types(),
+		Start: types(),
+		Noticed: types(),
+		Prompt: types(),
+		Answer: types(),
+		Succeed: types(),
+		Fail: types(),
+		Close: types()
+	} },
+	states: {
+		Idle: { schemas: { context: types() } },
+		SavingKey: { schemas: { context: types() } },
+		Working: { schemas: { context: types() } },
+		Prompted: { schemas: { context: types() } },
+		Failed: { schemas: { context: types() } },
+		SignedIn: { schemas: { context: types() } }
+	}
+}).createFSM({
+	initial: "Idle",
+	context: {
+		attempt: 0,
+		provider: void 0,
+		notices: void 0,
+		prompt: void 0,
+		issue: void 0
+	},
+	states: {
+		Idle: { on: {
+			SaveKey: ({ context, event }) => ({
+				target: "SavingKey",
+				context: {
+					attempt: context.attempt + 1,
+					provider: event.provider
+				}
+			}),
+			Start: ({ context, event }) => ({
+				target: "Working",
+				context: {
+					attempt: context.attempt + 1,
+					provider: event.provider,
+					notices: []
+				}
+			})
+		} },
+		SavingKey: { on: {
+			Succeed: ({ context, event }) => event.attempt === context.attempt ? { target: "SignedIn" } : void 0,
+			Fail: ({ context, event }) => event.attempt === context.attempt ? {
+				target: "Failed",
+				context: { issue: event.issue }
+			} : void 0,
+			Close: {
+				target: "Idle",
+				context: { provider: void 0 }
+			}
+		} },
+		Working: { on: {
+			Noticed: ({ context, event }) => event.attempt === context.attempt ? { context: { notices: [...context.notices, event.notice] } } : void 0,
+			Prompt: ({ context, event }) => event.attempt === context.attempt ? {
+				target: "Prompted",
+				context: { prompt: event.prompt }
+			} : void 0,
+			Succeed: ({ context, event }) => event.attempt === context.attempt ? {
+				target: "SignedIn",
+				context: { notices: void 0 }
+			} : void 0,
+			Fail: ({ context, event }) => event.attempt === context.attempt ? {
+				target: "Failed",
+				context: {
+					notices: void 0,
+					issue: event.issue
+				}
+			} : void 0,
+			Close: {
+				target: "Idle",
+				context: {
+					provider: void 0,
+					notices: void 0
+				}
+			}
+		} },
+		Prompted: { on: {
+			Noticed: ({ context, event }) => event.attempt === context.attempt ? { context: { notices: [...context.notices, event.notice] } } : void 0,
+			Answer: ({ context, event }) => event.attempt === context.attempt ? {
+				target: "Working",
+				context: { prompt: void 0 }
+			} : void 0,
+			Succeed: ({ context, event }) => event.attempt === context.attempt ? {
+				target: "SignedIn",
+				context: {
+					notices: void 0,
+					prompt: void 0
+				}
+			} : void 0,
+			Fail: ({ context, event }) => event.attempt === context.attempt ? {
+				target: "Failed",
+				context: {
+					notices: void 0,
+					prompt: void 0,
+					issue: event.issue
+				}
+			} : void 0,
+			Close: {
+				target: "Idle",
+				context: {
+					provider: void 0,
+					notices: void 0,
+					prompt: void 0
+				}
+			}
+		} },
+		Failed: { on: {
+			SaveKey: ({ context, event }) => ({
+				target: "SavingKey",
+				context: {
+					attempt: context.attempt + 1,
+					provider: event.provider,
+					issue: void 0
+				}
+			}),
+			Start: ({ context, event }) => ({
+				target: "Working",
+				context: {
+					attempt: context.attempt + 1,
+					provider: event.provider,
+					notices: [],
+					issue: void 0
+				}
+			}),
+			Close: {
+				target: "Idle",
+				context: {
+					provider: void 0,
+					issue: void 0
+				}
+			}
+		} },
+		SignedIn: { on: {
+			SaveKey: ({ context, event }) => ({
+				target: "SavingKey",
+				context: {
+					attempt: context.attempt + 1,
+					provider: event.provider
+				}
+			}),
+			Start: ({ context, event }) => ({
+				target: "Working",
+				context: {
+					attempt: context.attempt + 1,
+					provider: event.provider,
+					notices: []
+				}
+			}),
+			Close: {
+				target: "Idle",
+				context: { provider: void 0 }
+			}
+		} }
+	}
 });
+const step = (snapshot, event) => {
+	const [next] = machine.transition(snapshot, event);
+	return [next, next !== snapshot];
+};
 // src/session/Session.ts
 const aboutKey = (pkg) => `${rowKey(pkg)}@${pkg.current}..${pkg.target ?? ""}`;
 const auditKey = (pkg, mode) => {
@@ -12677,13 +13096,14 @@ const questionOf = (state) => {
 		_tag: "Password",
 		request: state.password
 	};
-	if (state.decision?._tag === "ScriptsBlocked") return {
+	if (state.operation.value !== "Asking") return;
+	const { decision } = state.operation.context;
+	return decision._tag === "ScriptsBlocked" ? {
 		_tag: "Scripts",
-		blocked: state.decision
-	};
-	if (state.decision?._tag === "AppRunning") return {
+		blocked: decision
+	} : {
 		_tag: "Quit",
-		running: state.decision
+		running: decision
 	};
 };
 const initial = (mode, scope, preferences, audits = {}, settingsIssue) => ({
@@ -12694,14 +13114,12 @@ const initial = (mode, scope, preferences, audits = {}, settingsIssue) => ({
 	discoveryError: void 0,
 	providers: [],
 	selected: [],
-	running: false,
-	stopping: false,
+	operation: machine$1.initialState,
 	activity: {},
 	outcomes: {},
 	actions: {},
 	installed: {},
 	removed: {},
-	decision: void 0,
 	password: void 0,
 	about: {},
 	audits,
@@ -12711,7 +13129,7 @@ const initial = (mode, scope, preferences, audits = {}, settingsIssue) => ({
 	preferences,
 	settingsIssue,
 	catalogue: void 0,
-	signIn: void 0
+	signIn: machine.initialState
 });
 const issueOf = (error) => `${error.file} cannot be read (${error.issue}); upup keeps audit first on and changes no settings until it is fixed or deleted`;
 const without = (record, key) => Object.fromEntries(Object.entries(record).filter(([entry]) => entry !== key));
@@ -12822,9 +13240,15 @@ const layer = Layer.effect(Session, Effect.gen(function* () {
 	const providers = yield* Ref.make([]);
 	const loading = yield* FiberHandle.make();
 	const operation = yield* FiberHandle.make();
-	const stopRequested = yield* Ref.make(false);
 	const pendingDecision = yield* Ref.make(Option.none());
 	const update = (f) => SubscriptionRef.update(state, f);
+	const send = (event) => SubscriptionRef.modify(state, (current) => {
+		const [next, handled] = step$1(current.operation, event);
+		return [handled, handled ? {
+			...current,
+			operation: next
+		} : current];
+	});
 	const setProvider = (name, f) => update((current) => ({
 		...current,
 		providers: current.providers.map((entry) => entry.name === name ? f(entry) : entry)
@@ -12995,11 +13419,12 @@ const layer = Layer.effect(Session, Effect.gen(function* () {
 		return {
 			...initial(mode, scope, current.preferences, current.audits, current.settingsIssue),
 			...places.get(`${mode}:${scope}`),
-			catalogue: current.catalogue
+			catalogue: current.catalogue,
+			signIn: current.signIn
 		};
 	});
 	const open = Effect.fn("Session.open")(function* (mode, scope) {
-		if ((yield* SubscriptionRef.get(state)).running) return;
+		if ((yield* SubscriptionRef.get(state)).operation.value !== "Idle") return;
 		yield* FiberHandle.clear(loading);
 		yield* reset(mode, scope);
 		yield* FiberHandle.run(loading, discover(mode, scope));
@@ -13016,7 +13441,7 @@ const layer = Layer.effect(Session, Effect.gen(function* () {
 	});
 	const refresh = Effect.gen(function* () {
 		const current = yield* SubscriptionRef.get(state);
-		if (current.running || current.discovering) return;
+		if (current.operation.value !== "Idle" || current.discovering) return;
 		yield* FiberHandle.run(loading, discover(current.mode, current.scope));
 	});
 	const toggle = Effect.fn("Session.toggle")(function* (key) {
@@ -13038,16 +13463,11 @@ const layer = Layer.effect(Session, Effect.gen(function* () {
 	const ask = (decision) => Effect.gen(function* () {
 		const answer = yield* Deferred.make();
 		yield* Ref.set(pendingDecision, Option.some(answer));
-		yield* update((current) => ({
-			...current,
+		yield* send({
+			type: "Ask",
 			decision
-		}));
-		const allowed = yield* Deferred.await(answer);
-		yield* update((current) => ({
-			...current,
-			decision: void 0
-		}));
-		return allowed;
+		});
+		return yield* Deferred.await(answer);
 	});
 	const decisions = Decisions.of({
 		asks: true,
@@ -13056,16 +13476,9 @@ const layer = Layer.effect(Session, Effect.gen(function* () {
 	});
 	const run = Effect.fn("Session.run")(function* (action, keys, accepted = []) {
 		const current = yield* SubscriptionRef.get(state);
-		if (current.running) return;
 		const targets = targetsFor(current, yield* Ref.get(providers), action, keys);
-		if (targets.length === 0) return;
-		yield* Ref.set(stopRequested, false);
+		if (targets.length === 0 || !(yield* send({ type: "Run" }))) return;
 		const vetting = action === "update" && current.preferences.auditFirst;
-		yield* update((latest) => ({
-			...latest,
-			running: true,
-			stopping: false
-		}));
 		const touched = [...new Set(targets.map((target) => target.provider))];
 		const confirmed = targets.filter((target) => accepted.includes(rowKey(target.pkg)));
 		const chosen = vetting ? vet(targets.filter((target) => !accepted.includes(rowKey(target.pkg))), current.mode).pipe(Effect.flatMap(({ approved, refused }) => update((latest) => ({
@@ -13085,7 +13498,7 @@ const layer = Layer.effect(Session, Effect.gen(function* () {
 				...latest.activity,
 				...Object.fromEntries(approved.map((target) => [rowKey(target.pkg), "waiting"]))
 			}
-		}))), Effect.flatMap((approved) => run$1(approved, Ref.get(stopRequested)).pipe(Stream.runForEach((event) => update((latest) => event._tag === "Progress" ? {
+		}))), Effect.flatMap((approved) => run$1(approved, SubscriptionRef.get(state).pipe(Effect.map((latest) => latest.operation.context.stopping))).pipe(Stream.runForEach((event) => update((latest) => event._tag === "Progress" ? {
 			...latest,
 			activity: {
 				...latest.activity,
@@ -13107,21 +13520,14 @@ const layer = Layer.effect(Session, Effect.gen(function* () {
 			selected: event.outcome._tag === "Completed" ? latest.selected.filter((key) => key !== event.key) : latest.selected
 		})), Effect.provideService(Decisions, decisions), Effect.provideService(UpdateLog, scoped(updateLog, placeOf(current))), Effect.andThen(collect$2(touched)), Effect.andThen(recallAll))), Effect.ensuring(Ref.set(pendingDecision, Option.none()).pipe(Effect.andThen(update((latest) => ({
 			...latest,
-			running: false,
-			stopping: false,
-			activity: {},
-			decision: void 0
+			operation: step$1(latest.operation, { type: "Finish" })[0],
+			activity: {}
 		})))))));
 	});
 	const answerPassword = (password) => sudo.answer(password);
-	const stop = Effect.gen(function* () {
-		yield* Ref.set(stopRequested, true);
-		yield* update((current) => current.running ? {
-			...current,
-			stopping: true
-		} : current);
-	});
+	const stop = Effect.asVoid(send({ type: "Stop" }));
 	const answer = Effect.fn("Session.answer")(function* (allowed) {
+		if (!(yield* send({ type: "Answer" }))) return;
 		const pending = yield* Ref.getAndSet(pendingDecision, Option.none());
 		if (Option.isSome(pending)) yield* Deferred.succeed(pending.value, allowed);
 	});
@@ -13178,73 +13584,86 @@ const layer = Layer.effect(Session, Effect.gen(function* () {
 		...stored,
 		auditFirst: on
 	}));
-	const setSignIn = (signIn) => update((current) => ({
-		...current,
-		signIn
-	}));
-	const saveKey = (provider, key) => setSignIn({
-		_tag: "Working",
-		provider,
-		notices: []
-	}).pipe(Effect.andThen(ai.setApiKey(provider, key)), Effect.matchEffect({
-		onSuccess: () => setSignIn(void 0).pipe(Effect.andThen(loadCatalogue)),
-		onFailure: (error) => setSignIn({
-			_tag: "Failed",
-			provider,
+	const sendSignIn = (event) => SubscriptionRef.modify(state, (current) => {
+		const stepped = step(current.signIn, event);
+		const [next, handled] = stepped;
+		return [stepped, handled ? {
+			...current,
+			signIn: next
+		} : current];
+	});
+	const takeAnswer = (taken) => Ref.modify(pendingAnswer, (pending) => Option.isSome(pending) && taken(pending.value.attempt) ? [pending, Option.none()] : [Option.none(), pending]);
+	const finish = (attempt) => Effect.matchEffect({
+		onSuccess: () => sendSignIn({
+			type: "Succeed",
+			attempt
+		}).pipe(Effect.andThen(loadCatalogue)),
+		onFailure: (error) => sendSignIn({
+			type: "Fail",
+			attempt,
 			issue: error.issue
 		})
-	}));
+	});
+	const saveKey = (provider, key) => Effect.gen(function* () {
+		const [saving, handled] = yield* sendSignIn({
+			type: "SaveKey",
+			provider
+		});
+		if (handled) yield* ai.setApiKey(provider, key).pipe(finish(saving.context.attempt));
+	});
 	const signIn = (provider) => Effect.gen(function* () {
-		yield* setSignIn({
-			_tag: "Working",
-			provider,
-			notices: []
+		const [working, handled] = yield* sendSignIn({
+			type: "Start",
+			provider
 		});
+		if (!handled) return;
+		const { attempt } = working.context;
 		const context = yield* Effect.context();
-		const working = (change) => update((current) => current.signIn?._tag === "Working" && current.signIn.provider === provider ? {
-			...current,
-			signIn: change(current.signIn)
-		} : current);
 		yield* FiberHandle.run(signing, ai.login(provider, {
 			notify: (event) => {
-				const notice = noticeOf(event);
-				Effect.runForkWith(context)(working((current) => ({
-					...current,
-					notices: [...current.notices, notice]
-				})));
+				Effect.runForkWith(context)(sendSignIn({
+					type: "Noticed",
+					attempt,
+					notice: noticeOf(event)
+				}));
 			},
 			prompt: async (prompt) => await Effect.runPromiseWith(context)(Effect.gen(function* () {
 				const reply = yield* Deferred.make();
-				yield* Ref.set(pendingAnswer, Option.some(reply));
-				yield* working((current) => ({
-					...current,
+				const replaced = yield* Ref.modify(pendingAnswer, (pending) => Option.isSome(pending) && pending.value.attempt >= attempt ? [void 0, pending] : [pending, Option.some({
+					attempt,
+					reply
+				})]);
+				if (replaced === void 0) return yield* Effect.interrupt;
+				if (Option.isSome(replaced)) yield* Deferred.interrupt(replaced.value.reply);
+				const [, asked] = yield* sendSignIn({
+					type: "Prompt",
+					attempt,
 					prompt
-				}));
+				});
+				if (!asked) {
+					yield* takeAnswer((stored) => stored === attempt);
+					return yield* Effect.interrupt;
+				}
 				return yield* Deferred.await(reply);
 			}))
-		}).pipe(Effect.matchEffect({
-			onSuccess: () => setSignIn(void 0).pipe(Effect.andThen(loadCatalogue)),
-			onFailure: (error) => setSignIn({
-				_tag: "Failed",
-				provider,
-				issue: error.issue
-			})
-		})));
+		}).pipe(finish(attempt)));
 	});
 	const answerSignIn = (reply) => Effect.gen(function* () {
-		const pending = yield* Ref.getAndSet(pendingAnswer, Option.none());
-		if (Option.isNone(pending)) return;
-		yield* update((current) => current.signIn?._tag === "Working" ? {
-			...current,
-			signIn: {
-				_tag: "Working",
-				provider: current.signIn.provider,
-				notices: current.signIn.notices
-			}
-		} : current);
-		yield* Deferred.succeed(pending.value, reply);
+		const { attempt } = (yield* SubscriptionRef.get(state)).signIn.context;
+		const [, handled] = yield* sendSignIn({
+			type: "Answer",
+			attempt
+		});
+		if (!handled) return;
+		const pending = yield* takeAnswer((stored) => stored === attempt);
+		if (Option.isSome(pending)) yield* Deferred.succeed(pending.value.reply, reply);
+	});
+	const closeSignIn = Effect.gen(function* () {
+		const [closed] = yield* sendSignIn({ type: "Close" });
+		yield* FiberHandle.clear(signing);
+		const pending = yield* takeAnswer((stored) => stored <= closed.context.attempt);
+		if (Option.isSome(pending)) yield* Deferred.interrupt(pending.value.reply);
 	});
-	const closeSignIn = FiberHandle.clear(signing).pipe(Effect.andThen(Ref.set(pendingAnswer, Option.none())), Effect.andThen(setSignIn(void 0)));
 	const awaitIdle = FiberHandle.awaitEmpty(operation);
 	return Session.of({
 		changes: SubscriptionRef.changes(state),
@@ -13284,7 +13703,7 @@ const silenceNodeWarningsWhileTuiDraws = () => {
 };
 const loadTui = Effect.suspend(() => {
 	silenceNodeWarningsWhileTuiDraws();
-	return process.getBuiltinModule("node:ffi") === void 0 ? Effect.die(`upup's TUI needs Node 26.12 or newer; this is Node ${process.versions.node}`) : Effect.promise(async () => await import("./Tui-BiTtZ1EF.mjs"));
+	return process.getBuiltinModule("node:ffi") === void 0 ? Effect.die(`upup's TUI needs Node 26.13 or newer; this is Node ${process.versions.node}`) : Effect.promise(async () => await import("./Tui-DV_6wbrQ.mjs"));
 });
 const open$1 = (begin, projectDir) => Effect.gen(function* () {
 	const { launch } = yield* loadTui;