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

fix(codex): resolve grant entry from __dirname so plain-node CLI entries stay electron-free

Browse Source 
The build guard rejects any electron require reachable from plain-node
entries; the bridge now maps app.asar to app.asar.unpacked by string
replacement instead of consulting electron app paths. CLI typecheck project
lists the new trust-grant module graph.
This commit is contained in:
Brennan Benson
2026-07-15 12:59:47 -07:00
parent 5c68a50385
commit 442cde8d99
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/tsconfig.cli.json
+4 -4
View File
@@ -11,14 +11,14 @@
"../src/main/antigravity/hook-service.ts",
"../src/main/claude/hook-settings.ts",
"../src/main/claude/hook-service.ts",
"../src/main/codex/codex-config-mirror.ts",
"../src/main/codex/codex-config-path-reference-rewrite.ts",
"../src/main/codex/codex-home-paths.ts",
"../src/main/codex/codex-hook-identity.ts",
"../src/main/codex/codex-app-server-capability-cache.ts",
"../src/main/codex/codex-app-server-client.ts",
"../src/main/codex/codex-app-server-grant-bridge.ts",
"../src/main/codex/codex-app-server-grant-envelope.ts",
"../src/main/codex/codex-config-mirror.ts",
"../src/main/codex/codex-config-path-reference-rewrite.ts",
"../src/main/codex/codex-home-paths.ts",
"../src/main/codex/codex-hook-identity.ts",
"../src/main/codex/codex-hook-trust-grant.ts",
"../src/main/codex/codex-trust-config-rollback.ts",
"../src/main/codex/codex-trust-grant-ledger.ts",
src/main/codex/codex-app-server-grant-bridge.ts
+11 -13
View File
@@ -24,19 +24,17 @@ const GRANT_ENTRY_MAX_BUFFER_BYTES = 16 * 1024 * 1024
export function resolveCodexGrantEntryPath(
pathExists: (candidate: string) => boolean = existsSync
): string | null {
// Why: this module is also bundled into a plain-Node CLI entry, so entry
// discovery cannot import Electron. Replacing the module's own asar segment
// finds the unpacked sibling in packaged builds and is a no-op in dev.
const unpackedModuleDir = __dirname.replace('app.asar', 'app.asar.unpacked')
const resourcesPath = (process as NodeJS.Process & { resourcesPath?: string }).resourcesPath
const candidates = [
resourcesPath
? join(resourcesPath, 'app.asar.unpacked', 'out', 'main', 'codex', GRANT_ENTRY_FILE_NAME)
: null,
join(unpackedModuleDir, 'codex', GRANT_ENTRY_FILE_NAME),
join(unpackedModuleDir, '..', 'codex', GRANT_ENTRY_FILE_NAME)
].filter((candidate): candidate is string => candidate !== null)
for (const candidate of candidates) {
// Why: resolved from __dirname (not electron's app paths) so this module
// stays loadable in plain-node CLI entries — the build guard rejects any
// electron require reachable from them. The emitted bridge chunk sits in
// out/main or out/main/chunks, so the entry is one or two levels up.
// ELECTRON_RUN_AS_NODE bypasses asar integration, so packaged builds must
// run the copy under app.asar.unpacked (out/main/codex/** is asarUnpacked).
const baseDirs = [__dirname, join(__dirname, '..')].map((dir) =>
dir.includes('app.asar') ? dir.replace('app.asar', 'app.asar.unpacked') : dir
)
for (const baseDir of baseDirs) {
const candidate = join(baseDir, 'codex', GRANT_ENTRY_FILE_NAME)
if (pathExists(candidate)) {
return candidate
}