@selesai/code 0.13.6 → 0.13.8

package/dist/extensions/pi-subagents/src/runs/foreground/workflow-detach-reconcile.ts

@@ -296,4 +296,4 @@ export function reconcileDetachedWorkflowChildCompletion(input: {
 		});
 	}
 	return true;
-}
+}

package/dist/extensions/pi-subagents/src/runs/foreground/workflow-foreground-steering.ts

@@ -185,4 +185,4 @@ export function workflowForegroundSteeringLaunchOptions(control: ForegroundRunCo
 		steerCapabilityPath: steerCapabilityPath(control.workflowSteeringDir, index),
 		steerAckDir,
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/abort-recovery.ts

@@ -116,4 +116,4 @@ export function planAbortRecovery(input: {
 	const progressLimit = emptyZeroUsageTerminal ? terminal.index : input.messages.length;
 	if (!hasUsefulProgress(input.messages, progressLimit)) return settle("no useful prior progress");
 	return { action: "resume", prompt: ABORT_RECOVERY_PROMPT };
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/acceptance.ts

@@ -678,7 +678,15 @@ function parseAcceptanceReportBody(body: string): { report?: AcceptanceReport; e
 	return validateAcceptanceReport(parseReportJson(body));
 }
 
-function parseUnterminatedAcceptanceReportFence(output: string): { report?: AcceptanceReport; error?: string } {
+interface AcceptanceReportParseResult {
+	report?: AcceptanceReport;
+	error?: string;
+	/** True when an acceptance-report signal was found but its envelope was invalid. */
+	malformed?: boolean;
+	sourcePath?: string;
+}
+
+function parseUnterminatedAcceptanceReportFence(output: string): AcceptanceReportParseResult {
 	const opener = /```acceptance[-_]report\b[^\n]*\n/gi.exec(output);
 	if (!opener) return {};
 	const bodyStart = opener.index + opener[0].length;
@@ -687,13 +695,13 @@ function parseUnterminatedAcceptanceReportFence(output: string): { report?: Acce
 		const validation = validateAcceptanceReport(JSON.parse(output.slice(bodyStart).trim()) as unknown);
 		return validation.report
 			? { report: validation.report }
-			: { error: `Failed to parse acceptance-report: Invalid acceptance-report: ${validation.errors.join("; ")}` };
+			: { error: `Failed to parse acceptance-report: Invalid acceptance-report: ${validation.errors.join("; ")}`, malformed: true };
 	} catch (error) {
-		return { error: `Failed to parse acceptance-report: ${error instanceof Error ? error.message : String(error)}` };
+		return { error: `Failed to parse acceptance-report: ${error instanceof Error ? error.message : String(error)}`, malformed: true };
 	}
 }
 
-function parseGenericJsonAcceptanceReportBody(body: string): { report?: AcceptanceReport; error?: string } {
+function parseGenericJsonAcceptanceReportBody(body: string): AcceptanceReportParseResult {
 	const parsed = parseReportJson(body);
 	const normalized = normalizeAcceptanceReportValue(parsed);
 	const hasCriteriaMarker = normalized.value !== null
@@ -704,12 +712,12 @@ function parseGenericJsonAcceptanceReportBody(body: string): { report?: Acceptan
 	const validation = validateAcceptanceReport(parsed);
 	return validation.report
 		? { report: validation.report }
-		: { error: `Invalid acceptance-report: ${validation.errors.join("; ")}` };
+		: { error: `Invalid acceptance-report: ${validation.errors.join("; ")}`, malformed: true };
 }
 
 export const ACCEPTANCE_REPORT_NOT_FOUND = "Structured acceptance report not found.";
 
-export function parseAcceptanceReport(output: string): { report?: AcceptanceReport; error?: string } {
+export function parseAcceptanceReport(output: string): AcceptanceReportParseResult {
 	const explicitFencePresent = /```acceptance[-_]report\b/i.test(output);
 	const fenced = fencedBlocks(output, "acceptance[-_]report");
 	const parseErrors: string[] = [];
@@ -722,17 +730,17 @@ export function parseAcceptanceReport(output: string): { report?: AcceptanceRepo
 			parseErrors.push(error instanceof Error ? error.message : String(error));
 		}
 	}
-	if (parseErrors.length > 0) return { error: `Failed to parse acceptance-report: ${parseErrors.join("; ")}` };
+	if (parseErrors.length > 0) return { error: `Failed to parse acceptance-report: ${parseErrors.join("; ")}`, malformed: true };
 	if (explicitFencePresent) {
 		const recovered = parseUnterminatedAcceptanceReportFence(output);
 		if (recovered.report || recovered.error) return recovered;
-		return { error: "Failed to parse acceptance-report: Empty or unterminated acceptance-report fence." };
+		return { error: "Failed to parse acceptance-report: Empty or unterminated acceptance-report fence.", malformed: true };
 	}
 	for (const body of fencedBlocks(output, "(?:json|jsonc|json5)")) {
 		try {
 			const parsed = parseGenericJsonAcceptanceReportBody(body);
 			if (parsed.report) return { report: parsed.report };
-			if (parsed.error) return { error: `Failed to parse acceptance-report: ${parsed.error}` };
+			if (parsed.error) return { error: `Failed to parse acceptance-report: ${parsed.error}`, malformed: parsed.malformed };
 		} catch {
 			// Ignore unrelated malformed generic JSON. A recognizable report shape
 			// returns exact validation errors above instead of being mistaken for prose.
@@ -742,20 +750,20 @@ export function parseAcceptanceReport(output: string): { report?: AcceptanceRepo
 	if (markerIndex !== -1) {
 		const jsonStart = output.indexOf("{", markerIndex);
 		if (jsonStart === -1) {
-			return { error: "Failed to parse acceptance-report: Expected a JSON object after ACCEPTANCE_REPORT:." };
+			return { error: "Failed to parse acceptance-report: Expected a JSON object after ACCEPTANCE_REPORT:.", malformed: true };
 		}
 		const json = extractBalancedJson(output, jsonStart);
 		if (!json) {
-			return { error: "Failed to parse acceptance-report: Unterminated JSON object after ACCEPTANCE_REPORT:." };
+			return { error: "Failed to parse acceptance-report: Unterminated JSON object after ACCEPTANCE_REPORT:.", malformed: true };
 		}
 		try {
 			const parsed = JSON.parse(json) as unknown;
 			const validation = validateAcceptanceReport(parsed);
 			if (validation.report) return { report: validation.report };
-			return { error: `Failed to parse acceptance-report: Invalid acceptance-report: ${validation.errors.join("; ")}` };
+			return { error: `Failed to parse acceptance-report: Invalid acceptance-report: ${validation.errors.join("; ")}`, malformed: true };
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
-			return { error: `Failed to parse acceptance-report: ${message}` };
+			return { error: `Failed to parse acceptance-report: ${message}`, malformed: true };
 		}
 	}
 	return { error: ACCEPTANCE_REPORT_NOT_FOUND };
@@ -764,14 +772,18 @@ export function parseAcceptanceReport(output: string): { report?: AcceptanceRepo
 function parseAcceptanceReportSources(
 	output: string,
 	fileOutput: { content: string; path: string; authoritative?: boolean } | undefined,
-): { report?: AcceptanceReport; error?: string } {
+): AcceptanceReportParseResult {
 	const fromText = () => parseAcceptanceReport(output);
 	const fromFile = () => {
 		if (!fileOutput) return { error: ACCEPTANCE_REPORT_NOT_FOUND };
 		const parsed = parseAcceptanceReport(fileOutput.content);
 		return parsed.report || parsed.error === ACCEPTANCE_REPORT_NOT_FOUND
 			? parsed
-			: { error: `${parsed.error} (in configured output ${fileOutput.path})` };
+			: {
+				...parsed,
+				error: `${parsed.error} (in configured output ${fileOutput.path})`,
+				sourcePath: fileOutput.path,
+			};
 	};
 	const [primary, secondary] = fileOutput?.authoritative ? [fromFile, fromText] : [fromText, fromFile];
 	const first = primary();
@@ -1272,7 +1284,7 @@ export async function evaluateAcceptance(input: {
 	 * be misattributed). Searched for the acceptance report; searched before
 	 * the assistant output when `authoritative` (outputMode "file-only").
 	 */
-	fileOutput?: { content: string; path: string; authoritative?: boolean };
+	fileOutput?: { content: string; path: string; authoritative?: boolean; durable?: boolean };
 	report?: AcceptanceReport;
 	reportError?: string;
 	reviewResult?: AcceptanceReviewResult;
@@ -1296,16 +1308,25 @@ export async function evaluateAcceptance(input: {
 	};
 	if (acceptance.level === "none") return ledger;
 
-	const parsed = input.reportError
+	const parsed: AcceptanceReportParseResult = input.reportError
 		? { error: input.reportError }
 		: input.report
 		? (() => {
 			const validation = validateAcceptanceReport(input.report);
 			return validation.report
 				? { report: validation.report }
-				: { error: `Failed to parse acceptance-report: Invalid acceptance-report: ${validation.errors.join("; ")}` };
+				: { error: `Failed to parse acceptance-report: Invalid acceptance-report: ${validation.errors.join("; ")}`, malformed: true };
 		})()
 		: parseAcceptanceReportSources(input.output, input.fileOutput);
+	const durableFileOutput = input.fileOutput?.authoritative && input.fileOutput.durable ? input.fileOutput : undefined;
+	if (parsed.malformed && parsed.sourcePath && durableFileOutput) {
+		ledger.recovery = {
+			status: "available-for-review",
+			reason: "acceptance-metadata-rejected",
+			reportPath: parsed.sourcePath,
+			reportHash: hash(durableFileOutput.content),
+		};
+	}
 	const needsReport = acceptanceRequiresChildReport(acceptance);
 	if (parsed.report) {
 		ledger.childReport = parsed.report;
@@ -1314,6 +1335,10 @@ export async function evaluateAcceptance(input: {
 	} else if (!input.reportOptional || needsReport || parsed.error !== ACCEPTANCE_REPORT_NOT_FOUND) {
 		ledger.childReportParseError = parsed.error;
 		ledger.runtimeChecks.push({ id: "attestation", status: "failed", message: parsed.error ?? "Structured acceptance report missing." });
+		if (ledger.recovery) {
+			ledger.status = "rejected";
+			ledger.evidenceStatus = "rejected";
+		}
 		if (!input.reportOptional) {
 			ledger.status = "rejected";
 			ledger.evidenceStatus = "rejected";
@@ -1420,4 +1445,4 @@ export function acceptanceFailureMessage(ledger: AcceptanceLedger): string | und
 	if (failedVerify) return `Acceptance verification '${failedVerify.id}' ${failedVerify.status}.`;
 	if (ledger.reviewResult?.status === "blockers") return "Acceptance review found blockers.";
 	return "Acceptance rejected.";
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/agent-contract.ts

@@ -35,4 +35,4 @@ export function attachContractProjections<T extends SingleResult>(result: T): T
 	result.review = buildReviewProjection(result);
 	if (!result.effects) result.effects = {} satisfies EffectsProjection;
 	return result;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/async-status-projection.ts

@@ -594,4 +594,4 @@ export function projectAsyncStatusSnapshot(jobs: Iterable<AsyncJobState>, option
 	};
 	enforceByteLimit(snapshot);
 	return snapshot;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/background-process-options.ts

@@ -6,4 +6,4 @@ export function backgroundProcessOptions(platform: NodeJS.Platform = process.pla
 		detached: platform !== "win32",
 		windowsHide: true,
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/capability-ceiling.ts

@@ -206,4 +206,4 @@ export function decodeSubagentCapabilityCeiling(value: string | undefined): Reso
 		throw new Error("Invalid inherited capability ceiling version.");
 	}
 	return parseSubagentCapabilityCeiling(parsed, "inherited capability ceiling");
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/chain-outputs.ts

@@ -113,4 +113,4 @@ export function outputEntryFromAsyncResult(result: { agent: string; output: stri
 		agent: result.agent,
 		stepIndex,
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/child-identity.ts

@@ -48,4 +48,4 @@ export function resolveAsyncStatusChild(
 
 export function isStoppableAsyncStatusStep(step: AsyncStatusStep): boolean {
 	return step.status === "pending" || step.status === "running";
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/child-launch-plan.ts

@@ -148,4 +148,4 @@ export function planChildLaunch(input: ChildLaunchPlanInput): ChildLaunchPlan {
 	const outputPath = resolveSingleOutputPath(behavior.output, input.runtimeCwd, instructionCwd, input.outputBaseDir);
 
 	return { stepCwd, instructionCwd, readExistenceCwd, behavior, inheritedRelativeParallelOutput, namespaceOutputPath, outputPath, skillNames };
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/child-protocol.ts

@@ -412,4 +412,4 @@ export function projectChildLifecycle(event: { type?: string; willRetry?: unknow
 	if (event.type === "agent_settled") return state?.compactionRetryActive ? "none" : "start-drain";
 	if (terminalAssistantStop) return "start-drain";
 	return "none";
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/claude-code-adapter.ts

@@ -126,4 +126,4 @@ export function resolveClaudeCodeLaunch(input: {
 		},
 		parser: createClaudeCodeJsonlParser(),
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/codex-exec-adapter.ts

@@ -126,4 +126,4 @@ export function resolveCodexExecLaunch(input: {
 		},
 		parser: createCodexExecJsonlParser(finalMessagePath),
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/completion-evidence.ts

@@ -86,4 +86,4 @@ export function projectSettlementDiagnostic(
 		...(input.requiredOutput ? { requiredOutput: input.requiredOutput } : {}),
 		afterCompactionSettlement: input.afterCompactionSettlement === true,
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/completion-guard.ts

@@ -249,4 +249,4 @@ export function evaluateCompletionMutationGuard(input: CompletionMutationGuardIn
 		triggered: expectedMutation && !attemptedMutation && !noEditChallengeComplete,
 		blocked: false,
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/context-mode.ts

@@ -41,4 +41,4 @@ export function contextModePrefix(
 	if (!label) return "";
 	if (mode === "fork") return `${theme.fg("warning", label)} `;
 	return `${theme.fg("dim", label)} `;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/cursor-agent-adapter.ts

@@ -111,4 +111,4 @@ export function resolveCursorAgentLaunch(input: {
 		},
 		parser: createCursorAgentJsonlParser(),
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/dynamic-fanout.ts

@@ -294,4 +294,4 @@ export async function validateDynamicCollection(schema: JsonSchemaObject | undef
 	if (validation.status === "invalid") {
 		throw new DynamicFanoutError(`Collected output validation failed: ${validation.message}`);
 	}
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/extension-bindings.ts

@@ -75,4 +75,4 @@ export function encodeExtensionBindings(input: ExtensionBindings | undefined): s
 export function omitExtensionBindingsEnv(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
 	const { [SELESAI_SUBAGENT_EXTENSION_BINDINGS_ENV]: _extensionBindings, ...sanitized } = env;
 	return sanitized;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/external-cli-contract.ts

@@ -164,4 +164,4 @@ export function externalCliReceiptMetadata(input: {
 		supervisor: { mode: "unsupported", reason: runner.unsupportedReasons.supervisor },
 		nonResumableReason: runner.nonResumableReason,
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/external-cli-preflight.ts

@@ -119,4 +119,4 @@ export function invalidateExternalCliPreflight(command: string, spec: ExternalCl
 export function clearExternalCliPreflightCacheForTests(): void {
 	cache.clear();
 	lookup.clear();
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/external-cli-runner.ts

@@ -426,4 +426,4 @@ export function runExternalCli(input: {
 			})();
 		});
 	});
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/external-job-bridge.ts

@@ -457,4 +457,4 @@ export async function requestExternalJobOperation<T extends ExternalJobHandle |
 	fs.rmSync(outPath, { force: true });
 	if (!response.ok) throw new ExternalJobProviderError(response.message, { code: response.code, ...(response.blockingJobId ? { blockingJobId: response.blockingJobId } : {}) });
 	return response.result as T;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/external-job-runner.ts

@@ -386,4 +386,4 @@ export async function runExternalJob(input: {
 		input.registerTimeout?.(undefined);
 		input.registerStop?.(undefined);
 	}
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/fast-mode-extension.ts

@@ -7,4 +7,4 @@ export function rewriteFastModeProviderRequest(event: BeforeProviderRequestEvent
 
 export default function registerSubagentFastModeExtension(pi: ExtensionAPI): void {
 	pi.on("before_provider_request", rewriteFastModeProviderRequest);
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/host-step-status.ts

@@ -144,6 +144,7 @@ export function validHostStepNodes(graph: WorkflowGraphSnapshot | undefined): Ho
 export function assertWorkflowGraphHostSteps(graph: WorkflowGraphSnapshot | undefined, source = "status", expectedRunId?: string): void {
 	if (!graph) return;
 	if (expectedRunId !== undefined && graph.runId !== expectedRunId) throw new Error(`Invalid host step '${source}': workflowGraph.runId does not match the status run id.`);
+	if (!Array.isArray(graph.nodes)) throw new Error(`Invalid host step '${source}.workflowGraph': nodes must be an array.`);
 	const hostStepCount = graph.nodes.filter((node) => node.kind === "host-step").length;
 	if (hostStepCount > HOST_STEP_MAX_COUNT) throw new Error(`Invalid host step '${source}': workflowGraph contains more than ${HOST_STEP_MAX_COUNT} host steps.`);
 	const hostSteps: HostStepNodeV1[] = [];
@@ -227,4 +228,4 @@ export function hostStepVerdictLabel(state: HostStepState, verdict: HostStepVerd
 export function hostStepReportName(reportPath: string | undefined): string | undefined {
 	if (!reportPath) return undefined;
 	return reportPath.split(/[\\/]/).filter(Boolean).at(-1);
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/lane-metadata.ts

@@ -102,4 +102,4 @@ export function validateAsyncStatusLaneMetadata(status: Pick<AsyncStatus, "runId
 		if (hasPath !== hasBranch) throw new Error(`${label}.steps[${index}] must include both worktreePath and branch.`);
 		if (hasPath) normalizeWorktreeStatusReference({ worktreePath: step.worktreePath, branch: step.branch }, `${label}.steps[${index}]`);
 	}
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/launch-cwd.ts

@@ -13,4 +13,4 @@ export function preflightLaunchCwd(requestedCwd: string, effectiveCwd: string):
 		return `Subagent launch aborted: cwd could not be accessed: ${effectiveCwd}${resolution}\n${error instanceof Error ? error.message : String(error)}`;
 	}
 	return undefined;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/llm-intent-arbiter.ts

@@ -299,4 +299,4 @@ async function arbitrateWithGuard(
 	} catch {
 		return "unavailable";
 	}
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/long-running-guard.ts

@@ -218,4 +218,4 @@ export function summarizeRecentMutatingFailures(state: MutatingFailureState): st
 	return state.recentFailures
 		.map((entry) => `${entry.tool}${entry.path ? `(${entry.path})` : ""}: ${entry.error}`)
 		.join(" | ");
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/mcp-config-sources.ts

@@ -419,4 +419,4 @@ function readJson(filePath: string): unknown | undefined {
 	} catch (error) {
 		throw new Error(`Invalid JSON in '${filePath}': ${error instanceof Error ? error.message : String(error)}`, { cause: error });
 	}
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/mcp-direct-tool-allowlist.ts

@@ -480,4 +480,4 @@ function stableStringify(value: unknown): string {
 	if (Array.isArray(value)) return `[${value.map((entry) => stableStringify(entry)).join(",")}]`;
 	const obj = value as Record<string, unknown>;
 	return `{${Object.keys(obj).sort().map((key) => `${JSON.stringify(key)}:${stableStringify(obj[key])}`).join(",")}}`;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/mcp-direct-tool-grant.ts

@@ -191,4 +191,4 @@ function resourceNameToToolName(name: string): string {
 		.toLowerCase();
 	if (!result || /^\d/.test(result)) result = `resource${result ? `_${result}` : ""}`;
 	return result;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/model-exclusions.ts

@@ -302,4 +302,4 @@ function shortenExclusionsToTTL(items: ModelExclusion[], ttlMs: number, now: num
 	const previousLength = items.length;
 	prune(items, now);
 	return changed || items.length !== previousLength;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/model-fallback.ts

@@ -321,15 +321,23 @@ export function resolveSubagentModelOverride(
 	const explicit = trimmed && trimmed !== INHERIT_MODEL ? trimmed : undefined;
 	if (!parentModel) throwForUnresolvedEnforcedInheritScope(options?.scope, explicit === undefined || options?.source === "inherited");
 	let resolved: string | undefined;
+	let resolvedFromRegistry = explicit === undefined;
 	if (explicit === undefined) {
 		resolved = parentModel ? `${parentModel.provider}/${parentModel.id}` : undefined;
 	} else {
-		resolved = resolveRequiredSubagentModelCandidate(explicit, availableModels, preferredProvider);
-	}
-	if (resolved && explicit !== undefined && options?.source === "explicit") {
-		throwForExplicitModelExclusion(resolved);
+		const candidate = resolveSubagentModelCandidate(explicit, availableModels, preferredProvider);
+		if (options?.source === "explicit") {
+			resolved = candidate ?? resolveRequiredSubagentModelCandidate(explicit, availableModels, preferredProvider);
+			throwForExplicitModelExclusion(resolved);
+			resolvedFromRegistry = true;
+		} else if (candidate) {
+			resolved = candidate;
+			resolvedFromRegistry = true;
+		} else {
+			resolved = explicit;
+		}
 	}
-	if (resolved && options?.scope) {
+	if (resolved && options?.scope && resolvedFromRegistry) {
 		const source: ModelSource = explicit === undefined ? "inherited" : (options.source ?? "inherited");
 		enforceModelScopes(resolved, options.scope, source, options.onWarn);
 	}
@@ -362,12 +370,33 @@ export function resolveEffectiveSubagentModel(
 	);
 }
 
+export type ModelOrigin = ModelSource | "configured";
+
 export interface BuildModelCandidatesOptions {
 	/** Fallback models warn by default and throw when strict scope enforcement is enabled. */
 	scope?: ModelScopeCheckRule | ModelScopeCheckRule[];
 	onWarn?: (violation: ModelScopeViolation) => void;
 	/** The primary model came from the running parent session, not configuration. */
 	primaryModelFromParent?: boolean;
+	/** How the primary model was selected. Explicit stays strict and does not rotate to fallbacks. */
+	origin?: ModelOrigin;
+}
+
+const ZERO_USABLE_MODEL_CANDIDATES_ERROR =
+	"No usable subagent models remain after registry, scope, and cached-exclusion filtering.";
+
+export function resolveModelOrigin(input: {
+	explicitModel?: string | boolean;
+	agentModel?: string | boolean;
+	parentModel?: ParentModel;
+	fromParent?: boolean;
+	storedOrigin?: ModelOrigin;
+}): ModelOrigin {
+	if (input.storedOrigin) return input.storedOrigin;
+	if (input.fromParent) return "inherited";
+	if (inheritsParentModel(input.explicitModel, input.agentModel, input.parentModel)) return "inherited";
+	const trimmed = typeof input.explicitModel === "string" ? input.explicitModel.trim() : "";
+	return trimmed && trimmed !== INHERIT_MODEL ? "explicit" : "configured";
 }
 
 export function inheritsParentModel(
@@ -388,36 +417,51 @@ export function buildModelCandidates(
 	options?: BuildModelCandidatesOptions,
 ): string[] {
 	if (!primaryModel) throwForUnresolvedEnforcedInheritScope(options?.scope, true);
+	const origin = options?.origin ?? (options?.primaryModelFromParent ? "inherited" : "configured");
+	const scopes = configuredScopes(options?.scope);
+	const warnCachedExclusion = (candidate: string, exclusion: NonNullable<ReturnType<typeof findModelExclusion>>) => {
+		const reason = redactSecretValues((exclusion.reason ?? "runtime-failure").replace(/[\u0000-\u001f\u007f]+/g, " ")).slice(0, 240);
+		console.warn(`[pi-subagents] Skipping model '${candidate}' due to a cached exclusion (reason: ${reason}; expires: ${new Date(exclusion.expiresAt).toISOString()}).`);
+	};
+	if (origin === "explicit" && primaryModel) {
+		const normalized = resolveRequiredSubagentModelCandidate(primaryModel.trim(), availableModels, preferredProvider);
+		throwForExplicitModelExclusion(normalized);
+		enforceModelScopes(normalized, scopes, "explicit", options?.onWarn);
+		primaryModel = normalized;
+	}
 	const seen = new Set<string>();
 	const candidates: string[] = [];
 	const rawCandidates = [primaryModel, ...(fallbackModels ?? [])];
+	let skippedPrimary: string | undefined;
 	for (let index = 0; index < rawCandidates.length; index++) {
 		const raw = rawCandidates[index];
 		if (!raw) continue;
 		const model = raw.trim();
-		const normalized = index === 0
-			? options?.primaryModelFromParent
-				? model
-				: resolveRequiredSubagentModelCandidate(model, availableModels, preferredProvider)
+		const normalized = index === 0 && (origin === "inherited" || origin === "explicit" || options?.primaryModelFromParent)
+			? model
 			: resolveSubagentModelCandidate(model, availableModels, preferredProvider);
 		if (!normalized) {
-			console.warn(`[pi-subagents] Skipping fallback model '${model}' because it is unavailable in this environment.`);
+			if (index === 0) skippedPrimary = model;
+			else console.warn(`[pi-subagents] Skipping fallback model '${model}' because it is unavailable in this environment.`);
 			continue;
 		}
 		if (seen.has(normalized)) continue;
-		const scopes = configuredScopes(options?.scope);
 		if (index > 0 || scopes.some((scope) => scope.enforce === true && scope.strict === true)) {
 			enforceModelScopes(normalized, scopes, "inherited", options?.onWarn);
 		}
 		seen.add(normalized);
 		candidates.push(normalized);
 	}
-	return filterFallbackCandidates(candidates, {
-		onExcluded(candidate, exclusion) {
-			const reason = redactSecretValues((exclusion.reason ?? "runtime-failure").replace(/[\u0000-\u001f\u007f]+/g, " ")).slice(0, 240);
-			console.warn(`[pi-subagents] Skipping model '${candidate}' due to a cached exclusion (reason: ${reason}; expires: ${new Date(exclusion.expiresAt).toISOString()}).`);
-		},
-	});
+	const resolved = filterFallbackCandidates(candidates, { onExcluded: warnCachedExclusion });
+	if (resolved.length === 0) {
+		if (skippedPrimary) resolveRequiredSubagentModelCandidate(skippedPrimary, availableModels, preferredProvider);
+		if (candidates.length > 0) throw new Error(ZERO_USABLE_MODEL_CANDIDATES_ERROR);
+		return resolved;
+	}
+	if (skippedPrimary) {
+		console.warn(`[pi-subagents] Skipping primary model '${skippedPrimary}' because it is unavailable in this environment.`);
+	}
+	return resolved;
 }
 
 const RETRYABLE_MODEL_FAILURE_PATTERNS = [
@@ -531,4 +575,4 @@ export function formatModelAttemptNote(attempt: ModelAttemptSummary, nextModel?:
 	return nextModel
 		? `[fallback] ${attempt.model} failed: ${failure}. Retrying with ${nextModel}.`
 		: `[fallback] ${attempt.model} failed: ${failure}.`;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/model-scope.ts

@@ -202,4 +202,4 @@ export function parseModelScopeConfig(
 	}
 
 	return Object.keys(config).length > 0 ? config : undefined;
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/mutation-evidence.ts

@@ -196,4 +196,4 @@ export function buildTimeoutRecoverySummary(input: {
 		warning,
 		message: lines.join("\n"),
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/nested-events.ts

@@ -1083,4 +1083,4 @@ export function nestedResultsPath(rootRunId: string, id: string): string {
 	assertSafeId("rootRunId", rootRunId);
 	assertSafeId("id", id);
 	return path.join(DIRS.results, "nested", rootRunId, `${id}.json`);
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/nested-path.ts

@@ -49,4 +49,4 @@ export function parseNestedPathEnv(value: string | undefined): NestedPathEntry[]
 export function encodeNestedPathEnv(value: NestedPathEntry[]): string {
 	const sanitized = sanitizeNestedPath(value);
 	return sanitized.length ? JSON.stringify(sanitized) : "";
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/nested-render.ts

@@ -124,4 +124,4 @@ export function formatNestedRunStatusLines(children: NestedRunSummary[] | undefi
 		maxLines: options.maxLines ?? 40,
 		commandHints: options.commandHints ?? false,
 	});
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/orca-progress-tabs.ts

@@ -496,4 +496,4 @@ export function createOrcaProgressTab(input: {
 			});
 		},
 	};
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/parallel-handoff.ts

@@ -689,4 +689,4 @@ export function discardPreservedWorktrees(
 		}
 	}
 	return { manifest, text: lines.join("\n") };
-}
+}

package/dist/extensions/pi-subagents/src/runs/shared/parallel-utils.ts

@@ -276,4 +276,4 @@ export function aggregateParallelOutputs(
 		.join("\n\n");
 }
 
-export const MAX_PARALLEL_CONCURRENCY = 4;
+export const MAX_PARALLEL_CONCURRENCY = 4;

package/dist/extensions/pi-subagents/src/runs/shared/permissions.ts

@@ -7,7 +7,7 @@ export interface PermissionConfig { rules?: PermissionRules }
 
 export const PERMISSION_POLICY_ENV = "SELESAI_SUBAGENT_PERMISSION_POLICY";
 export const PERMISSION_AUDIT_PATH_ENV = "SELESAI_SUBAGENT_PERMISSION_AUDIT_PATH";
-const INTERNAL_TOOLS = new Set(["contact_supervisor", "intercom", "subagent_wait", "structured_output"]);
+const INTERNAL_TOOLS = new Set(["contact_supervisor", "intercom", "bg_wait", "subagent_wait", "structured_output"]);
 const DECISIONS = new Set<PermissionDecision>(["allow", "ask", "deny"]);
 const MAX_POLICY_BYTES = 16 * 1024;
 const MAX_PREVIEW_BYTES = 2048;
@@ -96,4 +96,4 @@ export function appendPermissionAudit(filePath: string | undefined, record: Reco
 	if (!filePath) return;
 	fs.mkdirSync(path.dirname(filePath), { recursive: true, mode: 0o700 });
 	fs.appendFileSync(filePath, `${JSON.stringify(record)}\n`, { encoding: "utf-8", mode: 0o600 });
-}
+}