Normalize codex models and workflow diagnostics

Author: 0xroylee

packages/cli/src/features/config/project-resolution.ts

@@ -1,3 +1,4 @@
+import { normalizeCodexModel } from "adapters/codex";
 import type {
 	DeepPartial,
 	DevosRootConfig,
@@ -119,6 +120,9 @@ function mergeRuntime(
 			...base.codex,
 			...(rootDefaults.codex ?? {}),
 			...(project.codex ?? {}),
+			model: normalizeCodexModel(
+				project.codex?.model ?? rootDefaults.codex?.model ?? base.codex.model,
+			),
 			docker: {
 				...(base.codex.docker ?? {}),
 				...(rootDefaults.codex?.docker ?? {}),
@@ -130,9 +134,9 @@ function mergeRuntime(
 				...(project.codex?.reasoningEfforts ?? {}),
 			},
 			models: {
-				...(base.codex.models ?? {}),
-				...(rootDefaults.codex?.models ?? {}),
-				...(project.codex?.models ?? {}),
+				...normalizeCodexModels(base.codex.models),
+				...normalizeCodexModels(rootDefaults.codex?.models),
+				...normalizeCodexModels(project.codex?.models),
 			},
 			fastModes: {
 				...(base.codex.fastModes ?? {}),
@@ -171,3 +175,15 @@ function mergeRuntime(
 		dryRun: project.dryRun ?? rootDefaults.dryRun ?? base.dryRun,
 	};
 }
+
+function normalizeCodexModels(
+	models: ProjectRuntimeConfig["codex"]["models"] | undefined,
+): ProjectRuntimeConfig["codex"]["models"] {
+	if (!models) return {};
+	return Object.fromEntries(
+		Object.entries(models).map(([key, value]) => [
+			key,
+			normalizeCodexModel(value),
+		]),
+	) as ProjectRuntimeConfig["codex"]["models"];
+}

packages/cli/src/features/models/model-command.ts

@@ -1,3 +1,4 @@
+import { normalizeCodexModel } from "adapters/codex";
 import { instanceConfigPath } from "../config";
 import { loadInstanceConfig, saveInstanceConfig } from "../onboard";
 import type {
@@ -35,6 +36,7 @@ export async function handleModelsCommand(
 	}
 
 	resetModelSettings(config, command.stage);
+	normalizeExistingModels(config);
 	await (deps.saveInstanceConfig ?? saveInstanceConfig)(config);
 	write(`Reset ${stageLabel(command.stage)} model settings.\n`);
 }
@@ -57,7 +59,7 @@ function applyModelSettings(
 	if (command.model !== undefined) {
 		config.codex.models = {
 			...(config.codex.models ?? {}),
-			[command.stage]: command.model,
+			[command.stage]: normalizeCodexModel(command.model),
 		};
 	}
 	if (command.reasoningEffort !== undefined) {
@@ -68,6 +70,17 @@ function applyModelSettings(
 	}
 }
 
+function normalizeExistingModels(
+	config: Awaited<ReturnType<typeof readInstanceConfig>>,
+): void {
+	if (!config.codex?.models) return;
+	for (const stage of STAGES) {
+		config.codex.models[stage] = normalizeCodexModel(
+			config.codex.models[stage],
+		);
+	}
+}
+
 function resetModelSettings(
 	config: Awaited<ReturnType<typeof readInstanceConfig>>,
 	stage: ModelStage,
@@ -98,7 +111,7 @@ function renderModelsList(
 		lines.push(
 			[
 				stageLabel(stage),
-				config.codex?.models?.[stage] ?? "-",
+				normalizeCodexModel(config.codex?.models?.[stage]) ?? "-",
 				config.codex?.reasoningEfforts?.[stage] ?? "-",
 			].join("\t"),
 		);

packages/cli/src/features/onboard/onboard-draft.ts

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { CODEX_DEFAULT_STAGE_MODELS } from "adapters/codex";
 import { clackPromptAdapter } from "../prompts";
 import type { PromptAdapter } from "../prompts";
 import {
@@ -14,13 +15,6 @@ import type {
 } from "./types/onboard.types";
 import { resolveUserPath } from "./wizard-helpers";
 
-const DEFAULT_CODEX_MODELS = {
-	brainstorm: "gpt-5.5",
-	plan: "gpt-5.5",
-	implement: "gpt-5.3-codex",
-	reviewTest: "gpt-5.3-codex",
-} as const;
-
 const ISOLATED_WORKTREES_DESCRIPTION =
 	"Keeps each workflow task in its own git worktree so agent changes do not collide with your main checkout or other running tasks.";
 
@@ -62,11 +56,11 @@ export async function collectOnboardDraft(
 				githubComment: DEFAULT_REASONING_EFFORTS.reviewTest,
 			},
 			models: {
-				brainstorm: DEFAULT_CODEX_MODELS.brainstorm,
-				plan: DEFAULT_CODEX_MODELS.plan,
-				implement: DEFAULT_CODEX_MODELS.implement,
-				reviewTest: DEFAULT_CODEX_MODELS.reviewTest,
-				githubComment: DEFAULT_CODEX_MODELS.reviewTest,
+				brainstorm: CODEX_DEFAULT_STAGE_MODELS.brainstorm,
+				plan: CODEX_DEFAULT_STAGE_MODELS.plan,
+				implement: CODEX_DEFAULT_STAGE_MODELS.implement,
+				reviewTest: CODEX_DEFAULT_STAGE_MODELS.reviewTest,
+				githubComment: CODEX_DEFAULT_STAGE_MODELS.githubComment,
 			},
 			plugins: ["github@openai-curated"],
 			skillsets: ["devos"],

packages/cli/src/features/workflow/implementation/implement-stage.ts

@@ -18,6 +18,9 @@ import type {
 } from "../types/workflow.types";
 import { appendCodexUsage } from "../usage/usage-state";
 
+const NO_STAGED_CHANGES_ERROR =
+	"No staged changes found after implement step; cannot create PR";
+
 export function fixedBugsForImplementationComment(
 	hasExistingPr: boolean,
 	bugs: RunState["bugs"],
@@ -100,12 +103,22 @@ export async function handleImplementingStage(
 				url: "https://example.invalid/dry-run",
 			};
 		} else {
-			state.pullRequest = await runtime.createDraftPrFromWorktree(
-				config,
-				state.issue.key,
-				state.issue.title,
-				state.issue.branchName,
-			);
+			state.pullRequest = await runtime
+				.createDraftPrFromWorktree(
+					config,
+					state.issue.key,
+					state.issue.title,
+					state.issue.branchName,
+				)
+				.catch((error) => {
+					if (!isNoStagedChangesError(error)) {
+						throw error;
+					}
+					throw noImplementationChangesError(
+						state.implementationSummary,
+						error,
+					);
+				});
 		}
 	} else if (!config.dryRun) {
 		if (!state.pullRequest?.branch) {
@@ -148,6 +161,27 @@ export async function handleImplementingStage(
 	);
 }
 
+function isNoStagedChangesError(error: unknown): boolean {
+	return (
+		error instanceof Error && error.message.includes(NO_STAGED_CHANGES_ERROR)
+	);
+}
+
+function noImplementationChangesError(
+	implementationSummary: string | undefined,
+	cause: unknown,
+): Error {
+	const summary = implementationSummary?.trim() || "No agent output recorded.";
+	const error = new Error(
+		[
+			"Implementation completed without file changes; no draft PR was created.",
+			`Agent output: ${summary}`,
+		].join("\n\n"),
+	);
+	Object.assign(error, { cause });
+	return error;
+}
+
 export async function prepareImplementationBranchForStage(
 	config: ResolvedProjectConfig,
 	state: RunState,

packages/cli/src/features/workflow/pipeline/issue-pipeline-executor.ts

@@ -6,10 +6,12 @@ import type {
 } from "../../types";
 import { ReviewMergeDecisionManager } from "../review/review-orchestrator";
 import { saveRunState, transitionStage } from "../state";
+import type { PipelineRunResult } from "../types/workflow-metadata.types";
 import type {
 	WorkflowRuntime,
 	WorkflowTaskClient,
 } from "../types/workflow.types";
+import { formatWorkflowError } from "../utils/error-format";
 import { heartbeatRunLease } from "../workflow-lease";
 import { isReviewOnlyExecutableStage } from "../workflow-queue";
 import { createBuiltInWorkflowMetadata } from "./built-in-workflow-metadata";
@@ -83,14 +85,7 @@ export class IssuePipelineExecutor {
 			},
 		});
 		if (!pipelineResult.ok) {
-			const failed = pipelineResult.phaseResults.find(
-				(result) => result.status === "rejected",
-			);
-			throw new Error(
-				failed?.status === "rejected"
-					? failed.error
-					: "Workflow pipeline failed",
-			);
+			throw resolvePipelineFailureError(pipelineResult);
 		}
 	}
 
@@ -127,3 +122,20 @@ export class IssuePipelineExecutor {
 		await saveRunState(this.config.workspacePath, state);
 	}
 }
+
+export function resolvePipelineFailureError(result: PipelineRunResult): Error {
+	const failed = result.phaseResults.find(
+		(phaseResult) => phaseResult.status === "rejected",
+	);
+	if (failed?.status !== "rejected") {
+		return new Error("Workflow pipeline failed");
+	}
+	return normalizePipelineError(failed.error);
+}
+
+function normalizePipelineError(error: unknown): Error {
+	if (error instanceof Error) {
+		return error;
+	}
+	return new Error(formatWorkflowError(error));
+}

packages/cli/src/features/workflow/pipeline/phase-runner.ts

@@ -6,7 +6,6 @@ import type {
 	WorkflowMetadata,
 	WorkflowPhaseDefinition,
 } from "../types/workflow-metadata.types";
-import { formatWorkflowError } from "../utils/error-format";
 
 export interface PhaseRunnerDeps {
 	runAgent(input: PhaseAgentRunInput): Promise<PhaseAgentRunResult>;
@@ -38,7 +37,7 @@ export class PhaseRunner {
 				return {
 					status: "rejected",
 					phase,
-					error: formatWorkflowError(result.reason),
+					error: result.reason,
 				};
 			}
 		}

packages/cli/src/features/workflow/types/workflow-metadata.types.ts

@@ -59,7 +59,7 @@ export type PhaseRunResult =
 	| {
 			status: "rejected";
 			phase: WorkflowPhaseDefinition;
-			error: string;
+			error: unknown;
 	  }
 	| {
 			status: "skipped";

packages/cli/src/integrations/github/github.ts

@@ -9,6 +9,7 @@ import type {
 	PullRequestRef,
 	ResolvedProjectConfig,
 } from "../../features/types";
+import { logger } from "../../utils/logger";
 import {
 	PREP_COMMAND_TIMEOUT_MS,
 	runPrepCommandWithRetry,
@@ -22,6 +23,7 @@ import type {
 } from "./types/github.types";
 
 const GITHUB_RETRY_ATTEMPTS = 3;
+const GIT_NOT_ANCESTOR_EXIT_CODE = 1;
 
 export function issueBranchName(issueKey: string, branchName?: string): string {
 	const trimmedBranchName = branchName?.trim();
@@ -105,13 +107,22 @@ export async function ensureBaseBranchFresh(
 		return;
 	}
 
-	const ancestor = await runPrepCommandWithRetry(
-		"git verify base branch ancestor",
+	const ancestor = await commandRunner(
 		"git",
 		["merge-base", "--is-ancestor", baseBranch, `origin/${baseBranch}`],
-		{ cwd: config.executionPath },
-		commandRunner,
+		{ cwd: config.executionPath, timeoutMs: PREP_COMMAND_TIMEOUT_MS },
 	);
+	if (ancestor.code === GIT_NOT_ANCESTOR_EXIT_CODE) {
+		logger.warn(
+			{
+				baseBranch,
+				cwd: config.executionPath,
+				remoteBranch: `origin/${baseBranch}`,
+			},
+			"Skipping local base branch ref update because it has commits not in the remote base",
+		);
+		return;
+	}
 	assertOk(
 		"git",
 		["merge-base", "--is-ancestor", baseBranch, `origin/${baseBranch}`],

packages/cli/src/utils/logger.ts

@@ -85,6 +85,7 @@ export function normalizeError(input: unknown): Record<string, unknown> {
 			name: input.name,
 			message: input.message,
 			stack: input.stack,
+			...normalizeDiagnosticErrorFields(input),
 		};
 	}
 	return { message: String(input) };
@@ -187,3 +188,24 @@ function indentBlock(value: string): string {
 function isLogContext(value: unknown): value is CliLogContext {
 	return typeof value === "object" && value !== null;
 }
+
+function normalizeDiagnosticErrorFields(error: Error): Record<string, unknown> {
+	const diagnostic = error as Error & Record<string, unknown>;
+	return pickDefined({
+		backend: diagnostic.backend,
+		command: diagnostic.command,
+		cwd: diagnostic.cwd,
+		code: diagnostic.code,
+		stdout: diagnostic.stdout,
+		stderr: diagnostic.stderr,
+		traceId: diagnostic.traceId,
+	});
+}
+
+function pickDefined(
+	input: Record<string, unknown | undefined>,
+): Record<string, unknown> {
+	return Object.fromEntries(
+		Object.entries(input).filter(([, value]) => value !== undefined),
+	);
+}

packages/cli/tests/codex.test.ts

@@ -155,10 +155,14 @@ describe("codex adapter", () => {
 		expect(calls).toHaveLength(3);
 		expect(calls[0]).toContain('service_tier="fast"');
 		expect(calls[0]).toContain("features.fast_mode=true");
+		expect(calls[0]).toContain("--ignore-user-config");
 		expect(calls[1]).not.toContain('service_tier="fast"');
+		expect(calls[1]).not.toContain('service_tier="flex"');
 		expect(calls[1]).not.toContain("features.fast_mode=true");
+		expect(calls[1]).toContain("--ignore-user-config");
 		expect(calls[2]).toContain('service_tier="fast"');
 		expect(calls[2]).toContain("features.fast_mode=true");
+		expect(calls[2]).toContain("--ignore-user-config");
 	});
 
 	it("uses github-comment model override when present", async () => {