codex-plus-patcher 0.5.0 → 0.7.0

package/src/patches/lib/common-patches.js

@@ -1,6 +1,20 @@
 const { codexPlusRuntimeAssets } = require("../../runtime/assets");
 const { replaceOnce } = require("./replace");
 const { makePatchSet } = require("./make-patch-set");
+const { aboutMetadataRequire } = require("./hooks/about");
+const { diagnosticDetailsHook } = require("./hooks/diagnostics");
+const { mermaidDiagramHook } = require("./hooks/mermaid");
+const { messageComposerHook } = require("./hooks/message-composer");
+const { nativeMainHook } = require("./hooks/native-main");
+const { reviewHook } = require("./hooks/review");
+const { projectColorHook, sidebarMergeDataAttributes } = require("./hooks/sidebar");
+const { appearanceSettingsHook, commandMenuItemsExpression } = require("./hooks/settings-commands");
+const { threadHeaderHook } = require("./hooks/thread-header");
+const { workerHook } = require("./hooks/worker");
+const {
+  patchLocalActiveWorkspaceRootDropdownProjectSelectorShortcut,
+  patchRunCommandProjectSelectorShortcut,
+} = require("./project-selector-shortcut-patch");
 
 function buildCodexPlusPatchSet(config) {
   const oldTitle = "<title>Codex</title>";
@@ -11,14 +25,22 @@ function buildCodexPlusPatchSet(config) {
   const files = config.files;
   const anchors = config.anchors;
   const mainFile = files.main;
+  const electronCommandSourceFile = files.electronCommandSource;
   const appMainFile = files.appMain;
   const appShellFile = files.appShell;
   const errorBoundaryFile = files.errorBoundary;
   const generalSettingsFile = files.generalSettings;
   const sidebarProjectHoverCardSourceRowsFile = files.sidebarProjectHoverCardSourceRows;
+  const headerFile = files.header;
+  const threadPageHeaderFile = files.threadPageHeader;
+  const localConversationPageFile = files.localConversationPage;
+  const threadContextFile = files.threadContext;
+  const threadContextImportFile = threadContextFile?.split("/").pop();
   const threadSidePanelTabsFile = files.threadSidePanelTabs;
   const userMessageAttachmentsFile = files.userMessageAttachments;
   const composerFile = files.composer;
+  const localActiveWorkspaceRootDropdownFile = files.localActiveWorkspaceRootDropdown;
+  const runCommandFile = files.runCommand;
   const localTaskRowFile = files.localTaskRow;
   const mermaidDiagramShellFile = files.mermaidDiagramShell;
   const electronMenuShortcutsFile = files.electronMenuShortcuts;
@@ -28,11 +50,6 @@ function buildCodexPlusPatchSet(config) {
   const sidebarThreadRowSignalsFile = files.sidebarThreadRowSignals;
   const branchPickerDropdownContentFile = files.branchPickerDropdownContent;
 
-function codexPlusWorkerHelpers() {
-  return `
-const CPXWorkerBridge=require(\"./codex-plus-worker.js\");function CPX_traceRequest(e){return CPXWorkerBridge.traceRequest(e)}async function CPX_repositoryTargets(e,t,n,r){return CPXWorkerBridge.repositoryTargets(e,t,n,r,(i,a)=>pae(e.getWorktreeRepositoryForRoot(i,n),a))}function CPX_isReadOnlyBranchRequest(e,t){return CPXWorkerBridge.isReadOnlyBranchRequest(e,t)}`;
-}
-
 function patchTitle(text) {
   return replaceOnce(text, oldTitle, newTitle, `${oldTitle} in ${titleFile}`);
 }
@@ -47,7 +64,7 @@ function patchAboutDialog(text, context = {}) {
   let patched = replaceOnce(
     text,
     "let i=a.app.getName(),o=a.app.getVersion()",
-    `let CPXAbout=require("./codex-plus-aboutMetadata.js").aboutPayload(${JSON.stringify(aboutContext)}),i=CPXAbout.appDisplayName,o=a.app.getVersion()`,
+    `let CPXAbout=${aboutMetadataRequire()}.aboutPayload(${JSON.stringify(aboutContext)}),i=CPXAbout.appDisplayName,o=a.app.getVersion()`,
     "about dialog app name anchor",
   );
   patched = replaceOnce(
@@ -65,7 +82,9 @@ function patchAboutDialog(text, context = {}) {
   patched = replaceOnce(
     patched,
     "function K0({appDisplayName:e,buildInfoLabel:t,buildInfoText:n,iconDataUrl:r,isDark:i,okLabel:a,title:o}){let s=r==null?``:",
-    "function K0({appDisplayName:e,buildInfoLabel:t,buildInfoText:n,codexPlusDisclaimerHeading:D,codexPlusDisclaimerBody:O,iconDataUrl:r,isDark:i,okLabel:a,title:o}){let CPXAboutMetadata=require(\"./codex-plus-aboutMetadata.js\"),q=CPXAboutMetadata.disclaimerMarkup({escape:zz.default,heading:D,body:O}),s=r==null?``:",
+    "function K0({appDisplayName:e,buildInfoLabel:t,buildInfoText:n,codexPlusDisclaimerHeading:D,codexPlusDisclaimerBody:O,iconDataUrl:r,isDark:i,okLabel:a,title:o}){let CPXAboutMetadata=" +
+      aboutMetadataRequire() +
+      ",q=CPXAboutMetadata.disclaimerMarkup({escape:zz.default,heading:D,body:O}),s=r==null?``:",
     "about dialog renderer signature anchor",
   );
   patched = replaceOnce(
@@ -98,19 +117,19 @@ function patchWorker(text) {
   let patched = replaceOnce(
     text,
     "function pae(e,t){return e.queryClient.fetchQuery",
-    `${codexPlusWorkerHelpers()}function pae(e,t){return e.queryClient.fetchQuery`,
+    `${workerHook()}function pae(e,t){return e.queryClient.fetchQuery`,
     "worker helper insertion anchor",
   );
   patched = replaceOnce(
     patched,
     "case`submodule-paths`:a=X({paths:await pae(this.gitManager.getWorktreeRepositoryForRoot(e.params.root,r),t.signal)});break;",
-    "case`codex-plus-trace`:a=X(CPX_traceRequest(e.params));break;case`repository-targets`:a=X(await CPX_repositoryTargets(this.gitManager,e.params,r,t.signal));break;case`submodule-paths`:a=X({paths:await pae(this.gitManager.getWorktreeRepositoryForRoot(e.params.root,r),t.signal)});break;",
+    "case`codex-plus-trace`:a=X(CPXT(e.params));break;case`repository-targets`:a=X(await CPXR(this.gitManager,e.params,r,t.signal));break;case`submodule-paths`:a=X({paths:await pae(this.gitManager.getWorktreeRepositoryForRoot(e.params.root,r),t.signal)});break;",
     "repository-targets worker switch anchor",
   );
   patched = replaceOnce(
     patched,
     "function u2({requestKind:e,source:t}){return l2.has(e??``)||d2(t)}",
-    "function u2({requestKind:e,source:t}){return l2.has(e??``)||d2(t)||CPX_isReadOnlyBranchRequest(e,t)}",
+    "function u2({requestKind:e,source:t}){return l2.has(e??``)||d2(t)||CPXB(e,t)}",
     "codex plus branch picker git allowlist anchor",
   );
   return replaceOnce(
@@ -121,21 +140,6 @@ function patchWorker(text) {
   );
 }
 
-const codexPlusReviewHelpers = `
-function CPXReviewMux(e){let t=e.mainReviewContent??(0,$.jsx)(of,e);return window.CodexPlus?.ui?.review?.renderBody?.({props:e,deps:{jsx:$.jsx,jsxs:$.jsxs,Fragment:$.Fragment,createElement:Q.createElement,React:Q,useStore:s,useAtom:l,routeAtom:ft,cwdAtom:Or,hostIdAtom:Dr,hostConfigAtom:kr,conversationIdAtom:jr,gitRequest:y,pathValue:B,DefaultReview:of,Button:Y,Tooltip:Ae,Icon:Je,Dropdown:yi,DropdownMenu:vi,BranchPickerDropdownContent:CPXBranchPickerDropdownContent,ReviewToolbar:dp,parseDiff:xr,DiffCard:Ma},defaultBody:t})??t}`;
-
-const codexPlusSubrepoDiffHelpers = `
-`;
-
-const codexPlusDiagnosticHelpers = `
-function CPXDiagnosticDetails(e){return window.CodexPlus?.ui?.errors?.renderDetails?.(e)??null}`;
-
-const codexPlusMermaidHelpers = `
-function CPXMermaidDiagramProps(e){return window.CodexPlus?.ui?.mermaid?.diagramProps?.(e)}`;
-
-const codexPlusNativeMainHelpers = `
-function CPXOpenMermaidViewer(e){let t=e?.html;if(typeof t!==\`string\`||t.length===0)return{ok:!1};let n=(0,s.join)((0,o.tmpdir)(),\`codex-plus-mermaid-\${(0,u.randomUUID)()}.html\`);(0,l.writeFileSync)(n,t,\`utf8\`);let r=new a.BrowserWindow({height:900,resizable:!0,show:!0,title:\`Mermaid diagram viewer\`,webPreferences:{contextIsolation:!0,nodeIntegration:!1,sandbox:!0},width:1400});return r.webContents.setWindowOpenHandler(e=>{try{let t=new URL(e.url);if(t.protocol===\`https:\`&&t.hostname===\`mermaid.live\`)a.shell.openExternal(e.url)}catch{}return{action:\`deny\`}}),r.on(\`closed\`,()=>{try{(0,l.unlinkSync)(n)}catch{}}),r.loadURL((0,S.pathToFileURL)(n).toString()).catch(()=>{}),{ok:!0}}function CPXRegisterNativeRequest(e){return a.ipcMain.handle(\`codex_plus:native-request\`,async(t,n)=>{if(!e.isTrustedIpcEvent(t))return{ok:!1};switch(n?.method){case\`mermaid/openViewer\`:return CPXOpenMermaidViewer(n.params);default:return{ok:!1}}})}`;
-
 function patchThreadSidePanelTabs(text) {
   let patched = replaceOnce(
     text,
@@ -146,13 +150,13 @@ function patchThreadSidePanelTabs(text) {
   patched = replaceOnce(
     patched,
     "function uf({cwd:e,fileEntries:t,generatedPathsReady:n,hasUnhandledAttributesFiles:r,isCappedMode:i,repositorySource:a,reviewSummarySource:o}){",
-    `${codexPlusReviewHelpers}function uf({cwd:e,fileEntries:t,generatedPathsReady:n,hasUnhandledAttributesFiles:r,isCappedMode:i,repositorySource:a,reviewSummarySource:o}){`,
+    `${reviewHook()}function uf({cwd:e,fileEntries:t,generatedPathsReady:n,hasUnhandledAttributesFiles:r,isCappedMode:i,repositorySource:a,reviewSummarySource:o}){`,
     "review host hook insertion anchor",
   );
   return replaceOnce(
     patched,
     "let s;t[1]!==a||t[2]!==r||t[3]!==i?(s=(0,$.jsx)(Tf,{diffMode:a,setTabState:r,tabState:i}),t[1]=a,t[2]=r,t[3]=i,t[4]=s):s=t[4];let c;",
-    "let s;t[1]!==a||t[2]!==r||t[3]!==i?(s=(0,$.jsx)(CPXReviewMux,{mainReviewContent:(0,$.jsx)(Tf,{diffMode:a,setTabState:r,tabState:i}),diffMode:a,setTabState:r,tabState:i}),t[1]=a,t[2]=r,t[3]=i,t[4]=s):s=t[4];let c;",
+    "let s;t[1]!==a||t[2]!==r||t[3]!==i?(s=(0,$.jsx)(CPXRM,{mainReviewContent:(0,$.jsx)(Tf,{diffMode:a,setTabState:r,tabState:i}),diffMode:a,setTabState:r,tabState:i}),t[1]=a,t[2]=r,t[3]=i,t[4]=s):s=t[4];let c;",
     "review body mux anchor",
   );
 }
@@ -160,7 +164,7 @@ function patchAppShell(text) {
   let patched = replaceOnce(
     text,
     "function En(e){return(0,Q.jsx)(wn,{onRetry:()=>{e.resetError()}})}",
-    `${codexPlusDiagnosticHelpers}function En(e){return(0,Q.jsx)(wn,{error:e.error,onRetry:()=>{e.resetError()}})}`,
+    `${diagnosticDetailsHook()}function En(e){return(0,Q.jsx)(wn,{error:e.error,onRetry:()=>{e.resetError()}})}`,
     "app shell error fallback prop anchor",
   );
   patched = replaceOnce(
@@ -187,7 +191,7 @@ function patchErrorBoundary(text) {
   let patched = replaceOnce(
     text,
     "function Xf(e){let t=(0,Vf.c)(9),{resetError:n}=e,r=ee(),i,a;",
-    `${codexPlusDiagnosticHelpers}function Xf(e){let t=(0,Vf.c)(9),{resetError:n,error:CPX_error,componentStack:CPX_componentStack}=e,r=ee(),i,a;`,
+    `${diagnosticDetailsHook()}function Xf(e){let t=(0,Vf.c)(9),{resetError:n,error:CPX_error,componentStack:CPX_componentStack}=e,r=ee(),i,a;`,
     "webview error boundary fallback prop anchor",
   );
   patched = replaceOnce(
@@ -208,7 +212,7 @@ function patchAppMainProjectColors(text) {
   let patched = replaceOnce(
     text,
     "function Pk(e){let t=(0,Q.c)(45),",
-    `${codexPlusProjectColorHelpers}function Pk(e){let t=(0,Q.c)(46),`,
+    `${projectColorHook()}function Pk(e){let t=(0,Q.c)(46),`,
     "project color app main helper insertion anchor",
   );
   patched = replaceOnce(
@@ -220,7 +224,7 @@ function patchAppMainProjectColors(text) {
   patched = replaceOnce(
     patched,
     "q={onActivateGroup:V,onStartNewConversation:a,isGrouped:!0,hideRemoteHostEnvIcon:!0,hideTimestamp:l,locationId:b,floatStatusIconsRight:s,showPinActionOnHover:o}",
-    "q={onActivateGroup:V,onStartNewConversation:a,isGrouped:!0,hideRemoteHostEnvIcon:!0,hideTimestamp:l,locationId:b,floatStatusIconsRight:s,showPinActionOnHover:o,dataAttributes:CPXHostThreadRowProps(i)}",
+    "q={onActivateGroup:V,onStartNewConversation:a,isGrouped:!0,hideRemoteHostEnvIcon:!0,hideTimestamp:l,locationId:b,floatStatusIconsRight:s,showPinActionOnHover:o,dataAttributes:CPXTR(i)}",
     "project thread row color key anchor",
   );
   patched = replaceOnce(
@@ -250,7 +254,7 @@ function patchAppMainProjectColors(text) {
   patched = replaceOnce(
     patched,
     "Ke=(0,Z.jsx)(Oe,{rowAttributes:ke,className:Ae,collapsed:L,contentClassName:je,",
-    "Ke=(0,Z.jsx)(Oe,{rowAttributes:{...ke,...CPXHostProjectRowProps(n)},className:Ae,collapsed:L,contentClassName:je,",
+    "Ke=(0,Z.jsx)(Oe,{rowAttributes:{...ke,...CPXPR(n)},className:Ae,collapsed:L,contentClassName:je,",
     "project header row color attributes anchor",
   );
   return patched;
@@ -273,7 +277,7 @@ function patchAppMainSidebarBlur(text) {
   return replaceOnce(
     patched,
     "children:[l,u,(0,Z.jsx)(H_,{route:a,children:C})]",
-    "children:[l,u,...(window.CodexPlus?.ui?.commands?.renderMenuItems?.({group:`suggested`,deps:{jsx:Z.jsx,MenuItem:Zy,register:Hp}})??[]),(0,Z.jsx)(H_,{route:a,children:C})]",
+    `children:[l,u,...(${commandMenuItemsExpression("suggested", "Z.jsx", "Zy", "Hp")}),(0,Z.jsx)(H_,{route:a,children:C})]`,
     "sidebar name blur command mount anchor",
   );
 }
@@ -313,19 +317,19 @@ function patchSidebarProjectHoverCardSourceRows(text) {
   patched = replaceOnce(
     patched,
     "dataAttributes:ae.sidebarThreadRow({active:s,hostId:t.hostId,id:n,kind:`pending-worktree`,pinned:r,title:t.label})",
-    "dataAttributes:window.CodexPlus?.ui?.sidebar?.mergeDataAttributes?.(ae.sidebarThreadRow({active:s,hostId:t.hostId,id:n,kind:`pending-worktree`,pinned:r,title:t.label}),CPX_rowDataAttributes)",
+    `dataAttributes:${sidebarMergeDataAttributes("ae.sidebarThreadRow({active:s,hostId:t.hostId,id:n,kind:`pending-worktree`,pinned:r,title:t.label})", "CPX_rowDataAttributes")}`,
     "pending worktree sidebar row data attributes merge anchor",
   );
   patched = replaceOnce(
     patched,
     "dataAttributes:ae.sidebarThreadRow({active:s,hostId:null,id:t,kind:`remote`,pinned:r,title:e.task.title??``})",
-    "dataAttributes:window.CodexPlus?.ui?.sidebar?.mergeDataAttributes?.(ae.sidebarThreadRow({active:s,hostId:null,id:t,kind:`remote`,pinned:r,title:e.task.title??``}),CPX_rowDataAttributes)",
+    `dataAttributes:${sidebarMergeDataAttributes("ae.sidebarThreadRow({active:s,hostId:null,id:t,kind:`remote`,pinned:r,title:e.task.title??``})", "CPX_rowDataAttributes")}`,
     "remote sidebar row data attributes merge anchor",
   );
   patched = replaceOnce(
     patched,
     "dataAttributes:ae.sidebarThreadRow({active:s,hostId:f,id:i,kind:`local`,pinned:r,title:x})",
-    "dataAttributes:window.CodexPlus?.ui?.sidebar?.mergeDataAttributes?.(ae.sidebarThreadRow({active:s,hostId:f,id:i,kind:`local`,pinned:r,title:x}),CPX_rowDataAttributes)",
+    `dataAttributes:${sidebarMergeDataAttributes("ae.sidebarThreadRow({active:s,hostId:f,id:i,kind:`local`,pinned:r,title:x})", "CPX_rowDataAttributes")}`,
     "local sidebar row data attributes merge anchor",
   );
   patched = replaceOnce(
@@ -384,17 +388,96 @@ function patchSidebarProjectHoverCardSourceRows(text) {
   );
 }
 
-const codexPlusProjectColorHelpers = `
-function CPXHostProjectRowProps(e){return window.CodexPlus?.ui?.sidebar?.projectRowProps?.({project:e})}function CPXHostThreadRowProps(e){return window.CodexPlus?.ui?.sidebar?.threadRowProps?.({project:e})}function CPXHostUserBubbleProps(e){return window.CodexPlus?.ui?.message?.userBubbleProps?.(e)}function CPXHostComposerSurfaceProps(e){return window.CodexPlus?.ui?.composer?.surfaceProps?.(e)}`;
+function patchHeader(text) {
+  let patched = replaceOnce(
+    text,
+    `import{Z as r,a as i,s as a}from"./app-scope-CWE-zIhQ.js";`,
+    `import{Z as r,a as i,a as CPX_readAtom,s as a}from"./app-scope-CWE-zIhQ.js";`,
+    "thread header atom reader alias import anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    `import{t as ee}from"./tooltip-B-u9JAuV.js";`,
+    `import{t as ee,t as CPX_Tooltip}from"./tooltip-B-u9JAuV.js";`,
+    "thread header tooltip alias import anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    `import{t as _e}from"./dock-DAmmeMut.js";`,
+    `import{t as _e}from"./dock-DAmmeMut.js";import{n as CPX_headerCwd,i as CPX_headerHostId}from"./${threadContextImportFile}";`,
+    "thread header context import anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "function lt(e){let t=(0,Z.c)(68),",
+    `${threadHeaderHook()}function lt(e){let t=(0,Z.c)(72),`,
+    "thread header accessory helper insertion anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "let C;t[36]!==c||t[37]!==g||t[38]!==i?(C=(0,Q.jsx)(`div`,{className:`mr-3 line-clamp-1 flex min-w-0 flex-1 items-center gap-1 truncate`,style:{viewTransitionName:`header-title`},children:i?(0,Q.jsxs)(`div`,{className:`flex min-w-0 flex-1 items-center gap-1`,children:[(0,Q.jsx)(mt,{onClick:c}),(0,Q.jsx)(x,{color:`ghostActive`,type:`button`,onClick:u,className:`min-w-0 flex-1 truncate !px-0 !py-0 text-left text-sm text-token-foreground hover:!bg-transparent hover:opacity-80 electron:font-medium`,children:(0,Q.jsx)(`span`,{className:`truncate`,children:i})})]}):(0,Q.jsx)(`span`,{className:`text-token-description-foreground`,children:(0,Q.jsx)(pt,{mergedTasks:g,onBack:c,showBackButton:!0})})}),t[36]=c,t[37]=g,t[38]=i,t[39]=C):C=t[39];",
+    "let CPX_headerContext={cwd:CPX_readAtom(CPX_headerCwd),hostId:CPX_readAtom(CPX_headerHostId)},CPX_headerAccessories=CPXThreadHeaderAccessories({context:CPX_headerContext,deps:{jsx:Q.jsx,jsxs:Q.jsxs,Tooltip:CPX_Tooltip}});let C;t[36]!==c||t[37]!==g||t[38]!==i||t[68]!==CPX_headerAccessories?(C=(0,Q.jsx)(`div`,{className:`mr-3 line-clamp-1 flex min-w-0 flex-1 items-center gap-1 truncate`,style:{viewTransitionName:`header-title`},children:i?(0,Q.jsxs)(`div`,{className:`flex min-w-0 flex-1 items-center gap-1`,children:[(0,Q.jsx)(mt,{onClick:c}),(0,Q.jsx)(x,{color:`ghostActive`,type:`button`,onClick:u,className:`min-w-0 flex-1 truncate !px-0 !py-0 text-left text-sm text-token-foreground hover:!bg-transparent hover:opacity-80 electron:font-medium`,children:(0,Q.jsx)(`span`,{className:`truncate`,children:i})}),CPX_headerAccessories]}):(0,Q.jsx)(`span`,{className:`text-token-description-foreground`,children:(0,Q.jsx)(pt,{mergedTasks:g,onBack:c,showBackButton:!0})})}),t[36]=c,t[37]=g,t[38]=i,t[68]=CPX_headerAccessories,t[39]=C):C=t[39];",
+    "thread header accessory render anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "t[53]!==A||t[54]!==b||t[55]!==S||t[56]!==C?(M=(0,Q.jsxs)(`div`,{className:b,children:[S,C,A]}),t[53]=A,t[54]=b,t[55]=S,t[56]=C,t[57]=M):M=t[57]",
+    "t[53]!==A||t[54]!==b||t[55]!==S||t[56]!==C?(M=(0,Q.jsxs)(`div`,{className:b,children:[S,C,A]}),t[53]=A,t[54]=b,t[55]=S,t[56]=C,t[57]=M):M=t[57]",
+    "thread header accessory mount anchor",
+  );
+  return patched;
+}
+
+function patchThreadPageHeader(text) {
+  let patched = text;
+  patched = replaceOnce(
+    patched,
+    "function c(e){let t=(0,o.c)(21),",
+    `${threadHeaderHook()}function c(e){let t=(0,o.c)(24),`,
+    "thread page header helper insertion anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "let t=(0,o.c)(24),{start:c,startActions:l,env:u,secondary:d,trailing:f,hostConfig:p}=e,m;",
+    "let t=(0,o.c)(24),{start:c,startActions:l,env:u,secondary:d,trailing:f,hostConfig:p,cwd:CPX_headerCwd}=e,CPX_headerContext={cwd:CPX_headerCwd,hostId:p?.id??null,header:{env:u,hostDisplayName:p?.display_name??null,startText:typeof c==`string`?c:null,secondaryText:typeof d==`string`?d:null,hasTrailing:f!=null}},CPX_headerAccessories=CPXThreadHeaderAccessories({context:CPX_headerContext,deps:{jsx:s.jsx,jsxs:s.jsxs}}),m;",
+    "thread page header accessory render anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "t[8]!==l||t[9]!==v||t[10]!==y||t[11]!==b?(x=(0,s.jsxs)(`div`,{className:`text-md flex min-w-0 items-center gap-2 truncate text-base electron:font-medium`,children:[v,y,b,l]}),t[8]=l,t[9]=v,t[10]=y,t[11]=b,t[12]=x):x=t[12]",
+    "t[8]!==l||t[9]!==v||t[10]!==y||t[11]!==b||t[21]!==CPX_headerAccessories?(x=(0,s.jsxs)(`div`,{className:`text-md flex min-w-0 items-center gap-2 truncate text-base electron:font-medium`,children:[v,y,b,CPX_headerAccessories,l]}),t[8]=l,t[9]=v,t[10]=y,t[11]=b,t[21]=CPX_headerAccessories,t[12]=x):x=t[12]",
+    "thread page header accessory mount anchor",
+  );
+  return patched;
+}
 
-const codexPlusAppearanceSettingsHelpers = `
-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 patchLocalConversationPageHeader(text) {
+  let patched = replaceOnce(
+    text,
+    "function Tt(e){let t=(0,Y.c)(42),",
+    `${threadHeaderHook()}function Tt(e){let t=(0,Y.c)(45),`,
+    "local conversation header helper insertion anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "let t=(0,Y.c)(45),{conversationId:n,getConversationMarkdown:r,markdownParentConversationId:a,title:o,titleSuffix:s,cwd:c,canPin:l,hideProjectMetadata:d,hideForkActions:f}=e,p=l===void 0?!0:l,m=d===void 0?!1:d,h=A(),g;",
+    "let t=(0,Y.c)(45),{conversationId:n,getConversationMarkdown:r,markdownParentConversationId:a,title:o,titleSuffix:s,cwd:c,canPin:l,hideProjectMetadata:d,hideForkActions:f}=e,CPX_headerContext={cwd:c,hostId:u(i(O,n)).id,header:{surface:`local-conversation`,titleText:typeof o==`string`?o:null}},CPX_headerAccessories=CPXThreadHeaderAccessories({context:CPX_headerContext,deps:{jsx:Z.jsx,jsxs:Z.jsxs}}),p=l===void 0?!0:l,m=d===void 0?!1:d,h=A(),g;",
+    "local conversation header accessory render anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "t[38]!==F||t[39]!==I||t[40]!==L?(z=(0,Z.jsx)(`div`,{className:`draggable grid w-full min-w-0 grid-cols-[minmax(0,1fr)] items-center gap-x-4 electron:h-toolbar extension:py-row-y`,children:(0,Z.jsxs)(`div`,{className:`flex min-w-0 items-center gap-2 truncate text-base electron:font-medium`,children:[F,I,L,R]})}),t[38]=F,t[39]=I,t[40]=L,t[41]=z):z=t[41]",
+    "t[38]!==F||t[39]!==I||t[40]!==L||t[42]!==CPX_headerAccessories?(z=(0,Z.jsx)(`div`,{className:`draggable grid w-full min-w-0 grid-cols-[minmax(0,1fr)] items-center gap-x-4 electron:h-toolbar extension:py-row-y`,children:(0,Z.jsxs)(`div`,{className:`flex min-w-0 items-center gap-2 truncate text-base electron:font-medium`,children:[F,I,L,CPX_headerAccessories,R]})}),t[38]=F,t[39]=I,t[40]=L,t[42]=CPX_headerAccessories,t[41]=z):z=t[41]",
+    "local conversation header accessory mount anchor",
+  );
+  return patched;
+}
 
 function patchGeneralSettingsUserBubbleColors(text) {
   let patched = replaceOnce(
     text,
     "function tn({showCodeFont:e,showTranslucentSidebarToggle:t,variant:n}){",
-    `${codexPlusAppearanceSettingsHelpers}function tn({showCodeFont:e,showTranslucentSidebarToggle:t,variant:n}){`,
+    `${appearanceSettingsHook()}function tn({showCodeFont:e,showTranslucentSidebarToggle:t,variant:n}){`,
     "user bubble settings helper insertion anchor",
   );
   return replaceOnce(
@@ -405,20 +488,17 @@ function patchGeneralSettingsUserBubbleColors(text) {
   );
 }
 
-const codexPlusUserBubbleHelpers = `
-${codexPlusProjectColorHelpers}function CPX_installHostSurfaceProps(){}CPX_installHostSurfaceProps();`;
-
 function patchUserMessageAttachmentsBubbleColors(text) {
   let patched = replaceOnce(
     text,
     "var Z=i(),Q=e(n(),1),$=r();function Ue(e){",
-    `var Z=i(),Q=e(n(),1),$=r();${codexPlusUserBubbleHelpers}function Ue(e){`,
+    `var Z=i(),Q=e(n(),1),$=r();${messageComposerHook()}function Ue(e){`,
     "user bubble helper insertion anchor",
   );
   patched = replaceOnce(
     patched,
     "Se=W?(0,$.jsx)(`div`,{className:`w-full p-px`,children:(0,$.jsx)(it,{cwd:T??null,hostId:k,initialMessage:U.trim(),onCancel:()=>{q(null)},onDraftChange:e=>{q(e)},onSubmit:ge})}):le?(0,$.jsx)(`div`,{\"data-user-message-bubble\":!0,role:H?`button`:void 0,tabIndex:0,className:D(e,`text-left focus-visible:ring-2 focus-visible:ring-token-focus-border focus-visible:outline-none`,H&&`cursor-interaction`),",
-    "Se=W?(0,$.jsx)(`div`,{className:`w-full p-px`,children:(0,$.jsx)(it,{cwd:T??null,hostId:k,initialMessage:U.trim(),onCancel:()=>{q(null)},onDraftChange:e=>{q(e)},onSubmit:ge})}):le?(0,$.jsx)(`div`,{\"data-user-message-bubble\":!0,...CPXHostUserBubbleProps({}),role:H?`button`:void 0,tabIndex:0,className:D(e,`text-left focus-visible:ring-2 focus-visible:ring-token-focus-border focus-visible:outline-none`,H&&`cursor-interaction`),",
+    "Se=W?(0,$.jsx)(`div`,{className:`w-full p-px`,children:(0,$.jsx)(it,{cwd:T??null,hostId:k,initialMessage:U.trim(),onCancel:()=>{q(null)},onDraftChange:e=>{q(e)},onSubmit:ge})}):le?(0,$.jsx)(`div`,{\"data-user-message-bubble\":!0,...CPXBubbleProps({}),role:H?`button`:void 0,tabIndex:0,className:D(e,`text-left focus-visible:ring-2 focus-visible:ring-token-focus-border focus-visible:outline-none`,H&&`cursor-interaction`),",
     "user bubble marker attribute anchor",
   );
   return replaceOnce(
@@ -444,8 +524,8 @@ function patchUserMessageAttachmentsProjectColors(text) {
   );
   return replaceOnce(
     patched,
-    "\"data-user-message-bubble\":!0,...CPXHostUserBubbleProps({}),role:H?`button`:void 0,",
-    "\"data-user-message-bubble\":!0,...CPXHostUserBubbleProps({project:CPX_userMessageProjectId}),role:H?`button`:void 0,",
+    "\"data-user-message-bubble\":!0,...CPXBubbleProps({}),role:H?`button`:void 0,",
+    "\"data-user-message-bubble\":!0,...CPXBubbleProps({project:CPX_userMessageProjectId}),role:H?`button`:void 0,",
     "user bubble project marker attribute anchor",
   );
 }
@@ -454,13 +534,13 @@ function patchComposerBubbleColors(text) {
   let patched = replaceOnce(
     text,
     "function oh(e){let t=(0,$.c)(13),",
-    `${codexPlusUserBubbleHelpers}function oh(e){let t=(0,$.c)(14),`,
+    `${messageComposerHook()}function oh(e){let t=(0,$.c)(14),`,
     "composer user bubble helper insertion anchor",
   );
   patched = replaceOnce(
     patched,
     "function oh(e){let t=(0,$.c)(14),{children:n,className:r,externalFooterVariant:i,inert:a,isDragActive:o,layout:s,onDragEnter:c,onDragLeave:l,onDragOver:u,onDrop:d}=e,",
-    "function oh(e){let t=(0,$.c)(14),{children:n,className:r,externalFooterVariant:i,inert:a,isDragActive:o,layout:s,onDragEnter:c,onDragLeave:l,onDragOver:u,onDrop:d,codexPlusProps:CPX_hostSurfaceProps}=e,CPX_surfaceProps=CPX_hostSurfaceProps??CPXHostComposerSurfaceProps({}),",
+    "function oh(e){let t=(0,$.c)(14),{children:n,className:r,externalFooterVariant:i,inert:a,isDragActive:o,layout:s,onDragEnter:c,onDragLeave:l,onDragOver:u,onDrop:d,codexPlusProps:CPX_hostSurfaceProps}=e,CPX_surfaceProps=CPX_hostSurfaceProps??CPXSurfaceProps({}),",
     "composer host surface props anchor",
   );
   patched = replaceOnce(
@@ -482,7 +562,7 @@ function patchComposerProjectColors(text) {
   patched = replaceOnce(
     patched,
     anchors.composerProjectStyleCaller,
-    anchors.composerProjectStyleCaller.replace(";return", ",CPX_composerThreadProjectId=a(CPX_threadProjectId,G==null?null:CPX_localThreadKey(G)),CPX_composerSurfaceProps=CPXHostComposerSurfaceProps({project:G==null?On?{hostId:On.hostId,path:On.remotePath,projectId:kn,label:On.label??On.name}:x??void 0:CPX_composerThreadProjectId});return"),
+    anchors.composerProjectStyleCaller.replace(";return", ",CPX_composerThreadProjectId=a(CPX_threadProjectId,G==null?null:CPX_localThreadKey(G)),CPX_composerSurfaceProps=CPXSurfaceProps({project:G==null?On?{hostId:On.hostId,path:On.remotePath,projectId:kn,label:On.label??On.name}:x??void 0:CPX_composerThreadProjectId});return"),
     "composer project style hook-safe caller anchor",
   );
   return replaceOnce(
@@ -497,7 +577,7 @@ function patchElectronMenuShortcuts(text) {
   return replaceOnce(
     text,
     "{id:`toggleSidebar`,titleIntlId:`codex.command.toggleSidebar`,descriptionIntlId:`codex.commandDescription.toggleSidebar`,commandMenuGroupKey:`panels`,commandMenu:!0,electron:{menuTitle:`Toggle Sidebar`,menuTitleIntlId:`codex.commandMenuTitle.toggleSidebar`,defaultKeybindings:[{key:`CmdOrCtrl+B`}]}},{id:`toggleBottomPanel`,",
-    "{id:`toggleSidebar`,titleIntlId:`codex.command.toggleSidebar`,descriptionIntlId:`codex.commandDescription.toggleSidebar`,commandMenuGroupKey:`panels`,commandMenu:!0,electron:{menuTitle:`Toggle Sidebar`,menuTitleIntlId:`codex.commandMenuTitle.toggleSidebar`,defaultKeybindings:[{key:`CmdOrCtrl+B`}]}},...(window.CodexPlus?.ui?.commands?.commandMetadata?.()??[]),{id:`toggleBottomPanel`,",
+    "{id:`toggleSidebar`,titleIntlId:`codex.command.toggleSidebar`,descriptionIntlId:`codex.commandDescription.toggleSidebar`,commandMenuGroupKey:`panels`,commandMenu:!0,electron:{menuTitle:`Toggle Sidebar`,menuTitleIntlId:`codex.commandMenuTitle.toggleSidebar`,defaultKeybindings:[{key:`CmdOrCtrl+B`}]}},{id:`codexPlus.focusProjectSelector`,title:`Focus project selector`,description:`Focus or open the new chat project selector`,commandMenuGroupKey:`workspace`,commandMenu:!0,electron:{menuTitle:`Focus project selector`,defaultKeybindings:[{key:`CmdOrCtrl+.`}]}},...(window.CodexPlus?.ui?.commands?.commandMetadata?.()?.filter?.(e=>e.id!==`codexPlus.focusProjectSelector`)??[]),{id:`toggleBottomPanel`,",
     "sidebar blur command palette metadata anchor",
   );
 }
@@ -515,13 +595,13 @@ function patchLocalTaskRow(text) {
   let patched = replaceOnce(
     text,
     "function fn(e){let t=(0,K.c)(124),",
-    `${codexPlusProjectColorHelpers}function fn(e){let t=(0,K.c)(124),`,
+    `${projectColorHook()}function fn(e){let t=(0,K.c)(124),`,
     "local task row project color helper insertion anchor",
   );
   patched = replaceOnce(
     patched,
     "threadSummary:Ne,dataAttributes:Fe}=e,Ie=g===void 0?!1:g,",
-    "threadSummary:Ne,dataAttributes:Fe}=e,CPX_rowDataAttributes=Fe??CPXHostProjectRowProps(Oe),Ie=g===void 0?!1:g,",
+    "threadSummary:Ne,dataAttributes:Fe}=e,CPX_rowDataAttributes=Fe??CPXPR(Oe),Ie=g===void 0?!1:g,",
     "local task row project assignment anchor",
   );
   patched = replaceOnce(
@@ -548,7 +628,7 @@ function patchMermaidDiagramShell(text) {
   let patched = replaceOnce(
     text,
     "function d(e){let t=(0,s.c)(18),{Renderer:n,className:r,code:i,fallback:d,isCodeFenceOpen:f,wideBlockKind:p}=e,",
-    `${codexPlusMermaidHelpers}function d(e){let t=(0,s.c)(18),{Renderer:n,className:r,code:i,fallback:d,isCodeFenceOpen:f,wideBlockKind:p}=e,`,
+    `${mermaidDiagramHook()}function d(e){let t=(0,s.c)(18),{Renderer:n,className:r,code:i,fallback:d,isCodeFenceOpen:f,wideBlockKind:p}=e,`,
     "mermaid diagram shell helper insertion anchor",
   );
   return replaceOnce(
@@ -572,17 +652,38 @@ function patchMainNativeBridge(text) {
   let patched = replaceOnce(
     text,
     "function z1(e){return a.ipcMain.handle(Tl,async(t,n)=>{",
-    `${codexPlusNativeMainHelpers}function z1(e){return a.ipcMain.handle(Tl,async(t,n)=>{`,
+    `${nativeMainHook()}function z1(e){return a.ipcMain.handle(Tl,async(t,n)=>{`,
     "codex plus native main helper insertion anchor",
   );
   return replaceOnce(
     patched,
     "v0({buildFlavor:i,getContextForWebContents:N.getContextForWebContents,isTrustedIpcEvent:te,usesOwlAppShell:y}),a.ipcMain.on(kl,",
-    "v0({buildFlavor:i,getContextForWebContents:N.getContextForWebContents,isTrustedIpcEvent:te,usesOwlAppShell:y}),CPXRegisterNativeRequest({isTrustedIpcEvent:te}),a.ipcMain.on(kl,",
+    "v0({buildFlavor:i,getContextForWebContents:N.getContextForWebContents,isTrustedIpcEvent:te,usesOwlAppShell:y}),CPXNative.registerNativeRequest({isTrustedIpcEvent:te}),a.ipcMain.on(kl,",
     "codex plus native main registration anchor",
   );
 }
 
+function patchMainMenuDiagnostics(text) {
+  let patched = replaceOnce(
+    text,
+    "He={...b(`toggleSidePanel`),click:async()=>{let e=await y();e&&_.sendMessageToWindow(e,{type:`toggle-diff-panel`})}},Ue=",
+    "He={...b(`toggleSidePanel`),click:async()=>{let e=await y();e&&_.sendMessageToWindow(e,{type:`toggle-diff-panel`})}},Ue=",
+    "codex plus menu template helper presence anchor",
+  );
+  patched = replaceOnce(
+    patched,
+    "He,We,{type:`separator`}",
+    "He,We,...CPXNative.templateItems(`view-menu`),{type:`separator`}",
+    "codex plus view menu template items anchor",
+  );
+  return replaceOnce(
+    patched,
+    "me.refreshApplicationMenu(),w(`application menu refreshed`,A),",
+    "CPXNative.setRefreshApplicationMenu(()=>me.refreshApplicationMenu()),me.refreshApplicationMenu(),CPXNative.logMenuDiagnostics(),w(`application menu refreshed`,A),",
+    "codex plus menu diagnostics refresh anchor",
+  );
+}
+
 return makePatchSet({
     id: config.id,
     codexVersion: config.codexVersion,
@@ -636,6 +737,14 @@ return makePatchSet({
         [composerFile, patchComposerProjectColors],
       ],
     },
+    ...(headerFile ? [{
+      id: "project-path-header",
+      fileTransforms: [
+        [headerFile, patchHeader],
+        ...(threadPageHeaderFile ? [[threadPageHeaderFile, patchThreadPageHeader]] : []),
+        ...(localConversationPageFile ? [[localConversationPageFile, patchLocalConversationPageHeader]] : []),
+      ],
+    }] : []),
     {
       id: "sidebar-name-blur",
       fileTransforms: [
@@ -644,11 +753,19 @@ return makePatchSet({
         [keyboardShortcutsSearchInputFile, patchKeyboardShortcutsSearchInput],
       ],
     },
-    ...(mermaidDiagramShellFile ? [{
+    {
+      id: "project-selector-shortcut",
+      fileTransforms: [
+        [localActiveWorkspaceRootDropdownFile, patchLocalActiveWorkspaceRootDropdownProjectSelectorShortcut],
+        [runCommandFile, patchRunCommandProjectSelectorShortcut],
+      ],
+    },
+    ...(mainFile ? [{
       id: "codex-plus-native-bridge",
       fileTransforms: [
         [preloadFile, patchPreloadNativeBridge],
         [mainFile, patchMainNativeBridge],
+        ...(electronCommandSourceFile ? [[mainFile, patchMainMenuDiagnostics]] : []),
       ],
     }] : []),
     ...(mermaidDiagramShellFile ? [{

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

@@ -0,0 +1,7 @@
+function aboutMetadataRequire() {
+  return 'require("./codex-plus-aboutMetadata.js")';
+}
+
+module.exports = {
+  aboutMetadataRequire,
+};

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

@@ -0,0 +1,7 @@
+function diagnosticDetailsHook() {
+  return "function CPXDiagnosticDetails(e){return window.CodexPlus?.ui?.errors?.renderDetails?.(e)??null}";
+}
+
+module.exports = {
+  diagnosticDetailsHook,
+};

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

@@ -0,0 +1,7 @@
+function mermaidDiagramHook() {
+  return "function CPXMermaidDiagramProps(e){return window.CodexPlus?.ui?.mermaid?.diagramProps?.(e)}";
+}
+
+module.exports = {
+  mermaidDiagramHook,
+};

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

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

package/src/patches/lib/hooks/native-main.js

@@ -0,0 +1,7 @@
+function nativeMainHook() {
+  return 'let CPXNative=require("./codex-plus-native-main.js").create({electron:a});';
+}
+
+module.exports = {
+  nativeMainHook,
+};

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

@@ -0,0 +1,12 @@
+function projectSelectorSearchHook() {
+  return "let CPXP=window.CodexPlusHost.adapters.projectSelector;";
+}
+
+function projectSelectorTriggerHook() {
+  return "function CPXPST(e,t){return CPXP.trigger(e,t,Me)}";
+}
+
+module.exports = {
+  projectSelectorSearchHook,
+  projectSelectorTriggerHook,
+};

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

@@ -0,0 +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]);";
+}
+
+module.exports = {
+  reviewHook,
+};

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

@@ -0,0 +1,12 @@
+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 commandMenuItemsExpression(group, jsx, menuItem, register) {
+  return `window.CodexPlus?.ui?.commands?.renderMenuItems?.({group:\`${group}\`,deps:{jsx:${jsx},MenuItem:${menuItem},register:${register}}})??[]`;
+}
+
+module.exports = {
+  appearanceSettingsHook,
+  commandMenuItemsExpression,
+};

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

@@ -0,0 +1,12 @@
+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})`;
+}
+
+module.exports = {
+  projectColorHook,
+  sidebarMergeDataAttributes,
+};

package/src/patches/lib/hooks/thread-header.js

@@ -0,0 +1,7 @@
+function threadHeaderHook() {
+  return "let CPXTH=window.CodexPlusHost.adapters.threadHeader;function CPXThreadHeaderAccessories(e){return CPXTH.accessories(e.context,e.deps)}";
+}
+
+module.exports = {
+  threadHeaderHook,
+};

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

@@ -0,0 +1,7 @@
+function workerHook() {
+  return 'const CPXW=require("./codex-plus-worker.js"),CPXT=e=>CPXW.traceRequest(e),CPXR=(e,t,n,r)=>CPXW.repositoryTargetsFromHost(e,t,n,r,pae),CPXB=(e,t)=>CPXW.isReadOnlyBranchRequest(e,t);';
+}
+
+module.exports = {
+  workerHook,
+};