codex-chatgpt-control 0.5.0-alpha.1 → 0.5.1-alpha.2

package/dist/src/commands/doctor.js

@@ -33,6 +33,8 @@ const REQUIRED_LOCALE_KEYS = [
 ];
 const REQUIRED_TOOL_IDS = ["web_search", "deep_research", "create_image"];
 const REQUIRED_MODE_OPTION_IDS = ["latest", "instant", "thinking", "extended", "medium", "high", "extraHigh", "pro"];
+const REQUIRED_CONFIGURATION_AXIS_IDS = ["power", "model", "intelligence", "effort", "speed", "advanced"];
+const REQUIRED_CONFIGURATION_OPTION_IDS = ["instant", "light", "medium", "high", "extraHigh", "max", "ultra", "pro", "standard", "fast"];
 export async function doctor(env, args = {}) {
     const wanted = args.check ?? DEFAULT_CHECKS;
     const checks = {};
@@ -232,8 +234,14 @@ function localizationCheck(env) {
     const requiredKeysMissing = REQUIRED_LOCALE_KEYS.filter(key => localeLabels[key].length === 0);
     const missingToolIds = REQUIRED_TOOL_IDS.filter(id => (localeLabels.tools[id]?.length ?? 0) === 0);
     const missingModeOptionIds = REQUIRED_MODE_OPTION_IDS.filter(id => (localeLabels.modeOptions[id]?.length ?? 0) === 0);
+    const missingConfigurationAxisIds = REQUIRED_CONFIGURATION_AXIS_IDS
+        .filter(id => (localeLabels.configurationAxes[id]?.length ?? 0) === 0);
+    const missingConfigurationOptionIds = REQUIRED_CONFIGURATION_OPTION_IDS
+        .filter(id => (localeLabels.configurationOptions[id]?.length ?? 0) === 0);
     const toolIds = Object.keys(localeLabels.tools);
     const modeOptionIds = Object.keys(localeLabels.modeOptions);
+    const configurationAxisIds = Object.keys(localeLabels.configurationAxes);
+    const configurationOptionIds = Object.keys(localeLabels.configurationOptions);
     const proAliases = [...localeLabels.modeOptions.pro];
     const supportsProExtendedAlias = proAliases.some(alias => /pro\s*(?:•\s*)?extended/i.test(alias))
         && proAliases.some(alias => /extended\s+pro/i.test(alias));
@@ -250,17 +258,26 @@ function localizationCheck(env) {
         && localeLabels.sendButton[0] === "Send prompt"
         && localeLabels.modeLabels.includes("Thinking")
         && localeLabels.modeOptions.pro?.[0] === "Pro"
+        && localeLabels.configurationAxes.power?.[0] === "Power"
+        && localeLabels.configurationAxes.advanced?.[0] === "Advanced"
+        && localeLabels.configurationOptions.ultra?.[0] === "Ultra"
         && localeLabels.tools.web_search?.[0] === "Web search";
     const labelCandidateCount = REQUIRED_LOCALE_KEYS.reduce((total, key) => total + localeLabels[key].length, 0)
         + Object.values(localeLabels.tools).reduce((total, values) => total + values.length, 0)
-        + Object.values(localeLabels.modeOptions).reduce((total, values) => total + values.length, 0);
+        + Object.values(localeLabels.modeOptions).reduce((total, values) => total + values.length, 0)
+        + Object.values(localeLabels.configurationAxes).reduce((total, values) => total + values.length, 0)
+        + Object.values(localeLabels.configurationOptions).reduce((total, values) => total + values.length, 0);
     const details = {
         englishCanonicalPresent,
         requiredKeysMissing,
         missingToolIds,
         missingModeOptionIds,
+        missingConfigurationAxisIds,
+        missingConfigurationOptionIds,
         toolIds,
         modeOptionIds,
+        configurationAxisIds,
+        configurationOptionIds,
         proAliases,
         supportsProExtendedAlias,
         runningStateLabelCoverage,
@@ -268,7 +285,12 @@ function localizationCheck(env) {
         pageAvailable: env.page !== undefined,
         runtimeSelectorCoverage: "registry_only_stage_2"
     };
-    if (englishCanonicalPresent && requiredKeysMissing.length === 0 && missingToolIds.length === 0 && missingModeOptionIds.length === 0) {
+    if (englishCanonicalPresent
+        && requiredKeysMissing.length === 0
+        && missingToolIds.length === 0
+        && missingModeOptionIds.length === 0
+        && missingConfigurationAxisIds.length === 0
+        && missingConfigurationOptionIds.length === 0) {
         const runningStateMessage = runningStateLocalizationSupport === "complete"
             ? "running-state labels are present for every registered non-English locale"
             : runningStateLocalizationSupport === "partial"

package/dist/src/commands/experience.d.ts

@@ -4,6 +4,7 @@ type SurfaceSnapshot = {
     composerLabels: string[];
     mainControls: string[];
     mainText: string;
+    selectedSurfaceLabels?: string[];
 };
 export declare function detectExperience(env: RuntimeEnv, args?: DetectExperienceArgs): Promise<CommandResult<DetectExperienceData>>;
 export declare function openExperience(env: RuntimeEnv, args: OpenExperienceArgs): Promise<CommandResult<OpenExperienceData>>;

package/dist/src/commands/experience.js

@@ -3,6 +3,9 @@ import { localeLabels } from "../dom/locale-labels.js";
 import { normalizeForLabelMatch, visibleLabelMatches } from "../dom/label-match.js";
 import { contextFromPage } from "./context.js";
 import { ensurePage } from "./session.js";
+const CHATGPT_HOME = "https://chatgpt.com/";
+const EXPERIENCE_CONTROL_DISCOVERY_TIMEOUT_MS = 15_000;
+const EXPERIENCE_POLL_MS = 250;
 export async function detectExperience(env, args = {}) {
     void args;
     const boot = await ensurePage(env);
@@ -43,14 +46,50 @@ export async function openExperience(env, args) {
             }));
         }
         const labels = localeLabels.experienceOptions[args.experience];
-        if (!await clickUniqueExperienceControl(page, labels)) {
-            return experienceSelectorDrift(page, `No unique visible ChatGPT ${args.experience === "work" ? "Work" : "Chat"} surface control was found.`, before);
-        }
         const timeoutMs = args.timeoutMs ?? 30000;
-        const started = Date.now();
+        const discoveryAttempts = pollAttempts(Math.min(timeoutMs, EXPERIENCE_CONTROL_DISCOVERY_TIMEOUT_MS), EXPERIENCE_POLL_MS);
+        let observed = before;
+        let controlClicked = await clickUniqueExperienceControl(page, labels);
+        if (!controlClicked && await navigateConversationToSurfaceHome(page, args.timeoutMs)) {
+            observed = detectExperienceFromSnapshot(await readSurfaceSnapshot(page));
+            if (observed.experience === args.experience) {
+                return resultOk({
+                    experience: args.experience,
+                    previousExperience: before.experience,
+                    changed: true,
+                    selectorProfile: observed.selectorProfile
+                }, await contextFromPage(page, {
+                    experience: observed.experience,
+                    selectorProfile: observed.selectorProfile
+                }));
+            }
+            controlClicked = await clickUniqueExperienceControl(page, labels);
+        }
+        // session.bootstrap can verify the composer before the Chat/Work radio has
+        // hydrated. Give the scoped surface control a short bounded discovery
+        // window instead of reporting selector drift from that transient state.
+        for (let attempt = 1; !controlClicked && attempt < discoveryAttempts; attempt += 1) {
+            await page.waitForTimeout?.(EXPERIENCE_POLL_MS);
+            observed = detectExperienceFromSnapshot(await readSurfaceSnapshot(page));
+            if (observed.experience === args.experience) {
+                return resultOk({
+                    experience: args.experience,
+                    previousExperience: before.experience,
+                    changed: true,
+                    selectorProfile: observed.selectorProfile
+                }, await contextFromPage(page, {
+                    experience: observed.experience,
+                    selectorProfile: observed.selectorProfile
+                }));
+            }
+            controlClicked = await clickUniqueExperienceControl(page, labels);
+        }
+        if (!controlClicked) {
+            return experienceSelectorDrift(page, `No unique visible ChatGPT ${args.experience === "work" ? "Work" : "Chat"} surface control was found.`, observed);
+        }
         let after = before;
-        while (Date.now() - started < timeoutMs) {
-            await page.waitForTimeout?.(250);
+        for (let attempt = 0; attempt < pollAttempts(timeoutMs, EXPERIENCE_POLL_MS); attempt += 1) {
+            await page.waitForTimeout?.(EXPERIENCE_POLL_MS);
             after = detectExperienceFromSnapshot(await readSurfaceSnapshot(page));
             if (after.experience === args.experience) {
                 return resultOk({
@@ -86,12 +125,39 @@ export async function openExperience(env, args) {
         return resultError(error instanceof Error ? error : new Error(String(error)), await contextFromPage(page));
     }
 }
+function pollAttempts(timeoutMs, pollMs) {
+    return Math.max(1, Math.ceil(Math.max(0, timeoutMs) / pollMs));
+}
+async function navigateConversationToSurfaceHome(page, timeoutMs) {
+    if (page.goto === undefined || page.url === undefined)
+        return false;
+    const currentUrl = await Promise.resolve(page.url()).catch(() => "");
+    if (!/^https:\/\/chatgpt\.com\/c\//i.test(currentUrl))
+        return false;
+    await page.goto(CHATGPT_HOME, {
+        waitUntil: "domcontentloaded",
+        timeout: timeoutMs ?? 30000
+    });
+    await page.waitForTimeout?.(500);
+    return true;
+}
 export function detectExperienceFromSnapshot(snapshot) {
     const evidence = [];
     const composerLabels = snapshot.composerLabels.map(normalizeForLabelMatch);
     const controls = snapshot.mainControls.map(normalizeForLabelMatch);
     const mainText = normalizeForLabelMatch(snapshot.mainText);
+    const selectedSurfaceLabels = (snapshot.selectedSurfaceLabels ?? []).map(normalizeForLabelMatch);
     const url = snapshot.url.toLowerCase();
+    const selectedWork = matchingLabels(selectedSurfaceLabels, localeLabels.experienceOptions.work);
+    const selectedChat = matchingLabels(selectedSurfaceLabels, localeLabels.experienceOptions.chat);
+    const workSurfaceSelected = selectedWork.length > 0 && selectedChat.length === 0;
+    const chatSurfaceSelected = selectedChat.length > 0 && selectedWork.length === 0;
+    if (workSurfaceSelected) {
+        evidence.push({ source: "control", label: "Work surface selected" });
+    }
+    else if (chatSurfaceSelected) {
+        evidence.push({ source: "control", label: "Chat surface selected" });
+    }
     const workComposer = matchingLabels(composerLabels, localeLabels.workComposerTextbox);
     for (const label of workComposer) {
         evidence.push({ source: "composer", label });
@@ -106,6 +172,18 @@ export function detectExperienceFromSnapshot(snapshot) {
     if (workAxisCount >= 2) {
         evidence.push({ source: "control", label: `Work configuration axes (${workAxisCount}/3)` });
     }
+    const workConfigurationOpener = controls.some(label => /\b(?:gpt[\s-]?\d|\d+(?:\.\d+)+|sol|luna|terra)\b/i.test(label)
+        && hasAnyLabel([label], [
+            ...localeLabels.configurationOptions.light,
+            ...localeLabels.configurationOptions.medium,
+            ...localeLabels.configurationOptions.high,
+            ...localeLabels.configurationOptions.extraHigh,
+            ...localeLabels.configurationOptions.max,
+            ...localeLabels.configurationOptions.ultra,
+        ]));
+    if (workConfigurationOpener) {
+        evidence.push({ source: "control", label: "Work configuration opener" });
+    }
     if (/\/work(?:\/|$|\?)/.test(url)) {
         evidence.push({ source: "url", label: snapshot.url });
     }
@@ -113,15 +191,21 @@ export function detectExperienceFromSnapshot(snapshot) {
         evidence.push({ source: "heading", label: "Work composer copy" });
     }
     const workScore = workComposer.length * 4
+        + (workSurfaceSelected ? 10 : 0)
         + (workAxisCount >= 2 ? 4 : 0)
+        // The active Work task drops the Chat/Work radio and keeps the shared
+        // "Chat with ChatGPT" textbox name. Its compound model + effort opener is
+        // therefore strong enough to disambiguate that continuation surface.
+        + (workConfigurationOpener ? 6 : 0)
         + (/\/work(?:\/|$|\?)/.test(url) ? 3 : 0)
         + (containsAny(mainText, ["work on something else", "work on anything"]) ? 2 : 0);
-    const chatScore = chatComposer.length * 4;
+    const chatScore = chatComposer.length * 4
+        + (chatSurfaceSelected ? 10 : 0);
     let experience = "unknown";
     let confidence = "low";
     if (workScore > chatScore && workScore >= 4) {
         experience = "work";
-        confidence = workScore >= 7 ? "high" : "medium";
+        confidence = workSurfaceSelected || workScore >= 7 ? "high" : "medium";
     }
     else if (chatScore > workScore && chatScore >= 4) {
         experience = "chat";
@@ -135,17 +219,28 @@ export async function readSurfaceSnapshot(page) {
         ? await Promise.resolve(page.url()).catch(() => "")
         : "";
     if (typeof page.evaluate !== "function") {
-        return { url, composerLabels: [], mainControls: [], mainText: "" };
+        return { url, composerLabels: [], mainControls: [], mainText: "", selectedSurfaceLabels: [] };
     }
-    const snapshot = await page.evaluate(() => {
+    const snapshot = await page.evaluate((surfaceOptionLabels) => {
         const visible = (element) => {
             const html = element;
             const rect = html.getBoundingClientRect?.();
-            const style = typeof window !== "undefined" ? window.getComputedStyle?.(html) : undefined;
-            return (rect === undefined || (rect.width > 0 && rect.height > 0))
-                && style?.display !== "none"
-                && style?.visibility !== "hidden"
-                && style?.opacity !== "0";
+            if (rect !== undefined && (rect.width <= 0 || rect.height <= 0))
+                return false;
+            let current = element;
+            while (current !== null) {
+                if (current.hasAttribute?.("inert") || current.getAttribute?.("aria-hidden") === "true") {
+                    return false;
+                }
+                const style = typeof window !== "undefined"
+                    ? window.getComputedStyle?.(current)
+                    : undefined;
+                if (style?.display === "none" || style?.visibility === "hidden" || style?.opacity === "0") {
+                    return false;
+                }
+                current = current.parentElement ?? null;
+            }
+            return true;
         };
         const labelFor = (element) => {
             const html = element;
@@ -156,6 +251,8 @@ export async function readSurfaceSnapshot(page) {
                 ?? "";
         };
         const normalize = (value) => value.replace(/\s+/g, " ").trim();
+        const normalizeComparable = (value) => normalize(value).toLocaleLowerCase();
+        const wantedSurfaceLabels = new Set(surfaceOptionLabels.map(normalizeComparable));
         const composerRoots = Array.from(document.querySelectorAll("main form, main [data-testid*='composer' i], main [class*='composer' i]"));
         const composerNodes = composerRoots.flatMap(root => [
             root,
@@ -183,8 +280,17 @@ export async function readSurfaceSnapshot(page) {
             .filter(visible)
             .slice(0, 32);
         const mainText = normalize(surfaceTextNodes.map(labelFor).join(" ")).slice(0, 2000);
-        return { composerLabels, mainControls, mainText };
-    }).catch(() => ({ composerLabels: [], mainControls: [], mainText: "" }));
+        const selectedSurfaceLabels = Array.from(new Set(Array.from(document.querySelectorAll("[role='radio'][aria-checked='true'], [role='radio'][data-state='checked'], input[type='radio']:checked"))
+            .filter(visible)
+            .map(labelFor)
+            .map(normalize)
+            .filter(label => wantedSurfaceLabels.has(normalizeComparable(label)))))
+            .slice(0, 4);
+        return { composerLabels, mainControls, mainText, selectedSurfaceLabels };
+    }, [
+        ...localeLabels.experienceOptions.chat,
+        ...localeLabels.experienceOptions.work,
+    ]).catch(() => ({ composerLabels: [], mainControls: [], mainText: "", selectedSurfaceLabels: [] }));
     return { url, ...snapshot };
 }
 function profileFromSnapshot(snapshot, experience) {
@@ -220,7 +326,7 @@ function profileFromSnapshot(snapshot, experience) {
 }
 async function clickUniqueExperienceControl(page, labels) {
     for (const label of labels) {
-        for (const role of ["button", "menuitem", "tab", "link"]) {
+        for (const role of ["radio", "button", "menuitem", "tab", "link"]) {
             if (await clickIfUnique(page.getByRole?.(role, { name: label, exact: true }))) {
                 return true;
             }
@@ -232,12 +338,39 @@ async function clickUniqueExperienceControl(page, labels) {
     return page.evaluate((wantedLabels) => {
         const normalize = (value) => value.replace(/\s+/g, " ").trim().toLocaleLowerCase();
         const wanted = new Set(wantedLabels.map(normalize));
-        const nodes = Array.from(document.querySelectorAll("header button, header [role='button'], header [role='tab'], main [role='menuitem'], main [role='option']"));
-        const matches = nodes.filter(node => {
+        const visible = (element) => {
+            const html = element;
+            const rect = html.getBoundingClientRect?.();
+            if (rect !== undefined && (rect.width <= 0 || rect.height <= 0))
+                return false;
+            let current = element;
+            while (current !== null) {
+                if (current.hasAttribute?.("inert") || current.getAttribute?.("aria-hidden") === "true") {
+                    return false;
+                }
+                const style = typeof window !== "undefined"
+                    ? window.getComputedStyle?.(current)
+                    : undefined;
+                if (style?.display === "none" || style?.visibility === "hidden" || style?.opacity === "0") {
+                    return false;
+                }
+                current = current.parentElement ?? null;
+            }
+            return true;
+        };
+        const labelFor = (node) => {
             const html = node;
-            const label = node.getAttribute("aria-label") ?? html.innerText ?? node.textContent ?? "";
-            return wanted.has(normalize(label));
-        });
+            const inputLabels = "labels" in node
+                ? Array.from(node.labels ?? []).map(label => label.innerText).join(" ")
+                : "";
+            return node.getAttribute("aria-label")
+                || inputLabels
+                || html.innerText
+                || node.textContent
+                || "";
+        };
+        const nodes = Array.from(document.querySelectorAll("[role='radio'], input[type='radio'], header button, header [role='button'], header [role='tab'], main [role='menuitem'], main [role='option']"));
+        const matches = nodes.filter(node => visible(node) && wanted.has(normalize(labelFor(node))));
         if (matches.length !== 1)
             return false;
         matches[0].click();

package/dist/src/commands/files.d.ts

@@ -3,3 +3,4 @@ export declare function validateAttachPaths(paths: string[]): Promise<AttachedFi
 export declare function preflightFiles(env: RuntimeEnv, args: FilePreflightArgs): Promise<CommandResult<FilePreflightData>>;
 export declare function attachFiles(env: RuntimeEnv, args: AttachFilesArgs): Promise<CommandResult<AttachFilesData>>;
 export declare function downloadLatestFile(env: RuntimeEnv, args: DownloadLatestArgs): Promise<CommandResult<DownloadedFile>>;
+export declare function stripLocalizedDownloadPrefix(value: string, labels: readonly string[]): string;