oh-my-codex 0.19.0 → 0.20.0

package/dist/utils/__tests__/worktree-tool-context.test.js

@@ -0,0 +1,118 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { basename, join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { renderCodeGraphInstructions, resolveWorktreeToolContext, worktreeToolContextEnv, } from '../worktree-tool-context.js';
+async function initRepo() {
+    const cwd = await mkdtemp(join(tmpdir(), 'omx-codegraph-context-'));
+    execFileSync('git', ['init'], { cwd, stdio: 'ignore' });
+    execFileSync('git', ['config', 'user.email', 'test@example.com'], { cwd, stdio: 'ignore' });
+    execFileSync('git', ['config', 'user.name', 'Test User'], { cwd, stdio: 'ignore' });
+    await writeFile(join(cwd, 'README.md'), 'hello\n', 'utf-8');
+    execFileSync('git', ['add', 'README.md'], { cwd, stdio: 'ignore' });
+    execFileSync('git', ['commit', '-m', 'init'], { cwd, stdio: 'ignore' });
+    return cwd;
+}
+async function writeCodeGraphDb(projectPath) {
+    await mkdir(join(projectPath, '.codegraph'), { recursive: true });
+    await writeFile(join(projectPath, '.codegraph', 'codegraph.db'), 'fixture\n', 'utf-8');
+}
+function addWorktree(repo, path, branch) {
+    execFileSync('git', ['worktree', 'add', '-b', branch, path, 'HEAD'], { cwd: repo, stdio: 'ignore' });
+}
+function siblingWorktreePath(repo, name) {
+    return join(repo, '..', `${basename(repo)}-${name}`);
+}
+describe('resolveWorktreeToolContext', () => {
+    it('uses sibling launch worktree with shared leader CodeGraph in auto mode', async () => {
+        const repo = await initRepo();
+        try {
+            await writeCodeGraphDb(repo);
+            const worktree = siblingWorktreePath(repo, 'sibling-launch');
+            addWorktree(repo, worktree, 'feat/sibling-launch');
+            const context = resolveWorktreeToolContext({ cwd: worktree, scope: 'launch', repoRoot: repo, worktreeRoot: worktree, env: {} });
+            assert.equal(context.repoRoot, repo);
+            assert.equal(context.worktreeRoot, worktree);
+            assert.equal(context.codeGraphMode, 'shared');
+            assert.equal(context.codeGraphProjectPath, repo);
+            assert.equal(worktreeToolContextEnv(context).OMX_WORKTREE_SCOPE, 'launch');
+            assert.match(renderCodeGraphInstructions(context), /shared leader index/);
+            assert.match(renderCodeGraphInstructions(context), /not branch-accurate for worktree-only changes/);
+        }
+        finally {
+            await rm(repo, { recursive: true, force: true });
+        }
+    });
+    it('uses nested team leader CodeGraph as shared context', async () => {
+        const repo = await initRepo();
+        try {
+            const leaderWorktree = join(repo, '.omx', 'team', 'parent', 'worktrees', 'worker-1');
+            addWorktree(repo, leaderWorktree, 'parent/worker-1');
+            await writeCodeGraphDb(leaderWorktree);
+            const nestedWorker = join(repo, '.omx', 'team', 'nested', 'worktrees', 'worker-1');
+            addWorktree(repo, nestedWorker, 'nested/worker-1');
+            const context = resolveWorktreeToolContext({
+                cwd: nestedWorker,
+                scope: 'team',
+                repoRoot: leaderWorktree,
+                worktreeRoot: nestedWorker,
+                env: {},
+            });
+            assert.equal(context.codeGraphMode, 'shared');
+            assert.equal(context.codeGraphProjectPath, leaderWorktree);
+            assert.equal(worktreeToolContextEnv(context).OMX_REPO_ROOT, leaderWorktree);
+        }
+        finally {
+            await rm(repo, { recursive: true, force: true });
+        }
+    });
+    it('prefers worktree-local CodeGraph over shared leader CodeGraph', async () => {
+        const repo = await initRepo();
+        try {
+            await writeCodeGraphDb(repo);
+            const worktree = siblingWorktreePath(repo, 'local-precedence');
+            addWorktree(repo, worktree, 'feat/local-precedence');
+            await writeCodeGraphDb(worktree);
+            const context = resolveWorktreeToolContext({ cwd: worktree, scope: 'team', repoRoot: repo, worktreeRoot: worktree, env: {} });
+            assert.equal(context.codeGraphMode, 'local');
+            assert.equal(context.codeGraphProjectPath, worktree);
+            assert.doesNotMatch(renderCodeGraphInstructions(context), /not branch-accurate/);
+        }
+        finally {
+            await rm(repo, { recursive: true, force: true });
+        }
+    });
+    it('turns auto mode off when no CodeGraph database exists', async () => {
+        const repo = await initRepo();
+        try {
+            const worktree = siblingWorktreePath(repo, 'no-codegraph');
+            addWorktree(repo, worktree, 'feat/no-codegraph');
+            const context = resolveWorktreeToolContext({ cwd: worktree, scope: 'launch', repoRoot: repo, worktreeRoot: worktree, env: {} });
+            assert.equal(context.codeGraphMode, 'off');
+            assert.equal(context.codeGraphProjectPath, '');
+            assert.equal(renderCodeGraphInstructions(context), '');
+        }
+        finally {
+            await rm(repo, { recursive: true, force: true });
+        }
+    });
+    it('honors explicit shared local auto and off modes', async () => {
+        const repo = await initRepo();
+        try {
+            await writeCodeGraphDb(repo);
+            const worktree = siblingWorktreePath(repo, 'explicit-modes');
+            addWorktree(repo, worktree, 'feat/explicit-modes');
+            assert.equal(resolveWorktreeToolContext({ cwd: worktree, scope: 'launch', repoRoot: repo, worktreeRoot: worktree, env: { OMX_CODEGRAPH_MODE: 'shared' } }).codeGraphMode, 'shared');
+            assert.equal(resolveWorktreeToolContext({ cwd: worktree, scope: 'launch', repoRoot: repo, worktreeRoot: worktree, env: { OMX_CODEGRAPH_MODE: 'local' } }).codeGraphMode, 'local');
+            assert.equal(resolveWorktreeToolContext({ cwd: worktree, scope: 'launch', repoRoot: repo, worktreeRoot: worktree, env: { OMX_CODEGRAPH_MODE: 'auto' } }).codeGraphMode, 'shared');
+            assert.equal(resolveWorktreeToolContext({ cwd: worktree, scope: 'launch', repoRoot: repo, worktreeRoot: worktree, env: { OMX_CODEGRAPH_MODE: 'off' } }).codeGraphMode, 'off');
+            assert.equal(resolveWorktreeToolContext({ cwd: worktree, scope: 'launch', repoRoot: repo, worktreeRoot: worktree, env: { OMX_CODEGRAPH_MODE: 'shared', OMX_CODEGRAPH_REQUESTED_MODE: 'auto' } }).codeGraphMode, 'shared');
+        }
+        finally {
+            await rm(repo, { recursive: true, force: true });
+        }
+    });
+});
+//# sourceMappingURL=worktree-tool-context.test.js.map

package/dist/utils/__tests__/worktree-tool-context.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-tool-context.test.js","sourceRoot":"","sources":["../../../src/utils/__tests__/worktree-tool-context.test.ts"],"names":[],"mappings":"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"}

package/dist/utils/worktree-tool-context.d.ts

@@ -0,0 +1,25 @@
+export type WorktreeToolScope = 'launch' | 'team' | 'autoresearch' | 'repo';
+export type RequestedCodeGraphMode = 'auto' | 'shared' | 'local' | 'off';
+export type ResolvedCodeGraphMode = 'shared' | 'local' | 'off';
+export interface WorktreeToolContext {
+    repoRoot: string;
+    worktreeRoot: string;
+    gitCommonDir: string;
+    worktreeScope: WorktreeToolScope;
+    codeGraphMode: ResolvedCodeGraphMode;
+    codeGraphProjectPath: string;
+    codeGraphDbPath: string;
+    codeGraphSource: 'worktree-local' | 'leader-shared' | 'none';
+    requestedCodeGraphMode: RequestedCodeGraphMode;
+}
+export interface ResolveWorktreeToolContextOptions {
+    cwd: string;
+    scope: WorktreeToolScope;
+    repoRoot?: string | null;
+    worktreeRoot?: string | null;
+    env?: NodeJS.ProcessEnv;
+}
+export declare function resolveWorktreeToolContext(options: ResolveWorktreeToolContextOptions): WorktreeToolContext;
+export declare function worktreeToolContextEnv(context: WorktreeToolContext): Record<string, string>;
+export declare function renderCodeGraphInstructions(context: WorktreeToolContext): string;
+//# sourceMappingURL=worktree-tool-context.d.ts.map

package/dist/utils/worktree-tool-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-tool-context.d.ts","sourceRoot":"","sources":["../../src/utils/worktree-tool-context.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,cAAc,GAAG,MAAM,CAAC;AAC5E,MAAM,MAAM,sBAAsB,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;AACzE,MAAM,MAAM,qBAAqB,GAAG,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;AAE/D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,iBAAiB,CAAC;IACjC,aAAa,EAAE,qBAAqB,CAAC;IACrC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,gBAAgB,GAAG,eAAe,GAAG,MAAM,CAAC;IAC7D,sBAAsB,EAAE,sBAAsB,CAAC;CAChD;AAED,MAAM,WAAW,iCAAiC;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,iBAAiB,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAmCD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,iCAAiC,GAAG,mBAAmB,CAmD1G;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAU3F;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAgBhF"}

package/dist/utils/worktree-tool-context.js

@@ -0,0 +1,116 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+function readGit(cwd, args) {
+    const result = spawnSync('git', args, {
+        cwd,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+        windowsHide: true,
+    });
+    if (result.status !== 0)
+        return null;
+    const value = (result.stdout || '').trim();
+    return value || null;
+}
+function resolveGitRoot(cwd) {
+    const value = readGit(cwd, ['rev-parse', '--show-toplevel']);
+    return value ? resolve(value) : null;
+}
+function resolveGitCommonDir(cwd, fallbackRoot) {
+    const value = readGit(cwd, ['rev-parse', '--git-common-dir']);
+    return value ? resolve(cwd, value) : join(fallbackRoot, '.git');
+}
+function normalizeRequestedCodeGraphMode(env) {
+    const raw = String(env.OMX_CODEGRAPH_REQUESTED_MODE ?? env.OMX_CODEGRAPH_MODE ?? 'auto').trim().toLowerCase();
+    if (raw === '' || raw === 'auto')
+        return 'auto';
+    if (raw === 'shared' || raw === 'local' || raw === 'off')
+        return raw;
+    return 'auto';
+}
+function resolveCodeGraphDbPath(projectPath) {
+    return join(projectPath, '.codegraph', 'codegraph.db');
+}
+export function resolveWorktreeToolContext(options) {
+    const env = options.env ?? process.env;
+    const worktreeRoot = resolve(options.worktreeRoot?.trim() || resolveGitRoot(options.cwd) || options.cwd);
+    const repoRoot = resolve(options.repoRoot?.trim() || resolveGitRoot(options.cwd) || worktreeRoot);
+    const gitCommonDir = resolveGitCommonDir(worktreeRoot, repoRoot);
+    const requestedCodeGraphMode = normalizeRequestedCodeGraphMode(env);
+    const localDbPath = resolveCodeGraphDbPath(worktreeRoot);
+    const sharedDbPath = resolveCodeGraphDbPath(repoRoot);
+    const hasLocalDb = existsSync(localDbPath);
+    const hasSharedDb = existsSync(sharedDbPath);
+    let codeGraphMode = 'off';
+    let codeGraphProjectPath = '';
+    let codeGraphDbPath = '';
+    let codeGraphSource = 'none';
+    if (requestedCodeGraphMode === 'local') {
+        codeGraphMode = 'local';
+        codeGraphProjectPath = worktreeRoot;
+        codeGraphDbPath = localDbPath;
+        codeGraphSource = 'worktree-local';
+    }
+    else if (requestedCodeGraphMode === 'shared') {
+        codeGraphMode = 'shared';
+        codeGraphProjectPath = repoRoot;
+        codeGraphDbPath = sharedDbPath;
+        codeGraphSource = 'leader-shared';
+    }
+    else if (requestedCodeGraphMode === 'auto') {
+        if (hasLocalDb) {
+            codeGraphMode = 'local';
+            codeGraphProjectPath = worktreeRoot;
+            codeGraphDbPath = localDbPath;
+            codeGraphSource = 'worktree-local';
+        }
+        else if (hasSharedDb) {
+            codeGraphMode = 'shared';
+            codeGraphProjectPath = repoRoot;
+            codeGraphDbPath = sharedDbPath;
+            codeGraphSource = 'leader-shared';
+        }
+    }
+    return {
+        repoRoot,
+        worktreeRoot,
+        gitCommonDir,
+        worktreeScope: options.scope,
+        codeGraphMode,
+        codeGraphProjectPath,
+        codeGraphDbPath,
+        codeGraphSource,
+        requestedCodeGraphMode,
+    };
+}
+export function worktreeToolContextEnv(context) {
+    return {
+        OMX_REPO_ROOT: context.repoRoot,
+        OMX_WORKTREE_ROOT: context.worktreeRoot,
+        OMX_GIT_COMMON_DIR: context.gitCommonDir,
+        OMX_WORKTREE_SCOPE: context.worktreeScope,
+        OMX_CODEGRAPH_MODE: context.codeGraphMode,
+        OMX_CODEGRAPH_PROJECT_PATH: context.codeGraphProjectPath,
+        OMX_CODEGRAPH_REQUESTED_MODE: context.requestedCodeGraphMode,
+    };
+}
+export function renderCodeGraphInstructions(context) {
+    if (context.codeGraphMode === 'off')
+        return '';
+    const modeLine = context.codeGraphMode === 'local'
+        ? `- Mode: local worktree index (${context.codeGraphProjectPath})`
+        : `- Mode: shared leader index (${context.codeGraphProjectPath})`;
+    const warning = context.codeGraphMode === 'shared'
+        ? '\n- Warning: the shared leader CodeGraph index is not branch-accurate for worktree-only changes; verify changed files directly in this worktree.'
+        : '';
+    return [
+        '## CodeGraph',
+        modeLine,
+        `- Project path: ${context.codeGraphProjectPath}`,
+        `- Database: ${context.codeGraphDbPath || '(not found yet)'}`,
+        '- OMX does not install CodeGraph, auto-index worktrees, or copy/symlink `.codegraph` for this run.',
+        warning.trim(),
+    ].filter(Boolean).join('\n');
+}
+//# sourceMappingURL=worktree-tool-context.js.map

package/dist/utils/worktree-tool-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-tool-context.js","sourceRoot":"","sources":["../../src/utils/worktree-tool-context.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-codex",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Multi-agent orchestration layer for OpenAI Codex CLI",
   "type": "module",
   "main": "dist/index.js",

package/plugins/oh-my-codex/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-codex",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Multi-agent orchestration layer for OpenAI Codex CLI",
   "author": {
     "name": "Yeachan Heo",

package/plugins/oh-my-codex/hooks/codex-native-hook.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { spawn } from 'node:child_process';
 import { extname } from 'node:path';
-import { existsSync, readFileSync, realpathSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -131,20 +131,82 @@ function detectCompactHookInput(input) {
   }
 }
 
-async function readBoundedStdin() {
+function parseHookPayload(input) {
+  try {
+    const parsed = JSON.parse(input.toString('utf8'));
+    return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+function sanitizeLaunchId(value) {
+  return String(value ?? '').trim().replace(/[^a-zA-Z0-9._-]/g, '_').slice(0, 128);
+}
+
+function resolveLaunchClaimPath(payload, launchId) {
+  const cwd = typeof payload.cwd === 'string' && payload.cwd.trim() ? payload.cwd : process.cwd();
+  const stateRoot = typeof process.env.OMX_ROOT === 'string' && process.env.OMX_ROOT.trim()
+    ? process.env.OMX_ROOT.trim()
+    : join(cwd, '.omx');
+  return join(stateRoot, 'state', 'plugin-hook-launches', `${sanitizeLaunchId(launchId)}.json`);
+}
+
+function hookPayloadSessionId(input, payload) {
+  const parsedSessionId = typeof payload.session_id === 'string' ? payload.session_id.trim() : '';
+  if (parsedSessionId) return parsedSessionId;
+  return extractTopLevelStringField(input.toString('utf8'), ['session_id', 'sessionId'])?.trim() ?? '';
+}
+
+function isOmxLauncherSession(input, payload) {
+  const launchId = process.env.OMX_CODEX_LAUNCH_ID?.trim();
+  const entryPath = process.env.OMX_ENTRY_PATH?.trim();
+  const sessionId = hookPayloadSessionId(input, payload);
+  if (!launchId || !entryPath || !sessionId) return false;
+
+  const claimPath = resolveLaunchClaimPath(payload, launchId);
+
+  try {
+    if (existsSync(claimPath)) {
+      const claimed = JSON.parse(readFileSync(claimPath, 'utf8'));
+      return claimed?.sessionId === sessionId;
+    }
+    mkdirSync(dirname(claimPath), { recursive: true });
+    writeFileSync(claimPath, `${JSON.stringify({ sessionId })}\n`, { encoding: 'utf8', mode: 0o600 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function writePlainCodexNoop(isStop) {
+  if (isStop) process.stdout.write('{}\n');
+  process.exitCode = 0;
+}
+
+async function readBoundedStdin({ drainOversized = false } = {}) {
   const chunks = [];
   let totalBytes = 0;
+  let storedBytes = 0;
+  let oversized = false;
   for await (const rawChunk of process.stdin) {
     const chunk = Buffer.isBuffer(rawChunk) ? rawChunk : Buffer.from(rawChunk);
     totalBytes += chunk.length;
-    if (totalBytes > MAX_WRAPPER_STDIN_BYTES) {
-      const remaining = MAX_WRAPPER_STDIN_BYTES - Buffer.concat(chunks).length;
+
+    if (oversized) continue;
+
+    const remaining = MAX_WRAPPER_STDIN_BYTES - storedBytes;
+    if (chunk.length > remaining) {
       if (remaining > 0) chunks.push(chunk.subarray(0, remaining));
-      return { input: Buffer.concat(chunks), oversized: true, totalBytes };
+      storedBytes += Math.max(remaining, 0);
+      oversized = true;
+      if (!drainOversized) return { input: Buffer.concat(chunks), oversized: true, totalBytes };
+      continue;
     }
     chunks.push(chunk);
+    storedBytes += chunk.length;
   }
-  return { input: Buffer.concat(chunks), oversized: false, totalBytes };
+  return { input: Buffer.concat(chunks), oversized, totalBytes };
 }
 
 function stopFallbackOutput(stopReason, detail) {
@@ -326,9 +388,7 @@ function hasActiveAutopilotStateForOversizedStop(input) {
 }
 
 
-function parseSingleJsonObjectOutput(raw) {
-  const text = String(raw ?? '').trim();
-  if (!text) return null;
+function parseJsonObjectCandidate(text) {
   try {
     const parsed = JSON.parse(text);
     if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return null;
@@ -338,11 +398,37 @@ function parseSingleJsonObjectOutput(raw) {
   }
 }
 
+function isJsonObjectFragmentLine(text) {
+  return text.startsWith('{') || text.endsWith('}') || /^"[^"]+"\s*:/.test(text);
+}
+
+function parseSingleJsonObjectOutput(raw) {
+  const text = String(raw ?? '').trim();
+  if (!text) return null;
+  const direct = parseJsonObjectCandidate(text);
+  if (direct) return direct;
+
+  const lines = text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  const lastLine = lines.at(-1);
+  if (!lastLine || !lastLine.startsWith('{') || !lastLine.endsWith('}')) return null;
+  for (const line of lines.slice(0, -1)) {
+    if (parseJsonObjectCandidate(line) || isJsonObjectFragmentLine(line)) return null;
+  }
+  return parseJsonObjectCandidate(lastLine);
+}
+
 async function main() {
-  const { input, oversized, totalBytes } = await readBoundedStdin();
+  const { input, oversized, totalBytes } = await readBoundedStdin({ drainOversized: true });
+  const payload = parseHookPayload(input);
+  const launchedByOmx = isOmxLauncherSession(input, payload);
   const isStop = detectStopHookInput(input);
   const isCompact = detectCompactHookInput(input);
 
+  if (!launchedByOmx) {
+    writePlainCodexNoop(isStop);
+    return;
+  }
+
   if (oversized) {
     const message = `plugin hook stdin exceeded ${MAX_WRAPPER_STDIN_BYTES} bytes before launcher delegation; totalBytes>${totalBytes}`;
     if (isStop) {

package/plugins/oh-my-codex/skills/ai-slop-cleaner/SKILL.md

@@ -15,7 +15,7 @@ Use this skill when:
 - Follow-up implementation left duplicate code, dead code, weak boundaries, missing tests, fallback-like code, or unnecessary wrapper layers
 - You need a disciplined cleanup workflow without broad rewrites
 
-## GPT-5.5 Guidance Alignment
+## GPT-5.6 Guidance Alignment
 
 - Keep outputs concise and evidence-dense unless risk or the user requests more detail.
 - Treat newer user instructions as local workflow updates without discarding earlier non-conflicting constraints.

package/plugins/oh-my-codex/skills/code-review/SKILL.md

@@ -15,7 +15,7 @@ This skill activates when:
 - After implementing a major feature
 - User wants quality assessment
 
-## GPT-5.5 Guidance Alignment
+## GPT-5.6 Guidance Alignment
 
 - Default to outcome-first progress and completion reporting: state the target result, evidence, validation status, and stop condition before adding process detail.
 - Treat newer user task updates as local overrides for the active workflow branch while preserving earlier non-conflicting constraints.

package/plugins/oh-my-codex/skills/omx-setup/SKILL.md

@@ -35,11 +35,11 @@ Supported setup flags (current implementation):
    - if a TTY user has persisted setup preferences, `omx setup` first summarizes the recorded choices and asks whether to **keep**, **review/change**, or **reset** them
    - else interactive prompt on TTY (default `user`)
    - else default `user` (safe for CI/tests)
-2. If scope is `user`, resolve user skill delivery mode:
+2. Resolve setup install mode:
    - explicit `--plugin`, `--legacy`, or `--install-mode legacy|plugin`, if present
    - persisted install mode in `./.omx/setup-scope.json`, if present and the TTY review decision is `keep`
-   - else discovered installed plugin cache under `${CODEX_HOME:-~/.codex}/plugins/cache/**/.codex-plugin/plugin.json` with `name: oh-my-codex` makes `plugin` the default
-   - else interactive prompt on TTY (`legacy` by default, or `plugin` when a plugin cache is discovered)
+   - else discovered installed plugin cache under `${CODEX_HOME:-~/.codex}/plugins/cache/**/.codex-plugin/plugin.json` with `name: oh-my-codex` makes `plugin` the default for both `user` and `project` scope, so project setup does not duplicate plugin-provided skills/hooks with legacy `.codex/skills` and `.codex/hooks.json`
+   - else in `user` scope, interactive prompt on TTY (`legacy` by default, or `plugin` when a plugin cache is discovered)
    - else default `legacy` unless a plugin cache is discovered
 3. Create directories and persist effective scope/install mode
 4. In legacy mode, install prompts/native agents/skills and merge full config.toml. In plugin mode, archive/remove legacy OMX-managed prompts/skills, refresh installable native agent TOMLs for `agent_type` routing, clean up stale generated non-installable native agents, and keep native Codex hooks installed.
@@ -51,7 +51,7 @@ Supported setup flags (current implementation):
 
 - `omx setup` prompts for scope when no scope is provided and stdin/stdout are TTY. If `./.omx/setup-scope.json` already exists, setup now summarizes the saved choices first and asks whether to keep them, review/change them, or reset and behave like a fresh setup run.
 - Non-interactive setup never blocks for this review prompt: it keeps deterministic CLI/persisted/default behavior for CI and scripted installs.
-- In `user` scope, `omx setup` also prompts for skill delivery mode when no prior install mode is kept; installed plugin cache discovery makes plugin mode the default prompt/non-interactive choice.
+- In `user` scope, `omx setup` also prompts for skill delivery mode when no prior install mode is kept; installed plugin cache discovery makes plugin mode the default prompt/non-interactive choice. In `project` scope, installed plugin cache discovery selects plugin mode non-interactively to avoid overlapping project legacy skills/hooks with plugin-provided surfaces.
 - Local project orchestration file is `./AGENTS.md` (project root).
 - If `AGENTS.md` exists and neither `--force` nor `--merge-agents` is used, interactive TTY runs ask whether to overwrite. Non-interactive runs preserve the file.
 - Use `--merge-agents` to keep existing project guidance while allowing setup to refresh OMX-managed AGENTS sections and the generated model capability table idempotently.
@@ -73,7 +73,7 @@ Use this map when reconciling setup behavior or debugging a confusing install:
 
 | Surface | Owner | Notes |
 | --- | --- | --- |
-| `./.omx/setup-scope.json` | `omx setup` | Persists setup scope and user-scope skill delivery mode. TTY reruns summarize it and offer keep/review/reset. |
+| `./.omx/setup-scope.json` | `omx setup` | Persists setup scope and install mode when needed. TTY reruns summarize it and offer keep/review/reset. |
 | `~/.codex/config.toml` / `./.codex/config.toml` | `omx setup` generated blocks + user edits | Setup refreshes OMX-managed blocks while preserving supported manual content; setup-owned runtime feature flags include `multi_agent`, `child_agents_md`, the Codex hook feature flag (`hooks` or legacy `codex_hooks`), and `goals`. |
 | `~/.codex/hooks.json` / `./.codex/hooks.json` | `omx setup` shared ownership | Setup owns OMX native hook wrappers and preserves user-owned hooks. |
 | prompts, skills, native agents | `omx setup` or Codex plugin delivery | Legacy mode installs local files; plugin mode relies on plugin discovery for bundled skills, archives/removes legacy OMX-managed prompt/skill copies, and refreshes setup-owned native agent TOMLs for `agent_type` routing while cleaning up stale generated/non-installable native agents. |

package/plugins/oh-my-codex/skills/prometheus-strict/SKILL.md

@@ -42,7 +42,7 @@ OMX already has `$plan`, `$ralplan`, and `$deep-interview`. Prometheus Strict ex
 - Ask high-leverage questions as a batched round when the answers materially change scope, safety, or validation. Reserve one-at-a-time questioning only for dependent question chains where the next question depends on the previous answer.
 - If a safe assumption is available, state it and continue.
 - Use repository reads when needed to make paths, tests, and handoff commands concrete.
-- During Metis planning, run pre-question research fan-out for every non-trivial intent unless the task is trivial, the cited spec is self-contained, or cached evidence already covers the same surface; use `explore` for repo facts and the exact cheap `gpt-5.4-mini` `researcher` lane for external docs / OSS references before asking the user. Prometheus Strict may fan out up to `2 explore + 4 researcher` agents per round so breadth comes from more citation-focused mini researchers while Metis/Momus/Oracle keep stronger judgment roles.
+- During Metis planning, run pre-question research fan-out for every non-trivial intent unless the task is trivial, the cited spec is self-contained, or cached evidence already covers the same surface; use `explore` for repo facts and the exact cheap `gpt-5.6-terra` `researcher` lane for external docs / OSS references before asking the user. Prometheus Strict may fan out up to `2 explore + 4 researcher` agents per round so breadth comes from more citation-focused mini researchers while Metis/Momus/Oracle keep stronger judgment roles.
 - Recommend `$team` only when Oracle identifies independent, bounded, verifiable lanes.
 
 ### Structured Question Surface
@@ -93,7 +93,7 @@ If the prompt contains destructive, credential-gated, external-production, or ma
 
 Use `prometheus-strict-metis` as the interview voice. When native subagents are available, invoke the dedicated agent; otherwise run the same role in-context without editing files.
 
-Metis discovers success criteria, non-goals, evidence versus assumptions, required artifacts, likely execution lanes, and missing decisions. Before the first user-facing question batch, Metis must actively fan out repo/external research per intent: `explore` maps local surfaces and exact `gpt-5.4-mini` `researcher` lanes gather official/upstream or OSS-reference evidence. Research-heavy intents use more cheap researchers rather than downgrading Metis/Momus/Oracle judgment.
+Metis discovers success criteria, non-goals, evidence versus assumptions, required artifacts, likely execution lanes, and missing decisions. Before the first user-facing question batch, Metis must actively fan out repo/external research per intent: `explore` maps local surfaces and exact `gpt-5.6-terra` `researcher` lanes gather official/upstream or OSS-reference evidence. Research-heavy intents use more cheap researchers rather than downgrading Metis/Momus/Oracle judgment.
 
 Run the interview as a bounded loop:
 
@@ -148,7 +148,7 @@ $team <N>:executor "execute the approved Ultragoal story in parallel lanes"  # o
 
 <Tool_Usage>
 - Use read-only repository inspection to verify referenced files, commands, and existing conventions.
-- Treat Metis research fan-out as part of planning, not execution: dispatch `explore` / exact `gpt-5.4-mini` `researcher` evidence-gathering before question generation for non-trivial intents, then re-prefill and ask only surviving CRITICAL gaps.
+- Treat Metis research fan-out as part of planning, not execution: dispatch `explore` / exact `gpt-5.6-terra` `researcher` evidence-gathering before question generation for non-trivial intents, then re-prefill and ask only surviving CRITICAL gaps.
 - Use `prometheus-strict-metis`, `prometheus-strict-momus`, and `prometheus-strict-oracle` sequentially; do not fan out implementation work from this skill.
 - Use `$ultragoal` only as the recommended execution handoff after the plan is ready.
 - Use `$team` only when parallel lanes are independent and verifiable.

package/plugins/oh-my-codex/skills/ralplan/SKILL.md

@@ -30,7 +30,7 @@ $ralplan --interactive "task description"
 
 ## Behavior
 
-## GPT-5.5 Guidance Alignment
+## GPT-5.6 Guidance Alignment
 
 Use the shared workflow guidance pattern: outcome-first framing, concise visible updates for multi-step planning, local overrides for the active workflow branch, evidence-backed planning and validation expectations, explicit stop rules, right-sized implementation/PRD shape, and automatic continuation for safe reversible steps. Ask only for material, destructive, credentialed, external-production, or preference-dependent branches.
 

package/plugins/oh-my-codex/skills/team/SKILL.md

@@ -17,7 +17,7 @@ This skill is operationally sensitive. Treat it as an operator workflow, not a g
 
 ## What This Skill Must Do
 
-## GPT-5.5 Guidance Alignment
+## GPT-5.6 Guidance Alignment
 
 Use the shared workflow guidance pattern: outcome-first framing, concise visible updates for multi-step work, local overrides for the active workflow branch, validation proportional to risk, explicit stop rules, and automatic continuation for safe reversible steps. Ask only for material, destructive, credentialed, external-production, or preference-dependent branches.
 

package/plugins/oh-my-codex/skills/ultrawork/references/agent-tiers.md

@@ -47,8 +47,8 @@ Use role to choose responsibility, tier to choose depth, and posture to choose o
   - Prioritizes intent classification, delegation, verification, and architectural judgment.
   - Typical roles: `planner`, `analyst`, `architect`, `critic`, `code-reviewer`.
   - Ralplan keeps `planner` and `architect` in this posture; `planner`
-    uses exact `gpt-5.5` with medium reasoning, `architect` uses exact
-    `gpt-5.5` with xhigh reasoning, and the `critic` consensus gate stays
+    uses exact `gpt-5.6-sol` with medium reasoning, `architect` uses exact
+    `gpt-5.6-sol` with xhigh reasoning, and the `critic` consensus gate stays
     on the frontier lane.
 
 - `deep-worker`:

package/prompts/prometheus-strict-metis.md

@@ -103,7 +103,7 @@ Optional ADDITIONAL dispatch on top of the mandatory minimum (fire when signals
 - Multi-module integration surface → extra `explore` to map the cross-module boundary.
 
 Fan-out budget and shape:
-- Max **2 explore + 4 researcher** agents per round, all dispatched in parallel via `run_in_background=true` in a single tool block (never sequential). `researcher` is pinned to the exact cheap `gpt-5.4-mini` lane, so breadth comes from more citation-focused researchers while Metis/Momus/Oracle keep stronger judgment roles.
+- Max **2 explore + 4 researcher** agents per round, all dispatched in parallel via `run_in_background=true` in a single tool block (never sequential). `researcher` is pinned to the exact cheap `gpt-5.6-terra` lane, so breadth comes from more citation-focused researchers while Metis/Momus/Oracle keep stronger judgment roles.
 - Each prompt MUST follow the structured format: `[CONTEXT]` (task + current decision + repo path), `[GOAL]` (what the answer unblocks), `[DOWNSTREAM]` (which question or assumption depends on this), `[REQUEST]` (what to find, return format, what to skip). Vague single-line prompts are forbidden. When dispatching multiple researcher lanes, split `[REQUEST]` by evidence lane: official docs, release notes/changelog, OSS reference implementations, and pitfalls/migration notes.
 - Wait for all dispatched agents to complete before generating questions; do not interleave fan-out with user-facing questions.
 

package/skills/ai-slop-cleaner/SKILL.md

@@ -15,7 +15,7 @@ Use this skill when:
 - Follow-up implementation left duplicate code, dead code, weak boundaries, missing tests, fallback-like code, or unnecessary wrapper layers
 - You need a disciplined cleanup workflow without broad rewrites
 
-## GPT-5.5 Guidance Alignment
+## GPT-5.6 Guidance Alignment
 
 - Keep outputs concise and evidence-dense unless risk or the user requests more detail.
 - Treat newer user instructions as local workflow updates without discarding earlier non-conflicting constraints.

package/skills/code-review/SKILL.md

@@ -15,7 +15,7 @@ This skill activates when:
 - After implementing a major feature
 - User wants quality assessment
 
-## GPT-5.5 Guidance Alignment
+## GPT-5.6 Guidance Alignment
 
 - Default to outcome-first progress and completion reporting: state the target result, evidence, validation status, and stop condition before adding process detail.
 - Treat newer user task updates as local overrides for the active workflow branch while preserving earlier non-conflicting constraints.

package/skills/ecomode/references/agent-tiers.md

@@ -47,7 +47,7 @@ Use role to choose responsibility, tier to choose depth, and posture to choose o
   - Prioritizes intent classification, delegation, verification, and architectural judgment.
   - Typical roles: `planner`, `analyst`, `architect`, `critic`, `code-reviewer`.
   - Ralplan keeps `planner` and `architect` in this posture but pins them to
-    exact `gpt-5.5` with role-specific reasoning; the `critic` consensus gate stays
+    exact `gpt-5.6-sol` with role-specific reasoning; the `critic` consensus gate stays
     on the frontier lane.
 
 - `deep-worker`: