codex-plus-patcher 0.7.0 → 0.7.2

package/src/runtime/plugins/projectSelectorShortcut.js

@@ -36,14 +36,71 @@
     ].map((value) => normalizeForFzf(value).text.trim()).filter(Boolean).join(" ");
   }
 
+  function projectSearchFields(project) {
+    return [
+      { text: project?.label, weight: 0 },
+      { text: project?.repositoryData?.rootFolder, weight: 10 },
+      { text: project?.hostDisplayName, weight: 20 },
+      { text: project?.path, weight: 40 },
+    ].map((field) => ({ ...field, text: normalizeForFzf(field.text).text.trim() })).filter((field) => field.text);
+  }
+
   function fzfConstructor() {
     return window.fzf?.Fzf;
   }
 
-  function fallbackFilter(items, query) {
-    const needle = normalizeForFzf(query).text.trim().toLowerCase();
-    if (!needle) return items;
-    return items.filter((item) => projectSearchText(item).toLowerCase().includes(needle));
+  function fallbackPositions(text, query) {
+    const normalizedText = normalizeForFzf(text);
+    const normalizedQuery = normalizeForFzf(query).text.trim().toLowerCase();
+    if (!normalizedText.text || !normalizedQuery) return null;
+
+    const haystack = normalizedText.text.toLowerCase();
+    const positions = [];
+    let cursor = 0;
+
+    for (const char of normalizedQuery) {
+      cursor = haystack.indexOf(char, cursor);
+      if (cursor === -1) return null;
+      positions.push(cursor);
+      cursor += 1;
+    }
+
+    return positions;
+  }
+
+  function fallbackScore(text, query) {
+    const positions = fallbackPositions(text, query);
+    if (positions == null) return null;
+
+    let score = positions[0] + (positions[positions.length - 1] - positions[0]);
+    for (let index = 1; index < positions.length; index += 1) {
+      score += positions[index] - positions[index - 1] - 1;
+    }
+    for (const position of positions) {
+      if (position === 0 || /\s/.test(text[position - 1] ?? "")) score -= 2;
+    }
+
+    return score;
+  }
+
+  function rankedFilter(items, query) {
+    return items
+      .map((item, index) => {
+        const scores = projectSearchFields(item)
+          .map((field) => {
+            const score = fallbackScore(field.text, query);
+            return score == null ? null : score + field.weight;
+          })
+          .filter((score) => score != null);
+        return { item, index, score: scores.length === 0 ? null : Math.min(...scores) };
+      })
+      .filter((entry) => entry.score != null)
+      .sort((left, right) =>
+        left.score - right.score ||
+        projectSearchText(left.item).length - projectSearchText(right.item).length ||
+        left.index - right.index,
+      )
+      .map((entry) => entry.item);
   }
 
   function fuzzyFilter(items, query) {
@@ -51,18 +108,16 @@
     const normalizedQuery = normalizeForFzf(query).text.trim();
     if (!normalizedQuery) return list;
 
-    const Fzf = fzfConstructor();
-    if (typeof Fzf !== "function") return fallbackFilter(list, query);
-
-    return new Fzf(
-      list.map((project) => ({ project, searchText: projectSearchText(project) })),
-      { selector: (entry) => entry.searchText },
-    ).find(normalizedQuery).map((entry) => entry.item.project);
+    return rankedFilter(list, query);
   }
 
   function labelPositions(text, query) {
     const Fzf = fzfConstructor();
-    if (typeof Fzf !== "function") return null;
+    if (typeof Fzf !== "function") {
+      const positions = fallbackPositions(text, query);
+      const normalizedText = normalizeForFzf(text);
+      return positions?.map((index) => normalizedText.map[index]).filter((index) => Number.isInteger(index)) ?? null;
+    }
 
     const normalizedText = normalizeForFzf(text);
     const normalizedQuery = normalizeForFzf(query).text.trim();

package/src/runtime/plugins/sidebarNameBlur.js

@@ -6,7 +6,7 @@
       name: "Sidebar Name Blur",
       description: "Registers the session-only Toggle sidebar blur command.",
       required: true,
-      styles: ':root[data-codex-plus-sidebar-names-blurred="true"] :is([data-thread-title],[data-codex-plus-sidebar-name]){filter:blur(4px);user-select:none}',
+      styles: ':root[data-codex-plus-sidebar-names-blurred="true"] :is([data-thread-title],[data-codex-plus-sidebar-name],[data-app-action-sidebar-project-row]){filter:blur(4px);user-select:none}',
       commands: [
         {
           id: "codexPlusToggleSidebarNameBlur",

package/src/runtime/plugins/userBubbleColors.js

@@ -95,9 +95,13 @@
       styles:
         ':root:not(.dark):not(.electron-dark) :is([data-codex-plus-user-bubble],[data-codex-plus-user-entry]){background-color:var(--codex-plus-user-bubble-light-bg);color:var(--codex-plus-user-bubble-light-fg)}' +
         ':root:not(.dark):not(.electron-dark) [data-codex-plus-user-entry] :is(.ProseMirror,.ProseMirror *,textarea,[contenteditable="true"],[data-placeholder]),:root:not(.dark):not(.electron-dark) [data-codex-plus-user-entry] :is(button:not([class*="bg-token-foreground"]),[role="button"]:not([class*="bg-token-foreground"]),button:not([class*="bg-token-foreground"]) svg,[role="button"]:not([class*="bg-token-foreground"]) svg,[class*="text-token-foreground"],[class*="text-token-description-foreground"],[class*="text-token-input-placeholder-foreground"],[class*="text-token-text-link-foreground"],[class*="text-token-editor-warning-foreground"]){color:var(--codex-plus-user-bubble-light-fg)}' +
+        ':root:not(.dark):not(.electron-dark) [data-codex-plus-user-entry] :is(button[aria-disabled="true"],button[class*="opacity-25"],[role="button"][aria-disabled="true"],[role="button"][class*="opacity-25"]){opacity:1!important;color:var(--codex-plus-user-bubble-light-fg)!important;-webkit-text-fill-color:currentColor!important}' +
+        ':root:not(.dark):not(.electron-dark) [data-codex-plus-user-entry] :is(button[aria-disabled="true"],button[class*="opacity-25"],[role="button"][aria-disabled="true"],[role="button"][class*="opacity-25"]) *{animation:none!important;background-image:none!important;color:inherit!important;stroke:currentColor!important;-webkit-text-fill-color:currentColor!important}' +
         ':root:not(.dark):not(.electron-dark) [data-codex-plus-user-entry] :is([data-placeholder],[class*="text-token-input-placeholder-foreground"])::before,:root:not(.dark):not(.electron-dark) [data-codex-plus-user-entry] :is([data-placeholder],[class*="text-token-input-placeholder-foreground"])::after,:root:not(.dark):not(.electron-dark) [data-codex-plus-user-entry] :is(input,textarea,[contenteditable="true"],[class*="placeholder:text-token-input-placeholder-foreground"])::placeholder{color:var(--codex-plus-user-bubble-light-fg)}' +
         ':root.dark :is([data-codex-plus-user-bubble],[data-codex-plus-user-entry]),:root.electron-dark :is([data-codex-plus-user-bubble],[data-codex-plus-user-entry]){background-color:var(--codex-plus-user-bubble-dark-bg);color:var(--codex-plus-user-bubble-dark-fg)}' +
         ':root.dark [data-codex-plus-user-entry] :is(.ProseMirror,.ProseMirror *,textarea,[contenteditable="true"],[data-placeholder]),:root.electron-dark [data-codex-plus-user-entry] :is(.ProseMirror,.ProseMirror *,textarea,[contenteditable="true"],[data-placeholder]),:root.dark [data-codex-plus-user-entry] :is(button:not([class*="bg-token-foreground"]),[role="button"]:not([class*="bg-token-foreground"]),button:not([class*="bg-token-foreground"]) svg,[role="button"]:not([class*="bg-token-foreground"]) svg,[class*="text-token-foreground"],[class*="text-token-description-foreground"],[class*="text-token-input-placeholder-foreground"],[class*="text-token-text-link-foreground"],[class*="text-token-editor-warning-foreground"]),:root.electron-dark [data-codex-plus-user-entry] :is(button:not([class*="bg-token-foreground"]),[role="button"]:not([class*="bg-token-foreground"]),button:not([class*="bg-token-foreground"]) svg,[role="button"]:not([class*="bg-token-foreground"]) svg,[class*="text-token-foreground"],[class*="text-token-description-foreground"],[class*="text-token-input-placeholder-foreground"],[class*="text-token-text-link-foreground"],[class*="text-token-editor-warning-foreground"]){color:var(--codex-plus-user-bubble-dark-fg)}' +
+        ':root.dark [data-codex-plus-user-entry] :is(button[aria-disabled="true"],button[class*="opacity-25"],[role="button"][aria-disabled="true"],[role="button"][class*="opacity-25"]),:root.electron-dark [data-codex-plus-user-entry] :is(button[aria-disabled="true"],button[class*="opacity-25"],[role="button"][aria-disabled="true"],[role="button"][class*="opacity-25"]){opacity:1!important;color:var(--codex-plus-user-bubble-dark-fg)!important;-webkit-text-fill-color:currentColor!important}' +
+        ':root.dark [data-codex-plus-user-entry] :is(button[aria-disabled="true"],button[class*="opacity-25"],[role="button"][aria-disabled="true"],[role="button"][class*="opacity-25"]) *,:root.electron-dark [data-codex-plus-user-entry] :is(button[aria-disabled="true"],button[class*="opacity-25"],[role="button"][aria-disabled="true"],[role="button"][class*="opacity-25"]) *{animation:none!important;background-image:none!important;color:inherit!important;stroke:currentColor!important;-webkit-text-fill-color:currentColor!important}' +
         ':root.dark [data-codex-plus-user-entry] :is([data-placeholder],[class*="text-token-input-placeholder-foreground"])::before,:root.dark [data-codex-plus-user-entry] :is([data-placeholder],[class*="text-token-input-placeholder-foreground"])::after,:root.dark [data-codex-plus-user-entry] :is(input,textarea,[contenteditable="true"],[class*="placeholder:text-token-input-placeholder-foreground"])::placeholder,:root.electron-dark [data-codex-plus-user-entry] :is([data-placeholder],[class*="text-token-input-placeholder-foreground"])::before,:root.electron-dark [data-codex-plus-user-entry] :is([data-placeholder],[class*="text-token-input-placeholder-foreground"])::after,:root.electron-dark [data-codex-plus-user-entry] :is(input,textarea,[contenteditable="true"],[class*="placeholder:text-token-input-placeholder-foreground"])::placeholder{color:var(--codex-plus-user-bubble-dark-fg)}',
       exports: {
         defaultColor,