ryco-cli 0.1.29 → 0.1.30

package/dist/{Metrics-BjqGlIP4.mjs → Metrics-CnmjpbWk.mjs}

@@ -1,776 +1,641 @@
 #!/usr/bin/env node
 
-import { Ko as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, Qo as ProviderInstanceId, Xr as DEFAULT_SERVER_SETTINGS, Yo as MODEL_SLUG_ALIASES_BY_PROVIDER, Zo as ProviderDriverKind, ei as ServerSettings, es as isProviderDriverKind, oi as StorageError, qo as DEFAULT_GIT_TEXT_GENERATION_OPTIONS_BY_PROVIDER, ti as ServerSettingsError } from "./src-7E1M4gTQ.mjs";
+import { Bs as NodeE2eeAdmissionPolicy, Ko as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, Qo as ProviderInstanceId, Xr as DEFAULT_SERVER_SETTINGS, Yo as MODEL_SLUG_ALIASES_BY_PROVIDER, Zo as ProviderDriverKind, ei as ServerSettings, es as isProviderDriverKind, oi as StorageError, qo as DEFAULT_GIT_TEXT_GENERATION_OPTIONS_BY_PROVIDER, ti as ServerSettingsError } from "./src-CtsgPPhb.mjs";
 import { r as fromLenientJson } from "./schemaJson-CaG1bOvo.mjs";
 import { n as runProcess } from "./processRunner-DnndFd2A.mjs";
 import { Cache, Cause, Context, Data, DateTime, Deferred, Duration, Effect, Equal, Exit, FileSystem, Layer, Metric, Path, Predicate, PubSub, Ref, Schema, SchemaIssue, Scope, Semaphore, Stream } from "effect";
-import * as P from "effect/Predicate";
 import path, { join } from "node:path";
 import * as Crypto from "node:crypto";
 import { createHash, timingSafeEqual } from "node:crypto";
+import * as P from "effect/Predicate";
 import { constants } from "node:fs";
 import { homedir } from "node:os";
 import fs$1, { access, lstat, realpath } from "node:fs/promises";
 import * as Semaphore$1 from "effect/Semaphore";
 import "effect/PlatformError";
 import { dual } from "effect/Function";
-//#region ../../packages/shared/src/Struct.ts
-function deepMerge(current, patch) {
-	if (!P.isObject(current) || !P.isObject(patch)) return patch;
-	const next = { ...current };
-	for (const [key, value] of Object.entries(patch)) {
-		if (value === void 0) continue;
-		const existing = next[key];
-		next[key] = P.isObject(existing) && P.isObject(value) ? deepMerge(existing, value) : value;
-	}
-	return next;
-}
-//#endregion
-//#region ../../packages/shared/src/model.ts
-const DEFAULT_PROVIDER_DRIVER_KIND = ProviderDriverKind.make("codex");
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/is.js
+const objectTypeNames = [
+	"Object",
+	"RegExp",
+	"Date",
+	"Error",
+	"Map",
+	"Set",
+	"WeakMap",
+	"WeakSet",
+	"ArrayBuffer",
+	"SharedArrayBuffer",
+	"DataView",
+	"Promise",
+	"URL",
+	"HTMLElement",
+	"Int8Array",
+	"Uint8ClampedArray",
+	"Int16Array",
+	"Uint16Array",
+	"Int32Array",
+	"Uint32Array",
+	"Float32Array",
+	"Float64Array",
+	"BigInt64Array",
+	"BigUint64Array",
+	"Tagged"
+];
 /**
-* Resolve the human-readable model title used by picker surfaces and durable
-* handoff presentation. Provider catalogs are authoritative when they carry a
-* friendly name; the routing slug remains the deterministic final fallback.
+* @param {any} value
+* @returns {string}
 */
-function getModelDisplayName(model, options) {
-	const shortName = trimOrNull(model.shortName);
-	const name = trimOrNull(model.name);
-	const slug = trimOrNull(model.slug) ?? model.slug;
-	return options?.preferShortName ? shortName ?? name ?? slug : name ?? shortName ?? slug;
-}
-/** Compose the optional sub-provider prefix exactly as the picker trigger does. */
-function getModelDisplayLabel(model, options) {
-	const title = getModelDisplayName(model, options);
-	const subProvider = trimOrNull(model.subProvider);
-	return subProvider ? `${subProvider} · ${title}` : title;
-}
-function createModelCapabilities(input) {
-	return { optionDescriptors: input.optionDescriptors.map(cloneDescriptor) };
-}
-function getRawSelectionValueById(selections, id) {
-	return (selections?.find((candidate) => candidate.id === id))?.value;
-}
-function getProviderOptionSelectionValue(selections, id) {
-	return getRawSelectionValueById(selections, id);
-}
-function getProviderOptionStringSelectionValue(selections, id) {
-	const value = getProviderOptionSelectionValue(selections, id);
-	return typeof value === "string" ? value : void 0;
-}
-function getProviderOptionBooleanSelectionValue(selections, id) {
-	const value = getProviderOptionSelectionValue(selections, id);
-	return typeof value === "boolean" ? value : void 0;
-}
-function getModelSelectionStringOptionValue(modelSelection, id) {
-	return getProviderOptionStringSelectionValue(modelSelection?.options, id);
-}
-function getModelSelectionBooleanOptionValue(modelSelection, id) {
-	return getProviderOptionBooleanSelectionValue(modelSelection?.options, id);
-}
-function resolveDescriptorChoiceValue(descriptor, raw) {
-	const trimmed = trimOrNull(raw);
-	if (!trimmed) return descriptor.currentValue ?? descriptor.options.find((option) => option.isDefault)?.id;
-	if (descriptor.options.length === 0) return trimmed;
-	if (descriptor.promptInjectedValues?.includes(trimmed) && descriptor.options.some((option) => option.id === trimmed)) return descriptor.options.find((option) => option.isDefault)?.id;
-	if (descriptor.options.some((option) => option.id === trimmed)) return trimmed;
-	return descriptor.currentValue ?? descriptor.options.find((option) => option.isDefault)?.id;
-}
-function cloneDescriptor(descriptor) {
-	return descriptor.type === "select" ? {
-		...descriptor,
-		options: [...descriptor.options],
-		...descriptor.promptInjectedValues ? { promptInjectedValues: [...descriptor.promptInjectedValues] } : {}
-	} : { ...descriptor };
+function is(value) {
+	if (value === null) return "null";
+	if (value === void 0) return "undefined";
+	if (value === true || value === false) return "boolean";
+	const typeOf = typeof value;
+	if (typeOf === "string" || typeOf === "number" || typeOf === "bigint" || typeOf === "symbol") return typeOf;
+	if (typeOf === "function") return "Function";
+	if (Array.isArray(value)) return "Array";
+	if (value instanceof Uint8Array) return "Uint8Array";
+	if (value.constructor === Object) return "Object";
+	const objectType = getObjectType(value);
+	if (objectType) return objectType;
+	return "Object";
 }
-function cloneSelection(selection) {
-	return { ...selection };
+/**
+* @param {any} value
+* @returns {string|undefined}
+*/
+function getObjectType(value) {
+	const objectTypeName = Object.prototype.toString.call(value).slice(8, -1);
+	if (objectTypeNames.includes(objectTypeName)) return objectTypeName;
 }
-function withDescriptorCurrentValue(descriptor, rawCurrentValue) {
-	if (descriptor.type === "boolean") {
-		if (typeof rawCurrentValue === "boolean") return {
-			...descriptor,
-			currentValue: rawCurrentValue
-		};
-		return descriptor;
+//#endregion
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/token.js
+var Type = class {
+	/**
+	* @param {number} major
+	* @param {string} name
+	* @param {boolean} terminal
+	*/
+	constructor(major, name, terminal) {
+		this.major = major;
+		this.majorEncoded = major << 5;
+		this.name = name;
+		this.terminal = terminal;
 	}
-	const currentValue = typeof rawCurrentValue === "string" ? resolveDescriptorChoiceValue(descriptor, rawCurrentValue) : resolveDescriptorChoiceValue(descriptor, descriptor.currentValue);
-	if (!currentValue) {
-		const { currentValue: _unusedCurrentValue, ...rest } = descriptor;
-		return rest;
+	toString() {
+		return `Type[${this.major}].${this.name}`;
 	}
-	return {
-		...descriptor,
-		currentValue
-	};
-}
-function getProviderOptionDescriptors(input) {
-	const { caps, selections } = input;
-	return (caps.optionDescriptors ?? []).map(cloneDescriptor).map((descriptor) => withDescriptorCurrentValue(descriptor, getRawSelectionValueById(selections, descriptor.id) ?? descriptor.currentValue));
-}
-function getProviderOptionCurrentValue(descriptor) {
-	if (!descriptor) return;
-	if (descriptor.type === "boolean") return descriptor.currentValue;
-	if (descriptor.currentValue) return descriptor.currentValue;
-	return descriptor.options.find((option) => option.isDefault)?.id;
-}
-function normalizeModelSlug(model, provider = DEFAULT_PROVIDER_DRIVER_KIND) {
-	if (typeof model !== "string") return null;
-	const trimmed = model.trim();
-	if (!trimmed) return null;
-	const aliases = MODEL_SLUG_ALIASES_BY_PROVIDER[provider] ?? {};
-	const aliased = Object.prototype.hasOwnProperty.call(aliases, trimmed) ? aliases[trimmed] : void 0;
-	return typeof aliased === "string" ? aliased : trimmed;
-}
-/** Trim a string, returning null for empty/missing values. */
-function trimOrNull(value) {
-	if (typeof value !== "string") return null;
-	return value.trim() || null;
-}
-function cloneSelections(selections) {
-	return selections.map(cloneSelection);
-}
-function createModelSelection(instanceId, model, options) {
-	const selections = options ? cloneSelections(options) : [];
-	const base = {
-		instanceId,
-		model
-	};
-	return selections.length > 0 ? {
-		...base,
-		options: selections
-	} : base;
-}
+	/**
+	* @param {Type} typ
+	* @returns {number}
+	*/
+	compare(typ) {
+		return this.major < typ.major ? -1 : this.major > typ.major ? 1 : 0;
+	}
+	/**
+	* Check equality between two Type instances. Safe to use across different
+	* copies of the Type class (e.g., when bundlers duplicate the module).
+	* (major, name) uniquely identifies a Type; terminal is implied by these.
+	* @param {Type} a
+	* @param {Type} b
+	* @returns {boolean}
+	*/
+	static equals(a, b) {
+		return a === b || a.major === b.major && a.name === b.name;
+	}
+};
+Type.uint = new Type(0, "uint", true);
+Type.negint = new Type(1, "negint", true);
+Type.bytes = new Type(2, "bytes", true);
+Type.string = new Type(3, "string", true);
+Type.array = new Type(4, "array", false);
+Type.map = new Type(5, "map", false);
+Type.tag = new Type(6, "tag", false);
+Type.float = new Type(7, "float", true);
+Type.false = new Type(7, "false", true);
+Type.true = new Type(7, "true", true);
+Type.null = new Type(7, "null", true);
+Type.undefined = new Type(7, "undefined", true);
+Type.break = new Type(7, "break", true);
+var Token = class {
+	/**
+	* @param {Type} type
+	* @param {any} [value]
+	* @param {number} [encodedLength]
+	*/
+	constructor(type, value, encodedLength) {
+		this.type = type;
+		this.value = value;
+		this.encodedLength = encodedLength;
+		/** @type {Uint8Array|undefined} */
+		this.encodedBytes = void 0;
+		/** @type {Uint8Array|undefined} */
+		this.byteValue = void 0;
+	}
+	toString() {
+		return `Token[${this.type}].${this.value}`;
+	}
+};
+//#endregion
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/byte-utils.js
+const useBuffer = globalThis.process && !globalThis.process.browser && globalThis.Buffer && typeof globalThis.Buffer.isBuffer === "function";
+const textEncoder$1 = new TextEncoder();
 /**
-* Context handoff is a provider-instance boundary. Model and option changes
-* within one configured instance remain on that provider's normal turn path.
+* @typedef {import('../interface.js').ByteView} ByteView
+* @typedef {import('../interface.js').AllocatedByteView} AllocatedByteView
 */
-function modelSelectionRequiresContextHandoff(input) {
-	return input.canonicalSelection.instanceId !== input.targetSelection.instanceId;
+/**
+* @param {Uint8Array} buf
+* @returns {boolean}
+*/
+function isBuffer(buf) {
+	return useBuffer && globalThis.Buffer.isBuffer(buf);
 }
 /**
-* Returns the effort value if it is a prompt-injected value according to
-* any select descriptor in the given capabilities, or null otherwise.
-*
-* Unlike a single `find`, this checks every descriptor so that the
-* correct descriptor's `promptInjectedValues` list is consulted even when
-* multiple select descriptors exist.
+* @param {ByteView|number[]} buf
+* @returns {ByteView}
 */
-function resolvePromptInjectedEffort(caps, rawEffort) {
-	const trimmed = trimOrNull(rawEffort);
-	if (!trimmed) return null;
-	const descriptors = getProviderOptionDescriptors({ caps });
-	for (const descriptor of descriptors) if (descriptor.type === "select" && descriptor.promptInjectedValues?.includes(trimmed)) return trimmed;
-	return null;
-}
-function applyClaudePromptEffortPrefix(text, effort) {
-	const trimmed = text.trim();
-	if (!trimmed) return trimmed;
-	if (effort !== "ultrathink") return trimmed;
-	if (trimmed.startsWith("Ultrathink:")) return trimmed;
-	return `Ultrathink:\n${trimmed}`;
-}
-//#endregion
-//#region ../../packages/shared/src/serverSettings.ts
-const ServerSettingsJson$1 = fromLenientJson(ServerSettings);
-function normalizePersistedServerSettingString(value) {
-	const trimmed = value?.trim();
-	return trimmed && trimmed.length > 0 ? trimmed : void 0;
-}
-function extractPersistedServerObservabilitySettings(input) {
-	return {
-		otlpTracesUrl: normalizePersistedServerSettingString(input.observability?.otlpTracesUrl),
-		otlpMetricsUrl: normalizePersistedServerSettingString(input.observability?.otlpMetricsUrl)
-	};
+function asU8A(buf) {
+	if (!(buf instanceof Uint8Array)) return Uint8Array.from(buf);
+	return isBuffer(buf) ? new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength) : buf;
 }
-function parsePersistedServerObservabilitySettings(raw) {
-	try {
-		return extractPersistedServerObservabilitySettings(Schema.decodeUnknownSync(ServerSettingsJson$1)(raw));
-	} catch {
-		return {
-			otlpTracesUrl: void 0,
-			otlpMetricsUrl: void 0
-		};
+const FROM_STRING_THRESHOLD_BUFFER = 24;
+const FROM_STRING_THRESHOLD_TEXTENCODER = 200;
+const fromString = useBuffer ? (string) => {
+	return string.length >= FROM_STRING_THRESHOLD_BUFFER ? globalThis.Buffer.from(string) : utf8ToBytes(string);
+} : 
+/**
+* @param {string} string
+*/
+(string) => {
+	return string.length >= FROM_STRING_THRESHOLD_TEXTENCODER ? textEncoder$1.encode(string) : utf8ToBytes(string);
+};
+/**
+* Buffer variant not fast enough for what we need
+* @param {number[]} arr
+* @returns {AllocatedByteView}
+*/
+const fromArray = (arr) => {
+	return Uint8Array.from(arr);
+};
+const slice = useBuffer ? (bytes, start, end) => {
+	if (isBuffer(bytes)) return new Uint8Array(bytes.subarray(start, end));
+	return bytes.slice(start, end);
+} : 
+/**
+* @param {Uint8Array} bytes
+* @param {number} start
+* @param {number} end
+*/
+(bytes, start, end) => {
+	return bytes.slice(start, end);
+};
+const concat = useBuffer ? (chunks, length) => {
+	chunks = chunks.map((c) => c instanceof Uint8Array ? c : globalThis.Buffer.from(c));
+	return asU8A(globalThis.Buffer.concat(chunks, length));
+} : 
+/**
+* @param {ByteView[]} chunks
+* @param {number} length
+* @returns {AllocatedByteView}
+*/
+(chunks, length) => {
+	const out = new Uint8Array(length);
+	let off = 0;
+	for (let b of chunks) {
+		if (off + b.length > out.length) b = b.subarray(0, out.length - off);
+		out.set(b, off);
+		off += b.length;
 	}
-}
-function shouldReplaceTextGenerationModelSelection(patch) {
-	return Boolean(patch && (patch.instanceId !== void 0 || patch.model !== void 0));
-}
-function mergeModelSelectionOptionsById(input) {
-	if (input.patch === void 0) return input.current ? [...input.current] : void 0;
-	if (input.patch.length === 0) return;
-	const merged = new Map((input.current ?? []).map((selection) => [selection.id, selection.value]));
-	for (const selection of input.patch) merged.set(selection.id, selection.value);
-	return [...merged.entries()].map(([id, value]) => ({
-		id,
-		value
-	}));
+	return out;
+};
+const alloc = useBuffer ? (size) => {
+	return globalThis.Buffer.allocUnsafe(size);
+} : 
+/**
+* @param {number} size
+* @returns {AllocatedByteView}
+*/
+(size) => {
+	return new Uint8Array(size);
+};
+/**
+* @param {Uint8Array} b1
+* @param {Uint8Array} b2
+* @returns {number}
+*/
+function compare(b1, b2) {
+	if (isBuffer(b1) && isBuffer(b2)) return b1.compare(b2);
+	for (let i = 0; i < b1.length; i++) {
+		if (b1[i] === b2[i]) continue;
+		return b1[i] < b2[i] ? -1 : 1;
+	}
+	return 0;
 }
 /**
-* Applies a server settings patch while treating textGenerationModelSelection as
-* replace-on-provider/model updates. This prevents stale nested options from
-* surviving a reset patch that intentionally omits options.
+* @param {string} str
+* @returns {number[]}
 */
-function applyServerSettingsPatch(current, patch) {
-	const selectionPatch = patch.textGenerationModelSelection;
-	for (const [field, value] of Object.entries(patch.expectedNodePreferences ?? {})) if (!Equal.equals(current[field] ?? null, value)) throw new Error("Node preferences changed elsewhere. Reload before saving.");
-	for (const [projectId, expected] of Object.entries(patch.expectedProjectPreferences ?? {})) {
-		const currentPreferences = current.projectPreferences[projectId] ?? {};
-		for (const [field, value] of Object.entries(expected)) {
-			const actual = field === "initialModelSelection" && !Object.hasOwn(currentPreferences, field) ? "absent" : currentPreferences[field] ?? null;
-			if (!Equal.equals(actual, value)) throw new Error("Project preferences changed elsewhere. Reload before saving.");
+function utf8ToBytes(str) {
+	const out = [];
+	let p = 0;
+	for (let i = 0; i < str.length; i++) {
+		let c = str.charCodeAt(i);
+		if (c < 128) out[p++] = c;
+		else if (c < 2048) {
+			out[p++] = c >> 6 | 192;
+			out[p++] = c & 63 | 128;
+		} else if ((c & 64512) === 55296 && i + 1 < str.length && (str.charCodeAt(i + 1) & 64512) === 56320) {
+			c = 65536 + ((c & 1023) << 10) + (str.charCodeAt(++i) & 1023);
+			out[p++] = c >> 18 | 240;
+			out[p++] = c >> 12 & 63 | 128;
+			out[p++] = c >> 6 & 63 | 128;
+			out[p++] = c & 63 | 128;
+		} else {
+			if (c >= 55296 && c <= 57343) c = 65533;
+			out[p++] = c >> 12 | 224;
+			out[p++] = c >> 6 & 63 | 128;
+			out[p++] = c & 63 | 128;
 		}
 	}
-	const { expectedProjectPreferences: _expected, expectedNodePreferences: _expectedNode, projectPreferences: _projects, ...persistedPatch } = patch;
-	let next = deepMerge(current, persistedPatch);
-	if (patch.initialModelSelection !== void 0) next = {
-		...next,
-		initialModelSelection: patch.initialModelSelection
-	};
-	if (patch.projectPreferences !== void 0) {
-		const projects = new Map(Object.entries(current.projectPreferences));
-		for (const [projectId, preferencesPatch] of Object.entries(patch.projectPreferences)) {
-			if (preferencesPatch === null) {
-				projects.delete(projectId);
-				continue;
-			}
-			const preferences = { ...projects.get(projectId) };
-			for (const [field, value] of Object.entries(preferencesPatch)) if (value === null && field !== "initialModelSelection") delete preferences[field];
-			else Object.assign(preferences, { [field]: value });
-			if (Object.keys(preferences).length) projects.set(projectId, preferences);
-			else projects.delete(projectId);
+	return out;
+}
+//#endregion
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/bl.js
+/**
+* Bl is a list of byte chunks, similar to https://github.com/rvagg/bl but for
+* writing rather than reading.
+* A Bl object accepts set() operations for individual bytes and copyTo() for
+* inserting byte arrays. These write operations don't automatically increment
+* the internal cursor so its "length" won't be changed. Instead, increment()
+* must be called to extend its length to cover the inserted data.
+* The toBytes() call will convert all internal memory to a single Uint8Array of
+* the correct length, truncating any data that is stored but hasn't been
+* included by an increment().
+* get() can retrieve a single byte.
+* All operations (except toBytes()) take an "offset" argument that will perform
+* the write at the offset _from the current cursor_. For most operations this
+* will be `0` to write at the current cursor position but it can be ahead of
+* the current cursor. Negative offsets probably work but are untested.
+*/
+/**
+* @typedef {import('../interface.js').ByteView} ByteView
+* @typedef {import('../interface.js').AllocatedByteView} AllocatedByteView
+*/
+const defaultChunkSize = 256;
+var Bl = class {
+	/**
+	* @param {number} [chunkSize]
+	*/
+	constructor(chunkSize = defaultChunkSize) {
+		this.chunkSize = chunkSize;
+		/** @type {number} */
+		this.cursor = 0;
+		/** @type {number} */
+		this.maxCursor = -1;
+		/** @type {(ByteView|number[])[]} */
+		this.chunks = [];
+		/** @type {ByteView|number[]|null} */
+		this._initReuseChunk = null;
+	}
+	reset() {
+		this.cursor = 0;
+		this.maxCursor = -1;
+		if (this.chunks.length) this.chunks = [];
+		if (this._initReuseChunk !== null) {
+			this.chunks.push(this._initReuseChunk);
+			this.maxCursor = this._initReuseChunk.length - 1;
 		}
-		next = {
-			...next,
-			projectPreferences: Object.fromEntries(projects)
-		};
 	}
-	if (patch.projectWorktreeSubmodules !== void 0) {
-		const modes = new Map(Object.entries(current.projectWorktreeSubmodules));
-		for (const [projectId, mode] of Object.entries(patch.projectWorktreeSubmodules)) if (mode === null) modes.delete(projectId);
-		else modes.set(projectId, mode);
-		next = {
-			...next,
-			projectWorktreeSubmodules: Object.fromEntries(modes)
-		};
+	/**
+	* @param {number} byte
+	*/
+	pushByte(byte) {
+		let topChunk = this.chunks[this.chunks.length - 1];
+		if (this.cursor > this.maxCursor) {
+			topChunk = alloc(this.chunkSize);
+			this.chunks.push(topChunk);
+			this.maxCursor += topChunk.length;
+			if (this._initReuseChunk === null) this._initReuseChunk = topChunk;
+		}
+		const chunkPos = topChunk.length - (this.maxCursor - this.cursor) - 1;
+		topChunk[chunkPos] = byte;
+		this.cursor++;
 	}
-	if (patch.projectWorktreeRoots !== void 0) {
-		const roots = new Map(Object.entries(current.projectWorktreeRoots));
-		for (const [projectId, root] of Object.entries(patch.projectWorktreeRoots)) if (root === null || root === "") roots.delete(projectId);
-		else roots.set(projectId, root);
-		next = {
-			...next,
-			projectWorktreeRoots: Object.fromEntries(roots)
-		};
+	/**
+	* @param {ByteView|number[]} bytes
+	*/
+	push(bytes) {
+		let topChunk = this.chunks[this.chunks.length - 1];
+		if (this.cursor + bytes.length <= this.maxCursor + 1) {
+			const chunkPos = topChunk.length - (this.maxCursor - this.cursor) - 1;
+			topChunk.set(bytes, chunkPos);
+		} else {
+			if (topChunk) {
+				const chunkPos = topChunk.length - (this.maxCursor - this.cursor) - 1;
+				if (chunkPos < topChunk.length) {
+					this.chunks[this.chunks.length - 1] = topChunk.subarray(0, chunkPos);
+					this.maxCursor = this.cursor - 1;
+				}
+			}
+			if (bytes.length < 64 && bytes.length < this.chunkSize) {
+				topChunk = alloc(this.chunkSize);
+				this.chunks.push(topChunk);
+				this.maxCursor += topChunk.length;
+				if (this._initReuseChunk === null) this._initReuseChunk = topChunk;
+				topChunk.set(bytes, 0);
+			} else {
+				this.chunks.push(bytes);
+				this.maxCursor += bytes.length;
+			}
+		}
+		this.cursor += bytes.length;
 	}
-	if (patch.projectStorageRetention !== void 0) {
-		const policies = new Map(Object.entries(current.projectStorageRetention));
-		for (const [projectId, policy] of Object.entries(patch.projectStorageRetention)) if (policy === null) policies.delete(projectId);
-		else policies.set(projectId, policy);
-		next = {
-			...next,
-			projectStorageRetention: Object.fromEntries(policies)
-		};
+	/**
+	* @param {boolean} [reset]
+	* @returns {AllocatedByteView}
+	*/
+	toBytes(reset = false) {
+		let byts;
+		if (this.chunks.length === 1) {
+			const chunk = this.chunks[0];
+			if (reset && this.cursor > chunk.length / 2) {
+				byts = this.cursor === chunk.length ? chunk : chunk.subarray(0, this.cursor);
+				this._initReuseChunk = null;
+				this.chunks = [];
+			} else byts = slice(chunk, 0, this.cursor);
+		} else byts = concat(this.chunks, this.cursor);
+		if (reset) this.reset();
+		return byts;
 	}
-	const nextWithReplacements = patch.providerInstances !== void 0 ? {
-		...next,
-		providerInstances: patch.providerInstances
-	} : next;
-	if (!selectionPatch) return nextWithReplacements;
-	const instanceId = selectionPatch.instanceId ?? current.textGenerationModelSelection.instanceId;
-	const model = selectionPatch.model ?? current.textGenerationModelSelection.model;
-	const options = shouldReplaceTextGenerationModelSelection(selectionPatch) ? selectionPatch.options : mergeModelSelectionOptionsById({
-		current: current.textGenerationModelSelection.options,
-		patch: selectionPatch.options
-	});
-	return {
-		...nextWithReplacements,
-		textGenerationModelSelection: createModelSelection(instanceId, model, options)
-	};
-}
-//#endregion
-//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/is.js
-const objectTypeNames = [
-	"Object",
-	"RegExp",
-	"Date",
-	"Error",
-	"Map",
-	"Set",
-	"WeakMap",
-	"WeakSet",
-	"ArrayBuffer",
-	"SharedArrayBuffer",
-	"DataView",
-	"Promise",
-	"URL",
-	"HTMLElement",
-	"Int8Array",
-	"Uint8ClampedArray",
-	"Int16Array",
-	"Uint16Array",
-	"Int32Array",
-	"Uint32Array",
-	"Float32Array",
-	"Float64Array",
-	"BigInt64Array",
-	"BigUint64Array",
-	"Tagged"
-];
-/**
-* @param {any} value
-* @returns {string}
-*/
-function is(value) {
-	if (value === null) return "null";
-	if (value === void 0) return "undefined";
-	if (value === true || value === false) return "boolean";
-	const typeOf = typeof value;
-	if (typeOf === "string" || typeOf === "number" || typeOf === "bigint" || typeOf === "symbol") return typeOf;
-	if (typeOf === "function") return "Function";
-	if (Array.isArray(value)) return "Array";
-	if (value instanceof Uint8Array) return "Uint8Array";
-	if (value.constructor === Object) return "Object";
-	const objectType = getObjectType(value);
-	if (objectType) return objectType;
-	return "Object";
-}
+};
 /**
-* @param {any} value
-* @returns {string|undefined}
+* U8Bl is a buffer list that writes directly to a user-provided Uint8Array.
+* It provides the same interface as Bl but writes to a fixed destination.
+* @template {ArrayBufferLike} T
 */
-function getObjectType(value) {
-	const objectTypeName = Object.prototype.toString.call(value).slice(8, -1);
-	if (objectTypeNames.includes(objectTypeName)) return objectTypeName;
-}
-//#endregion
-//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/token.js
-var Type = class {
+var U8Bl = class {
 	/**
-	* @param {number} major
-	* @param {string} name
-	* @param {boolean} terminal
+	* @param {Uint8Array<T>} dest
 	*/
-	constructor(major, name, terminal) {
-		this.major = major;
-		this.majorEncoded = major << 5;
-		this.name = name;
-		this.terminal = terminal;
+	constructor(dest) {
+		this.dest = dest;
+		/** @type {number} */
+		this.cursor = 0;
+		/** @type {Array<Uint8Array<T>>} */
+		this.chunks = [dest];
 	}
-	toString() {
-		return `Type[${this.major}].${this.name}`;
+	reset() {
+		this.cursor = 0;
 	}
 	/**
-	* @param {Type} typ
-	* @returns {number}
+	* @param {number} byte
 	*/
-	compare(typ) {
-		return this.major < typ.major ? -1 : this.major > typ.major ? 1 : 0;
+	pushByte(byte) {
+		if (this.cursor >= this.dest.length) throw new Error("write out of bounds, destination buffer is too small");
+		this.dest[this.cursor++] = byte;
 	}
 	/**
-	* Check equality between two Type instances. Safe to use across different
-	* copies of the Type class (e.g., when bundlers duplicate the module).
-	* (major, name) uniquely identifies a Type; terminal is implied by these.
-	* @param {Type} a
-	* @param {Type} b
-	* @returns {boolean}
+	* @param {ByteView|number[]} bytes
 	*/
-	static equals(a, b) {
-		return a === b || a.major === b.major && a.name === b.name;
+	push(bytes) {
+		if (this.cursor + bytes.length > this.dest.length) throw new Error("write out of bounds, destination buffer is too small");
+		this.dest.set(bytes, this.cursor);
+		this.cursor += bytes.length;
 	}
-};
-Type.uint = new Type(0, "uint", true);
-Type.negint = new Type(1, "negint", true);
-Type.bytes = new Type(2, "bytes", true);
-Type.string = new Type(3, "string", true);
-Type.array = new Type(4, "array", false);
-Type.map = new Type(5, "map", false);
-Type.tag = new Type(6, "tag", false);
-Type.float = new Type(7, "float", true);
-Type.false = new Type(7, "false", true);
-Type.true = new Type(7, "true", true);
-Type.null = new Type(7, "null", true);
-Type.undefined = new Type(7, "undefined", true);
-Type.break = new Type(7, "break", true);
-var Token = class {
 	/**
-	* @param {Type} type
-	* @param {any} [value]
-	* @param {number} [encodedLength]
+	* @param {boolean} [reset]
+	* @returns {Uint8Array<T>}
 	*/
-	constructor(type, value, encodedLength) {
-		this.type = type;
-		this.value = value;
-		this.encodedLength = encodedLength;
-		/** @type {Uint8Array|undefined} */
-		this.encodedBytes = void 0;
-		/** @type {Uint8Array|undefined} */
-		this.byteValue = void 0;
-	}
-	toString() {
-		return `Token[${this.type}].${this.value}`;
+	toBytes(reset = false) {
+		const byts = this.dest.subarray(0, this.cursor);
+		if (reset) this.reset();
+		return byts;
 	}
 };
 //#endregion
-//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/byte-utils.js
-const useBuffer = globalThis.process && !globalThis.process.browser && globalThis.Buffer && typeof globalThis.Buffer.isBuffer === "function";
-const textEncoder$1 = new TextEncoder();
-/**
-* @typedef {import('../interface.js').ByteView} ByteView
-* @typedef {import('../interface.js').AllocatedByteView} AllocatedByteView
-*/
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/common.js
+const decodeErrPrefix = "CBOR decode error:";
+const encodeErrPrefix = "CBOR encode error:";
+const uintMinorPrefixBytes = [];
+uintMinorPrefixBytes[23] = 1;
+uintMinorPrefixBytes[24] = 2;
+uintMinorPrefixBytes[25] = 3;
+uintMinorPrefixBytes[26] = 5;
+uintMinorPrefixBytes[27] = 9;
 /**
-* @param {Uint8Array} buf
-* @returns {boolean}
+* @param {Uint8Array} data
+* @param {number} pos
+* @param {number} need
 */
-function isBuffer(buf) {
-	return useBuffer && globalThis.Buffer.isBuffer(buf);
+function assertEnoughData(data, pos, need) {
+	if (data.length - pos < need) throw new Error(`${decodeErrPrefix} not enough data for type`);
 }
+//#endregion
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/0uint.js
+const uintBoundaries = [
+	24,
+	256,
+	65536,
+	4294967296,
+	BigInt("18446744073709551616")
+];
 /**
-* @param {ByteView|number[]} buf
-* @returns {ByteView}
+* @typedef {import('../interface.js').ByteWriter} ByteWriter
+* @typedef {import('../interface.js').DecodeOptions} DecodeOptions
 */
-function asU8A(buf) {
-	if (!(buf instanceof Uint8Array)) return Uint8Array.from(buf);
-	return isBuffer(buf) ? new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength) : buf;
-}
-const FROM_STRING_THRESHOLD_BUFFER = 24;
-const FROM_STRING_THRESHOLD_TEXTENCODER = 200;
-const fromString = useBuffer ? (string) => {
-	return string.length >= FROM_STRING_THRESHOLD_BUFFER ? globalThis.Buffer.from(string) : utf8ToBytes(string);
-} : 
 /**
-* @param {string} string
+* @param {Uint8Array} data
+* @param {number} offset
+* @param {DecodeOptions} options
+* @returns {number}
 */
-(string) => {
-	return string.length >= FROM_STRING_THRESHOLD_TEXTENCODER ? textEncoder$1.encode(string) : utf8ToBytes(string);
-};
+function readUint8(data, offset, options) {
+	assertEnoughData(data, offset, 1);
+	const value = data[offset];
+	if (options.strict === true && value < uintBoundaries[0]) throw new Error(`${decodeErrPrefix} integer encoded in more bytes than necessary (strict decode)`);
+	return value;
+}
 /**
-* Buffer variant not fast enough for what we need
-* @param {number[]} arr
-* @returns {AllocatedByteView}
+* @param {Uint8Array} data
+* @param {number} offset
+* @param {DecodeOptions} options
+* @returns {number}
 */
-const fromArray = (arr) => {
-	return Uint8Array.from(arr);
-};
-const slice = useBuffer ? (bytes, start, end) => {
-	if (isBuffer(bytes)) return new Uint8Array(bytes.subarray(start, end));
-	return bytes.slice(start, end);
-} : 
+function readUint16(data, offset, options) {
+	assertEnoughData(data, offset, 2);
+	const value = data[offset] << 8 | data[offset + 1];
+	if (options.strict === true && value < uintBoundaries[1]) throw new Error(`${decodeErrPrefix} integer encoded in more bytes than necessary (strict decode)`);
+	return value;
+}
 /**
-* @param {Uint8Array} bytes
-* @param {number} start
-* @param {number} end
+* @param {Uint8Array} data
+* @param {number} offset
+* @param {DecodeOptions} options
+* @returns {number}
 */
-(bytes, start, end) => {
-	return bytes.slice(start, end);
-};
-const concat = useBuffer ? (chunks, length) => {
-	chunks = chunks.map((c) => c instanceof Uint8Array ? c : globalThis.Buffer.from(c));
-	return asU8A(globalThis.Buffer.concat(chunks, length));
-} : 
+function readUint32(data, offset, options) {
+	assertEnoughData(data, offset, 4);
+	const value = data[offset] * 16777216 + (data[offset + 1] << 16) + (data[offset + 2] << 8) + data[offset + 3];
+	if (options.strict === true && value < uintBoundaries[2]) throw new Error(`${decodeErrPrefix} integer encoded in more bytes than necessary (strict decode)`);
+	return value;
+}
 /**
-* @param {ByteView[]} chunks
-* @param {number} length
-* @returns {AllocatedByteView}
+* @param {Uint8Array} data
+* @param {number} offset
+* @param {DecodeOptions} options
+* @returns {number|bigint}
 */
-(chunks, length) => {
-	const out = new Uint8Array(length);
-	let off = 0;
-	for (let b of chunks) {
-		if (off + b.length > out.length) b = b.subarray(0, out.length - off);
-		out.set(b, off);
-		off += b.length;
-	}
-	return out;
-};
-const alloc = useBuffer ? (size) => {
-	return globalThis.Buffer.allocUnsafe(size);
-} : 
+function readUint64(data, offset, options) {
+	assertEnoughData(data, offset, 8);
+	const hi = data[offset] * 16777216 + (data[offset + 1] << 16) + (data[offset + 2] << 8) + data[offset + 3];
+	const lo = data[offset + 4] * 16777216 + (data[offset + 5] << 16) + (data[offset + 6] << 8) + data[offset + 7];
+	const value = (BigInt(hi) << BigInt(32)) + BigInt(lo);
+	if (options.strict === true && value < uintBoundaries[3]) throw new Error(`${decodeErrPrefix} integer encoded in more bytes than necessary (strict decode)`);
+	if (value <= Number.MAX_SAFE_INTEGER) return Number(value);
+	if (options.allowBigInt === true) return value;
+	throw new Error(`${decodeErrPrefix} integers outside of the safe integer range are not supported`);
+}
 /**
-* @param {number} size
-* @returns {AllocatedByteView}
+* @param {Uint8Array} data
+* @param {number} pos
+* @param {number} _minor
+* @param {DecodeOptions} options
+* @returns {Token}
 */
-(size) => {
-	return new Uint8Array(size);
-};
+function decodeUint8(data, pos, _minor, options) {
+	return new Token(Type.uint, readUint8(data, pos + 1, options), 2);
+}
 /**
-* @param {Uint8Array} b1
-* @param {Uint8Array} b2
-* @returns {number}
+* @param {Uint8Array} data
+* @param {number} pos
+* @param {number} _minor
+* @param {DecodeOptions} options
+* @returns {Token}
 */
-function compare(b1, b2) {
-	if (isBuffer(b1) && isBuffer(b2)) return b1.compare(b2);
-	for (let i = 0; i < b1.length; i++) {
-		if (b1[i] === b2[i]) continue;
-		return b1[i] < b2[i] ? -1 : 1;
-	}
-	return 0;
+function decodeUint16(data, pos, _minor, options) {
+	return new Token(Type.uint, readUint16(data, pos + 1, options), 3);
 }
 /**
-* @param {string} str
-* @returns {number[]}
+* @param {Uint8Array} data
+* @param {number} pos
+* @param {number} _minor
+* @param {DecodeOptions} options
+* @returns {Token}
 */
-function utf8ToBytes(str) {
-	const out = [];
-	let p = 0;
-	for (let i = 0; i < str.length; i++) {
-		let c = str.charCodeAt(i);
-		if (c < 128) out[p++] = c;
-		else if (c < 2048) {
-			out[p++] = c >> 6 | 192;
-			out[p++] = c & 63 | 128;
-		} else if ((c & 64512) === 55296 && i + 1 < str.length && (str.charCodeAt(i + 1) & 64512) === 56320) {
-			c = 65536 + ((c & 1023) << 10) + (str.charCodeAt(++i) & 1023);
-			out[p++] = c >> 18 | 240;
-			out[p++] = c >> 12 & 63 | 128;
-			out[p++] = c >> 6 & 63 | 128;
-			out[p++] = c & 63 | 128;
-		} else {
-			if (c >= 55296 && c <= 57343) c = 65533;
-			out[p++] = c >> 12 | 224;
-			out[p++] = c >> 6 & 63 | 128;
-			out[p++] = c & 63 | 128;
-		}
-	}
-	return out;
+function decodeUint32(data, pos, _minor, options) {
+	return new Token(Type.uint, readUint32(data, pos + 1, options), 5);
 }
-//#endregion
-//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/bl.js
 /**
-* Bl is a list of byte chunks, similar to https://github.com/rvagg/bl but for
-* writing rather than reading.
-* A Bl object accepts set() operations for individual bytes and copyTo() for
-* inserting byte arrays. These write operations don't automatically increment
-* the internal cursor so its "length" won't be changed. Instead, increment()
-* must be called to extend its length to cover the inserted data.
-* The toBytes() call will convert all internal memory to a single Uint8Array of
-* the correct length, truncating any data that is stored but hasn't been
-* included by an increment().
-* get() can retrieve a single byte.
-* All operations (except toBytes()) take an "offset" argument that will perform
-* the write at the offset _from the current cursor_. For most operations this
-* will be `0` to write at the current cursor position but it can be ahead of
-* the current cursor. Negative offsets probably work but are untested.
+* @param {Uint8Array} data
+* @param {number} pos
+* @param {number} _minor
+* @param {DecodeOptions} options
+* @returns {Token}
 */
+function decodeUint64(data, pos, _minor, options) {
+	return new Token(Type.uint, readUint64(data, pos + 1, options), 9);
+}
 /**
-* @typedef {import('../interface.js').ByteView} ByteView
-* @typedef {import('../interface.js').AllocatedByteView} AllocatedByteView
+* @param {ByteWriter} writer
+* @param {Token} token
 */
-const defaultChunkSize = 256;
-var Bl = class {
-	/**
-	* @param {number} [chunkSize]
-	*/
-	constructor(chunkSize = defaultChunkSize) {
-		this.chunkSize = chunkSize;
-		/** @type {number} */
-		this.cursor = 0;
-		/** @type {number} */
-		this.maxCursor = -1;
-		/** @type {(ByteView|number[])[]} */
-		this.chunks = [];
-		/** @type {ByteView|number[]|null} */
-		this._initReuseChunk = null;
+function encodeUint(writer, token) {
+	return encodeUintValue(writer, 0, token.value);
+}
+/**
+* @param {ByteWriter} writer
+* @param {number} major
+* @param {number|bigint} uint
+*/
+function encodeUintValue(writer, major, uint) {
+	if (uint < uintBoundaries[0]) {
+		const nuint = Number(uint);
+		writer.pushByte(major | nuint);
+	} else if (uint < uintBoundaries[1]) {
+		const nuint = Number(uint);
+		writer.push([major | 24, nuint]);
+	} else if (uint < uintBoundaries[2]) {
+		const nuint = Number(uint);
+		writer.push([
+			major | 25,
+			nuint >>> 8,
+			nuint & 255
+		]);
+	} else if (uint < uintBoundaries[3]) {
+		const nuint = Number(uint);
+		writer.push([
+			major | 26,
+			nuint >>> 24 & 255,
+			nuint >>> 16 & 255,
+			nuint >>> 8 & 255,
+			nuint & 255
+		]);
+	} else {
+		const buint = BigInt(uint);
+		if (buint < uintBoundaries[4]) {
+			const set = [
+				major | 27,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			];
+			let lo = Number(buint & BigInt(4294967295));
+			let hi = Number(buint >> BigInt(32) & BigInt(4294967295));
+			set[8] = lo & 255;
+			lo = lo >> 8;
+			set[7] = lo & 255;
+			lo = lo >> 8;
+			set[6] = lo & 255;
+			lo = lo >> 8;
+			set[5] = lo & 255;
+			set[4] = hi & 255;
+			hi = hi >> 8;
+			set[3] = hi & 255;
+			hi = hi >> 8;
+			set[2] = hi & 255;
+			hi = hi >> 8;
+			set[1] = hi & 255;
+			writer.push(set);
+		} else throw new Error(`${decodeErrPrefix} encountered BigInt larger than allowable range`);
 	}
-	reset() {
-		this.cursor = 0;
-		this.maxCursor = -1;
-		if (this.chunks.length) this.chunks = [];
-		if (this._initReuseChunk !== null) {
-			this.chunks.push(this._initReuseChunk);
-			this.maxCursor = this._initReuseChunk.length - 1;
-		}
-	}
-	/**
-	* @param {number} byte
-	*/
-	pushByte(byte) {
-		let topChunk = this.chunks[this.chunks.length - 1];
-		if (this.cursor > this.maxCursor) {
-			topChunk = alloc(this.chunkSize);
-			this.chunks.push(topChunk);
-			this.maxCursor += topChunk.length;
-			if (this._initReuseChunk === null) this._initReuseChunk = topChunk;
-		}
-		const chunkPos = topChunk.length - (this.maxCursor - this.cursor) - 1;
-		topChunk[chunkPos] = byte;
-		this.cursor++;
-	}
-	/**
-	* @param {ByteView|number[]} bytes
-	*/
-	push(bytes) {
-		let topChunk = this.chunks[this.chunks.length - 1];
-		if (this.cursor + bytes.length <= this.maxCursor + 1) {
-			const chunkPos = topChunk.length - (this.maxCursor - this.cursor) - 1;
-			topChunk.set(bytes, chunkPos);
-		} else {
-			if (topChunk) {
-				const chunkPos = topChunk.length - (this.maxCursor - this.cursor) - 1;
-				if (chunkPos < topChunk.length) {
-					this.chunks[this.chunks.length - 1] = topChunk.subarray(0, chunkPos);
-					this.maxCursor = this.cursor - 1;
-				}
-			}
-			if (bytes.length < 64 && bytes.length < this.chunkSize) {
-				topChunk = alloc(this.chunkSize);
-				this.chunks.push(topChunk);
-				this.maxCursor += topChunk.length;
-				if (this._initReuseChunk === null) this._initReuseChunk = topChunk;
-				topChunk.set(bytes, 0);
-			} else {
-				this.chunks.push(bytes);
-				this.maxCursor += bytes.length;
-			}
-		}
-		this.cursor += bytes.length;
-	}
-	/**
-	* @param {boolean} [reset]
-	* @returns {AllocatedByteView}
-	*/
-	toBytes(reset = false) {
-		let byts;
-		if (this.chunks.length === 1) {
-			const chunk = this.chunks[0];
-			if (reset && this.cursor > chunk.length / 2) {
-				byts = this.cursor === chunk.length ? chunk : chunk.subarray(0, this.cursor);
-				this._initReuseChunk = null;
-				this.chunks = [];
-			} else byts = slice(chunk, 0, this.cursor);
-		} else byts = concat(this.chunks, this.cursor);
-		if (reset) this.reset();
-		return byts;
-	}
-};
-/**
-* U8Bl is a buffer list that writes directly to a user-provided Uint8Array.
-* It provides the same interface as Bl but writes to a fixed destination.
-* @template {ArrayBufferLike} T
-*/
-var U8Bl = class {
-	/**
-	* @param {Uint8Array<T>} dest
-	*/
-	constructor(dest) {
-		this.dest = dest;
-		/** @type {number} */
-		this.cursor = 0;
-		/** @type {Array<Uint8Array<T>>} */
-		this.chunks = [dest];
-	}
-	reset() {
-		this.cursor = 0;
-	}
-	/**
-	* @param {number} byte
-	*/
-	pushByte(byte) {
-		if (this.cursor >= this.dest.length) throw new Error("write out of bounds, destination buffer is too small");
-		this.dest[this.cursor++] = byte;
-	}
-	/**
-	* @param {ByteView|number[]} bytes
-	*/
-	push(bytes) {
-		if (this.cursor + bytes.length > this.dest.length) throw new Error("write out of bounds, destination buffer is too small");
-		this.dest.set(bytes, this.cursor);
-		this.cursor += bytes.length;
-	}
-	/**
-	* @param {boolean} [reset]
-	* @returns {Uint8Array<T>}
-	*/
-	toBytes(reset = false) {
-		const byts = this.dest.subarray(0, this.cursor);
-		if (reset) this.reset();
-		return byts;
-	}
-};
-//#endregion
-//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/common.js
-const decodeErrPrefix = "CBOR decode error:";
-const encodeErrPrefix = "CBOR encode error:";
-const uintMinorPrefixBytes = [];
-uintMinorPrefixBytes[23] = 1;
-uintMinorPrefixBytes[24] = 2;
-uintMinorPrefixBytes[25] = 3;
-uintMinorPrefixBytes[26] = 5;
-uintMinorPrefixBytes[27] = 9;
-/**
-* @param {Uint8Array} data
-* @param {number} pos
-* @param {number} need
-*/
-function assertEnoughData(data, pos, need) {
-	if (data.length - pos < need) throw new Error(`${decodeErrPrefix} not enough data for type`);
 }
-//#endregion
-//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/0uint.js
-const uintBoundaries = [
-	24,
-	256,
-	65536,
-	4294967296,
-	BigInt("18446744073709551616")
-];
-/**
-* @typedef {import('../interface.js').ByteWriter} ByteWriter
-* @typedef {import('../interface.js').DecodeOptions} DecodeOptions
-*/
 /**
-* @param {Uint8Array} data
-* @param {number} offset
-* @param {DecodeOptions} options
+* @param {Token} token
 * @returns {number}
 */
-function readUint8(data, offset, options) {
-	assertEnoughData(data, offset, 1);
-	const value = data[offset];
-	if (options.strict === true && value < uintBoundaries[0]) throw new Error(`${decodeErrPrefix} integer encoded in more bytes than necessary (strict decode)`);
-	return value;
-}
+encodeUint.encodedSize = function encodedSize(token) {
+	return encodeUintValue.encodedSize(token.value);
+};
 /**
-* @param {Uint8Array} data
-* @param {number} offset
-* @param {DecodeOptions} options
+* @param {number} uint
 * @returns {number}
 */
-function readUint16(data, offset, options) {
-	assertEnoughData(data, offset, 2);
-	const value = data[offset] << 8 | data[offset + 1];
-	if (options.strict === true && value < uintBoundaries[1]) throw new Error(`${decodeErrPrefix} integer encoded in more bytes than necessary (strict decode)`);
-	return value;
-}
+encodeUintValue.encodedSize = function encodedSize(uint) {
+	if (uint < uintBoundaries[0]) return 1;
+	if (uint < uintBoundaries[1]) return 2;
+	if (uint < uintBoundaries[2]) return 3;
+	if (uint < uintBoundaries[3]) return 5;
+	return 9;
+};
 /**
-* @param {Uint8Array} data
-* @param {number} offset
-* @param {DecodeOptions} options
+* @param {Token} tok1
+* @param {Token} tok2
 * @returns {number}
 */
-function readUint32(data, offset, options) {
-	assertEnoughData(data, offset, 4);
-	const value = data[offset] * 16777216 + (data[offset + 1] << 16) + (data[offset + 2] << 8) + data[offset + 3];
-	if (options.strict === true && value < uintBoundaries[2]) throw new Error(`${decodeErrPrefix} integer encoded in more bytes than necessary (strict decode)`);
-	return value;
-}
+encodeUint.compareTokens = function compareTokens(tok1, tok2) {
+	return tok1.value < tok2.value ? -1 : tok1.value > tok2.value ? 1 : 0;
+};
+//#endregion
+//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/1negint.js
 /**
-* @param {Uint8Array} data
-* @param {number} offset
-* @param {DecodeOptions} options
-* @returns {number|bigint}
+* @typedef {import('../interface.js').ByteWriter} ByteWriter
+* @typedef {import('../interface.js').DecodeOptions} DecodeOptions
 */
-function readUint64(data, offset, options) {
-	assertEnoughData(data, offset, 8);
-	const hi = data[offset] * 16777216 + (data[offset + 1] << 16) + (data[offset + 2] << 8) + data[offset + 3];
-	const lo = data[offset + 4] * 16777216 + (data[offset + 5] << 16) + (data[offset + 6] << 8) + data[offset + 7];
-	const value = (BigInt(hi) << BigInt(32)) + BigInt(lo);
-	if (options.strict === true && value < uintBoundaries[3]) throw new Error(`${decodeErrPrefix} integer encoded in more bytes than necessary (strict decode)`);
-	if (value <= Number.MAX_SAFE_INTEGER) return Number(value);
-	if (options.allowBigInt === true) return value;
-	throw new Error(`${decodeErrPrefix} integers outside of the safe integer range are not supported`);
-}
 /**
 * @param {Uint8Array} data
 * @param {number} pos
@@ -778,8 +643,8 @@ function readUint64(data, offset, options) {
 * @param {DecodeOptions} options
 * @returns {Token}
 */
-function decodeUint8(data, pos, _minor, options) {
-	return new Token(Type.uint, readUint8(data, pos + 1, options), 2);
+function decodeNegint8(data, pos, _minor, options) {
+	return new Token(Type.negint, -1 - readUint8(data, pos + 1, options), 2);
 }
 /**
 * @param {Uint8Array} data
@@ -788,8 +653,8 @@ function decodeUint8(data, pos, _minor, options) {
 * @param {DecodeOptions} options
 * @returns {Token}
 */
-function decodeUint16(data, pos, _minor, options) {
-	return new Token(Type.uint, readUint16(data, pos + 1, options), 3);
+function decodeNegint16(data, pos, _minor, options) {
+	return new Token(Type.negint, -1 - readUint16(data, pos + 1, options), 3);
 }
 /**
 * @param {Uint8Array} data
@@ -798,9 +663,11 @@ function decodeUint16(data, pos, _minor, options) {
 * @param {DecodeOptions} options
 * @returns {Token}
 */
-function decodeUint32(data, pos, _minor, options) {
-	return new Token(Type.uint, readUint32(data, pos + 1, options), 5);
+function decodeNegint32(data, pos, _minor, options) {
+	return new Token(Type.negint, -1 - readUint32(data, pos + 1, options), 5);
 }
+const neg1b$1 = BigInt(-1);
+const pos1b$1 = BigInt(1);
 /**
 * @param {Uint8Array} data
 * @param {number} pos
@@ -808,169 +675,27 @@ function decodeUint32(data, pos, _minor, options) {
 * @param {DecodeOptions} options
 * @returns {Token}
 */
-function decodeUint64(data, pos, _minor, options) {
-	return new Token(Type.uint, readUint64(data, pos + 1, options), 9);
+function decodeNegint64(data, pos, _minor, options) {
+	const int = readUint64(data, pos + 1, options);
+	if (typeof int !== "bigint") {
+		const value = -1 - int;
+		if (value >= Number.MIN_SAFE_INTEGER) return new Token(Type.negint, value, 9);
+	}
+	if (options.allowBigInt !== true) throw new Error(`${decodeErrPrefix} integers outside of the safe integer range are not supported`);
+	return new Token(Type.negint, neg1b$1 - BigInt(int), 9);
 }
 /**
 * @param {ByteWriter} writer
 * @param {Token} token
 */
-function encodeUint(writer, token) {
-	return encodeUintValue(writer, 0, token.value);
+function encodeNegint(writer, token) {
+	const negint = token.value;
+	const unsigned = typeof negint === "bigint" ? negint * neg1b$1 - pos1b$1 : negint * -1 - 1;
+	encodeUintValue(writer, token.type.majorEncoded, unsigned);
 }
 /**
-* @param {ByteWriter} writer
-* @param {number} major
-* @param {number|bigint} uint
-*/
-function encodeUintValue(writer, major, uint) {
-	if (uint < uintBoundaries[0]) {
-		const nuint = Number(uint);
-		writer.pushByte(major | nuint);
-	} else if (uint < uintBoundaries[1]) {
-		const nuint = Number(uint);
-		writer.push([major | 24, nuint]);
-	} else if (uint < uintBoundaries[2]) {
-		const nuint = Number(uint);
-		writer.push([
-			major | 25,
-			nuint >>> 8,
-			nuint & 255
-		]);
-	} else if (uint < uintBoundaries[3]) {
-		const nuint = Number(uint);
-		writer.push([
-			major | 26,
-			nuint >>> 24 & 255,
-			nuint >>> 16 & 255,
-			nuint >>> 8 & 255,
-			nuint & 255
-		]);
-	} else {
-		const buint = BigInt(uint);
-		if (buint < uintBoundaries[4]) {
-			const set = [
-				major | 27,
-				0,
-				0,
-				0,
-				0,
-				0,
-				0,
-				0
-			];
-			let lo = Number(buint & BigInt(4294967295));
-			let hi = Number(buint >> BigInt(32) & BigInt(4294967295));
-			set[8] = lo & 255;
-			lo = lo >> 8;
-			set[7] = lo & 255;
-			lo = lo >> 8;
-			set[6] = lo & 255;
-			lo = lo >> 8;
-			set[5] = lo & 255;
-			set[4] = hi & 255;
-			hi = hi >> 8;
-			set[3] = hi & 255;
-			hi = hi >> 8;
-			set[2] = hi & 255;
-			hi = hi >> 8;
-			set[1] = hi & 255;
-			writer.push(set);
-		} else throw new Error(`${decodeErrPrefix} encountered BigInt larger than allowable range`);
-	}
-}
-/**
-* @param {Token} token
-* @returns {number}
-*/
-encodeUint.encodedSize = function encodedSize(token) {
-	return encodeUintValue.encodedSize(token.value);
-};
-/**
-* @param {number} uint
-* @returns {number}
-*/
-encodeUintValue.encodedSize = function encodedSize(uint) {
-	if (uint < uintBoundaries[0]) return 1;
-	if (uint < uintBoundaries[1]) return 2;
-	if (uint < uintBoundaries[2]) return 3;
-	if (uint < uintBoundaries[3]) return 5;
-	return 9;
-};
-/**
-* @param {Token} tok1
-* @param {Token} tok2
-* @returns {number}
-*/
-encodeUint.compareTokens = function compareTokens(tok1, tok2) {
-	return tok1.value < tok2.value ? -1 : tok1.value > tok2.value ? 1 : 0;
-};
-//#endregion
-//#region ../../node_modules/.bun/cborg@6.1.2/node_modules/cborg/lib/1negint.js
-/**
-* @typedef {import('../interface.js').ByteWriter} ByteWriter
-* @typedef {import('../interface.js').DecodeOptions} DecodeOptions
-*/
-/**
-* @param {Uint8Array} data
-* @param {number} pos
-* @param {number} _minor
-* @param {DecodeOptions} options
-* @returns {Token}
-*/
-function decodeNegint8(data, pos, _minor, options) {
-	return new Token(Type.negint, -1 - readUint8(data, pos + 1, options), 2);
-}
-/**
-* @param {Uint8Array} data
-* @param {number} pos
-* @param {number} _minor
-* @param {DecodeOptions} options
-* @returns {Token}
-*/
-function decodeNegint16(data, pos, _minor, options) {
-	return new Token(Type.negint, -1 - readUint16(data, pos + 1, options), 3);
-}
-/**
-* @param {Uint8Array} data
-* @param {number} pos
-* @param {number} _minor
-* @param {DecodeOptions} options
-* @returns {Token}
-*/
-function decodeNegint32(data, pos, _minor, options) {
-	return new Token(Type.negint, -1 - readUint32(data, pos + 1, options), 5);
-}
-const neg1b$1 = BigInt(-1);
-const pos1b$1 = BigInt(1);
-/**
-* @param {Uint8Array} data
-* @param {number} pos
-* @param {number} _minor
-* @param {DecodeOptions} options
-* @returns {Token}
-*/
-function decodeNegint64(data, pos, _minor, options) {
-	const int = readUint64(data, pos + 1, options);
-	if (typeof int !== "bigint") {
-		const value = -1 - int;
-		if (value >= Number.MIN_SAFE_INTEGER) return new Token(Type.negint, value, 9);
-	}
-	if (options.allowBigInt !== true) throw new Error(`${decodeErrPrefix} integers outside of the safe integer range are not supported`);
-	return new Token(Type.negint, neg1b$1 - BigInt(int), 9);
-}
-/**
-* @param {ByteWriter} writer
-* @param {Token} token
-*/
-function encodeNegint(writer, token) {
-	const negint = token.value;
-	const unsigned = typeof negint === "bigint" ? negint * neg1b$1 - pos1b$1 : negint * -1 - 1;
-	encodeUintValue(writer, token.type.majorEncoded, unsigned);
-}
-/**
-* @param {Token} token
-* @returns {number}
+* @param {Token} token
+* @returns {number}
 */
 encodeNegint.encodedSize = function encodedSize(token) {
 	const negint = token.value;
@@ -2672,148 +2397,423 @@ function invalid() {
 function assertUnsignedSafeInteger(value) {
 	if (!Number.isSafeInteger(value) || value < 0) invalid();
 }
-function assertProtocolVersion(value) {
-	if (!Number.isSafeInteger(value) || value < 0 || value > 65535) invalid();
+function assertProtocolVersion(value) {
+	if (!Number.isSafeInteger(value) || value < 0 || value > 65535) invalid();
+}
+function assertIdentifier(value, pattern) {
+	if (!pattern.test(value)) invalid();
+}
+function copyBytes(value, expectedLengths) {
+	if (!(value instanceof Uint8Array) || !expectedLengths.includes(value.byteLength)) invalid();
+	return Uint8Array.from(value);
+}
+function canonicalizeHubOrigin(value) {
+	if (typeof value !== "string" || value.length === 0 || value.length > 512) invalid();
+	let url;
+	try {
+		url = new URL(value);
+	} catch {
+		return invalid();
+	}
+	const isLoopbackHttp = url.protocol === "http:" && LOOPBACK_HOSTS.has(url.hostname);
+	if (url.protocol !== "https:" && !isLoopbackHttp || url.username !== "" || url.password !== "" || url.pathname !== "/" || url.search !== "" || url.hash !== "" || value !== url.origin) invalid();
+	return url.origin;
+}
+function normalizeHubNodeName(value) {
+	if (typeof value !== "string") invalid();
+	const normalized = value.trim();
+	if (normalized.length === 0 || normalized.length > 100) invalid();
+	return normalized;
+}
+function validateNodePublicKey(descriptor) {
+	if (descriptor.algorithm === "ed25519") return {
+		algorithm: descriptor.algorithm,
+		publicKey: copyBytes(descriptor.publicKey, [32])
+	};
+	if (descriptor.algorithm === "p256") {
+		const publicKey = copyBytes(descriptor.publicKey, [33, 65]);
+		const prefix = publicKey[0];
+		if (publicKey.byteLength === 33 && prefix !== 2 && prefix !== 3 || publicKey.byteLength === 65 && prefix !== 4) invalid();
+		return {
+			algorithm: descriptor.algorithm,
+			publicKey
+		};
+	}
+	return invalid();
+}
+function fingerprintNodePublicKey(descriptor) {
+	const key = validateNodePublicKey(descriptor);
+	const canonical = encode([
+		NODE_KEY_FINGERPRINT_DOMAIN,
+		key.algorithm,
+		key.publicKey
+	], rfc8949EncodeOptions);
+	return Uint8Array.from(createHash("sha256").update(canonical).digest());
+}
+function formatNodePublicKeyFingerprint(fingerprint) {
+	const bytes = copyBytes(fingerprint, [32]);
+	return `SHA256:${Buffer.from(bytes).toString("base64url")}`;
+}
+function encodeNodeAuthenticationTranscript(input) {
+	const hubOrigin = canonicalizeHubOrigin(input.hubOrigin);
+	assertProtocolVersion(input.protocolMajor);
+	assertProtocolVersion(input.protocolMinor);
+	assertIdentifier(input.nodeId, NODE_ID);
+	assertIdentifier(input.activeKeyId, NODE_KEY_ID);
+	assertUnsignedSafeInteger(input.challengeExpiresAt);
+	const challenge = copyBytes(input.challenge, [32]);
+	return Uint8Array.from(encode([
+		NODE_AUTH_TRANSCRIPT_DOMAIN,
+		hubOrigin,
+		input.protocolMajor,
+		input.protocolMinor,
+		input.nodeId,
+		input.activeKeyId,
+		input.challengeExpiresAt,
+		challenge
+	], rfc8949EncodeOptions));
+}
+function encodeNodeKeyRotationTranscript(input) {
+	const hubOrigin = canonicalizeHubOrigin(input.hubOrigin);
+	assertProtocolVersion(input.protocolMajor);
+	assertProtocolVersion(input.protocolMinor);
+	assertIdentifier(input.rotationRequestId, ROTATION_REQUEST_ID);
+	assertIdentifier(input.nodeId, NODE_ID);
+	assertIdentifier(input.oldActiveKeyId, NODE_KEY_ID);
+	assertIdentifier(input.newKeyId, NODE_KEY_ID);
+	assertUnsignedSafeInteger(input.challengeExpiresAt);
+	const newKey = validateNodePublicKey(input.newKey);
+	const fingerprint = fingerprintNodePublicKey(newKey);
+	const challenge = copyBytes(input.challenge, [32]);
+	return Uint8Array.from(encode([
+		NODE_KEY_ROTATION_TRANSCRIPT_DOMAIN,
+		hubOrigin,
+		input.protocolMajor,
+		input.protocolMinor,
+		input.rotationRequestId,
+		input.nodeId,
+		input.oldActiveKeyId,
+		input.newKeyId,
+		newKey.algorithm,
+		newKey.publicKey,
+		fingerprint,
+		input.challengeExpiresAt,
+		challenge
+	], rfc8949EncodeOptions));
+}
+function encodeNativeNodeClaimTranscript(input) {
+	const hubOrigin = canonicalizeHubOrigin(input.hubOrigin);
+	assertProtocolVersion(input.protocolVersion);
+	assertProtocolVersion(input.transcriptVersion);
+	assertIdentifier(input.claimId, NATIVE_NODE_CLAIM_ID);
+	assertIdentifier(input.accountId, ACCOUNT_ID);
+	assertIdentifier(input.spaceId, SPACE_ID);
+	assertIdentifier(input.sessionId, SESSION_ID);
+	const dpopKeyThumbprint = copyBytes(input.dpopKeyThumbprint, [32]);
+	assertIdentifier(input.installationId, DESKTOP_INSTALLATION_ID);
+	assertIdentifier(input.environmentId, ENVIRONMENT_ID);
+	const nodeKey = validateNodePublicKey(input.nodeKey);
+	const nodeFingerprint = fingerprintNodePublicKey(nodeKey);
+	assertUnsignedSafeInteger(input.claimExpiresAt);
+	const challenge = copyBytes(input.challenge, [32]);
+	return Uint8Array.from(encode([
+		NATIVE_NODE_CLAIM_TRANSCRIPT_DOMAIN,
+		hubOrigin,
+		input.protocolVersion,
+		input.transcriptVersion,
+		input.claimId,
+		input.accountId,
+		input.spaceId,
+		input.sessionId,
+		dpopKeyThumbprint,
+		input.installationId,
+		input.environmentId,
+		nodeKey.algorithm,
+		nodeKey.publicKey,
+		nodeFingerprint,
+		input.claimExpiresAt,
+		challenge
+	], rfc8949EncodeOptions));
+}
+function equalNodeIdentityBytes(left, right) {
+	if (!(left instanceof Uint8Array) || !(right instanceof Uint8Array)) return false;
+	if (left.byteLength !== right.byteLength) return false;
+	return timingSafeEqual(left, right);
+}
+//#endregion
+//#region ../../packages/shared/src/Struct.ts
+function deepMerge(current, patch) {
+	if (!P.isObject(current) || !P.isObject(patch)) return patch;
+	const next = { ...current };
+	for (const [key, value] of Object.entries(patch)) {
+		if (value === void 0) continue;
+		const existing = next[key];
+		next[key] = P.isObject(existing) && P.isObject(value) ? deepMerge(existing, value) : value;
+	}
+	return next;
+}
+//#endregion
+//#region ../../packages/shared/src/model.ts
+const DEFAULT_PROVIDER_DRIVER_KIND = ProviderDriverKind.make("codex");
+/**
+* Resolve the human-readable model title used by picker surfaces and durable
+* handoff presentation. Provider catalogs are authoritative when they carry a
+* friendly name; the routing slug remains the deterministic final fallback.
+*/
+function getModelDisplayName(model, options) {
+	const shortName = trimOrNull(model.shortName);
+	const name = trimOrNull(model.name);
+	const slug = trimOrNull(model.slug) ?? model.slug;
+	return options?.preferShortName ? shortName ?? name ?? slug : name ?? shortName ?? slug;
+}
+/** Compose the optional sub-provider prefix exactly as the picker trigger does. */
+function getModelDisplayLabel(model, options) {
+	const title = getModelDisplayName(model, options);
+	const subProvider = trimOrNull(model.subProvider);
+	return subProvider ? `${subProvider} · ${title}` : title;
+}
+function createModelCapabilities(input) {
+	return { optionDescriptors: input.optionDescriptors.map(cloneDescriptor) };
+}
+function getRawSelectionValueById(selections, id) {
+	return (selections?.find((candidate) => candidate.id === id))?.value;
+}
+function getProviderOptionSelectionValue(selections, id) {
+	return getRawSelectionValueById(selections, id);
+}
+function getProviderOptionStringSelectionValue(selections, id) {
+	const value = getProviderOptionSelectionValue(selections, id);
+	return typeof value === "string" ? value : void 0;
+}
+function getProviderOptionBooleanSelectionValue(selections, id) {
+	const value = getProviderOptionSelectionValue(selections, id);
+	return typeof value === "boolean" ? value : void 0;
+}
+function getModelSelectionStringOptionValue(modelSelection, id) {
+	return getProviderOptionStringSelectionValue(modelSelection?.options, id);
+}
+function getModelSelectionBooleanOptionValue(modelSelection, id) {
+	return getProviderOptionBooleanSelectionValue(modelSelection?.options, id);
+}
+function resolveDescriptorChoiceValue(descriptor, raw) {
+	const trimmed = trimOrNull(raw);
+	if (!trimmed) return descriptor.currentValue ?? descriptor.options.find((option) => option.isDefault)?.id;
+	if (descriptor.options.length === 0) return trimmed;
+	if (descriptor.promptInjectedValues?.includes(trimmed) && descriptor.options.some((option) => option.id === trimmed)) return descriptor.options.find((option) => option.isDefault)?.id;
+	if (descriptor.options.some((option) => option.id === trimmed)) return trimmed;
+	return descriptor.currentValue ?? descriptor.options.find((option) => option.isDefault)?.id;
+}
+function cloneDescriptor(descriptor) {
+	return descriptor.type === "select" ? {
+		...descriptor,
+		options: [...descriptor.options],
+		...descriptor.promptInjectedValues ? { promptInjectedValues: [...descriptor.promptInjectedValues] } : {}
+	} : { ...descriptor };
+}
+function cloneSelection(selection) {
+	return { ...selection };
+}
+function withDescriptorCurrentValue(descriptor, rawCurrentValue) {
+	if (descriptor.type === "boolean") {
+		if (typeof rawCurrentValue === "boolean") return {
+			...descriptor,
+			currentValue: rawCurrentValue
+		};
+		return descriptor;
+	}
+	const currentValue = typeof rawCurrentValue === "string" ? resolveDescriptorChoiceValue(descriptor, rawCurrentValue) : resolveDescriptorChoiceValue(descriptor, descriptor.currentValue);
+	if (!currentValue) {
+		const { currentValue: _unusedCurrentValue, ...rest } = descriptor;
+		return rest;
+	}
+	return {
+		...descriptor,
+		currentValue
+	};
+}
+function getProviderOptionDescriptors(input) {
+	const { caps, selections } = input;
+	return (caps.optionDescriptors ?? []).map(cloneDescriptor).map((descriptor) => withDescriptorCurrentValue(descriptor, getRawSelectionValueById(selections, descriptor.id) ?? descriptor.currentValue));
+}
+function getProviderOptionCurrentValue(descriptor) {
+	if (!descriptor) return;
+	if (descriptor.type === "boolean") return descriptor.currentValue;
+	if (descriptor.currentValue) return descriptor.currentValue;
+	return descriptor.options.find((option) => option.isDefault)?.id;
+}
+function normalizeModelSlug(model, provider = DEFAULT_PROVIDER_DRIVER_KIND) {
+	if (typeof model !== "string") return null;
+	const trimmed = model.trim();
+	if (!trimmed) return null;
+	const aliases = MODEL_SLUG_ALIASES_BY_PROVIDER[provider] ?? {};
+	const aliased = Object.prototype.hasOwnProperty.call(aliases, trimmed) ? aliases[trimmed] : void 0;
+	return typeof aliased === "string" ? aliased : trimmed;
+}
+/** Trim a string, returning null for empty/missing values. */
+function trimOrNull(value) {
+	if (typeof value !== "string") return null;
+	return value.trim() || null;
+}
+function cloneSelections(selections) {
+	return selections.map(cloneSelection);
+}
+function createModelSelection(instanceId, model, options) {
+	const selections = options ? cloneSelections(options) : [];
+	const base = {
+		instanceId,
+		model
+	};
+	return selections.length > 0 ? {
+		...base,
+		options: selections
+	} : base;
+}
+/**
+* Context handoff is a provider-instance boundary. Model and option changes
+* within one configured instance remain on that provider's normal turn path.
+*/
+function modelSelectionRequiresContextHandoff(input) {
+	return input.canonicalSelection.instanceId !== input.targetSelection.instanceId;
+}
+/**
+* Returns the effort value if it is a prompt-injected value according to
+* any select descriptor in the given capabilities, or null otherwise.
+*
+* Unlike a single `find`, this checks every descriptor so that the
+* correct descriptor's `promptInjectedValues` list is consulted even when
+* multiple select descriptors exist.
+*/
+function resolvePromptInjectedEffort(caps, rawEffort) {
+	const trimmed = trimOrNull(rawEffort);
+	if (!trimmed) return null;
+	const descriptors = getProviderOptionDescriptors({ caps });
+	for (const descriptor of descriptors) if (descriptor.type === "select" && descriptor.promptInjectedValues?.includes(trimmed)) return trimmed;
+	return null;
+}
+function applyClaudePromptEffortPrefix(text, effort) {
+	const trimmed = text.trim();
+	if (!trimmed) return trimmed;
+	if (effort !== "ultrathink") return trimmed;
+	if (trimmed.startsWith("Ultrathink:")) return trimmed;
+	return `Ultrathink:\n${trimmed}`;
 }
-function assertIdentifier(value, pattern) {
-	if (!pattern.test(value)) invalid();
+//#endregion
+//#region ../../packages/shared/src/serverSettings.ts
+const ServerSettingsJson$1 = fromLenientJson(ServerSettings);
+function normalizePersistedServerSettingString(value) {
+	const trimmed = value?.trim();
+	return trimmed && trimmed.length > 0 ? trimmed : void 0;
 }
-function copyBytes(value, expectedLengths) {
-	if (!(value instanceof Uint8Array) || !expectedLengths.includes(value.byteLength)) invalid();
-	return Uint8Array.from(value);
+function extractPersistedServerObservabilitySettings(input) {
+	return {
+		otlpTracesUrl: normalizePersistedServerSettingString(input.observability?.otlpTracesUrl),
+		otlpMetricsUrl: normalizePersistedServerSettingString(input.observability?.otlpMetricsUrl)
+	};
 }
-function canonicalizeHubOrigin(value) {
-	if (typeof value !== "string" || value.length === 0 || value.length > 512) invalid();
-	let url;
+function parsePersistedServerObservabilitySettings(raw) {
 	try {
-		url = new URL(value);
+		return extractPersistedServerObservabilitySettings(Schema.decodeUnknownSync(ServerSettingsJson$1)(raw));
 	} catch {
-		return invalid();
-	}
-	const isLoopbackHttp = url.protocol === "http:" && LOOPBACK_HOSTS.has(url.hostname);
-	if (url.protocol !== "https:" && !isLoopbackHttp || url.username !== "" || url.password !== "" || url.pathname !== "/" || url.search !== "" || url.hash !== "" || value !== url.origin) invalid();
-	return url.origin;
-}
-function normalizeHubNodeName(value) {
-	if (typeof value !== "string") invalid();
-	const normalized = value.trim();
-	if (normalized.length === 0 || normalized.length > 100) invalid();
-	return normalized;
-}
-function validateNodePublicKey(descriptor) {
-	if (descriptor.algorithm === "ed25519") return {
-		algorithm: descriptor.algorithm,
-		publicKey: copyBytes(descriptor.publicKey, [32])
-	};
-	if (descriptor.algorithm === "p256") {
-		const publicKey = copyBytes(descriptor.publicKey, [33, 65]);
-		const prefix = publicKey[0];
-		if (publicKey.byteLength === 33 && prefix !== 2 && prefix !== 3 || publicKey.byteLength === 65 && prefix !== 4) invalid();
 		return {
-			algorithm: descriptor.algorithm,
-			publicKey
+			otlpTracesUrl: void 0,
+			otlpMetricsUrl: void 0
 		};
 	}
-	return invalid();
-}
-function fingerprintNodePublicKey(descriptor) {
-	const key = validateNodePublicKey(descriptor);
-	const canonical = encode([
-		NODE_KEY_FINGERPRINT_DOMAIN,
-		key.algorithm,
-		key.publicKey
-	], rfc8949EncodeOptions);
-	return Uint8Array.from(createHash("sha256").update(canonical).digest());
-}
-function formatNodePublicKeyFingerprint(fingerprint) {
-	const bytes = copyBytes(fingerprint, [32]);
-	return `SHA256:${Buffer.from(bytes).toString("base64url")}`;
-}
-function encodeNodeAuthenticationTranscript(input) {
-	const hubOrigin = canonicalizeHubOrigin(input.hubOrigin);
-	assertProtocolVersion(input.protocolMajor);
-	assertProtocolVersion(input.protocolMinor);
-	assertIdentifier(input.nodeId, NODE_ID);
-	assertIdentifier(input.activeKeyId, NODE_KEY_ID);
-	assertUnsignedSafeInteger(input.challengeExpiresAt);
-	const challenge = copyBytes(input.challenge, [32]);
-	return Uint8Array.from(encode([
-		NODE_AUTH_TRANSCRIPT_DOMAIN,
-		hubOrigin,
-		input.protocolMajor,
-		input.protocolMinor,
-		input.nodeId,
-		input.activeKeyId,
-		input.challengeExpiresAt,
-		challenge
-	], rfc8949EncodeOptions));
 }
-function encodeNodeKeyRotationTranscript(input) {
-	const hubOrigin = canonicalizeHubOrigin(input.hubOrigin);
-	assertProtocolVersion(input.protocolMajor);
-	assertProtocolVersion(input.protocolMinor);
-	assertIdentifier(input.rotationRequestId, ROTATION_REQUEST_ID);
-	assertIdentifier(input.nodeId, NODE_ID);
-	assertIdentifier(input.oldActiveKeyId, NODE_KEY_ID);
-	assertIdentifier(input.newKeyId, NODE_KEY_ID);
-	assertUnsignedSafeInteger(input.challengeExpiresAt);
-	const newKey = validateNodePublicKey(input.newKey);
-	const fingerprint = fingerprintNodePublicKey(newKey);
-	const challenge = copyBytes(input.challenge, [32]);
-	return Uint8Array.from(encode([
-		NODE_KEY_ROTATION_TRANSCRIPT_DOMAIN,
-		hubOrigin,
-		input.protocolMajor,
-		input.protocolMinor,
-		input.rotationRequestId,
-		input.nodeId,
-		input.oldActiveKeyId,
-		input.newKeyId,
-		newKey.algorithm,
-		newKey.publicKey,
-		fingerprint,
-		input.challengeExpiresAt,
-		challenge
-	], rfc8949EncodeOptions));
+function shouldReplaceTextGenerationModelSelection(patch) {
+	return Boolean(patch && (patch.instanceId !== void 0 || patch.model !== void 0));
 }
-function encodeNativeNodeClaimTranscript(input) {
-	const hubOrigin = canonicalizeHubOrigin(input.hubOrigin);
-	assertProtocolVersion(input.protocolVersion);
-	assertProtocolVersion(input.transcriptVersion);
-	assertIdentifier(input.claimId, NATIVE_NODE_CLAIM_ID);
-	assertIdentifier(input.accountId, ACCOUNT_ID);
-	assertIdentifier(input.spaceId, SPACE_ID);
-	assertIdentifier(input.sessionId, SESSION_ID);
-	const dpopKeyThumbprint = copyBytes(input.dpopKeyThumbprint, [32]);
-	assertIdentifier(input.installationId, DESKTOP_INSTALLATION_ID);
-	assertIdentifier(input.environmentId, ENVIRONMENT_ID);
-	const nodeKey = validateNodePublicKey(input.nodeKey);
-	const nodeFingerprint = fingerprintNodePublicKey(nodeKey);
-	assertUnsignedSafeInteger(input.claimExpiresAt);
-	const challenge = copyBytes(input.challenge, [32]);
-	return Uint8Array.from(encode([
-		NATIVE_NODE_CLAIM_TRANSCRIPT_DOMAIN,
-		hubOrigin,
-		input.protocolVersion,
-		input.transcriptVersion,
-		input.claimId,
-		input.accountId,
-		input.spaceId,
-		input.sessionId,
-		dpopKeyThumbprint,
-		input.installationId,
-		input.environmentId,
-		nodeKey.algorithm,
-		nodeKey.publicKey,
-		nodeFingerprint,
-		input.claimExpiresAt,
-		challenge
-	], rfc8949EncodeOptions));
+function mergeModelSelectionOptionsById(input) {
+	if (input.patch === void 0) return input.current ? [...input.current] : void 0;
+	if (input.patch.length === 0) return;
+	const merged = new Map((input.current ?? []).map((selection) => [selection.id, selection.value]));
+	for (const selection of input.patch) merged.set(selection.id, selection.value);
+	return [...merged.entries()].map(([id, value]) => ({
+		id,
+		value
+	}));
 }
-function equalNodeIdentityBytes(left, right) {
-	if (!(left instanceof Uint8Array) || !(right instanceof Uint8Array)) return false;
-	if (left.byteLength !== right.byteLength) return false;
-	return timingSafeEqual(left, right);
+/**
+* Applies a server settings patch while treating textGenerationModelSelection as
+* replace-on-provider/model updates. This prevents stale nested options from
+* surviving a reset patch that intentionally omits options.
+*/
+function applyServerSettingsPatch(current, patch) {
+	const selectionPatch = patch.textGenerationModelSelection;
+	for (const [field, value] of Object.entries(patch.expectedNodePreferences ?? {})) if (!Equal.equals(current[field] ?? null, value)) throw new Error("Node preferences changed elsewhere. Reload before saving.");
+	for (const [projectId, expected] of Object.entries(patch.expectedProjectPreferences ?? {})) {
+		const currentPreferences = current.projectPreferences[projectId] ?? {};
+		for (const [field, value] of Object.entries(expected)) {
+			const actual = field === "initialModelSelection" && !Object.hasOwn(currentPreferences, field) ? "absent" : currentPreferences[field] ?? null;
+			if (!Equal.equals(actual, value)) throw new Error("Project preferences changed elsewhere. Reload before saving.");
+		}
+	}
+	const { expectedProjectPreferences: _expected, expectedNodePreferences: _expectedNode, projectPreferences: _projects, ...persistedPatch } = patch;
+	let next = deepMerge(current, persistedPatch);
+	if (patch.initialModelSelection !== void 0) next = {
+		...next,
+		initialModelSelection: patch.initialModelSelection
+	};
+	if (patch.projectPreferences !== void 0) {
+		const projects = new Map(Object.entries(current.projectPreferences));
+		for (const [projectId, preferencesPatch] of Object.entries(patch.projectPreferences)) {
+			if (preferencesPatch === null) {
+				projects.delete(projectId);
+				continue;
+			}
+			const preferences = { ...projects.get(projectId) };
+			for (const [field, value] of Object.entries(preferencesPatch)) if (value === null && field !== "initialModelSelection") delete preferences[field];
+			else Object.assign(preferences, { [field]: value });
+			if (Object.keys(preferences).length) projects.set(projectId, preferences);
+			else projects.delete(projectId);
+		}
+		next = {
+			...next,
+			projectPreferences: Object.fromEntries(projects)
+		};
+	}
+	if (patch.projectWorktreeSubmodules !== void 0) {
+		const modes = new Map(Object.entries(current.projectWorktreeSubmodules));
+		for (const [projectId, mode] of Object.entries(patch.projectWorktreeSubmodules)) if (mode === null) modes.delete(projectId);
+		else modes.set(projectId, mode);
+		next = {
+			...next,
+			projectWorktreeSubmodules: Object.fromEntries(modes)
+		};
+	}
+	if (patch.projectWorktreeRoots !== void 0) {
+		const roots = new Map(Object.entries(current.projectWorktreeRoots));
+		for (const [projectId, root] of Object.entries(patch.projectWorktreeRoots)) if (root === null || root === "") roots.delete(projectId);
+		else roots.set(projectId, root);
+		next = {
+			...next,
+			projectWorktreeRoots: Object.fromEntries(roots)
+		};
+	}
+	if (patch.projectStorageRetention !== void 0) {
+		const policies = new Map(Object.entries(current.projectStorageRetention));
+		for (const [projectId, policy] of Object.entries(patch.projectStorageRetention)) if (policy === null) policies.delete(projectId);
+		else policies.set(projectId, policy);
+		next = {
+			...next,
+			projectStorageRetention: Object.fromEntries(policies)
+		};
+	}
+	const nextWithReplacements = patch.providerInstances !== void 0 ? {
+		...next,
+		providerInstances: patch.providerInstances
+	} : next;
+	if (!selectionPatch) return nextWithReplacements;
+	const instanceId = selectionPatch.instanceId ?? current.textGenerationModelSelection.instanceId;
+	const model = selectionPatch.model ?? current.textGenerationModelSelection.model;
+	const options = shouldReplaceTextGenerationModelSelection(selectionPatch) ? selectionPatch.options : mergeModelSelectionOptionsById({
+		current: current.textGenerationModelSelection.options,
+		patch: selectionPatch.options
+	});
+	return {
+		...nextWithReplacements,
+		textGenerationModelSelection: createModelSelection(instanceId, model, options)
+	};
 }
 //#endregion
 //#region src/config.ts
@@ -2890,6 +2890,7 @@ function resolveHubConnectorConfig(raw) {
 	};
 }
 const DEFAULT_NODE_E2EE_POLICY_CONFIG = {
+	mode: void 0,
 	requireE2EE: void 0,
 	requireApprovedClientE2EE: void 0,
 	configurationIssue: void 0
@@ -2916,10 +2917,12 @@ const parseTriStateBoolean = (value) => {
 function resolveNodeE2eePolicyConfig(raw) {
 	const requireE2EE = parseTriStateBoolean(raw.requireE2EE);
 	const requireApprovedClientE2EE = parseTriStateBoolean(raw.requireApprovedClientE2EE);
+	const mode = raw.mode === void 0 ? void 0 : Schema.is(NodeE2eeAdmissionPolicy)(raw.mode) ? raw.mode : null;
 	return {
+		mode: mode ?? void 0,
 		requireE2EE: typeof requireE2EE === "boolean" ? requireE2EE : void 0,
 		requireApprovedClientE2EE: typeof requireApprovedClientE2EE === "boolean" ? requireApprovedClientE2EE : void 0,
-		configurationIssue: requireE2EE === void 0 || requireApprovedClientE2EE === void 0 ? "configuration_invalid" : void 0
+		configurationIssue: requireE2EE === void 0 || requireApprovedClientE2EE === void 0 || mode === null ? "configuration_invalid" : void 0
 	};
 }
 function resolveManagedWorktreesRoot(config) {
@@ -4414,4 +4417,4 @@ const providerTurnMetricAttributes = (input) => {
 	});
 };
 //#endregion
-export { makeWorkspaceAccessPolicy as $, getProviderOptionBooleanSelectionValue as $t, runtimeQueueBlockedDuration as A, resolveHubConnectorConfig as At, startupCommandGateQueueHighWater as B, formatNodePublicKeyFingerprint as Bt, providerStartupQueueHighWater as C, acquireStorageSettingsLease as Ct, providerTurnsTotal as D, ServerConfig as Dt, providerTurnMetricAttributes as E, RuntimeMode as Et, runtimeQueueHighWater as F, encodeNativeNodeClaimTranscript as Ft, LocalDiagnosticsMetrics as G, rfc8949EncodeOptions as Gt, terminalRestartsTotal as H, Tokeniser as Ht, runtimeQueueOverflowsTotal as I, encodeNodeAuthenticationTranscript as It, outcomeFromExit as J, applyClaudePromptEffortPrefix as Jt, LocalDiagnosticsMetricsLive as K, Type as Kt, runtimeQueueRecoveriesTotal as L, encodeNodeKeyRotationTranscript as Lt, runtimeQueueDepth as M, resolveNodeE2eePolicyConfig as Mt, runtimeQueueDequeuesTotal as N, resolveStaticDir as Nt, rpcRequestDuration as O, deriveServerPaths as Ot, runtimeQueueEnqueuesTotal as P, canonicalizeHubOrigin as Pt, WorkspaceAccessPolicyLive as Q, getModelSelectionStringOptionValue as Qt, startupCommandGateEnqueuesTotal as R, equalNodeIdentityBytes as Rt, providerStartupQueueDepth as S, mintStorageCleanupClaim as St, providerTurnDuration as T, DEFAULT_PORT as Tt, terminalSessionsTotal as U, decode as Ut, startupCommandGateQueueWaitDuration as V, normalizeHubNodeName as Vt, withMetrics as W, encode as Wt, ServerSettingsService as X, getModelDisplayLabel as Xt, ServerSettingsLive as Y, createModelCapabilities as Yt, redactServerSettingsForClient as Z, getModelSelectionBooleanOptionValue as Zt, providerRuntimeEventsTotal as _, assertCleanWorktree as _t, contextHandoffsTotal as a, resolvePromptInjectedEffort as an, expandHomePath as at, providerStaleStopTimeoutsTotal as b, removeQuarantinedTemporaryDirectory as bt, increment as c, writeFileStringAtomically as ct, orchestrationCommandAckDuration as d, canonicalStoragePath as dt, getProviderOptionCurrentValue as en, WorkspaceAccessPolicy as et, orchestrationCommandDuration as f, hasWorktreeCreationLease as ft, providerMetricAttributes as g, assertCanonicalPath as gt, providerEventLogRecordsDroppedTotal as h, storageLifecycleLock as ht, contextHandoffPreparationDuration as i, normalizeModelSlug as in, validateWorktreeRoot as it, runtimeQueueCoalescedTotal as j, resolveManagedWorktreesRoot as jt, rpcRequestsTotal as k, ensureServerDirectories as kt, metricAttributes as l, acquireStoragePathUseLease as lt, orchestrationEventsProcessedTotal as m, recordCreatedWorktree as mt, contextHandoffContextEntriesTotal as n, getProviderOptionStringSelectionValue as nn, resolveConfiguredWorktreeRoot as nt, gitCommandDuration as o, ServerSecretStoreLive as ot, orchestrationCommandsTotal as p, isStoragePathBlocked as pt, compactTraceAttributes as q, parsePersistedServerObservabilitySettings as qt, contextHandoffDispatchDuration as r, modelSelectionRequiresContextHandoff as rn, selectConfiguredWorktreeRoot as rt, gitCommandsTotal as s, ServerSecretStore as st, contextHandoffContextBytesTotal as t, getProviderOptionDescriptors as tn, canonicalizeWorktreePath as tt, metricNames as u, acquireWorktreeCreationLease as ut, providerRuntimeStaleEventsTotal as v, captureWorktreeIdentity as vt, providerStartupQueueWaitDuration as w, hasStorageSettingsUpdateLease as wt, providerStartupAdmissionTotal as x, removeVerifiedWorktree as xt, providerSessionsTotal as y, measureDirectory as yt, startupCommandGateQueueDepth as z, fingerprintNodePublicKey as zt };
+export { makeWorkspaceAccessPolicy as $, formatNodePublicKeyFingerprint as $t, runtimeQueueBlockedDuration as A, resolveHubConnectorConfig as At, startupCommandGateQueueHighWater as B, getProviderOptionBooleanSelectionValue as Bt, providerStartupQueueHighWater as C, acquireStorageSettingsLease as Ct, providerTurnsTotal as D, ServerConfig as Dt, providerTurnMetricAttributes as E, RuntimeMode as Et, runtimeQueueHighWater as F, applyClaudePromptEffortPrefix as Ft, LocalDiagnosticsMetrics as G, normalizeModelSlug as Gt, terminalRestartsTotal as H, getProviderOptionDescriptors as Ht, runtimeQueueOverflowsTotal as I, createModelCapabilities as It, outcomeFromExit as J, encodeNativeNodeClaimTranscript as Jt, LocalDiagnosticsMetricsLive as K, resolvePromptInjectedEffort as Kt, runtimeQueueRecoveriesTotal as L, getModelDisplayLabel as Lt, runtimeQueueDepth as M, resolveNodeE2eePolicyConfig as Mt, runtimeQueueDequeuesTotal as N, resolveStaticDir as Nt, rpcRequestDuration as O, deriveServerPaths as Ot, runtimeQueueEnqueuesTotal as P, parsePersistedServerObservabilitySettings as Pt, WorkspaceAccessPolicyLive as Q, fingerprintNodePublicKey as Qt, startupCommandGateEnqueuesTotal as R, getModelSelectionBooleanOptionValue as Rt, providerStartupQueueDepth as S, mintStorageCleanupClaim as St, providerTurnDuration as T, DEFAULT_PORT as Tt, terminalSessionsTotal as U, getProviderOptionStringSelectionValue as Ut, startupCommandGateQueueWaitDuration as V, getProviderOptionCurrentValue as Vt, withMetrics as W, modelSelectionRequiresContextHandoff as Wt, ServerSettingsService as X, encodeNodeKeyRotationTranscript as Xt, ServerSettingsLive as Y, encodeNodeAuthenticationTranscript as Yt, redactServerSettingsForClient as Z, equalNodeIdentityBytes as Zt, providerRuntimeEventsTotal as _, assertCleanWorktree as _t, contextHandoffsTotal as a, Type as an, expandHomePath as at, providerStaleStopTimeoutsTotal as b, removeQuarantinedTemporaryDirectory as bt, increment as c, writeFileStringAtomically as ct, orchestrationCommandAckDuration as d, canonicalStoragePath as dt, normalizeHubNodeName as en, WorkspaceAccessPolicy as et, orchestrationCommandDuration as f, hasWorktreeCreationLease as ft, providerMetricAttributes as g, assertCanonicalPath as gt, providerEventLogRecordsDroppedTotal as h, storageLifecycleLock as ht, contextHandoffPreparationDuration as i, rfc8949EncodeOptions as in, validateWorktreeRoot as it, runtimeQueueCoalescedTotal as j, resolveManagedWorktreesRoot as jt, rpcRequestsTotal as k, ensureServerDirectories as kt, metricAttributes as l, acquireStoragePathUseLease as lt, orchestrationEventsProcessedTotal as m, recordCreatedWorktree as mt, contextHandoffContextEntriesTotal as n, decode as nn, resolveConfiguredWorktreeRoot as nt, gitCommandDuration as o, ServerSecretStoreLive as ot, orchestrationCommandsTotal as p, isStoragePathBlocked as pt, compactTraceAttributes as q, canonicalizeHubOrigin as qt, contextHandoffDispatchDuration as r, encode as rn, selectConfiguredWorktreeRoot as rt, gitCommandsTotal as s, ServerSecretStore as st, contextHandoffContextBytesTotal as t, Tokeniser as tn, canonicalizeWorktreePath as tt, metricNames as u, acquireWorktreeCreationLease as ut, providerRuntimeStaleEventsTotal as v, captureWorktreeIdentity as vt, providerStartupQueueWaitDuration as w, hasStorageSettingsUpdateLease as wt, providerStartupAdmissionTotal as x, removeVerifiedWorktree as xt, providerSessionsTotal as y, measureDirectory as yt, startupCommandGateQueueDepth as z, getModelSelectionStringOptionValue as zt };