orcastrator 0.2.20 → 0.2.23

package/README.md

@@ -109,7 +109,7 @@ orca pr publish --last
 
 Orca auto-discovers config in this order:
 
-1. `~/.orca/config.js`
+1. Global config: `~/.orca/config.ts` (preferred when both exist) or `~/.orca/config.js`
 2. Project config: `./orca.config.ts` (preferred when both exist) or `./orca.config.js`
 3. `--config <path>` (if passed)
 
@@ -120,20 +120,12 @@ Later entries override earlier ones.
 import { defineOrcaConfig } from "orcastrator";
 
 export default defineOrcaConfig({
-  executor: "codex",
-  anthropicApiKey: process.env.ANTHROPIC_API_KEY,
-  openaiApiKey: process.env.OPENAI_API_KEY,
+  executor: "codex",  openaiApiKey: process.env.OPENAI_API_KEY,
   runsDir: "./.orca/runs",
   sessionLogs: "./session-logs",
   skills: ["./.orca/skills"],
   maxRetries: 1,
-  claude: {
-    model: "claude-sonnet-4-20250514",
-    effort: "medium",
-    useV2Preview: true,
-    maxTurnsPerTask: 12,
-    allowTextJsonFallback: false
-  },
+
   codex: {
     enabled: true,
     model: "gpt-5.3-codex",
@@ -186,11 +178,10 @@ export default defineOrcaConfig({
 
 ### Config field reference (OrcaConfig)
 
-Top-level: `executor`, `anthropicApiKey`, `openaiApiKey`, `runsDir`, `sessionLogs`, `skills`, `maxRetries`, `hooks`, `hookCommands`, `pr`, `review`, `claude`, `codex`.
+Top-level: `executor`, `openaiApiKey`, `runsDir`, `sessionLogs`, `skills`, `maxRetries`, `hooks`, `hookCommands`, `pr`, `review`, `codex`.
 
 - `pr.enabled`, `pr.requireConfirmation`
 - `maxRetries` is part of `OrcaConfig`; current planner-generated task retries remain fixed in task graph contracts
-- `claude.model`, `claude.effort`, `claude.useV2Preview`, `claude.maxTurnsPerTask`, `claude.allowTextJsonFallback`
 - `codex.enabled`, `codex.model`, `codex.effort`, `codex.command`, `codex.timeoutMs`, `codex.multiAgent`, `codex.perCwdExtraUserRoots`
 - `review.plan.enabled`, `review.plan.onInvalid`
 - `review.execution.enabled`, `review.execution.maxCycles`, `review.execution.onFindings`, `review.execution.validator.auto`, `review.execution.validator.commands`, `review.execution.prompt`
@@ -229,9 +220,7 @@ Global:
 - `--plan <path>`
 - `--config <path>`
 - `--codex-only` (force Codex executor for this run)
-- `--claude-only` (force Claude executor for this run)
 - `--codex-effort <low|medium|high>`
-- `--claude-effort <low|medium|high|max>`
 - `--on-milestone <cmd>`
 - `--on-task-complete <cmd>`
 - `--on-task-fail <cmd>`
@@ -259,9 +248,7 @@ Global:
 - `--last`
 - `--config <path>`
 - `--codex-only`
-- `--claude-only`
 - `--codex-effort <low|medium|high>`
-- `--claude-effort <low|medium|high|max>`
 
 `orca cancel`:
 
@@ -297,13 +284,13 @@ Global:
 
 `orca setup`:
 
-- `--anthropic-key <key>` — override Anthropic API key (written to config)
+- auto-detect is default
 - `--openai-key <key>` — override OpenAI API key (written to config)
-- `--executor <codex|claude>` — explicitly set executor in written config
-- `--global` — save to `~/.orca/config.js` (default)
-- `--project` — save to `./orca.config.js`
-- `--project-config-template` — write typed project hook template to `./orca.config.ts`
-- `--skip-project-config` — skip project config prompt
+- `--executor <codex>` — explicitly set executor in written config
+- `--ts` — write TS config output (`~/.orca/config.ts` / `./orca.config.ts`)
+- `--global` — save to global config (`~/.orca/config.js` by default, or `.ts` with `--ts`)
+- `--project` — save to project config (`./orca.config.js` by default, or `.ts` with `--ts`)
+- `--project-config-template` / `--skip-project-config` removed
 
 `orca help`:
 
@@ -342,8 +329,8 @@ Run IDs are generated as:
 
 ### Config File Locations
 
-- Global: `~/.orca/config.js`
-- Project: `./orca.config.js` or `./orca.config.ts`
+- Global: `~/.orca/config.ts` (preferred when both exist) or `~/.orca/config.js`
+- Project: `./orca.config.ts` (preferred when both exist) or `./orca.config.js`
 - Explicit: `--config <path>`
 
 ### Project Instruction Files
@@ -351,11 +338,8 @@ Run IDs are generated as:
 During planning, Orca automatically injects project instruction files when present:
 
 1. `AGENTS.md`
-2. `CLAUDE.md`
-
-Files are discovered from the project root (nearest `.git` from the spec/task context) and injected in that order.
 
-If both filenames resolve to the same underlying file (for example, `CLAUDE.md` symlinked to `AGENTS.md`), Orca injects that content only once and keeps the first entry in order (`AGENTS.md`).
+Files are discovered from the project root (nearest `.git` from the spec/task context) and injected when present.
 
 ### Project Skills
 

package/dist/cli/commands/help.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/help.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsGzC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAqB1D"}
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/help.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4EzC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAiB1D"}

package/dist/cli/commands/help.js

@@ -11,7 +11,7 @@ function printSection(title, entries) {
     console.log("");
 }
 function printStyledHelpPage() {
-    console.log("orca — coordinated agent run harness");
+    console.log("orca — coordinated codex run harness");
     console.log("");
     printSection("RUNNING", [
         { command: 'orca "add auth to the app"', description: "run with inline goal" },
@@ -33,34 +33,15 @@ function printStyledHelpPage() {
         { command: "orca pr publish --run <id>", description: "publish draft → ready for review" },
         { command: "orca pr status --run <id>", description: "check PR state and CI" }
     ]);
-    printSection("SETUP", [
-        { command: "orca setup", description: "first-time setup and environment checks" }
-    ]);
+    printSection("SETUP", [{ command: "orca setup", description: "first-time setup and Codex environment checks" }]);
     printSection("FLAGS", [
         { command: "-p, --prompt <text>", description: "inline task goal (alias: --task)" },
         { command: "--plan, --spec <path>", description: "path to spec or plan file" },
         { command: "--run <id>", description: "specify run by ID" },
         { command: "--last", description: "use the most recent run" },
-        {
-            command: "--config <path>",
-            description: "explicit config file (auto-discovered by default)"
-        },
-        {
-            command: "--codex-only",
-            description: "override executor to Codex for the current run"
-        },
-        {
-            command: "--claude-only",
-            description: "override executor to Claude for the current run"
-        },
-        {
-            command: "--codex-effort <value>",
-            description: "override Codex effort for the current run"
-        },
-        {
-            command: "--claude-effort <value>",
-            description: "override Claude effort for the current run"
-        },
+        { command: "--config <path>", description: "explicit config file (auto-discovered by default)" },
+        { command: "--codex-only", description: "override executor to Codex for the current run" },
+        { command: "--codex-effort <value>", description: "override Codex effort for the current run" },
         { command: "--full-auto", description: "skip all questions, proceed autonomously" },
         { command: "--on-complete <cmd>", description: "shell hook on run complete" },
         { command: "--on-error <cmd>", description: "shell hook on run error" },
@@ -69,25 +50,18 @@ function printStyledHelpPage() {
     ]);
 }
 function findCommand(program, pathText) {
-    const segments = pathText
-        .split(" ")
-        .map((segment) => segment.trim())
-        .filter((segment) => segment.length > 0);
+    const segments = pathText.split(" ").map((segment) => segment.trim()).filter((segment) => segment.length > 0);
     let current = program;
     for (const segment of segments) {
         current = current.commands.find((command) => command.name() === segment);
-        if (!current) {
+        if (!current)
             return undefined;
-        }
     }
     return current;
 }
 export function registerHelpCommand(program) {
     program.addHelpCommand(false);
-    program
-        .command("help [command]")
-        .description("display help for command")
-        .action((commandPath) => {
+    program.command("help [command]").description("display help for command").action((commandPath) => {
         if (!commandPath) {
             printStyledHelpPage();
             return;

package/dist/cli/commands/resume.d.ts

@@ -1,13 +1,11 @@
 import { type Command } from "commander";
-import { type ClaudeEffort, type CodexEffort } from "../../types/effort.js";
+import { type CodexEffort } from "../../types/effort.js";
 export interface ResumeCommandOptions {
     run?: string;
     last?: boolean;
     config?: string;
     codexOnly?: boolean;
-    claudeOnly?: boolean;
     codexEffort?: CodexEffort;
-    claudeEffort?: ClaudeEffort;
 }
 export declare function resumeCommandHandler(options: ResumeCommandOptions): Promise<void>;
 export declare function registerResumeCommand(program: Command): void;

package/dist/cli/commands/resume.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAM/D,OAAO,EAAuC,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGjH,MAAM,WAAW,oBAAoB;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AA4DD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuEvF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmB5D"}
+{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAM/D,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAG3E,MAAM,WAAW,oBAAoB;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAgDD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmEvF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAiB5D"}

package/dist/cli/commands/resume.js

@@ -2,7 +2,7 @@ import { InvalidArgumentError } from "commander";
 import { resolveConfig } from "../../core/config-loader.js";
 import { runTaskRunner } from "../../core/task-runner.js";
 import { RunStore } from "../../state/store.js";
-import { parseClaudeEffort, parseCodexEffort } from "../../types/effort.js";
+import { parseCodexEffort } from "../../types/effort.js";
 import { getLastRun } from "../../utils/last-run.js";
 function createStore() {
     const runsDir = process.env.ORCA_RUNS_DIR;
@@ -25,34 +25,20 @@ function parseCodexEffortOption(value) {
         throw new InvalidArgumentError(error instanceof Error ? error.message : String(error));
     }
 }
-function parseClaudeEffortOption(value) {
-    try {
-        return parseClaudeEffort(value);
-    }
-    catch (error) {
-        throw new InvalidArgumentError(error instanceof Error ? error.message : String(error));
-    }
-}
 function applyExecutorOverrideForResume(config, options) {
     const nextConfig = { ...config };
-    if (options.codexOnly || options.claudeOnly) {
-        nextConfig.executor = options.codexOnly ? "codex" : "claude";
+    if (options.codexOnly) {
+        nextConfig.executor = "codex";
     }
     if (options.codexEffort !== undefined) {
         nextConfig.codex = { ...nextConfig.codex, effort: options.codexEffort };
     }
-    if (options.claudeEffort !== undefined) {
-        nextConfig.claude = { ...nextConfig.claude, effort: options.claudeEffort };
-    }
     if (config === undefined && Object.keys(nextConfig).length === 0) {
         return undefined;
     }
     return nextConfig;
 }
 export async function resumeCommandHandler(options) {
-    if (options.codexOnly && options.claudeOnly) {
-        throw new Error("--codex-only and --claude-only are mutually exclusive; choose only one executor override.");
-    }
     const store = createStore();
     const resolvedConfig = await resolveConfig(options.config);
     const effectiveConfig = applyExecutorOverrideForResume(resolvedConfig, options);
@@ -116,9 +102,7 @@ export function registerResumeCommand(program) {
         .option("--last", "Use the most recent run")
         .option("--config <path>", "Path to orca config file")
         .option("--codex-only", "Force Codex executor for this resumed run (overrides config)")
-        .option("--claude-only", "Force Claude executor for this resumed run (overrides config)")
         .option("--codex-effort <value>", "Codex effort override for this resumed run", parseCodexEffortOption)
-        .option("--claude-effort <value>", "Claude effort override for this resumed run", parseClaudeEffortOption)
         .action(async (options) => {
         try {
             await resumeCommandHandler(options);

package/dist/cli/commands/run-command.test-harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-command.test-harness.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/run-command.test-harness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,IAAI,EAAE,MAAM,UAAU,CAAC;AAMvD,KAAK,SAAS,GAAG,cAAc,UAAU,CAAC,CAAC;AAE3C,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,MAAM,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,OAAO,CAAC;QAC3B,SAAS,EAAE,SAAS,CAAC;QACrB,cAAc,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QACxC,iBAAiB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QAC3C,sBAAsB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QAChD,yBAAyB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QACnD,gBAAgB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QAC1C,oBAAoB,EAAE,KAAK,KAAK,EAAE,SAAS,GAAG,QAAQ,EAAE,OAAO,EAAE,MAAM,KAAK,KAAK,CAAC;KACnF,CAAC,CAAC;IACH,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,CA0IrF"}
+{"version":3,"file":"run-command.test-harness.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/run-command.test-harness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,IAAI,EAAE,MAAM,UAAU,CAAC;AAMvD,KAAK,SAAS,GAAG,cAAc,UAAU,CAAC,CAAC;AAE3C,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,MAAM,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,OAAO,CAAC;QAC3B,SAAS,EAAE,SAAS,CAAC;QACrB,cAAc,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QACxC,iBAAiB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QAC3C,sBAAsB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QAChD,yBAAyB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QACnD,gBAAgB,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;QAC1C,oBAAoB,EAAE,KAAK,KAAK,EAAE,SAAS,GAAG,QAAQ,EAAE,OAAO,EAAE,MAAM,KAAK,KAAK,CAAC;KACnF,CAAC,CAAC;IACH,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,CAgJrF"}

package/dist/cli/commands/run-command.test-harness.js

@@ -7,10 +7,12 @@ export function createRunCommandTestHarness(tempPrefix) {
     let tempDir = "";
     const originalRunsDir = process.env.ORCA_RUNS_DIR;
     const originalSkipValidators = process.env.ORCA_SKIP_VALIDATORS;
+    const originalOpenaiApiKey = process.env.OPENAI_API_KEY;
     beforeEach(async () => {
         tempDir = await mkdtemp(path.join(os.tmpdir(), tempPrefix));
         process.env.ORCA_RUNS_DIR = path.join(tempDir, "runs");
         process.env.ORCA_SKIP_VALIDATORS = "1";
+        process.env.OPENAI_API_KEY = "test-openai-key";
         process.exitCode = 0;
     });
     afterEach(async () => {
@@ -28,6 +30,12 @@ export function createRunCommandTestHarness(tempPrefix) {
         else {
             process.env.ORCA_SKIP_VALIDATORS = originalSkipValidators;
         }
+        if (originalOpenaiApiKey === undefined) {
+            delete process.env.OPENAI_API_KEY;
+        }
+        else {
+            process.env.OPENAI_API_KEY = originalOpenaiApiKey;
+        }
         await rm(tempDir, { recursive: true, force: true });
     });
     async function loadRunModule() {

package/dist/cli/commands/run.d.ts

@@ -1,5 +1,5 @@
 import { type Command } from "commander";
-import { type ClaudeEffort, type CodexEffort } from "../../types/effort.js";
+import { type CodexEffort } from "../../types/effort.js";
 export interface RunCommandOptions {
     spec?: string;
     plan?: string;
@@ -8,9 +8,7 @@ export interface RunCommandOptions {
     goal?: string;
     config?: string;
     codexOnly?: boolean;
-    claudeOnly?: boolean;
     codexEffort?: CodexEffort;
-    claudeEffort?: ClaudeEffort;
     onMilestone?: string;
     onTaskComplete?: string;
     onTaskFail?: string;

package/dist/cli/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/run.ts"],"names":[],"mappings":"AAQA,OAAO,EAAwB,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAa/D,OAAO,EAAuC,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA6BjH,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAuDD,wBAAsB,+BAA+B,CAAC,OAAO,GAAE,MAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBnG;AAoOD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgSjF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkEzD"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/run.ts"],"names":[],"mappings":"AAQA,OAAO,EAAwB,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAa/D,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA6B3E,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA+CD,wBAAsB,+BAA+B,CAAC,OAAO,GAAE,MAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBnG;AAoND,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2QjF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA0DzD"}

package/dist/cli/commands/run.js

@@ -16,7 +16,7 @@ import { createOpenclawHookHandler, detectOpenclawAvailability } from "../../hoo
 import { createStdoutHookHandler } from "../../hooks/adapters/stdout.js";
 import { HookDispatcher } from "../../hooks/dispatcher.js";
 import { RunStore } from "../../state/store.js";
-import { parseClaudeEffort, parseCodexEffort } from "../../types/effort.js";
+import { parseCodexEffort } from "../../types/effort.js";
 import { generateRunId } from "../../utils/ids.js";
 import { readCodexAuthJson } from "./setup.js";
 const exec = promisify(execCallback);
@@ -54,14 +54,6 @@ function parseCodexEffortOption(value) {
         throw new InvalidArgumentError(error instanceof Error ? error.message : String(error));
     }
 }
-function parseClaudeEffortOption(value) {
-    try {
-        return parseClaudeEffort(value);
-    }
-    catch (error) {
-        throw new InvalidArgumentError(error instanceof Error ? error.message : String(error));
-    }
-}
 function createStore() {
     const runsDir = process.env.ORCA_RUNS_DIR;
     return runsDir ? new RunStore(runsDir) : new RunStore();
@@ -111,16 +103,6 @@ function buildCliCommandHooks(options) {
         ...(options.onError ? { onError: options.onError } : {})
     };
 }
-function isNestedClaudeCodeSession(env = process.env) {
-    const markers = [
-        env.CLAUDE_CODE_SESSION_ID,
-        env.CLAUDE_CODE_ENTRYPOINT,
-        env.ANTHROPIC_CLAUDE_CODE,
-        env.CLAUDE_CODE,
-        env.CLAUDECODE
-    ];
-    return markers.some((value) => typeof value === "string" ? value.trim().length > 0 : Boolean(value));
-}
 function isCodexAvailableForRun(env = process.env) {
     const envOpenai = env.ORCA_OPENAI_API_KEY ?? env.OPENAI_API_KEY;
     if (typeof envOpenai === "string" && envOpenai.trim().length > 0) {
@@ -131,15 +113,12 @@ function isCodexAvailableForRun(env = process.env) {
 }
 function applyExecutorOverrideForRun(config, options) {
     const nextConfig = { ...config };
-    if (options.codexOnly || options.claudeOnly) {
-        nextConfig.executor = options.codexOnly ? "codex" : "claude";
+    if (options.codexOnly) {
+        nextConfig.executor = "codex";
     }
     if (options.codexEffort !== undefined) {
         nextConfig.codex = { ...nextConfig.codex, effort: options.codexEffort };
     }
-    if (options.claudeEffort !== undefined) {
-        nextConfig.claude = { ...nextConfig.claude, effort: options.claudeEffort };
-    }
     if (config === undefined && Object.keys(nextConfig).length === 0) {
         return undefined;
     }
@@ -270,9 +249,6 @@ async function requestStructuredExecutionReview(runPrompt, cycleIndex, basePromp
     };
 }
 export async function runCommandHandler(options) {
-    if (options.codexOnly && options.claudeOnly) {
-        throw new Error("--codex-only and --claude-only are mutually exclusive; choose only one executor override.");
-    }
     const inlineTask = options.task ?? options.prompt ?? options.goal;
     const inputSpecPath = options.spec ?? options.plan;
     if (options.goal !== undefined && (options.task || options.prompt)) {
@@ -300,18 +276,11 @@ export async function runCommandHandler(options) {
         });
         await maybeCreateFirstRunGlobalConfig();
         const orcaConfig = await resolveConfig(options.config);
-        let effectiveConfig = applyExecutorOverrideForRun(orcaConfig, options);
-        if (isNestedClaudeCodeSession()) {
-            console.warn("⚠ Running inside Claude Code — forcing executor: codex to avoid runtime conflicts.");
-            effectiveConfig = {
-                ...effectiveConfig,
-                executor: "codex"
-            };
-            if (!isCodexAvailableForRun()) {
-                console.error("Codex is unavailable in this nested Claude Code session. Set OPENAI_API_KEY (or ORCA_OPENAI_API_KEY) or configure ~/.codex/auth.json.");
-                process.exitCode = 1;
-                return;
-            }
+        const effectiveConfig = applyExecutorOverrideForRun(orcaConfig, options);
+        if (!isCodexAvailableForRun()) {
+            console.error("Codex is unavailable. Set OPENAI_API_KEY (or ORCA_OPENAI_API_KEY) or configure ~/.codex/auth.json.");
+            process.exitCode = 1;
+            return;
         }
         const runId = generateRunId(specPath);
         console.log(`Run ID: ${runId}`);
@@ -379,8 +348,7 @@ export async function runCommandHandler(options) {
             mode: "run",
             overallStatus: "running"
         });
-        const executor = effectiveConfig?.executor ?? "codex";
-        if (executor === "codex") {
+        {
             const cwd = process.cwd();
             const multiAgentResult = await ensureCodexMultiAgent(effectiveConfig);
             if (multiAgentResult.action === "created" || multiAgentResult.action === "appended") {
@@ -474,15 +442,6 @@ export async function runCommandHandler(options) {
                 await codexSession.disconnect();
             }
         }
-        else {
-            console.log("Phase 4: Skipping Codex consultation because executor is set to Claude.");
-            await runTaskRunner({
-                runId,
-                store,
-                ...(effectiveConfig ? { config: effectiveConfig } : {}),
-                emitHook
-            });
-        }
         const run = await store.getRun(runId);
         if (!run) {
             throw new Error(`Run not found after execution: ${runId}`);
@@ -516,9 +475,7 @@ export function registerRunCommand(program) {
         .option("-p, --prompt <text>", "Inline task text (alias for --task)")
         .option("--config <path>", "Path to orca config file")
         .option("--codex-only", "Force Codex executor for this run (overrides config)")
-        .option("--claude-only", "Force Claude executor for this run (overrides config)")
         .option("--codex-effort <value>", "Codex effort override for this run", parseCodexEffortOption)
-        .option("--claude-effort <value>", "Claude effort override for this run", parseClaudeEffortOption)
         .option("--on-milestone <cmd>", "Shell hook command for onMilestone")
         .option("--on-task-complete <cmd>", "Shell hook command for onTaskComplete")
         .option("--on-task-fail <cmd>", "Shell hook command for onTaskFail")
@@ -532,11 +489,6 @@ export function registerRunCommand(program) {
                 ...commandOptions,
                 ...(goal !== undefined ? { goal } : {})
             };
-            if (normalizedOptions.codexOnly && normalizedOptions.claudeOnly) {
-                console.error("Error: --codex-only and --claude-only are mutually exclusive; choose only one.");
-                process.exitCode = 1;
-                return;
-            }
             const inlineTask = normalizedOptions.task ?? normalizedOptions.prompt ?? normalizedOptions.goal;
             const inputSpecPath = normalizedOptions.spec ?? normalizedOptions.plan;
             if (normalizedOptions.goal !== undefined && (normalizedOptions.task || normalizedOptions.prompt)) {

package/dist/cli/commands/setup.d.ts

@@ -1,19 +1,16 @@
 import { type Command } from "commander";
 export interface SetupCommandOptions {
-    anthropicKey?: string;
     openaiKey?: string;
     global?: boolean;
     project?: boolean;
     ts?: boolean;
-    executor?: "codex" | "claude";
+    executor?: "codex";
     projectConfigTemplate?: boolean;
     skipProjectConfig?: boolean;
 }
-type PackageManager = "brew" | "apt" | "winget";
 type ApiKeyConfig = {
-    anthropicApiKey?: string;
     openaiApiKey?: string;
-    executor?: "codex" | "claude";
+    executor?: "codex";
 };
 type ResolveApiKeyOptions = {
     openclawConfigPath?: string;
@@ -22,9 +19,7 @@ type ResolveApiKeyOptions = {
 export declare function resolveApiKey(flagValue: string | undefined, envVarName: string, openclawConfigPathOrOptions?: string | ResolveApiKeyOptions, maybeOptions?: ResolveApiKeyOptions): string | undefined;
 export declare function readCodexAuthJson(homedir?: string): string | undefined;
 export declare function readClaudeCodeKeychain(): string | undefined;
-export declare function detectPackageManager(exists?: (command: string) => boolean): PackageManager | null;
-export declare function buildConfigModule({ anthropicApiKey, openaiApiKey, executor }: ApiKeyConfig): string;
-export declare function buildProjectConfigTemplate(): string;
+export declare function buildConfigModule({ openaiApiKey, executor }: ApiKeyConfig): string;
 export declare function setupCommandHandler(options: SetupCommandOptions): Promise<void>;
 export declare function registerSetupCommand(program: Command): void;
 export {};

package/dist/cli/commands/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/setup.ts"],"names":[],"mappings":"AASA,OAAO,EAAwB,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAI/D,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,KAAK,cAAc,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEhD,KAAK,YAAY,GAAG;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC/B,CAAC;AA0EF,KAAK,oBAAoB,GAAG;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AA0DF,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,MAAM,EAClB,2BAA2B,CAAC,EAAE,MAAM,GAAG,oBAAoB,EAC3D,YAAY,CAAC,EAAE,oBAAoB,GAClC,MAAM,GAAG,SAAS,CAEpB;AA2CD,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,MAAqB,GAAG,MAAM,GAAG,SAAS,CA+CpF;AAED,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,SAAS,CA0B3D;AAUD,wBAAgB,oBAAoB,CAClC,MAAM,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAuB,GACnD,cAAc,GAAG,IAAI,CAcvB;AAED,wBAAgB,iBAAiB,CAAC,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,YAAY,GAAG,MAAM,CAiBnG;AAoBD,wBAAgB,0BAA0B,IAAI,MAAM,CA6DnD;AA6LD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkIrF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAe3D"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/setup.ts"],"names":[],"mappings":"AASA,OAAO,EAAwB,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAI/D,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAID,KAAK,YAAY,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAGlE,KAAK,oBAAoB,GAAG;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9E,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,MAAM,EAClB,2BAA2B,CAAC,EAAE,MAAM,GAAG,oBAAoB,EAC3D,YAAY,CAAC,EAAE,oBAAoB,GAClC,MAAM,GAAG,SAAS,CAsBpB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,MAAqB,GAAG,MAAM,GAAG,SAAS,CAUpF;AAED,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,SAAS,CAE3D;AAOD,wBAAgB,iBAAiB,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,YAAY,GAAG,MAAM,CAMlF;AA6DD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqDrF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAY3D"}