codexuse-cli 6.1.1 → 6.2.1

package/dist/index.js

@@ -2082,6 +2082,58 @@ 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,
+    maxActivations: 5
+  };
+}
+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",
@@ -2197,7 +2249,6 @@ var DEFAULT_AUTO_ROLL_ENABLED = false;
 var DEFAULT_AUTO_ROLL_REARM_REMAINING_THRESHOLD = 15;
 var DEFAULT_AUTO_ROLL_SWITCH_REMAINING_THRESHOLD = 5;
 var DEFAULT_LAUNCH_OFFICIAL_CODEX_WHEN_CLOSED_ON_AUTO_ROLL = false;
-var DEFAULT_HANDOFF_RUNNING_THREADS_ON_ACCOUNT_SWITCH = false;
 var DEFAULT_AUTO_ROLL_PRIORITY_ORDER = [];
 var DEFAULT_LOW_REMAINING_NOTIFICATION_ENABLED = false;
 var DEFAULT_LOW_REMAINING_NOTIFICATION_THRESHOLD = 1;
@@ -2305,7 +2356,6 @@ function normalizeAutoRollSettings(raw) {
     rearmRemainingThreshold: normalizedRearm,
     switchRemainingThreshold: normalizedSwitch,
     launchOfficialCodexWhenClosedOnAutoRoll: raw?.launchOfficialCodexWhenClosedOnAutoRoll === true ? true : DEFAULT_LAUNCH_OFFICIAL_CODEX_WHEN_CLOSED_ON_AUTO_ROLL,
-    handoffRunningThreadsOnAccountSwitch: raw?.handoffRunningThreadsOnAccountSwitch === true ? true : DEFAULT_HANDOFF_RUNNING_THREADS_ON_ACCOUNT_SWITCH,
     priorityOrder: sanitizeAutoRollPriorityOrder(raw?.priorityOrder),
     excludedAccountKeys: sanitizeAutoRollExcludedAccountKeys(
       raw?.excludedAccountKeys
@@ -2320,6 +2370,21 @@ function normalizeAutoRollSettings(raw) {
   return normalized;
 }
 
+// ../../packages/contracts/src/work/types.ts
+function createDefaultWorkState() {
+  return {
+    version: 1,
+    plannerProfileName: null,
+    profilePolicies: {},
+    projectsByPath: {},
+    jobsById: {},
+    requestJobIds: {},
+    plansById: {},
+    configMigrationVersion: 0,
+    restartRequiredProfiles: []
+  };
+}
+
 // ../../packages/runtime-app-state/src/storage/documents.ts
 var import_node_fs2 = require("fs");
 var import_node_fs3 = require("fs");
@@ -2360,12 +2425,12 @@ async function openLockDatabase(databasePath) {
     throw error;
   }
 }
-async function acquireCrossProcessFileLockTransaction(filePath, mode) {
+async function acquireCrossProcessFileLockTransaction(filePath, mode, busyTimeoutMs = mode === "write" ? 1e3 : 0) {
   const databasePath = `${import_node_path.default.resolve(filePath)}.codexuse-lock.sqlite`;
   let database = null;
   try {
     database = await openLockDatabase(databasePath);
-    database.exec(`PRAGMA busy_timeout = ${mode === "write" ? 1e3 : 0};`);
+    database.exec(`PRAGMA busy_timeout = ${Math.max(0, Math.trunc(busyTimeoutMs))};`);
     database.exec("CREATE TABLE IF NOT EXISTS codexuse_file_lock (id INTEGER PRIMARY KEY);");
     if (mode === "write") {
       database.exec("BEGIN EXCLUSIVE;");
@@ -2394,8 +2459,8 @@ async function acquireCrossProcessFileLockTransaction(filePath, mode) {
     }
   };
 }
-async function acquireCrossProcessFileLock(filePath) {
-  return acquireCrossProcessFileLockTransaction(filePath, "write");
+async function acquireCrossProcessFileLock(filePath, options = {}) {
+  return acquireCrossProcessFileLockTransaction(filePath, "write", options.busyTimeoutMs);
 }
 async function acquireCrossProcessFileReadLock(filePath) {
   return acquireCrossProcessFileLockTransaction(filePath, "read");
@@ -3408,12 +3473,12 @@ function resolveStorageDbPath() {
 function createDefaultAppState() {
   return {
     schemaVersion: 1,
+    trialExperience: { knownLicenseHolder: false, pendingInteractiveAt: null, trial: null },
     autoRoll: {
       enabled: false,
       rearmRemainingThreshold: 15,
       switchRemainingThreshold: 5,
       launchOfficialCodexWhenClosedOnAutoRoll: false,
-      handoffRunningThreadsOnAccountSwitch: false,
       priorityOrder: [],
       excludedAccountKeys: [],
       lowRemainingNotificationEnabled: false,
@@ -3498,11 +3563,13 @@ function createDefaultAppState() {
         proUnlockedCelebrated: false
       },
       duplicateWarningDismissedKey: null,
-      pendingLicenseActivation: false
+      pendingLicenseActivation: false,
+      pendingCheckout: null
     },
     profileDashboard: {
       customGroupsByAccountKey: {}
     },
+    work: createDefaultWorkState(),
     skills: {
       sources: [],
       installsBySlug: {}
@@ -3547,6 +3614,12 @@ function asStringArray(value3) {
     return [normalized];
   });
 }
+function normalizeAutoRollActivityKind(value3) {
+  if (value3 === "official-codex-handoff") {
+    return "official-codex-activation";
+  }
+  return value3 === "profile-switch" || value3 === "auth-verified" || value3 === "official-codex-activation" || value3 === "official-codex-restart" || value3 === "reset-window-activation" || value3 === "low-remaining-alert" ? value3 : "auto-roll-eval";
+}
 function asStringRecord(value3) {
   if (!isRecord2(value3)) {
     return {};
@@ -3605,7 +3678,6 @@ function normalizeOfficialCodexQolSettings(value3) {
     scrollRestoreEnabled: value3.scrollRestoreEnabled === true,
     conversationTimelineEnabled: value3.conversationTimelineEnabled === true,
     inCodexStatusEnabled: value3.inCodexStatusEnabled !== false,
-    handoffChipEnabled: value3.handoffChipEnabled !== false,
     actionTargets,
     providerStatus,
     overlayAutoRollEnabled: typeof value3.overlayAutoRollEnabled === "boolean" ? value3.overlayAutoRollEnabled : null
@@ -4110,6 +4182,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 +4221,8 @@ function normalizeAppState(raw) {
   const next = deepMerge(defaults, raw);
   const merged = next;
   merged.schemaVersion = 1;
+  merged.work = isRecord2(raw.work) ? deepMerge(createDefaultWorkState(), raw.work) : createDefaultWorkState();
+  merged.trialExperience = normalizeTrialExperience(raw.trialExperience);
   merged.autoRoll = normalizeAutoRollSettings(rawAutoRoll);
   if (!isRecord2(merged.officialCodex)) {
     merged.officialCodex = clone2(defaults.officialCodex);
@@ -4141,10 +4244,11 @@ function normalizeAppState(raw) {
   );
   merged.officialCodex.lastActivationStatus = asString(merged.officialCodex.lastActivationStatus);
   merged.officialCodex.lastActivationReason = asString(merged.officialCodex.lastActivationReason);
-  merged.officialCodex.activity = Array.isArray(merged.officialCodex.activity) ? merged.officialCodex.activity.filter((entry) => isRecord2(entry)).map((entry) => ({
+  const rawOfficialCodexActivity = Array.isArray(rawOfficialCodex?.activity) ? rawOfficialCodex.activity : [];
+  merged.officialCodex.activity = rawOfficialCodexActivity.length > 0 ? rawOfficialCodexActivity.filter(isRecord2).map((entry) => ({
     id: asString(entry.id) ?? "",
     at: asString(entry.at) ?? (/* @__PURE__ */ new Date(0)).toISOString(),
-    kind: entry.kind === "auto-roll-eval" || entry.kind === "profile-switch" || entry.kind === "auth-verified" || entry.kind === "official-codex-activation" || entry.kind === "official-codex-restart" || entry.kind === "official-codex-handoff" || entry.kind === "reset-window-activation" || entry.kind === "low-remaining-alert" ? entry.kind : "auto-roll-eval",
+    kind: normalizeAutoRollActivityKind(entry.kind),
     status: asString(entry.status) ?? "unknown",
     reason: asString(entry.reason),
     decisionId: asString(entry.decisionId),
@@ -4253,7 +4357,7 @@ function normalizeAppState(raw) {
     merged.officialCodex.relayProfilesById
   );
   merged.officialCodex.desktopLlmEnabled = rawOfficialCodex?.desktopLlmEnabled === true;
-  const rawActivationDebt = isRecord2(merged.officialCodex.pendingActivationDebt) ? merged.officialCodex.pendingActivationDebt : null;
+  const rawActivationDebt = isRecord2(rawOfficialCodex?.pendingActivationDebt) ? rawOfficialCodex.pendingActivationDebt : null;
   if (rawActivationDebt) {
     const debt = rawActivationDebt;
     const targetProfileName = asString(debt.targetProfileName);
@@ -4266,23 +4370,17 @@ function normalizeAppState(raw) {
       decisionId: asString(debt.decisionId),
       attempts: asNumberOrNull(debt.attempts) ?? 0,
       lastReason: asString(debt.lastReason),
-      handoffReason: debt.handoffReason === "manual" || debt.handoffReason === "auto-roll" ? debt.handoffReason : null,
-      handoffThreadIds: asStringArray(debt.handoffThreadIds),
-      handoffSentThreadIds: asStringArray(debt.handoffSentThreadIds),
-      sourceActiveThreadIds: asStringArray(debt.sourceActiveThreadIds),
-      sourceCompletedThreadIds: asStringArray(
-        debt.sourceCompletedThreadIds
+      activationSource: debt.activationSource === "manual" || debt.activationSource === "auto-roll" ? debt.activationSource : debt.handoffReason === "manual" ? "manual" : "auto-roll",
+      blockingThreadIds: asStringArray(
+        debt.blockingThreadIds ?? debt.sourceActiveThreadIds
       ),
-      sourceActiveTurnIdsByThreadId: asStringRecord(
-        debt.sourceActiveTurnIdsByThreadId
+      completedBlockingThreadIds: asStringArray(
+        debt.completedBlockingThreadIds ?? debt.sourceCompletedThreadIds
       ),
-      sourceCaptureState: debt.sourceCaptureState === "attaching" || debt.sourceCaptureState === "attached" || debt.sourceCaptureState === "failed" ? debt.sourceCaptureState : null,
-      handoffClientUserMessageIdsByThreadId: asStringRecord(
-        debt.handoffClientUserMessageIdsByThreadId
+      blockingTurnIdsByThreadId: asStringRecord(
+        debt.blockingTurnIdsByThreadId ?? debt.sourceActiveTurnIdsByThreadId
       ),
-      handoffTurnIdsByThreadId: asStringRecord(
-        debt.handoffTurnIdsByThreadId
-      )
+      sourceListenerState: debt.sourceListenerState === "attaching" || debt.sourceListenerState === "attached" || debt.sourceListenerState === "failed" ? debt.sourceListenerState : debt.sourceCaptureState === "attaching" || debt.sourceCaptureState === "attached" || debt.sourceCaptureState === "failed" ? debt.sourceCaptureState : null
     } : null;
   } else {
     merged.officialCodex.pendingActivationDebt = null;
@@ -4562,6 +4660,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)) {
@@ -5062,7 +5161,6 @@ var CLOUD_SYNC_RUNTIME_SETTING_KEYS = /* @__PURE__ */ new Set([
   "officialCodexScrollRestoreEnabled",
   "officialCodexConversationTimelineEnabled",
   "officialCodexInCodexStatusEnabled",
-  "officialCodexHandoffChipEnabled",
   "officialCodexRelayMode",
   "officialCodexRelayProfileId",
   "officialCodexModelWhitelistUnlockEnabled",
@@ -5139,27 +5237,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();
@@ -5201,7 +5307,6 @@ async function writeCodexSettingsJsonRaw(payload) {
       rearmRemainingThreshold: autoRoll.rearmRemainingThreshold,
       switchRemainingThreshold: autoRoll.switchRemainingThreshold,
       launchOfficialCodexWhenClosedOnAutoRoll: autoRoll.launchOfficialCodexWhenClosedOnAutoRoll,
-      handoffRunningThreadsOnAccountSwitch: autoRoll.handoffRunningThreadsOnAccountSwitch,
       priorityOrder: autoRoll.priorityOrder,
       excludedAccountKeys: autoRoll.excludedAccountKeys,
       lowRemainingNotificationEnabled: autoRoll.lowRemainingNotificationEnabled,
@@ -5254,46 +5359,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 +5627,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 +5639,7 @@ function lockReasonFor(info) {
 }
 function buildLockedTrialInfo(stored) {
   return {
+    startedAt: null,
     active: false,
     expired: true,
     expiresAt: stored?.expiresAt ?? null,
@@ -6078,6 +6145,7 @@ var LicenseService = class {
   constructor() {
     this.refreshPromise = null;
     this.verificationPromise = null;
+    this.activationTail = Promise.resolve();
   }
   async getCachedStatus() {
     try {
@@ -6129,8 +6197,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 +6231,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 +6247,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 +6264,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 +6278,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.");
@@ -23636,6 +23729,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",
@@ -23672,17 +23766,10 @@ var RPC_METHODS = {
   autoRollResolveDecision: "autoRoll.resolveDecision",
   officialCodexActivate: "officialCodex.activate",
   officialCodexInstances: "officialCodex.instances",
-  officialCodexLaunchProfile: "officialCodex.launchProfile",
-  officialCodexFocusProfile: "officialCodex.focusProfile",
+  accountsOpen: "accounts.open",
   officialCodexStopProfile: "officialCodex.stopProfile",
   officialCodexRestartProfile: "officialCodex.restartProfile",
-  officialCodexUseProfile: "officialCodex.useProfile",
-  officialCodexLaunchProfiles: "officialCodex.launchProfiles",
-  officialCodexStopProfiles: "officialCodex.stopProfiles",
   officialCodexActivateProfiles: "officialCodex.activateProfiles",
-  officialCodexPrepareDraftHandoff: "officialCodex.prepareDraftHandoff",
-  officialCodexOpenWorkspace: "officialCodex.openWorkspace",
-  officialCodexOpenDevTools: "officialCodex.openDevTools",
   officialCodexApplyQol: "officialCodex.applyQol",
   officialCodexApplyPower: "officialCodex.applyPower",
   officialCodexRefreshBridgeCapabilities: "officialCodex.refreshBridgeCapabilities",
@@ -23722,7 +23809,27 @@ var RPC_METHODS = {
   accountPoolClearSession: "accountPool.clearSession",
   accountPoolListRecentRequests: "accountPool.listRecentRequests",
   accountPoolTestModels: "accountPool.testModels",
-  accountPoolTestResponse: "accountPool.testResponse"
+  accountPoolTestResponse: "accountPool.testResponse",
+  workGetSnapshot: "work.getSnapshot",
+  workOpenFolder: "work.openFolder",
+  workOpenWindows: "work.openWindows",
+  workStartPlan: "work.startPlan",
+  workOpenPlan: "work.openPlan",
+  workRemovePlan: "work.removePlan",
+  workSetPlanner: "work.setPlanner",
+  workUpdateProfilePolicy: "work.updateProfilePolicy",
+  workAuthorizeProject: "work.authorizeProject",
+  workProjectPreview: "work.project.preview",
+  workDelegate: "work.delegate",
+  workAction: "work.action",
+  workDiffReview: "work.diff.review",
+  workHistoryList: "work.history.list",
+  workHistoryOpen: "work.history.open",
+  workConfigGet: "work.config.get",
+  workConfigSaveShared: "work.config.saveShared",
+  workConfigSaveOverride: "work.config.saveOverride",
+  workConfigResetOverride: "work.config.resetOverride",
+  workConfigReconcileExternal: "work.config.reconcileExternal"
 };
 var RPC_CHANNELS = {
   runtimeProvidersUpdated: "runtime.providersUpdated",
@@ -23733,7 +23840,8 @@ var RPC_CHANNELS = {
   autoRollDecision: "autoRoll.decision",
   officialCodexActivationProgress: "officialCodex.activationProgress",
   officialCodexActivityUpdated: "officialCodex.activityUpdated",
-  officialCodexStatusUpdated: "officialCodex.statusUpdated"
+  officialCodexStatusUpdated: "officialCodex.statusUpdated",
+  workUpdated: "work.updated"
 };
 
 // ../../packages/contracts/src/filesystem.ts
@@ -23818,7 +23926,14 @@ var DesktopRpcRequestBody = Schema_exports.Union([
   tagRequestBody(RPC_METHODS.runtimeRefreshProviders, Schema_exports.Struct({})),
   // 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.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,
@@ -23839,21 +23954,27 @@ var DesktopRpcRequestBody = Schema_exports.Union([
   tagRequestBody(
     RPC_METHODS.codexConfigGet,
     Schema_exports.Struct({
-      codexHomePath: Schema_exports.optional(Schema_exports.Union([Schema_exports.String, Schema_exports.Null]))
+      codexHomePath: Schema_exports.optional(
+        Schema_exports.Union([Schema_exports.String, Schema_exports.Null])
+      )
     })
   ),
   tagRequestBody(
     RPC_METHODS.codexConfigSaveRaw,
     Schema_exports.Struct({
       content: Schema_exports.String,
-      codexHomePath: Schema_exports.optional(Schema_exports.Union([Schema_exports.String, Schema_exports.Null]))
+      codexHomePath: Schema_exports.optional(
+        Schema_exports.Union([Schema_exports.String, Schema_exports.Null])
+      )
     })
   ),
   tagRequestBody(
     RPC_METHODS.codexConfigUpdate,
     Schema_exports.Struct({
       updates: Schema_exports.Unknown,
-      codexHomePath: Schema_exports.optional(Schema_exports.Union([Schema_exports.String, Schema_exports.Null]))
+      codexHomePath: Schema_exports.optional(
+        Schema_exports.Union([Schema_exports.String, Schema_exports.Null])
+      )
     })
   ),
   tagRequestBody(
@@ -23861,7 +23982,9 @@ var DesktopRpcRequestBody = Schema_exports.Union([
     Schema_exports.Struct({
       binaryPath: Schema_exports.optional(Schema_exports.Union([Schema_exports.String, Schema_exports.Null])),
       args: Schema_exports.optional(Schema_exports.Union([Schema_exports.String, Schema_exports.Null])),
-      codexHomePath: Schema_exports.optional(Schema_exports.Union([Schema_exports.String, Schema_exports.Null]))
+      codexHomePath: Schema_exports.optional(
+        Schema_exports.Union([Schema_exports.String, Schema_exports.Null])
+      )
     })
   ),
   tagRequestBody(RPC_METHODS.codexRuntimeUpdate, Schema_exports.Struct({})),
@@ -23906,8 +24029,6 @@ var DesktopRpcRequestBody = Schema_exports.Union([
       reason: Schema_exports.optional(
         Schema_exports.Union([Schema_exports.Literal("manual"), Schema_exports.Literal("auto-roll")])
       ),
-      carryDraft: Schema_exports.optional(Schema_exports.Boolean),
-      continueThreadId: Schema_exports.optional(Schema_exports.Union([Schema_exports.String, Schema_exports.Null])),
       forceAdopt: Schema_exports.optional(Schema_exports.Boolean),
       launchIfNotRunning: Schema_exports.optional(Schema_exports.Boolean),
       awaitCodexFollowUp: Schema_exports.optional(Schema_exports.Boolean)
@@ -23989,21 +24110,16 @@ var DesktopRpcRequestBody = Schema_exports.Union([
     RPC_METHODS.autoRollResolveDecision,
     Schema_exports.Struct({
       id: TrimmedNonEmptyString,
-      action: Schema_exports.Union([Schema_exports.Literal("accept"), Schema_exports.Literal("cancel")])
+      action: Schema_exports.Union([
+        Schema_exports.Literal("accept"),
+        Schema_exports.Literal("cancel")
+      ])
     })
   ),
   tagRequestBody(RPC_METHODS.officialCodexActivate, Schema_exports.Struct({})),
   tagRequestBody(RPC_METHODS.officialCodexInstances, Schema_exports.Struct({})),
   tagRequestBody(
-    RPC_METHODS.officialCodexLaunchProfile,
-    Schema_exports.Struct({
-      name: TrimmedNonEmptyString,
-      desiredQolSettings: Schema_exports.optional(Schema_exports.Unknown),
-      desiredPowerSettings: Schema_exports.optional(Schema_exports.Unknown)
-    })
-  ),
-  tagRequestBody(
-    RPC_METHODS.officialCodexFocusProfile,
+    RPC_METHODS.accountsOpen,
     Schema_exports.Struct({
       name: TrimmedNonEmptyString,
       desiredQolSettings: Schema_exports.optional(Schema_exports.Unknown),
@@ -24022,26 +24138,6 @@ var DesktopRpcRequestBody = Schema_exports.Union([
       desiredPowerSettings: Schema_exports.optional(Schema_exports.Unknown)
     })
   ),
-  tagRequestBody(
-    RPC_METHODS.officialCodexUseProfile,
-    Schema_exports.Struct({
-      name: TrimmedNonEmptyString,
-      desiredQolSettings: Schema_exports.optional(Schema_exports.Unknown),
-      desiredPowerSettings: Schema_exports.optional(Schema_exports.Unknown)
-    })
-  ),
-  tagRequestBody(
-    RPC_METHODS.officialCodexLaunchProfiles,
-    Schema_exports.Struct({
-      names: Schema_exports.Array(TrimmedNonEmptyString),
-      desiredQolSettings: Schema_exports.optional(Schema_exports.Unknown),
-      desiredPowerSettings: Schema_exports.optional(Schema_exports.Unknown)
-    })
-  ),
-  tagRequestBody(
-    RPC_METHODS.officialCodexStopProfiles,
-    Schema_exports.Struct({ names: Schema_exports.Array(TrimmedNonEmptyString) })
-  ),
   tagRequestBody(
     RPC_METHODS.officialCodexActivateProfiles,
     Schema_exports.Struct({
@@ -24049,28 +24145,6 @@ var DesktopRpcRequestBody = Schema_exports.Union([
       desiredPowerSettings: Schema_exports.optional(Schema_exports.Unknown)
     })
   ),
-  tagRequestBody(
-    RPC_METHODS.officialCodexPrepareDraftHandoff,
-    Schema_exports.Struct({
-      sourceProfileName: TrimmedNonEmptyString,
-      targetProfileName: TrimmedNonEmptyString,
-      desiredQolSettings: Schema_exports.optional(Schema_exports.Unknown),
-      desiredPowerSettings: Schema_exports.optional(Schema_exports.Unknown)
-    })
-  ),
-  tagRequestBody(
-    RPC_METHODS.officialCodexOpenWorkspace,
-    Schema_exports.Struct({
-      profileName: TrimmedNonEmptyString,
-      editor: TrimmedNonEmptyString
-    })
-  ),
-  tagRequestBody(
-    RPC_METHODS.officialCodexOpenDevTools,
-    Schema_exports.Struct({
-      profileName: TrimmedNonEmptyString
-    })
-  ),
   tagRequestBody(
     RPC_METHODS.officialCodexApplyQol,
     Schema_exports.Struct({
@@ -24211,7 +24285,10 @@ var DesktopRpcRequestBody = Schema_exports.Union([
   ),
   tagRequestBody(
     RPC_METHODS.desktopLlmSetRoutePublished,
-    Schema_exports.Struct({ publicSlug: TrimmedNonEmptyString, published: Schema_exports.Boolean })
+    Schema_exports.Struct({
+      publicSlug: TrimmedNonEmptyString,
+      published: Schema_exports.Boolean
+    })
   ),
   tagRequestBody(
     RPC_METHODS.desktopLlmProbeRoute,
@@ -24252,16 +24329,102 @@ var DesktopRpcRequestBody = Schema_exports.Union([
   tagRequestBody(
     RPC_METHODS.desktopLlmRuntimeControl,
     Schema_exports.Struct({
-      action: Schema_exports.Union([
-        Schema_exports.Literal("drain"),
-        Schema_exports.Literal("resume")
-      ])
+      action: Schema_exports.Union([Schema_exports.Literal("drain"), Schema_exports.Literal("resume")])
     })
   ),
   tagRequestBody(RPC_METHODS.cliInfo, Schema_exports.Struct({})),
   tagRequestBody(RPC_METHODS.cliStatus, Schema_exports.Struct({})),
   tagRequestBody(RPC_METHODS.cliCheckFreshness, Schema_exports.Struct({})),
-  tagRequestBody(RPC_METHODS.cliUpdateGlobal, Schema_exports.Struct({}))
+  tagRequestBody(RPC_METHODS.cliUpdateGlobal, Schema_exports.Struct({})),
+  tagRequestBody(RPC_METHODS.workGetSnapshot, Schema_exports.Struct({})),
+  tagRequestBody(RPC_METHODS.workStartPlan, Schema_exports.Struct({ input: Schema_exports.Unknown })),
+  tagRequestBody(RPC_METHODS.workOpenPlan, Schema_exports.Struct({ planId: TrimmedNonEmptyString })),
+  tagRequestBody(RPC_METHODS.workRemovePlan, Schema_exports.Struct({ planId: TrimmedNonEmptyString })),
+  tagRequestBody(RPC_METHODS.workOpenWindows, Schema_exports.Struct({ jobId: TrimmedNonEmptyString })),
+  tagRequestBody(RPC_METHODS.workOpenFolder, Schema_exports.Struct({
+    profileName: TrimmedNonEmptyString,
+    folderPath: TrimmedNonEmptyString
+  })),
+  tagRequestBody(
+    RPC_METHODS.workSetPlanner,
+    Schema_exports.Struct({ profileName: TrimmedNonEmptyString })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workUpdateProfilePolicy,
+    Schema_exports.Struct({
+      profileName: TrimmedNonEmptyString,
+      patch: Schema_exports.Unknown
+    })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workAuthorizeProject,
+    Schema_exports.Struct({ permission: Schema_exports.Unknown })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workProjectPreview,
+    Schema_exports.Struct({ repositoryPath: TrimmedNonEmptyString })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workDelegate,
+    Schema_exports.Struct({ input: Schema_exports.Unknown })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workAction,
+    Schema_exports.Struct({ input: Schema_exports.Unknown })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workDiffReview,
+    Schema_exports.Struct({
+      jobId: TrimmedNonEmptyString,
+      offset: Schema_exports.optional(Schema_exports.Number),
+      diffHash: Schema_exports.optional(Schema_exports.String)
+    })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workHistoryList,
+    Schema_exports.Struct({ input: Schema_exports.Unknown })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workHistoryOpen,
+    Schema_exports.Struct({
+      profileName: TrimmedNonEmptyString,
+      threadId: TrimmedNonEmptyString
+    })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workConfigGet,
+    Schema_exports.Struct({
+      profileName: Schema_exports.optional(Schema_exports.Union([Schema_exports.String, Schema_exports.Null]))
+    })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workConfigSaveShared,
+    Schema_exports.Struct({
+      content: Schema_exports.String,
+      expectedRevision: TrimmedNonEmptyString
+    })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workConfigSaveOverride,
+    Schema_exports.Struct({
+      profileName: TrimmedNonEmptyString,
+      content: Schema_exports.String,
+      expectedRevision: Schema_exports.optional(
+        Schema_exports.Union([Schema_exports.String, Schema_exports.Null])
+      )
+    })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workConfigResetOverride,
+    Schema_exports.Struct({ profileName: TrimmedNonEmptyString })
+  ),
+  tagRequestBody(
+    RPC_METHODS.workConfigReconcileExternal,
+    Schema_exports.Struct({
+      profileName: TrimmedNonEmptyString,
+      expectedRevision: TrimmedNonEmptyString
+    })
+  )
 ]);
 var DesktopRpcRequest = Schema_exports.Struct({
   id: TrimmedNonEmptyString,
@@ -24319,6 +24482,10 @@ var RpcPushOfficialCodexStatusUpdated = makeRpcPushSchema(
   RPC_CHANNELS.officialCodexStatusUpdated,
   Schema_exports.Unknown
 );
+var RpcPushWorkUpdated = makeRpcPushSchema(
+  RPC_CHANNELS.workUpdated,
+  Schema_exports.Unknown
+);
 var RpcPushChannelSchema = Schema_exports.Literals([
   RPC_CHANNELS.runtimeProvidersUpdated,
   RPC_CHANNELS.profilesSwitched,
@@ -24328,7 +24495,8 @@ var RpcPushChannelSchema = Schema_exports.Literals([
   RPC_CHANNELS.autoRollDecision,
   RPC_CHANNELS.officialCodexActivationProgress,
   RPC_CHANNELS.officialCodexActivityUpdated,
-  RPC_CHANNELS.officialCodexStatusUpdated
+  RPC_CHANNELS.officialCodexStatusUpdated,
+  RPC_CHANNELS.workUpdated
 ]);
 var RpcPush = Schema_exports.Union([
   RpcPushRuntimeProvidersUpdated,
@@ -24339,7 +24507,8 @@ var RpcPush = Schema_exports.Union([
   RpcPushAutoRollDecision,
   RpcPushOfficialCodexActivationProgress,
   RpcPushOfficialCodexActivityUpdated,
-  RpcPushOfficialCodexStatusUpdated
+  RpcPushOfficialCodexStatusUpdated,
+  RpcPushWorkUpdated
 ]);
 var RpcPushEnvelopeBase = Schema_exports.Struct({
   type: Schema_exports.Literal("push"),
@@ -26916,7 +27085,7 @@ function createBridgeSnapshotExpression() {
       capabilities: {
         health: healthReady,
         snapshot: commandReady("snapshot"),
-        draft: commandReady("setDraft"),
+        draft: false,
         qol: commandReady("applyQol"),
         power: commandReady("applyPower"),
         modelWhitelist: commandReady("applyPower"),
@@ -26943,114 +27112,6 @@ function createBridgeSnapshotExpression() {
     return snapshot;
   })()`;
 }
-function createBridgeSetDraftPromptExpression(prompt) {
-  return `(() => {
-    const prompt = ${JSON.stringify(prompt)};
-    const visible = (element) => {
-      if (!element || !(element instanceof HTMLElement)) return false;
-      const style = window.getComputedStyle(element);
-      const rect = element.getBoundingClientRect();
-      return style.visibility !== "hidden" &&
-        style.display !== "none" &&
-        rect.width > 0 &&
-        rect.height > 0 &&
-        !element.hasAttribute("disabled") &&
-        element.getAttribute("aria-disabled") !== "true";
-    };
-    const dispatchInput = (element) => {
-      try {
-        element.dispatchEvent(new InputEvent("input", {
-          bubbles: true,
-          cancelable: true,
-          inputType: "insertText",
-          data: prompt
-        }));
-      } catch {
-        element.dispatchEvent(new Event("input", { bubbles: true }));
-      }
-      element.dispatchEvent(new Event("change", { bubbles: true }));
-    };
-    const setNativeValue = (element, value) => {
-      const proto = Object.getPrototypeOf(element);
-      const descriptor = proto ? Object.getOwnPropertyDescriptor(proto, "value") : null;
-      if (descriptor?.set) {
-        descriptor.set.call(element, value);
-      } else {
-        element.value = value;
-      }
-    };
-    const selectors = [
-      "textarea",
-      "input[type='text']",
-      "[contenteditable='true']",
-      "[role='textbox']"
-    ];
-    const candidates = selectors.flatMap((selector) =>
-      Array.from(document.querySelectorAll(selector))
-    ).filter(visible);
-    const emptyPreferred = candidates.find((element) => {
-      const value = element instanceof HTMLTextAreaElement || element instanceof HTMLInputElement
-        ? element.value
-        : element.textContent;
-      return !String(value ?? "").trim();
-    });
-    const target = emptyPreferred ?? candidates[0] ?? null;
-    if (!target) {
-      return {
-        status: "not-found",
-        reason: "composer-not-found",
-        route: window.location.pathname + window.location.search + window.location.hash
-      };
-    }
-    target.focus();
-    if (target instanceof HTMLTextAreaElement || target instanceof HTMLInputElement) {
-      setNativeValue(target, prompt);
-      dispatchInput(target);
-      return {
-        status: "inserted",
-        reason: null,
-        route: window.location.pathname + window.location.search + window.location.hash
-      };
-    }
-    const selection = window.getSelection();
-    if (selection) {
-      const range = document.createRange();
-      range.selectNodeContents(target);
-      selection.removeAllRanges();
-      selection.addRange(range);
-    }
-    const inserted = document.execCommand?.("insertText", false, prompt);
-    if (!inserted) {
-      target.textContent = prompt;
-    }
-    dispatchInput(target);
-    return {
-      status: "inserted",
-      reason: null,
-      route: window.location.pathname + window.location.search + window.location.hash
-    };
-  })()`;
-}
-function createBridgeReadComposerExpression() {
-  return `(() => {
-    const visible = (element) => {
-      if (!element || !(element instanceof HTMLElement)) return false;
-      const style = window.getComputedStyle(element);
-      const rect = element.getBoundingClientRect();
-      return style.visibility !== "hidden" && style.display !== "none" && rect.width > 0 && rect.height > 0;
-    };
-    const valueOf = (element) =>
-      element instanceof HTMLTextAreaElement || element instanceof HTMLInputElement
-        ? element.value
-        : element.textContent;
-    const candidates = ["textarea", "input[type='text']", "[contenteditable='true']", "[role='textbox']"]
-      .flatMap((selector) => Array.from(document.querySelectorAll(selector)))
-      .filter(visible);
-    const filled = candidates.find((element) => String(valueOf(element) ?? "").trim());
-    const target = filled ?? candidates[0] ?? null;
-    return { text: target ? String(valueOf(target) ?? "") : "" };
-  })()`;
-}
 function buildInCodexStatusOverlayCssRules() {
   const id2 = "#codexuse-profile-menu-section";
   return [
@@ -27078,8 +27139,6 @@ function buildInCodexStatusOverlayCssRules() {
     `${id2} .codexuse-meter[data-tone="critical"] > i{background:var(--cu-crit);}`,
     // Hangs under the account it acts on. It used to be a full-width bold blue
     // row between two accounts, louder than either and owned by neither.
-    `${id2} button.codexuse-handoff-button{width:calc(100% - 17px);margin:1px 0 2px 17px;overflow:hidden;padding:3px 8px;color:var(--cu-muted);font-size:11px;text-overflow:ellipsis;white-space:nowrap;}`,
-    `${id2} button.codexuse-handoff-button:hover,${id2} button.codexuse-handoff-button:focus-visible{color:var(--cu-accent);}`,
     `${id2} .codexuse-decision{margin:3px 4px 5px;padding:8px;border:1px solid color-mix(in srgb,var(--cu-low) 38%,transparent);border-radius:8px;background:color-mix(in srgb,var(--cu-low) 8%,transparent);}`,
     `${id2} .codexuse-decision-title{font-size:12px;font-weight:600;line-height:16px;}`,
     `${id2} .codexuse-decision-detail{margin-top:2px;color:var(--cu-muted);font-size:11px;line-height:15px;}`,
@@ -27111,16 +27170,12 @@ function createBridgeApplyQolExpression(settings) {
     const scrollRestoreEnabled = ${JSON.stringify(settings.scrollRestoreEnabled === true)};
     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
-  )};
-    let currentOverlayRunningThreadHandoffEnabled = ${JSON.stringify(
-    typeof settings.overlayRunningThreadHandoffEnabled === "boolean" ? settings.overlayRunningThreadHandoffEnabled : null
   )};
     let currentWideViewEnabled = wideViewEnabled;
     let currentScrollRestoreEnabled = scrollRestoreEnabled;
@@ -27150,8 +27205,8 @@ function createBridgeApplyQolExpression(settings) {
     const profileMenuId = "codexuse-profile-menu-section";
     const legacySettingsId = "codexuse-settings-section";
     const legacyStatusId = "codexuse-status-pill";
-    const legacyHandoffId = "codexuse-handoff-chip";
-    const legacyHandoffPickerId = "codexuse-handoff-picker";
+    const legacyContinuationId = "codexuse-handoff-chip";
+    const legacyContinuationPickerId = "codexuse-handoff-picker";
     // Codex desktop is a SPA whose URL never changes per thread; key scroll
     // state by the open conversation id so each chat restores independently.
     const route = () => {
@@ -27531,7 +27586,6 @@ function createBridgeApplyQolExpression(settings) {
       try {
         const actionMessage =
           action === "switch" ? "Switching\u2026"
-            : action === "continue" ? "Moving thread\u2026"
             : action === "auto-roll-accept" ? "Switching\u2026"
             : action === "auto-roll-cancel" ? "Staying here"
             : action === "setting" ? "Saving\u2026"
@@ -27592,9 +27646,6 @@ function createBridgeApplyQolExpression(settings) {
         if (typeof result.overlayAutoRollEnabled === "boolean") {
           currentOverlayAutoRollEnabled = result.overlayAutoRollEnabled;
         }
-        if (typeof result.overlayRunningThreadHandoffEnabled === "boolean") {
-          currentOverlayRunningThreadHandoffEnabled = result.overlayRunningThreadHandoffEnabled;
-        }
         if (result.providerStatus && typeof result.providerStatus.publishedModelCount === "number") {
           customModelCount = Math.max(0, Math.floor(result.providerStatus.publishedModelCount));
         }
@@ -27614,8 +27665,8 @@ function createBridgeApplyQolExpression(settings) {
     };
     const renderProfileMenu = () => {
       document.getElementById(legacyStatusId)?.remove();
-      document.getElementById(legacyHandoffId)?.remove();
-      document.getElementById(legacyHandoffPickerId)?.remove();
+      document.getElementById(legacyContinuationId)?.remove();
+      document.getElementById(legacyContinuationPickerId)?.remove();
       document.getElementById(legacySettingsId)?.remove();
       const previous = document.getElementById(profileMenuId);
       const threadId = activeThreadId();
@@ -27633,12 +27684,9 @@ function createBridgeApplyQolExpression(settings) {
       const renderKey = JSON.stringify({
         targets: allTargets,
         canonicalSyncLine: currentCanonicalSyncLine,
-        handoffEnabled,
-        hasThread: Boolean(threadId),
         customModelCount,
         currentAutoRollDecision,
         currentOverlayAutoRollEnabled,
-        currentOverlayRunningThreadHandoffEnabled,
         currentWideViewEnabled,
         currentScrollRestoreEnabled,
         currentConversationTimelineEnabled,
@@ -27822,23 +27870,6 @@ function createBridgeApplyQolExpression(settings) {
           row.setAttribute("aria-disabled", "true");
         }
         section.appendChild(row);
-        if (canSwitch && handoffEnabled && threadId) {
-          const handoffButton = document.createElement("button");
-          handoffButton.type = "button";
-          handoffButton.className = "codexuse-handoff-button";
-          handoffButton.setAttribute("role", "menuitem");
-          // Names its own target, so a row sandwiched between two profiles can
-          // never be read as belonging to the wrong one.
-          handoffButton.textContent = "\u21B3 Continue this thread in " + label.textContent;
-          handoffButton.setAttribute("aria-label", "Continue this thread in " + label.textContent);
-          handoffButton.addEventListener("click", (event) => {
-            event.preventDefault();
-            event.stopPropagation();
-            setMenuButtonsDisabled(true);
-            requestAction("continue", target);
-          }, true);
-          section.appendChild(handoffButton);
-        }
       });
       const appendSettingRow = (item) => {
         const row = document.createElement("button");
@@ -27887,14 +27918,6 @@ function createBridgeApplyQolExpression(settings) {
               enabled: currentOverlayAutoRollEnabled,
             }]
           : []),
-        ...(typeof currentOverlayRunningThreadHandoffEnabled === "boolean"
-          ? [{
-              key: "runningThreadHandoff",
-              label: "Continue running threads",
-              detail: "Move active work after a switch",
-              enabled: currentOverlayRunningThreadHandoffEnabled,
-            }]
-          : []),
         {
           key: "wideView",
           label: "Wide conversations",
@@ -27963,11 +27986,11 @@ function createBridgeApplyQolExpression(settings) {
         return element?.id === profileMenuId ||
           element?.id === legacySettingsId ||
           element?.id === legacyStatusId ||
-          element?.id === legacyHandoffId ||
-          element?.id === legacyHandoffPickerId ||
+          element?.id === legacyContinuationId ||
+          element?.id === legacyContinuationPickerId ||
           element?.classList?.contains(timelineClass) ||
           Boolean(element?.closest?.(
-            "." + timelineClass + ",#" + profileMenuId + ",#" + legacySettingsId + ",#" + legacyStatusId + ",#" + legacyHandoffId + ",#" + legacyHandoffPickerId
+            "." + timelineClass + ",#" + profileMenuId + ",#" + legacySettingsId + ",#" + legacyStatusId + ",#" + legacyContinuationId + ",#" + legacyContinuationPickerId
           ));
       };
       const isVisualOnlyMutation = (mutation) => {
@@ -27989,8 +28012,8 @@ function createBridgeApplyQolExpression(settings) {
         document.getElementById(profileMenuId)?.remove();
         document.getElementById(legacySettingsId)?.remove();
         document.getElementById(legacyStatusId)?.remove();
-        document.getElementById(legacyHandoffId)?.remove();
-        document.getElementById(legacyHandoffPickerId)?.remove();
+        document.getElementById(legacyContinuationId)?.remove();
+        document.getElementById(legacyContinuationPickerId)?.remove();
       };
     } else {
       document.querySelectorAll("." + timelineClass).forEach((node) => node.remove());
@@ -27998,8 +28021,8 @@ function createBridgeApplyQolExpression(settings) {
       document.getElementById(profileMenuId)?.remove();
       document.getElementById(legacySettingsId)?.remove();
       document.getElementById(legacyStatusId)?.remove();
-      document.getElementById(legacyHandoffId)?.remove();
-      document.getElementById(legacyHandoffPickerId)?.remove();
+      document.getElementById(legacyContinuationId)?.remove();
+      document.getElementById(legacyContinuationPickerId)?.remove();
     }
 
     state.wideViewEnabled = wideViewEnabled;
@@ -29222,22 +29245,6 @@ function normalizeBridgeSnapshot(value3) {
     relayStatus: normalizeRelayStatus(record2.relayStatus)
   };
 }
-function normalizeDraftPromptInsertionResult(value3) {
-  if (!value3 || typeof value3 !== "object") {
-    return {
-      status: "failed",
-      reason: "invalid-bridge-result",
-      route: null
-    };
-  }
-  const record2 = value3;
-  const status = record2.status === "inserted" || record2.status === "not-found" || record2.status === "unavailable" || record2.status === "failed" ? record2.status : "failed";
-  return {
-    status,
-    reason: sanitizeUserFacingError(record2.reason),
-    route: typeof record2.route === "string" ? record2.route : null
-  };
-}
 function normalizeQolScriptResult(value3, settings) {
   if (!value3 || typeof value3 !== "object") {
     return {
@@ -29341,18 +29348,16 @@ function normalizeOfficialCodexQolSettings2(value3) {
     scrollRestoreEnabled: value3.scrollRestoreEnabled === true,
     conversationTimelineEnabled: value3.conversationTimelineEnabled === true,
     inCodexStatusEnabled: value3.inCodexStatusEnabled !== false,
-    handoffChipEnabled: value3.handoffChipEnabled !== false,
     actionTargets,
     providerStatus,
     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,
     overlayAccountActionMode: value3.overlayAccountActionMode === "shared-switch" || value3.overlayAccountActionMode === "isolated-open" ? value3.overlayAccountActionMode : null
   };
 }
 function hasActiveQolSettings(settings) {
-  return settings.wideViewEnabled || settings.scrollRestoreEnabled || settings.conversationTimelineEnabled || settings.inCodexStatusEnabled || settings.handoffChipEnabled === false;
+  return settings.wideViewEnabled || settings.scrollRestoreEnabled || settings.conversationTimelineEnabled || settings.inCodexStatusEnabled;
 }
 function hasActivePowerSettings(settings) {
   return settings.relayMode !== "off" || settings.modelWhitelistUnlockEnabled || settings.pluginMarketplaceUnlockEnabled || settings.forcePluginInstallEnabled;
@@ -29468,7 +29473,6 @@ function createBridgeInstallExpression() {
     state.commands = {
       health: true,
       snapshot: true,
-      setDraft: true,
       sendMessage: true,
       applyQol: true,
       applyPower: true
@@ -30528,11 +30532,11 @@ async function startOfficialCodexBridgeActionListenerOnce(args2) {
       if (!id2 || !rememberBridgeActionId(id2)) {
         return;
       }
-      const action = payload.action === "continue" || payload.action === "switch" || payload.action === "auto-roll" || payload.action === "auto-roll-accept" || payload.action === "auto-roll-cancel" || payload.action === "restart" || payload.action === "setting" ? payload.action : null;
+      const action = payload.action === "switch" || payload.action === "auto-roll" || payload.action === "auto-roll-accept" || payload.action === "auto-roll-cancel" || payload.action === "restart" || payload.action === "setting" ? payload.action : null;
       if (!action) {
         return;
       }
-      const settingKey = payload.settingKey === "autoRoll" || payload.settingKey === "runningThreadHandoff" || payload.settingKey === "wideView" || payload.settingKey === "scrollRestore" || payload.settingKey === "conversationTimeline" || payload.settingKey === "handoffChip" ? payload.settingKey : null;
+      const settingKey = payload.settingKey === "autoRoll" || payload.settingKey === "wideView" || payload.settingKey === "scrollRestore" || payload.settingKey === "conversationTimeline" ? payload.settingKey : null;
       const settingValue = typeof payload.settingValue === "boolean" ? payload.settingValue : null;
       if (action === "setting" && (!settingKey || settingValue === null)) {
         return;
@@ -31023,6 +31027,25 @@ function enqueueProfileAction(profileName, work) {
   });
   return run2;
 }
+var LAUNCH_LOCK_NAME = ".codexuse-launch.lock";
+var LAUNCH_LOCK_WAIT_MS = 6e4;
+async function withProfileLaunchFileLock(profileHome, work, options) {
+  const accountKey = options.profileKey?.trim();
+  const lockPath = accountKey ? import_node_path12.default.join(resolveProfileCodexHomesRoot(), ".launch-locks", (0, import_node_crypto11.createHash)("sha256").update(accountKey).digest("hex")) : import_node_path12.default.join(profileHome, LAUNCH_LOCK_NAME);
+  const deadline = Date.now() + (options.waitMs ?? LAUNCH_LOCK_WAIT_MS);
+  for (; ; ) {
+    const release = await acquireCrossProcessFileLock(lockPath, { busyTimeoutMs: 0 });
+    if (release) {
+      try {
+        return await work();
+      } finally {
+        await release();
+      }
+    }
+    if (Date.now() >= deadline) return options.onBusy();
+    await sleep3(250);
+  }
+}
 async function readProcessRows() {
   const result2 = await runCommand2(
     "/bin/ps",
@@ -31783,128 +31806,6 @@ async function verifyCurrentManagedProfileProof(instance, runtime, candidate, op
   });
   return migrated;
 }
-async function resolveOfficialCodexBridgeTarget(args2) {
-  const existing = args2.state.officialCodex.instancesByProfileName[args2.profileName] ?? null;
-  if (existing) {
-    const runtime = await resolveInstanceRuntimeState({
-      instance: existing,
-      candidate: args2.candidate,
-      rows: args2.rows
-    });
-    const verified = await verifyCurrentManagedProfileProof(
-      existing,
-      runtime,
-      args2.candidate,
-      { requireCdpBrowser: true }
-    );
-    if (verified) {
-      return { instance: verified, runtime, managed: true };
-    }
-  }
-  const runningManagedPids = /* @__PURE__ */ new Set();
-  for (const instance of Object.values(
-    args2.state.officialCodex.instancesByProfileName
-  )) {
-    if (instance.profileName === args2.profileName) {
-      continue;
-    }
-    const runtime = await resolveInstanceRuntimeState({
-      instance,
-      candidate: args2.candidate,
-      rows: args2.rows
-    });
-    const verified = runtime.running ? await verifyCurrentManagedProfileProof(
-      instance,
-      runtime,
-      args2.candidate,
-      { requireCdpBrowser: true }
-    ) : null;
-    if (verified?.pid) {
-      runningManagedPids.add(verified.pid);
-    }
-  }
-  const candidates = [];
-  for (const row of args2.rows) {
-    if (!isMainProcessRow(row, args2.candidate) || runningManagedPids.has(row.pid)) {
-      continue;
-    }
-    const cdpPort = parseRemoteDebuggingPort(row.args);
-    if (!cdpPort) {
-      continue;
-    }
-    const appServerPid = findAppServerPid(args2.rows, row.pid);
-    candidates.push({
-      row,
-      cdpPort,
-      appServerPid,
-      hint: await describeUnmanagedProfileHint(appServerPid)
-    });
-  }
-  const target = candidates.find(
-    (entry) => entry.hint.profileName === args2.profileName && entry.hint.profileMatchSource === "profile-home"
-  ) ?? null;
-  if (!target) {
-    return null;
-  }
-  if (!target.appServerPid || !target.row.startedAt || !await attestOfficialCodexProcessEpoch({
-    candidate: args2.candidate,
-    pid: target.row.pid,
-    appServerPid: target.appServerPid,
-    startedAt: target.row.startedAt,
-    cdpPort: target.cdpPort
-  })) {
-    return null;
-  }
-  const now2 = Date.now();
-  const bridge = bridgeStateUnattached(target.cdpPort, now2);
-  const observed = {
-    profileName: args2.profileName,
-    profileKey: existing?.profileKey ?? null,
-    profileMatchSource: target.hint.profileMatchSource,
-    processProofVersion: MANAGED_PROCESS_PROOF_VERSION,
-    profileHome: existing?.profileHome ?? null,
-    appPath: args2.candidate.appPath,
-    bundleId: args2.candidate.bundleId,
-    pid: target.row.pid,
-    appServerPid: target.appServerPid,
-    launchedAt: target.row.startedAt,
-    lastVerifiedAt: now2,
-    lastStatus: "observed-unmanaged",
-    lastError: null,
-    ...bridge,
-    bridgeStatus: existing?.bridgeStatus ?? bridge.bridgeStatus,
-    bridgeLastCheckedAt: existing?.bridgeLastCheckedAt ?? bridge.bridgeLastCheckedAt,
-    bridgeError: existing?.bridgeError ?? bridge.bridgeError,
-    bridgeVersion: existing?.bridgeVersion ?? bridge.bridgeVersion,
-    bridgeRoute: existing?.bridgeRoute ?? bridge.bridgeRoute,
-    bridgeDevToolsUrl: existing?.bridgeDevToolsUrl ?? bridge.bridgeDevToolsUrl,
-    bridgeCapabilities: existing?.bridgeCapabilities ?? bridge.bridgeCapabilities,
-    bridgeActiveThreadId: existing?.bridgeActiveThreadId ?? bridge.bridgeActiveThreadId,
-    bridgeActiveThreadTitle: existing?.bridgeActiveThreadTitle ?? bridge.bridgeActiveThreadTitle,
-    bridgeActiveThreadUpdatedAt: existing?.bridgeActiveThreadUpdatedAt ?? bridge.bridgeActiveThreadUpdatedAt,
-    bridgeComposerText: existing?.bridgeComposerText ?? bridge.bridgeComposerText,
-    bridgeWorkspacePath: existing?.bridgeWorkspacePath ?? bridge.bridgeWorkspacePath,
-    bridgeModel: existing?.bridgeModel ?? bridge.bridgeModel,
-    bridgeActivityState: existing?.bridgeActivityState ?? bridge.bridgeActivityState,
-    bridgeQol: existing?.bridgeQol ?? bridge.bridgeQol,
-    bridgePower: existing?.bridgePower ?? bridge.bridgePower,
-    bridgeRelayStatus: existing?.bridgeRelayStatus ?? bridge.bridgeRelayStatus,
-    desiredQolSettings: existing?.desiredQolSettings ?? null,
-    desiredPowerSettings: existing?.desiredPowerSettings ?? null
-  };
-  if (!existing || existing.pid !== observed.pid || existing.appServerPid !== observed.appServerPid || existing.cdpPort !== observed.cdpPort || existing.lastStatus !== observed.lastStatus) {
-    await patchManagedInstance(observed);
-  }
-  return {
-    managed: false,
-    runtime: {
-      running: true,
-      appServerPid: target.appServerPid,
-      startedAt: target.row.startedAt
-    },
-    instance: observed
-  };
-}
 var devToolsActivePortPaths = (appUserDataDir) => {
   const roots = appUserDataDir ? [appUserDataDir] : [
     import_node_path12.default.join((0, import_node_os4.homedir)(), "Library", "Application Support", "OpenAI", "Codex"),
@@ -31991,6 +31892,10 @@ async function openCodexWithProfileHome(candidate, profileHome, profileName, pre
         `CODEX_SQLITE_HOME=${sqliteHome}`,
         "--env",
         `CODEX_TELEMETRY_LABEL=${telemetryLabel}`,
+        ...Object.entries(options.environment ?? {}).flatMap(([key, value3]) => [
+          "--env",
+          `${key}=${value3}`
+        ]),
         "--args",
         ...appUserDataDir ? [`--user-data-dir=${appUserDataDir}`] : [],
         "--remote-debugging-port=0",
@@ -32277,7 +32182,7 @@ function resolveOfficialCodexLaunchConfiguration(profileHome, options = {}) {
   };
 }
 function resolveOfficialCodexThreadSqliteHome(profileHome) {
-  return profileHome === SHARED_CODEX_HOME ? resolveCodexSqliteHomeDir(profileHome) : profileHome;
+  return profileHome;
 }
 function sharedCodexLaunchOptions(useDefaultUserData, profileIdentity) {
   const userDataDir = !useDefaultUserData && profileIdentity ? import_node_path12.default.join(
@@ -32442,39 +32347,6 @@ async function reconcileSharedManagedWindowAfterLaunch(args2) {
   }
   return null;
 }
-async function readSharedComposerDraft(debuggerUrl) {
-  try {
-    const value3 = await evaluateCdpExpression(
-      debuggerUrl,
-      createBridgeReadComposerExpression()
-    );
-    const text = value3 && typeof value3 === "object" && "text" in value3 ? value3.text : null;
-    return typeof text === "string" ? text : "";
-  } catch {
-    return "";
-  }
-}
-async function restoreSharedComposerDraft(debuggerUrl, prompt) {
-  if (!prompt.trim()) {
-    return;
-  }
-  for (let attempt = 0; attempt < 8; attempt += 1) {
-    await new Promise((resolve2) => setTimeout(resolve2, 400));
-    try {
-      const result2 = await evaluateOfficialCodexBridgeCommand(
-        debuggerUrl,
-        "setDraft",
-        createBridgeSetDraftPromptExpression(prompt),
-        false
-      );
-      const status = result2 && typeof result2 === "object" && "status" in result2 ? result2.status : null;
-      if (status === "inserted") {
-        return;
-      }
-    } catch {
-    }
-  }
-}
 function isSharedHomeMainProcessRow(row, candidate) {
   const managedRoots = [
     resolveProfileCodexHomesRoot(),
@@ -34437,15 +34309,11 @@ async function applySharedLaunchFollowUp(args2) {
         ].filter((key) => renderer[key] !== true).join(",")}`
       };
     }
-    if (args2.carryDraft && args2.carriedDraft.trim()) {
-      await restoreSharedComposerDraft(debuggerUrl, args2.carriedDraft);
-    }
     const [finalAccount, snapshot2] = await Promise.all([
       readTargetAccount(),
       readSharedBridgeSnapshot(debuggerUrl)
     ]);
-    const expectedDraft = args2.carryDraft && args2.carriedDraft.trim() ? args2.carriedDraft : "";
-    if (!finalAccount || !officialCodexExpectedAccountMatches(args2.expectedAccount, finalAccount) || !snapshot2 || snapshot2.activeThreadId !== null || (snapshot2.composerText ?? "") !== expectedDraft) {
+    if (!finalAccount || !officialCodexExpectedAccountMatches(args2.expectedAccount, finalAccount) || !snapshot2 || snapshot2.activeThreadId !== null || (snapshot2.composerText ?? "") !== "") {
       return { verified: false, reason: "renderer-postcondition-unverified" };
     }
     return { verified: true, reason: null };
@@ -34488,9 +34356,8 @@ function liveRendererEvidenceVerified(args2) {
   }
   const evidence = args2.value && typeof args2.value === "object" ? args2.value : {};
   const sourceThreadEvicted = evidence.sourceThreadEvicted === true && evidence.activeThreadId === null && args2.snapshot.activeThreadId === null && (!args2.sourceThreadId || args2.snapshot.activeThreadId !== args2.sourceThreadId);
-  const composerSafe = args2.carryDraft ? !args2.sourceDraft || args2.snapshot.composerText !== args2.sourceDraft : !args2.snapshot.composerText;
   return Boolean(
-    evidence.status === "observed" && evidence.displayedAccountMatched === true && evidence.workspaceMatched === true && evidence.threadSurfaceReady === true && evidence.rateSurfaceReady === true && evidence.composerReady === true && sourceThreadEvicted && composerSafe
+    evidence.status === "observed" && evidence.displayedAccountMatched === true && evidence.workspaceMatched === true && evidence.threadSurfaceReady === true && evidence.rateSurfaceReady === true && evidence.composerReady === true && sourceThreadEvicted && !args2.snapshot.composerText
   );
 }
 async function attemptOfficialCodexManagedLiveLogin(args2) {
@@ -34594,7 +34461,7 @@ async function attemptOfficialCodexManagedLiveLogin(args2) {
           sourceAccountThreadIds: sourceSurface.accountThreadIds,
           sourceRateResponseSignature: sourceSurface.accountRateSignature,
           sourceRateSurfaceSignature: sourceSurface.rateSignature,
-          clearComposer: args2.options.carryDraft !== true
+          clearComposer: true
         }),
         false
       );
@@ -34603,9 +34470,7 @@ async function attemptOfficialCodexManagedLiveLogin(args2) {
         verified: liveRendererEvidenceVerified({
           value: value3,
           snapshot: snapshot2,
-          sourceThreadId: sourceSnapshot.activeThreadId,
-          sourceDraft: args2.sourceDraft,
-          carryDraft: args2.options.carryDraft === true
+          sourceThreadId: sourceSnapshot.activeThreadId
         }),
         snapshot: snapshot2
       };
@@ -34638,13 +34503,6 @@ async function attemptOfficialCodexManagedLiveLogin(args2) {
     })) {
       return null;
     }
-    if (args2.options.carryDraft && args2.sourceDraft.trim()) {
-      await restoreSharedComposerDraft(args2.debuggerUrl, args2.sourceDraft);
-      const restoredSnapshot = await readSharedBridgeSnapshot(args2.debuggerUrl);
-      if (restoredSnapshot?.composerText !== args2.sourceDraft) {
-        return null;
-      }
-    }
     const bridge = await refreshAdoptedSharedWindow(profileName);
     if (bridge?.bridgeStatus !== "healthy") {
       return null;
@@ -34717,6 +34575,22 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
     };
   }
   let rows = await readProcessRows();
+  const instances = (await updateAppState((current) => current, {
+    mode: "replace",
+    cloneCurrent: false
+  })).officialCodex.instancesByProfileName;
+  for (const instance of Object.values(instances)) {
+    if (instance.profileName !== options.profileName && (!options.profileKey || instance.profileKey !== options.profileKey)) continue;
+    const row = rows.find((entry) => entry.pid === instance.pid);
+    if (!row || isSharedHomeMainProcessRow(row, candidate)) continue;
+    if ((await resolveInstanceRuntimeState({ instance, candidate, rows })).running) {
+      return {
+        status: "failed",
+        reason: `This account already has an isolated Codex window under profile '${instance.profileName}'. Open that window instead.`,
+        pid: instance.pid
+      };
+    }
+  }
   await hydrateSharedHomeCdpWindow(rows, candidate);
   if (expectedWindowPreflight && !sharedWindowTopologyMatches(
     expectedWindowPreflight,
@@ -34758,8 +34632,6 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
       pid: null
     };
   }
-  let carriedDraft = "";
-  const needsBridgeAutomation = options.carryDraft === true;
   if (driveTarget) {
     const managedTarget = driveTarget;
     const mainRow = rows.find((row) => row.pid === managedTarget.pid) ?? null;
@@ -34876,11 +34748,6 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
         } catch {
         }
       }
-      if (liveAutomationEligible && options.carryDraft && target?.webSocketDebuggerUrl) {
-        carriedDraft = await readSharedComposerDraft(
-          target.webSocketDebuggerUrl
-        );
-      }
       if (liveAutomationEligible && target?.webSocketDebuggerUrl && options.liveLoginCredentials) {
         const live = await attemptOfficialCodexManagedLiveLogin({
           candidate,
@@ -34889,7 +34756,6 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
           startedAt: mainRow.startedAt,
           debuggerUrl: target.webSocketDebuggerUrl,
           sourceSnapshot: snapshot2,
-          sourceDraft: carriedDraft,
           options
         });
         if (live) {
@@ -34970,7 +34836,7 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
   if (!driveTarget && plainSharedRows.length > 0 && options.forceAdopt !== true) {
     return {
       status: "skipped",
-      reason: options.accountChanged === true || needsBridgeAutomation ? "plain-window-requires-take-control" : "same-account-plain-window",
+      reason: options.accountChanged === true ? "plain-window-requires-take-control" : "same-account-plain-window",
       pid: plainSharedRows[0]?.pid ?? null,
       closedPreviousWindow,
       suppressPlainReopen: closedPreviousWindow
@@ -35403,8 +35269,6 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
       }
       const followUp = await applySharedLaunchFollowUp({
         cdpPort: finalCdpPort,
-        carriedDraft,
-        carryDraft: options.carryDraft === true,
         expectedAccount: options.expectedAccount ?? null,
         allowOnboardingOverride: true
       });
@@ -35670,8 +35534,6 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
     }
     const followUp = await applySharedLaunchFollowUp({
       cdpPort,
-      carriedDraft,
-      carryDraft: options.carryDraft === true,
       expectedAccount: options.expectedAccount ?? null,
       allowOnboardingOverride: false
     });
@@ -35758,7 +35620,7 @@ async function applyOfficialCodexLiveAccountSwitchOnce(options = {}, takeoverTra
   }
 }
 function applyOfficialCodexLiveAccountSwitch(options = {}) {
-  return enqueueProfileAction("shared-window", async () => {
+  return enqueueProfileAction("shared-window", () => withProfileLaunchFileLock(resolveDefaultCodexHomeDir(), async () => {
     const operationId = (0, import_node_crypto11.randomUUID)();
     let result2 = await applyOfficialCodexLiveAccountSwitchOnce(options, {
       operationId,
@@ -35792,7 +35654,10 @@ function applyOfficialCodexLiveAccountSwitch(options = {}) {
       });
     }
     return { ...result2, closedPreviousWindow };
-  });
+  }, {
+    profileKey: options.profileKey,
+    onBusy: () => ({ status: "failed", reason: "launch-in-progress", pid: null, closedPreviousWindow: false })
+  }));
 }
 function toIso2(value3) {
   return typeof value3 === "number" && Number.isFinite(value3) ? new Date(value3).toISOString() : null;
@@ -36036,93 +35901,28 @@ async function getOfficialCodexProfileInstances(options = {}) {
     unmanaged
   };
 }
-async function setOfficialCodexProfileDraftPrompt(profileName, prompt) {
-  const normalizedProfileName = profileName.trim();
-  const normalizedPrompt = prompt.trim();
-  if (!normalizedProfileName || !normalizedPrompt) {
-    return {
-      status: "unavailable",
-      reason: "missing-profile-or-prompt",
-      route: null
-    };
-  }
-  if (process.platform !== "darwin") {
-    return {
-      status: "unavailable",
-      reason: "unsupported-platform",
-      route: null
-    };
-  }
-  try {
-    const [state, { candidate }, rows] = await Promise.all([
-      getAppState(),
-      resolveCodexAppTarget(),
-      readProcessRows()
-    ]);
-    if (!candidate) {
-      return {
-        status: "unavailable",
-        reason: "codex-app-not-found",
-        route: null
-      };
-    }
-    const bridgeTarget = await resolveOfficialCodexBridgeTarget({
-      profileName: normalizedProfileName,
-      state,
-      candidate,
-      rows
-    });
-    if (!bridgeTarget?.instance.cdpPort) {
-      return {
-        status: "unavailable",
-        reason: "target-instance-not-running",
-        route: null
-      };
-    }
-    const targets = await readCdpTargets(bridgeTarget.instance.cdpPort);
-    const target = pickCodexCdpTarget(targets);
-    if (!target?.webSocketDebuggerUrl) {
-      return {
-        status: "unavailable",
-        reason: "cdp-target-not-found",
-        route: null
-      };
-    }
-    const listenerAttached = await startOfficialCodexBridgeActionListener({
-      profileName: normalizedProfileName,
-      cdpPort: bridgeTarget.instance.cdpPort,
-      debuggerUrl: target.webSocketDebuggerUrl,
-      processEpoch: notificationProcessEpochFromInstance(bridgeTarget.instance)
-    });
-    if (!listenerAttached) {
-      return {
-        status: "failed",
-        reason: "bridge-listener-attach-failed",
-        route: null
-      };
-    }
-    const result2 = await evaluateOfficialCodexBridgeCommand(
-      target.webSocketDebuggerUrl,
-      "setDraft",
-      createBridgeSetDraftPromptExpression(normalizedPrompt),
-      false
-    );
-    return normalizeDraftPromptInsertionResult(result2);
-  } catch (error) {
-    return {
-      status: "failed",
-      reason: sanitizeUserFacingError(error) ?? "draft-insertion-failed",
-      route: null
-    };
-  }
-}
 function launchOfficialCodexProfileInstance(options) {
   return enqueueProfileAction(
     options.profileName,
     () => launchOfficialCodexProfileInstanceWithRetries(options)
   );
 }
-async function launchOfficialCodexProfileInstanceWithRetries(options) {
+function launchOfficialCodexProfileInstanceWithRetries(options) {
+  return withProfileLaunchFileLock(
+    options.profileHome,
+    () => launchOfficialCodexProfileInstanceUnlocked(options),
+    {
+      profileKey: options.profileKey,
+      onBusy: () => ({
+        status: "failed",
+        profileName: options.profileName,
+        instance: null,
+        reason: "launch-in-progress"
+      })
+    }
+  );
+}
+async function launchOfficialCodexProfileInstanceUnlocked(options) {
   let launched = await launchOfficialCodexProfileInstanceOnce(options);
   for (let attempt = 1; attempt < LAUNCH_VERIFY_RETRIES; attempt += 1) {
     if (launched.status !== "failed" || launched.reason !== "app-server-not-verified") {
@@ -36167,7 +35967,25 @@ async function launchOfficialCodexProfileInstanceOnce(options) {
   if (staleLaunchPids.length > 0) {
     launchBaselineMainPids = (await readProcessRows()).filter((row) => isMainProcessRow(row, candidate)).map((row) => row.pid);
   }
-  const existing = await readManagedInstance(options.profileName);
+  const instances = (await updateAppState((current) => current, {
+    mode: "replace",
+    cloneCurrent: false
+  })).officialCodex.instancesByProfileName;
+  if (options.profileKey) {
+    for (const instance of Object.values(instances)) {
+      if (instance.profileName === options.profileName || instance.profileKey !== options.profileKey) continue;
+      const runtime = await resolveInstanceRuntimeState({ instance, candidate, rows: await readProcessRows() });
+      if (runtime.running) {
+        return {
+          status: "failed",
+          profileName: options.profileName,
+          instance: managedInstanceToPayload(instance, true, runtime.appServerPid, runtime.startedAt),
+          reason: `This account already has a Codex window under profile '${instance.profileName}'. Open that profile instead.`
+        };
+      }
+    }
+  }
+  const existing = instances[options.profileName] ?? null;
   const desiredQolSettings = resolveDesiredQolSettings({
     requested: options.desiredQolSettings,
     existing: existing?.desiredQolSettings
@@ -36260,7 +36078,10 @@ async function launchOfficialCodexProfileInstanceOnce(options) {
       candidate,
       options.profileHome,
       options.profileName,
-      new Set(launchBaselineMainPids)
+      new Set(launchBaselineMainPids),
+      {
+        environment: options.environment
+      }
     );
     if (launch.pid !== null && launch.startedAt !== null && launch.cdpPort !== null) {
       launchedProcess = {
@@ -38982,6 +38803,19 @@ var ProfileManager = class {
     const workspace = this.resolveWorkspaceIdentity(data, resolvedMetadata);
     const workspaceId = workspace.id || DEFAULT_WORKSPACE_ID;
     const workspaceName = workspace.name ?? null;
+    const identityKey = this.resolveProfileIdentityFromData(null, data, resolvedMetadata);
+    if (identityKey && (!existingRecord || identityKey !== this.resolveProfileIdentityFromRecord(existingRecord) || workspaceId !== this.normalizeWorkspaceId(existingRecord.workspaceId) || this.resolveAuthMethod(data) !== this.resolveAuthMethod(existingRecord.data))) {
+      const duplicate = await this.getProfileRowByIdentityAndWorkspace(
+        identityKey,
+        workspaceId,
+        { authMethod: this.resolveAuthMethod(data) }
+      );
+      if (duplicate && duplicate.name !== resolvedName) {
+        throw new Error(
+          `Account is already saved as profile '${duplicate.name}'. Switch to or delete that profile before creating another.`
+        );
+      }
+    }
     if (!data.workspace_id) {
       data.workspace_id = workspaceId;
     }
@@ -40385,27 +40219,6 @@ var ProfileManager = class {
     const description = this.describeActiveAuth(authData);
     const normalizedProfile = description.normalized;
     normalizedProfile.created_at = normalizedProfile.created_at ?? (/* @__PURE__ */ new Date()).toISOString();
-    const identityKey = this.resolveProfileIdentityFromData(
-      null,
-      normalizedProfile,
-      description.metadata
-    );
-    const workspace = this.resolveWorkspaceIdentity(
-      normalizedProfile,
-      description.metadata
-    );
-    if (identityKey) {
-      const duplicate = await this.getProfileRowByIdentityAndWorkspace(
-        identityKey,
-        workspace.id ?? DEFAULT_WORKSPACE_ID,
-        { authMethod: this.resolveAuthMethod(normalizedProfile) }
-      );
-      if (duplicate && duplicate.name !== profileName) {
-        throw new Error(
-          `Account is already saved as profile '${duplicate.name}'. Switch to or delete that profile before creating another.`
-        );
-      }
-    }
     await this.persistProfileRecord(
       profileName,
       normalizedProfile,
@@ -40478,20 +40291,6 @@ var ProfileManager = class {
         `Active Codex login is for a different OpenAI identity than profile '${profileName}'. Create a new profile for that login instead.`
       );
     }
-    if (existingIdentity && normalized.workspace_id) {
-      const targetWorkspaceId = normalized.workspace_id;
-      const currentWorkspaceId = currentWorkspace.id ?? DEFAULT_WORKSPACE_ID;
-      if (targetWorkspaceId !== currentWorkspaceId) {
-        const duplicate = await this.getProfileRowByIdentityAndWorkspace(existingIdentity, targetWorkspaceId, {
-          authMethod: this.resolveAuthMethod(existing)
-        });
-        if (duplicate && duplicate.name !== profileName) {
-          throw new Error(
-            `Account is already saved as profile '${duplicate.name}'. Switch to or delete that profile before creating another.`
-          );
-        }
-      }
-    }
     const { profile: merged, metadata } = this.mergeProfileRecords(existing, normalized);
     delete merged.tokenAlert;
     await this.persistProfileRecord(profileName, merged, metadata);
@@ -43471,8 +43270,137 @@ function normalizeRawMessage(rawMessage) {
   }
   return cleaned;
 }
+var KNOWN_ERRORS = {
+  "desktop-llm-route-bound-running": {
+    message: "This model is used by an open Codex window.",
+    recovery: "Close that window, then save again."
+  },
+  "desktop-llm-route-bound": {
+    message: "This model is used by an account.",
+    recovery: "Change that account's model first."
+  },
+  "desktop-llm-provider-bound": {
+    message: "This provider is used by an account.",
+    recovery: "Remove or change that account first."
+  },
+  "desktop-llm-route-slug-collision": {
+    message: "Another model already uses that name.",
+    recovery: "Choose a different name."
+  },
+  "desktop-llm-route-not-verified": {
+    message: "This model has not been tested yet.",
+    recovery: "Test the model, then use it."
+  },
+  "desktop-llm-credential-missing": {
+    message: "This provider has no API key.",
+    recovery: "Add the key under Settings, Model Providers."
+  },
+  "desktop-llm-provider-credential-missing": {
+    message: "This provider has no API key.",
+    recovery: "Add the key under Settings, Model Providers."
+  },
+  "external-profile-not-ready": {
+    message: "This account's model is not ready.",
+    recovery: "Finish its setup under Settings, Model Providers."
+  },
+  "external-profile-route-not-ready": {
+    message: "This account's model is not ready.",
+    recovery: "Finish its setup under Settings, Model Providers."
+  },
+  "quit-custom-provider-profile-before-change": {
+    message: "This account's Codex window is open.",
+    recovery: "Close the window, then make the change."
+  },
+  "quit-managed-profile-before-native-restore": {
+    message: "This account's Codex window is open.",
+    recovery: "Close the window, then restore its settings."
+  },
+  "profile-name-already-used": {
+    message: "Another account already uses that name.",
+    recovery: "Choose a different name."
+  },
+  "unverified-official-codex-window": {
+    message: "A Codex window is open that CodexUse cannot confirm belongs to this account.",
+    recovery: "Close that window, then open the account again."
+  },
+  "multiple-official-app-variants-running": {
+    message: "More than one version of the Codex app is running.",
+    recovery: "Quit the extra one, then try again."
+  },
+  "previous-instance-still-running": {
+    message: "The previous Codex window is still closing.",
+    recovery: "Wait a moment, then try again."
+  },
+  "launch-in-progress": {
+    message: "This account is already opening.",
+    recovery: "Wait for its window to appear."
+  },
+  "official-codex-app-not-found": {
+    message: "The Codex app is not installed on this Mac.",
+    recovery: "Install Codex, then try again."
+  },
+  "work-config-invalid-toml": {
+    message: "The settings are not valid TOML. Nothing was changed.",
+    recovery: "Fix the syntax, then save again."
+  },
+  "work-config-secret": {
+    message: "Settings cannot contain API keys, tokens, or passwords.",
+    recovery: "Remove the secret, then save again."
+  },
+  "work-config-planner-tools-managed": {
+    message: "CodexUse manages the codexuse_work tool entry.",
+    recovery: "Remove that entry, then save again."
+  },
+  "work-config-shared-stale": {
+    message: "The shared settings changed after you opened them.",
+    recovery: "Reload, then apply your change again."
+  },
+  "work-config-override-stale": {
+    message: "This account's settings changed after you opened them.",
+    recovery: "Reload, then apply your change again."
+  },
+  "work-config-external-changed": {
+    message: "This account's Codex settings were changed outside CodexUse.",
+    recovery: "Open the account, review the outside changes, and import them first."
+  },
+  "work-config-external-review-stale": {
+    message: "The outside settings changed after you reviewed them.",
+    recovery: "Reload and review them again."
+  },
+  "work-config-changed-during-save": {
+    message: "The settings changed while saving. Nothing was applied.",
+    recovery: "Reload, then save again."
+  },
+  "work-config-write-not-confirmed": {
+    message: "CodexUse wrote the settings but could not read them back.",
+    recovery: "Reload to check what was saved."
+  },
+  "Enable third-party providers before authorizing a custom-provider worker.": {
+    message: "Allow third-party providers for this folder before using a custom-model worker.",
+    recovery: "Turn on the allowance in the folder's options, then start again."
+  }
+};
+function findKnownError(cleaned) {
+  for (const [key, entry] of Object.entries(KNOWN_ERRORS)) {
+    const matches = key.includes(" ") ? cleaned.includes(key) : new RegExp(`(^|[^a-z0-9-])${key}([^a-z0-9-]|$)`).test(cleaned);
+    if (matches) {
+      return entry;
+    }
+  }
+  return null;
+}
 function resolveCategory(cleaned, options) {
   const lower = cleaned.toLowerCase();
+  const known = findKnownError(cleaned);
+  if (known) {
+    return {
+      code: "ERR_ACTION_REQUIRED",
+      title: "Something needs to change first",
+      message: known.message,
+      recovery: known.recovery,
+      retryable: true
+    };
+  }
   if (options.notFoundFallback && (lower.includes("enoent") || lower.includes("not found"))) {
     return {
       code: "ERR_NOT_FOUND",
@@ -43487,7 +43415,7 @@ function resolveCategory(cleaned, options) {
       code: "ERR_RATE_LIMIT",
       title: "Rate limit reached",
       message: "The provider is rate limited right now.",
-      recovery: "Wait a moment, switch profiles, or try again.",
+      recovery: "Wait a moment, open another account, or try again.",
       retryable: true
     };
   }
@@ -43514,7 +43442,7 @@ function resolveCategory(cleaned, options) {
       code: "ERR_AUTH",
       title: "Sign-in expired",
       message: "This account needs to sign in again.",
-      recovery: "Reconnect the profile, then retry the action.",
+      recovery: "Reconnect the account, then retry the action.",
       retryable: true
     };
   }
@@ -43550,7 +43478,7 @@ function resolveCategory(cleaned, options) {
       code: "ERR_PROVIDER",
       title: "Provider request failed",
       message: "The AI provider rejected or failed the request.",
-      recovery: "Try again, or switch the active profile or model.",
+      recovery: "Try again, open another account, or change the model.",
       retryable: true
     };
   }
@@ -43820,7 +43748,6 @@ async function coordinateOfficialCodexProfileSwitch(options) {
         }
       }
       const transition = await applyOfficialCodexLiveAccountSwitch({
-        carryDraft: options.carryDraft === true,
         profileName: targetProfileName,
         profileKey: options.targetProfileKey ?? null,
         desiredQolSettings: options.desiredQolSettings,
@@ -44568,7 +44495,7 @@ async function coordinateCliOfficialCodexProfileSwitch(options) {
           actor: "cli",
           expectedSourceProfileName,
           standingTakeControlConsent: await readStandingTakeControlConsent(),
-          // ceiling: CLI cannot own persisted live-login expiry maintenance; upgrade when a resident backend handoff is available.
+          // ceiling: CLI cannot own persisted live-login expiry maintenance; upgrade when a resident backend recovery process is available.
           allowLiveLogin: false
         })
       );
@@ -44628,42 +44555,6 @@ async function coordinateCliOfficialCodexProfileSwitch(options) {
     configureOfficialCodexBridgeNotificationHandler(null);
   }
 }
-async function prepareCliManagedDraftHandoff(manager, sourceProfileName, targetProfile) {
-  const sourceProfile = await getManagedProfileByName(
-    manager,
-    sourceProfileName
-  );
-  if (!sourceProfile) {
-    return;
-  }
-  const sourceRuntimeName = managedProfileRuntimeName(sourceProfile);
-  const targetRuntimeName = managedProfileRuntimeName(targetProfile);
-  const instances = await getOfficialCodexProfileInstances({
-    profileNames: [sourceRuntimeName, targetRuntimeName]
-  });
-  const source = instances.instances.find(
-    (instance) => instance.profileName === sourceRuntimeName && instance.running
-  );
-  if (!source) {
-    return;
-  }
-  const sourceContext = [
-    source.bridgeActiveThreadTitle ? `Source task: ${source.bridgeActiveThreadTitle}` : null,
-    source.bridgeActiveThreadId ? `Source task ID: ${source.bridgeActiveThreadId}` : null,
-    source.bridgeComposerText?.trim() ? `Visible draft:
-${source.bridgeComposerText.trim()}` : null
-  ].filter((line) => Boolean(line));
-  if (sourceContext.length === 0) {
-    return;
-  }
-  await setOfficialCodexProfileDraftPrompt(
-    targetRuntimeName,
-    [
-      "Continue the same Codex task after this profile switch.",
-      ...sourceContext
-    ].join("\n\n").slice(0, 2e4)
-  );
-}
 async function coordinateCliManagedProfileSwitch(options) {
   const targetProfile = await getManagedProfileByName(
     options.profileManager,
@@ -44722,17 +44613,6 @@ async function coordinateCliManagedProfileSwitch(options) {
         mechanism = "relaunch";
       }
       await persistLastProfileName(targetProfile.name);
-      if (options.carryDraft && current.name && current.name !== targetProfile.name) {
-        await prepareCliManagedDraftHandoff(
-          options.profileManager,
-          current.name,
-          targetProfile
-        ).catch((error) => {
-          console.warn(
-            `Could not prepare profile handoff: ${error instanceof Error ? error.message : String(error)}`
-          );
-        });
-      }
       return {
         sourceProfileName: current.name,
         targetProfileName: targetProfile.name,
@@ -44755,17 +44635,6 @@ async function coordinateCliManagedProfileSwitch(options) {
   const managedOutcome = { ...outcome, sourceProfileName: current.name };
   if (managedOutcome.authStatus !== "not-started") {
     await persistLastProfileName(targetProfile.name);
-    if (options.carryDraft && currentProfile?.kind === "custom" && current.name && current.name !== targetProfile.name) {
-      await prepareCliManagedDraftHandoff(
-        options.profileManager,
-        current.name,
-        targetProfile
-      ).catch((error) => {
-        console.warn(
-          `Could not prepare profile handoff: ${error instanceof Error ? error.message : String(error)}`
-        );
-      });
-    }
   }
   return managedOutcome;
 }
@@ -44956,8 +44825,7 @@ async function runAutoRollPass(manager, options) {
     synchronizeApp: options.synchronizeOfficialCodex,
     launchIfNotRunning: options.launchOfficialCodexWhenClosed === true,
     explicitTakeControl: options.takeControl === true,
-    readStandingTakeControlConsent: async () => (await readAppSettings()).officialCodexAutoControlEnabled === true,
-    carryDraft: true
+    readStandingTakeControlConsent: async () => (await readAppSettings()).officialCodexAutoControlEnabled === true
   });
   await recordCliCoordinatedOutcome(
     outcome,
@@ -45117,8 +44985,7 @@ async function handleProfileCommand(args2, version) {
         synchronizeApp: activation.synchronize,
         launchIfNotRunning: activation.launch,
         explicitTakeControl: takeControl,
-        readStandingTakeControlConsent: async () => (await readAppSettings()).officialCodexAutoControlEnabled === true,
-        carryDraft: true
+        readStandingTakeControlConsent: async () => (await readAppSettings()).officialCodexAutoControlEnabled === true
       });
       await recordCliCoordinatedOutcome(
         outcome,
@@ -46458,7 +46325,7 @@ async function ensureCliStorageReady() {
 }
 
 // src/app/main.ts
-var VERSION = true ? "6.1.1" : "0.0.0";
+var VERSION = true ? "6.2.1" : "0.0.0";
 async function runCli() {
   const args2 = process.argv.slice(2);
   if (args2.length === 0) {