codexuse-cli 6.1.1 → 6.2.0

package/README.md

@@ -4,6 +4,10 @@ Command-line control for CodexUse profiles: switch Codex accounts, run Codex und
 profile, and manage Account Pool, licenses, and manual cloud sync. Shares local state with
 the CodexUse desktop app on the same machine.
 
+The CLI has a separate macOS, Windows, and Linux route. Codex App window control,
+provider setup, and the desktop Account Pool runtime require the Apple Silicon
+macOS desktop app. The CLI does not provide desktop feature parity.
+
 Install (npm):
 ```bash
 npm install -g codexuse-cli

package/dist/index.js

@@ -2082,6 +2082,57 @@ var import_node_crypto2 = require("crypto");
 var import_node_path4 = __toESM(require("path"), 1);
 var import_node_os = __toESM(require("os"), 1);
 
+// ../../packages/contracts/src/license/offer-config.ts
+function getActiveOffer() {
+  const basePriceUsd = 39;
+  const discountPercent = 50;
+  const salePriceUsd = basePriceUsd * (100 - discountPercent) / 100;
+  return {
+    basePriceUsd,
+    basePriceDisplay: `$${basePriceUsd}`,
+    couponCode: "SUMMER50",
+    discountPercent,
+    salePriceUsd,
+    salePriceDisplay: `$${salePriceUsd.toFixed(2)}`,
+    isActive: true,
+    campaign: "summer-2026",
+    productPermalink: "codex-use",
+    checkoutBaseUrl: "https://hweihwang.gumroad.com/l/codex-use",
+    trialEnabled: true,
+    trialDays: 7
+  };
+}
+function buildCheckoutUrl(offer2, options) {
+  const base2 = offer2.checkoutBaseUrl;
+  const withCoupon = offer2.isActive && offer2.couponCode ? `${base2}/${offer2.couponCode}` : base2;
+  const url = new URL(withCoupon);
+  if (options?.directCheckout) {
+    url.searchParams.set("wanted", "true");
+  }
+  if (!options?.source || !options?.medium) {
+    return url.toString();
+  }
+  url.searchParams.set("utm_source", options.source);
+  url.searchParams.set("utm_medium", options.medium);
+  if (options.campaign) {
+    url.searchParams.set("utm_campaign", options.campaign);
+  } else if (offer2.campaign) {
+    url.searchParams.set("utm_campaign", offer2.campaign);
+  }
+  return url.toString();
+}
+
+// ../../packages/contracts/src/license/activation-session.ts
+var ACTIVATION_RETENTION_MS = 24 * 60 * 60 * 1e3;
+var ACTIVATION_WATCH_MS = 20 * 60 * 1e3;
+var ACTIVATION_SESSION_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function normalizePendingCheckout(value3) {
+  if (!value3 || typeof value3 !== "object" || Array.isArray(value3)) return null;
+  const { sessionId, startedAt } = value3;
+  if (typeof sessionId !== "string" || !ACTIVATION_SESSION_PATTERN.test(sessionId) || typeof startedAt !== "number" || !Number.isSafeInteger(startedAt) || startedAt <= 0) return null;
+  return { sessionId, startedAt };
+}
+
 // ../../packages/contracts/src/desktop/llm-compatibility.ts
 var DESKTOP_LLM_CAPABILITY_NAMES = [
   "streamingText",
@@ -3408,6 +3459,7 @@ function resolveStorageDbPath() {
 function createDefaultAppState() {
   return {
     schemaVersion: 1,
+    trialExperience: { knownLicenseHolder: false, pendingInteractiveAt: null, trial: null },
     autoRoll: {
       enabled: false,
       rearmRemainingThreshold: 15,
@@ -3498,7 +3550,8 @@ function createDefaultAppState() {
         proUnlockedCelebrated: false
       },
       duplicateWarningDismissedKey: null,
-      pendingLicenseActivation: false
+      pendingLicenseActivation: false,
+      pendingCheckout: null
     },
     profileDashboard: {
       customGroupsByAccountKey: {}
@@ -4110,6 +4163,35 @@ function normalizeOfficialCodexPowerStatus(value3) {
     appliedAt: asString(value3.appliedAt)
   };
 }
+function normalizeTrialExperience(raw) {
+  const value3 = isRecord2(raw) ? raw : {};
+  const trial = isRecord2(value3.trial) ? value3.trial : {};
+  const startedAt = asString(trial.startedAt);
+  const expiresAt = asString(trial.expiresAt);
+  const start = startedAt ? Date.parse(startedAt) : NaN;
+  const end = expiresAt ? Date.parse(expiresAt) : NaN;
+  const observedAt = asNumberOrNull(trial.observedAt);
+  const valid = startedAt && expiresAt && Number.isFinite(start) && end > start && observedAt !== null && observedAt >= start;
+  const first = isRecord2(trial.firstOutcome) ? trial.firstOutcome : {};
+  const completedAt = asNumberOrNull(first.completedAt);
+  const kind = first.kind;
+  const validKind = kind === "shared_history_switch" || kind === "shared_history_window" || kind === "matched_window" || kind === "provider_window" || kind === "pool_request";
+  const interactiveAt = asNumberOrNull(trial.interactiveAt);
+  const pendingInteractiveAt = asNumberOrNull(value3.pendingInteractiveAt);
+  return {
+    knownLicenseHolder: value3.knownLicenseHolder === true,
+    pendingInteractiveAt: pendingInteractiveAt !== null && pendingInteractiveAt > 0 ? pendingInteractiveAt : null,
+    trial: valid ? {
+      startedAt,
+      expiresAt,
+      observedAt,
+      priorPayment: trial.priorPayment === "known_prior_license" ? "known_prior_license" : "unknown",
+      interactiveAt: interactiveAt !== null && interactiveAt > 0 && interactiveAt < end ? interactiveAt : null,
+      firstOutcome: validKind && completedAt !== null && completedAt >= start && completedAt < end ? { kind, completedAt } : null,
+      entitlementObservedAt: asNumberOrNull(trial.entitlementObservedAt)
+    } : null
+  };
+}
 function normalizeAppState(raw) {
   const defaults = createDefaultAppState();
   if (!isRecord2(raw)) {
@@ -4120,6 +4202,7 @@ function normalizeAppState(raw) {
   const next = deepMerge(defaults, raw);
   const merged = next;
   merged.schemaVersion = 1;
+  merged.trialExperience = normalizeTrialExperience(raw.trialExperience);
   merged.autoRoll = normalizeAutoRollSettings(rawAutoRoll);
   if (!isRecord2(merged.officialCodex)) {
     merged.officialCodex = clone2(defaults.officialCodex);
@@ -4562,6 +4645,7 @@ function normalizeAppState(raw) {
   if (typeof merged.ui.pendingLicenseActivation !== "boolean") {
     merged.ui.pendingLicenseActivation = false;
   }
+  merged.ui.pendingCheckout = normalizePendingCheckout(merged.ui.pendingCheckout);
   {
     const allowedUiKeys = new Set(Object.keys(defaults.ui));
     for (const key of Object.keys(merged.ui)) {
@@ -5139,27 +5223,35 @@ async function getStoredLicense() {
   const state = await getAppState();
   return parseStoredLicense(state.license);
 }
-async function persistLicense(license) {
+async function persistLicense(license, expected) {
   const parsed = parseStoredLicense(license);
-  await patchAppState({
-    license: parsed ? {
-      licenseKey: parsed.licenseKey ?? null,
-      purchaseEmail: parsed.purchaseEmail ?? null,
-      lastVerifiedAt: parsed.lastVerifiedAt ?? null,
-      nextCheckAt: parsed.nextCheckAt ?? null,
-      lastVerificationError: parsed.lastVerificationError ?? null,
-      status: parsed.status ?? "inactive",
-      signature: parsed.signature ?? null
-    } : {
-      licenseKey: null,
-      purchaseEmail: null,
-      lastVerifiedAt: null,
-      nextCheckAt: null,
-      lastVerificationError: null,
-      status: "inactive",
-      signature: null
+  let persisted = false;
+  await updateAppState((current) => {
+    if (expected !== void 0 && JSON.stringify(parseStoredLicense(current.license)) !== JSON.stringify(parseStoredLicense(expected))) {
+      return {};
     }
+    persisted = true;
+    return {
+      license: parsed ? {
+        licenseKey: parsed.licenseKey ?? null,
+        purchaseEmail: parsed.purchaseEmail ?? null,
+        lastVerifiedAt: parsed.lastVerifiedAt ?? null,
+        nextCheckAt: parsed.nextCheckAt ?? null,
+        lastVerificationError: parsed.lastVerificationError ?? null,
+        status: parsed.status ?? "inactive",
+        signature: parsed.signature ?? null
+      } : {
+        licenseKey: null,
+        purchaseEmail: null,
+        lastVerifiedAt: null,
+        nextCheckAt: null,
+        lastVerificationError: null,
+        status: "inactive",
+        signature: null
+      }
+    };
   });
+  return persisted;
 }
 async function getStoredAutoRollSettings() {
   const state = await getAppState();
@@ -5254,46 +5346,6 @@ async function getLicenseSecret() {
   return persistLicenseSecret(dbPath, secret);
 }
 
-// ../../packages/contracts/src/license/offer-config.ts
-function getActiveOffer() {
-  const basePriceUsd = 39;
-  const discountPercent = 50;
-  const salePriceUsd = basePriceUsd * (100 - discountPercent) / 100;
-  return {
-    basePriceUsd,
-    basePriceDisplay: `$${basePriceUsd}`,
-    couponCode: "SUMMER50",
-    discountPercent,
-    salePriceUsd,
-    salePriceDisplay: `$${salePriceUsd.toFixed(2)}`,
-    isActive: true,
-    campaign: "summer-2026",
-    productPermalink: "codex-use",
-    checkoutBaseUrl: "https://hweihwang.gumroad.com/l/codex-use",
-    trialEnabled: true,
-    trialDays: 7
-  };
-}
-function buildCheckoutUrl(offer2, options) {
-  const base2 = offer2.checkoutBaseUrl;
-  const withCoupon = offer2.isActive && offer2.couponCode ? `${base2}/${offer2.couponCode}` : base2;
-  const url = new URL(withCoupon);
-  if (options?.directCheckout) {
-    url.searchParams.set("wanted", "true");
-  }
-  if (!options?.source || !options?.medium) {
-    return url.toString();
-  }
-  url.searchParams.set("utm_source", options.source);
-  url.searchParams.set("utm_medium", options.medium);
-  if (options.campaign) {
-    url.searchParams.set("utm_campaign", options.campaign);
-  } else if (offer2.campaign) {
-    url.searchParams.set("utm_campaign", offer2.campaign);
-  }
-  return url.toString();
-}
-
 // ../../packages/runtime-profiles/src/license/trial.ts
 var import_node_crypto6 = __toESM(require("crypto"), 1);
 
@@ -5562,6 +5614,7 @@ function buildTrialInfo(stored, now2) {
   const expired = stored?.serverExpired === true || expiresAtMs === null || expiresAtMs <= now2;
   const daysLeft = expired || expiresAtMs === null ? 0 : Math.max(0, Math.ceil((expiresAtMs - now2) / DAY_MS));
   return {
+    startedAt: stored?.startedAt ?? null,
     active: !expired,
     expired,
     expiresAt: stored?.expiresAt ?? null,
@@ -5573,6 +5626,7 @@ function lockReasonFor(info) {
 }
 function buildLockedTrialInfo(stored) {
   return {
+    startedAt: null,
     active: false,
     expired: true,
     expiresAt: stored?.expiresAt ?? null,
@@ -6078,6 +6132,7 @@ var LicenseService = class {
   constructor() {
     this.refreshPromise = null;
     this.verificationPromise = null;
+    this.activationTail = Promise.resolve();
   }
   async getCachedStatus() {
     try {
@@ -6129,8 +6184,10 @@ var LicenseService = class {
         nextCheckAt: new Date(cappedNextCheckTs).toISOString()
       };
       const signed = withSignature(updated, secret);
+      if (!await persistLicense(signed, workingStored)) {
+        return this.getStatus({ allowStale: true });
+      }
       workingStored = signed;
-      await persistLicense(signed);
     }
     const tampered = Boolean(workingStored.licenseKey) && !signatureValid;
     const cached2 = tampered ? toLicenseStatus(null, {
@@ -6161,7 +6218,9 @@ var LicenseService = class {
           lastVerificationError: null
         };
         const signed = withSignature(updated, secret);
-        await persistLicense(signed);
+        if (!await persistLicense(signed, workingStored)) {
+          return this.getStatus({ allowStale: true });
+        }
         return finalize2(toLicenseStatus(signed));
       } catch (error) {
         const message = error instanceof Error ? error.message : "License verification failed.";
@@ -6175,7 +6234,9 @@ var LicenseService = class {
             },
             secret
           );
-          await persistLicense(fallbackStored2);
+          if (!await persistLicense(fallbackStored2, workingStored)) {
+            return this.getStatus({ allowStale: true });
+          }
           const fallback = toLicenseStatus(fallbackStored2, {
             state: fallbackStored2.status ?? "grace",
             error: message
@@ -6190,7 +6251,9 @@ var LicenseService = class {
           status: "inactive",
           lastVerificationError: message
         }, secret);
-        await persistLicense(fallbackStored);
+        if (!await persistLicense(fallbackStored, workingStored)) {
+          return this.getStatus({ allowStale: true });
+        }
         return finalize2(toLicenseStatus(fallbackStored, { error: message }));
       }
     };
@@ -6202,6 +6265,23 @@ var LicenseService = class {
     }
   }
   async activate(licenseKey) {
+    return (await this.queueActivation(licenseKey, false)).license;
+  }
+  activateFromCheckout(licenseKey) {
+    return this.queueActivation(licenseKey, true);
+  }
+  queueActivation(licenseKey, onlyIfUnlicensed) {
+    const result2 = this.activationTail.then(async () => {
+      if (onlyIfUnlicensed) {
+        const current = await this.getCachedStatus();
+        if (current.isPro) return { license: current, activated: false };
+      }
+      return { license: await this.performActivation(licenseKey), activated: true };
+    });
+    this.activationTail = result2.then(() => void 0, () => void 0);
+    return result2;
+  }
+  async performActivation(licenseKey) {
     const trimmed = licenseKey.trim();
     if (!trimmed) {
       throw new Error("License key is required.");
@@ -23636,6 +23716,7 @@ var RPC_METHODS = {
   runtimeRefreshProviders: "runtime.refreshProviders",
   appStateGet: "appState.get",
   appStatePatch: "appState.patch",
+  trialExperienceStart: "trialExperience.start",
   appSettingsGet: "appSettings.get",
   appSettingsUpdate: "appSettings.update",
   officialCodexSetAutoControl: "officialCodex.setAutoControl",
@@ -23819,6 +23900,7 @@ var DesktopRpcRequestBody = Schema_exports.Union([
   // Desktop dashboard/runtime methods
   tagRequestBody(RPC_METHODS.appStateGet, Schema_exports.Struct({})),
   tagRequestBody(RPC_METHODS.appStatePatch, Schema_exports.Struct({ patch: Schema_exports.Unknown })),
+  tagRequestBody(RPC_METHODS.trialExperienceStart, Schema_exports.Struct({ interactiveAt: Schema_exports.Number })),
   tagRequestBody(RPC_METHODS.appSettingsGet, Schema_exports.Struct({})),
   tagRequestBody(
     RPC_METHODS.appSettingsUpdate,
@@ -46458,7 +46540,7 @@ async function ensureCliStorageReady() {
 }
 
 // src/app/main.ts
-var VERSION = true ? "6.1.1" : "0.0.0";
+var VERSION = true ? "6.2.0" : "0.0.0";
 async function runCli() {
   const args2 = process.argv.slice(2);
   if (args2.length === 0) {