codex-plus-patcher 0.7.0 → 0.7.2

package/src/patches/lib/hooks/message-composer.js

@@ -1,5 +1,5 @@
 function messageComposerHook() {
-  return "let CPXMC=window.CodexPlusHost.adapters.messageComposer,CPXBubbleProps=e=>CPXMC.userBubbleProps(e),CPXSurfaceProps=e=>CPXMC.composerSurfaceProps(e);";
+  return "var CPXMC=window.CodexPlusHost.adapters.messageComposer,CPXBubbleProps=e=>CPXMC.userBubbleProps(e),CPXSurfaceProps=e=>CPXMC.composerSurfaceProps(e);";
 }
 
 module.exports = {

package/src/patches/lib/hooks/project-selector.js

@@ -2,8 +2,8 @@ function projectSelectorSearchHook() {
   return "let CPXP=window.CodexPlusHost.adapters.projectSelector;";
 }
 
-function projectSelectorTriggerHook() {
-  return "function CPXPST(e,t){return CPXP.trigger(e,t,Me)}";
+function projectSelectorTriggerHook(reactIdentifier = "Me") {
+  return `function CPXPST(e,t){return CPXP.trigger(e,t,${reactIdentifier})}`;
 }
 
 module.exports = {

package/src/patches/lib/hooks/review.js

@@ -1,5 +1,7 @@
-function reviewHook() {
-  return "let CPXR=window.CodexPlusHost.adapters.review,CPXRM=e=>CPXR.renderBodyFromHost(e,[$,Q,s,l,ft,Or,Dr,kr,jr,y,B,of,Y,Ae,Je,yi,vi,CPXBranchPickerDropdownContent,dp,xr,Ma]);";
+function reviewHook(depsExpression) {
+  const deps =
+    depsExpression || "[$,Q,s,l,ft,Or,Dr,kr,jr,y,B,of,Y,Ae,Je,yi,vi,CPXBranchPickerDropdownContent,dp,xr,Ma]";
+  return `let CPXR=window.CodexPlusHost.adapters.review,CPXRM=e=>CPXR.renderBodyFromHost(e,${deps});`;
 }
 
 module.exports = {

package/src/patches/lib/hooks/settings-commands.js

@@ -1,5 +1,6 @@
-function appearanceSettingsHook() {
-  return "function CPXAppearanceRows(e){return window.CodexPlus?.ui?.settings?.appearance?.renderRows?.({deps:{React:X,jsx:Z.jsx,SettingRow:J,ColorInput:sn,Switch:q},variant:e})??[]}";
+function appearanceSettingsHook(depsExpression) {
+  const deps = depsExpression || "{React:X,jsx:Z.jsx,SettingRow:J,ColorInput:sn,Switch:q}";
+  return `function CPXAppearanceRows(e){return window.CodexPlus?.ui?.settings?.appearance?.renderRows?.({deps:${deps},variant:e})??[]}`;
 }
 
 function commandMenuItemsExpression(group, jsx, menuItem, register) {

package/src/patches/lib/hooks/sidebar.js

@@ -1,12 +1,7 @@
 function projectColorHook() {
-  return "let CPXS=window.CodexPlusHost.adapters.sidebar,CPXPR=e=>CPXS.projectRowProps(e),CPXTR=e=>CPXS.threadRowProps(e);";
-}
-
-function sidebarMergeDataAttributes(baseExpression, extraExpression) {
-  return `window.CodexPlusHost.adapters.sidebar.mergeThreadRowAttributes(${baseExpression},${extraExpression})`;
+  return "var CPXS=window.CodexPlusHost.adapters.sidebar,CPXPR=e=>CPXS.projectRowProps(e);";
 }
 
 module.exports = {
   projectColorHook,
-  sidebarMergeDataAttributes,
 };

package/src/patches/lib/project-selector-shortcut-patch.js

@@ -2,6 +2,14 @@ const { replaceOnce } = require("./replace");
 const { projectSelectorSearchHook, projectSelectorTriggerHook } = require("./hooks/project-selector");
 
 function patchLocalActiveWorkspaceRootDropdownProjectSelectorShortcut(text) {
+  if (text.includes("function Ti(e){let t=(0,Oi.c)(109),")) {
+    return replaceOnce(
+      text,
+      "de=(0,X.jsx)(`button`,{type:`button`,className:`flex min-w-0 items-center gap-1.5 rounded-lg bg-token-foreground/5 px-2 py-0.5 text-base leading-6 font-medium tracking-[-0.13px] text-token-foreground`,disabled:re,children:ue})",
+      "de=(0,X.jsx)(`button`,{type:`button`,\"data-codex-plus-project-selector-trigger\":!0,\"data-codex-plus-project-selector-variant\":`default`,className:`flex min-w-0 items-center gap-1.5 rounded-lg bg-token-foreground/5 px-2 py-0.5 text-base leading-6 font-medium tracking-[-0.13px] text-token-foreground`,disabled:re,children:ue})",
+      "project selector shortcut final dropdown trigger anchor",
+    );
+  }
   let patched = replaceOnce(
     text,
     "Ne=r();function Pe(e){let t=(0,Ne.c)(42),",
@@ -40,16 +48,147 @@ function patchLocalActiveWorkspaceRootDropdownProjectSelectorShortcut(text) {
   );
 }
 
+function patchHomeProjectDropdownProjectSelectorShortcut(text) {
+  if (text.includes("function zn(e){let t=(0,Bn.c)(44),") && text.includes("function ar({activeProjectIdOverride:e,")) {
+    let patched = replaceOnce(
+      text,
+      "function zn(e){let t=(0,Bn.c)(44),",
+      `${projectSelectorSearchHook()}${projectSelectorTriggerHook("$")}function zn(e){let t=(0,Bn.c)(44),`,
+      "home project selector shortcut helper insertion anchor",
+    );
+    patched = replaceOnce(
+      patched,
+      "let e=_.trim().toLowerCase();b=r.filter(t=>{if(!e)return!0;let n=t.repositoryData?.rootFolder??``;return[t.label,n,t.path??``,t.hostDisplayName??``].some(t=>t.toLowerCase().includes(e))});",
+      "b=CPXP.fuzzyFilter(r,_);",
+      "home project selector fuzzy search filter anchor",
+    );
+    patched = replaceOnce(
+      patched,
+      "w=(0,Z.jsx)(_t,{value:_,onChange:s,placeholder:c,className:`mb-1`})",
+      "w=(0,Z.jsx)(_t,{value:_,onChange:s,onKeyDown:e=>CPXP.acceptFirst(e,b,o,_),placeholder:c,className:`mb-1`})",
+      "home project selector accept first match keydown anchor",
+    );
+    patched = replaceOnce(
+      patched,
+      "(0,Z.jsx)(`span`,{className:`truncate`,children:e.label})",
+      "(0,Z.jsx)(`span`,{className:`truncate`,children:CPXP.fuzzyHighlight(e.label,_,Z.jsx)})",
+      "home project selector fuzzy search highlight anchor",
+    );
+    patched = replaceOnce(
+      patched,
+      "children:(0,$.jsxs)(me,{size:`composerSm`,color:`ghost`,className:`min-w-0`,children:",
+      "children:(0,$.jsxs)(me,{\"data-codex-plus-project-selector-trigger\":!0,\"data-codex-plus-project-selector-variant\":u,size:`composerSm`,color:`ghost`,className:`min-w-0`,children:",
+      "home project selector default button marker anchor",
+    );
+    patched = replaceOnce(
+      patched,
+      "children:(0,$.jsx)($n,{categoryLabel:(0,$.jsx)(R,{id:`composer.localCwdDropdown.footerCategory`",
+      "children:(0,$.jsx)($n,{\"data-codex-plus-project-selector-trigger\":!0,\"data-codex-plus-project-selector-variant\":u,categoryLabel:(0,$.jsx)(R,{id:`composer.localCwdDropdown.footerCategory`",
+      "home project selector footer button marker anchor",
+    );
+    patched = replaceOnce(
+      patched,
+      "ze=()=>(0,$.jsxs)(`button`,{className:V(`heading-xl text-token-text-tertiary",
+      "ze=()=>(0,$.jsxs)(`button`,{\"data-codex-plus-project-selector-trigger\":!0,\"data-codex-plus-project-selector-variant\":u,className:V(`heading-xl text-token-text-tertiary",
+      "home project selector hero button marker anchor",
+    );
+    patched = replaceOnce(
+      patched,
+      "triggerButton:p??G(),contentWidth:`menu`",
+      "triggerButton:CPXPST(p??G(),u),contentWidth:`menu`",
+      "home project selector empty trigger anchor",
+    );
+    return replaceOnce(
+      patched,
+      "triggerButton:p??(u===`hero`?ze():u===`home`?G():Ie()),contentWidth:`workspace`",
+      "triggerButton:CPXPST(p??(u===`hero`?ze():u===`home`?G():Ie()),u),contentWidth:`workspace`",
+      "home project selector workspace trigger anchor",
+    );
+  }
+  let patched = replaceOnce(
+    text,
+    "function St({activeProjectIdOverride:e,allowLocalProjects:t=!0,allowLocalProjectActions:n=t,allowRemoteProjects:r=!0,disabled:a=!1,hideLabel:o=!1,onWorkspaceRootSelected:s,variant:c=`default`,isOpen:l,onOpenChange:m,triggerButton:_}){",
+    `${projectSelectorSearchHook()}${projectSelectorTriggerHook("wt")}function St({activeProjectIdOverride:e,allowLocalProjects:t=!0,allowLocalProjectActions:n=t,allowRemoteProjects:r=!0,disabled:a=!1,hideLabel:o=!1,onWorkspaceRootSelected:s,variant:c=\`default\`,isOpen:l,onOpenChange:m,triggerButton:_}){`,
+    "home project selector shortcut helper insertion anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "let e=_.trim().toLowerCase();b=r.filter(t=>{if(!e)return!0;let n=t.repositoryData?.rootFolder??``;return[t.label,n,t.path??``,t.hostDisplayName??``].some(t=>t.toLowerCase().includes(e))});",
+    "b=CPXP.fuzzyFilter(r,_);",
+    "home project selector fuzzy search filter anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "w=(0,X.jsx)(ie,{value:_,onChange:s,placeholder:c,className:`mb-1`})",
+    "w=(0,X.jsx)(ie,{value:_,onChange:s,onKeyDown:e=>CPXP.acceptFirst(e,b,o,_),placeholder:c,className:`mb-1`})",
+    "home project selector accept first match keydown anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "(0,X.jsx)(`span`,{className:`truncate`,children:e.label})",
+    "(0,X.jsx)(`span`,{className:`truncate`,children:CPXP.fuzzyHighlight(e.label,_,X.jsx)})",
+    "home project selector fuzzy search highlight anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "children:(0,$.jsxs)(Ne,{size:`composerSm`,color:`ghost`,className:`min-w-0`,children:",
+    "children:(0,$.jsxs)(Ne,{\"data-codex-plus-project-selector-trigger\":!0,\"data-codex-plus-project-selector-variant\":c,size:`composerSm`,color:`ghost`,className:`min-w-0`,children:",
+    "home project selector default button marker anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "children:(0,$.jsx)(gt,{categoryLabel:(0,$.jsx)(R,{id:`composer.localCwdDropdown.footerCategory`",
+    "children:(0,$.jsx)(gt,{\"data-codex-plus-project-selector-trigger\":!0,\"data-codex-plus-project-selector-variant\":c,categoryLabel:(0,$.jsx)(R,{id:`composer.localCwdDropdown.footerCategory`",
+    "home project selector footer button marker anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "Ze=()=>(0,$.jsxs)(`button`,{className:W(`heading-xl text-token-text-tertiary",
+    "Ze=()=>(0,$.jsxs)(`button`,{\"data-codex-plus-project-selector-trigger\":!0,\"data-codex-plus-project-selector-variant\":c,className:W(`heading-xl text-token-text-tertiary",
+    "home project selector hero button marker anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "triggerButton:_??J(),contentWidth:`menu`",
+    "triggerButton:CPXPST(_??J(),c),contentWidth:`menu`",
+    "home project selector empty trigger anchor",
+  );
+  return replaceOnce(
+    patched,
+    "triggerButton:_??(c===`hero`?Ze():c===`home`?J():Ke()),contentWidth:`workspace`",
+    "triggerButton:CPXPST(_??(c===`hero`?Ze():c===`home`?J():Ke()),c),contentWidth:`workspace`",
+    "home project selector workspace trigger anchor",
+  );
+}
+
 function patchRunCommandProjectSelectorShortcut(text) {
+  const runtimeCommandEntries = "...(window.CodexPlus?.commands?.all?.()??[]).map(e=>[e.id,()=>window.CodexPlus?.commands?.run?.(e.id)])";
+  if (text.includes("Jy(`toggleSidebar`,r);")) {
+    return replaceOnce(
+      text,
+      "Jy(`toggleSidebar`,r);",
+      "Jy(`toggleSidebar`,r);for(let e of window.CodexPlus?.commands?.all?.()??[])Jy(e.id,()=>window.CodexPlus?.commands?.run?.(e.id));",
+      "codex plus runtime command dispatch anchor",
+    );
+  }
+  if (text.includes("],[`openFolder`,GTt],[`toggleSidebar`,")) {
+    return replaceOnce(
+      text,
+      "],[`openFolder`,GTt],[`toggleSidebar`,",
+      `],[\`openFolder\`,GTt],${runtimeCommandEntries},[\`toggleSidebar\`,`,
+      "codex plus runtime command dispatch anchor",
+    );
+  }
   return replaceOnce(
     text,
     "],[`openFolder`,()=>{r()}],[`toggleSidebar`,",
-    "],[`codexPlus.focusProjectSelector`,()=>{window.CodexPlus?.commands?.run?.(`codexPlus.focusProjectSelector`)}],[`openFolder`,()=>{r()}],[`toggleSidebar`,",
-    "project selector shortcut command dispatch anchor",
+    `],[\`openFolder\`,()=>{r()}],${runtimeCommandEntries},[\`toggleSidebar\`,`,
+    "codex plus runtime command dispatch anchor",
   );
 }
 
 module.exports = {
+  patchHomeProjectDropdownProjectSelectorShortcut,
   patchLocalActiveWorkspaceRootDropdownProjectSelectorShortcut,
   patchRunCommandProjectSelectorShortcut,
 };

package/src/runtime/api/index.js

@@ -62,7 +62,10 @@
     return result;
   }
 
+  core.plugins.list = () => Array.from(core.plugins.values());
+
   const CodexPlus = {
+    config: globalObject.__CodexPlusRuntimeConfig || {},
     definePlugin,
     registerPlugin,
     startPlugin,

package/src/runtime/assets.js

@@ -55,13 +55,13 @@ const runtimeFiles = [
   ...browserRuntimeAssets,
 ];
 
-function browserRuntimeManifest() {
-  return `window.__CodexPlusRuntimeFiles=${JSON.stringify(browserRuntimeFiles)};window.__CodexPlusLoadRuntimeFiles?.(window.__CodexPlusRuntimeFiles);\n`;
+function browserRuntimeManifest(config = {}) {
+  return `window.__CodexPlusRuntimeConfig=${JSON.stringify(config)};window.__CodexPlusRuntimeFiles=${JSON.stringify(browserRuntimeFiles)};window.__CodexPlusLoadRuntimeFiles?.(window.__CodexPlusRuntimeFiles);\n`;
 }
 
-function codexPlusRuntimeAssets() {
+function codexPlusRuntimeAssets(config = {}) {
   return runtimeFiles.map(([asarPath, localPath]) => {
-    const content = localPath == null ? browserRuntimeManifest() : fs.readFileSync(path.join(runtimeRoot, localPath), "utf8");
+    const content = localPath == null ? browserRuntimeManifest(config) : fs.readFileSync(path.join(runtimeRoot, localPath), "utf8");
     return [asarPath, content];
   });
 }

package/src/runtime/host/projectSelector.js

@@ -40,7 +40,11 @@
   }
 
   function trigger(element, variant, React) {
-    return React.isValidElement(element)
+    return typeof React?.cloneElement === "function" &&
+      element != null &&
+      typeof element === "object" &&
+      "props" in element &&
+      "type" in element
       ? React.cloneElement(element, {
           ...element.props,
           "data-codex-plus-project-selector-trigger": true,

package/src/runtime/plugins/mermaidFullscreen.js

@@ -4,7 +4,13 @@
   const BUTTON_CLASS = "codex-plus-mermaid-expand-button";
 
   function sourceFor(container) {
-    return container.querySelector("pre.sr-only")?.textContent || "";
+    return container.querySelector("pre.sr-only")?.textContent ||
+      container.parentElement?.querySelector(":scope > pre.sr-only")?.textContent ||
+      "";
+  }
+
+  function hostFor(container) {
+    return container.closest('[data-markdown-copy="code-block"]') || container;
   }
 
   function assetUrl(assetPath) {
@@ -13,6 +19,10 @@
     return new URL(`assets/${assetPath}`, document.baseURI).href;
   }
 
+  function mermaidCoreAsset() {
+    return CodexPlus.config?.mermaidCoreAsset || "mermaid.core.js";
+  }
+
   function escapeHtml(value) {
     return String(value).replace(/[&<>"']/g, (char) => ({
       "&": "&amp;",
@@ -219,17 +229,19 @@ renderFromSource().catch((error) => {
     const isDark = document.documentElement.classList.contains("dark") || document.documentElement.classList.contains("electron-dark");
     const debug = localStorage.getItem("codexPlusMermaidDebug") === "1";
     const html = source
-      ? viewerHtml({ source, isDark, mermaidModuleUrl: assetUrl("mermaid.core-eIokQLcr.js"), debug })
+      ? viewerHtml({ source, isDark, mermaidModuleUrl: assetUrl(mermaidCoreAsset()), debug })
       : `<!doctype html><meta charset="utf-8"><body>${escapeHtml("No Mermaid source was found.")}</body>`;
     CodexPlus.native.request("mermaid/openViewer", { html }).catch(() => {});
   }
 
   function decorate(container) {
-    if (container.querySelector(`:scope > .${BUTTON_CLASS}`)) return;
-    container.style.position ||= "relative";
+    const host = hostFor(container);
+    if (host.querySelector(`:scope > .${BUTTON_CLASS}`)) return;
+    host.setAttribute("data-codex-plus-mermaid-host", "");
+    host.style.position ||= "relative";
     const control = button("Open Mermaid diagram fullscreen");
-    control.addEventListener("click", () => openViewer(container));
-    container.prepend(control);
+    control.addEventListener("click", () => openViewer(host));
+    host.prepend(control);
   }
 
   function decorateAll(root = document) {
@@ -243,6 +255,7 @@ renderFromSource().catch((error) => {
       description: "Adds a separate fullscreen viewer with zoom controls to rendered Mermaid diagrams.",
       required: true,
       styles:
+        `[data-codex-plus-mermaid-host]{position:relative}` +
         `[data-codex-plus-mermaid-diagram]{position:relative}` +
         `.${BUTTON_CLASS}{position:absolute;left:.5rem;top:.5rem;z-index:30;display:inline-flex;width:1.75rem;height:1.75rem;align-items:center;justify-content:center;border:1px solid var(--color-token-input-border,rgba(127,127,127,.35));border-radius:.375rem;background:var(--color-background-elevated-primary,#fff);color:var(--color-token-foreground,#111);box-shadow:0 2px 8px rgba(0,0,0,.12);opacity:.82}` +
         `.${BUTTON_CLASS}::before,.${BUTTON_CLASS}::after{content:"";position:absolute;width:.42rem;height:.42rem;border-color:currentColor;border-style:solid}` +

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,17 @@
       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) [data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color]{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 [data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color],:root.electron-dark [data-app-action-sidebar-project-list-id][data-codex-plus-project-sidebar-color]{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,