@wlv-zedd/dsh-chatgpt-web 1.0.4 → 1.0.5

package/lib/cli.js

@@ -25,6 +25,7 @@ import { tmpdir } from "node:os";
 var CHATGPT_WEB_MODEL_PREFIX = "chatgpt-web/";
 var CHATGPT_WEB_BACKEND_MODEL = "gpt-5.6-sol";
 var CHATGPT_WEB_LUNA_BACKEND_MODEL = "gpt-5.6-luna";
+var CHATGPT_WEB_GPT6_BACKEND_MODEL = "gpt-6";
 var CHATGPT_WEB_ZERO_RISK_BACKEND_MODEL = "chatgpt-web-zero-risk";
 var CHATGPT_WEB_ZERO_RISK_PRO_BACKEND_MODEL = "chatgpt-web-zero-risk-pro";
 var CHATGPT_WEB_INSTANT_CONTEXT_WINDOW = 41000;
@@ -166,8 +167,8 @@ var CHATGPT_WEB_LUNA_MODEL_ROUTES = [
 var CHATGPT_WEB_MODEL_ROUTES = [
   {
     slug: "chatgpt-web/light",
-    displayName: "ChatGPT Web — Instant",
-    description: "ChatGPT Web Instant through the native Codex harness.",
+    displayName: "ChatGPT Web — GPT-5.6 Sol Instant (即时)",
+    description: "通过原生 Codex 通道的 ChatGPT Web 即时档 (Instant)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "low",
@@ -176,8 +177,8 @@ var CHATGPT_WEB_MODEL_ROUTES = [
   },
   {
     slug: "chatgpt-web/medium",
-    displayName: "ChatGPT Web — Medium",
-    description: "ChatGPT Web Medium through the native Codex harness.",
+    displayName: "ChatGPT Web — GPT-5.6 Sol Medium (中等)",
+    description: "通过原生 Codex 通道的 ChatGPT Web 中等档 (Medium)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "medium",
@@ -186,18 +187,48 @@ var CHATGPT_WEB_MODEL_ROUTES = [
   },
   {
     slug: "chatgpt-web/high",
-    displayName: "ChatGPT Web — High",
-    description: "ChatGPT Web High through the native Codex harness.",
+    displayName: "ChatGPT Web — GPT-5.6 Sol High (高)",
+    description: "通过原生 Codex 通道的 ChatGPT Web 高档 (High)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "high",
     adapterEffort: "high",
     requiresPro: false
   },
+  {
+    slug: "chatgpt-web/gpt-6-light",
+    displayName: "ChatGPT Web — GPT-6 Instant (即时)",
+    description: "通过原生 Codex 通道的 ChatGPT GPT-6 即时档（Plus 选择器，2026-10 / GPT-6 Instant）。",
+    interactionMode: "automatic",
+    backendModel: CHATGPT_WEB_GPT6_BACKEND_MODEL,
+    codexEffort: "low",
+    adapterEffort: "low",
+    requiresPro: false
+  },
+  {
+    slug: "chatgpt-web/gpt-6-medium",
+    displayName: "ChatGPT Web — GPT-6 Medium (中等)",
+    description: "通过原生 Codex 通道的 ChatGPT GPT-6 中等档（Plus 选择器，2026-10 / GPT-6 Medium）。",
+    interactionMode: "automatic",
+    backendModel: CHATGPT_WEB_GPT6_BACKEND_MODEL,
+    codexEffort: "medium",
+    adapterEffort: "medium",
+    requiresPro: false
+  },
+  {
+    slug: "chatgpt-web/gpt-6-high",
+    displayName: "ChatGPT Web — GPT-6 High (高)",
+    description: "通过原生 Codex 通道的 ChatGPT GPT-6 高档（Plus 选择器，2026-10 / GPT-6 High）。",
+    interactionMode: "automatic",
+    backendModel: CHATGPT_WEB_GPT6_BACKEND_MODEL,
+    codexEffort: "high",
+    adapterEffort: "high",
+    requiresPro: false
+  },
   {
     slug: "chatgpt-web/extra-high",
-    displayName: "ChatGPT Web — Extra High",
-    description: "Account-gated ChatGPT Web Extra High through the native Codex harness.",
+    displayName: "ChatGPT Web — Extra High (超高)",
+    description: "按账号开放的超高档 ChatGPT Web (Extra High，通过原生 Codex 通道)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "xhigh",
@@ -207,7 +238,7 @@ var CHATGPT_WEB_MODEL_ROUTES = [
   {
     slug: "chatgpt-web/pro",
     displayName: "ChatGPT Web — Pro",
-    description: "Account-gated ChatGPT Pro through the native Codex harness.",
+    description: "按账号开放的 ChatGPT Pro (通过原生 Codex 通道)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "ultra",
@@ -270,7 +301,7 @@ function requireChatGptWebModelRoute(modelId, capabilities) {
 }
 
 // src/version.ts
-var VERSION = "1.0.4";
+var VERSION = "1.0.5";
 
 // src/config.ts
 var CHATGPT_CONNECTOR_NAME = "Codex Native2";
@@ -844,15 +875,20 @@ var CHATGPT_COMPOSER_SELECTOR = [
 ].join(", ");
 var CHATGPT_EFFORT_CONTROL_SELECTOR = [
   'button[aria-haspopup="menu"][data-tone="neutral"]',
-  'button[data-testid="model-switcher-dropdown-button"][aria-haspopup="menu"]'
+  'button[data-testid="model-switcher-dropdown-button"][aria-haspopup="menu"]',
+  'button[aria-haspopup="menu"][aria-label="选择 ChatGPT 模型"]',
+  'button[aria-haspopup="menu"][aria-label*="ChatGPT"][aria-label*="model" i]'
 ].join(", ");
 var CHATGPT_EFFORT_MENU_SELECTOR = [
-  '[data-testid="composer-intelligence-picker-content"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider])',
-  '[role="menu"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider])',
-  '[role="group"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider])'
+  '[data-testid="composer-intelligence-picker-content"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider], [data-model-picker-power-slider])',
+  '[role="menu"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider], [data-model-picker-power-slider])',
+  '[role="group"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider], [data-model-picker-power-slider])'
 ].join(", ");
 var CHATGPT_EFFORT_ITEM_SELECTOR = '[role="menuitemradio"]';
-var CHATGPT_EFFORT_SLIDER_SELECTOR = '[data-model-reasoning-effort-slider] [role="slider"]';
+var CHATGPT_EFFORT_SLIDER_SELECTOR = [
+  '[data-model-picker-power-slider] [role="slider"]',
+  '[data-model-reasoning-effort-slider] [role="slider"]'
+].join(", ");
 var CHATGPT_EFFORT_SLIDER_MAX_OPTIONS = 5;
 var CHATGPT_STOP_BUTTON_SELECTOR = [
   '[data-testid="stop-button"]',
@@ -7334,6 +7370,7 @@ class ChatGptMarkdownBuffer {
 
 // src/adapters/chatgpt-web/model.ts
 var CHATGPT_WEB_MODEL_ID = CHATGPT_WEB_BACKEND_MODEL;
+var CHATGPT_WEB_GPT6_MODEL_ID = CHATGPT_WEB_GPT6_BACKEND_MODEL;
 var CHATGPT_WEB_LUNA_MODEL_ID = CHATGPT_WEB_LUNA_BACKEND_MODEL;
 function resolveChatGptWebModelMode(modelId, reasoning, capabilities) {
   if (modelId === CHATGPT_WEB_LUNA_MODEL_ID) {
@@ -7354,7 +7391,7 @@ function resolveChatGptWebModelMode(modelId, reasoning, capabilities) {
       localTools: capabilities.localToolsEnabled
     };
   }
-  if (modelId !== CHATGPT_WEB_MODEL_ID) {
+  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_GPT6_MODEL_ID) {
     throw new Error(`ChatGPT web model is not supported: ${modelId}`);
   }
   if (!capabilities.solAvailable) {
@@ -7363,15 +7400,15 @@ function resolveChatGptWebModelMode(modelId, reasoning, capabilities) {
   const effort = reasoning ?? "high";
   switch (effort) {
     case "low":
-      return { modelId, effort, displayLabel: "Instant", uiEffortIndex: 0, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+      return { modelId, effort, displayLabel: "Instant (即时)", uiEffortIndex: 0, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
     case "medium":
-      return { modelId, effort, displayLabel: "Medium", uiEffortIndex: 1, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+      return { modelId, effort, displayLabel: "Medium (中等)", uiEffortIndex: 1, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
     case "high":
-      return { modelId, effort, displayLabel: "High", uiEffortIndex: 2, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+      return { modelId, effort, displayLabel: "High (高)", uiEffortIndex: 2, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
     case "xhigh":
       if (!capabilities.proAvailable)
         throw new Error("ChatGPT Extra High effort is not available for this account");
-      return { modelId, effort, displayLabel: "Extra High", uiEffortIndex: 3, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+      return { modelId, effort, displayLabel: "Extra High (超高)", uiEffortIndex: 3, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
     case "max":
       if (!capabilities.proAvailable)
         throw new Error("ChatGPT Pro effort is not available for this account");
@@ -10856,7 +10893,7 @@ async function resolveChatGptToolConfirmation(page, appName, autoApprove, signal
   return true;
 }
 function assertChatGptWebInputWithinLimits(estimatedInputTokens, estimatedMessageTokens, modelId, effort, capabilities, promptChars, composerCharLimitOverride) {
-  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_LUNA_MODEL_ID) {
+  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_LUNA_MODEL_ID && modelId !== CHATGPT_WEB_GPT6_MODEL_ID) {
     throw new Error(`ChatGPT web context limit is not defined for model: ${modelId}`);
   }
   if (modelId === CHATGPT_WEB_LUNA_MODEL_ID && estimatedInputTokens > CHATGPT_LUNA_BROWSER_INPUT_TOKEN_BUDGET) {
@@ -10879,7 +10916,7 @@ function assertChatGptWebMultipartInputWithinLimits(estimatedInputTokens, estima
   if (modelId === CHATGPT_WEB_LUNA_MODEL_ID) {
     throw new ChatGptWebAdapterError("Bigger Context is unavailable for Luna because every later browser request includes the accumulated transcript inside the same 28,000-token transport budget.", { status: 400, errorType: "invalid_request_error", code: "context_length_exceeded", retryable: false });
   }
-  if (modelId !== CHATGPT_WEB_MODEL_ID) {
+  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_GPT6_MODEL_ID) {
     throw new Error(`ChatGPT Bigger Context limit is not defined for model: ${modelId}`);
   }
   const { contextWindow: baseContextWindow } = resolveChatGptWebContextLimits(modelId, effort, { ...capabilities, experimentalBiggerContext: false });
@@ -10908,7 +10945,7 @@ function resolveChatGptWebMultipartStagingMode(modelId, capabilities, requestedE
   if (modelId === CHATGPT_WEB_LUNA_MODEL_ID || !capabilities.solAvailable) {
     throw new ChatGptWebAdapterError("Bigger Context staging is unavailable for a Luna-only account.", { status: 400, errorType: "invalid_request_error", code: "context_length_exceeded", retryable: false });
   }
-  if (modelId !== CHATGPT_WEB_MODEL_ID) {
+  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_GPT6_MODEL_ID) {
     throw new Error(`ChatGPT Bigger Context staging mode is not defined for model: ${modelId}`);
   }
   const efforts = capabilities.proAvailable ? ["low", "medium", "max"] : ["low", "medium"];
@@ -11560,6 +11597,34 @@ function insertPlainTextIntoComposer(element, value) {
   }
   return document.execCommand("insertText", false, value);
 }
+var CHATGPT_SEND_BUTTON_SELECTORS = [
+  '[data-testid="send-button"]',
+  'button[aria-label="Send"]',
+  'button[aria-label="发送"]',
+  'button[aria-label="发送消息"]',
+  'button[aria-label*="Send" i]',
+  'button[aria-label*="发送"]'
+].join(", ");
+async function resolveChatGptComposerContainer(composer, page) {
+  const formScope = composer.locator("xpath=ancestor::form[1]");
+  if (await formScope.count().catch(() => 0) > 0)
+    return formScope.first();
+  const containerScope = composer.locator("xpath=ancestor::*[self::form or self::div or @role='group' or @role='region'][1]");
+  if (await containerScope.count().catch(() => 0) > 0)
+    return containerScope.first();
+  return composer;
+}
+async function resolveChatGptSendButton(composer, page) {
+  const formScope = composer.locator("xpath=ancestor::form[1]").locator(CHATGPT_SEND_BUTTON_SELECTORS);
+  if (await formScope.count().catch(() => 0) > 0)
+    return formScope.first();
+  const containerScope = composer.locator("xpath=ancestor::*[self::form or self::div or @role='group' or @role='region'][1]").locator(CHATGPT_SEND_BUTTON_SELECTORS);
+  if (await containerScope.count().catch(() => 0) > 0)
+    return containerScope.first();
+  if (page)
+    return page.locator(CHATGPT_SEND_BUTTON_SELECTORS).first();
+  return composer.locator(CHATGPT_SEND_BUTTON_SELECTORS).first();
+}
 
 class ChatGptBrowserWorker {
   config;
@@ -11858,7 +11923,7 @@ class ChatGptBrowserWorker {
         await throwIfChatGptRateLimitDialog(page);
       if (ready === "session-expired")
         await throwIfChatGptSessionFailureAlert(page);
-      if (ready !== "slider" && await effortSlider.isVisible().catch(() => false))
+      if (await effortSlider.isVisible().catch(() => false))
         ready = "slider";
       await captureDiagnostic?.(ready === "slider" ? "effort-slider-visible" : "effort-choice-visible");
     } catch (error) {
@@ -11875,11 +11940,11 @@ class ChatGptBrowserWorker {
       if (!sliderState) {
         throw chatGptModelControlUnavailableAdapterError("ChatGPT effort slider exposed an invalid ARIA range");
       }
-      const targetValue = sliderState.min + uiEffortIndex;
-      if (targetValue > sliderState.max) {
-        const proUsageLimitHint = uiEffortIndex === 4 && sliderState.min === 0 && sliderState.max === 3 ? " If you have made many Pro requests recently, ChatGPT may have temporarily hidden Pro because you reached its usage limit." : "";
-        throw chatGptModelControlUnavailableAdapterError(`ChatGPT effort slider does not expose item index ${uiEffortIndex}` + ` (min=${sliderState.min}; max=${sliderState.max})` + proUsageLimitHint);
+      const requestedStop = sliderState.min + uiEffortIndex;
+      if (requestedStop > sliderState.max) {
+        throw chatGptModelControlUnavailableAdapterError(`ChatGPT effort slider does not expose item index ${uiEffortIndex}` + ` (min=${sliderState.min}; max=${sliderState.max})` + ". This account's picker exposes three effort stops only.");
       }
+      const targetValue = requestedStop;
       const sliderControl = effortSlider.locator("xpath=ancestor::*[@role='menuitem'][1]");
       while (sliderState.value !== targetValue) {
         await throwIfChatGptRateLimitDialog(page);
@@ -12575,7 +12640,8 @@ class ChatGptBrowserWorker {
   }
   async sendAttachedPrompt(page, baseline, captureDiagnostic, abortSignal, externalProgress, submissionLifecycle, completionTracker, recoverObservation) {
     const composer = await this.activeComposer(page);
-    const sendButton = composer.locator("xpath=ancestor::form[1]").locator('[data-testid="send-button"], button[aria-label="Send"]').first();
+    const sendButton = await resolveChatGptSendButton(composer, page);
+    await captureDiagnostic?.("send-button-resolved");
     await sendButton.waitFor({ state: "visible", timeout: browserStageTimeouts.send });
     await settleChatGptUi();
     const sendEnableDeadline = Date.now() + this.config.tuning.sendEnableGraceMs;
@@ -12791,17 +12857,17 @@ class ChatGptBrowserWorker {
     if (files.length === 0)
       return;
     const composer = await this.activeComposer(page);
-    const composerForm = composer.locator("xpath=ancestor::form[1]");
+    const composerContainer = await resolveChatGptComposerContainer(composer, page);
     const input = page.locator('input[data-testid="upload-photos-input"]');
     await input.waitFor({ state: "attached", timeout: 20000 });
     await input.setInputFiles(files);
     try {
-      await Promise.all(files.map((file) => composerForm.getByRole("group", { name: file.name, exact: true }).waitFor({ state: "visible", timeout: 60000 })));
+      await Promise.all(files.map((file) => composerContainer.getByRole("group", { name: file.name, exact: true }).waitFor({ state: "visible", timeout: 60000 })));
     } catch {
       const alerts = (await page.locator('[role="alert"]').allInnerTexts().catch(() => [])).map((text) => text.replace(/\s+/g, " ").trim()).filter(Boolean);
       throw new Error(`ChatGPT did not accept all prompt attachments` + (alerts.length > 0 ? `: ${alerts.join(" | ")}` : ""));
     }
-    const send = composerForm.locator('[data-testid="send-button"], button[aria-label="Send"]').first();
+    const send = await resolveChatGptSendButton(composer, page);
     const deadline = Date.now() + 60000;
     while (Date.now() < deadline) {
       if (await send.isEnabled().catch(() => false))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wlv-zedd/dsh-chatgpt-web",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "DeepSeek Harness Cordis plugin for free ChatGPT Web (GPT 5.6 Luna) pure chat and zero API fees.",
   "repository": {
     "type": "git",

package/src/adapters/chatgpt-web/browser-worker.ts

@@ -24,6 +24,7 @@ import {
   type ChatGptMarkdownSegment,
 } from "./markdown";
 import {
+  CHATGPT_WEB_GPT6_MODEL_ID,
   CHATGPT_WEB_LUNA_MODEL_ID,
   CHATGPT_WEB_MODEL_ID,
   resolveChatGptWebModelMode,
@@ -879,7 +880,11 @@ export function assertChatGptWebInputWithinLimits(
   promptChars?: number,
   composerCharLimitOverride?: number,
 ): void {
-  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_LUNA_MODEL_ID) {
+  if (
+    modelId !== CHATGPT_WEB_MODEL_ID
+    && modelId !== CHATGPT_WEB_LUNA_MODEL_ID
+    && modelId !== CHATGPT_WEB_GPT6_MODEL_ID
+  ) {
     throw new Error(`ChatGPT web context limit is not defined for model: ${modelId}`);
   }
   if (
@@ -945,7 +950,8 @@ export function assertChatGptWebMultipartInputWithinLimits(
       { status: 400, errorType: "invalid_request_error", code: "context_length_exceeded", retryable: false },
     );
   }
-  if (modelId !== CHATGPT_WEB_MODEL_ID) {
+  // GPT-6 shares the Sol-class Plus transport windows, so Bigger Context applies to it too.
+  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_GPT6_MODEL_ID) {
     throw new Error(`ChatGPT Bigger Context limit is not defined for model: ${modelId}`);
   }
   const { contextWindow: baseContextWindow } = resolveChatGptWebContextLimits(
@@ -1016,7 +1022,7 @@ export function resolveChatGptWebMultipartStagingMode(
       { status: 400, errorType: "invalid_request_error", code: "context_length_exceeded", retryable: false },
     );
   }
-  if (modelId !== CHATGPT_WEB_MODEL_ID) {
+  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_GPT6_MODEL_ID) {
     throw new Error(`ChatGPT Bigger Context staging mode is not defined for model: ${modelId}`);
   }
   const efforts: readonly ChatGptWebModelMode["effort"][] = capabilities.proAvailable
@@ -2013,6 +2019,37 @@ export function insertPlainTextIntoComposer(element: HTMLElement, value: string)
   return document.execCommand("insertText", false, value);
 }
 
+export const CHATGPT_SEND_BUTTON_SELECTORS = [
+  '[data-testid="send-button"]',
+  'button[aria-label="Send"]',
+  'button[aria-label="发送"]',
+  'button[aria-label="发送消息"]',
+  'button[aria-label*="Send" i]',
+  'button[aria-label*="发送"]',
+].join(", ");
+
+export async function resolveChatGptComposerContainer(composer: Locator, page?: Page): Promise<Locator> {
+  const formScope = composer.locator("xpath=ancestor::form[1]");
+  if (await formScope.count().catch(() => 0) > 0) return formScope.first();
+  const containerScope = composer.locator("xpath=ancestor::*[self::form or self::div or @role='group' or @role='region'][1]");
+  if (await containerScope.count().catch(() => 0) > 0) return containerScope.first();
+  return composer;
+}
+
+export async function resolveChatGptSendButton(composer: Locator, page?: Page): Promise<Locator> {
+  // Strategy 1: Ancestor form if present
+  const formScope = composer.locator("xpath=ancestor::form[1]").locator(CHATGPT_SEND_BUTTON_SELECTORS);
+  if (await formScope.count().catch(() => 0) > 0) return formScope.first();
+
+  // Strategy 2: Ancestor container (div, role=group, role=region)
+  const containerScope = composer.locator("xpath=ancestor::*[self::form or self::div or @role='group' or @role='region'][1]").locator(CHATGPT_SEND_BUTTON_SELECTORS);
+  if (await containerScope.count().catch(() => 0) > 0) return containerScope.first();
+
+  // Strategy 3: Page-level active send button fallback
+  if (page) return page.locator(CHATGPT_SEND_BUTTON_SELECTORS).first();
+  return composer.locator(CHATGPT_SEND_BUTTON_SELECTORS).first();
+}
+
 export class ChatGptBrowserWorker {
   static forProvider(provider: CodexProviderConfig): ChatGptBrowserWorker {
     const config = resolveBrowserConfig(provider);
@@ -2371,9 +2408,10 @@ export class ChatGptBrowserWorker {
       ]);
       if (ready === "rate-limit") await throwIfChatGptRateLimitDialog(page);
       if (ready === "session-expired") await throwIfChatGptSessionFailureAlert(page);
-      // The current picker exposes model rows as menuitemradio alongside the effort slider.
-      // Those rows can win the locator race even though they are not effort choices.
-      if (ready !== "slider" && await effortSlider.isVisible().catch(() => false)) ready = "slider";
+      // The current picker exposes model rows as menuitemradio ALONGSIDE the effort slider.
+      // Those rows are models, not effort choices, so a visible slider is authoritative:
+      // we drive effort with arrow keys and never index the rows.
+      if (await effortSlider.isVisible().catch(() => false)) ready = "slider";
       await captureDiagnostic?.(ready === "slider" ? "effort-slider-visible" : "effort-choice-visible");
     } catch (error) {
       if (error instanceof ChatGptWebAdapterError) throw error;
@@ -2397,17 +2435,18 @@ export class ChatGptBrowserWorker {
           "ChatGPT effort slider exposed an invalid ARIA range",
         );
       }
-      const targetValue = sliderState.min + uiEffortIndex;
-      if (targetValue > sliderState.max) {
-        const proUsageLimitHint = uiEffortIndex === 4 && sliderState.min === 0 && sliderState.max === 3
-          ? " If you have made many Pro requests recently, ChatGPT may have temporarily hidden Pro because you reached its usage limit."
-          : "";
+      // The Plus picker only exposes three stops (Low/Medium/High). If the caller requested a
+      // higher stop that the UI cannot reach, reject it here instead of letting the slider
+      // loop fail silently or silently cap to a lower level.
+      const requestedStop = sliderState.min + uiEffortIndex;
+      if (requestedStop > sliderState.max) {
         throw chatGptModelControlUnavailableAdapterError(
           `ChatGPT effort slider does not expose item index ${uiEffortIndex}`
           + ` (min=${sliderState.min}; max=${sliderState.max})`
-          + proUsageLimitHint,
+          + ". This account's picker exposes three effort stops only.",
         );
       }
+      const targetValue = requestedStop;
       const sliderControl = effortSlider.locator("xpath=ancestor::*[@role='menuitem'][1]");
       while (sliderState.value !== targetValue) {
         await throwIfChatGptRateLimitDialog(page);
@@ -3414,10 +3453,8 @@ export class ChatGptBrowserWorker {
     recoverObservation?: ChatGptObservationRecovery,
   ): Promise<ChatGptSubmissionEvidence> {
     const composer = await this.activeComposer(page);
-    const sendButton = composer
-      .locator("xpath=ancestor::form[1]")
-      .locator('[data-testid="send-button"], button[aria-label="Send"]')
-      .first();
+    const sendButton = await resolveChatGptSendButton(composer, page);
+    await captureDiagnostic?.("send-button-resolved");
     await sendButton.waitFor({ state: "visible", timeout: browserStageTimeouts.send });
     await settleChatGptUi();
     const sendEnableDeadline = Date.now() + this.config.tuning.sendEnableGraceMs;
@@ -3734,13 +3771,13 @@ export class ChatGptBrowserWorker {
     const files = chatGptPromptFilePayloads(prompt);
     if (files.length === 0) return;
     const composer = await this.activeComposer(page);
-    const composerForm = composer.locator("xpath=ancestor::form[1]");
+    const composerContainer = await resolveChatGptComposerContainer(composer, page);
     const input = page.locator('input[data-testid="upload-photos-input"]');
     await input.waitFor({ state: "attached", timeout: 20_000 });
     await input.setInputFiles(files);
     try {
       await Promise.all(files.map(file => (
-        composerForm.getByRole("group", { name: file.name, exact: true })
+        composerContainer.getByRole("group", { name: file.name, exact: true })
           .waitFor({ state: "visible", timeout: 60_000 })
       )));
     } catch {
@@ -3752,7 +3789,7 @@ export class ChatGptBrowserWorker {
         + (alerts.length > 0 ? `: ${alerts.join(" | ")}` : ""),
       );
     }
-    const send = composerForm.locator('[data-testid="send-button"], button[aria-label="Send"]').first();
+    const send = await resolveChatGptSendButton(composer, page);
     const deadline = Date.now() + 60_000;
     while (Date.now() < deadline) {
       if (await send.isEnabled().catch(() => false)) return;

package/src/adapters/chatgpt-web/model.ts

@@ -1,9 +1,11 @@
 import {
   CHATGPT_WEB_BACKEND_MODEL,
+  CHATGPT_WEB_GPT6_BACKEND_MODEL,
   CHATGPT_WEB_LUNA_BACKEND_MODEL,
 } from "../../chatgpt-web-models";
 
 export const CHATGPT_WEB_MODEL_ID = CHATGPT_WEB_BACKEND_MODEL;
+export const CHATGPT_WEB_GPT6_MODEL_ID = CHATGPT_WEB_GPT6_BACKEND_MODEL;
 export const CHATGPT_WEB_LUNA_MODEL_ID = CHATGPT_WEB_LUNA_BACKEND_MODEL;
 
 export interface ChatGptWebCapabilities {
@@ -15,7 +17,7 @@ export interface ChatGptWebCapabilities {
 export interface ChatGptWebModelMode {
   modelId: string;
   effort: "low" | "medium" | "high" | "xhigh" | "max";
-  displayLabel: "Luna" | "Think" | "Instant" | "Medium" | "High" | "Extra High" | "Pro";
+  displayLabel: "Luna" | "Think" | "Instant (即时)" | "Medium (中等)" | "High (高)" | "Extra High (超高)" | "Pro";
   uiEffortIndex: 0 | 1 | 2 | 3 | 4 | null;
   thinkEnabled: boolean;
   localTools: boolean;
@@ -44,7 +46,7 @@ export function resolveChatGptWebModelMode(
       localTools: capabilities.localToolsEnabled,
     };
   }
-  if (modelId !== CHATGPT_WEB_MODEL_ID) {
+  if (modelId !== CHATGPT_WEB_MODEL_ID && modelId !== CHATGPT_WEB_GPT6_MODEL_ID) {
     throw new Error(`ChatGPT web model is not supported: ${modelId}`);
   }
   if (!capabilities.solAvailable) {
@@ -53,14 +55,16 @@ export function resolveChatGptWebModelMode(
   const effort = reasoning ?? "high";
   switch (effort) {
     case "low":
-      return { modelId, effort, displayLabel: "Instant", uiEffortIndex: 0, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+      return { modelId, effort, displayLabel: "Instant (即时)", uiEffortIndex: 0, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
     case "medium":
-      return { modelId, effort, displayLabel: "Medium", uiEffortIndex: 1, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+      return { modelId, effort, displayLabel: "Medium (中等)", uiEffortIndex: 1, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
     case "high":
-      return { modelId, effort, displayLabel: "High", uiEffortIndex: 2, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+      return { modelId, effort, displayLabel: "High (高)", uiEffortIndex: 2, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+    // The Plus picker exposes only three effort stops (Low/Medium/High). Higher stops are
+    // Pro-account only; this check runs before the turn reaches the browser layer.
     case "xhigh":
       if (!capabilities.proAvailable) throw new Error("ChatGPT Extra High effort is not available for this account");
-      return { modelId, effort, displayLabel: "Extra High", uiEffortIndex: 3, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
+      return { modelId, effort, displayLabel: "Extra High (超高)", uiEffortIndex: 3, thinkEnabled: false, localTools: capabilities.localToolsEnabled };
     case "max":
       if (!capabilities.proAvailable) throw new Error("ChatGPT Pro effort is not available for this account");
       return { modelId, effort, displayLabel: "Pro", uiEffortIndex: 4, thinkEnabled: false, localTools: capabilities.localToolsEnabled };

package/src/chatgpt-session.ts

@@ -12,14 +12,24 @@ export const CHATGPT_COMPOSER_SELECTOR = [
 export const CHATGPT_EFFORT_CONTROL_SELECTOR = [
   'button[aria-haspopup="menu"][data-tone="neutral"]',
   'button[data-testid="model-switcher-dropdown-button"][aria-haspopup="menu"]',
+  // 2026-10 UI: a plain button whose stable hooks are aria-haspopup="menu" plus a localized
+  // aria-label. Match the zh label and a bilingual pattern so the probe does not silently
+  // degrade to a Luna-only account on non-English UI.
+  'button[aria-haspopup="menu"][aria-label="选择 ChatGPT 模型"]',
+  'button[aria-haspopup="menu"][aria-label*="ChatGPT"][aria-label*="model" i]',
 ].join(", ");
 export const CHATGPT_EFFORT_MENU_SELECTOR = [
-  '[data-testid="composer-intelligence-picker-content"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider])',
-  '[role="menu"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider])',
-  '[role="group"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider])',
+  '[data-testid="composer-intelligence-picker-content"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider], [data-model-picker-power-slider])',
+  '[role="menu"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider], [data-model-picker-power-slider])',
+  '[role="group"]:has([role="menuitemradio"], [data-model-reasoning-effort-slider], [data-model-picker-power-slider])',
 ].join(", ");
 export const CHATGPT_EFFORT_ITEM_SELECTOR = '[role="menuitemradio"]';
-export const CHATGPT_EFFORT_SLIDER_SELECTOR = '[data-model-reasoning-effort-slider] [role="slider"]';
+// 2026-10 UI renamed the wrapper attribute to data-model-picker-power-slider. Keep the old
+// anchor so a rollback still resolves the slider.
+export const CHATGPT_EFFORT_SLIDER_SELECTOR = [
+  '[data-model-picker-power-slider] [role="slider"]',
+  '[data-model-reasoning-effort-slider] [role="slider"]',
+].join(", ");
 export const CHATGPT_EFFORT_SLIDER_MAX_OPTIONS = 5;
 export const CHATGPT_STOP_BUTTON_SELECTOR = [
   '[data-testid="stop-button"]',

package/src/chatgpt-web-models.ts

@@ -1,6 +1,9 @@
 export const CHATGPT_WEB_MODEL_PREFIX = "chatgpt-web/";
 export const CHATGPT_WEB_BACKEND_MODEL = "gpt-5.6-sol";
 export const CHATGPT_WEB_LUNA_BACKEND_MODEL = "gpt-5.6-luna";
+/** GPT-6 appears in the Plus picker (2026-10) alongside GPT-5.6 Sol. Selecting it is a
+ *  pure browser-UI action (click the model row), so it needs no extra transport window. */
+export const CHATGPT_WEB_GPT6_BACKEND_MODEL = "gpt-6";
 /** Internal adapter identity for a turn whose ChatGPT model is selected by the user in the launcher. */
 export const CHATGPT_WEB_ZERO_RISK_BACKEND_MODEL = "chatgpt-web-zero-risk";
 /** Internal adapter identity for the explicitly enabled, Pro-sized Zero Risk context profile. */
@@ -8,7 +11,8 @@ export const CHATGPT_WEB_ZERO_RISK_PRO_BACKEND_MODEL = "chatgpt-web-zero-risk-pr
 
 export type ChatGptWebAutomaticBackendModel =
   | typeof CHATGPT_WEB_BACKEND_MODEL
-  | typeof CHATGPT_WEB_LUNA_BACKEND_MODEL;
+  | typeof CHATGPT_WEB_LUNA_BACKEND_MODEL
+  | typeof CHATGPT_WEB_GPT6_BACKEND_MODEL;
 export type ChatGptWebBackendModel =
   | ChatGptWebAutomaticBackendModel
   | ChatGptWebZeroRiskBackendModel;
@@ -291,8 +295,8 @@ export const CHATGPT_WEB_LUNA_MODEL_ROUTES: readonly ChatGptWebModelRoute[] = [
 export const CHATGPT_WEB_MODEL_ROUTES: readonly ChatGptWebAutomaticModelRoute[] = [
   {
     slug: "chatgpt-web/light",
-    displayName: "ChatGPT Web — Instant",
-    description: "ChatGPT Web Instant through the native Codex harness.",
+    displayName: "ChatGPT Web — GPT-5.6 Sol Instant (即时)",
+    description: "通过原生 Codex 通道的 ChatGPT Web 即时档 (Instant)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "low",
@@ -301,8 +305,8 @@ export const CHATGPT_WEB_MODEL_ROUTES: readonly ChatGptWebAutomaticModelRoute[]
   },
   {
     slug: "chatgpt-web/medium",
-    displayName: "ChatGPT Web — Medium",
-    description: "ChatGPT Web Medium through the native Codex harness.",
+    displayName: "ChatGPT Web — GPT-5.6 Sol Medium (中等)",
+    description: "通过原生 Codex 通道的 ChatGPT Web 中等档 (Medium)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "medium",
@@ -311,18 +315,48 @@ export const CHATGPT_WEB_MODEL_ROUTES: readonly ChatGptWebAutomaticModelRoute[]
   },
   {
     slug: "chatgpt-web/high",
-    displayName: "ChatGPT Web — High",
-    description: "ChatGPT Web High through the native Codex harness.",
+    displayName: "ChatGPT Web — GPT-5.6 Sol High (高)",
+    description: "通过原生 Codex 通道的 ChatGPT Web 高档 (High)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "high",
     adapterEffort: "high",
     requiresPro: false,
   },
+  {
+    slug: "chatgpt-web/gpt-6-light",
+    displayName: "ChatGPT Web — GPT-6 Instant (即时)",
+    description: "通过原生 Codex 通道的 ChatGPT GPT-6 即时档（Plus 选择器，2026-10 / GPT-6 Instant）。",
+    interactionMode: "automatic",
+    backendModel: CHATGPT_WEB_GPT6_BACKEND_MODEL,
+    codexEffort: "low",
+    adapterEffort: "low",
+    requiresPro: false,
+  },
+  {
+    slug: "chatgpt-web/gpt-6-medium",
+    displayName: "ChatGPT Web — GPT-6 Medium (中等)",
+    description: "通过原生 Codex 通道的 ChatGPT GPT-6 中等档（Plus 选择器，2026-10 / GPT-6 Medium）。",
+    interactionMode: "automatic",
+    backendModel: CHATGPT_WEB_GPT6_BACKEND_MODEL,
+    codexEffort: "medium",
+    adapterEffort: "medium",
+    requiresPro: false,
+  },
+  {
+    slug: "chatgpt-web/gpt-6-high",
+    displayName: "ChatGPT Web — GPT-6 High (高)",
+    description: "通过原生 Codex 通道的 ChatGPT GPT-6 高档（Plus 选择器，2026-10 / GPT-6 High）。",
+    interactionMode: "automatic",
+    backendModel: CHATGPT_WEB_GPT6_BACKEND_MODEL,
+    codexEffort: "high",
+    adapterEffort: "high",
+    requiresPro: false,
+  },
   {
     slug: "chatgpt-web/extra-high",
-    displayName: "ChatGPT Web — Extra High",
-    description: "Account-gated ChatGPT Web Extra High through the native Codex harness.",
+    displayName: "ChatGPT Web — Extra High (超高)",
+    description: "按账号开放的超高档 ChatGPT Web (Extra High，通过原生 Codex 通道)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "xhigh",
@@ -332,7 +366,7 @@ export const CHATGPT_WEB_MODEL_ROUTES: readonly ChatGptWebAutomaticModelRoute[]
   {
     slug: "chatgpt-web/pro",
     displayName: "ChatGPT Web — Pro",
-    description: "Account-gated ChatGPT Pro through the native Codex harness.",
+    description: "按账号开放的 ChatGPT Pro (通过原生 Codex 通道)。",
     interactionMode: "automatic",
     backendModel: CHATGPT_WEB_BACKEND_MODEL,
     codexEffort: "ultra",

package/src/model-catalog.ts

@@ -52,7 +52,7 @@ function routedModelPriority(
     throw new Error("Native Codex model template priority cannot reserve the Compatibility V1 roster");
   }
   // Codex V1 exposes at most five model overrides. Keep the native Sol row plus the four useful
-  // delegated Web efforts (Medium, High, Extra High, Pro); Instant remains a selectable root model
+  // delegated Web efforts (中等 / 高 / 超高 / Pro); 即时 remains a selectable root model
   // but does not displace Pro from spawn_agent's bounded registry.
   return priority + 1;
 }

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '1.0.4';
+export const VERSION = '1.0.5';