fix(patches): adapt regexes to CC 2.1.113 minified shapes

verboseProperty: spinner props moved from createElement object literal to destructured function parameter, and spinnerTip is no longer adjacent. Add fallback anchor on overrideMessage + verbose.

thinkerFormat: same shape change — the approxAreaPattern can no longer rely on spinnerTip preceding overrideMessage. Add a new-shape fallback using overrideMessage,spinnerSuffix,verbose.

opusplan1m: CC 2.1.113 dropped model version numbers from the description string ('Opus 4.6 in plan mode' -> 'Opus in plan mode'); make the version-suffix pieces optional.

patchesAppliedIndication: PATCH 3's 'skipped' message duplicates the specific cause already printed by findPatchesListLocation. Downgrade from console.error to console.log to stop flagging it as a failure.

Author: Ben

src/patches/opusplan1m.ts

@@ -109,9 +109,11 @@ const patchModelAliasesList = (oldFile: string): string | null => {
  *   if (A === "opusplan[1m]") return "Opus 4.6 in plan mode, else Sonnet 4.6 (1M context)";
  */
 const patchDescriptionFunction = (oldFile: string): string | null => {
-  // Pattern matches: if (VAR === "opusplan") return "Opus 4.6 in plan mode, else Sonnet 4.6";
+  // Pattern matches: if (VAR === "opusplan") return "Opus[ 4.6] in plan mode, else Sonnet[ 4.6]";
+  // CC >= 2.1.113 dropped the model version numbers from this string, so the
+  // " 4.6" fragments must be optional.
   const pattern =
-    /(if\s*\(\s*([$\w]+)\s*===\s*"opusplan"\s*\)\s*return\s*"Opus .{0,20} in plan mode, else Sonnet .{0,20}";)/;
+    /(if\s*\(\s*([$\w]+)\s*===\s*"opusplan"\s*\)\s*return\s*"Opus(?: .{0,20})? in plan mode, else Sonnet(?: .{0,20})?";)/;
 
   const match = oldFile.match(pattern);
   if (!match || match.index === undefined) {

src/patches/patchesAppliedIndication.ts

@@ -553,8 +553,11 @@ export const writePatchesAppliedIndication = (
   if (showPatchesApplied) {
     const patchesListLoc = findPatchesListLocation(content);
     if (!patchesListLoc) {
-      console.error(
-        'patch: patchesAppliedIndication: patch 3 skipped (version display pattern changed by PATCH 2)'
+      // findPatchesListLocation already logged the specific cause (e.g. header
+      // component function not found on CC >= 2.1.86). Don't duplicate as an
+      // error — this is a cascade from the underlying shape change.
+      console.log(
+        'patch: patchesAppliedIndication: patch 3 skipped (see prior message)'
       );
     } else {
       const lines = [];

src/patches/thinkerFormat.ts

@@ -3,9 +3,15 @@
 import { LocationResult, showDiff } from './index';
 
 const getThinkerFormatLocation = (oldFile: string): LocationResult | null => {
-  const approxAreaPattern =
+  // Older CC shape: spinnerTip + overrideMessage adjacent in one destructure.
+  const approxAreaPatternOld =
     /spinnerTip:[$\w]+,(?:[$\w]+:[$\w]+,)*overrideMessage:[$\w]+,.{300}/;
-  const approxAreaMatch = oldFile.match(approxAreaPattern);
+  // CC >= 2.1.113: spinnerTip moved out; anchor on the spinner's destructured
+  // signature containing overrideMessage, spinnerSuffix, and verbose.
+  const approxAreaPatternNew =
+    /overrideMessage:[$\w]+,spinnerSuffix:[$\w]+,verbose:[$\w]+,.{300}/;
+  const approxAreaMatch =
+    oldFile.match(approxAreaPatternOld) || oldFile.match(approxAreaPatternNew);
 
   if (!approxAreaMatch || approxAreaMatch.index == undefined) {
     console.error('patch: thinker format: failed to find approxAreaMatch');

src/patches/verboseProperty.ts

@@ -3,13 +3,22 @@
 import { LocationResult, showDiff } from './index';
 
 const getVerbosePropertyLocation = (oldFile: string): LocationResult | null => {
+  // Older CC shape: createElement(X, {...spinnerTip...overrideMessage...})
   const createElementPattern =
     /createElement\([$\w]+,\{[^}]+spinnerTip[^}]+overrideMessage[^}]+\}/;
-  const createElementMatch = oldFile.match(createElementPattern);
+  // CC >= 2.1.113: the spinner component receives its props as a destructured
+  // function parameter rather than a createElement object literal, and
+  // spinnerTip is no longer on the same object (it's pulled from state
+  // separately). Anchor on overrideMessage + verbose instead.
+  const destructurePattern =
+    /\{[^{}]{0,400}overrideMessage:[$\w]+,[^{}]{0,200}verbose:[^,}]+[^{}]{0,200}\}/;
+
+  const createElementMatch =
+    oldFile.match(createElementPattern) || oldFile.match(destructurePattern);
 
   if (!createElementMatch || createElementMatch.index === undefined) {
     console.error(
-      'patch: verbose: failed to find createElement with spinnerTip and overrideMessage'
+      'patch: verbose: failed to find spinner props containing overrideMessage and verbose'
     );
     return null;
   }