moving
This commit is contained in:
@@ -76,8 +76,15 @@ export const codexAdapter: EventAdapter = {
|
||||
extractParent(payload): string | undefined {
|
||||
return pickStringField(payload, 'parent_frame_id', 'prompt_frame_id');
|
||||
},
|
||||
// formatInject omitted ⇒ the shared SessionStart body uses CC's default
|
||||
// hookSpecificOutput shape (codex honors the CC inject convention).
|
||||
|
||||
formatInject(additionalContext): unknown {
|
||||
return {
|
||||
hookSpecificOutput: {
|
||||
hookEventName: 'SessionStart',
|
||||
additionalContext,
|
||||
},
|
||||
};
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
import {
|
||||
isDirectExecution,
|
||||
makePreCompactHandler,
|
||||
runHook,
|
||||
type HookRunOptions,
|
||||
@@ -20,15 +21,6 @@ export async function runPreCompact(opts: Partial<HookRunOptions> = {}): Promise
|
||||
});
|
||||
}
|
||||
|
||||
const isMain = (() => {
|
||||
try {
|
||||
if (typeof process.argv[1] !== 'string') return false;
|
||||
const url = new URL(`file://${process.argv[1].replace(/\\/g, '/')}`);
|
||||
return url.href === import.meta.url;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
})();
|
||||
if (isMain) {
|
||||
if (isDirectExecution(import.meta.url)) {
|
||||
void runPreCompact();
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
*/
|
||||
|
||||
import {
|
||||
isDirectExecution,
|
||||
makeSessionStartHandler,
|
||||
runHook,
|
||||
type HookRunOptions,
|
||||
@@ -23,15 +24,6 @@ export async function runSessionStart(opts: Partial<HookRunOptions> = {}): Promi
|
||||
});
|
||||
}
|
||||
|
||||
const isMain = (() => {
|
||||
try {
|
||||
if (typeof process.argv[1] !== 'string') return false;
|
||||
const url = new URL(`file://${process.argv[1].replace(/\\/g, '/')}`);
|
||||
return url.href === import.meta.url;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
})();
|
||||
if (isMain) {
|
||||
if (isDirectExecution(import.meta.url)) {
|
||||
void runSessionStart();
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
import {
|
||||
isDirectExecution,
|
||||
makeStopHandler,
|
||||
runHook,
|
||||
type HookRunOptions,
|
||||
@@ -21,15 +22,6 @@ export async function runStop(opts: Partial<HookRunOptions> = {}): Promise<void>
|
||||
});
|
||||
}
|
||||
|
||||
const isMain = (() => {
|
||||
try {
|
||||
if (typeof process.argv[1] !== 'string') return false;
|
||||
const url = new URL(`file://${process.argv[1].replace(/\\/g, '/')}`);
|
||||
return url.href === import.meta.url;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
})();
|
||||
if (isMain) {
|
||||
if (isDirectExecution(import.meta.url)) {
|
||||
void runStop();
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
*/
|
||||
|
||||
import {
|
||||
isDirectExecution,
|
||||
makeUserPromptSubmitHandler,
|
||||
runHook,
|
||||
type HookRunOptions,
|
||||
@@ -19,15 +20,6 @@ export async function runUserPromptSubmit(opts: Partial<HookRunOptions> = {}): P
|
||||
});
|
||||
}
|
||||
|
||||
const isMain = (() => {
|
||||
try {
|
||||
if (typeof process.argv[1] !== 'string') return false;
|
||||
const url = new URL(`file://${process.argv[1].replace(/\\/g, '/')}`);
|
||||
return url.href === import.meta.url;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
})();
|
||||
if (isMain) {
|
||||
if (isDirectExecution(import.meta.url)) {
|
||||
void runUserPromptSubmit();
|
||||
}
|
||||
|
||||
@@ -25,7 +25,6 @@ import { dirname } from 'node:path';
|
||||
import { createLogger, type Logger } from '@waggle/hive-mind-shim-core';
|
||||
import {
|
||||
backupByteIdentical,
|
||||
hookCommandFor,
|
||||
hookScriptPath,
|
||||
jsonRegister,
|
||||
normalizeCliPath,
|
||||
@@ -34,7 +33,13 @@ import {
|
||||
type JsonRegisterEntry,
|
||||
type Lifecycle,
|
||||
} from '@waggle/hive-mind-hooks-core';
|
||||
import { resolvePaths, allHookBasenames, type CodexPaths, type ResolvePathsOptions } from './paths.js';
|
||||
import {
|
||||
resolvePaths,
|
||||
allHookBasenames,
|
||||
hookCommandFor,
|
||||
type CodexPaths,
|
||||
type ResolvePathsOptions,
|
||||
} from './paths.js';
|
||||
import { codexRegisterSpec } from './adapter.js';
|
||||
|
||||
export interface InstallResult {
|
||||
|
||||
@@ -5,15 +5,17 @@
|
||||
* Codex's standalone `~/.codex/hooks.json` (NOT `~/.codex/config.toml` —
|
||||
* we stay out of the user's TOML and away from protected
|
||||
* `notify`/`profile`/`model_providers` keys). The Windows-safe backup
|
||||
* path + `--cli-path` quoting + hooks-dir resolution are reused verbatim
|
||||
* from `@waggle/hive-mind-hooks-core` so codex reads like the reference.
|
||||
* path + hooks-dir resolution reuse `@waggle/hive-mind-hooks-core`. Codex
|
||||
* needs its own Windows command encoder because its Rust runtime passes the
|
||||
* whole handler string through the selected host shell (PowerShell for a
|
||||
* normal local thread, with `cmd.exe /C` as the fallback).
|
||||
*/
|
||||
|
||||
import { homedir } from 'node:os';
|
||||
import { join, resolve } from 'node:path';
|
||||
import { join, resolve, win32 } from 'node:path';
|
||||
import {
|
||||
backupPathFor,
|
||||
hookCommandFor,
|
||||
hookCommandFor as sharedHookCommandFor,
|
||||
hooksDirFromModuleUrl,
|
||||
} from '@waggle/hive-mind-hooks-core';
|
||||
|
||||
@@ -69,5 +71,77 @@ export function resolvePaths(opts: ResolvePathsOptions = {}): CodexPaths {
|
||||
return { codexDir, configPath, pointerPath, hooksDir };
|
||||
}
|
||||
|
||||
/** Re-export the shared Windows-safe helpers so codex modules read like CC. */
|
||||
export { backupPathFor, hookCommandFor };
|
||||
export interface HookCommandOptions {
|
||||
/** Explicit seam for cross-platform command-shape tests. */
|
||||
platform?: NodeJS.Platform;
|
||||
/** Explicit Windows runtime seam; production normally uses the launcher env override. */
|
||||
nodePath?: string;
|
||||
/** Explicit Windows root seam; production reads the OS-provided SystemRoot. */
|
||||
systemRoot?: string;
|
||||
}
|
||||
|
||||
function powershellLiteral(value: string): string {
|
||||
return `'${value.replaceAll("'", "''")}'`;
|
||||
}
|
||||
|
||||
function windowsPowerShellPath(systemRoot?: string): string {
|
||||
const root = win32.normalize(
|
||||
systemRoot?.trim()
|
||||
|| process.env.SystemRoot?.trim()
|
||||
|| 'C:\\Windows',
|
||||
);
|
||||
if (!/^[A-Za-z]:\\[A-Za-z0-9._\\-]+$/.test(root)) {
|
||||
throw new Error('Windows SystemRoot must be an absolute shell-safe path');
|
||||
}
|
||||
return win32.join(root, 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe');
|
||||
}
|
||||
|
||||
function windowsHookCommand(
|
||||
nodePath: string,
|
||||
scriptPath: string,
|
||||
cliPath?: string,
|
||||
systemRoot?: string,
|
||||
): string {
|
||||
const args = [nodePath, scriptPath];
|
||||
if (cliPath && cliPath.length > 0) args.push('--cli-path', cliPath);
|
||||
|
||||
const script = [
|
||||
"$ErrorActionPreference = 'Stop'",
|
||||
'try {',
|
||||
` & ${args.map(powershellLiteral).join(' ')}`,
|
||||
' if ($null -eq $LASTEXITCODE) { exit 1 }',
|
||||
' exit $LASTEXITCODE',
|
||||
'} catch {',
|
||||
' [Console]::Error.WriteLine($_.Exception.Message)',
|
||||
' exit 1',
|
||||
'}',
|
||||
].join('\r\n');
|
||||
const encoded = Buffer.from(script, 'utf16le').toString('base64');
|
||||
return `${windowsPowerShellPath(systemRoot)} -NoLogo -NoProfile -NonInteractive -EncodedCommand ${encoded}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a Codex command that survives the host's exact shell dispatch.
|
||||
* POSIX keeps the shared `node "script" --cli-path "cli"` contract. On
|
||||
* Windows the trusted invocation is UTF-16LE encoded inside PowerShell so
|
||||
* both Codex's PowerShell host and its `cmd.exe /C` fallback can parse the
|
||||
* same command. The system PowerShell path is resolved to a validated
|
||||
* absolute literal so an untrusted workspace cannot win command lookup with
|
||||
* a repo-local `powershell.exe`.
|
||||
*/
|
||||
export function hookCommandFor(
|
||||
scriptPath: string,
|
||||
cliPath?: string,
|
||||
opts: HookCommandOptions = {},
|
||||
): string {
|
||||
if ((opts.platform ?? process.platform) !== 'win32') {
|
||||
return sharedHookCommandFor(scriptPath, cliPath);
|
||||
}
|
||||
|
||||
const nodePath = opts.nodePath?.trim()
|
||||
|| process.env.WAGGLE_HOOK_NODE_PATH?.trim()
|
||||
|| process.execPath;
|
||||
return windowsHookCommand(nodePath, scriptPath, cliPath, opts.systemRoot);
|
||||
}
|
||||
|
||||
export { backupPathFor };
|
||||
|
||||
Reference in New Issue
Block a user