ai-zero-token 2.0.5 → 2.0.6

package/dist/core/store/codex-auth-store.js

@@ -1,17 +1,25 @@
 #!/usr/bin/env node
+import { execFile } from "node:child_process";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { promisify } from "node:util";
+const execFileAsync = promisify(execFile);
 function getCodexHomeDir() {
   return process.env.CODEX_HOME || path.join(os.homedir(), ".codex");
 }
-const DEFAULT_CODEX_PROVIDER_ID = "ai-zero-token";
+const OPENAI_CODEX_PROVIDER_ID = "openai";
+const LEGACY_CODEX_PROVIDER_ID = "ai-zero-token";
+const DEFAULT_CODEX_PROVIDER_ID = OPENAI_CODEX_PROVIDER_ID;
 function getCodexAuthPath() {
   return path.join(getCodexHomeDir(), "auth.json");
 }
 function getCodexConfigPath() {
   return path.join(getCodexHomeDir(), "config.toml");
 }
+function getCodexStateDbPath() {
+  return path.join(getCodexHomeDir(), "state_5.sqlite");
+}
 function createBackupSuffix() {
   return (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
 }
@@ -26,6 +34,65 @@ function validateProviderId(providerId) {
     throw new Error("Codex providerId \u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u4E0B\u5212\u7EBF\u548C\u77ED\u6A2A\u7EBF\u3002");
   }
 }
+async function fileExists(targetPath) {
+  try {
+    await fs.access(targetPath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function sqliteQuote(value) {
+  return `'${value.replace(/'/g, "''")}'`;
+}
+async function runSqlite(dbPath, sql) {
+  const { stdout } = await execFileAsync("sqlite3", [dbPath, sql], {
+    timeout: 15e3,
+    maxBuffer: 1024 * 1024
+  });
+  return stdout.trim();
+}
+async function migrateLegacyCodexHistoryProvider() {
+  const dbPath = getCodexStateDbPath();
+  if (!await fileExists(dbPath)) {
+    return {
+      path: dbPath,
+      migratedCount: 0,
+      skipped: true
+    };
+  }
+  try {
+    const countRaw = await runSqlite(
+      dbPath,
+      `select count(*) from threads where model_provider=${sqliteQuote(LEGACY_CODEX_PROVIDER_ID)};`
+    );
+    const migratedCount = Number.parseInt(countRaw, 10);
+    if (!Number.isFinite(migratedCount) || migratedCount <= 0) {
+      return {
+        path: dbPath,
+        migratedCount: 0,
+        skipped: true
+      };
+    }
+    const backupPath = `${dbPath}.azt-backup-${createBackupSuffix()}`;
+    await runSqlite(dbPath, `.backup ${sqliteQuote(backupPath)}`);
+    await runSqlite(
+      dbPath,
+      `update threads set model_provider=${sqliteQuote(OPENAI_CODEX_PROVIDER_ID)} where model_provider=${sqliteQuote(LEGACY_CODEX_PROVIDER_ID)};`
+    );
+    return {
+      path: dbPath,
+      backupPath,
+      migratedCount
+    };
+  } catch (error) {
+    return {
+      path: dbPath,
+      migratedCount: 0,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
 function normalizeCodexProviderBaseUrl(value) {
   let normalized = value.trim();
   if (!normalized) {
@@ -79,17 +146,21 @@ function findFirstTableLine(lines) {
   const index = lines.findIndex((line) => /^\s*\[/.test(line));
   return index === -1 ? lines.length : index;
 }
-function parseRootModelProvider(raw) {
+function parseRootString(raw, key) {
   const lines = raw.split(/\r?\n/);
   const firstTableLine = findFirstTableLine(lines);
+  const keyPattern = new RegExp(`^\\s*${escapeRegExp(key)}\\s*=\\s*(.+)$`);
   for (let index = 0; index < firstTableLine; index += 1) {
-    const match = /^\s*model_provider\s*=\s*(.+)$/.exec(lines[index] ?? "");
+    const match = keyPattern.exec(lines[index] ?? "");
     if (match) {
       return parseTomlStringValue(match[1] ?? "");
     }
   }
   return void 0;
 }
+function parseRootModelProvider(raw) {
+  return parseRootString(raw, "model_provider");
+}
 function parseGatewayProviderTable(raw, providerId) {
   const lines = raw.split(/\r?\n/);
   const tablePattern = new RegExp(`^\\s*\\[\\s*model_providers\\.${escapeRegExp(providerId)}\\s*\\]\\s*$`);
@@ -106,16 +177,17 @@ function parseGatewayProviderTable(raw, providerId) {
   }
   return { exists: true, baseUrl };
 }
-function upsertRootModelProvider(raw, providerId) {
+function upsertRootString(raw, key, value) {
   if (!raw.trim()) {
-    return `model_provider = ${formatTomlString(providerId)}
+    return `${key} = ${formatTomlString(value)}
 `;
   }
   const lines = raw.split(/\r?\n/);
   const firstTableLine = findFirstTableLine(lines);
-  const nextLine = `model_provider = ${formatTomlString(providerId)}`;
+  const nextLine = `${key} = ${formatTomlString(value)}`;
+  const keyPattern = new RegExp(`^\\s*${escapeRegExp(key)}\\s*=`);
   for (let index = 0; index < firstTableLine; index += 1) {
-    if (/^\s*model_provider\s*=/.test(lines[index])) {
+    if (keyPattern.test(lines[index])) {
       lines[index] = nextLine;
       return lines.join("\n");
     }
@@ -123,6 +195,9 @@ function upsertRootModelProvider(raw, providerId) {
   lines.splice(firstTableLine, 0, nextLine, "");
   return lines.join("\n");
 }
+function upsertRootModelProvider(raw, providerId) {
+  return upsertRootString(raw, "model_provider", providerId);
+}
 function buildGatewayProviderBlock(providerId, baseUrl) {
   return [
     "# AI Zero Token managed Codex provider",
@@ -152,14 +227,27 @@ function upsertGatewayProviderTable(raw, providerId, baseUrl) {
   return lines.join("\n").replace(/\s+$/g, "\n");
 }
 function applyGatewayProviderConfig(raw, providerId, baseUrl) {
-  return upsertGatewayProviderTable(upsertRootModelProvider(raw, providerId), providerId, baseUrl);
+  const sanitizedRaw = removeOpenAIGatewayConfig(raw).raw;
+  return upsertGatewayProviderTable(upsertRootModelProvider(sanitizedRaw, providerId), providerId, baseUrl);
 }
-function removeRootModelProvider(raw, providerId) {
+function applyOpenAIGatewayConfig(raw, baseUrl) {
+  const withoutLegacyProvider = removeGatewayProviderConfig(raw, LEGACY_CODEX_PROVIDER_ID).raw;
+  return upsertRootString(
+    upsertRootModelProvider(withoutLegacyProvider, OPENAI_CODEX_PROVIDER_ID),
+    "openai_base_url",
+    baseUrl
+  );
+}
+function removeRootString(raw, key, expectedValue) {
   const lines = raw.split(/\r?\n/);
   const firstTableLine = findFirstTableLine(lines);
+  const keyPattern = new RegExp(`^\\s*${escapeRegExp(key)}\\s*=\\s*(.+)$`);
   for (let index = 0; index < firstTableLine; index += 1) {
-    const match = /^\s*model_provider\s*=\s*(.+)$/.exec(lines[index] ?? "");
-    if (!match || parseTomlStringValue(match[1] ?? "") !== providerId) {
+    const match = keyPattern.exec(lines[index] ?? "");
+    if (!match) {
+      continue;
+    }
+    if (typeof expectedValue === "string" && parseTomlStringValue(match[1] ?? "") !== expectedValue) {
       continue;
     }
     lines.splice(index, 1);
@@ -170,6 +258,9 @@ function removeRootModelProvider(raw, providerId) {
   }
   return { raw, removed: false };
 }
+function removeRootModelProvider(raw, providerId) {
+  return removeRootString(raw, "model_provider", providerId);
+}
 function removeGatewayProviderTable(raw, providerId) {
   const lines = raw.split(/\r?\n/);
   const tablePattern = new RegExp(`^\\s*\\[\\s*model_providers\\.${escapeRegExp(providerId)}\\s*\\]\\s*$`);
@@ -196,6 +287,15 @@ function removeGatewayProviderConfig(raw, providerId) {
     removed: rootRemoved.removed || tableRemoved.removed
   };
 }
+function removeOpenAIGatewayConfig(raw) {
+  const openAIBaseRemoved = removeRootString(raw, "openai_base_url");
+  const openAIProviderRemoved = removeRootModelProvider(openAIBaseRemoved.raw, OPENAI_CODEX_PROVIDER_ID);
+  const legacyRemoved = removeGatewayProviderConfig(openAIProviderRemoved.raw, LEGACY_CODEX_PROVIDER_ID);
+  return {
+    raw: legacyRemoved.raw,
+    removed: openAIBaseRemoved.removed || openAIProviderRemoved.removed || legacyRemoved.removed
+  };
+}
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -209,7 +309,8 @@ async function readCodexAuth() {
   }
 }
 async function getCodexGatewayProviderStatus(params) {
-  const providerId = params?.providerId?.trim() || DEFAULT_CODEX_PROVIDER_ID;
+  const requestedProviderId = params?.providerId?.trim();
+  const providerId = requestedProviderId || DEFAULT_CODEX_PROVIDER_ID;
   validateProviderId(providerId);
   const configPath = getCodexConfigPath();
   let raw = "";
@@ -224,6 +325,30 @@ async function getCodexGatewayProviderStatus(params) {
     };
   }
   const modelProvider = parseRootModelProvider(raw);
+  if (providerId === OPENAI_CODEX_PROVIDER_ID) {
+    const openAIBaseUrl = parseRootString(raw, "openai_base_url");
+    if (openAIBaseUrl && (!modelProvider || modelProvider === OPENAI_CODEX_PROVIDER_ID)) {
+      return {
+        path: configPath,
+        providerId: OPENAI_CODEX_PROVIDER_ID,
+        exists: true,
+        active: !modelProvider || modelProvider === OPENAI_CODEX_PROVIDER_ID,
+        baseUrl: openAIBaseUrl,
+        modelProvider
+      };
+    }
+    const legacyTable = parseGatewayProviderTable(raw, LEGACY_CODEX_PROVIDER_ID);
+    if (!requestedProviderId && legacyTable.exists) {
+      return {
+        path: configPath,
+        providerId: LEGACY_CODEX_PROVIDER_ID,
+        exists: true,
+        active: modelProvider === LEGACY_CODEX_PROVIDER_ID,
+        baseUrl: legacyTable.baseUrl,
+        modelProvider
+      };
+    }
+  }
   const table = parseGatewayProviderTable(raw, providerId);
   return {
     path: configPath,
@@ -321,7 +446,8 @@ async function applyGatewayToCodexProviderConfig(params) {
     raw = "";
     backupPath = void 0;
   }
-  const next = applyGatewayProviderConfig(raw, providerId, baseUrl);
+  const useOpenAIProvider = providerId === OPENAI_CODEX_PROVIDER_ID;
+  const next = useOpenAIProvider ? applyOpenAIGatewayConfig(raw, baseUrl) : applyGatewayProviderConfig(raw, providerId, baseUrl);
   const tmpPath = `${configPath}.tmp-${process.pid}`;
   await fs.writeFile(tmpPath, next, {
     encoding: "utf8",
@@ -333,7 +459,8 @@ async function applyGatewayToCodexProviderConfig(params) {
     path: configPath,
     backupPath,
     providerId,
-    baseUrl
+    baseUrl,
+    historyMigration: useOpenAIProvider ? await migrateLegacyCodexHistoryProvider() : void 0
   };
 }
 async function removeGatewayFromCodexProviderConfig(params) {
@@ -350,7 +477,14 @@ async function removeGatewayFromCodexProviderConfig(params) {
       removed: false
     };
   }
-  const next = removeGatewayProviderConfig(raw, providerId);
+  const sanitized = removeOpenAIGatewayConfig(raw);
+  const next = providerId === OPENAI_CODEX_PROVIDER_ID || providerId === LEGACY_CODEX_PROVIDER_ID ? sanitized : (() => {
+    const providerRemoved = removeGatewayProviderConfig(sanitized.raw, providerId);
+    return {
+      raw: providerRemoved.raw,
+      removed: sanitized.removed || providerRemoved.removed
+    };
+  })();
   if (!next.removed) {
     return {
       path: configPath,

package/dist/core/store/settings-store.js

@@ -21,7 +21,10 @@ function createDefaultSettings() {
       excludedProfileIds: []
     },
     runtime: {
-      quotaSyncConcurrency: 16
+      quotaSyncConcurrency: 3
+    },
+    image: {
+      freeAccountWebGenerationEnabled: false
     },
     server: {
       host: "0.0.0.0",
@@ -47,6 +50,9 @@ function normalizeSettings(parsed) {
     runtime: {
       quotaSyncConcurrency: normalizeQuotaSyncConcurrency(parsed.runtime?.quotaSyncConcurrency, defaults.runtime.quotaSyncConcurrency)
     },
+    image: {
+      freeAccountWebGenerationEnabled: parsed.image?.freeAccountWebGenerationEnabled ?? defaults.image.freeAccountWebGenerationEnabled
+    },
     server: {
       host: parsed.server?.host ?? defaults.server.host,
       port: parsed.server?.port ?? defaults.server.port
@@ -63,7 +69,7 @@ async function loadSettings() {
     return createDefaultSettings();
   }
 }
-function normalizeQuotaSyncConcurrency(value, fallback = 16) {
+function normalizeQuotaSyncConcurrency(value, fallback = 3) {
   const parsed = typeof value === "number" ? value : typeof value === "string" ? Number.parseInt(value, 10) : fallback;
   if (!Number.isFinite(parsed)) {
     return fallback;

package/dist/core/store/state-paths.js

@@ -34,6 +34,18 @@ function getStorePath() {
 function getSettingsPath() {
   return path.join(stateDir, "settings.json");
 }
+function getUsageDir() {
+  return path.join(stateDir, "usage");
+}
+function getUsageEventsDir() {
+  return path.join(getUsageDir(), "events");
+}
+function getUsageDailyPath() {
+  return path.join(getUsageDir(), "daily.json");
+}
+function getUsageLifetimePath() {
+  return path.join(getUsageDir(), "lifetime.json");
+}
 async function ensureStateMigrated() {
   if (!migrationPromise) {
     migrationPromise = (async () => {
@@ -50,5 +62,9 @@ export {
   ensureStateMigrated,
   getSettingsPath,
   getStateDir,
-  getStorePath
+  getStorePath,
+  getUsageDailyPath,
+  getUsageDir,
+  getUsageEventsDir,
+  getUsageLifetimePath
 };