unity-open-mcp 1.2.3 → 1.4.0

package/dist/dialog-dismiss.js

@@ -24,7 +24,7 @@
 // deps beyond MCP SDK"): only child_process and os.
 import { execFile, execFileSync } from "node:child_process";
 import { platform as nodePlatform } from "node:os";
-import { DIALOG_TITLE_FRAGMENTS, parseDialogPolicy, preferenceTokensForPolicy, genericFallbackTokens, blockedKindsForPolicy, } from "./dialog-policy.js";
+import { DIALOG_TITLE_FRAGMENTS, DIALOG_FOCUSED_BUTTON_TOKENS, parseDialogPolicy, preferenceTokensForPolicy, genericFallbackTokens, blockedKindsForPolicy, titleMatchesDialogKind, UNITY_EDITOR_WINDOW_TITLE_MARKER, } from "./dialog-policy.js";
 /**
  * Window-title fragments matched against the Unity launch-errors dialog.
  * Kept as the M13 T4.5 back-compat export (the launch-errors subset of
@@ -120,7 +120,7 @@ export async function tryDismissDialog(opts) {
 function buildTokenTable(opts) {
     const kinds = {};
     for (const kind of Object.keys(DIALOG_TITLE_FRAGMENTS)) {
-        const tokens = preferenceTokensForPolicy(kind, opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss);
+        const tokens = preferenceTokensForPolicy(kind, opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss, opts.allowVersionMismatch);
         kinds[kind] = {
             fragments: [...DIALOG_TITLE_FRAGMENTS[kind]],
             tokens: tokens === null ? null : [...tokens],
@@ -129,7 +129,7 @@ function buildTokenTable(opts) {
     return {
         kinds,
         blocked: [
-            ...blockedKindsForPolicy(opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss),
+            ...blockedKindsForPolicy(opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss, opts.allowVersionMismatch),
         ],
         genericTokens: [...genericFallbackTokens(opts.policy)],
     };
@@ -145,8 +145,9 @@ function buildTokenTable(opts) {
  * Strategy:
  *   1. P/Invoke `EnumWindows` to enumerate every visible top-level window
  *      owned by `Unity.exe`.
- *   2. For each, normalize the title (alphanumeric lowercase) and match it
- *      against the embedded per-kind fragment table to classify it.
+ *   2. For each, skip the main Editor window ({@link isUnityEditorWindowTitle}),
+ *      normalize the title (alphanumeric lowercase) and match it against the
+ *      embedded per-kind fragment table to classify it.
  *   3. If the kind is in the blocked list → emit `blocked:<kind>` and skip
  *      the click. If the kind's token list is null → skip (not-found).
  *   4. Walk child windows with `EnumChildWindows`, find a Button whose
@@ -212,6 +213,8 @@ namespace UnityOpenMcp.Dialogs {
         sb.Length = 0;
         GetWindowTextW(hWnd, sb, sb.Capacity);
         var title = sb.ToString();
+        // The main Editor window title embeds project/scene names; never classify it.
+        if (title.IndexOf("${UNITY_EDITOR_WINDOW_TITLE_MARKER}", StringComparison.OrdinalIgnoreCase) >= 0) continue;
         var norm = Norm(title);
         string kind = null;
         foreach (var kv in table.kinds) {
@@ -312,49 +315,37 @@ async function tryDismissWindows(opts) {
 // ---------------------------------------------------------------------------
 /**
  * The AppleScript template used for the macOS dismiss path. Exposed as a
- * function of the token table so tests can assert the script shape without
+ * function of the probe options so tests can assert the script shape without
  * launching osascript.
  *
- * Strategy: iterate every window of the Unity process, normalize its title,
- * classify it against the table, and click the first button whose normalized
- * label contains a policy token. If the kind is blocked, emit `blocked:<kind>`
- * without clicking. If Unity is not running OR no matching button exists, the
- * script reports `not-found`. Any AppleScript exception (e.g. Accessibility
- * permission not granted) is reported as `error:<msg>`.
+ * Strategy: iterate every window of the Unity process except the main Editor
+ * window (its title contains {@link UNITY_EDITOR_WINDOW_TITLE_MARKER}),
+ * classify it by its title normalized with `normLabel` (see
+ * {@link macosTitleMatch}), and act per kind as {@link focusDialogAction}
+ * decides from the shared policy table (see {@link macosDialogKindBlock}):
+ *
+ *   - `focus`   — the policy picks the kind's focused/default button
+ *                 ({@link DIALOG_FOCUSED_BUTTON_TOKENS}): press Return, but
+ *                 only when the window shows a button with that label.
+ *   - `named`   — the policy picks another button (e.g. Enter Safe Mode, or
+ *                 Quit/Cancel under `cancel`): click the first button whose
+ *                 normalized title equals a policy token, in priority order,
+ *                 or report `blocked:<kind>` when none is found. Return is
+ *                 never pressed, because it would click the focused button.
+ *   - `blocked` — the policy blocks the kind: report `blocked:<kind>`.
+ *   - `skip`    — the policy declines the kind: no block; the window falls
+ *                 through to `not-found` so polling continues.
+ *
+ * Project Upgrade is always reported as `blocked` (never clicked), and
+ * unsaved scene changes have their own named-button block behind the opt-in.
+ * If Unity is not running or nothing matches, the script reports `not-found`.
+ * Any AppleScript exception (e.g. Accessibility permission not granted) is
+ * reported as `error:<msg>`.
  *
  * Requires the Terminal / `node` binary to have been granted Accessibility
  * permission in System Settings → Privacy & Security → Accessibility.
- *
- * The token table is JSON-escaped into the script header.
  */
 export function macosDismissAppleScript(opts) {
-    // The macOS path cannot do per-button selection as precisely as the Windows
-    // path (AppleScript's named-button click works but is brittle across
-    // Unity versions); instead it classifies the window title and presses
-    // Return to click the FOCUSED (default) button — which under the default /
-    // auto / ignore / recover policies IS the safe choice (Ignore on
-    // launch-errors, Continue on non-matching-editor, OK on auto-graphics-api).
-    // Project Upgrade is detected and reported as `blocked` (never Return-clicked
-    // without the explicit opt-in). The token table from buildTokenTable is
-    // consulted only to decide whether the policy declines a kind entirely
-    // (manual / safe-mode on a kind with no safe button → no click, not-found);
-    // when it declines, the script returns not-found for that kind.
-    const launchFrags = DIALOG_TITLE_FRAGMENTS.launch_errors;
-    const nonMatchFrags = DIALOG_TITLE_FRAGMENTS.non_matching_editor;
-    const graphicsFrags = DIALOG_TITLE_FRAGMENTS.auto_graphics_api;
-    const sceneModifiedFrags = DIALOG_TITLE_FRAGMENTS.scene_modified_externally;
-    // Whether the active policy dismisses each safe kind at all. Under manual,
-    // or safe-mode on non_matching/auto_graphics (no safe button), the loop
-    // should NOT click — return not-found so polling continues.
-    const dismissesLaunch = preferenceTokensForPolicy("launch_errors", opts.policy, opts.allowProjectUpgrade) !== null;
-    const dismissesNonMatch = preferenceTokensForPolicy("non_matching_editor", opts.policy, opts.allowProjectUpgrade) !== null;
-    const dismissesGraphics = preferenceTokensForPolicy("auto_graphics_api", opts.policy, opts.allowProjectUpgrade) !== null;
-    // scene_modified_externally: safe to Return-click (focused button is Reload)
-    // under auto/ignore/recover. unsaved_scene_changes is intentionally NOT
-    // Return-clicked here — it's destructive (data loss either way) and is
-    // blocked by default; even with the opt-in the per-button Windows path is
-    // the safer surface for it.
-    const dismissesSceneModified = preferenceTokensForPolicy("scene_modified_externally", opts.policy, opts.allowProjectUpgrade) !== null;
     const unsavedTokens = opts.allowUnsavedSceneDismiss
         ? preferenceTokensForPolicy("unsaved_scene_changes", opts.policy, opts.allowProjectUpgrade, true)
         : null;
@@ -373,6 +364,9 @@ export function macosDismissAppleScript(opts) {
                 return "Cancel";
             return t;
         });
+    const unsavedClick = opts.allowUnsavedSceneDismiss && unsavedButtonLabels.length > 0
+        ? unsavedSceneMacOsClickBlocks(unsavedButtonLabels)
+        : { window: "", sheets: "" };
     return `
 on run
   try
@@ -387,22 +381,29 @@ on run
           on error
             set wt to ""
           end try
-          -- Project Upgrade: NEVER click without the explicit opt-in, even
-          -- though the focused button is usually Confirm. Report blocked.
-          if (wt contains "Upgrade") and (wt contains "Project") then
-            return "blocked:" & "project_upgrade"
+          -- Dialog fragments are normalized (letters and digits only), so match
+          -- them against the normalized title, never the raw one.
+          set wn to my normLabel(wt)
+          -- The main Editor window title ("<Project> - <Scene> - ... - Unity
+          -- <version>") embeds user-chosen names and "SAFE MODE"; never classify
+          -- it as a dialog. Its sheets are still scanned below.
+          if not (wt contains "${UNITY_EDITOR_WINDOW_TITLE_MARKER}") then
+            -- Project Upgrade: NEVER click without the explicit opt-in, even
+            -- though the focused button is usually Confirm. Report blocked.
+            if (wt contains "Upgrade") and (wt contains "Project") then
+              return "blocked:" & "project_upgrade"
+            end if
+            ${macosDialogKindBlock("non_matching_editor", opts)}
+            -- Unsaved scene changes: blocked unless the dedicated opt-in is set.
+            if ${(opts.allowUnsavedSceneDismiss ? "false" : "true")} then
+              if wt contains "Have Been Modified" or wt contains "Unsaved changes" or wt contains "Save Changes" then return "blocked:" & "unsaved_scene_changes"
+            end if
+            ${unsavedClick.window}
+            ${macosDialogKindBlock("launch_errors", opts)}
+            ${macosDialogKindBlock("auto_graphics_api", opts)}
+            ${macosDialogKindBlock("scene_modified_externally", opts)}
           end if
-          -- Unsaved scene changes: blocked unless the dedicated opt-in is set.
-          if ${(opts.allowUnsavedSceneDismiss ? "false" : "true")} then
-            if wt contains "Have Been Modified" or wt contains "Unsaved changes" or wt contains "Save Changes" then return "blocked:" & "unsaved_scene_changes"
-          end if
-          ${opts.allowUnsavedSceneDismiss && unsavedButtonLabels.length > 0
-        ? unsavedSceneMacOsClickBlock(unsavedButtonLabels)
-        : ""}
-          ${launchFrags.map((f) => fragmentCheck(f, "launch_errors", dismissesLaunch)).join("\n          ")}
-          ${nonMatchFrags.map((f) => fragmentCheck(f, "non_matching_editor", dismissesNonMatch)).join("\n          ")}
-          ${graphicsFrags.map((f) => fragmentCheck(f, "auto_graphics_api", dismissesGraphics)).join("\n          ")}
-          ${sceneModifiedFrags.map((f) => fragmentCheck(f, "scene_modified_externally", dismissesSceneModified)).join("\n          ")}
+          ${unsavedClick.sheets}
         end repeat
       end tell
     end tell
@@ -411,10 +412,151 @@ on run
     return "error:" & errMsg
   end try
 end run
+
+${MACOS_NORM_LABEL_HANDLER}`;
+}
+/**
+ * AppleScript mirror of {@link normalizeDialogLabel}: keep ASCII letters and
+ * digits only. AppleScript string comparison (`is`, `contains`) ignores case
+ * by default, so the handler does not lowercase. Exported for tests.
+ */
+export const MACOS_NORM_LABEL_HANDLER = `
+-- Mirror of normalizeDialogLabel: keep ASCII letters and digits only.
+-- (String comparison is case-insensitive by default, so no lowercasing.)
+on normLabel(s)
+  set out to ""
+  repeat with c in (characters of s)
+    set ch to contents of c
+    set cid to id of ch
+    -- "id of" yields a LIST for a character made of several code points
+    -- (decomposed accents, emoji); comparing a list numerically would raise
+    -- and abort the whole probe, so such characters are simply dropped.
+    if class of cid is integer then
+      if (cid >= 48 and cid <= 57) or (cid >= 65 and cid <= 90) or (cid >= 97 and cid <= 122) then set out to out & ch
+    end if
+  end repeat
+  return out
+end normLabel
 `;
+/**
+ * How a focus-driven platform (macOS AppleScript, Linux xdotool) may act on a
+ * dialog of the given kind under the active policy. Derived from the shared
+ * policy table so every platform agrees:
+ *
+ *   - `blocked` — the policy blocks the kind (e.g. Project Upgrade without its
+ *                 opt-in). Report `blocked:<kind>`, never click.
+ *   - `skip`    — the policy declines the kind (no preference tokens). Do
+ *                 nothing; try the next kind.
+ *   - `focus`   — the policy's first choice is the kind's focused button
+ *                 ({@link DIALOG_FOCUSED_BUTTON_TOKENS}): pressing Return is
+ *                 safe.
+ *   - `named`   — the policy's first choice is some other button (e.g. Enter
+ *                 Safe Mode, Quit, Cancel). Return would press the focused
+ *                 button instead, so only a named-button click may act.
+ *
+ * Pure; exported for tests.
+ */
+export function focusDialogAction(kind, opts) {
+    const blocked = blockedKindsForPolicy(opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss, opts.allowVersionMismatch);
+    if (blocked.includes(kind))
+        return "blocked";
+    const tokens = preferenceTokensForPolicy(kind, opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss, opts.allowVersionMismatch);
+    if (tokens === null)
+        return "skip";
+    return tokens[0] === DIALOG_FOCUSED_BUTTON_TOKENS[kind] ? "focus" : "named";
+}
+/**
+ * AppleScript title condition per focus-classified kind, over `wn` — the
+ * window title normalized by `normLabel`. The fragments are normalized
+ * (letters and digits only), and AppleScript `contains` ignores case but not
+ * spaces or punctuation, so matching the raw title would never fire
+ * (`"Enter Safe Mode?" contains "safemode"` is false). Non-Matching Editor
+ * matches the short `nonmatchingeditor` stem so both the hyphenated and the
+ * spaced spelling qualify. Exported for tests.
+ */
+export function macosTitleMatch(kind) {
+    const fragments = kind === "non_matching_editor" ? ["nonmatchingeditor"] : DIALOG_TITLE_FRAGMENTS[kind];
+    return fragments.map((f) => `(wn contains "${f}")`).join(" or ");
+}
+/**
+ * AppleScript block for one dialog kind inside the window loop (`w` / `wt`),
+ * shaped by {@link focusDialogAction}:
+ *
+ *   - `blocked` → `blocked:<kind>` when the title matches.
+ *   - `skip`    → a comment only; the window falls through.
+ *   - `focus`   → press Return on the focused button, when the window has a
+ *                 button whose normalized title equals the kind's focused
+ *                 token; otherwise fall through (no press).
+ *   - `named`   → for each policy token in priority order, click the first
+ *                 button whose normalized title equals it; if none matches,
+ *                 report `blocked:<kind>`. Never presses Return.
+ *
+ * Exact normalized equality (not substring) keeps a short token such as `no`
+ * from matching an unrelated label such as "Ignore".
+ *
+ * Pure; exported for tests.
+ */
+export function macosDialogKindBlock(kind, opts) {
+    const titleMatch = macosTitleMatch(kind);
+    switch (focusDialogAction(kind, opts)) {
+        case "skip":
+            return `-- policy declines ${kind}; skip`;
+        case "blocked":
+            return `-- policy blocks ${kind}
+          if ${titleMatch} then
+            return "blocked:" & "${kind}"
+          end if`;
+        case "focus": {
+            const focusedToken = DIALOG_FOCUSED_BUTTON_TOKENS[kind];
+            return `-- policy picks the focused button on ${kind}: press Return, but only
+          -- when the window shows that button, so Return lands on a real dialog
+          if ${titleMatch} then
+            repeat with btn in buttons of w
+              try
+                set bt to (title of btn) as text
+              on error
+                set bt to ""
+              end try
+              if my normLabel(bt) is "${focusedToken}" then
+                set frontmost to true
+                key code 36
+                return "dismissed:Focus:${kind}"
+              end if
+            end repeat
+          end if`;
+        }
+        case "named": {
+            const tokens = preferenceTokensForPolicy(kind, opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss, opts.allowVersionMismatch) ?? [];
+            const tokenList = tokens.map((t) => `"${t}"`).join(", ");
+            return `-- policy picks a non-focused button on ${kind}: click it by name,
+          -- never press Return (that would click the focused button)
+          if ${titleMatch} then
+            repeat with tok in {${tokenList}}
+              repeat with btn in buttons of w
+                try
+                  set bt to (title of btn) as text
+                on error
+                  set bt to ""
+                end try
+                if my normLabel(bt) is (contents of tok) then
+                  set frontmost to true
+                  click btn
+                  return "dismissed:" & bt & ":${kind}"
+                end if
+              end repeat
+            end repeat
+            return "blocked:" & "${kind}"
+          end if`;
+        }
+    }
 }
-/** AppleScript block: match unsaved-scene title fragments and click a named button. */
-function unsavedSceneMacOsClickBlock(buttonLabels) {
+/**
+ * AppleScript blocks that match the unsaved-scene prompt and click a named
+ * button: `window` checks the dialog window's own title (skipped for the main
+ * Editor window), `sheets` checks the sheets of any window (Unity 6 attaches
+ * the prompt to the main Editor window).
+ */
+function unsavedSceneMacOsClickBlocks(buttonLabels) {
     const textFrags = [
         "Have Been Modified",
         "Unsaved changes",
@@ -424,9 +566,9 @@ function unsavedSceneMacOsClickBlock(buttonLabels) {
     ];
     const titleMatch = (varName) => textFrags.map((f) => `${varName} contains "${f}"`).join(" or ");
     const staticTextScan = (container, flagVar) => `
-            repeat with st in static texts of ${container}
+            repeat with stx in static texts of ${container}
               try
-                set tx to (value of st) as text
+                set tx to (value of stx) as text
               on error
                 set tx to ""
               end try
@@ -450,11 +592,13 @@ function unsavedSceneMacOsClickBlock(buttonLabels) {
               end if
             end repeat`)
         .join("");
-    return `
-          -- Top-level window title (some Unity versions).
-          if (${titleMatch("wt")}) then
-            ${clickButtons("w")}
-          end if
+    return {
+        window: `
+            -- Top-level window title (some Unity versions).
+            if (${titleMatch("wt")}) then
+              ${clickButtons("w")}
+            end if`,
+        sheets: `
           -- Unity 6 save prompt is usually a sheet on the main Editor window.
           try
             repeat with s in sheets of w
@@ -470,27 +614,8 @@ function unsavedSceneMacOsClickBlock(buttonLabels) {
                 ${clickButtons("s")}
               end if
             end repeat
-          end try`;
-}
-/**
- * Build the per-fragment AppleScript check block. When the policy dismisses
- * the kind, the block activates the window + presses Return and returns the
- * dismissed token; when the policy declines the kind (null tokens), the block
- * is omitted entirely (the loop falls through to the next fragment).
- *
- * AppleScript `contains` is case-insensitive by default, so the lowercased
- * fragment matches Unity's mixed-case titles ("Enter Safe Mode?" contains
- * "entersafemode" → false, BUT "safemode" matches; the fragment list is built
- * to have at least one case-insensitive hit per title).
- */
-function fragmentCheck(fragment, kind, dismisses) {
-    if (!dismisses)
-        return `-- policy declines ${kind}; skip`;
-    return `if wt contains "${fragment}" then
-            set frontmost to true
-            key code 36
-            return "dismissed:Focus:${kind}"
-          end if`;
+          end try`,
+    };
 }
 async function tryDismissMacOS(opts) {
     return new Promise((resolve) => {
@@ -553,6 +678,24 @@ export function _resetXdotoolPresenceForTests() {
 export function regexEscapeForXdotool(s) {
     return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+/**
+ * The `xdotool search --name` pattern for a normalized title fragment.
+ * Fragments are letters and digits only ("entersafemode"), while real titles
+ * carry spaces and punctuation ("Enter Safe Mode?"), so the pattern allows any
+ * run of non-alphanumerics between consecutive characters and spells each
+ * letter in both cases. That is the regex form of "the normalized title
+ * contains the fragment" and does not depend on xdotool's case handling.
+ * Any other character is escaped literally.
+ */
+export function xdotoolTitlePattern(fragment) {
+    return [...fragment]
+        .map((ch) => /[a-z]/i.test(ch)
+        ? `[${ch.toLowerCase()}${ch.toUpperCase()}]`
+        : /[0-9]/.test(ch)
+            ? ch
+            : regexEscapeForXdotool(ch))
+        .join("[^A-Za-z0-9]*");
+}
 /**
  * Look up currently-running Unity Editor PIDs on the local box. Used by the
  * Linux/X11 path to scope the title-fragment match to Unity processes only.
@@ -574,6 +717,19 @@ function getUnityPidsLinux() {
         return [];
     }
 }
+/**
+ * What the Linux/X11 path does with a Unity-owned window of the given kind:
+ * {@link focusDialogAction} with `named` folded into `blocked`, because
+ * xdotool can only press Return on the focused (default) button — it cannot
+ * click a named one (e.g. `cancel` on the Safe Mode prompt, whose focused
+ * button is Ignore, is reported as blocked for a human).
+ *
+ * Pure; exported for tests.
+ */
+export function linuxFocusAction(kind, opts) {
+    const action = focusDialogAction(kind, opts);
+    return action === "named" ? "blocked" : action;
+}
 async function tryDismissLinuxX11(opts) {
     if (!isXdotoolAvailable()) {
         return {
@@ -589,11 +745,11 @@ async function tryDismissLinuxX11(opts) {
     // first kind whose xdotool search surfaces a Unity-owned window.
     //   - blocked kinds (project_upgrade without opt-in) → report blocked.
     //   - decline kinds (tokens === null) → skip (treat as not-found).
-    //   - otherwise activate the window + send Return to click the focused
-    //     (default) button. Under default/auto/ignore/recover the default
-    //     button is the safe choice for launch_errors / non_matching_editor /
-    //     auto_graphics_api. Project upgrade is never clicked here (blocked).
-    const blocked = new Set(blockedKindsForPolicy(opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss));
+    //   - policy picks the kind's focused button → activate the window + send
+    //     Return to click it.
+    //   - policy picks any other button → blocked: xdotool cannot click a
+    //     named button, and Return would press the focused one instead (see
+    //     linuxFocusAction / DIALOG_FOCUSED_BUTTON_TOKENS).
     const kinds = Object.keys(DIALOG_TITLE_FRAGMENTS);
     // Prefer launch_errors first (the common stall), then the safe kinds, then
     // the destructive kinds last so a blocked destructive modal doesn't shadow a
@@ -640,7 +796,7 @@ async function tryDismissLinuxX11(opts) {
                 return;
             }
             const kind = order[idx++];
-            const tokens = preferenceTokensForPolicy(kind, opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss);
+            const action = linuxFocusAction(kind, opts);
             const fragments = DIALOG_TITLE_FRAGMENTS[kind];
             // Probe this kind's fragments one at a time.
             let fIdx = 0;
@@ -652,7 +808,7 @@ async function tryDismissLinuxX11(opts) {
                     return;
                 }
                 const fragment = fragments[fIdx++];
-                const child = execFile("xdotool", ["search", "--name", regexEscapeForXdotool(fragment)], { timeout: XDOTOOL_PROBE_TIMEOUT_MS }, (err, stdout) => {
+                const child = execFile("xdotool", ["search", "--name", xdotoolTitlePattern(fragment)], { timeout: XDOTOOL_PROBE_TIMEOUT_MS }, (err, stdout) => {
                     activeChild = null;
                     disarmWatchdog();
                     if (settled)
@@ -662,21 +818,28 @@ async function tryDismissLinuxX11(opts) {
                         return;
                     }
                     const candidateIds = stdout.trim().split(/\s+/).filter(Boolean);
-                    findUnityOwnedWindow(candidateIds, unityPids, (winId) => {
+                    // Re-check the title in Node: it must still classify as this
+                    // kind and must not be the main Editor window, whose title can
+                    // contain a fragment (a scene name, or "SAFE MODE").
+                    const acceptTitle = (title) => titleMatchesDialogKind(title, kind);
+                    findUnityOwnedWindow(candidateIds, unityPids, acceptTitle, (winId) => {
                         if (!winId) {
                             tryNextFragment();
                             return;
                         }
-                        if (blocked.has(kind) || tokens === null) {
+                        if (action !== "focus") {
                             // Found the dialog but the policy declines. Report blocked
-                            // only for genuinely blocked kinds (project_upgrade); a null-
-                            // token decline (manual / safe-mode on a kind with no safe
-                            // button) is reported as not-found so the loop keeps ticking.
-                            if (blocked.has(kind)) {
+                            // for genuinely blocked kinds; a `skip` decline (manual /
+                            // safe-mode on a kind with no safe button) is reported as
+                            // not-found so the loop keeps ticking.
+                            if (action === "blocked") {
+                                const policyBlocks = blockedKindsForPolicy(opts.policy, opts.allowProjectUpgrade, opts.allowUnsavedSceneDismiss, opts.allowVersionMismatch).includes(kind);
                                 finish({
                                     kind: "blocked",
                                     dialog: kind,
-                                    message: `Policy '${opts.policy}' declines to dismiss ${kind} dialog`,
+                                    message: policyBlocks
+                                        ? `Policy '${opts.policy}' declines to dismiss ${kind} dialog`
+                                        : `Policy '${opts.policy}' selects a button other than the focused one on the ${kind} dialog; xdotool can only press Return on the focused button, so it needs a human`,
                                 });
                                 return;
                             }
@@ -722,14 +885,15 @@ async function tryDismissLinuxX11(opts) {
 }
 /**
  * Walk `candidateIds` and call `done(winId)` with the first window owned by
- * a Unity PID, or `done(undefined)` if none match. Sequential — the list is
- * small and parallelism buys nothing meaningful.
+ * a Unity PID whose title (`xdotool getwindowname`) passes `acceptTitle`, or
+ * `done(undefined)` if none match. Sequential — the list is small and
+ * parallelism buys nothing meaningful.
  *
  * `stop` (optional) is polled before each probe and recursion step: once the
  * outer probe has settled, the walk must not spawn further getwindowpid
  * children (the result would be discarded anyway).
  */
-function findUnityOwnedWindow(candidateIds, unityPids, done, stop) {
+function findUnityOwnedWindow(candidateIds, unityPids, acceptTitle, done, stop) {
     let idx = 0;
     const next = () => {
         if (stop?.())
@@ -749,7 +913,7 @@ function findUnityOwnedWindow(candidateIds, unityPids, done, stop) {
             }
             const pid = parseInt(stdout.trim(), 10);
             if (Number.isFinite(pid) && unityPids.has(pid)) {
-                done(winId);
+                checkTitle(winId);
                 return;
             }
             next();
@@ -757,6 +921,23 @@ function findUnityOwnedWindow(candidateIds, unityPids, done, stop) {
         // SIGKILL escalation for a wedged getwindowpid probe.
         const disarmWatchdog = armSigkillEscalation(child, LINUX_PROBE_TIMEOUT_MS, () => stop?.() ?? false);
     };
+    const checkTitle = (winId) => {
+        if (stop?.())
+            return;
+        const child = execFile("xdotool", ["getwindowname", winId], { timeout: LINUX_PROBE_TIMEOUT_MS }, (err, stdout) => {
+            disarmWatchdog();
+            if (stop?.())
+                return;
+            // An unreadable title is not evidence of a dialog: skip the window.
+            if (!err && acceptTitle(stdout.replace(/\r?\n$/, ""))) {
+                done(winId);
+                return;
+            }
+            next();
+        });
+        // SIGKILL escalation for a wedged getwindowname probe.
+        const disarmWatchdog = armSigkillEscalation(child, LINUX_PROBE_TIMEOUT_MS, () => stop?.() ?? false);
+    };
     next();
 }
 // ---------------------------------------------------------------------------
@@ -896,6 +1077,7 @@ export function readDismissConfig(env = process.env) {
         policy,
         allowProjectUpgrade: env.UNITY_OPEN_MCP_ALLOW_PROJECT_UPGRADE === "1",
         allowUnsavedSceneDismiss: env.UNITY_OPEN_MCP_ALLOW_UNSAVED_SCENE_DISMISS === "1",
+        allowVersionMismatch: env.UNITY_OPEN_MCP_ALLOW_VERSION_MISMATCH === "1",
     };
 }
 function parsePositiveInt(raw, fallback) {
@@ -948,6 +1130,7 @@ export async function pollAndDismissDialogs(opts) {
                 policy: opts.policy,
                 allowProjectUpgrade: opts.allowProjectUpgrade,
                 allowUnsavedSceneDismiss: opts.allowUnsavedSceneDismiss,
+                allowVersionMismatch: opts.allowVersionMismatch,
                 // M12 — thread the loop's abort signal into the probe so an in-flight
                 // osascript/PowerShell child is killed the moment the readiness abort
                 // fires, instead of running out its own ~5s timeout after the compile
@@ -966,17 +1149,19 @@ export async function pollAndDismissDialogs(opts) {
                 // one error and surfaces the next.
             }
             else if (outcome.kind === "blocked") {
-                // Project-upgrade / unsaved-scene-changes (or future blocked kind):
-                // log once per kind per run, then keep polling. A human must dismiss
+                // Destructive or version-mismatch dialog: log once per kind per run,
+                // then keep polling. A human must dismiss
                 // it; exiting would hide the stall behind a clean-looking readiness
                 // abort.
                 if (!seenBlocked.has(outcome.dialog)) {
                     seenBlocked.add(outcome.dialog);
                     const optIn = outcome.dialog === "project_upgrade"
                         ? "Set UNITY_OPEN_MCP_ALLOW_PROJECT_UPGRADE=1 to opt in to auto-confirm (irreversible)."
-                        : outcome.dialog === "unsaved_scene_changes"
-                            ? "Set UNITY_OPEN_MCP_ALLOW_UNSAVED_SCENE_DISMISS=1 to opt in to auto-dismiss (destructive — data loss either way)."
-                            : "Dismiss it manually or change UNITY_OPEN_MCP_DIALOG_POLICY.";
+                        : outcome.dialog === "non_matching_editor"
+                            ? "Set UNITY_OPEN_MCP_ALLOW_VERSION_MISMATCH=1 only for an intentional upgrade or compatibility run."
+                            : outcome.dialog === "unsaved_scene_changes"
+                                ? "Set UNITY_OPEN_MCP_ALLOW_UNSAVED_SCENE_DISMISS=1 to opt in to auto-dismiss (destructive — data loss either way)."
+                                : "Dismiss it manually or change UNITY_OPEN_MCP_DIALOG_POLICY.";
                     log(`[unity-open-mcp] dialog auto-dismiss blocked on ${outcome.dialog} ` +
                         `(policy=${opts.policy}): ${outcome.message}. ${optIn}`);
                 }