starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-10-19 16:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(codex): resolve the trust-grant entry without requiring electron

Browse Source 
The grant bridge is reachable from plain-Node CLI entries, where the
plain-node entry guard rejects any chunk containing require("electron").
Resolve the bundled session entry from __dirname (root chunk and chunks/
layouts) with an app.asar -> app.asar.unpacked rewrite for packaged runs,
instead of electron's app path APIs.
This commit is contained in:
Brennan Benson
2026-07-14 23:26:46 -07:00
parent c3f37e5500
commit c668ab05bc
1 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/codex/codex-app-server-grant-bridge.ts
+15 -30
View File
@@ -39,40 +39,25 @@ const GRANT_ENTRY_FILE_NAME = 'codex-app-server-grant-entry.js'
const GRANT_ENTRY_TIMEOUT_MARGIN_MS = 5_000
const GRANT_ENTRY_MAX_BUFFER_BYTES = 16 * 1024 * 1024
function loadElectronApp(): { getAppPath(): string; isPackaged: boolean } | null {
try {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return (
(require('electron') as { app?: { getAppPath(): string; isPackaged: boolean } }).app ?? null
)
} catch {
return null
}
}
export function resolveCodexGrantEntryPath(
pathExists: (candidate: string) => boolean = existsSync
): string | null {
const app = loadElectronApp()
let appPath: string | undefined
try {
appPath = app?.getAppPath()
} catch {
appPath = undefined
}
// Why: ELECTRON_RUN_AS_NODE bypasses Electron's asar integration, so the
// Why: this module is reachable from plain-Node CLI entries, so it must not
// require electron (plain-node-entry-guard). __dirname of the built chunk is
// out/main (root chunk) or out/main/chunks; the entry sits at
// out/main/codex/. ELECTRON_RUN_AS_NODE bypasses asar integration, so the
// packaged entry must run from app.asar.unpacked (out/main/codex/** is in
// the asarUnpack list).
const unpackedAppPath =
app?.isPackaged && appPath ? appPath.replace('app.asar', 'app.asar.unpacked') : appPath
const candidates = [
// Dev/E2E: electron-vite's appPath is already out/main.
unpackedAppPath ? join(unpackedAppPath, 'codex', GRANT_ENTRY_FILE_NAME) : null,
unpackedAppPath ? join(unpackedAppPath, 'out', 'main', 'codex', GRANT_ENTRY_FILE_NAME) : null,
// Plain-node CLI context (no electron): resolve relative to this chunk.
join(__dirname, 'codex', GRANT_ENTRY_FILE_NAME),
join(__dirname, '..', 'codex', GRANT_ENTRY_FILE_NAME)
].filter((candidate): candidate is string => candidate !== null)
// the asarUnpack list) — cover that with a path rewrite instead of app APIs.
const chunkDirs = [__dirname, join(__dirname, '..')]
const candidates = chunkDirs.flatMap((dir) => {
const unpackedDir = dir.includes('app.asar')
? dir.replace('app.asar', 'app.asar.unpacked')
: null
return [
...(unpackedDir ? [join(unpackedDir, 'codex', GRANT_ENTRY_FILE_NAME)] : []),
join(dir, 'codex', GRANT_ENTRY_FILE_NAME)
]
})
for (const candidate of candidates) {
if (pathExists(candidate)) {
return candidate