@youdie006/prodex 0.36.4 → 0.36.5

package/dist/chatgpt-browser.js

@@ -5,6 +5,7 @@ import net from "node:net";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
+import { readPowerSliderSelection } from "./picker-interaction.js";
 export class ChatGptBrowserBlockerError extends Error {
     blocker;
     constructor(blocker) {
@@ -1300,6 +1301,14 @@ const CLICK_POINT_SNIPPET = `
       el.scrollIntoView({ block: "center", inline: "nearest" });
       const r = el.getBoundingClientRect();
       if (r.width < 1 || r.height < 1) return { ok: false, reason: "target element has no visible area" };
+      // An inert row cannot be clicked at ANY point, so say that instead of
+      // blaming whatever hit-testing returns instead. Measured on the current
+      // picker: the model rows carry pointer-events:none and sit outside the
+      // menu's own box, so every coordinate on them resolves to the effort
+      // control and the refusal read as "another element covers it".
+      if (getComputedStyle(el).pointerEvents === "none") {
+        return { ok: false, reason: "target element is not clickable (pointer-events: none)" };
+      }
       el.setAttribute('data-prodex-click', '1');
       const x = Math.round(r.x + r.width / 2);
       const y = Math.round(r.y + (yCap ? Math.min(r.height / 2, yCap) : r.height / 2));
@@ -1382,15 +1391,24 @@ export function powerSliderStateExpression() {
     const slider = document.querySelector('[role="slider"]');
     const menu = document.querySelector('[data-testid="composer-intelligence-picker-content"]');
     const lines = menu ? (menu.innerText || "").split(String.fromCharCode(10)).map((l) => l.trim()).filter(Boolean) : [];
-    const after = (label) => { const i = lines.indexOf(label); return i >= 0 ? lines[i + 1] : null; };
     if (!slider) return { ok: false, reason: "power slider not found", lines };
+    const readPowerSliderSelection = ${readPowerSliderSelection.toString()};
+    const selection = readPowerSliderSelection({
+      sliderValueText: slider.getAttribute("aria-valuetext"),
+      items: menu ? [...menu.querySelectorAll('[role="menuitemradio"],[role="menuitem"]')].map((item) => ({
+        role: item.getAttribute("role"),
+        text: item.innerText || item.textContent || "",
+        checked: item.getAttribute("aria-checked") === "true",
+        containsSlider: item.contains(slider)
+      })) : []
+    });
     return {
       ok: true,
       position: Number(slider.getAttribute("aria-valuenow")),
       min: Number(slider.getAttribute("aria-valuemin")),
       max: Number(slider.getAttribute("aria-valuemax")),
-      model: after("Model"),
-      effort: after("Effort"),
+      model: selection.model,
+      effort: selection.effort,
       lines
     };
   })()`;
@@ -1562,11 +1580,32 @@ const POWER_SLIDER_APPEAR_ATTEMPTS = 5;
 // Click a model row. They are ordinary `menuitemradio` entries in the same
 // menu as the effort slider, so the existing by-label lookup reaches them; what
 // was missing is anything routing a model here instead of into the slider.
-async function selectPickerModel(cdp, requested) {
+/**
+ * Whether a model selection failure is the picker not offering it at all.
+ *
+ * Those two cases - the row is absent, or it is inert - are the UI declining to
+ * provide the choice, and they must not kill a send that is otherwise fine. It
+ * is the same answer prodex already gives for a Pro sub-mode it cannot apply.
+ * Anything else (a menu that would not open, a click that would not land) is a
+ * real failure and stays one, so a genuine break is not buried under a warning.
+ */
+export function modelSelectionUnavailableWarning(requested, reason, available) {
+    if (!/menu item not found|not clickable/i.test(reason))
+        return undefined;
+    const offers = available?.length ? ` It offers: ${available.join(", ")}.` : "";
+    return (`model_not_applied: this ChatGPT picker does not offer "${requested}" as a selectable model, ` +
+        `so the send used whatever the composer already had.${offers} ` +
+        'Pick an effort with --effort instead, or clear a saved default with `prodex setup --model ""`.');
+}
+async function selectPickerModel(cdp, requested, warnings = []) {
     const hit = await cdp.evaluate(menuItemRectExpression(requested));
     if (!hit.ok || hit.x === undefined || hit.y === undefined) {
-        const available = hit.available?.length ? ` The picker offers: ${hit.available.join(", ")}.` : "";
-        throw new Error(`ChatGPT's model picker has no "${requested}" model.${available}`);
+        const unavailable = modelSelectionUnavailableWarning(requested, hit.reason ?? "", hit.available);
+        if (unavailable) {
+            warnings.push(unavailable);
+            return;
+        }
+        throw new Error(hit.reason ?? `ChatGPT's model picker has no "${requested}" model.`);
     }
     await verifiedClickWithRetry(cdp, () => cdp.evaluate(menuItemRectExpression(requested)), requested);
 }
@@ -1689,7 +1728,7 @@ async function selectModelReasoning(cdp, options, selectionWarnings = []) {
                 await selectPowerStep(cdp, plan.sliderLabel);
             }
             if (plan.modelLabel) {
-                await selectPickerModel(cdp, plan.modelLabel);
+                await selectPickerModel(cdp, plan.modelLabel, selectionWarnings);
             }
             // This branch cannot honour a sub-mode, and used to return without
             // saying so - the caller got a clean receipt for a 확장 it never got.

package/dist/picker-interaction.js

@@ -0,0 +1,40 @@
+/** Pure decision helpers for ChatGPT's composer picker, kept out of the page. */
+/** Read model and effort from both the current mixed-control picker and its prior labeled-row form. */
+export function readPowerSliderSelection(snapshot) {
+    const items = snapshot.items.map((item) => ({
+        ...item,
+        lines: item.text
+            .split("\n")
+            .map((line) => line.trim())
+            .filter(Boolean)
+    }));
+    const powerLabels = new Set([
+        "instant",
+        "즉시",
+        "빠름",
+        "fast",
+        "medium",
+        "중간",
+        "보통",
+        "high",
+        "높음",
+        "extra high",
+        "extrahigh",
+        "very high",
+        "매우 높음",
+        "매우높음",
+        "pro",
+        "프로"
+    ]);
+    const legacyModel = items.find((item) => item.lines[0] === "Model")?.lines[1] ?? null;
+    const legacyEffort = items.find((item) => item.lines[0] === "Effort")?.lines[1] ?? null;
+    const checkedModel = items.find((item) => item.role === "menuitemradio" && item.checked)?.lines[0] ?? null;
+    const sliderOwner = items.find((item) => item.role === "menuitem" && item.containsSlider)?.lines[0] ?? null;
+    const visiblePowerLabel = items.find((item) => item.role === "menuitem" && powerLabels.has((item.lines[0] ?? "").toLowerCase()))?.lines[0] ?? null;
+    const accessibleCandidate = snapshot.sliderValueText?.trim() || null;
+    const accessibleValue = accessibleCandidate && powerLabels.has(accessibleCandidate.toLowerCase()) ? accessibleCandidate : null;
+    return {
+        model: legacyModel ?? checkedModel,
+        effort: accessibleValue ?? legacyEffort ?? sliderOwner ?? visiblePowerLabel
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youdie006/prodex",
-  "version": "0.36.4",
+  "version": "0.36.5",
   "description": "Local receipt bus for coordinating Codex execution with ChatGPT Pro/Projects consultation.",
   "author": "youdie006",
   "license": "MIT",