codex-plus-patcher 0.6.0 → 0.7.1

package/src/runtime/plugins/nestedRepositories.js

@@ -13,6 +13,43 @@
     return JSON.stringify([hostId, conversationId, cwd]);
   }
 
+  function workerRequest(workerId, method, params, signal) {
+    const bridge = window.electronBridge;
+    if (typeof bridge?.sendWorkerMessageFromView !== "function" || typeof bridge?.subscribeToWorkerMessages !== "function") {
+      return Promise.reject(new Error("Electron worker bridge is unavailable"));
+    }
+    if (signal?.aborted) return Promise.reject(new DOMException("Aborted", "AbortError"));
+    const id = `codex-plus-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
+    const request = { id, method, params };
+    return new Promise((resolve, reject) => {
+      let unsubscribe = null;
+      let done = false;
+      const cleanup = () => {
+        if (done) return;
+        done = true;
+        unsubscribe?.();
+        signal?.removeEventListener?.("abort", abort);
+      };
+      const abort = () => {
+        cleanup();
+        bridge.sendWorkerMessageFromView(workerId, { type: "worker-request-cancel", workerId, id }).catch(() => {});
+        reject(new DOMException("Aborted", "AbortError"));
+      };
+      unsubscribe = bridge.subscribeToWorkerMessages(workerId, (message) => {
+        if (message?.type !== "worker-response" || message?.workerId !== workerId || message?.response?.id !== id) return;
+        cleanup();
+        const result = message.response.result;
+        if (result?.type === "ok") resolve(result.value);
+        else reject(new Error(result?.error?.message || "Worker request failed"));
+      });
+      signal?.addEventListener?.("abort", abort, { once: true });
+      bridge.sendWorkerMessageFromView(workerId, { type: "worker-request", workerId, request }).catch((error) => {
+        cleanup();
+        reject(error instanceof Error ? error : new Error(String(error)));
+      });
+    });
+  }
+
   function debugText(value) {
     try {
       return JSON.stringify(value, (_key, item) => (typeof item === "bigint" ? String(item) : item), 2) ?? "";
@@ -86,6 +123,7 @@
   function RepoDiffBody({ cwd, hostConfig, conversationId, diffMode, diffText, statusText, error, isLoading }, deps) {
     const { jsx, createElement, parseDiff, DiffCard, pathValue } = deps;
     if (error != null || isLoading || diffText == null) return PlainDiff({ text: statusText }, deps);
+    if (typeof parseDiff !== "function" || typeof DiffCard !== "function") return PlainDiff({ text: diffText }, deps);
     let parsed;
     try {
       parsed = parseDiff(diffText);
@@ -193,6 +231,27 @@
     }, [open, query, repo.root, hostConfig.id]);
 
     const title = selected || "Unstaged";
+    if (!Button || !Tooltip || !Icon || !Dropdown || !DropdownMenu || !BranchPickerDropdownContent) {
+      const options = branches.length > 0 ? branches : searchedBranches;
+      return jsxs("label", {
+        className: "flex min-w-32 max-w-52 shrink-0 items-center gap-1 text-xs text-token-description-foreground",
+        children: [
+          jsx("span", { className: "sr-only", children: "Base branch" }),
+          jsx("select", {
+            className:
+              "min-w-0 flex-1 rounded-md border border-token-border bg-token-main-surface-primary px-1.5 py-1 text-xs text-token-foreground",
+            value: selected,
+            disabled: loading || error != null,
+            onFocus: loadBranches,
+            onChange: (event) => setBaseBranch(event.target.value),
+            children: [
+              jsx("option", { value: "", children: loading ? "Loading..." : "Unstaged" }, "unstaged"),
+              ...options.map((branch) => jsx("option", { value: branch.name ?? branch, children: branch.name ?? branch }, branch.name ?? branch)),
+            ],
+          }),
+        ],
+      });
+    }
     const button = jsxs(Button, {
       type: "button",
       color: selected ? "ghostActive" : "ghost",
@@ -317,14 +376,16 @@
               ],
             }),
             jsx(BranchPicker, { repo, hostConfig, baseBranch, setBaseBranch, deps }),
-            jsx(ReviewToolbar, {
-              conversationId,
-              cwd: repo.cwd,
-              hostId,
-              codexWorktree: false,
-              surface: "review-toolbar",
-              reviewToolbarCompact: true,
-            }, repo.id),
+            ReviewToolbar
+              ? jsx(ReviewToolbar, {
+                  conversationId,
+                  cwd: repo.cwd,
+                  hostId,
+                  codexWorktree: false,
+                  surface: "review-toolbar",
+                  reviewToolbarCompact: true,
+                }, repo.id)
+              : null,
           ],
         }),
         collapsed ? null : RepoDiffBody({ cwd: repo.cwd, hostConfig, conversationId, diffMode, diffText, statusText, error, isLoading: loading }, deps),
@@ -338,7 +399,7 @@
     const cwd = useAtom(cwdAtom);
     const hostId = useAtom(hostIdAtom);
     const hostConfig = useAtom(hostConfigAtom);
-    const conversationAtomValue = useAtom(conversationIdAtom);
+    const conversationAtomValue = conversationIdAtom ? useAtom(conversationIdAtom) : null;
     const conversationId = routeStore.value.routeKind === "local-thread" ? routeStore.value.conversationId : null;
     const [targets, setTargets] = React.useState(null);
     const [collapsed, setCollapsedState] = React.useState(() => new Map());
@@ -438,8 +499,8 @@
       start(api) {
         api.ui.review.wrapBody((props, deps) => ReviewMux(props, deps));
         api.modules.registerHostModule("codex-plus:native:repository-targets", {
-          request(params) {
-            return api.native.request("repository-targets", params);
+          request(params, signal) {
+            return workerRequest("git", "repository-targets", params, signal);
           },
         });
       },

package/src/runtime/plugins/projectColors.js

@@ -58,6 +58,90 @@
     return palette[fnv1a32(colorKey(project)) % palette.length];
   }
 
+  const projectByPath = new Map();
+  const projectByName = new Map();
+
+  function pathBasename(value) {
+    const trimmed = String(value || "").replace(/\/+$/, "");
+    if (trimmed === "") return "";
+    return trimmed.split("/").pop() || "";
+  }
+
+  function projectPathKeys(project) {
+    if (project == null || typeof project === "string") return [];
+    const host = project.hostId ?? project.host ?? project.remoteHostId ?? "local";
+    const paths = [project.path, project.cwd, project.projectPath, project.remotePath, project.root, project.workspaceRoot]
+      .filter((value) => value != null && String(value).trim() !== "")
+      .map((value) => String(value).trim());
+    return paths.map((path) => `${host}:${path}`);
+  }
+
+  function projectNameKeys(project) {
+    if (project == null || typeof project === "string") return [];
+    const repositoryRoot = project.repositoryData?.rootFolder;
+    const values = [
+      project.label,
+      project.name,
+      repositoryRoot,
+      pathBasename(project.projectId),
+      pathBasename(project.id),
+      ...projectPathKeys(project).map((key) => pathBasename(key)),
+    ];
+    return Array.from(new Set(values
+      .filter((value) => value != null && String(value).trim() !== "")
+      .map((value) => String(value).trim())));
+  }
+
+  function rememberProjectName(key, project) {
+    if (key === "") return;
+    const existing = projectByName.get(key);
+    if (existing === undefined) {
+      projectByName.set(key, project);
+      return;
+    }
+    if (existing != null && colorKey(existing) !== colorKey(project)) projectByName.set(key, null);
+  }
+
+  function rememberProject(project) {
+    const key = colorKey(project);
+    if (key.trim() === "") return project;
+    for (const pathKey of projectPathKeys(project)) projectByPath.set(pathKey, project);
+    for (const nameKey of projectNameKeys(project)) rememberProjectName(nameKey, project);
+    return project;
+  }
+
+  function resolveProject(project) {
+    for (const pathKey of projectPathKeys(project)) {
+      const knownProject = projectByPath.get(pathKey);
+      if (knownProject) return knownProject;
+    }
+    for (const nameKey of projectNameKeys(project)) {
+      const knownProject = projectByName.get(nameKey);
+      if (knownProject) return knownProject;
+    }
+    return null;
+  }
+
+  function activeSidebarStyle() {
+    const active = document.querySelector('[data-app-action-sidebar-thread-active="true"][data-codex-plus-project-color]');
+    if (!active) return undefined;
+    const computed = getComputedStyle(active);
+    const accent = computed.getPropertyValue("--codex-plus-project-accent").trim();
+    if (accent === "") return undefined;
+    return {
+      "--codex-plus-project-accent": accent,
+      "--codex-plus-project-bg-light": computed.getPropertyValue("--codex-plus-project-bg-light").trim(),
+      "--codex-plus-project-fg-light": computed.getPropertyValue("--codex-plus-project-fg-light").trim(),
+      "--codex-plus-project-soft-light": computed.getPropertyValue("--codex-plus-project-soft-light").trim(),
+      "--codex-plus-project-bg-dark": computed.getPropertyValue("--codex-plus-project-bg-dark").trim(),
+      "--codex-plus-project-fg-dark": computed.getPropertyValue("--codex-plus-project-fg-dark").trim(),
+      "--codex-plus-project-border-dark": computed.getPropertyValue("--codex-plus-project-border-dark").trim(),
+      "--codex-plus-project-separator-light": computed.getPropertyValue("--codex-plus-project-separator-light").trim(),
+      "--codex-plus-project-separator-dark": computed.getPropertyValue("--codex-plus-project-separator-dark").trim(),
+      borderLeft: `6px solid ${accent}`,
+    };
+  }
+
   function style(project) {
     const key = colorKey(project);
     if (!readEnabled() || key.trim() === "") return undefined;
@@ -77,7 +161,9 @@
   }
 
   function dataAttributes(project, sidebar) {
-    const inlineStyle = style(project);
+    const resolvedProject = sidebar ? rememberProject(project) : resolveProject(project);
+    const directStyle = style(project);
+    const inlineStyle = resolvedProject ? style(resolvedProject) : directStyle ?? activeSidebarStyle();
     if (inlineStyle == null) return undefined;
     return {
       "data-codex-plus-project-color": "",
@@ -114,14 +200,15 @@
       description: "Provides deterministic project accent colors across sidebar, messages, and composer surfaces.",
       required: true,
       styles:
-        ":root:not(.dark):not(.electron-dark) [data-codex-plus-project-sidebar-color]{border-radius:0;background-color:var(--codex-plus-project-soft-light);border-left-color:var(--codex-plus-project-accent)}" +
-        ":root:not(.dark):not(.electron-dark) [data-app-action-sidebar-thread-active=\"true\"][data-codex-plus-project-sidebar-color]{background-color:var(--codex-plus-project-bg-light);box-shadow:inset 5px 0 0 var(--codex-plus-project-accent)}" +
-        ":root.dark [data-codex-plus-project-sidebar-color],:root.electron-dark [data-codex-plus-project-sidebar-color]{border-radius:0;background-color:var(--codex-plus-project-bg-dark);border-left-color:var(--codex-plus-project-border-dark)}" +
-        ":root.dark [data-app-action-sidebar-thread-active=\"true\"][data-codex-plus-project-sidebar-color],:root.electron-dark [data-app-action-sidebar-thread-active=\"true\"][data-codex-plus-project-sidebar-color]{background-color:color-mix(in srgb,var(--codex-plus-project-accent) 38%,transparent);border-left-color:color-mix(in srgb,var(--codex-plus-project-accent) 88%,transparent);box-shadow:inset 5px 0 0 var(--codex-plus-project-accent)}" +
+        ":root:not(.dark):not(.electron-dark) :is([data-app-action-sidebar-project-row],[data-app-action-sidebar-thread-row][data-codex-plus-project-sidebar-color],[data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color] [data-app-action-sidebar-thread-row]){border-radius:0;background-color:var(--codex-plus-project-soft-light);border-left-color:var(--codex-plus-project-accent)}" +
+        ":root:not(.dark):not(.electron-dark) :is([data-app-action-sidebar-thread-row][data-codex-plus-project-sidebar-color],[data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color] [data-app-action-sidebar-thread-row])[data-app-action-sidebar-thread-active=\"true\"]{background-color:var(--codex-plus-project-bg-light);box-shadow:inset 5px 0 0 var(--codex-plus-project-accent)}" +
+        ":root.dark :is([data-app-action-sidebar-project-row],[data-app-action-sidebar-thread-row][data-codex-plus-project-sidebar-color],[data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color] [data-app-action-sidebar-thread-row]),:root.electron-dark :is([data-app-action-sidebar-project-row],[data-app-action-sidebar-thread-row][data-codex-plus-project-sidebar-color],[data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color] [data-app-action-sidebar-thread-row]){border-radius:0;background-color:var(--codex-plus-project-bg-dark);border-left-color:var(--codex-plus-project-border-dark)}" +
+        ":root.dark :is([data-app-action-sidebar-thread-row][data-codex-plus-project-sidebar-color],[data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color] [data-app-action-sidebar-thread-row])[data-app-action-sidebar-thread-active=\"true\"],:root.electron-dark :is([data-app-action-sidebar-thread-row][data-codex-plus-project-sidebar-color],[data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color] [data-app-action-sidebar-thread-row])[data-app-action-sidebar-thread-active=\"true\"]{background-color:color-mix(in srgb,var(--codex-plus-project-accent) 38%,transparent);border-left-color:color-mix(in srgb,var(--codex-plus-project-accent) 88%,transparent);box-shadow:inset 5px 0 0 var(--codex-plus-project-accent)}" +
         ":root:not(.dark):not(.electron-dark) [data-codex-plus-project-color]{border-left-color:var(--codex-plus-project-accent)}" +
         ":root.dark [data-codex-plus-project-color],:root.electron-dark [data-codex-plus-project-color]{border-left-color:var(--codex-plus-project-border-dark)}" +
-        ":root:not(.dark):not(.electron-dark) [data-codex-plus-project-color]:not([data-codex-plus-project-sidebar-color]){background-image:linear-gradient(to right,var(--codex-plus-project-separator-light),var(--codex-plus-project-separator-light));background-repeat:no-repeat;background-size:2px 100%;background-position:left top}" +
-        ":root.dark [data-codex-plus-project-color]:not([data-codex-plus-project-sidebar-color]),:root.electron-dark [data-codex-plus-project-color]:not([data-codex-plus-project-sidebar-color]){background-image:linear-gradient(to right,var(--codex-plus-project-separator-dark),var(--codex-plus-project-separator-dark));background-repeat:no-repeat;background-size:2px 100%;background-position:left top}",
+        ":root:not(.dark):not(.electron-dark) [data-codex-plus-project-color]:not([data-codex-plus-project-sidebar-color]){box-shadow:inset 6px 0 0 var(--codex-plus-project-accent);border-left-color:var(--codex-plus-project-accent)}" +
+        ":root.dark [data-codex-plus-project-color]:not([data-codex-plus-project-sidebar-color]),:root.electron-dark [data-codex-plus-project-color]:not([data-codex-plus-project-sidebar-color]){box-shadow:inset 6px 0 0 var(--codex-plus-project-accent);border-left-color:var(--codex-plus-project-border-dark)}" +
+        "[data-codex-plus-user-entry][data-codex-plus-project-color]{box-shadow:inset 6px 0 0 var(--codex-plus-project-accent),0 0 0 .5px rgba(255,255,255,.2)!important}",
       exports: {
         colorFor,
         colorKey,

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",