oh-my-codex 0.17.3 → 0.18.1

package/src/scripts/notify-hook/team-worker-stop.ts

@@ -8,12 +8,12 @@
 
 import { appendFile, mkdir, rename, writeFile } from 'fs/promises';
 import { dirname, join } from 'path';
-import { DEFAULT_MARKER } from '../tmux-hook-engine.js';
+import { DEFAULT_MARKER, paneHasActiveTask } from '../tmux-hook-engine.js';
 import { appendTeamDeliveryLog } from '../../team/delivery-log.js';
 import { safeString, asNumber } from './utils.js';
 import { readJsonIfExists } from './state-io.js';
 import { logTmuxHookEvent } from './log.js';
-import { evaluatePaneInjectionReadiness, sendPaneInput } from './team-tmux-guard.js';
+import { evaluatePaneInjectionReadiness, queuePaneInput, sendPaneInput } from './team-tmux-guard.js';
 import { resolvePaneTarget } from './tmux-injection.js';
 import { readTeamWorkersForIdleCheck } from './team-worker.js';
 
@@ -185,17 +185,28 @@ export async function maybeNudgeLeaderForAllowedWorkerStop({
     + DEFAULT_MARKER;
 
   try {
-    const sendResult = await sendPaneInput({
-      paneTarget: tmuxTarget,
-      prompt,
-      submitKeyPresses: 2,
-      submitDelayMs: 100,
-    });
-    if (!sendResult.ok) throw new Error(sendResult.error || sendResult.reason || 'send_failed');
+    const leaderHasActiveTask = paneHasActiveTask(paneGuard.paneCapture);
+    let deliveryMode = 'sent';
+    if (leaderHasActiveTask) {
+      const sendResult = await queuePaneInput({
+        paneTarget: tmuxTarget,
+        prompt,
+      });
+      if (!sendResult.ok) throw new Error(sendResult.error || sendResult.reason || 'send_failed');
+      deliveryMode = 'queued';
+    } else {
+      const sendResult = await sendPaneInput({
+        paneTarget: tmuxTarget,
+        prompt,
+        submitKeyPresses: 2,
+        submitDelayMs: 100,
+      });
+      if (!sendResult.ok) throw new Error(sendResult.error || sendResult.reason || 'send_failed');
+    }
 
     await writeStopNudgeState(statePath, {
       ...nextState,
-      delivery: 'sent',
+      delivery: deliveryMode,
       leader_pane_id: leaderPaneId || null,
       tmux_target: tmuxTarget,
     });
@@ -205,7 +216,7 @@ export async function maybeNudgeLeaderForAllowedWorkerStop({
       type: 'worker_stop_leader_nudge',
       worker: workerName,
       to_worker: 'leader-fixed',
-      delivery: 'sent',
+      delivery: deliveryMode,
       created_at: nowIso,
       source_type: SOURCE_TYPE,
     });
@@ -225,10 +236,10 @@ export async function maybeNudgeLeaderForAllowedWorkerStop({
       from_worker: workerName,
       to_worker: 'leader-fixed',
       transport: 'send-keys',
-      result: 'sent',
+      result: deliveryMode,
       reason: 'worker_stop_allowed',
     }).catch(() => {});
-    return { ok: true, result: 'sent' };
+    return { ok: true, result: deliveryMode };
   } catch (err) {
     await recordDeferred({
       stateDir,

package/src/scripts/run-provider-advisor.ts

@@ -83,6 +83,16 @@ function shouldUseClaudeIssuePermissionsBypass(provider: string, prompt: string)
   return ISSUE_WORK_PROMPT_PATTERNS.some((pattern) => pattern.test(trimmed));
 }
 
+function buildProviderLaunchArgs(provider: string, prompt: string, originalTask: string): string[] {
+  const promptArgs = provider === 'claude'
+    ? ['-p', '--', prompt]
+    : ['-p', prompt];
+
+  return shouldUseClaudeIssuePermissionsBypass(provider, originalTask)
+    ? [CLAUDE_SKIP_PERMISSIONS_FLAG, ...promptArgs]
+    : promptArgs;
+}
+
 function buildSummary(exitCode: number, output: string): string {
   if (exitCode === 0) {
     return 'Provider completed successfully. Review the raw output for details.';
@@ -165,9 +175,7 @@ async function main(): Promise<void> {
 
   ensureBinary(binary);
 
-  const launchArgs = shouldUseClaudeIssuePermissionsBypass(provider, originalTask)
-    ? [CLAUDE_SKIP_PERMISSIONS_FLAG, '-p', prompt]
-    : ['-p', prompt];
+  const launchArgs = buildProviderLaunchArgs(provider, prompt, originalTask);
 
   const run = spawnSync(binary, launchArgs, {
     encoding: 'utf8',

package/src/scripts/smoke-packed-install.ts

@@ -1,5 +1,6 @@
 import {
   mkdtempSync,
+  realpathSync,
   rmSync,
 } from 'node:fs';
 import { mkdirSync } from 'node:fs';
@@ -20,6 +21,18 @@ export {
 export const PACKED_INSTALL_SMOKE_CORE_COMMANDS = [
   ['--help'],
   ['version'],
+  ['api', '--help'],
+  ['sparkshell', '--help'],
+] as const;
+
+export const PACKED_INSTALL_NATIVE_HOOK_SMOKE_EVENTS = [
+  'SessionStart',
+  'PreToolUse',
+  'PostToolUse',
+  'UserPromptSubmit',
+  'PreCompact',
+  'PostCompact',
+  'Stop',
 ] as const;
 
 function usage(): string {
@@ -110,6 +123,99 @@ function npmBinName(name: string): string {
   return process.platform === 'win32' ? `${name}.cmd` : name;
 }
 
+function resolveGlobalNodeModules(prefixDir: string): string {
+  const result = run('npm', ['root', '-g', '--prefix', prefixDir], { cwd: prefixDir });
+  const root = String(result.stdout || '').trim();
+  if (!root) throw new Error('npm root -g did not return a node_modules directory');
+  return root;
+}
+
+export function validateHookStdout(eventName: string, stdout: string): void {
+  const trimmed = stdout.trim();
+  if (!trimmed) return;
+  try {
+    JSON.parse(trimmed);
+  } catch (error) {
+    throw new Error(
+      `native hook ${eventName} emitted invalid JSON stdout: ${error instanceof Error ? error.message : String(error)}`,
+    );
+  }
+}
+
+export function buildNativeHookSmokePayload(
+  eventName: typeof PACKED_INSTALL_NATIVE_HOOK_SMOKE_EVENTS[number],
+  smokeCwd: string,
+): Record<string, unknown> {
+  const base = {
+    hook_event_name: eventName,
+    session_id: `packed-install-smoke-${eventName}`,
+    cwd: smokeCwd,
+  };
+  switch (eventName) {
+    case 'SessionStart':
+      return {
+        ...base,
+        transcript_path: join(smokeCwd, 'nonexistent-transcript.jsonl'),
+      };
+    case 'PreToolUse':
+      return {
+        ...base,
+        tool_name: 'Bash',
+        tool_use_id: 'packed-install-smoke-tool',
+        tool_input: { command: 'echo packed install smoke' },
+      };
+    case 'PostToolUse':
+      return {
+        ...base,
+        tool_name: 'Bash',
+        tool_use_id: 'packed-install-smoke-tool',
+        tool_input: { command: 'echo packed install smoke' },
+        tool_response: {
+          exit_code: 0,
+          stdout: 'packed install smoke\n',
+          stderr: '',
+        },
+      };
+    case 'UserPromptSubmit':
+      return {
+        ...base,
+        transcript_path: join(smokeCwd, 'nonexistent-transcript.jsonl'),
+        prompt: 'packed install native hook smoke test',
+      };
+    case 'PreCompact':
+    case 'PostCompact':
+    case 'Stop':
+      return base;
+  }
+}
+
+function smokeInstalledNativeHookDist(prefixDir: string): void {
+  const globalNodeModules = resolveGlobalNodeModules(prefixDir);
+  const packageRoot = join(globalNodeModules, 'oh-my-codex');
+  const hookScript = join(packageRoot, 'dist', 'scripts', 'codex-native-hook.js');
+  const smokeCwd = mkdtempSync(join(tmpdir(), 'omx-packed-hook-smoke-'));
+  try {
+    for (const eventName of PACKED_INSTALL_NATIVE_HOOK_SMOKE_EVENTS) {
+      const payload = buildNativeHookSmokePayload(eventName, smokeCwd);
+      const result = run(process.execPath, [realpathSync(hookScript)], {
+        cwd: smokeCwd,
+        env: {
+          ...process.env,
+          OMX_NATIVE_HOOK_DOCTOR_SMOKE: '1',
+          OMX_ROOT: join(smokeCwd, '.omx-packed-hook-root'),
+          OMX_SESSION_ID: `packed-install-smoke-${eventName}`,
+          OMX_SOURCE_CWD: smokeCwd,
+          OMX_STARTUP_CWD: smokeCwd,
+        },
+        input: JSON.stringify(payload),
+      });
+      validateHookStdout(eventName, result.stdout as string);
+    }
+  } finally {
+    rmSync(smokeCwd, { recursive: true, force: true });
+  }
+}
+
 export function parseNpmPackJsonOutput(stdout: string): Array<{ filename: string }> {
   const start = stdout.lastIndexOf('\n[');
   const jsonText = (start >= 0 ? stdout.slice(start + 1) : stdout).trim();
@@ -145,6 +251,7 @@ async function main(): Promise<void> {
     for (const argv of PACKED_INSTALL_SMOKE_CORE_COMMANDS) {
       run(omxPath, argv, { cwd: repoRoot });
     }
+    smokeInstalledNativeHookDist(prefixDir);
 
     console.log('packed install smoke: PASS');
   } finally {

package/src/scripts/sync-plugin-mirror.ts

@@ -55,7 +55,6 @@ const PLUGIN_NAME = "oh-my-codex";
 const SETUP_OWNED_PLUGIN_MANIFEST_FIELDS = [
 	"agents",
 	"prompts",
-	"hooks",
 ] as const;
 
 async function readJsonFile<T>(path: string): Promise<T> {
@@ -199,13 +198,14 @@ async function assertPluginManifestPolicy(
 	const pkg = await readJsonFile<PackageJson>(join(root, "package.json"));
 	const expectedFields: Pick<
 		PluginManifest,
-		"name" | "version" | "skills" | "mcpServers" | "apps"
+		"name" | "version" | "skills" | "mcpServers" | "apps" | "hooks"
 	> = {
 		name: PLUGIN_NAME,
 		version: pkg.version,
 		skills: "./skills/",
 		mcpServers: "./.mcp.json",
 		apps: "./.app.json",
+		hooks: "./hooks/hooks.json",
 	};
 
 	for (const [field, expectedValue] of Object.entries(expectedFields)) {
@@ -229,7 +229,7 @@ async function assertPluginManifestPolicy(
 					"plugin_bundle_metadata_out_of_sync",
 					"kind=plugin-manifest",
 					`field=${field}`,
-					"message=setup-owned agents/prompts/hooks must not be plugin-scoped",
+					"message=setup-owned agents/prompts must not be plugin-scoped",
 				].join("\n"),
 			);
 		}

package/src/scripts/verify-native-agents.ts

@@ -199,11 +199,11 @@ export async function verifyNativeAgents(
       ? await readPluginManifest(root)
       : options.pluginManifest;
   if (pluginManifest) {
-    for (const field of ["agents", "prompts", "hooks"]) {
+    for (const field of ["agents", "prompts"]) {
       if (pluginManifest[field] !== undefined) {
         throw errorBlock("native_agent_plugin_boundary_violation", {
           field,
-          message: "native agents/prompts/hooks are setup-owned, not plugin-scoped",
+          message: "native agents/prompts are setup-owned, not plugin-scoped",
         });
       }
     }

package/templates/catalog-manifest.json

@@ -108,6 +108,13 @@
       "core": false,
       "internalRequired": false
     },
+    {
+      "name": "best-practice-research",
+      "category": "planning",
+      "status": "active",
+      "core": false,
+      "internalRequired": false
+    },
     {
       "name": "analyze",
       "category": "shortcut",