codexuse-cli 6.1.0 → 6.2.0

package/dist/index.js

@@ -2082,6 +2082,57 @@ var import_node_crypto2 = require("crypto");
 var import_node_path4 = __toESM(require("path"), 1);
 var import_node_os = __toESM(require("os"), 1);
 
+// ../../packages/contracts/src/license/offer-config.ts
+function getActiveOffer() {
+  const basePriceUsd = 39;
+  const discountPercent = 50;
+  const salePriceUsd = basePriceUsd * (100 - discountPercent) / 100;
+  return {
+    basePriceUsd,
+    basePriceDisplay: `$${basePriceUsd}`,
+    couponCode: "SUMMER50",
+    discountPercent,
+    salePriceUsd,
+    salePriceDisplay: `$${salePriceUsd.toFixed(2)}`,
+    isActive: true,
+    campaign: "summer-2026",
+    productPermalink: "codex-use",
+    checkoutBaseUrl: "https://hweihwang.gumroad.com/l/codex-use",
+    trialEnabled: true,
+    trialDays: 7
+  };
+}
+function buildCheckoutUrl(offer2, options) {
+  const base2 = offer2.checkoutBaseUrl;
+  const withCoupon = offer2.isActive && offer2.couponCode ? `${base2}/${offer2.couponCode}` : base2;
+  const url = new URL(withCoupon);
+  if (options?.directCheckout) {
+    url.searchParams.set("wanted", "true");
+  }
+  if (!options?.source || !options?.medium) {
+    return url.toString();
+  }
+  url.searchParams.set("utm_source", options.source);
+  url.searchParams.set("utm_medium", options.medium);
+  if (options.campaign) {
+    url.searchParams.set("utm_campaign", options.campaign);
+  } else if (offer2.campaign) {
+    url.searchParams.set("utm_campaign", offer2.campaign);
+  }
+  return url.toString();
+}
+
+// ../../packages/contracts/src/license/activation-session.ts
+var ACTIVATION_RETENTION_MS = 24 * 60 * 60 * 1e3;
+var ACTIVATION_WATCH_MS = 20 * 60 * 1e3;
+var ACTIVATION_SESSION_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function normalizePendingCheckout(value3) {
+  if (!value3 || typeof value3 !== "object" || Array.isArray(value3)) return null;
+  const { sessionId, startedAt } = value3;
+  if (typeof sessionId !== "string" || !ACTIVATION_SESSION_PATTERN.test(sessionId) || typeof startedAt !== "number" || !Number.isSafeInteger(startedAt) || startedAt <= 0) return null;
+  return { sessionId, startedAt };
+}
+
 // ../../packages/contracts/src/desktop/llm-compatibility.ts
 var DESKTOP_LLM_CAPABILITY_NAMES = [
   "streamingText",
@@ -3408,6 +3459,7 @@ function resolveStorageDbPath() {
 function createDefaultAppState() {
   return {
     schemaVersion: 1,
+    trialExperience: { knownLicenseHolder: false, pendingInteractiveAt: null, trial: null },
     autoRoll: {
       enabled: false,
       rearmRemainingThreshold: 15,
@@ -3498,7 +3550,8 @@ function createDefaultAppState() {
         proUnlockedCelebrated: false
       },
       duplicateWarningDismissedKey: null,
-      pendingLicenseActivation: false
+      pendingLicenseActivation: false,
+      pendingCheckout: null
     },
     profileDashboard: {
       customGroupsByAccountKey: {}
@@ -4110,6 +4163,35 @@ function normalizeOfficialCodexPowerStatus(value3) {
     appliedAt: asString(value3.appliedAt)
   };
 }
+function normalizeTrialExperience(raw) {
+  const value3 = isRecord2(raw) ? raw : {};
+  const trial = isRecord2(value3.trial) ? value3.trial : {};
+  const startedAt = asString(trial.startedAt);
+  const expiresAt = asString(trial.expiresAt);
+  const start = startedAt ? Date.parse(startedAt) : NaN;
+  const end = expiresAt ? Date.parse(expiresAt) : NaN;
+  const observedAt = asNumberOrNull(trial.observedAt);
+  const valid = startedAt && expiresAt && Number.isFinite(start) && end > start && observedAt !== null && observedAt >= start;
+  const first = isRecord2(trial.firstOutcome) ? trial.firstOutcome : {};
+  const completedAt = asNumberOrNull(first.completedAt);
+  const kind = first.kind;
+  const validKind = kind === "shared_history_switch" || kind === "shared_history_window" || kind === "matched_window" || kind === "provider_window" || kind === "pool_request";
+  const interactiveAt = asNumberOrNull(trial.interactiveAt);
+  const pendingInteractiveAt = asNumberOrNull(value3.pendingInteractiveAt);
+  return {
+    knownLicenseHolder: value3.knownLicenseHolder === true,
+    pendingInteractiveAt: pendingInteractiveAt !== null && pendingInteractiveAt > 0 ? pendingInteractiveAt : null,
+    trial: valid ? {
+      startedAt,
+      expiresAt,
+      observedAt,
+      priorPayment: trial.priorPayment === "known_prior_license" ? "known_prior_license" : "unknown",
+      interactiveAt: interactiveAt !== null && interactiveAt > 0 && interactiveAt < end ? interactiveAt : null,
+      firstOutcome: validKind && completedAt !== null && completedAt >= start && completedAt < end ? { kind, completedAt } : null,
+      entitlementObservedAt: asNumberOrNull(trial.entitlementObservedAt)
+    } : null
+  };
+}
 function normalizeAppState(raw) {
   const defaults = createDefaultAppState();
   if (!isRecord2(raw)) {
@@ -4120,6 +4202,7 @@ function normalizeAppState(raw) {
   const next = deepMerge(defaults, raw);
   const merged = next;
   merged.schemaVersion = 1;
+  merged.trialExperience = normalizeTrialExperience(raw.trialExperience);
   merged.autoRoll = normalizeAutoRollSettings(rawAutoRoll);
   if (!isRecord2(merged.officialCodex)) {
     merged.officialCodex = clone2(defaults.officialCodex);
@@ -4562,6 +4645,7 @@ function normalizeAppState(raw) {
   if (typeof merged.ui.pendingLicenseActivation !== "boolean") {
     merged.ui.pendingLicenseActivation = false;
   }
+  merged.ui.pendingCheckout = normalizePendingCheckout(merged.ui.pendingCheckout);
   {
     const allowedUiKeys = new Set(Object.keys(defaults.ui));
     for (const key of Object.keys(merged.ui)) {
@@ -5139,27 +5223,35 @@ async function getStoredLicense() {
   const state = await getAppState();
   return parseStoredLicense(state.license);
 }
-async function persistLicense(license) {
+async function persistLicense(license, expected) {
   const parsed = parseStoredLicense(license);
-  await patchAppState({
-    license: parsed ? {
-      licenseKey: parsed.licenseKey ?? null,
-      purchaseEmail: parsed.purchaseEmail ?? null,
-      lastVerifiedAt: parsed.lastVerifiedAt ?? null,
-      nextCheckAt: parsed.nextCheckAt ?? null,
-      lastVerificationError: parsed.lastVerificationError ?? null,
-      status: parsed.status ?? "inactive",
-      signature: parsed.signature ?? null
-    } : {
-      licenseKey: null,
-      purchaseEmail: null,
-      lastVerifiedAt: null,
-      nextCheckAt: null,
-      lastVerificationError: null,
-      status: "inactive",
-      signature: null
+  let persisted = false;
+  await updateAppState((current) => {
+    if (expected !== void 0 && JSON.stringify(parseStoredLicense(current.license)) !== JSON.stringify(parseStoredLicense(expected))) {
+      return {};
     }
+    persisted = true;
+    return {
+      license: parsed ? {
+        licenseKey: parsed.licenseKey ?? null,
+        purchaseEmail: parsed.purchaseEmail ?? null,
+        lastVerifiedAt: parsed.lastVerifiedAt ?? null,
+        nextCheckAt: parsed.nextCheckAt ?? null,
+        lastVerificationError: parsed.lastVerificationError ?? null,
+        status: parsed.status ?? "inactive",
+        signature: parsed.signature ?? null
+      } : {
+        licenseKey: null,
+        purchaseEmail: null,
+        lastVerifiedAt: null,
+        nextCheckAt: null,
+        lastVerificationError: null,
+        status: "inactive",
+        signature: null
+      }
+    };
   });
+  return persisted;
 }
 async function getStoredAutoRollSettings() {
   const state = await getAppState();
@@ -5254,46 +5346,6 @@ async function getLicenseSecret() {
   return persistLicenseSecret(dbPath, secret);
 }
 
-// ../../packages/contracts/src/license/offer-config.ts
-function getActiveOffer() {
-  const basePriceUsd = 39;
-  const discountPercent = 50;
-  const salePriceUsd = basePriceUsd * (100 - discountPercent) / 100;
-  return {
-    basePriceUsd,
-    basePriceDisplay: `$${basePriceUsd}`,
-    couponCode: "SUMMER50",
-    discountPercent,
-    salePriceUsd,
-    salePriceDisplay: `$${salePriceUsd.toFixed(2)}`,
-    isActive: true,
-    campaign: "summer-2026",
-    productPermalink: "codex-use",
-    checkoutBaseUrl: "https://hweihwang.gumroad.com/l/codex-use",
-    trialEnabled: true,
-    trialDays: 7
-  };
-}
-function buildCheckoutUrl(offer2, options) {
-  const base2 = offer2.checkoutBaseUrl;
-  const withCoupon = offer2.isActive && offer2.couponCode ? `${base2}/${offer2.couponCode}` : base2;
-  const url = new URL(withCoupon);
-  if (options?.directCheckout) {
-    url.searchParams.set("wanted", "true");
-  }
-  if (!options?.source || !options?.medium) {
-    return url.toString();
-  }
-  url.searchParams.set("utm_source", options.source);
-  url.searchParams.set("utm_medium", options.medium);
-  if (options.campaign) {
-    url.searchParams.set("utm_campaign", options.campaign);
-  } else if (offer2.campaign) {
-    url.searchParams.set("utm_campaign", offer2.campaign);
-  }
-  return url.toString();
-}
-
 // ../../packages/runtime-profiles/src/license/trial.ts
 var import_node_crypto6 = __toESM(require("crypto"), 1);
 
@@ -5562,6 +5614,7 @@ function buildTrialInfo(stored, now2) {
   const expired = stored?.serverExpired === true || expiresAtMs === null || expiresAtMs <= now2;
   const daysLeft = expired || expiresAtMs === null ? 0 : Math.max(0, Math.ceil((expiresAtMs - now2) / DAY_MS));
   return {
+    startedAt: stored?.startedAt ?? null,
     active: !expired,
     expired,
     expiresAt: stored?.expiresAt ?? null,
@@ -5573,6 +5626,7 @@ function lockReasonFor(info) {
 }
 function buildLockedTrialInfo(stored) {
   return {
+    startedAt: null,
     active: false,
     expired: true,
     expiresAt: stored?.expiresAt ?? null,
@@ -6078,6 +6132,7 @@ var LicenseService = class {
   constructor() {
     this.refreshPromise = null;
     this.verificationPromise = null;
+    this.activationTail = Promise.resolve();
   }
   async getCachedStatus() {
     try {
@@ -6129,8 +6184,10 @@ var LicenseService = class {
         nextCheckAt: new Date(cappedNextCheckTs).toISOString()
       };
       const signed = withSignature(updated, secret);
+      if (!await persistLicense(signed, workingStored)) {
+        return this.getStatus({ allowStale: true });
+      }
       workingStored = signed;
-      await persistLicense(signed);
     }
     const tampered = Boolean(workingStored.licenseKey) && !signatureValid;
     const cached2 = tampered ? toLicenseStatus(null, {
@@ -6161,7 +6218,9 @@ var LicenseService = class {
           lastVerificationError: null
         };
         const signed = withSignature(updated, secret);
-        await persistLicense(signed);
+        if (!await persistLicense(signed, workingStored)) {
+          return this.getStatus({ allowStale: true });
+        }
         return finalize2(toLicenseStatus(signed));
       } catch (error) {
         const message = error instanceof Error ? error.message : "License verification failed.";
@@ -6175,7 +6234,9 @@ var LicenseService = class {
             },
             secret
           );
-          await persistLicense(fallbackStored2);
+          if (!await persistLicense(fallbackStored2, workingStored)) {
+            return this.getStatus({ allowStale: true });
+          }
           const fallback = toLicenseStatus(fallbackStored2, {
             state: fallbackStored2.status ?? "grace",
             error: message
@@ -6190,7 +6251,9 @@ var LicenseService = class {
           status: "inactive",
           lastVerificationError: message
         }, secret);
-        await persistLicense(fallbackStored);
+        if (!await persistLicense(fallbackStored, workingStored)) {
+          return this.getStatus({ allowStale: true });
+        }
         return finalize2(toLicenseStatus(fallbackStored, { error: message }));
       }
     };
@@ -6202,6 +6265,23 @@ var LicenseService = class {
     }
   }
   async activate(licenseKey) {
+    return (await this.queueActivation(licenseKey, false)).license;
+  }
+  activateFromCheckout(licenseKey) {
+    return this.queueActivation(licenseKey, true);
+  }
+  queueActivation(licenseKey, onlyIfUnlicensed) {
+    const result2 = this.activationTail.then(async () => {
+      if (onlyIfUnlicensed) {
+        const current = await this.getCachedStatus();
+        if (current.isPro) return { license: current, activated: false };
+      }
+      return { license: await this.performActivation(licenseKey), activated: true };
+    });
+    this.activationTail = result2.then(() => void 0, () => void 0);
+    return result2;
+  }
+  async performActivation(licenseKey) {
     const trimmed = licenseKey.trim();
     if (!trimmed) {
       throw new Error("License key is required.");
@@ -7560,7 +7640,7 @@ function logInfo(...args2) {
   console.info(...args2);
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Pipeable.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Pipeable.js
 var pipeArguments = (self, args2) => {
   switch (args2.length) {
     case 0:
@@ -7604,7 +7684,7 @@ var Class = /* @__PURE__ */ (function() {
   return PipeableBase;
 })();
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Function.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Function.js
 var dual = function(arity, body) {
   if (typeof arity === "function") {
     return function() {
@@ -7675,7 +7755,7 @@ function memoizeIdempotent(f) {
   };
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/equal.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/equal.js
 var getAllObjectKeys = (obj) => {
   const keys4 = new Set(Reflect.ownKeys(obj));
   if (obj.constructor === Object) return keys4;
@@ -7698,7 +7778,7 @@ var getAllObjectKeys = (obj) => {
 };
 var byReferenceInstances = /* @__PURE__ */ new WeakSet();
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Predicate.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Predicate.js
 function isString(input) {
   return typeof input === "string";
 }
@@ -7746,7 +7826,7 @@ function isError(input) {
   return input instanceof Error;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Hash.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Hash.js
 var symbol = "~effect/interfaces/Hash";
 var hash = (self) => {
   switch (typeof self) {
@@ -7870,7 +7950,7 @@ function withVisitedTracking(obj, fn2) {
   return result2;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Equal.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Equal.js
 var symbol2 = "~effect/interfaces/Equal";
 function equals() {
   if (arguments.length === 1) {
@@ -8062,7 +8142,7 @@ function makeCompareSet(equivalence) {
 var compareSets = /* @__PURE__ */ makeCompareSet(compareBoth);
 var isEqual = (u) => hasProperty(u, symbol2);
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Reducer.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Reducer.js
 function make(combine2, initialValue, combineAll) {
   return {
     combine: combine2,
@@ -8077,7 +8157,7 @@ function make(combine2, initialValue, combineAll) {
   };
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Equivalence.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Equivalence.js
 var make2 = (isEquivalent) => (self, that) => self === that || isEquivalent(self, that);
 var isStrictEquivalent = (x, y) => x === y;
 var strictEqual = () => isStrictEquivalent;
@@ -8100,10 +8180,10 @@ function Struct(fields) {
   });
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/array.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/array.js
 var isArrayNonEmpty = (self) => self.length > 0;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/record.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/record.js
 function assignProperty(self, key, value3) {
   if (key === "__proto__") {
     Object.defineProperty(self, key, {
@@ -8125,14 +8205,14 @@ function assignProperties(self, source) {
   }
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Combiner.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Combiner.js
 function make3(combine2) {
   return {
     combine: combine2
   };
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Redactable.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Redactable.js
 var symbolRedactable = /* @__PURE__ */ Symbol.for("~effect/Redactable");
 var isRedactable = (u) => hasProperty(u, symbolRedactable);
 function redact(u) {
@@ -8154,7 +8234,7 @@ var emptyContext = {
   }
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Formatter.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Formatter.js
 function format(input, options) {
   const space = options?.space ?? 0;
   const ancestors = /* @__PURE__ */ new WeakSet();
@@ -8255,7 +8335,7 @@ function formatJson(input, options) {
   }, options?.space) ?? "null";
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Inspectable.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Inspectable.js
 var NodeInspectSymbol = /* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom");
 var toJson = (input) => {
   try {
@@ -8308,7 +8388,7 @@ var Class2 = class {
   }
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Utils.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Utils.js
 var SingleShotGen = class _SingleShotGen {
   called = false;
   self;
@@ -8368,7 +8448,7 @@ var pickInternalCall = () => {
 };
 var internalCall = /* @__PURE__ */ pickInternalCall();
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/core.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/core.js
 var EffectTypeId = `~effect/Effect`;
 var ExitTypeId = `~effect/Exit`;
 var effectVariance = {
@@ -8713,7 +8793,7 @@ var DoneVoid = {
   value: void 0
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/option.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/option.js
 var TypeId = "~effect/data/Option";
 var CommonProto = {
   [TypeId]: {
@@ -8779,7 +8859,7 @@ var some = (value3) => {
   return a;
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/result.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/result.js
 var TypeId2 = "~effect/data/Result";
 var CommonProto2 = {
   [TypeId2]: {
@@ -8846,7 +8926,7 @@ var succeed = (success) => {
   return a;
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Order.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Order.js
 function make4(compare) {
   return (self, that) => self === that ? 0 : compare(self, that);
 }
@@ -8876,7 +8956,7 @@ var isGreaterThan = (O) => dual(2, (self, that) => O(self, that) === 1);
 var isLessThanOrEqualTo = (O) => dual(2, (self, that) => O(self, that) !== 1);
 var isGreaterThanOrEqualTo = (O) => dual(2, (self, that) => O(self, that) !== -1);
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Option.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Option.js
 var none2 = () => none;
 var some2 = some;
 var isOption2 = isOption;
@@ -8905,7 +8985,7 @@ var flatten = /* @__PURE__ */ flatMap(identity);
 var filter = /* @__PURE__ */ dual(2, (self, predicate) => isNone2(self) ? none2() : predicate(self.value) ? some2(self.value) : none2());
 var makeEquivalence = (isEquivalent) => make2((x, y) => isNone2(x) ? isNone2(y) : isNone2(y) ? false : isEquivalent(x.value, y.value));
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Result.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Result.js
 var succeed2 = succeed;
 var fail2 = fail;
 var try_ = (evaluate2) => {
@@ -8936,7 +9016,7 @@ var match2 = /* @__PURE__ */ dual(2, (self, {
 var getOrElse2 = /* @__PURE__ */ dual(2, (self, onFailure) => isFailure2(self) ? onFailure(self.failure) : self.success);
 var flatMap2 = /* @__PURE__ */ dual(2, (self, f) => isFailure2(self) ? fail2(self.failure) : f(self.success));
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Record.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Record.js
 var map3 = /* @__PURE__ */ dual(2, (self, f) => {
   const out = {
     ...self
@@ -8948,7 +9028,7 @@ var map3 = /* @__PURE__ */ dual(2, (self, f) => {
 });
 var keys = (self) => Object.keys(self);
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Array.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Array.js
 var Array2 = globalThis.Array;
 var fromIterable = (collection) => Array2.isArray(collection) ? collection : Array2.from(collection);
 var ensure = (self) => Array2.isArray(self) ? self : [self];
@@ -9022,7 +9102,7 @@ function makeReducerConcat() {
   return reducer;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/BigDecimal.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/BigDecimal.js
 var FINITE_INT_REGEXP = /^[+-]?\d+$/;
 var TypeId3 = "~effect/BigDecimal";
 var BigDecimalProto = {
@@ -9251,17 +9331,17 @@ var floor = /* @__PURE__ */ dual(isBigDecimalArgs, (self, scale2 = 0) => {
   return truncated;
 });
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Boolean.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Boolean.js
 var Boolean2 = globalThis.Boolean;
 var ReducerOr = /* @__PURE__ */ make((a, b) => a || b, false);
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Effectable.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Effectable.js
 var Prototype2 = (options) => makePrimitiveProto({
   op: options.label,
   [evaluate]: options.evaluate
 });
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Context.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Context.js
 var ServiceTypeId = "~effect/Context/Service";
 var Service = function() {
   function KeyClass() {
@@ -9438,7 +9518,7 @@ var serviceNotFoundError = (service2) => {
 };
 var Reference = Service;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Duration.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Duration.js
 var TypeId5 = "~effect/time/Duration";
 var bigint02 = /* @__PURE__ */ BigInt(0);
 var bigint12 = /* @__PURE__ */ BigInt(1);
@@ -9696,7 +9776,7 @@ var Equivalence2 = (self, that) => matchPair(self, that, {
 });
 var equals3 = /* @__PURE__ */ dual(2, (self, that) => Equivalence2(self, that));
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Scheduler.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Scheduler.js
 var Scheduler = /* @__PURE__ */ Reference("effect/Scheduler", {
   fiberCached: true,
   defaultValue: () => new MixedScheduler()
@@ -9833,7 +9913,7 @@ var PreventSchedulerYield = /* @__PURE__ */ Reference("effect/Scheduler/PreventS
   defaultValue: () => false
 });
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Data.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Data.js
 var Class3 = class extends Class {
   constructor(props) {
     super();
@@ -9844,7 +9924,7 @@ var Class3 = class extends Class {
 };
 var TaggedError2 = TaggedError;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Encoding.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Encoding.js
 var EncodingErrorTypeId = "~effect/encoding/EncodingError";
 var EncodingError = class extends (/* @__PURE__ */ TaggedError2("EncodingError")) {
   /**
@@ -10017,14 +10097,14 @@ var fromHexChar = (byte) => {
   throw new TypeError("Invalid input");
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Tracer.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Tracer.js
 var ParentSpanKey = "effect/Tracer/ParentSpan";
 var TracerKey = "effect/Tracer";
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/metric.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/metric.js
 var FiberRuntimeMetricsKey = "effect/observability/Metric/FiberRuntimeMetricsKey";
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/references.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/references.js
 var CurrentStackFrame = /* @__PURE__ */ Reference("effect/References/CurrentStackFrame", {
   fiberCached: true,
   defaultValue: constUndefined
@@ -10038,7 +10118,7 @@ var MinimumLogLevel = /* @__PURE__ */ Reference("effect/References/MinimumLogLev
   defaultValue: () => "Info"
 });
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/stackTraceLimit.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/stackTraceLimit.js
 var isStackTraceLimitWritable = () => {
   const desc = Object.getOwnPropertyDescriptor(Error, "stackTraceLimit");
   if (desc === void 0) {
@@ -10055,7 +10135,7 @@ var setStackTraceLimit = (value3) => {
   }
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/effect.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/effect.js
 var Interrupt = class extends ReasonBase {
   fiberId;
   constructor(fiberId2, annotations = constEmptyAnnotations) {
@@ -10886,7 +10966,7 @@ var iterateEagerImpl = (options) => {
     if (concurrency === 1) {
       return runSequential(state, items, 0, end);
     }
-    const orderedStep = opts?.orderedStep === true && concurrency > 1;
+    const orderedStep = opts?.orderedStep === true;
     let done2 = false;
     let parentFiber;
     let fibers;
@@ -11153,7 +11233,7 @@ var logLevelColors = {
   Fatal: [colors.bgBrightRed, colors.black]
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Cause.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Cause.js
 var isCause2 = isCause;
 var isReason = isCauseReason;
 var isFailReason2 = isFailReason;
@@ -11166,7 +11246,7 @@ var map6 = causeMap;
 var pretty = causePretty;
 var IllegalArgumentError2 = IllegalArgumentError;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Exit.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Exit.js
 var isExit2 = isExit;
 var succeed4 = exitSucceed;
 var failCause2 = exitFailCause;
@@ -11175,7 +11255,7 @@ var void_2 = exitVoid;
 var isSuccess3 = exitIsSuccess;
 var isFailure3 = exitIsFailure;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/dateTime.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/dateTime.js
 var TypeId6 = "~effect/time/DateTime";
 var TimeZoneTypeId = "~effect/time/DateTime/TimeZone";
 var Proto2 = {
@@ -11569,7 +11649,7 @@ var formatIsoOffset = (self) => {
 };
 var formatIsoZoned = (self) => self.zone._tag === "Offset" ? formatIsoOffset(self) : `${formatIsoOffset(self)}[${self.zone.id}]`;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Number.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Number.js
 var Number3 = globalThis.Number;
 var remainder = /* @__PURE__ */ dual(2, (self, divisor) => {
   const selfString = self.toString();
@@ -11610,17 +11690,18 @@ function toScientificInteger(n) {
 var ReducerMax = /* @__PURE__ */ make((a, b) => Math.max(a, b), -Infinity);
 var ReducerMin = /* @__PURE__ */ make((a, b) => Math.min(a, b), Infinity);
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/String.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/String.js
 var String2 = globalThis.String;
 var trim = (self) => self.trim();
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Effect.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Effect.js
 var tryPromise2 = tryPromise;
 var succeed5 = succeed3;
 var succeedNone2 = succeedNone;
 var void_3 = void_;
 var fail5 = fail3;
 var failCauseSync2 = failCauseSync;
+var die2 = die;
 var try_3 = try_2;
 var fromResult2 = fromResult;
 var flatMap4 = flatMap3;
@@ -11638,7 +11719,7 @@ var flatMapEager2 = flatMapEager;
 var catchEager2 = catchEager;
 var fnUntracedEager2 = fnUntracedEager;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/schema/annotations.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/schema/annotations.js
 function resolve(ast) {
   return ast.checks ? ast.checks[ast.checks.length - 1].annotations : ast.annotations;
 }
@@ -11661,7 +11742,7 @@ var getExpected = /* @__PURE__ */ memoize((ast) => {
 });
 var annotationExcludedKeys = /* @__PURE__ */ new Set([SENTINELS_ANNOTATION_KEY, STRUCTURAL_ANNOTATION_KEY, "representation", "arbitrary", "brands", "toJsonSchema", "toCode", "toArbitrary", "toEquivalence", "toFormatter", "toCodec", "toCodecJson", "toCodecStringTree", "toCodecIso"]);
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/schema/parser.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/schema/parser.js
 var missing = /* @__PURE__ */ Symbol();
 var succeed6 = succeed4;
 var missingExit = /* @__PURE__ */ succeed6(missing);
@@ -11669,7 +11750,7 @@ var sameExit = /* @__PURE__ */ succeed6(missing);
 var toOption = (value3) => value3 === missing ? none2() : some2(value3);
 var fromOptionExit = (option2) => option2._tag === "None" ? missingExit : succeed6(option2.value);
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/SchemaIssue.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/SchemaIssue.js
 var TypeId7 = "~effect/SchemaIssue/Issue";
 function isIssue(u) {
   return hasProperty(u, TypeId7) && u[TypeId7] === TypeId7;
@@ -12012,7 +12093,7 @@ function findMessage(issue) {
   if (typeof message === "string") return message;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/schema/cause.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/schema/cause.js
 function getSchemaIssue(cause) {
   let issue;
   for (const reason of cause.reasons) {
@@ -12033,7 +12114,7 @@ function getSchemaIssueOrThrow(cause, message) {
   return issue;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/DateTime.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/DateTime.js
 var isDateTime2 = isDateTime;
 var isTimeZone2 = isTimeZone;
 var isTimeZoneOffset2 = isTimeZoneOffset;
@@ -12057,7 +12138,7 @@ var toEpochMillis2 = toEpochMillis;
 var formatIso2 = formatIso;
 var formatIsoZoned2 = formatIsoZoned;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/SchemaGetter.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/SchemaGetter.js
 var Getter = class _Getter extends Class {
   run;
   constructor(run2) {
@@ -12344,7 +12425,7 @@ function collectBracketPathEntries(isLeaf) {
   };
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/SchemaTransformation.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/SchemaTransformation.js
 var Middleware = class _Middleware {
   _tag = "Middleware";
   decode;
@@ -12585,7 +12666,7 @@ var dateTimeZonedFromString = /* @__PURE__ */ transformOrFail2({
   encode: (zoned) => succeed5(formatIsoZoned2(zoned))
 });
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/SchemaAST.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/SchemaAST.js
 function makeGuard(tag2) {
   return (ast) => ast._tag === tag2;
 }
@@ -12641,11 +12722,17 @@ var Declaration = class _Declaration extends Base2 {
   typeParameters;
   run;
   encodingChecks;
-  constructor(typeParameters, run2, annotations, checks, encoding, context2, encodingChecks) {
+  /**
+   * Parser factory {@link flip} swaps in, so a declaration can behave
+   * differently when encoding. `undefined` reuses {@link run}.
+   */
+  encodingRun;
+  constructor(typeParameters, run2, annotations, checks, encoding, context2, encodingChecks, encodingRun) {
     super(annotations, checks, encoding, context2);
     this.typeParameters = typeParameters;
     this.run = run2;
     this.encodingChecks = encodingChecks;
+    this.encodingRun = encodingRun;
   }
   /** @internal */
   getParser() {
@@ -12655,17 +12742,17 @@ var Declaration = class _Declaration extends Base2 {
       return (run2 ??= this.run(this.typeParameters))(input, this, options);
     };
   }
-  _rebuild(recur3, checks, encodingChecks) {
+  _rebuild(recur3, checks, encodingChecks, run2, encodingRun) {
     const tps = mapOrSame(this.typeParameters, recur3);
-    return tps === this.typeParameters && checks === this.checks && encodingChecks === this.encodingChecks ? this : new _Declaration(tps, this.run, this.annotations, checks, void 0, this.context, encodingChecks);
+    return tps === this.typeParameters && checks === this.checks && encodingChecks === this.encodingChecks && run2 === this.run && encodingRun === this.encodingRun ? this : new _Declaration(tps, run2, this.annotations, checks, void 0, this.context, encodingChecks, encodingRun);
   }
   /** @internal */
   recur(recur3) {
-    return this._rebuild(recur3, this.checks, this.encodingChecks);
+    return this._rebuild(recur3, this.checks, this.encodingChecks, this.run, this.encodingRun);
   }
   /** @internal */
   flip(recur3) {
-    return this._rebuild(recur3, this.encodingChecks, this.checks);
+    return this._rebuild(recur3, this.encodingChecks, this.checks, this.encodingRun ?? this.run, this.run);
   }
   /** @internal */
   getExpected() {
@@ -13332,13 +13419,7 @@ var Objects = class _Objects extends Base2 {
       onItem: (s, [key, index2]) => parseIndex(s, key, index2),
       step: (_s, _, exit3) => exit3._tag === "Failure" ? exit3 : void 0
     }) : void 0;
-    return fnUntracedEager2(function* (input, options) {
-      if (input === missing) {
-        return missing;
-      }
-      if (!(typeof input === "object" && input !== null && !Array.isArray(input))) {
-        return yield* fail5(new InvalidType(ast, input, options));
-      }
+    const compileMembers = () => {
       if (!properties) {
         properties = ast.propertySignatures.map((ps) => ({
           parser: compileConstructorDefault2(ps.type),
@@ -13351,6 +13432,16 @@ var Objects = class _Objects extends Base2 {
           parserValue: compileConstructorDefault2(is3.type)
         })) : void 0;
       }
+      return properties;
+    };
+    const fallback = fnUntracedEager2(function* (input, options) {
+      if (input === missing) {
+        return missing;
+      }
+      if (!(typeof input === "object" && input !== null && !Array.isArray(input))) {
+        return yield* fail5(new InvalidType(ast, input, options));
+      }
+      compileMembers();
       const record2 = input;
       const out = {};
       const state = {
@@ -13432,6 +13523,57 @@ var Objects = class _Objects extends Base2 {
       }
       return out;
     });
+    if (indexCount) return fallback;
+    const resume = (state, index2, pending) => {
+      const property = properties[index2];
+      return flatMap4(exit2(pending), (exit3) => {
+        const terminal = stepProperty(state, property, exit3);
+        if (terminal) return terminal;
+        const done2 = () => succeed6(state.out);
+        const eff = parseProperties(state, properties.slice(index2 + 1));
+        return eff ? flatMapEager2(eff, done2) : done2();
+      });
+    };
+    return (input, options) => {
+      if (input === missing) return missingExit;
+      if (options.errors === "all" || options.onExcessProperty !== void 0 || options.propertyOrder === "original" || options.concurrency !== void 0) {
+        return fallback(input, options);
+      }
+      if (!(typeof input === "object" && input !== null && !Array.isArray(input))) {
+        return fail5(new InvalidType(ast, input, options));
+      }
+      const props = compileMembers();
+      const record2 = input;
+      const out = {};
+      const state = {
+        ast,
+        input: record2,
+        out,
+        issues: void 0,
+        options
+      };
+      try {
+        for (let index2 = 0; index2 < props.length; index2++) {
+          const property = props[index2];
+          const name = property.name;
+          const hasKey2 = Object.hasOwn(record2, name);
+          const value3 = hasKey2 ? record2[name] : missing;
+          const exit3 = property.parser(value3, options);
+          if (!effectIsExit(exit3)) {
+            return resume(state, index2, exit3);
+          }
+          if (exit3 === sameExit) {
+            if (hasKey2) assignProperty(out, name, value3);
+            continue;
+          }
+          const terminal = stepProperty(state, property, exit3);
+          if (terminal) return terminal;
+        }
+      } catch (error) {
+        return die2(error);
+      }
+      return succeed6(out);
+    };
   }
   _rebuild(recur3, recurParameter, checks, encodingChecks) {
     const props = mapOrSame(this.propertySignatures, (ps) => {
@@ -13459,6 +13601,28 @@ var Objects = class _Objects extends Base2 {
     return "object";
   }
 };
+function stepProperty(s, p, exit3) {
+  if (exit3._tag === "Failure") {
+    return wrapPropertyKeyIssue(s, s.ast, p.name, exit3);
+  }
+  if (exit3 === sameExit) return;
+  const value3 = exit3[args];
+  if (value3 !== missing) {
+    assignProperty(s.out, p.name, value3);
+    return;
+  }
+  delete s.out[p.name];
+  if (!isOptional(p.type)) {
+    const issue = new Pointer([p.name], new MissingKey(p.type.context?.annotations));
+    if (s.options.errors === "all") {
+      if (s.issues) s.issues.push(issue);
+      else s.issues = [issue];
+      return;
+    } else {
+      return fail4(new Composite(s.ast, [issue], s.input, s.options));
+    }
+  }
+}
 var parseProperties = /* @__PURE__ */ iterateEager()({
   onItem(s, p) {
     if (!Object.hasOwn(s.input, p.name)) {
@@ -13468,28 +13632,7 @@ var parseProperties = /* @__PURE__ */ iterateEager()({
     assignProperty(s.out, p.name, value3);
     return p.parser(value3, s.options);
   },
-  step(s, p, exit3) {
-    if (exit3._tag === "Failure") {
-      return wrapPropertyKeyIssue(s, s.ast, p.name, exit3);
-    }
-    if (exit3 === sameExit) return;
-    const value3 = exit3[args];
-    if (value3 !== missing) {
-      assignProperty(s.out, p.name, value3);
-      return;
-    }
-    delete s.out[p.name];
-    if (!isOptional(p.type)) {
-      const issue = new Pointer([p.name], new MissingKey(p.type.context?.annotations));
-      if (s.options.errors === "all") {
-        if (s.issues) s.issues.push(issue);
-        else s.issues = [issue];
-        return;
-      } else {
-        return fail4(new Composite(s.ast, [issue], s.input, s.options));
-      }
-    }
-  }
+  step: stepProperty
 });
 function combineChecks(a, b) {
   if (!a) return b;
@@ -14572,7 +14715,7 @@ var StringTree = /* @__PURE__ */ new Declaration([], () => (input, ast, options)
 });
 var unknownToStringTree = /* @__PURE__ */ new Link(StringTree, /* @__PURE__ */ passthrough2());
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Chunk.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Chunk.js
 var TypeId10 = "~effect/collections/Chunk";
 function copy(src, srcPos, dest, destPos, len) {
   for (let i = srcPos; i < Math.min(src.length, srcPos + len); i++) {
@@ -14756,7 +14899,7 @@ var getUnsafe2 = /* @__PURE__ */ dual(2, (self, index2) => {
 });
 var size = (self) => self.length;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Schema.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Schema.js
 var Schema_exports = {};
 __export(Schema_exports, {
   Any: () => Any2,
@@ -15109,7 +15252,7 @@ __export(Schema_exports, {
   withDecodingDefaultTypeKey: () => withDecodingDefaultTypeKey
 });
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/graph.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/graph.js
 var TypeId11 = "~effect/collections/Graph";
 var toImpl = (graph) => graph;
 var edgeEquals = (type, self, that) => (type === "directed" ? self.source === that.source && self.target === that.target : self.source === that.source && self.target === that.target || self.source === that.target && self.target === that.source) && equals(self.data, that.data);
@@ -15230,7 +15373,7 @@ var hydrate = (snapshot2) => {
   return graph;
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Graph.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Graph.js
 var TypeId12 = TypeId11;
 var isGraph = (u) => hasProperty(u, TypeId12);
 var EdgeIdentity = class _EdgeIdentity {
@@ -15259,7 +15402,7 @@ var EdgeIdentity = class _EdgeIdentity {
   }
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/hashMap.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/hashMap.js
 var HashMapTypeId = "~effect/collections/HashMap";
 var SHIFT = 5;
 var BUCKET_SIZE = 1 << SHIFT;
@@ -15901,14 +16044,14 @@ var entries = (self) => {
 };
 var size2 = (self) => self.size;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/HashMap.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/HashMap.js
 var isHashMap2 = isHashMap;
 var fromIterable4 = fromIterable3;
 var entries2 = entries;
 var toEntries = (self) => Array.from(entries2(self));
 var size3 = size2;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/hashSet.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/hashSet.js
 var HashSetTypeId = "~effect/collections/HashSet";
 var HashSetProto = {
   [symbol]() {
@@ -15962,12 +16105,12 @@ var every2 = (self, predicate) => {
   return true;
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/HashSet.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/HashSet.js
 var fromIterable6 = fromIterable5;
 var isHashSet2 = isHashSet;
 var size5 = size4;
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/SchemaParser.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/SchemaParser.js
 function makeEffect(schema) {
   const parser = runWithCompiler(constructorCompiler, toType(schema.ast));
   return (input, options) => {
@@ -16265,7 +16408,7 @@ function makeParser(ast, compile, compileConstructorDefault2, constructorDefault
   };
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/schema/schema.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/schema/schema.js
 var TypeId13 = "~effect/Schema/Schema";
 function makeDeclarationReviver(id2, payloadSchema, revive) {
   return {
@@ -16310,7 +16453,7 @@ function make15(ast, options) {
   return self;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Struct.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Struct.js
 var Struct_exports = {};
 __export(Struct_exports, {
   Record: () => Record,
@@ -16413,7 +16556,7 @@ function Record(keys4, value3) {
   return out;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/UndefinedOr.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/UndefinedOr.js
 function makeReducer2(combiner2) {
   return make((self, that) => {
     if (self === void 0) return that;
@@ -16422,7 +16565,7 @@ function makeReducer2(combiner2) {
   }, void 0);
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/errors.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/errors.js
 function errorWithPath(message, path21) {
   if (path21.length > 0) {
     message += `
@@ -16431,7 +16574,7 @@ function errorWithPath(message, path21) {
   return new Error(message);
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/schema/toArbitrary.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/schema/toArbitrary.js
 var arbitraryMemoMap = /* @__PURE__ */ new WeakMap();
 var suspendDepthIdentifierMap = /* @__PURE__ */ new WeakMap();
 var emptyRecursionStack = [];
@@ -17093,7 +17236,7 @@ function base(ast, path21) {
   }
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/schema/toEquivalence.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/schema/toEquivalence.js
 var toEquivalence = /* @__PURE__ */ memoize((ast) => {
   return recur2(ast, []);
 });
@@ -17216,7 +17359,7 @@ function recur2(ast, path21) {
   }
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/JsonPointer.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/JsonPointer.js
 function escapeToken(token) {
   return token.replace(/~/g, "~0").replace(/\//g, "~1");
 }
@@ -17224,73 +17367,23 @@ function unescapeToken(token) {
   return token.replace(/~1/g, "/").replace(/~0/g, "~");
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/JsonSchema.js
-var RE_DEFS = /^#\/\$defs(?=\/|$)/;
-var DRAFT_04_COPY_KEYWORDS = /* @__PURE__ */ new Set(["$ref", "type", "required", "enum", "title", "description", "default", "format", "pattern", "minLength", "maxLength", "minItems", "maxItems", "minProperties", "maxProperties", "multipleOf", "uniqueItems"]);
-var DRAFT_07_COPY_KEYWORDS = /* @__PURE__ */ new Set([...DRAFT_04_COPY_KEYWORDS, "const", "examples", "readOnly", "writeOnly", "minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum"]);
-var DRAFT_07_SINGLE_SUBSCHEMA_KEYWORDS = /* @__PURE__ */ new Set(["not", "additionalProperties", "propertyNames"]);
-var MAP_SUBSCHEMA_KEYWORDS = /* @__PURE__ */ new Set(["properties", "patternProperties"]);
-var ARRAY_SUBSCHEMA_KEYWORDS = /* @__PURE__ */ new Set(["allOf", "anyOf", "oneOf"]);
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/JsonSchema.js
+var META_SCHEMA_URI_DRAFT_07 = "http://json-schema.org/draft-07/schema#";
+var META_SCHEMA_URI_DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
+function isMetaSchemaUri(value3, uri) {
+  return value3 === uri || value3 === (uri.endsWith("#") ? uri.slice(0, -1) : `${uri}#`);
+}
 function toDocumentDraft07(document) {
   return {
     dialect: "draft-07",
-    schema: toSchemaDraft07(document.schema),
-    definitions: map3(document.definitions, toSchemaDraft07)
+    ...convertDocument(document, draft07Adapter)
   };
 }
-function toSchemaDraft07(schema) {
-  return transformSchema(schema, (src) => {
-    rewriteSchemaRef(src, (ref) => ref.replace(RE_DEFS, "#/definitions"));
-    const out = {};
-    let prefixItems = void 0;
-    let items = void 0;
-    for (const k of Object.keys(src)) {
-      const v = src[k];
-      if (k === "required" && Array.isArray(v) && v.length === 0) continue;
-      if (DRAFT_07_COPY_KEYWORDS.has(k)) {
-        out[k] = v;
-        continue;
-      }
-      if (MAP_SUBSCHEMA_KEYWORDS.has(k) || ARRAY_SUBSCHEMA_KEYWORDS.has(k) || DRAFT_07_SINGLE_SUBSCHEMA_KEYWORDS.has(k)) {
-        out[k] = v;
-        continue;
-      }
-      switch (k) {
-        // Tuple handling (2020-12 form)
-        case "prefixItems":
-          prefixItems = v;
-          break;
-        case "items":
-          items = v;
-          break;
-        default:
-          break;
-      }
-    }
-    if (prefixItems !== void 0) {
-      if (Array.isArray(prefixItems)) {
-        out.items = prefixItems;
-        if (items !== void 0) out.additionalItems = items;
-      } else {
-        out.items = prefixItems;
-      }
-    } else if (items !== void 0) {
-      out.items = items;
-    }
-    const $ref = out.$ref;
-    if (typeof $ref === "string" && Object.keys(out).length > 1) {
-      delete out.$ref;
-      out.allOf = [{
-        $ref
-      }, ...Array.isArray(out.allOf) ? out.allOf : []];
-    }
-    return out;
-  });
-}
 function transformSchema(node, transform3) {
-  return walk(node);
-  function walk(node2) {
+  return walk(node, false, true);
+  function walk(node2, inheritedResource, isRoot = false) {
     if (!isObject(node2)) return node2;
+    const inEmbeddedResource = inheritedResource || !isRoot && createsResource(node2.$id);
     const out = {};
     for (const key of Object.keys(node2)) {
       const value3 = node2[key];
@@ -17300,13 +17393,13 @@ function transformSchema(node, transform3) {
         case "properties":
         case "patternProperties":
         case "dependentSchemas":
-          transformed = mapObject(value3, walk) ?? value3;
+          transformed = mapObject(value3, (value4) => walk(value4, inEmbeddedResource)) ?? value3;
           break;
         case "allOf":
         case "anyOf":
         case "oneOf":
         case "prefixItems":
-          transformed = Array.isArray(value3) ? value3.map(walk) : value3;
+          transformed = Array.isArray(value3) ? value3.map((value4) => walk(value4, inEmbeddedResource)) : value3;
           break;
         case "not":
         case "additionalProperties":
@@ -17319,31 +17412,340 @@ function transformSchema(node, transform3) {
         case "then":
         case "else":
         case "contentSchema":
-          transformed = walk(value3);
+          transformed = walk(value3, inEmbeddedResource);
       }
       assignProperty(out, key, transformed);
     }
-    return transform3(out);
+    transform3(out, inEmbeddedResource);
+    return out;
   }
 }
 function rewriteRefs(schema, rewrite) {
-  return transformSchema(schema, (schema2) => rewriteSchemaRef(schema2, rewrite));
+  return transformSchema(schema, (schema2) => {
+    rewriteSchemaRef(schema2, rewrite);
+  });
 }
 function rewriteSchemaRef(schema, rewrite) {
   if (typeof schema.$ref === "string") {
-    assignProperty(schema, "$ref", rewrite(schema.$ref));
+    assignProperty(schema, "$ref", rewrite(schema.$ref, "$ref"));
+  }
+  if (typeof schema.$dynamicRef === "string") {
+    assignProperty(schema, "$dynamicRef", rewrite(schema.$dynamicRef, "$dynamicRef"));
   }
-  return schema;
 }
 function mapObject(value3, f) {
-  return isObject(value3) ? map3(value3, f) : void 0;
+  if (!isObject(value3)) return void 0;
+  const out = {};
+  for (const key of Object.keys(value3)) {
+    assignProperty(out, key, f(value3[key], key));
+  }
+  return out;
+}
+function runConverter(adapter, options, use) {
+  const locations = /* @__PURE__ */ new Map();
+  const references = [];
+  let rootUri = ROOT_URI;
+  function convert(root, sourcePath = [], targetPath = []) {
+    if (sourcePath.length === 0 && options?.trackIds) {
+      const id2 = isObject(root) ? getResourceId(root) : void 0;
+      rootUri = resolveResourceUri(id2, ROOT_URI) ?? ROOT_URI;
+    }
+    return loop(root, sourcePath, targetPath, {
+      sourceRoot: [],
+      targetRoot: [],
+      uri: rootUri
+    });
+  }
+  function finish() {
+    for (const [out2, value3, sourceResource] of references) {
+      let reference = value3;
+      const resolved = resolveUrl(value3, sourceResource);
+      if (resolved !== void 0) {
+        const sourcePointer = parsePointerFragment(resolved.hash);
+        resolved.hash = "";
+        if (sourcePointer !== void 0) {
+          const targetPath = locations.get(locationKey(resolved.href, sourcePointer));
+          if (targetPath !== void 0) reference = relocateReference(value3, targetPath);
+        }
+      }
+      assignProperty(out2, "$ref", reference);
+    }
+  }
+  const out = use(convert);
+  finish();
+  return out;
+  function loop(node, sourcePath, targetPath, resourceScope) {
+    if (typeof node === "boolean") {
+      recordLocations(sourcePath, targetPath, resourceScope);
+      return options?.booleanAdapter?.(node) ?? node;
+    }
+    if (!isObject(node)) return node;
+    let currentResourceScope = resourceScope;
+    const id2 = getResourceId(node);
+    if (sourcePath.length > 0 && options?.trackIds && createsResource(id2)) {
+      const uri = resolveResourceUri(id2, resourceScope.uri);
+      if (uri !== void 0) {
+        currentResourceScope = {
+          parent: resourceScope,
+          sourceRoot: sourcePath,
+          targetRoot: targetPath,
+          uri
+        };
+      }
+    }
+    recordLocations(sourcePath, targetPath, currentResourceScope);
+    const currentResource = currentResourceScope.uri;
+    const context2 = {
+      isDocumentRoot: sourcePath.length === 0,
+      schema(value3, sourceKey, targetKey = sourceKey) {
+        return loop(value3, [...sourcePath, sourceKey], [...targetPath, targetKey], currentResourceScope);
+      },
+      schemaAt(value3, sourceSuffix, targetSuffix) {
+        return loop(value3, [...sourcePath, ...sourceSuffix], [...targetPath, ...targetSuffix], currentResourceScope);
+      },
+      schemaArray(value3, sourceKey, targetKey = sourceKey) {
+        return Array.isArray(value3) ? value3.map((item, index2) => loop(item, [...sourcePath, sourceKey, String(index2)], [...targetPath, targetKey, String(index2)], currentResourceScope)) : value3;
+      },
+      schemaMap(value3, sourceKey, targetKey = sourceKey) {
+        if (!isObject(value3)) return value3;
+        return mapObject(value3, (item, key) => loop(item, [...sourcePath, sourceKey, key], [...targetPath, targetKey, key], currentResourceScope));
+      },
+      reference(out2, value3) {
+        if (typeof value3 === "string") {
+          references.push([out2, value3, currentResource]);
+        } else {
+          assignProperty(out2, "$ref", value3);
+        }
+      }
+    };
+    return adapter(node, context2);
+  }
+  function getResourceId(schema) {
+    return options?.ignoreRefSiblings === true && typeof schema.$ref === "string" ? void 0 : schema.$id;
+  }
+  function recordLocations(sourcePath, targetPath, scope2) {
+    if (scope2.parent !== void 0) recordLocations(sourcePath, targetPath, scope2.parent);
+    locations.set(locationKey(scope2.uri, sourcePath.slice(scope2.sourceRoot.length)), targetPath.slice(scope2.targetRoot.length));
+  }
+}
+var ROOT_URI = "https://effect.invalid/.json-schema/";
+function resolveUrl(value3, base2) {
+  return URL.canParse(value3, base2) ? new URL(value3, base2) : void 0;
+}
+function resolveResourceUri(value3, base2) {
+  if (typeof value3 !== "string") return void 0;
+  const url = resolveUrl(value3, base2);
+  if (url === void 0) return void 0;
+  url.hash = "";
+  return url.href;
+}
+function parsePointerFragment(hash2) {
+  if (hash2.length === 0) return [];
+  let pointer;
+  try {
+    pointer = decodeURIComponent(hash2.slice(1));
+  } catch {
+    return void 0;
+  }
+  if (!pointer.startsWith("/")) return void 0;
+  return /~(?:[^01]|$)/.test(pointer) ? void 0 : pointer.slice(1).split("/").map(unescapeToken);
+}
+function relocateReference(reference, targetPath) {
+  const index2 = reference.indexOf("#");
+  if (index2 === -1 && targetPath.length === 0) return reference;
+  const uri = index2 === -1 ? reference : reference.slice(0, index2);
+  return `${uri}${formatPointerFragment(targetPath)}`;
+}
+function formatPointerFragment(path21) {
+  return path21.length === 0 ? "#" : `#/${path21.map((token) => encodeURI(escapeToken(token)).replace(/#/g, "%23")).join("/")}`;
+}
+function locationKey(resource, pointer) {
+  return `${resource}\0${JSON.stringify(pointer)}`;
+}
+function createsResource(id2) {
+  return typeof id2 === "string" && id2.length > 0 && id2[0] !== "#";
+}
+function convertDocument(document, adapter, options) {
+  return runConverter(adapter, {
+    ...options,
+    trackIds: true
+  }, (convert) => ({
+    schema: convert(document.schema),
+    definitions: mapObject(document.definitions, (definition, key) => convert(definition, ["$defs", key], ["definitions", key]))
+  }));
+}
+var SCHEMA_MAP_KEYWORDS = /* @__PURE__ */ new Set(["properties", "patternProperties"]);
+var SCHEMA_ARRAY_KEYWORDS = /* @__PURE__ */ new Set(["allOf", "anyOf", "oneOf"]);
+var JSON_SCHEMA_SINGLE_KEYWORDS = /* @__PURE__ */ new Set(["not", "additionalProperties", "propertyNames", "contains", "if", "then", "else", "contentSchema"]);
+function convertSubschemaKeyword(out, key, value3, context2, singleKeywords, mapKeywords = SCHEMA_MAP_KEYWORDS) {
+  let converted;
+  if (mapKeywords.has(key)) converted = context2.schemaMap(value3, key);
+  else if (SCHEMA_ARRAY_KEYWORDS.has(key)) converted = context2.schemaArray(value3, key);
+  else if (singleKeywords.has(key)) converted = context2.schema(value3, key);
+  else return false;
+  assignProperty(out, key, converted);
+  return true;
+}
+var PRE_2020_TO_2020_COLLISIONS = ["$anchor", "$defs", "$dynamicAnchor", "$dynamicRef", "$vocabulary", "contentSchema", "dependentRequired", "dependentSchemas", "maxContains", "minContains", "prefixItems", "unevaluatedItems", "unevaluatedProperties"];
+var DRAFT_07_TO_2020_COLLISIONS = [...PRE_2020_TO_2020_COLLISIONS, "deprecated"];
+var OPEN_API_30_TO_2020_COLLISIONS = [...PRE_2020_TO_2020_COLLISIONS, "$comment", "$id", "$schema", "const", "contains", "contentEncoding", "contentMediaType", "else", "examples", "if", "patternProperties", "propertyNames", "then"];
+var ANCHOR_REGEXP = /^[A-Za-z_][-A-Za-z0-9._]*$/;
+var LEGACY_ID_FRAGMENT_REGEXP = /^[A-Za-z][-A-Za-z0-9._:]*$/;
+function unsupported(keyword, dialect, details) {
+  throw new Error(`Cannot convert JSON Schema keyword "${keyword}" to ${dialect}: ${details}`);
+}
+function rejectKeywordCollisions(source, keywords, targetDialect, sourceDialect) {
+  for (const keyword of keywords) {
+    if (Object.hasOwn(source, keyword)) {
+      unsupported(keyword, targetDialect, `it is not active in ${sourceDialect} but would become active in the target`);
+    }
+  }
+}
+var DRAFT_07_TARGET_COLLISIONS = ["additionalItems", "definitions", "dependencies"];
+function convertMetaSchemaKeyword(out, value3, context2, targetUri, targetDialect) {
+  if (context2.isDocumentRoot) {
+    assignProperty(out, "$schema", isMetaSchemaUri(value3, META_SCHEMA_URI_DRAFT_2020_12) ? targetUri : value3);
+  } else if (!isMetaSchemaUri(value3, META_SCHEMA_URI_DRAFT_2020_12)) {
+    unsupported("$schema", targetDialect, "an embedded resource cannot declare a different dialect");
+  }
+}
+function draft07Adapter(source, context2) {
+  rejectKeywordCollisions(source, DRAFT_07_TARGET_COLLISIONS, "Draft-07", "Draft 2020-12");
+  const out = {};
+  let reference = void 0;
+  let prefixItems = void 0;
+  let items = void 0;
+  for (const key of Object.keys(source)) {
+    const value3 = source[key];
+    if (convertSubschemaKeyword(out, key, value3, context2, JSON_SCHEMA_SINGLE_KEYWORDS)) continue;
+    switch (key) {
+      case "$ref":
+        reference = value3;
+        break;
+      case "$schema":
+        convertMetaSchemaKeyword(out, value3, context2, META_SCHEMA_URI_DRAFT_07, "Draft-07");
+        break;
+      case "$id":
+      case "$anchor":
+        break;
+      case "$defs":
+        assignProperty(out, "definitions", context2.schemaMap(value3, key, "definitions"));
+        break;
+      case "prefixItems":
+        prefixItems = value3;
+        break;
+      case "items":
+        items = value3;
+        break;
+      case "dependentRequired":
+      case "dependentSchemas":
+      case "minContains":
+      case "maxContains":
+        break;
+      case "$dynamicRef":
+      case "$dynamicAnchor":
+      case "$vocabulary":
+      case "unevaluatedProperties":
+      case "unevaluatedItems":
+        unsupported(key, "Draft-07", "the target dialect has no equivalent");
+      case "required":
+        if (Array.isArray(value3) && value3.length === 0) break;
+        assignProperty(out, key, value3);
+        break;
+      default:
+        assignProperty(out, key, value3);
+    }
+  }
+  convertTuple(out, prefixItems, items, context2);
+  if (Object.hasOwn(source, "contains")) {
+    const minContains = source.minContains;
+    const maxContains = source.maxContains;
+    if (minContains !== void 0 && minContains !== 1 || maxContains !== void 0) {
+      unsupported("minContains/maxContains", "Draft-07", "contains cardinality cannot be represented");
+    }
+    if (Object.hasOwn(source, "minContains")) assignProperty(out, "minContains", minContains);
+  } else {
+    if (Object.hasOwn(source, "minContains")) assignProperty(out, "minContains", source.minContains);
+    if (Object.hasOwn(source, "maxContains")) assignProperty(out, "maxContains", source.maxContains);
+  }
+  convertDependencies(source, out, context2, "draft-07");
+  convertLegacyId(source, out, "$id", "Draft-07");
+  convertReference(out, reference, context2);
+  return out;
+}
+function convertTuple(out, prefixItems, items, context2) {
+  if (prefixItems === void 0) {
+    if (items !== void 0) assignProperty(out, "items", context2.schema(items, "items"));
+    return;
+  }
+  assignProperty(out, "items", context2.schemaArray(prefixItems, "prefixItems", "items"));
+  if (items !== void 0) {
+    assignProperty(out, "additionalItems", context2.schema(items, "items", "additionalItems"));
+  }
+}
+function convertReference(out, reference, context2) {
+  if (reference === void 0) return;
+  if (typeof reference === "string" && Object.keys(out).length > 0) {
+    const referenceSchema = {};
+    context2.reference(referenceSchema, reference);
+    appendAllOf(out, referenceSchema);
+  } else {
+    context2.reference(out, reference);
+  }
+}
+function convertDependencies(source, out, context2, targetDialect) {
+  const dependentRequired = isObject(source.dependentRequired) ? source.dependentRequired : void 0;
+  const dependentSchemas = isObject(source.dependentSchemas) ? source.dependentSchemas : void 0;
+  if (dependentRequired === void 0 && dependentSchemas === void 0) return;
+  const dependencies = {};
+  const keys4 = /* @__PURE__ */ new Set([...Object.keys(dependentRequired ?? {}), ...Object.keys(dependentSchemas ?? {})]);
+  for (const key of keys4) {
+    const required2 = dependentRequired?.[key];
+    const dependency = dependentSchemas?.[key];
+    const omitRequired = targetDialect === "draft-04" && Array.isArray(required2) && required2.length === 0;
+    if (dependency === void 0) {
+      if (!omitRequired) assignProperty(dependencies, key, required2);
+    } else if (required2 === void 0 || omitRequired) {
+      assignProperty(dependencies, key, context2.schemaAt(dependency, ["dependentSchemas", key], ["dependencies", key]));
+    } else {
+      assignProperty(dependencies, key, {
+        allOf: [context2.schemaAt(dependency, ["dependentSchemas", key], ["dependencies", key, "allOf", "0"]), {
+          required: required2
+        }]
+      });
+    }
+  }
+  if (Object.keys(dependencies).length > 0) assignProperty(out, "dependencies", dependencies);
+}
+function appendAllOf(out, schema) {
+  if (Array.isArray(out.allOf)) out.allOf.push(schema);
+  else assignProperty(out, "allOf", [schema]);
+}
+function convertLegacyId(source, out, targetKey, dialect) {
+  const id2 = source.$id;
+  const anchor = source.$anchor;
+  if (anchor === void 0) {
+    if (id2 !== void 0) assignProperty(out, targetKey, id2);
+    return;
+  }
+  if (typeof anchor !== "string" || !ANCHOR_REGEXP.test(anchor)) {
+    unsupported("$anchor", dialect, "the anchor is not valid");
+  }
+  if (!LEGACY_ID_FRAGMENT_REGEXP.test(anchor)) {
+    unsupported("$anchor", dialect, "the anchor cannot be represented as a plain-name fragment identifier");
+  }
+  if (id2 === void 0) {
+    assignProperty(out, targetKey, `#${anchor}`);
+  } else {
+    unsupported("$anchor", dialect, "it cannot be combined with the schema $id");
+  }
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/RegExp.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/RegExp.js
 var RegExp2 = globalThis.RegExp;
 var escape = (string3) => string3.replace(/[/\\^$*+?.()|[\]{}]/g, "\\$&");
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/schema/toJsonSchemaDocument.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/schema/toJsonSchemaDocument.js
 var jsonSchemaAnnotationExcludedKeys = /* @__PURE__ */ new Set([...annotationExcludedKeys, IDENTIFIER_FALLBACK_KEY, ...jsonSchemaAnnotationKeys]);
 function collectJsonSchemaAnnotations(annotations, options) {
   if (annotations === void 0) return void 0;
@@ -17786,7 +18188,7 @@ function compileJsonSchema(representations, rootPaths, references, options) {
         if (types.length === 0) return {
           not: {}
         };
-        if (types.length > 1) {
+        if (representation.mode === "anyOf" && types.length > 1) {
           const compacted = compactEnums(types);
           if (compacted !== void 0) return compacted;
         }
@@ -17880,7 +18282,7 @@ function toJsonSchemaDocument(document, options) {
   };
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/schema/toRepresentation.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/schema/toRepresentation.js
 var defaultReferencePolicy = ({
   identifier: identifier2
 }) => identifier2;
@@ -18195,7 +18597,7 @@ function toRepresentations(asts, options) {
   }
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/JsonPatch.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/JsonPatch.js
 function get4(oldValue, newValue) {
   const patches = [];
   getLoop(oldValue, newValue, "", patches);
@@ -18376,7 +18778,7 @@ function rebuildFromStack(stack, newParent) {
   return acc;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Optic.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Optic.js
 function makeIso(get5, set2) {
   return make16(primitiveNode("Iso", get5, set2));
 }
@@ -18722,7 +19124,7 @@ function id() {
   return identityIso;
 }
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/internal/redacted.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/internal/redacted.js
 var redactedRegistry = /* @__PURE__ */ new WeakMap();
 var value = (self) => {
   if (redactedRegistry.has(self)) {
@@ -18732,7 +19134,7 @@ var value = (self) => {
   }
 };
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Redacted.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Redacted.js
 var TypeId14 = "~effect/data/Redacted";
 var isRedacted = (u) => hasProperty(u, TypeId14);
 var make17 = (value3, options) => {
@@ -18765,7 +19167,7 @@ var Proto3 = {
 var value2 = value;
 var makeEquivalence5 = (isEquivalent) => make2((x, y) => isEquivalent(value2(x), value2(y)));
 
-// ../../node_modules/.bun/effect@4.0.0-rc.111/node_modules/effect/dist/Schema.js
+// ../../node_modules/.bun/effect@4.0.0-rc.112/node_modules/effect/dist/Schema.js
 var TypeId15 = TypeId13;
 function declareConstructor() {
   return (typeParameters, run2, annotations) => {
@@ -18796,9 +19198,15 @@ var SchemaErrorTypeId = "~effect/SchemaError/SchemaError";
 var SchemaError = class extends (/* @__PURE__ */ TaggedError2("SchemaError")) {
   [SchemaErrorTypeId] = SchemaErrorTypeId;
   constructor(issue) {
-    super({
-      issue
-    });
+    const stackTraceLimit = getStackTraceLimit();
+    setStackTraceLimit(0);
+    try {
+      super({
+        issue
+      });
+    } finally {
+      setStackTraceLimit(stackTraceLimit);
+    }
   }
   get message() {
     return defaultFormatter(this.issue);
@@ -18915,6 +19323,9 @@ function decodeUnknownEffect2(schema, options) {
   };
 }
 function fromIssueEffect(self) {
+  if (effectIsExit(self)) {
+    return fromIssueExit(self);
+  }
   return catchCause2(self, (cause) => failCauseSync2(() => map6(cause, (issue) => new SchemaError(issue))));
 }
 var decodeEffect2 = decodeUnknownEffect2;
@@ -19390,7 +19801,8 @@ function toTaggedUnion(tag2) {
       discriminants,
       isAnyOf,
       guards,
-      match: match7
+      match: match7,
+      matchOrElse
     });
     function walk(schema) {
       const ast = schema.ast;
@@ -19429,6 +19841,23 @@ function toTaggedUnion(tag2) {
       const handler = Object.hasOwn(cases2, key) ? cases2[key] : void 0;
       return handler(value3);
     }
+    function matchOrElse() {
+      if (arguments.length === 2) {
+        const cases3 = arguments[0];
+        const orElse2 = arguments[1];
+        return function(value4) {
+          const key2 = value4[tag2];
+          const handler2 = Object.hasOwn(cases3, key2) ? cases3[key2] ?? orElse2 : orElse2;
+          return handler2(value4);
+        };
+      }
+      const value3 = arguments[0];
+      const cases2 = arguments[1];
+      const orElse = arguments[2];
+      const key = value3[tag2];
+      const handler = Object.hasOwn(cases2, key) ? cases2[key] ?? orElse : orElse;
+      return handler(value3);
+    }
   };
 }
 function TaggedUnion(casesByTag) {
@@ -19443,13 +19872,15 @@ function TaggedUnion(casesByTag) {
   const {
     guards,
     isAnyOf,
-    match: match7
+    match: match7,
+    matchOrElse
   } = toTaggedUnion("_tag")(union5);
   return make18(union5.ast, {
     cases,
     isAnyOf,
     guards,
-    match: match7
+    match: match7,
+    matchOrElse
   });
 }
 function Opaque() {
@@ -23285,6 +23716,7 @@ var RPC_METHODS = {
   runtimeRefreshProviders: "runtime.refreshProviders",
   appStateGet: "appState.get",
   appStatePatch: "appState.patch",
+  trialExperienceStart: "trialExperience.start",
   appSettingsGet: "appSettings.get",
   appSettingsUpdate: "appSettings.update",
   officialCodexSetAutoControl: "officialCodex.setAutoControl",
@@ -23468,6 +23900,7 @@ var DesktopRpcRequestBody = Schema_exports.Union([
   // Desktop dashboard/runtime methods
   tagRequestBody(RPC_METHODS.appStateGet, Schema_exports.Struct({})),
   tagRequestBody(RPC_METHODS.appStatePatch, Schema_exports.Struct({ patch: Schema_exports.Unknown })),
+  tagRequestBody(RPC_METHODS.trialExperienceStart, Schema_exports.Struct({ interactiveAt: Schema_exports.Number })),
   tagRequestBody(RPC_METHODS.appSettingsGet, Schema_exports.Struct({})),
   tagRequestBody(
     RPC_METHODS.appSettingsUpdate,
@@ -25532,7 +25965,6 @@ var CODEX_BRIDGE_PROBE_TTL_MS = 5e3;
 var CODEX_BRIDGE_LAUNCH_WAIT_MS = 3e4;
 var CODEX_LAUNCH_RUNAWAY_STARTUP_MS = 18e4;
 var CODEX_LAUNCH_RUNAWAY_STARTUP_SAMPLE_MS = 2e3;
-var CODEX_LAUNCH_RUNAWAY_LIFETIME_SAMPLE_MS = 5e3;
 var CODEX_LAUNCH_RUNAWAY_THREAD_LIMIT = 180;
 var CODEX_LAUNCH_RUNAWAY_DESCENDANT_LIMIT = 96;
 var CODEX_LAUNCH_RUNAWAY_CONSECUTIVE_SAMPLES = 3;
@@ -25568,6 +26000,28 @@ function logOfficialCodexTakeoverPhase(trace, candidate, phase, context2 = {}) {
     ...context2
   });
 }
+function normalizeOfficialCodexBridgeActionResult(value3) {
+  if (!value3 || typeof value3 !== "object") {
+    return {
+      status: "failed",
+      message: "The action did not return a verified result."
+    };
+  }
+  const record2 = value3;
+  const status = record2.status === "completed" || record2.status === "pending" || record2.status === "failed" ? record2.status : null;
+  const message = typeof record2.message === "string" ? record2.message.trim().slice(0, 240) : "";
+  if (!status || !message) {
+    return {
+      status: "failed",
+      message: "The action returned an invalid result."
+    };
+  }
+  return {
+    status,
+    message,
+    ...record2.mode === "shared-switch" || record2.mode === "isolated-open" ? { mode: record2.mode } : {}
+  };
+}
 var officialCodexBridgeActionHandler = null;
 var bridgeActionListeners = /* @__PURE__ */ new Map();
 var bridgeActionListenerReady = /* @__PURE__ */ new Map();
@@ -25701,7 +26155,7 @@ async function officialCodexLiveLoginExpiryGuardMatches(guard) {
   if (account.status !== "observed") {
     return "unknown";
   }
-  return expectedAccountMatches(
+  return officialCodexExpectedAccountMatches(
     {
       email: null,
       accountId: guard.accountId,
@@ -26740,6 +27194,9 @@ function createBridgeApplyQolExpression(settings) {
     const conversationTimelineEnabled = ${JSON.stringify(settings.conversationTimelineEnabled === true)};
     const inCodexStatusEnabled = ${JSON.stringify(settings.inCodexStatusEnabled === true)};
     const handoffEnabled = ${JSON.stringify(settings.handoffChipEnabled !== false)};
+    const accountActionMode = ${JSON.stringify(
+    settings.overlayAccountActionMode === "shared-switch" ? "shared-switch" : "isolated-open"
+  )};
     let currentAutoRollDecision = ${JSON.stringify(settings.autoRollDecision ?? null)};
     let currentOverlayAutoRollEnabled = ${JSON.stringify(
     typeof settings.overlayAutoRollEnabled === "boolean" ? settings.overlayAutoRollEnabled : null
@@ -27282,7 +27739,7 @@ function createBridgeApplyQolExpression(settings) {
       const title = document.createElement("span");
       // Names the job, not the brand. The list holds OpenAI accounts and
       // custom-model profiles, so "accounts" was also the wrong word.
-      title.textContent = "Switch profile";
+      title.textContent = accountActionMode === "shared-switch" ? "Switch profile" : "Open profile";
       const actionStatus = document.createElement("span");
       actionStatus.className = "codexuse-action-status";
       actionStatus.setAttribute("data-codexuse-action-status", "true");
@@ -27429,7 +27886,12 @@ function createBridgeApplyQolExpression(settings) {
           row.appendChild(meter);
         }
         if (canSwitch) {
-          row.setAttribute("aria-label", "Switch to " + label.textContent);
+          row.setAttribute(
+            "aria-label",
+            accountActionMode === "shared-switch"
+              ? "Switch to " + label.textContent
+              : "Open " + label.textContent + " in isolated window"
+          );
           row.addEventListener("click", (event) => {
             event.preventDefault();
             event.stopPropagation();
@@ -28967,7 +29429,8 @@ function normalizeOfficialCodexQolSettings2(value3) {
     canonicalSyncLine: typeof value3.canonicalSyncLine === "string" && value3.canonicalSyncLine.trim() ? value3.canonicalSyncLine.trim().slice(0, 40) : null,
     autoRollDecision: normalizeOverlayAutoRollDecision(value3.autoRollDecision),
     overlayAutoRollEnabled: typeof value3.overlayAutoRollEnabled === "boolean" ? value3.overlayAutoRollEnabled : null,
-    overlayRunningThreadHandoffEnabled: typeof value3.overlayRunningThreadHandoffEnabled === "boolean" ? value3.overlayRunningThreadHandoffEnabled : null
+    overlayRunningThreadHandoffEnabled: typeof value3.overlayRunningThreadHandoffEnabled === "boolean" ? value3.overlayRunningThreadHandoffEnabled : null,
+    overlayAccountActionMode: value3.overlayAccountActionMode === "shared-switch" || value3.overlayAccountActionMode === "isolated-open" ? value3.overlayAccountActionMode : null
   };
 }
 function hasActiveQolSettings(settings) {
@@ -29157,7 +29620,7 @@ function createBridgeInstallExpression() {
       const action = request.action;
       state.lastActionRequest = null;
       if (result && typeof result === "object" && result.status === "failed") {
-        const message = typeof result.reason === "string" && result.reason ? result.reason : "Did not switch";
+        const message = typeof result.message === "string" && result.message ? result.message : "The action failed";
         state.lastActionMessage = message;
         if (action === "setting" && typeof request.settingKey === "string" && typeof request.settingValue === "boolean") {
           const host = document.getElementById("codexuse-profile-menu-section");
@@ -29172,14 +29635,9 @@ function createBridgeInstallExpression() {
         settleActionMessage(message);
         return true;
       }
-      const message =
-        action === "switch" ? "Switched"
-          : action === "continue" ? "Thread moved"
-          : action === "auto-roll-accept" ? "Switched"
-          : action === "auto-roll-cancel" ? "Staying here"
-          : action === "restart" ? "Restarted"
-          : action === "setting" ? "Saved"
-          : "Done";
+      const message = result && typeof result.message === "string" && result.message
+        ? result.message
+        : "The action returned an invalid result.";
       state.lastActionMessage = message;
       settleActionMessage(message);
       return true;
@@ -30175,6 +30633,7 @@ async function startOfficialCodexBridgeActionListenerOnce(args2) {
         autoRollDecisionId,
         settingKey,
         settingValue,
+        sourceProcessEpoch: args2.processEpoch,
         cdpPort: args2.cdpPort,
         route: typeof payload.route === "string" ? sanitizeBridgeActionRoute(payload.route) : null,
         activeThreadId: normalizeOfficialCodexThreadId(payload.activeThreadId),
@@ -30184,26 +30643,30 @@ async function startOfficialCodexBridgeActionListenerOnce(args2) {
       void (async () => {
         let result2;
         if (!handler) {
-          result2 = { status: "failed", reason: "Action handler is reconnecting" };
+          result2 = { status: "failed", message: "The action handler is reconnecting." };
         } else {
           try {
-            result2 = await handler(request);
+            result2 = normalizeOfficialCodexBridgeActionResult(
+              await handler(request)
+            );
           } catch (error) {
-            const reason = sanitizeUserFacingError(error) ?? "Action failed";
+            const reason = sanitizeUserFacingError(error) ?? "The action failed.";
             console.warn("[official-codex-bridge-action] Handler failed.", {
               action: request.action,
               error: reason
             });
-            result2 = { status: "failed", reason };
+            result2 = { status: "failed", message: reason };
           }
         }
         let serialized;
         try {
-          serialized = JSON.stringify(result2 ?? { status: "ok" }) ?? "null";
+          serialized = JSON.stringify(
+            normalizeOfficialCodexBridgeActionResult(result2)
+          );
         } catch {
           serialized = JSON.stringify({
             status: "failed",
-            reason: "Action result was invalid"
+            message: "The action result was invalid."
           });
         }
         send("Runtime.evaluate", {
@@ -30345,7 +30808,10 @@ async function reapplyDesiredBridgeSettings(instance, bridge, allowAnyPageTarget
       const qolSettings = normalizeOfficialCodexQolSettings2(
         instance.desiredQolSettings
       );
-      const qolExpression = createBridgeApplyQolExpression(qolSettings);
+      const qolExpression = createBridgeApplyQolExpression({
+        ...qolSettings,
+        overlayAccountActionMode: instance.profileHome === null ? "shared-switch" : "isolated-open"
+      });
       const qolValue = await evaluateOfficialCodexBridgeCommand(
         target.webSocketDebuggerUrl,
         "applyQol",
@@ -30976,82 +31442,64 @@ async function readProcessThreadCount(pid) {
   }).length;
   return threadCount > 0 ? threadCount : null;
 }
-function startOfficialCodexLaunchRunawayWatchdog(args2) {
+function startBoundedOfficialCodexLaunchRunawayWatchdog(args2) {
+  const now2 = args2.now ?? Date.now;
+  const wait = args2.wait ?? sleep3;
+  const deadline = now2() + (args2.startupDeadlineMs ?? CODEX_LAUNCH_RUNAWAY_STARTUP_MS);
+  const sampleMs = args2.sampleMs ?? CODEX_LAUNCH_RUNAWAY_STARTUP_SAMPLE_MS;
+  const consecutiveSampleLimit = args2.consecutiveSampleLimit ?? CODEX_LAUNCH_RUNAWAY_CONSECUTIVE_SAMPLES;
+  const threadLimit = args2.threadLimit ?? CODEX_LAUNCH_RUNAWAY_THREAD_LIMIT;
+  const descendantLimit = args2.descendantLimit ?? CODEX_LAUNCH_RUNAWAY_DESCENDANT_LIMIT;
+  const inspectionFailureLimit = args2.inspectionFailureLimit ?? CODEX_LAUNCH_RUNAWAY_INSPECTION_FAILURE_LIMIT;
+  const evidenceTtlMs = args2.evidenceTtlMs ?? CODEX_LAUNCH_RUNAWAY_EVIDENCE_TTL_MS;
   let cancelled = false;
   const result2 = (async () => {
     let consecutiveRunawaySamples = 0;
     let lastRunawaySampleAt = null;
     let consecutiveInspectionFailures = 0;
-    const startedWatchingAt = Date.now();
-    while (!cancelled) {
-      await sleep3(
-        Date.now() - startedWatchingAt < CODEX_LAUNCH_RUNAWAY_STARTUP_MS ? CODEX_LAUNCH_RUNAWAY_STARTUP_SAMPLE_MS : CODEX_LAUNCH_RUNAWAY_LIFETIME_SAMPLE_MS
-      );
-      if (cancelled) return null;
-      let rows;
+    while (!cancelled && now2() < deadline) {
+      await wait(Math.min(sampleMs, Math.max(0, deadline - now2())));
+      if (cancelled || now2() >= deadline) return null;
+      let sample;
       try {
-        rows = await readProcessRows();
+        sample = await args2.inspect();
       } catch {
         consecutiveInspectionFailures += 1;
-        if (consecutiveInspectionFailures >= CODEX_LAUNCH_RUNAWAY_INSPECTION_FAILURE_LIMIT) {
-          console.warn(
-            "[official-codex-launch] Runaway watchdog stopped after persistent process-inspection failures.",
-            {
-              pid: args2.pid,
-              startedAt: args2.startedAt,
-              cdpPort: args2.cdpPort,
-              consecutiveInspectionFailures
-            }
-          );
+        if (consecutiveInspectionFailures >= inspectionFailureLimit) {
+          args2.onInspectionFailureLimit?.(consecutiveInspectionFailures);
           return null;
         }
         continue;
       }
       consecutiveInspectionFailures = 0;
-      const mainRow = rows.find((row) => row.pid === args2.pid) ?? null;
-      if (!mainRow || !isMainProcessRow(mainRow, args2.candidate) || mainRow.startedAt !== args2.startedAt || !remoteDebuggingPortMatches(mainRow.args, args2.cdpPort)) {
+      if (!sample.epochMatches) {
         return null;
       }
-      const descendantProcessCount = getDescendantPids(args2.pid, rows).length;
-      const threadCount = await readProcessThreadCount(args2.pid);
-      const runawaySample = threadCount !== null && threadCount >= CODEX_LAUNCH_RUNAWAY_THREAD_LIMIT || descendantProcessCount >= CODEX_LAUNCH_RUNAWAY_DESCENDANT_LIMIT;
+      const runawaySample = sample.threadCount !== null && sample.threadCount >= threadLimit || sample.descendantProcessCount >= descendantLimit;
       if (runawaySample) {
         consecutiveRunawaySamples += 1;
-        lastRunawaySampleAt = Date.now();
-      } else if (threadCount !== null) {
+        lastRunawaySampleAt = now2();
+      } else if (sample.threadCount !== null) {
         consecutiveRunawaySamples = 0;
         lastRunawaySampleAt = null;
-      } else if (lastRunawaySampleAt !== null && Date.now() - lastRunawaySampleAt > CODEX_LAUNCH_RUNAWAY_EVIDENCE_TTL_MS) {
+      } else if (lastRunawaySampleAt !== null && now2() - lastRunawaySampleAt > evidenceTtlMs) {
         consecutiveRunawaySamples = 0;
         lastRunawaySampleAt = null;
       }
-      if (consecutiveRunawaySamples < CODEX_LAUNCH_RUNAWAY_CONSECUTIVE_SAMPLES) {
+      if (consecutiveRunawaySamples < consecutiveSampleLimit) {
         continue;
       }
-      const remainingPids = await stopOfficialCodexProcessEpoch({
-        candidate: args2.candidate,
-        pid: args2.pid,
-        startedAt: args2.startedAt,
-        cdpPort: args2.cdpPort
-      }).catch(() => [args2.pid]);
-      console.warn("[official-codex-launch] Stopped runaway managed launch.", {
-        pid: args2.pid,
-        startedAt: args2.startedAt,
-        cdpPort: args2.cdpPort,
-        threadCount,
-        descendantProcessCount,
-        remainingPids
-      });
-      return { threadCount, descendantProcessCount, remainingPids };
+      const runaway = {
+        threadCount: sample.threadCount,
+        descendantProcessCount: sample.descendantProcessCount,
+        remainingPids: await args2.stop()
+      };
+      args2.onRunaway?.(runaway);
+      return runaway;
     }
     return null;
   })().catch((error) => {
-    console.warn("[official-codex-launch] Runaway watchdog failed.", {
-      pid: args2.pid,
-      startedAt: args2.startedAt,
-      cdpPort: args2.cdpPort,
-      error: sanitizeUserFacingError(error) ?? "process-inspection-failed"
-    });
+    args2.onError?.(error);
     return null;
   });
   return {
@@ -31061,6 +31509,59 @@ function startOfficialCodexLaunchRunawayWatchdog(args2) {
     }
   };
 }
+function startOfficialCodexLaunchRunawayWatchdog(args2) {
+  return startBoundedOfficialCodexLaunchRunawayWatchdog({
+    inspect: async () => {
+      const rows = await readProcessRows();
+      const mainRow = rows.find((row) => row.pid === args2.pid) ?? null;
+      if (!mainRow || !isMainProcessRow(mainRow, args2.candidate) || mainRow.startedAt !== args2.startedAt || !remoteDebuggingPortMatches(mainRow.args, args2.cdpPort)) {
+        return {
+          epochMatches: false,
+          threadCount: null,
+          descendantProcessCount: 0
+        };
+      }
+      const descendantProcessCount = getDescendantPids(args2.pid, rows).length;
+      const threadCount = await readProcessThreadCount(args2.pid);
+      return { epochMatches: true, threadCount, descendantProcessCount };
+    },
+    stop: () => stopOfficialCodexProcessEpoch({
+      candidate: args2.candidate,
+      pid: args2.pid,
+      startedAt: args2.startedAt,
+      cdpPort: args2.cdpPort
+    }).catch(() => [args2.pid]),
+    onRunaway: ({ threadCount, descendantProcessCount, remainingPids }) => {
+      console.warn("[official-codex-launch] Stopped runaway managed launch.", {
+        pid: args2.pid,
+        startedAt: args2.startedAt,
+        cdpPort: args2.cdpPort,
+        threadCount,
+        descendantProcessCount,
+        remainingPids
+      });
+    },
+    onInspectionFailureLimit: (consecutiveInspectionFailures) => {
+      console.warn(
+        "[official-codex-launch] Runaway watchdog stopped after persistent process-inspection failures.",
+        {
+          pid: args2.pid,
+          startedAt: args2.startedAt,
+          cdpPort: args2.cdpPort,
+          consecutiveInspectionFailures
+        }
+      );
+    },
+    onError: (error) => {
+      console.warn("[official-codex-launch] Runaway watchdog failed.", {
+        pid: args2.pid,
+        startedAt: args2.startedAt,
+        cdpPort: args2.cdpPort,
+        error: sanitizeUserFacingError(error) ?? "process-inspection-failed"
+      });
+    }
+  });
+}
 async function waitForLaunchStepOrRunaway(step, watchdog) {
   const runaway = watchdog.result.then(
     (value3) => value3 ? { kind: "runaway", value: value3 } : new Promise(() => void 0)
@@ -31253,34 +31754,6 @@ async function readManagedInstance(profileName) {
   const state = await getAppState();
   return state.officialCodex.instancesByProfileName[profileName] ?? null;
 }
-function recordManagedLaunchRunaway(args2) {
-  void args2.watchdog.result.then(async (runaway) => {
-    if (!runaway) return;
-    const current = await readManagedInstance(args2.profileName);
-    if (!current || current.pid !== args2.pid || current.launchedAt !== args2.startedAt || current.cdpPort !== args2.cdpPort) {
-      return;
-    }
-    const rows = await readProcessRows().catch(() => []);
-    const mainStillRunning = rows.some(
-      (row) => row.pid === args2.pid && row.startedAt === args2.startedAt && isMainProcessRow(row, args2.candidate) && remoteDebuggingPortMatches(row.args, args2.cdpPort)
-    );
-    await patchManagedInstance({
-      ...current,
-      pid: mainStillRunning ? args2.pid : null,
-      appServerPid: mainStillRunning ? current.appServerPid : null,
-      ...mainStillRunning ? bridgeStateForStoredInstance(current, true, Date.now()) : bridgeStateUnavailable(),
-      lastVerifiedAt: Date.now(),
-      lastStatus: "failed",
-      lastError: mainStillRunning ? "launch-runaway-stop-timeout" : "launch-runaway-detected"
-    });
-  }).catch((error) => {
-    console.warn("[official-codex-launch] Failed to record runaway launch.", {
-      profileName: args2.profileName,
-      pid: args2.pid,
-      error: sanitizeUserFacingError(error) ?? "state-update-failed"
-    });
-  });
-}
 async function resolveInstanceRuntimeState(args2) {
   const pid = args2.instance.pid;
   if (!pid) {
@@ -31573,9 +32046,15 @@ async function openCodexWithProfileHome(candidate, profileHome, profileName, pre
     };
   }
   const telemetryLabel = `codexuse-profile-${encodeURIComponent(profileName)}`;
-  const launchHome = resolveCodexLaunchHome(profileHome);
-  const appUserDataDir = options.useDefaultUserData === true ? null : options.userDataDir ?? import_node_path12.default.join(profileHome, "codex-app-user-data");
-  const sqliteHome = options.sqliteHome ?? profileHome;
+  const launchConfiguration = resolveOfficialCodexLaunchConfiguration(
+    profileHome,
+    options
+  );
+  const {
+    codexHome: launchHome,
+    sqliteHome,
+    userDataDir: appUserDataDir
+  } = launchConfiguration;
   const activePortPaths = devToolsActivePortPaths(appUserDataDir);
   let child;
   try {
@@ -31870,6 +32349,15 @@ async function signalPids(pids, signal) {
   return signaled;
 }
 var SHARED_CODEX_HOME = resolveDefaultCodexHomeDir();
+function resolveOfficialCodexLaunchConfiguration(profileHome, options = {}) {
+  return {
+    codexHome: resolveCodexLaunchHome(profileHome),
+    sqliteHome: options.sqliteHome ?? profileHome,
+    // Managed profile windows keep Electron state separate as well as CODEX_HOME.
+    // Callers can supply another isolated directory or explicitly use stock state.
+    userDataDir: options.useDefaultUserData === true ? null : options.userDataDir ?? import_node_path12.default.join(profileHome, "codex-app-user-data")
+  };
+}
 function resolveOfficialCodexThreadSqliteHome(profileHome) {
   return profileHome === SHARED_CODEX_HOME ? resolveCodexSqliteHomeDir(profileHome) : profileHome;
 }
@@ -31889,7 +32377,7 @@ var sharedHomeCdpWindow = null;
 function normalizedAccountWorkspaceId(value3) {
   return value3?.trim() || "__default__";
 }
-function expectedAccountMatches(expected, observed) {
+function officialCodexExpectedAccountMatches(expected, observed) {
   const identityMatches = expected.accountId ? observed.accountId === expected.accountId : Boolean(
     expected.email && observed.email && observed.email.toLowerCase() === expected.email.toLowerCase()
   );
@@ -33934,7 +34422,7 @@ async function waitForExpectedOfficialCodexAccount(debuggerUrl, expectedAccount)
           false
         )
       );
-      if (observed && expectedAccountMatches(expectedAccount, observed)) {
+      if (observed && officialCodexExpectedAccountMatches(expectedAccount, observed)) {
         return observed;
       }
     } catch {
@@ -34039,7 +34527,7 @@ async function applySharedLaunchFollowUp(args2) {
       readSharedBridgeSnapshot(debuggerUrl)
     ]);
     const expectedDraft = args2.carryDraft && args2.carriedDraft.trim() ? args2.carriedDraft : "";
-    if (!finalAccount || !expectedAccountMatches(args2.expectedAccount, finalAccount) || !snapshot2 || snapshot2.activeThreadId !== null || (snapshot2.composerText ?? "") !== expectedDraft) {
+    if (!finalAccount || !officialCodexExpectedAccountMatches(args2.expectedAccount, finalAccount) || !snapshot2 || snapshot2.activeThreadId !== null || (snapshot2.composerText ?? "") !== expectedDraft) {
       return { verified: false, reason: "renderer-postcondition-unverified" };
     }
     return { verified: true, reason: null };
@@ -34161,7 +34649,7 @@ async function attemptOfficialCodexManagedLiveLogin(args2) {
     const notified = await notification.promise;
     notification = null;
     const account = await readSharedOfficialCodexAppAccount();
-    if (account.status !== "observed" || !expectedAccountMatches(expectedAccount, account)) {
+    if (account.status !== "observed" || !officialCodexExpectedAccountMatches(expectedAccount, account)) {
       return null;
     }
     await adoptSharedManagedWindow({
@@ -34215,7 +34703,7 @@ async function attemptOfficialCodexManagedLiveLogin(args2) {
         return null;
       }
       const refreshedAccount = await readSharedOfficialCodexAppAccount();
-      if (refreshedAccount.status !== "observed" || !expectedAccountMatches(expectedAccount, refreshedAccount)) {
+      if (refreshedAccount.status !== "observed" || !officialCodexExpectedAccountMatches(expectedAccount, refreshedAccount)) {
         return null;
       }
       reconciled = await reconcile(args2.debuggerUrl);
@@ -34357,11 +34845,11 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
   if (driveTarget) {
     const managedTarget = driveTarget;
     const mainRow = rows.find((row) => row.pid === managedTarget.pid) ?? null;
-    const appServerPid2 = findAppServerPid(rows, managedTarget.pid);
-    if (!mainRow?.startedAt || !appServerPid2 || !await attestOfficialCodexProcessEpoch({
+    const appServerPid = findAppServerPid(rows, managedTarget.pid);
+    if (!mainRow?.startedAt || !appServerPid || !await attestOfficialCodexProcessEpoch({
       candidate,
       pid: managedTarget.pid,
-      appServerPid: appServerPid2,
+      appServerPid,
       startedAt: mainRow.startedAt,
       cdpPort: managedTarget.cdpPort
     })) {
@@ -34382,12 +34870,12 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
           await ensureOfficialCodexBridgeInstalled(debuggerUrl, false);
         } catch {
         }
-        let bridge2 = null;
+        let bridge = null;
         if (options.profileName) {
           await adoptSharedManagedWindow({
             candidate,
             pid: managedTarget.pid,
-            appServerPid: appServerPid2,
+            appServerPid,
             cdpPort: managedTarget.cdpPort,
             startedAt: mainRow.startedAt,
             profileName: options.profileName,
@@ -34395,19 +34883,19 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
             desiredQolSettings: options.desiredQolSettings,
             desiredPowerSettings: options.desiredPowerSettings
           });
-          bridge2 = await refreshAdoptedSharedWindow(options.profileName);
-          if (bridge2?.bridgeStatus !== "healthy") {
+          bridge = await refreshAdoptedSharedWindow(options.profileName);
+          if (bridge?.bridgeStatus !== "healthy") {
             return {
               status: "failed",
               mechanism: "none",
-              reason: bridge2?.bridgeError ?? "bridge-not-healthy",
+              reason: bridge?.bridgeError ?? "bridge-not-healthy",
               pid: managedTarget.pid,
-              appServerPid: appServerPid2,
+              appServerPid,
               cdpPort: managedTarget.cdpPort,
-              bridgeStatus: bridge2?.bridgeStatus ?? null,
-              bridgeError: bridge2?.bridgeError ?? null,
-              bridgeActiveThreadId: bridge2?.bridgeActiveThreadId ?? null,
-              bridgeWorkspacePath: bridge2?.bridgeWorkspacePath ?? null
+              bridgeStatus: bridge?.bridgeStatus ?? null,
+              bridgeError: bridge?.bridgeError ?? null,
+              bridgeActiveThreadId: bridge?.bridgeActiveThreadId ?? null,
+              bridgeWorkspacePath: bridge?.bridgeWorkspacePath ?? null
             };
           }
         }
@@ -34416,12 +34904,12 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
           mechanism: "none",
           reason: null,
           pid: managedTarget.pid,
-          appServerPid: appServerPid2,
+          appServerPid,
           cdpPort: managedTarget.cdpPort,
-          bridgeStatus: bridge2?.bridgeStatus ?? null,
-          bridgeError: bridge2?.bridgeError ?? null,
-          bridgeActiveThreadId: bridge2?.bridgeActiveThreadId ?? null,
-          bridgeWorkspacePath: bridge2?.bridgeWorkspacePath ?? null
+          bridgeStatus: bridge?.bridgeStatus ?? null,
+          bridgeError: bridge?.bridgeError ?? null,
+          bridgeActiveThreadId: bridge?.bridgeActiveThreadId ?? null,
+          bridgeWorkspacePath: bridge?.bridgeWorkspacePath ?? null
         };
       }
       sharedHomeCdpWindow = null;
@@ -34479,7 +34967,7 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
         const live = await attemptOfficialCodexManagedLiveLogin({
           candidate,
           driveTarget: managedTarget,
-          appServerPid: appServerPid2,
+          appServerPid,
           startedAt: mainRow.startedAt,
           debuggerUrl: target.webSocketDebuggerUrl,
           sourceSnapshot: snapshot2,
@@ -34593,6 +35081,7 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
       reason: launch2.reason ?? null
     });
     if (!launch2.opened || launch2.pid === null || launch2.startedAt === null || launch2.cdpPort === null || !launch2.watchdog) {
+      launch2.watchdog?.cancel();
       return {
         status: "failed",
         reason: launch2.reason ?? "shared-home-launch-failed",
@@ -34600,376 +35089,442 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
         closedPreviousWindow: false
       };
     }
-    const cdpPort2 = launch2.cdpPort;
-    const appServerStep2 = await waitForLaunchStepOrRunaway(
-      waitForAppServerPid(launch2.pid, SHARED_CODEX_HOME),
-      launch2.watchdog
-    );
-    if (appServerStep2.kind === "runaway") {
-      return {
-        status: "failed",
-        reason: launchRunawayFailureReason(appServerStep2.value, launch2.pid),
-        pid: launch2.pid,
-        appServerPid: null,
-        cdpPort: cdpPort2,
-        closedPreviousWindow: false
-      };
-    }
-    const appServerPid2 = appServerStep2.value;
-    logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "verifier-app-server", {
-      verified: appServerPid2 !== null
-    });
-    if (appServerPid2 === null) {
-      const remaining = await stopUnverifiedLaunch({
-        candidate,
-        pid: launch2.pid,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
-      });
-      return {
-        status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "app-server-not-verified",
-        pid: launch2.pid,
-        appServerPid: null,
-        cdpPort: cdpPort2,
-        closedPreviousWindow: false
-      };
-    }
-    const replacementTarget = await waitForCdpTargetAfterLaunch(cdpPort2);
-    if (!replacementTarget?.webSocketDebuggerUrl) {
-      const remaining = await stopUnverifiedLaunch({
-        candidate,
-        pid: launch2.pid,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
+    let finalLaunchWatchdog = null;
+    try {
+      const cdpPort = launch2.cdpPort;
+      const appServerStep = await waitForLaunchStepOrRunaway(
+        waitForAppServerPid(launch2.pid, SHARED_CODEX_HOME),
+        launch2.watchdog
+      );
+      if (appServerStep.kind === "runaway") {
+        return {
+          status: "failed",
+          reason: launchRunawayFailureReason(appServerStep.value, launch2.pid),
+          pid: launch2.pid,
+          appServerPid: null,
+          cdpPort,
+          closedPreviousWindow: false
+        };
+      }
+      const appServerPid = appServerStep.value;
+      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "verifier-app-server", {
+        verified: appServerPid !== null
       });
-      return {
-        status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "bridge-not-healthy-after-launch",
-        pid: launch2.pid,
-        appServerPid: appServerPid2,
-        cdpPort: cdpPort2,
-        bridgeError: "cdp-target-not-found",
-        closedPreviousWindow: false
-      };
-    }
-    const attestedStep2 = await waitForLaunchStepOrRunaway(
-      waitForAttestedProcessEpoch({
-        candidate,
-        pid: launch2.pid,
-        appServerPid: appServerPid2,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
-      }),
-      launch2.watchdog
-    );
-    if (attestedStep2.kind === "runaway") {
-      return {
-        status: "failed",
-        reason: launchRunawayFailureReason(attestedStep2.value, launch2.pid),
-        pid: launch2.pid,
-        appServerPid: appServerPid2,
-        cdpPort: cdpPort2,
-        closedPreviousWindow: false
-      };
-    }
-    if (!attestedStep2.value) {
-      const remaining = await stopUnverifiedLaunch({
-        candidate,
-        pid: launch2.pid,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
+      if (appServerPid === null) {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "app-server-not-verified",
+          pid: launch2.pid,
+          appServerPid: null,
+          cdpPort,
+          closedPreviousWindow: false
+        };
+      }
+      const replacementTarget = await waitForCdpTargetAfterLaunch(cdpPort);
+      if (!replacementTarget?.webSocketDebuggerUrl) {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "bridge-not-healthy-after-launch",
+          pid: launch2.pid,
+          appServerPid,
+          cdpPort,
+          bridgeError: "cdp-target-not-found",
+          closedPreviousWindow: false
+        };
+      }
+      const attestedStep = await waitForLaunchStepOrRunaway(
+        waitForAttestedProcessEpoch({
+          candidate,
+          pid: launch2.pid,
+          appServerPid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        }),
+        launch2.watchdog
+      );
+      if (attestedStep.kind === "runaway") {
+        return {
+          status: "failed",
+          reason: launchRunawayFailureReason(attestedStep.value, launch2.pid),
+          pid: launch2.pid,
+          appServerPid,
+          cdpPort,
+          closedPreviousWindow: false
+        };
+      }
+      if (!attestedStep.value) {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "process-identity-not-verified",
+          pid: launch2.pid,
+          appServerPid,
+          cdpPort,
+          closedPreviousWindow: false
+        };
+      }
+      try {
+        await ensureOfficialCodexBridgeInstalled(
+          replacementTarget.webSocketDebuggerUrl,
+          false
+        );
+      } catch (error) {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "bridge-not-healthy-after-launch",
+          pid: launch2.pid,
+          appServerPid,
+          cdpPort,
+          bridgeError: sanitizeUserFacingError(error) ?? "bridge-install-failed",
+          closedPreviousWindow: false
+        };
+      }
+      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "verifier-bridge", {
+        healthy: true
       });
-      return {
-        status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "process-identity-not-verified",
-        pid: launch2.pid,
-        appServerPid: appServerPid2,
-        cdpPort: cdpPort2,
-        closedPreviousWindow: false
-      };
-    }
-    try {
-      await ensureOfficialCodexBridgeInstalled(
+      const verifierAccount = options.expectedAccount ? await waitForExpectedOfficialCodexAccount(
         replacementTarget.webSocketDebuggerUrl,
-        false
+        options.expectedAccount
+      ) : null;
+      if (!options.expectedAccount || !verifierAccount || !officialCodexExpectedAccountMatches(options.expectedAccount, verifierAccount)) {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "official-codex-target-account-unverified",
+          pid: launch2.pid,
+          appServerPid,
+          cdpPort,
+          closedPreviousWindow: false
+        };
+      }
+      const verifierSurface = await prepareOfficialCodexRendererSurface(
+        replacementTarget.webSocketDebuggerUrl,
+        true
       );
-    } catch (error) {
-      const remaining = await stopUnverifiedLaunch({
-        candidate,
-        pid: launch2.pid,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
+      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "verifier-surface", {
+        status: verifierSurface
       });
-      return {
-        status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "bridge-not-healthy-after-launch",
-        pid: launch2.pid,
-        appServerPid: appServerPid2,
-        cdpPort: cdpPort2,
-        bridgeError: sanitizeUserFacingError(error) ?? "bridge-install-failed",
-        closedPreviousWindow: false
-      };
-    }
-    logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "verifier-bridge", {
-      healthy: true
-    });
-    const verifierAccount = options.expectedAccount ? await waitForExpectedOfficialCodexAccount(
-      replacementTarget.webSocketDebuggerUrl,
-      options.expectedAccount
-    ) : null;
-    if (!options.expectedAccount || !verifierAccount || !expectedAccountMatches(options.expectedAccount, verifierAccount)) {
-      const remaining = await stopUnverifiedLaunch({
-        candidate,
-        pid: launch2.pid,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
+      if (verifierSurface !== "ready") {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "renderer-surface-unavailable",
+          pid: launch2.pid,
+          appServerPid,
+          cdpPort,
+          closedPreviousWindow: false
+        };
+      }
+      if (!await expectedSharedWindowTopologyStillMatches(
+        expectedWindowPreflight,
+        /* @__PURE__ */ new Set([launch2.pid])
+      )) {
+        await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: "failed",
+          reason: "official-codex-process-state-changed-before-switch",
+          pid: null,
+          closedPreviousWindow: false
+        };
+      }
+      const takeoverVetoReason2 = await resolveStandingTakeoverActivityVeto(options);
+      if (takeoverVetoReason2) {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: remaining.length > 0 ? "failed" : "skipped",
+          mechanism: "none",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : takeoverVetoReason2,
+          pid: launch2.pid,
+          appServerPid,
+          cdpPort,
+          closedPreviousWindow: false
+        };
+      }
+      const remainingPlainPids = /* @__PURE__ */ new Set();
+      for (const row of plainSharedRows) {
+        for (const pid of await stopOfficialCodexProcessEpoch({
+          candidate,
+          pid: row.pid,
+          startedAt: row.startedAt,
+          cdpPort: null
+        })) {
+          remainingPlainPids.add(pid);
+        }
+      }
+      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "previous-window-exit", {
+        remainingCount: remainingPlainPids.size
       });
-      return {
-        status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "official-codex-target-account-unverified",
-        pid: launch2.pid,
-        appServerPid: appServerPid2,
-        cdpPort: cdpPort2,
-        closedPreviousWindow: false
-      };
-    }
-    const verifierSurface = await prepareOfficialCodexRendererSurface(
-      replacementTarget.webSocketDebuggerUrl,
-      true
-    );
-    logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "verifier-surface", {
-      status: verifierSurface
-    });
-    if (verifierSurface !== "ready") {
-      const remaining = await stopUnverifiedLaunch({
+      if (remainingPlainPids.size > 0) {
+        await stopUnverifiedLaunch({
+          candidate,
+          pid: launch2.pid,
+          startedAt: launch2.startedAt,
+          cdpPort
+        });
+        return {
+          status: "failed",
+          reason: "previous-instance-still-running",
+          pid: null,
+          closedPreviousWindow: false
+        };
+      }
+      closedPreviousWindow = true;
+      await sleep3(POST_EXIT_SETTLE_MS);
+      const remainingVerifierPids = await stopUnverifiedLaunch({
         candidate,
         pid: launch2.pid,
         startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
+        cdpPort
       });
-      return {
-        status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "renderer-surface-unavailable",
-        pid: launch2.pid,
-        appServerPid: appServerPid2,
-        cdpPort: cdpPort2,
-        closedPreviousWindow: false
-      };
-    }
-    if (!await expectedSharedWindowTopologyStillMatches(
-      expectedWindowPreflight,
-      /* @__PURE__ */ new Set([launch2.pid])
-    )) {
-      await stopUnverifiedLaunch({
-        candidate,
-        pid: launch2.pid,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
+      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "verifier-exit", {
+        remainingCount: remainingVerifierPids.length
       });
-      return {
-        status: "failed",
-        reason: "official-codex-process-state-changed-before-switch",
-        pid: null,
-        closedPreviousWindow: false
-      };
-    }
-    const takeoverVetoReason2 = await resolveStandingTakeoverActivityVeto(options);
-    if (takeoverVetoReason2) {
-      const remaining = await stopUnverifiedLaunch({
+      if (remainingVerifierPids.length > 0) {
+        return {
+          status: "failed",
+          reason: "temporary-instance-still-running",
+          pid: launch2.pid,
+          closedPreviousWindow
+        };
+      }
+      sharedHomeCdpWindow = null;
+      rows = await readProcessRows();
+      if (findSharedHomeDebugWindows(rows, candidate).length > 0 || findPlainSharedHomeRows(rows, candidate).length > 0) {
+        return {
+          status: "failed",
+          reason: "official-codex-process-state-changed-before-switch",
+          pid: null,
+          closedPreviousWindow,
+          suppressPlainReopen: true
+        };
+      }
+      const finalLaunch = await openCodexWithProfileHome(
         candidate,
-        pid: launch2.pid,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
+        SHARED_CODEX_HOME,
+        options.profileName ?? "shared",
+        new Set(rows.map((row) => row.pid)),
+        sharedCodexLaunchOptions(
+          false,
+          options.profileKey ?? options.profileName
+        )
+      );
+      finalLaunchWatchdog = finalLaunch.watchdog;
+      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "final-launched", {
+        opened: finalLaunch.opened,
+        hasPid: finalLaunch.pid !== null,
+        reason: finalLaunch.reason ?? null
       });
-      return {
-        status: remaining.length > 0 ? "failed" : "skipped",
-        mechanism: "none",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : takeoverVetoReason2,
-        pid: launch2.pid,
-        appServerPid: appServerPid2,
-        cdpPort: cdpPort2,
-        closedPreviousWindow: false
-      };
-    }
-    const remainingPlainPids = /* @__PURE__ */ new Set();
-    for (const row of plainSharedRows) {
-      for (const pid of await stopOfficialCodexProcessEpoch({
-        candidate,
-        pid: row.pid,
-        startedAt: row.startedAt,
-        cdpPort: null
-      })) {
-        remainingPlainPids.add(pid);
+      if (!finalLaunch.opened || finalLaunch.pid === null || finalLaunch.startedAt === null || finalLaunch.cdpPort === null || !finalLaunch.watchdog) {
+        return {
+          status: "failed",
+          reason: finalLaunch.reason ?? "shared-home-launch-failed",
+          pid: null,
+          closedPreviousWindow
+        };
       }
-    }
-    logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "previous-window-exit", {
-      remainingCount: remainingPlainPids.size
-    });
-    if (remainingPlainPids.size > 0) {
-      await stopUnverifiedLaunch({
-        candidate,
-        pid: launch2.pid,
-        startedAt: launch2.startedAt,
-        cdpPort: cdpPort2
+      const finalCdpPort = finalLaunch.cdpPort;
+      const finalAppServerStep = await waitForLaunchStepOrRunaway(
+        waitForAppServerPid(finalLaunch.pid, SHARED_CODEX_HOME),
+        finalLaunch.watchdog
+      );
+      if (finalAppServerStep.kind === "runaway") {
+        return {
+          status: "failed",
+          reason: launchRunawayFailureReason(
+            finalAppServerStep.value,
+            finalLaunch.pid
+          ),
+          pid: finalLaunch.pid,
+          appServerPid: null,
+          cdpPort: finalCdpPort,
+          closedPreviousWindow
+        };
+      }
+      let finalAppServerPid = finalAppServerStep.value;
+      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "final-app-server", {
+        verified: finalAppServerPid !== null
       });
-      return {
-        status: "failed",
-        reason: "previous-instance-still-running",
-        pid: null,
-        closedPreviousWindow: false
-      };
-    }
-    closedPreviousWindow = true;
-    await sleep3(POST_EXIT_SETTLE_MS);
-    const remainingVerifierPids = await stopUnverifiedLaunch({
-      candidate,
-      pid: launch2.pid,
-      startedAt: launch2.startedAt,
-      cdpPort: cdpPort2
-    });
-    logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "verifier-exit", {
-      remainingCount: remainingVerifierPids.length
-    });
-    if (remainingVerifierPids.length > 0) {
-      return {
-        status: "failed",
-        reason: "temporary-instance-still-running",
-        pid: launch2.pid,
-        closedPreviousWindow
-      };
-    }
-    sharedHomeCdpWindow = null;
-    rows = await readProcessRows();
-    if (findSharedHomeDebugWindows(rows, candidate).length > 0 || findPlainSharedHomeRows(rows, candidate).length > 0) {
-      return {
-        status: "failed",
-        reason: "official-codex-process-state-changed-before-switch",
-        pid: null,
-        closedPreviousWindow,
-        suppressPlainReopen: true
-      };
-    }
-    const finalLaunch = await openCodexWithProfileHome(
-      candidate,
-      SHARED_CODEX_HOME,
-      options.profileName ?? "shared",
-      new Set(rows.map((row) => row.pid)),
-      sharedCodexLaunchOptions(
-        false,
-        options.profileKey ?? options.profileName
-      )
-    );
-    logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "final-launched", {
-      opened: finalLaunch.opened,
-      hasPid: finalLaunch.pid !== null,
-      reason: finalLaunch.reason ?? null
-    });
-    if (!finalLaunch.opened || finalLaunch.pid === null || finalLaunch.startedAt === null || finalLaunch.cdpPort === null || !finalLaunch.watchdog) {
-      return {
-        status: "failed",
-        reason: finalLaunch.reason ?? "shared-home-launch-failed",
-        pid: null,
-        closedPreviousWindow
-      };
-    }
-    const finalCdpPort = finalLaunch.cdpPort;
-    const finalAppServerStep = await waitForLaunchStepOrRunaway(
-      waitForAppServerPid(finalLaunch.pid, SHARED_CODEX_HOME),
-      finalLaunch.watchdog
-    );
-    if (finalAppServerStep.kind === "runaway") {
-      return {
-        status: "failed",
-        reason: launchRunawayFailureReason(
-          finalAppServerStep.value,
-          finalLaunch.pid
-        ),
-        pid: finalLaunch.pid,
-        appServerPid: null,
+      if (finalAppServerPid === null) {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: finalLaunch.pid,
+          startedAt: finalLaunch.startedAt,
+          cdpPort: finalCdpPort
+        });
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "app-server-not-verified",
+          pid: finalLaunch.pid,
+          appServerPid: null,
+          cdpPort: finalCdpPort,
+          closedPreviousWindow
+        };
+      }
+      const finalAttestedStep = await waitForLaunchStepOrRunaway(
+        waitForAttestedProcessEpoch({
+          candidate,
+          pid: finalLaunch.pid,
+          appServerPid: finalAppServerPid,
+          startedAt: finalLaunch.startedAt,
+          cdpPort: finalCdpPort
+        }),
+        finalLaunch.watchdog
+      );
+      if (finalAttestedStep.kind === "runaway") {
+        return {
+          status: "failed",
+          reason: launchRunawayFailureReason(
+            finalAttestedStep.value,
+            finalLaunch.pid
+          ),
+          pid: finalLaunch.pid,
+          appServerPid: finalAppServerPid,
+          cdpPort: finalCdpPort,
+          closedPreviousWindow
+        };
+      }
+      if (!finalAttestedStep.value) {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: finalLaunch.pid,
+          startedAt: finalLaunch.startedAt,
+          cdpPort: finalCdpPort
+        });
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "process-identity-not-verified",
+          pid: finalLaunch.pid,
+          appServerPid: finalAppServerPid,
+          cdpPort: finalCdpPort,
+          closedPreviousWindow
+        };
+      }
+      sharedHomeCdpWindow = { pid: finalLaunch.pid, cdpPort: finalCdpPort };
+      let bridge = null;
+      if (options.profileName) {
+        await adoptSharedManagedWindow({
+          candidate,
+          pid: finalLaunch.pid,
+          appServerPid: finalAppServerPid,
+          cdpPort: finalCdpPort,
+          startedAt: finalLaunch.startedAt,
+          profileName: options.profileName,
+          profileKey: options.profileKey,
+          desiredQolSettings: options.desiredQolSettings,
+          desiredPowerSettings: options.desiredPowerSettings
+        });
+        bridge = await refreshAdoptedSharedWindow(options.profileName);
+        logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "final-bridge", {
+          healthy: bridge?.bridgeStatus === "healthy",
+          bridgeStatus: bridge?.bridgeStatus ?? null
+        });
+        if (bridge?.bridgeStatus !== "healthy") {
+          const remaining = await stopUnverifiedLaunch({
+            candidate,
+            pid: finalLaunch.pid,
+            startedAt: finalLaunch.startedAt,
+            cdpPort: finalCdpPort
+          });
+          sharedHomeCdpWindow = null;
+          return {
+            status: "failed",
+            reason: remaining.length > 0 ? "temporary-instance-still-running" : "bridge-not-healthy-after-launch",
+            pid: finalLaunch.pid,
+            appServerPid: finalAppServerPid,
+            cdpPort: finalCdpPort,
+            bridgeStatus: bridge?.bridgeStatus ?? null,
+            bridgeError: bridge?.bridgeError ?? null,
+            bridgeActiveThreadId: bridge?.bridgeActiveThreadId ?? null,
+            bridgeWorkspacePath: bridge?.bridgeWorkspacePath ?? null,
+            closedPreviousWindow
+          };
+        }
+      }
+      const followUp = await applySharedLaunchFollowUp({
         cdpPort: finalCdpPort,
-        closedPreviousWindow
-      };
-    }
-    let finalAppServerPid = finalAppServerStep.value;
-    logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "final-app-server", {
-      verified: finalAppServerPid !== null
-    });
-    if (finalAppServerPid === null) {
-      const remaining = await stopUnverifiedLaunch({
-        candidate,
-        pid: finalLaunch.pid,
-        startedAt: finalLaunch.startedAt,
-        cdpPort: finalCdpPort
+        carriedDraft,
+        carryDraft: options.carryDraft === true,
+        expectedAccount: options.expectedAccount ?? null,
+        allowOnboardingOverride: true
       });
-      return {
-        status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "app-server-not-verified",
-        pid: finalLaunch.pid,
-        appServerPid: null,
-        cdpPort: finalCdpPort,
-        closedPreviousWindow
-      };
-    }
-    const finalAttestedStep = await waitForLaunchStepOrRunaway(
-      waitForAttestedProcessEpoch({
+      const reconciliation = await reconcileSharedManagedWindowAfterLaunch({
         candidate,
         pid: finalLaunch.pid,
         appServerPid: finalAppServerPid,
-        startedAt: finalLaunch.startedAt,
-        cdpPort: finalCdpPort
-      }),
-      finalLaunch.watchdog
-    );
-    if (finalAttestedStep.kind === "runaway") {
-      return {
-        status: "failed",
-        reason: launchRunawayFailureReason(
-          finalAttestedStep.value,
-          finalLaunch.pid
-        ),
-        pid: finalLaunch.pid,
-        appServerPid: finalAppServerPid,
         cdpPort: finalCdpPort,
-        closedPreviousWindow
-      };
-    }
-    if (!finalAttestedStep.value) {
-      const remaining = await stopUnverifiedLaunch({
-        candidate,
-        pid: finalLaunch.pid,
         startedAt: finalLaunch.startedAt,
-        cdpPort: finalCdpPort
+        profileName: options.profileName,
+        profileKey: options.profileKey,
+        desiredQolSettings: options.desiredQolSettings,
+        desiredPowerSettings: options.desiredPowerSettings,
+        bridge
       });
-      return {
-        status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "process-identity-not-verified",
-        pid: finalLaunch.pid,
-        appServerPid: finalAppServerPid,
-        cdpPort: finalCdpPort,
-        closedPreviousWindow
-      };
-    }
-    sharedHomeCdpWindow = { pid: finalLaunch.pid, cdpPort: finalCdpPort };
-    let bridge2 = null;
-    if (options.profileName) {
-      await adoptSharedManagedWindow({
+      if (reconciliation) {
+        finalAppServerPid = reconciliation.appServerPid;
+        bridge = reconciliation.bridge;
+      }
+      const finalEpoch = reconciliation?.processEpoch ?? null;
+      const finalBridgeVerified = !options.profileName || bridge?.bridgeStatus === "healthy";
+      const finalTopologyVerified = Boolean(
+        finalEpoch && isExclusiveSharedManagedWindow(
+          finalEpoch.rows,
+          candidate,
+          finalLaunch.pid,
+          finalCdpPort
+        )
+      );
+      const accountObservation = finalTopologyVerified && options.expectedAccount ? await readVerifiedTransitionAccountObservation({
         candidate,
         pid: finalLaunch.pid,
         appServerPid: finalAppServerPid,
-        cdpPort: finalCdpPort,
         startedAt: finalLaunch.startedAt,
-        profileName: options.profileName,
-        profileKey: options.profileKey,
-        desiredQolSettings: options.desiredQolSettings,
-        desiredPowerSettings: options.desiredPowerSettings
-      });
-      bridge2 = await refreshAdoptedSharedWindow(options.profileName);
-      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "final-bridge", {
-        healthy: bridge2?.bridgeStatus === "healthy",
-        bridgeStatus: bridge2?.bridgeStatus ?? null
-      });
-      if (bridge2?.bridgeStatus !== "healthy") {
+        cdpPort: finalCdpPort,
+        expectedAccount: options.expectedAccount
+      }) : null;
+      if (!followUp.verified || !finalTopologyVerified || !finalBridgeVerified || !accountObservation) {
         const remaining = await stopUnverifiedLaunch({
           candidate,
           pid: finalLaunch.pid,
@@ -34979,114 +35534,47 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
         sharedHomeCdpWindow = null;
         return {
           status: "failed",
-          reason: remaining.length > 0 ? "temporary-instance-still-running" : "bridge-not-healthy-after-launch",
+          mechanism: "relaunch",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : !finalEpoch ? "observed-process-identity-changed" : !finalTopologyVerified ? "official-codex-process-state-changed-before-switch" : !finalBridgeVerified ? "bridge-not-healthy-after-launch" : !accountObservation ? "official-codex-target-account-unverified" : followUp.reason,
           pid: finalLaunch.pid,
           appServerPid: finalAppServerPid,
           cdpPort: finalCdpPort,
-          bridgeStatus: bridge2?.bridgeStatus ?? null,
-          bridgeError: bridge2?.bridgeError ?? null,
-          bridgeActiveThreadId: bridge2?.bridgeActiveThreadId ?? null,
-          bridgeWorkspacePath: bridge2?.bridgeWorkspacePath ?? null,
-          closedPreviousWindow
+          closedPreviousWindow,
+          rendererVerified: false,
+          suppressPlainReopen: true
         };
       }
-    }
-    const followUp2 = await applySharedLaunchFollowUp({
-      cdpPort: finalCdpPort,
-      carriedDraft,
-      carryDraft: options.carryDraft === true,
-      expectedAccount: options.expectedAccount ?? null,
-      allowOnboardingOverride: true
-    });
-    const reconciliation2 = await reconcileSharedManagedWindowAfterLaunch({
-      candidate,
-      pid: finalLaunch.pid,
-      appServerPid: finalAppServerPid,
-      cdpPort: finalCdpPort,
-      startedAt: finalLaunch.startedAt,
-      profileName: options.profileName,
-      profileKey: options.profileKey,
-      desiredQolSettings: options.desiredQolSettings,
-      desiredPowerSettings: options.desiredPowerSettings,
-      bridge: bridge2
-    });
-    if (reconciliation2) {
-      finalAppServerPid = reconciliation2.appServerPid;
-      bridge2 = reconciliation2.bridge;
-    }
-    const finalEpoch2 = reconciliation2?.processEpoch ?? null;
-    const finalBridgeVerified2 = !options.profileName || bridge2?.bridgeStatus === "healthy";
-    const finalTopologyVerified2 = Boolean(
-      finalEpoch2 && isExclusiveSharedManagedWindow(
-        finalEpoch2.rows,
-        candidate,
-        finalLaunch.pid,
-        finalCdpPort
-      )
-    );
-    const accountObservation2 = finalTopologyVerified2 && options.expectedAccount ? await readVerifiedTransitionAccountObservation({
-      candidate,
-      pid: finalLaunch.pid,
-      appServerPid: finalAppServerPid,
-      startedAt: finalLaunch.startedAt,
-      cdpPort: finalCdpPort,
-      expectedAccount: options.expectedAccount
-    }) : null;
-    if (!followUp2.verified || !finalTopologyVerified2 || !finalBridgeVerified2 || !accountObservation2) {
-      const remaining = await stopUnverifiedLaunch({
-        candidate,
-        pid: finalLaunch.pid,
-        startedAt: finalLaunch.startedAt,
-        cdpPort: finalCdpPort
+      if (options.profileName) {
+        await recordOfficialCodexManagedAccountObservation(
+          options.profileName,
+          finalLaunch.pid,
+          finalAppServerPid,
+          finalLaunch.startedAt,
+          finalCdpPort
+        );
+      }
+      logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "completed", {
+        status: "launched"
       });
-      sharedHomeCdpWindow = null;
       return {
-        status: "failed",
+        status: "launched",
         mechanism: "relaunch",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : !finalEpoch2 ? "observed-process-identity-changed" : !finalTopologyVerified2 ? "official-codex-process-state-changed-before-switch" : !finalBridgeVerified2 ? "bridge-not-healthy-after-launch" : !accountObservation2 ? "official-codex-target-account-unverified" : followUp2.reason,
+        reason: null,
         pid: finalLaunch.pid,
         appServerPid: finalAppServerPid,
         cdpPort: finalCdpPort,
+        bridgeStatus: bridge?.bridgeStatus ?? null,
+        bridgeError: bridge?.bridgeError ?? null,
+        bridgeActiveThreadId: bridge?.bridgeActiveThreadId ?? null,
+        bridgeWorkspacePath: bridge?.bridgeWorkspacePath ?? null,
         closedPreviousWindow,
-        rendererVerified: false,
-        suppressPlainReopen: true
+        rendererVerified: true,
+        accountObservation
       };
+    } finally {
+      launch2.watchdog.cancel();
+      finalLaunchWatchdog?.cancel();
     }
-    if (options.profileName) {
-      await recordOfficialCodexManagedAccountObservation(
-        options.profileName,
-        finalLaunch.pid,
-        finalAppServerPid,
-        finalLaunch.startedAt,
-        finalCdpPort
-      );
-      recordManagedLaunchRunaway({
-        watchdog: finalLaunch.watchdog,
-        candidate,
-        profileName: options.profileName,
-        pid: finalLaunch.pid,
-        startedAt: finalLaunch.startedAt,
-        cdpPort: finalCdpPort
-      });
-    }
-    logOfficialCodexTakeoverPhase(takeoverTrace, candidate, "completed", {
-      status: "launched"
-    });
-    return {
-      status: "launched",
-      mechanism: "relaunch",
-      reason: null,
-      pid: finalLaunch.pid,
-      appServerPid: finalAppServerPid,
-      cdpPort: finalCdpPort,
-      bridgeStatus: bridge2?.bridgeStatus ?? null,
-      bridgeError: bridge2?.bridgeError ?? null,
-      bridgeActiveThreadId: bridge2?.bridgeActiveThreadId ?? null,
-      bridgeWorkspacePath: bridge2?.bridgeWorkspacePath ?? null,
-      closedPreviousWindow,
-      rendererVerified: true,
-      accountObservation: accountObservation2
-    };
   }
   if (plainSharedRows.length > 0 && !await expectedSharedWindowTopologyStillMatches(
     expectedWindowPreflight
@@ -35148,6 +35636,7 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
     sharedCodexLaunchOptions(true)
   );
   if (!launch.opened || launch.pid === null || launch.startedAt === null || launch.cdpPort === null || !launch.watchdog) {
+    launch.watchdog?.cancel();
     return {
       status: "failed",
       reason: launch.reason ?? "shared-home-launch-failed",
@@ -35155,90 +35644,154 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
       closedPreviousWindow
     };
   }
-  const cdpPort = launch.cdpPort;
-  const appServerStep = await waitForLaunchStepOrRunaway(
-    waitForAppServerPid(launch.pid, SHARED_CODEX_HOME),
-    launch.watchdog
-  );
-  if (appServerStep.kind === "runaway") {
-    return {
-      status: "failed",
-      reason: launchRunawayFailureReason(appServerStep.value, launch.pid),
-      pid: launch.pid,
-      appServerPid: null,
+  try {
+    const cdpPort = launch.cdpPort;
+    const appServerStep = await waitForLaunchStepOrRunaway(
+      waitForAppServerPid(launch.pid, SHARED_CODEX_HOME),
+      launch.watchdog
+    );
+    if (appServerStep.kind === "runaway") {
+      return {
+        status: "failed",
+        reason: launchRunawayFailureReason(appServerStep.value, launch.pid),
+        pid: launch.pid,
+        appServerPid: null,
+        cdpPort,
+        closedPreviousWindow
+      };
+    }
+    let appServerPid = appServerStep.value;
+    if (appServerPid === null) {
+      const remaining = await stopUnverifiedLaunch({
+        candidate,
+        pid: launch.pid,
+        startedAt: launch.startedAt,
+        cdpPort
+      });
+      return {
+        status: "failed",
+        reason: remaining.length > 0 ? "temporary-instance-still-running" : "app-server-not-verified",
+        pid: launch.pid,
+        appServerPid: null,
+        cdpPort,
+        closedPreviousWindow
+      };
+    }
+    const attestedStep = await waitForLaunchStepOrRunaway(
+      waitForAttestedProcessEpoch({
+        candidate,
+        pid: launch.pid,
+        appServerPid,
+        startedAt: launch.startedAt,
+        cdpPort
+      }),
+      launch.watchdog
+    );
+    if (attestedStep.kind === "runaway") {
+      return {
+        status: "failed",
+        reason: launchRunawayFailureReason(attestedStep.value, launch.pid),
+        pid: launch.pid,
+        appServerPid,
+        cdpPort,
+        closedPreviousWindow
+      };
+    }
+    if (!attestedStep.value) {
+      const remaining = await stopUnverifiedLaunch({
+        candidate,
+        pid: launch.pid,
+        startedAt: launch.startedAt,
+        cdpPort
+      });
+      return {
+        status: "failed",
+        reason: remaining.length > 0 ? "temporary-instance-still-running" : "process-identity-not-verified",
+        pid: launch.pid,
+        appServerPid,
+        cdpPort,
+        closedPreviousWindow
+      };
+    }
+    sharedHomeCdpWindow = { pid: launch.pid, cdpPort };
+    let bridge = null;
+    if (options.profileName) {
+      await adoptSharedManagedWindow({
+        candidate,
+        pid: launch.pid,
+        appServerPid,
+        cdpPort,
+        startedAt: launch.startedAt,
+        profileName: options.profileName,
+        profileKey: options.profileKey,
+        desiredQolSettings: options.desiredQolSettings,
+        desiredPowerSettings: options.desiredPowerSettings
+      });
+      bridge = await refreshAdoptedSharedWindow(options.profileName);
+      if (bridge?.bridgeStatus !== "healthy") {
+        const remaining = await stopUnverifiedLaunch({
+          candidate,
+          pid: launch.pid,
+          startedAt: launch.startedAt,
+          cdpPort
+        });
+        sharedHomeCdpWindow = null;
+        return {
+          status: "failed",
+          reason: remaining.length > 0 ? "temporary-instance-still-running" : "bridge-not-healthy-after-launch",
+          pid: launch.pid,
+          appServerPid,
+          cdpPort,
+          bridgeStatus: bridge?.bridgeStatus ?? null,
+          bridgeError: bridge?.bridgeError ?? null,
+          bridgeActiveThreadId: bridge?.bridgeActiveThreadId ?? null,
+          bridgeWorkspacePath: bridge?.bridgeWorkspacePath ?? null,
+          closedPreviousWindow
+        };
+      }
+    }
+    const followUp = await applySharedLaunchFollowUp({
       cdpPort,
-      closedPreviousWindow
-    };
-  }
-  let appServerPid = appServerStep.value;
-  if (appServerPid === null) {
-    const remaining = await stopUnverifiedLaunch({
-      candidate,
-      pid: launch.pid,
-      startedAt: launch.startedAt,
-      cdpPort
+      carriedDraft,
+      carryDraft: options.carryDraft === true,
+      expectedAccount: options.expectedAccount ?? null,
+      allowOnboardingOverride: false
     });
-    return {
-      status: "failed",
-      reason: remaining.length > 0 ? "temporary-instance-still-running" : "app-server-not-verified",
-      pid: launch.pid,
-      appServerPid: null,
-      cdpPort,
-      closedPreviousWindow
-    };
-  }
-  const attestedStep = await waitForLaunchStepOrRunaway(
-    waitForAttestedProcessEpoch({
+    const reconciliation = await reconcileSharedManagedWindowAfterLaunch({
       candidate,
       pid: launch.pid,
       appServerPid,
-      startedAt: launch.startedAt,
-      cdpPort
-    }),
-    launch.watchdog
-  );
-  if (attestedStep.kind === "runaway") {
-    return {
-      status: "failed",
-      reason: launchRunawayFailureReason(attestedStep.value, launch.pid),
-      pid: launch.pid,
-      appServerPid,
       cdpPort,
-      closedPreviousWindow
-    };
-  }
-  if (!attestedStep.value) {
-    const remaining = await stopUnverifiedLaunch({
-      candidate,
-      pid: launch.pid,
       startedAt: launch.startedAt,
-      cdpPort
+      profileName: options.profileName,
+      profileKey: options.profileKey,
+      desiredQolSettings: options.desiredQolSettings,
+      desiredPowerSettings: options.desiredPowerSettings,
+      bridge
     });
-    return {
-      status: "failed",
-      reason: remaining.length > 0 ? "temporary-instance-still-running" : "process-identity-not-verified",
-      pid: launch.pid,
-      appServerPid,
-      cdpPort,
-      closedPreviousWindow
-    };
-  }
-  sharedHomeCdpWindow = { pid: launch.pid, cdpPort };
-  let bridge = null;
-  if (options.profileName) {
-    await adoptSharedManagedWindow({
+    if (reconciliation) {
+      appServerPid = reconciliation.appServerPid;
+      bridge = reconciliation.bridge;
+    }
+    const finalEpoch = reconciliation?.processEpoch ?? null;
+    const finalBridgeVerified = !options.profileName || bridge?.bridgeStatus === "healthy";
+    const finalTopologyVerified = Boolean(
+      finalEpoch && isExclusiveSharedManagedWindow(
+        finalEpoch.rows,
+        candidate,
+        launch.pid,
+        cdpPort
+      )
+    );
+    const accountObservation = finalTopologyVerified && options.expectedAccount ? await readVerifiedTransitionAccountObservation({
       candidate,
       pid: launch.pid,
       appServerPid,
-      cdpPort,
       startedAt: launch.startedAt,
-      profileName: options.profileName,
-      profileKey: options.profileKey,
-      desiredQolSettings: options.desiredQolSettings,
-      desiredPowerSettings: options.desiredPowerSettings
-    });
-    bridge = await refreshAdoptedSharedWindow(options.profileName);
-    if (bridge?.bridgeStatus !== "healthy") {
+      cdpPort,
+      expectedAccount: options.expectedAccount
+    }) : null;
+    if (!followUp.verified || !finalTopologyVerified || !finalBridgeVerified || !accountObservation) {
       const remaining = await stopUnverifiedLaunch({
         candidate,
         pid: launch.pid,
@@ -35248,111 +35801,43 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
       sharedHomeCdpWindow = null;
       return {
         status: "failed",
-        reason: remaining.length > 0 ? "temporary-instance-still-running" : "bridge-not-healthy-after-launch",
+        mechanism: "relaunch",
+        reason: remaining.length > 0 ? "temporary-instance-still-running" : !finalEpoch ? "observed-process-identity-changed" : !finalTopologyVerified ? "official-codex-process-state-changed-before-switch" : !finalBridgeVerified ? "bridge-not-healthy-after-launch" : !accountObservation ? "official-codex-target-account-unverified" : followUp.reason,
         pid: launch.pid,
         appServerPid,
         cdpPort,
-        bridgeStatus: bridge?.bridgeStatus ?? null,
-        bridgeError: bridge?.bridgeError ?? null,
-        bridgeActiveThreadId: bridge?.bridgeActiveThreadId ?? null,
-        bridgeWorkspacePath: bridge?.bridgeWorkspacePath ?? null,
-        closedPreviousWindow
+        closedPreviousWindow,
+        rendererVerified: false,
+        suppressPlainReopen: true
       };
     }
-  }
-  const followUp = await applySharedLaunchFollowUp({
-    cdpPort,
-    carriedDraft,
-    carryDraft: options.carryDraft === true,
-    expectedAccount: options.expectedAccount ?? null,
-    allowOnboardingOverride: false
-  });
-  const reconciliation = await reconcileSharedManagedWindowAfterLaunch({
-    candidate,
-    pid: launch.pid,
-    appServerPid,
-    cdpPort,
-    startedAt: launch.startedAt,
-    profileName: options.profileName,
-    profileKey: options.profileKey,
-    desiredQolSettings: options.desiredQolSettings,
-    desiredPowerSettings: options.desiredPowerSettings,
-    bridge
-  });
-  if (reconciliation) {
-    appServerPid = reconciliation.appServerPid;
-    bridge = reconciliation.bridge;
-  }
-  const finalEpoch = reconciliation?.processEpoch ?? null;
-  const finalBridgeVerified = !options.profileName || bridge?.bridgeStatus === "healthy";
-  const finalTopologyVerified = Boolean(
-    finalEpoch && isExclusiveSharedManagedWindow(
-      finalEpoch.rows,
-      candidate,
-      launch.pid,
-      cdpPort
-    )
-  );
-  const accountObservation = finalTopologyVerified && options.expectedAccount ? await readVerifiedTransitionAccountObservation({
-    candidate,
-    pid: launch.pid,
-    appServerPid,
-    startedAt: launch.startedAt,
-    cdpPort,
-    expectedAccount: options.expectedAccount
-  }) : null;
-  if (!followUp.verified || !finalTopologyVerified || !finalBridgeVerified || !accountObservation) {
-    const remaining = await stopUnverifiedLaunch({
-      candidate,
-      pid: launch.pid,
-      startedAt: launch.startedAt,
-      cdpPort
-    });
-    sharedHomeCdpWindow = null;
+    if (options.profileName) {
+      await recordOfficialCodexManagedAccountObservation(
+        options.profileName,
+        launch.pid,
+        appServerPid,
+        launch.startedAt,
+        cdpPort
+      );
+    }
     return {
-      status: "failed",
+      status: "launched",
       mechanism: "relaunch",
-      reason: remaining.length > 0 ? "temporary-instance-still-running" : !finalEpoch ? "observed-process-identity-changed" : !finalTopologyVerified ? "official-codex-process-state-changed-before-switch" : !finalBridgeVerified ? "bridge-not-healthy-after-launch" : !accountObservation ? "official-codex-target-account-unverified" : followUp.reason,
+      reason: null,
       pid: launch.pid,
       appServerPid,
       cdpPort,
+      bridgeStatus: bridge?.bridgeStatus ?? null,
+      bridgeError: bridge?.bridgeError ?? null,
+      bridgeActiveThreadId: bridge?.bridgeActiveThreadId ?? null,
+      bridgeWorkspacePath: bridge?.bridgeWorkspacePath ?? null,
       closedPreviousWindow,
-      rendererVerified: false,
-      suppressPlainReopen: true
+      rendererVerified: true,
+      accountObservation
     };
+  } finally {
+    launch.watchdog.cancel();
   }
-  if (options.profileName) {
-    await recordOfficialCodexManagedAccountObservation(
-      options.profileName,
-      launch.pid,
-      appServerPid,
-      launch.startedAt,
-      cdpPort
-    );
-    recordManagedLaunchRunaway({
-      watchdog: launch.watchdog,
-      candidate,
-      profileName: options.profileName,
-      pid: launch.pid,
-      startedAt: launch.startedAt,
-      cdpPort
-    });
-  }
-  return {
-    status: "launched",
-    mechanism: "relaunch",
-    reason: null,
-    pid: launch.pid,
-    appServerPid,
-    cdpPort,
-    bridgeStatus: bridge?.bridgeStatus ?? null,
-    bridgeError: bridge?.bridgeError ?? null,
-    bridgeActiveThreadId: bridge?.bridgeActiveThreadId ?? null,
-    bridgeWorkspacePath: bridge?.bridgeWorkspacePath ?? null,
-    closedPreviousWindow,
-    rendererVerified: true,
-    accountObservation
-  };
 }
 function applyOfficialCodexLiveAccountSwitch(options = {}) {
   return enqueueProfileAction("shared-window", async () => {
@@ -35868,6 +36353,8 @@ async function launchOfficialCodexProfileInstanceOnce(options) {
       };
     }
     if (!launch.opened) {
+      launch.watchdog?.cancel();
+      launchedProcess = null;
       const reason = launch.reason ?? "open-failed";
       const failed = failedLaunchState({
         reason,
@@ -36031,14 +36518,7 @@ async function launchOfficialCodexProfileInstanceOnce(options) {
       lastError: null
     };
     await patchManagedInstance(instance);
-    recordManagedLaunchRunaway({
-      watchdog: launchWatchdog,
-      candidate,
-      profileName: options.profileName,
-      pid: launchedPid,
-      startedAt: launch.startedAt,
-      cdpPort
-    });
+    launchWatchdog.cancel();
     launchedProcess = null;
     return {
       status: "started",
@@ -42744,9 +43224,9 @@ Runs the profile bound to the current workspace. --profile warns when it overrid
   }
   const profileName = readOption(flags, "--profile", "-p");
   const allowedFlags = profileName ? /* @__PURE__ */ new Set(["--profile", "-p", "--strict", profileName, `--profile=${profileName}`]) : /* @__PURE__ */ new Set(["--strict"]);
-  const unsupported = flags.filter((entry) => !allowedFlags.has(entry));
-  if (unsupported.length > 0) {
-    throw new Error(`Unsupported run option: ${unsupported[0]}`);
+  const unsupported2 = flags.filter((entry) => !allowedFlags.has(entry));
+  if (unsupported2.length > 0) {
+    throw new Error(`Unsupported run option: ${unsupported2[0]}`);
   }
   if (codexArgs.some(
     (entry) => entry === "-C" || entry.startsWith("-C") && entry.length > 2 || entry === "--cd" || entry.startsWith("--cd=") || entry === "--cwd" || entry.startsWith("--cwd=")
@@ -46060,7 +46540,7 @@ async function ensureCliStorageReady() {
 }
 
 // src/app/main.ts
-var VERSION = true ? "6.1.0" : "0.0.0";
+var VERSION = true ? "6.2.0" : "0.0.0";
 async function runCli() {
   const args2 = process.argv.slice(2);
   if (args2.length === 0) {