@tokensrc/codex 1.14.17 → 1.14.18

package/dist/commands.js

@@ -4,34 +4,24 @@ import { join } from "node:path";
 import { getStoragePath, loadAccounts, setStoragePath, setStoragePathDirect } from "codex-multi-auth/storage";
 import { normalizeCodexServiceUrl } from "./client.js";
 import { CodexServiceError } from "./errors.js";
-import { backupCodexFileCredentials, codexFileCredentialsMatchAccount, discardCodexFileCredentialBackup, inspectLocalCodexCredentialStatus, readManagedCodexLineageState, resetManagedCodexFileCredentials, restoreCodexFileCredentials, writeCodexChatgptFileCredentials } from "./credentials.js";
+import { backupCodexFileCredentials, codexFileCredentialsMatchAccount, inspectLocalCodexCredentialStatus, resetManagedCodexFileCredentials, restoreCodexFileCredentials, writeCodexChatgptFileCredentials } from "./credentials.js";
 import { CODEX_DISTRIBUTION_SCHEMA_VERSION } from "./protocol.js";
 import { formatCodexAccountDisplayIdentity, resolveCodexAdminAccount, resolveCodexAccountDisplayName } from "./account-display.js";
 import { loadCodexQuotaUploads } from "./quota-cache.js";
 import { cleanupLegacyCodexProvider } from "./legacy-cleanup.js";
-import { executeCodexEnrollmentLogin } from "./enrollment-flow.js";
-import { executeCodexMigrationLoginBatch } from "./migration-login-batch.js";
-import { executeCodexShortLivedCredentialDelivery } from "./short-lived-delivery-flow.js";
 import { executeCodexTokenPoolV4Delivery, reconcilePendingManagedCodexV3Operation, reportManagedCodexV3Credentials } from "./managed-credential-v3-flow.js";
 import { resolveManagedCodexV3AssignmentTarget } from "./managed-credential-v3-assignment.js";
 import { executeCodexTokenPoolV4Login } from "./token-pool-v4-upload-flow.js";
 import { readManagedCodexV3State } from "./managed-credential-v3.js";
 import { profileAccountTokenPoolV4Enabled, profileMultiDeviceCredentialSyncEnabled, profileRequestBoundDeviceCredentialsEnabled } from "./profile.js";
 import { superviseCodexV5Credentials, synchronizeCodexV5SelectionOnce } from "./multi-device-v5-flow.js";
-import { executeCodexAssignmentRetirementLocalDelete } from "./retirement-flow.js";
-import { clearCodexSelection, loadCodexSelection, rememberCodexSelectionProviderAccount, saveCodexSelection } from "./selection.js";
+import { clearCodexSelection, loadCodexSelection, saveCodexSelection } from "./selection.js";
 import { installCodexShortcuts, removeCodexShortcuts } from "./shortcuts.js";
 import { isCodexAccountAvailable, isCodexSubscriptionExpired, renderCodexAccountDashboard, selectCodexAccount } from "./tui.js";
-import { readCodexShortLivedDeliveryJournal } from "./short-lived-delivery-journal.js";
-import { superviseCodexShortLivedCredentials } from "./credential-supervisor.js";
 import { ensureCodexV6DeviceCredentials, reconcileCodexV6DeviceAccess, reportCodexV6DeviceCredentials, requireAvailableCodexV6DeviceAccess } from "./request-bound-device-v6-flow.js";
 import { getOrCreateCodexInstallationId } from "./multi-device-v5-state.js";
 import { resetCodexV6LocalState } from "./request-bound-device-v6-state.js";
 export const NO_AVAILABLE_CHATGPT_ACCOUNT_MESSAGE = "当前用户没有绑定可用的 ChatGPT 账号。请前往 OA 系统提交 IT11 工单，申请独享或共享的 ChatGPT 个人账号。";
-// The Server refreshes a user-bound lineage only inside its final 60-second
-// credential safety window. Asking for a new delivery earlier would merely
-// re-encrypt the same access/ID tokens and must not be treated as a renewal.
-const SERVER_MANAGED_SHORT_LIVED_REFRESH_WINDOW_MS = 60_000;
 const SCHEMA_V2_LEGACY_MANAGEMENT_DISABLED = "schema_v2_legacy_management_disabled";
 function findV3Assignment(input) {
     return input.assignments.items.find((item) => item.assignmentId === input.assignmentId
@@ -39,11 +29,6 @@ function findV3Assignment(input) {
         && item.providerAccountId === input.providerAccountId
         && item.lineageId === input.lineageId);
 }
-export function effectiveCodexCredentialRefreshBefore(requestedMs, serverManagedShortLived) {
-    return serverManagedShortLived
-        ? Math.min(requestedMs, SERVER_MANAGED_SHORT_LIVED_REFRESH_WINDOW_MS)
-        : requestedMs;
-}
 async function json(command, deps) {
     if (command.optsWithGlobals().json)
         return true;
@@ -62,10 +47,6 @@ function success(value) {
 function importFailures(credentials) {
     return credentials.filter(({ status }) => status === "REJECTED" || status === "UNKNOWN");
 }
-function schemaV2LifecycleEnabled(config) {
-    const capabilities = config.profile?.userBoundRefreshTokens;
-    return capabilities?.delivery === true || capabilities?.migrationPlans === true;
-}
 function accountTokenPoolV4Enabled(config) {
     return profileAccountTokenPoolV4Enabled(config.profile);
 }
@@ -85,19 +66,9 @@ function codexConfigPathForEnv(env) {
     return codexHome ? join(codexHome, "config.toml") : undefined;
 }
 function assertLegacyManagementEnabled(config) {
-    const requestBound = requestBoundDeviceCredentialsEnabled(config);
-    if (!schemaV2LifecycleEnabled(config) && !requestBound)
+    if (!requestBoundDeviceCredentialsEnabled(config))
         return;
-    throw new CodexServiceError(requestBound
-        ? "Request-bound per-device credentials are enabled; legacy direct assignment management is disabled."
-        : "Schema-v2 user-bound credentials are enabled; legacy refresh-token pool management is disabled.", SCHEMA_V2_LEGACY_MANAGEMENT_DISABLED, 409);
-}
-function assignmentCredentialStatus(assignment) {
-    if (isCodexSubscriptionExpired(assignment))
-        return "EXPIRED";
-    if (assignment.deliveryEligible)
-        return "AVAILABLE";
-    return ["NEEDS_REAUTH", "LOST", "DIVERGED", "COMPROMISED"].includes(assignment.lineageStatus ?? "") ? "NEEDS_REAUTH" : "TEMPORARILY_UNAVAILABLE";
+    throw new CodexServiceError("Request-bound per-device credentials are enabled; legacy direct assignment management is disabled.", SCHEMA_V2_LEGACY_MANAGEMENT_DISABLED, 409);
 }
 function assertCodexSubscriptionActive(subscription, label) {
     if (!isCodexSubscriptionExpired(subscription))
@@ -290,31 +261,6 @@ async function loadAccountData(deps, options = {}, allowV4Replacement = false) {
             preferredV3Assignments
         };
     }
-    if (deps.config.profile?.userBoundRefreshTokens?.delivery === true) {
-        const assignments = await deps.clientFor(serviceConnection(options)).listCredentialAssignments();
-        const accounts = assignments.items.map((assignment) => ({
-            id: assignment.managedAccountId,
-            accountId: assignment.assignmentId,
-            label: assignment.label,
-            isDefault: previous?.account.assignmentId === assignment.assignmentId,
-            ...(assignment.credentialExpiresAt
-                ? { accessExpiresAt: Date.parse(assignment.credentialExpiresAt) }
-                : {}),
-            ...subscriptionSummary(assignment),
-            credentialStatus: assignmentCredentialStatus(assignment),
-            lineageStatus: assignment.lineageStatus ?? undefined,
-            quota: null
-        }));
-        return {
-            response: {
-                schemaVersion: CODEX_DISTRIBUTION_SCHEMA_VERSION,
-                accounts,
-                defaultAccountId: previous?.account.managedAccountId ?? null
-            },
-            selectedAccountId: previous?.account.managedAccountId,
-            assignments
-        };
-    }
     const response = await deps.clientFor(serviceConnection(options)).listAccounts();
     return {
         response,
@@ -443,39 +389,6 @@ async function installCredentials(deps, selection, service, allowV4Replacement =
         });
         return { expiresAt: Date.parse(delivered.credentialExpiresAt), selection };
     }
-    if (deps.config.profile?.userBoundRefreshTokens?.delivery === true) {
-        await discardCodexFileCredentialBackup(deps.env);
-        if (selection.account.distributionMode !== "SERVER_MANAGED_SHORT_LIVED"
-            || !selection.account.assignmentId || !selection.account.managedAccountId) {
-            throw new CodexServiceError("The saved Codex selection is not a schema-v2 credential assignment.", "codex_assignment_not_found", 404);
-        }
-        const assignments = await client.listCredentialAssignments();
-        const assignment = assignments.items.find((item) => item.assignmentId === selection.account.assignmentId
-            && item.managedAccountId === selection.account.managedAccountId);
-        if (!assignment) {
-            throw new CodexServiceError("The selected schema-v2 credential assignment is no longer active.", "codex_assignment_not_found", 404);
-        }
-        const state = await readManagedCodexLineageState(deps.env);
-        const journal = await readCodexShortLivedDeliveryJournal(deps.env);
-        const recoverable = journal?.tenantId === deps.config.connection.tenantId
-            && journal.assignmentId === assignment.assignmentId
-            || state?.assignmentId === assignment.assignmentId
-                && (state.tenantId === deps.config.connection.tenantId || state.tenantId === null)
-                && (state.phase === "INSTALLING"
-                    || state.phase === "INSTALLED_PENDING_ACK" && Date.parse(state.ackExpiresAt) > Date.now());
-        if (!assignment.deliveryEligible && !recoverable) {
-            throw new CodexServiceError("The selected schema-v2 credential assignment is not ready for delivery.", "short_lived_credential_lineage_not_ready", 409);
-        }
-        const delivered = await executeCodexShortLivedCredentialDelivery({
-            client,
-            tenantId: deps.config.connection.tenantId,
-            assignmentId: assignment.assignmentId,
-            allowNewDelivery: assignment.deliveryEligible,
-            env: deps.env
-        });
-        const updated = await rememberCodexSelectionProviderAccount(deps.config.persistence.configDirectory, assignment.assignmentId, delivered.providerAccountId);
-        return { expiresAt: Date.parse(delivered.credentialExpiresAt), selection: updated };
-    }
     await backupCodexFileCredentials(deps.env);
     const response = await client.getLoginCredentials(selection.account.id);
     await writeCodexChatgptFileCredentials({
@@ -633,43 +546,6 @@ async function selectedCredentials(deps, requested, options = {}) {
     if (!selection || serviceChanged || requested && !requestedMatchesSelection) {
         selection = (await chooseAccount(deps, requested, options)).selection;
     }
-    if (deps.config.profile?.userBoundRefreshTokens?.delivery === true) {
-        if (selection.account.distributionMode !== "SERVER_MANAGED_SHORT_LIVED") {
-            selection = (await chooseAccount(deps, requested, options)).selection;
-        }
-        const assignments = await deps.clientFor({
-            serverUrl: selection.serviceUrl,
-            allowInsecureHttp: selection.allowInsecurePoc
-        }).listCredentialAssignments();
-        const assignment = assignments.items.find((item) => item.assignmentId === selection.account.assignmentId
-            && item.managedAccountId === selection.account.managedAccountId);
-        if (!assignment) {
-            throw new CodexServiceError("The selected schema-v2 credential assignment is no longer active.", "codex_assignment_not_found", 404);
-        }
-        assertCodexSubscriptionActive(assignment, assignment.label);
-        const state = await readManagedCodexLineageState(deps.env);
-        const journal = await readCodexShortLivedDeliveryJournal(deps.env);
-        const stateMatches = state !== undefined
-            && (state.tenantId === deps.config.connection.tenantId || state.tenantId === null)
-            && state.assignmentId === assignment.assignmentId
-            && state.managedAccountId === assignment.managedAccountId;
-        const local = await inspectLocalCodexCredentialStatus(stateMatches ? state.providerAccountId : selection.account.providerAccountId, deps.env);
-        const pending = journal?.tenantId === deps.config.connection.tenantId
-            && journal.assignmentId === assignment.assignmentId
-            || stateMatches && state.phase !== "INSTALLED";
-        if (!assignment.deliveryEligible || !stateMatches || !local.usable
-            || local.matchesExpectedAccount !== true || pending) {
-            return installCredentials(deps, selection, {
-                serverUrl: selection.serviceUrl,
-                allowInsecureHttp: selection.allowInsecurePoc
-            });
-        }
-        const matchingState = state;
-        if (selection.account.providerAccountId !== matchingState.providerAccountId) {
-            selection = await rememberCodexSelectionProviderAccount(deps.config.persistence.configDirectory, assignment.assignmentId, matchingState.providerAccountId);
-        }
-        return { selection, expiresAt: local.expiresAt ?? Date.parse(matchingState.credentialExpiresAt) };
-    }
     if (!selection.account.accountId) {
         throw new CodexServiceError("The saved Codex selection has no provider account.", "invalid_configuration");
     }
@@ -762,21 +638,7 @@ async function launchWithSelectedCredentials(deps, selected, launch) {
             }
         }
     }
-    if (deps.config.profile?.userBoundRefreshTokens?.delivery !== true)
-        return launch();
-    let current = selected;
-    return superviseCodexShortLivedCredentials({
-        initialExpiresAt: current.expiresAt,
-        launch: (signal) => launch(signal),
-        renew: async () => {
-            const installed = await installCredentials(deps, current.selection, {
-                serverUrl: current.selection.serviceUrl,
-                allowInsecureHttp: current.selection.allowInsecurePoc
-            });
-            current = installed;
-            return { expiresAt: installed.expiresAt };
-        }
-    });
+    return launch();
 }
 export function registerCodexCommands(program, deps, options = {}) {
     const codex = options.nested === false
@@ -1093,8 +955,6 @@ export function registerCodexCommands(program, deps, options = {}) {
         .action(async (_options, command) => {
         const selection = await loadCodexSelection(deps.config.persistence.configDirectory);
         const cleanup = await cleanupLegacyCodexProvider(codexConfigPathForEnv(deps.env));
-        if (schemaV2LifecycleEnabled(deps.config))
-            await discardCodexFileCredentialBackup(deps.env);
         const auth = await resetManagedCodexFileCredentials(selection?.account.providerAccountId ?? selection?.account.accountId, deps.env);
         await resetCodexV6LocalState(deps.env);
         await clearCodexSelection(deps.config.persistence.configDirectory);
@@ -1193,7 +1053,7 @@ export function registerCodexCommands(program, deps, options = {}) {
         if (!Number.isFinite(requestedRefreshBefore) || requestedRefreshBefore <= 0) {
             throw new Error("--refresh-before must be positive.");
         }
-        const refreshBefore = effectiveCodexCredentialRefreshBefore(requestedRefreshBefore, deps.config.profile?.userBoundRefreshTokens?.delivery === true);
+        const refreshBefore = requestedRefreshBefore;
         let expiresAt = selected.expiresAt;
         do {
             const timestamp = Date.now();
@@ -1296,126 +1156,6 @@ export function registerCodexCommands(program, deps, options = {}) {
         if (failures.length > 0)
             process.exitCode = 1;
     });
-    if (schemaV2LifecycleEnabled(deps.config)) {
-        const enrollment = codex.command("enrollment")
-            .description("Execute administrator-created one-shot Codex login intents");
-        serviceOptions(enrollment.command("status <intent>").description("Show redacted enrollment intent status"))
-            .action(async (intent, opts, command) => {
-            const result = await deps.clientFor(serviceConnection(opts)).getEnrollmentIntent(intent);
-            if (await json(command, deps)) {
-                print(deps.output, { ok: true, ...result });
-                return;
-            }
-            deps.output.write(`${result.intent.id}  ${result.intent.type}  ${result.intent.status}`
-                + `  revision=${result.intent.revision}\n`);
-            deps.output.write(`expires=${result.intent.expiresAt}`
-                + `${result.intent.assignmentId ? `  assignment=${result.intent.assignmentId}` : ""}`
-                + `${result.intent.managedAccountId ? `  account=${result.intent.managedAccountId}` : ""}\n`);
-            if (!result.capabilities.candidateUpload) {
-                deps.output.write("安全候选上传尚未启用；当前任务只能查询或取消，不会启动 OpenAI 登录。\n");
-            }
-        });
-        serviceOptions(enrollment.command("login <intent>")
-            .description("Run one isolated official Codex login for an enrollment intent"))
-            .option("--device-auth", "use the official Codex device authorization flow")
-            .action(async (intent, _opts, command) => {
-            const result = await executeCodexEnrollmentLogin({
-                client: deps.clientFor(serviceConnection(_opts)),
-                tenantId: deps.config.connection.tenantId,
-                intentId: intent,
-                deviceAuth: _opts.deviceAuth
-            });
-            if (await json(command, deps))
-                print(deps.output, { ok: true, ...result });
-            else {
-                deps.output.write(`${result.intent.id} 登录候选已处理；状态=${result.intent.status}`
-                    + `${result.result.managedAccountId ? `，账号=${result.result.managedAccountId}` : ""}`
-                    + `${result.result.lineageId ? `，lineage=${result.result.lineageId}` : ""}`
-                    + "。\n");
-                if (result.result.outcome === "TEMPORARILY_UNAVAILABLE") {
-                    deps.output.write("同一进程内的安全重试已耗尽；请取消并新建任务，不能用另一次登录覆盖已保留的候选。\n");
-                }
-            }
-        });
-        serviceOptions(enrollment.command("login-batch <planId>")
-            .description("Sequentially execute isolated logins from a migration plan queue")
-            .option("--device-auth", "use the official Codex device authorization flow")
-            .option("--dry-run", "show the redacted sequential plan without starting login")
-            .option("--page-size <count>", "migration queue page size", "100"))
-            .action(async (planId, opts, command) => {
-            if (deps.config.profile?.userBoundRefreshTokens?.migrationPlans !== true) {
-                throw new CodexServiceError("The selected tenant has not enabled schema-v2 migration login plans.", "capability_not_enabled", 409);
-            }
-            const pageSize = Number(opts.pageSize);
-            if (!Number.isInteger(pageSize) || pageSize < 1 || pageSize > 100) {
-                throw new CodexServiceError("--page-size must be an integer from 1 to 100.", "invalid_configuration");
-            }
-            const batch = await executeCodexMigrationLoginBatch({
-                client: deps.clientFor(serviceConnection(opts)),
-                tenantId: deps.config.connection.tenantId,
-                planId,
-                deviceAuth: opts.deviceAuth,
-                dryRun: opts.dryRun,
-                pageSize
-            });
-            const failed = batch.counts.failed > 0
-                || ["TARGET_UNCERTAIN", "AUTHENTICATION_ERROR", "SERVICE_ERROR", "LOGIN_ERROR"]
-                    .includes(batch.stopReason);
-            if (await json(command, deps)) {
-                print(deps.output, { ok: !failed, ...batch });
-            }
-            else {
-                deps.output.write(`migration=${batch.plan.id} status=${batch.plan.status} revision=${batch.plan.revision}`
-                    + ` stop=${batch.stopReason}${batch.dryRun ? " dry-run" : ""}\n`);
-                deps.output.write(`capacity: verifiedMinimum=${batch.capacity.verifiedMinimum}, verifiedLimit=unknown,`
-                    + ` sequentialRequired=${batch.capacity.sequentialRequired}; verifiedMinimum 不是上限。\n`);
-                for (const item of batch.items) {
-                    deps.output.write(`${item.assignmentId} ${item.action}/${item.status}`
-                        + `${item.intentId ? ` intent=${item.intentId}` : ""}`
-                        + `${item.outcome ? ` outcome=${item.outcome}` : ""}`
-                        + `${item.skipReason ? ` skip=${item.skipReason}` : ""}`
-                        + `${item.safeErrorCode ? ` error=${item.safeErrorCode}` : ""}\n`);
-                }
-                deps.output.write(`summary: attempted=${batch.counts.attempted}, completed=${batch.counts.completed},`
-                    + ` failed=${batch.counts.failed}, skipped=${batch.counts.skipped}.\n`);
-            }
-            if (failed)
-                process.exitCode = 1;
-        });
-        serviceOptions(enrollment.command("cancel <intent>").description("Cancel an enrollment intent"))
-            .option("--idempotency-key <key>", "reuse a prior cancellation idempotency key")
-            .action(async (intent, opts, command) => {
-            const client = deps.clientFor(serviceConnection(opts));
-            const current = await client.getEnrollmentIntent(intent);
-            const result = await client.cancelEnrollmentIntent(intent, {
-                idempotencyKey: opts.idempotencyKey?.trim() || randomUUID(),
-                revision: current.intent.revision
-            });
-            if (await json(command, deps))
-                print(deps.output, { ok: true, ...result });
-            else
-                deps.output.write(`${result.intent.id} 已取消；状态=${result.intent.status}。\n`);
-        });
-        const retirement = codex.command("retirement")
-            .description("Remove an exact locally installed lineage for a Server retirement request");
-        serviceOptions(retirement.command("acknowledge <retirement>")
-            .description("Delete the matching managed short-lived credentials and append local evidence")
-            .option("--idempotency-key <key>", "reuse a prior local deletion acknowledgement key"))
-            .action(async (retirementId, opts, command) => {
-            const result = await executeCodexAssignmentRetirementLocalDelete({
-                client: deps.clientFor(serviceConnection(opts)),
-                retirementId,
-                env: deps.env,
-                ...(opts.idempotencyKey?.trim() ? { idempotencyKey: opts.idempotencyKey.trim() } : {})
-            });
-            if (await json(command, deps))
-                print(deps.output, { ok: true, ...result });
-            else
-                deps.output.write(`本机匹配的短效凭据已删除并记录证据；retirement=${result.retirement.id}`
-                    + `，revision=${result.retirement.revision}，状态=${result.retirement.status}。\n`
-                    + "该证据不代表其他终端已清理；最终退役仍等待全部已披露短效凭据自然过期。\n");
-        });
-    }
     const admin = codex.command("admin")
         .description("Administer server-managed Codex accounts and assignments");
     const adminRequests = admin.command("requests")