cuelo 0.8.0 → 0.8.2

package/Tools/OMP_Global_Config/patches/apply-core-patch.mjs

@@ -64,6 +64,20 @@ const OPUS55_ROW_1846 = {
 		patched: '"claude-opus-5-5":{"id":"claude-opus-5-5","name":"Claude Opus 5.5","api":"anthropic-messages","provider":"anthropic","baseUrl":"https://api.anthropic.com","reasoning":true,"input":["text","image"],"cost":{"input":4,"output":20,"cacheRead":0.2,"cacheWrite":5},"contextWindow":1000000,"maxTokens":128000,"int":57.6,"tps":95.2,"thinking":{"mode":"anthropic-adaptive","efforts":["low","medium","high","xhigh","max"],"supportsDisplay":true,"prefixBinding":true},"identity":{"class":"anthropic","family":"opus","revision":"5.5.0"},"requiresGlyphTokenization":true,"tokenizer":"claude-v5","supportsComputerUse":false,"compat":{"officialEndpoint":true,"signingEndpoint":true,"supportsContextManagement":true,"supportsServerCompaction":true,"firstPartyProvider":true,"supportsOutputEffort":true,"disableStrictTools":false,"disableAdaptiveThinking":false,"allowAnthropicHeaderOverrides":false,"supportsEagerToolInputStreaming":true,"supportsLongCacheRetention":true,"supportsMidConversationSystem":true,"supportsTurnScopedSystem":true,"supportsMidConversationToolChanges":true,"supportsPerMessageEffort":true,"supportsThinkingBindingControls":true',
 };
 
+/**
+ * #310의 18.4.10 후보. binding controls만 켜고 18.4.6 결과와 `": true"` 공백으로 구분한다(EDITS 항목 주석). marker는
+ * patched 전체다: 18.4.12 후보와는 행 앞쪽 측정값 tps로만 갈리므로 tps 뒤 조각을 marker로 쓰면 둘 다 applied가 된다.
+ */
+const OPUS55_TPS_18410 = '"tps":95.2,';
+const OPUS55_TPS_18412 = '"tps":92.9,';
+const OPUS55_ROW_18410_PATCHED = OPUS55_ROW_1846.patched.replace('"supportsThinkingBindingControls":true', '"supportsThinkingBindingControls": true');
+const OPUS55_ROW_18410 = {
+	file: "../pi-catalog/src/models.json",
+	marker: OPUS55_ROW_18410_PATCHED,
+	anchor: OPUS55_ROW_1846.anchor.replace('"supportsDisplay":true}', '"supportsDisplay":true,"prefixBinding":true}'),
+	patched: OPUS55_ROW_18410_PATCHED,
+};
+
 /** 각 항목: 원본 앵커를 찾아 patched 로 바꾼다. marker 가 있으면 이미 적용된 것으로 본다. */
 const EDITS = [
 	{
@@ -454,6 +468,136 @@ const EDITS = [
 		anchor: " Every task MUST skip build/lint/tests/formatters mid-flight; run once afterward.",
 		patched: " Validation ownership: each task owner MUST run the smallest meaningful validation for its settled changes; do not blanket-ban independent checks. Defer only checks that depend on another writer's unfinished changes or concurrently mutate the same build output, cache, database, or profile; name one owner and run each shared check once after convergence, reusing valid results instead of repeating them in Main.",
 	},
+	{
+		// 18.4.12(upstream "subagents skip their own builds, tests, and smoke runs")는 subagent 렌더에서 # 5. Verify 전체를
+		// "NEVER verify your changes … unless your assignment explicitly instructs it" Hand-off 로 바꿨다. CUELO 계약은
+		// Maker 가 자기 변경을 집중 검사로 증명·보고하고 무거운 통합 검사는 Main 에 exact command 로 넘기는 것이다
+		// (agent/sop/_writer.md, rule://subagent 「검증 소유권」). 그래서 subagent 에도 Verify 본문(UI·버그·테스트 규칙)을
+		// 그대로 두고 subagent 줄만 앞에 붙인다. 프로젝트 전체 검사 금지는 이 템플릿에 worktree 정보가 없어 여기 두지 않고
+		// subagent-system-prompt.md 의 `{{#unless worktree}}` # Validation 이 맡는다(18.4.10 의미). 18.4.10 에는 subagent
+		// 분기가 없어 할 일이 없다: alternate 는 그 판 Verify 머리의 no-op 이고, 18.4.12 결과와 순정 어디에도 없는 문맥이다.
+		file: "src/prompts/system/system-prompt.md",
+		marker: "Scoped proof of your own change is yours:",
+		anchor: `{{#if subagent}}
+# 5. Hand-off
+Main agent verifies once after all subagents land; parallel runs storm the CPU and trip on siblings' half-finished edits.
+- NEVER verify your changes (builds, tests, linters, formatters, smoke runs) unless your assignment explicitly instructs it.
+- Changes complete → yield; name the checks main agent should run.
+{{else}}
+# 5. Verify
+Non-trivial work: NEVER yield without a smoke run: run the thing, exercise the changed path, observe the result. Tests alone are not proof.
+- Investigation: run it; output proves it; no tests.
+- UI: verify actual surface.
+{{#if browserEnabled}}
+  - Web: \`browser.open\` tab, direct helpers for actions, \`tab.run\` for custom JS; visual proof; \`tab.close\`. No tests unless existing suite breaks.
+{{/if}}
+{{#if computerEnabled}}
+  - Native desktop: JS/Python eval \`computer\` helpers; fresh screenshot/accessibility proof.
+{{/if}}
+  - TUI/CLI: launch actual program; observe interaction/output/state.
+{{#ifAny (not browserEnabled) (not computerEnabled)}}
+  - No runtime for changed surface: throwaway script/smoke test; report visual limit.
+{{/ifAny}}
+- Bug: reproduce before; confirm after. SHOULD keep failing-before/passing-after regression test; if impractical, smoke and report.
+- Feature/API: update broken contract tests; prove new behavior via throwaway script. New test ONLY for uncertain edge or user request.
+- Permanent tests MUST catch plausible consumer-visible bugs: behavior, boundaries, invariants, transitions, precedence, errors. Follow conventions; deterministic, isolated, full-suite-safe.
+- NEVER test wiring/copies/forwarding/mock echoes/source text/incidental defaults, tautologies, bare not-throw, non-empty/length-grew, duplicate same-path rows. Use throwaway scripts.
+- Existing wording/implementation/incidental-behavior tests: MUST delete, NEVER re-pin regardless of author.
+{{/if}}
+
+# 6. Cleanup
+{{#if subagent}}Permanent{{else}}After smoke proof: permanent{{/if}} fix/feature`,
+		patched: `# 5. Verify
+{{#if subagent}}
+Scoped proof of your own change is yours: run the single test file, targeted repro, or smoke run below that exercises the changed path, and report each command, exit status, and observed result. A check you cannot run here, or a heavy integration check main agent owns → yield its exact command for main agent to run.
+{{/if}}
+Non-trivial work: NEVER yield without a smoke run: run the thing, exercise the changed path, observe the result. Tests alone are not proof.
+- Investigation: run it; output proves it; no tests.
+- UI: verify actual surface.
+{{#if browserEnabled}}
+  - Web: \`browser.open\` tab, direct helpers for actions, \`tab.run\` for custom JS; visual proof; \`tab.close\`. No tests unless existing suite breaks.
+{{/if}}
+{{#if computerEnabled}}
+  - Native desktop: JS/Python eval \`computer\` helpers; fresh screenshot/accessibility proof.
+{{/if}}
+  - TUI/CLI: launch actual program; observe interaction/output/state.
+{{#ifAny (not browserEnabled) (not computerEnabled)}}
+  - No runtime for changed surface: throwaway script/smoke test; report visual limit.
+{{/ifAny}}
+- Bug: reproduce before; confirm after. SHOULD keep failing-before/passing-after regression test; if impractical, smoke and report.
+- Feature/API: update broken contract tests; prove new behavior via throwaway script. New test ONLY for uncertain edge or user request.
+- Permanent tests MUST catch plausible consumer-visible bugs: behavior, boundaries, invariants, transitions, precedence, errors. Follow conventions; deterministic, isolated, full-suite-safe.
+- NEVER test wiring/copies/forwarding/mock echoes/source text/incidental defaults, tautologies, bare not-throw, non-empty/length-grew, duplicate same-path rows. Use throwaway scripts.
+- Existing wording/implementation/incidental-behavior tests: MUST delete, NEVER re-pin regardless of author.
+
+# 6. Cleanup
+After smoke proof: permanent fix/feature`,
+		alternates: [{
+			file: "src/prompts/system/system-prompt.md",
+			marker: "code made obsolete by cutover is in scope.{{/has}}\n\n# 5. Verify\nNon-trivial work:",
+			anchor: "code made obsolete by cutover is in scope.{{/has}}\n\n# 5. Verify\nNon-trivial work:",
+			patched: "code made obsolete by cutover is in scope.{{/has}}\n\n# 5. Verify\nNon-trivial work:",
+		}],
+	},
+	{
+		// 같은 18.4.12 변경이 project-prompt.md <critical> 의 검증 의무 줄을 subagent 에서 "verification is main agent's job.
+		// NEVER run it yourself …"로 바꿨다. 의무 줄을 모두에게 되돌리고 subagent 범위(집중 증명·exit status 보고·못 돌린
+		// 검사의 exact command)만 덧붙인다. 18.4.10 alternate 는 그 판 의무 줄(바로 뒤 </critical>)의 no-op 이다.
+		file: "src/prompts/system/project-prompt.md",
+		marker: "- As a subagent, that proof is a scoped check of your own change;",
+		anchor: `{{#if subagent}}
+- Changes complete → yield; verification is main agent's job. NEVER run it yourself unless your assignment explicitly instructs it.
+{{else}}
+- Before yielding, MUST verify significant behavioral changes: run the specific test, command, or scenario covering the change.
+{{/if}}`,
+		patched: `- Before yielding, MUST verify significant behavioral changes: run the specific test, command, or scenario covering the change.
+{{#if subagent}}
+- As a subagent, that proof is a scoped check of your own change; report its command and exit status, and yield the exact command for any check you cannot run so main agent runs it.
+{{/if}}`,
+		alternates: [{
+			file: "src/prompts/system/project-prompt.md",
+			marker: "- Before yielding, MUST verify significant behavioral changes: run the specific test, command, or scenario covering the change.\n</critical>",
+			anchor: "- Before yielding, MUST verify significant behavioral changes: run the specific test, command, or scenario covering the change.\n</critical>",
+			patched: "- Before yielding, MUST verify significant behavioral changes: run the specific test, command, or scenario covering the change.\n</critical>",
+		}],
+	},
+	{
+		// 18.4.11 은 subagent-system-prompt.md 의 # Validation 절을 지웠다. 18.4.10 과 같은 자리·같은 `{{#unless worktree}}`
+		// 조건으로 되돌린다: 작업 트리를 형제와 공유할 때만 프로젝트 전체 빌드·포매터·린터·전체 스위트를 금지한다(형제의 미완
+		// 편집·CPU 경합). 집중 증명은 "fine"(허용)이 아니라 요구로 적는다 — 18.4.12 의 다른 두 템플릿과 같은 계약이고,
+		// 18.4.10 순정 문장과 구분돼 그 판에서 applied 로 보이지 않는다. 18.4.10 alternate 는 그 판 절 끝의 no-op 이다.
+		file: "src/prompts/system/subagent-system-prompt.md",
+		marker: "Scoped proof of your own change (single test file, targeted repro, smoke run) is still required: run it and report the result.",
+		anchor: "You are operating on a piece of work assigned to you by the main agent.\n\n{{#if worktree}}",
+		patched: `You are operating on a piece of work assigned to you by the main agent.
+
+{{#unless worktree}}
+# Validation
+Project-wide validation is the main agent's job, run once after all subagents land. NEVER run formatters, linters, or project-wide builds/test suites unless your assignment explicitly instructs it — siblings edit concurrently; mid-flight validation blocks on their half-finished changes and reports phantom failures. Scoped proof of your own change (single test file, targeted repro, smoke run) is still required: run it and report the result.
+{{/unless}}
+
+{{#if worktree}}`,
+		alternates: [{
+			file: "src/prompts/system/subagent-system-prompt.md",
+			marker: "Scoped proof of your own change (single test file, targeted repro, smoke run) is fine.\n{{/unless}}",
+			anchor: "Scoped proof of your own change (single test file, targeted repro, smoke run) is fine.\n{{/unless}}",
+			patched: "Scoped proof of your own change (single test file, targeted repro, smoke run) is fine.\n{{/unless}}",
+		}],
+	},
+	{
+		// 18.4.11 은 같은 파일 Completion 의 "investigate, edit, run, verify." 에서 run·verify 를 뺐다. 실행·검증을 되살리되
+		// 범위를 집중 검사로 적는다(18.4.10 문장과도 구분된다). 18.4.10 alternate 는 그 판 문장의 no-op 이다.
+		file: "src/prompts/system/subagent-system-prompt.md",
+		marker: "you MUST continue with another tool call — investigate, edit, run scoped checks, verify.",
+		anchor: "you MUST continue with another tool call — investigate, edit. Save narrative",
+		patched: "you MUST continue with another tool call — investigate, edit, run scoped checks, verify. Save narrative",
+		alternates: [{
+			file: "src/prompts/system/subagent-system-prompt.md",
+			marker: "you MUST continue with another tool call — investigate, edit, run, verify. Save narrative",
+			anchor: "you MUST continue with another tool call — investigate, edit, run, verify. Save narrative",
+			patched: "you MUST continue with another tool call — investigate, edit, run, verify. Save narrative",
+		}],
+	},
 	{
 		// 2026-09-15 실환경: 사용자가 보낸 steer 가 ask 시작 12.7초 전에 큐에
 		// 들어왔지만, ask 가 24분 timeout 을 전부 기다린 뒤에야 interrupt_skipped
@@ -2063,373 +2207,6 @@ function evalRejectionResult(error: unknown): AgentToolResult<EvalToolDetails |
 				return result;
 			});`,
 	},
-	// ---- task maker external runtime bridge (Codex app-server / Claude Code CLI) ----
-	// 분기는 코어가 provider/model/auth fallback 을 최종 승인한 뒤에만 일어난다.
-	// 두 env 중 하나라도 없거나 maker 이외 agent 면 기존 createAgentSession 경로를 그대로 탄다.
-	{
-		file: "src/task/executor.ts",
-		marker: 'import { pathToFileURL } from "node:url";',
-		anchor: `import path from "node:path";`,
-		patched: `import path from "node:path";
-import { pathToFileURL } from "node:url";`,
-	},
-	{
-		file: "src/task/executor.ts",
-		marker: `type ExternalMakerEngine = "codex" | "claude";`,
-		anchor: `function normalizeModelPatterns(value: string | string[] | undefined): string[] {
-	if (!value) return [];
-	if (Array.isArray(value)) {
-		return value.map(entry => entry.trim()).filter(Boolean);
-	}
-	return value
-		.split(",")
-		.map(entry => entry.trim())
-		.filter(Boolean);
-}`,
-		patched: `function normalizeModelPatterns(value: string | string[] | undefined): string[] {
-	if (!value) return [];
-	if (Array.isArray(value)) {
-		return value.map(entry => entry.trim()).filter(Boolean);
-	}
-	return value
-		.split(",")
-		.map(entry => entry.trim())
-		.filter(Boolean);
-}
-
-type ExternalMakerEngine = "codex" | "claude";
-type ExternalMakerEvent =
-	| { type: "session_started"; sessionId: string; engine: ExternalMakerEngine }
-	| { type: "text_delta"; text: string }
-	| { type: "reasoning_delta"; text: string }
-	| { type: "tool_started"; id: string; name: string; input: unknown }
-	| { type: "tool_completed"; id: string; output: string; isError: boolean }
-	| { type: "file_changed"; path: string }
-	| { type: "usage"; input: number; cachedInput: number; cacheWrite: number; output: number }
-	| { type: "turn_completed"; stopReason: "stop" | "aborted" | "error"; text: string }
-	| { type: "error"; message: string };
-
-interface ExternalMakerSession {
-	readonly id: string;
-	readonly engine: ExternalMakerEngine;
-	prompt(message: string): Promise<void>;
-	abort(): Promise<void>;
-	onEvent(handler: (event: ExternalMakerEvent) => void): () => void;
-	dispose(): Promise<void>;
-}
-
-interface ExternalMakerRuntime {
-	createSession(options: {
-		cwd: string;
-		model?: string;
-		thinking?: string;
-	}): Promise<ExternalMakerSession>;
-}
-
-function resolveExternalMakerEngine(
-	agentName: string,
-	model: Model<Api> | undefined,
-): { engine: ExternalMakerEngine; runtimeDir: string } | undefined {
-	if (agentName !== "maker" || !model) return undefined;
-	const configured = process.env.CUELO_MAKER_ENGINES?.trim();
-	const runtimeDir = process.env.CUELO_RUNTIME_DIR?.trim();
-	if (!configured || !runtimeDir) return undefined;
-	const engines = new Set(configured.split(",").map(value => value.trim()).filter(Boolean));
-	const engine =
-		model.provider === "openai-codex" && engines.has("codex")
-			? "codex"
-			: model.provider === "anthropic" && engines.has("claude")
-				? "claude"
-				: undefined;
-	if (!engine) return undefined;
-	if (!path.isAbsolute(runtimeDir)) {
-		throw new Error("CUELO_RUNTIME_DIR must be an absolute path when an external maker engine is selected");
-	}
-	return { engine, runtimeDir };
-}
-
-async function loadExternalMakerRuntime(
-	engine: ExternalMakerEngine,
-	runtimeDir: string,
-): Promise<ExternalMakerRuntime> {
-	const moduleUrl = pathToFileURL(path.join(runtimeDir, "index.ts")).href;
-	const runtimeModule = (await import(moduleUrl)) as {
-		getRuntime?: (selected: ExternalMakerEngine) => Promise<ExternalMakerRuntime>;
-	};
-	if (typeof runtimeModule.getRuntime !== "function") {
-		throw new Error(\`CUELO runtime module does not export getRuntime(): \${moduleUrl}\`);
-	}
-	return runtimeModule.getRuntime(engine);
-}`,
-	},
-	{
-		file: "src/task/executor.ts",
-		marker: "acceptExternalEvent(event: ExternalMakerEvent, engine: ExternalMakerEngine): void;",
-		anchor: `	/** Subscribe the monitor to a session's events. Returns the unsubscribe function. */
-	attach(session: AgentSession): () => void;`,
-		patched: `	/** Subscribe the monitor to a session's events. Returns the unsubscribe function. */
-	attach(session: AgentSession): () => void;
-	/** Translate one optional-runtime event into the existing task progress/result stream. */
-	acceptExternalEvent(event: ExternalMakerEvent, engine: ExternalMakerEngine): void;`,
-	},
-	{
-		file: "src/task/executor.ts",
-		marker: "let hasExternalUsage = false;",
-		anchor: `	const outputChunks: string[] = [];
-	const finalOutputChunks: string[] = [];`,
-		patched: `	const outputChunks: string[] = [];
-	const finalOutputChunks: string[] = [];
-	const externalToolNames = new Map<string, string>();
-	let externalStreamText = "";
-	let hasExternalUsage = false;
-	const externalUsage = { input: 0, cachedInput: 0, cacheWrite: 0, output: 0 };`,
-	},
-	{
-		file: "src/task/executor.ts",
-		marker: "const acceptExternalEvent = (event: ExternalMakerEvent, engine: ExternalMakerEngine): void => {",
-		anchor: `	const publishAdvisorState = (session: AgentSession | null): void => {`,
-		patched: `	const acceptExternalEvent = (event: ExternalMakerEvent, engine: ExternalMakerEngine): void => {
-		const forward = (mapped: AgentEvent): void => {
-			emitSubagentEvent(mapped);
-			processEvent(mapped);
-		};
-		switch (event.type) {
-			case "session_started":
-				emitSubagentEvent({ type: "agent_start" } as AgentEvent);
-				break;
-			case "text_delta": {
-				externalStreamText += event.text;
-				forward({
-					type: "message_update",
-					message: { role: "assistant", content: [] },
-					assistantMessageEvent: { type: "text_delta", delta: event.text },
-				} as unknown as AgentEvent);
-				break;
-			}
-			case "reasoning_delta":
-				forward({
-					type: "message_update",
-					message: { role: "assistant", content: [] },
-					assistantMessageEvent: { type: "thinking_delta", delta: event.text },
-				} as unknown as AgentEvent);
-				break;
-			case "tool_started":
-				externalToolNames.set(event.id, event.name);
-				forward({
-					type: "tool_execution_start",
-					toolCallId: event.id,
-					toolName: event.name,
-					args: isRecord(event.input) ? event.input : {},
-				} as unknown as AgentEvent);
-				break;
-			case "tool_completed": {
-				const toolName = externalToolNames.get(event.id) ?? "external-tool";
-				externalToolNames.delete(event.id);
-				forward({
-					type: "tool_execution_end",
-					toolCallId: event.id,
-					toolName,
-					args: {},
-					result: { content: [{ type: "text", text: event.output }], details: {} },
-					isError: event.isError,
-				} as unknown as AgentEvent);
-				break;
-			}
-			case "file_changed":
-				progress.lastIntent = \`changed \${event.path}\`;
-				scheduleProgress();
-				break;
-			case "usage":
-				hasExternalUsage = true;
-				externalUsage.input += event.input;
-				externalUsage.cachedInput += event.cachedInput;
-				externalUsage.cacheWrite += event.cacheWrite;
-				externalUsage.output += event.output;
-				break;
-			case "turn_completed": {
-				const report = event.text.trim() ? event.text : externalStreamText;
-				const finalText = \`[external-engine: \${engine}]\${report ? \`\\n\\n\${report}\` : ""}\`;
-				const usage = hasExternalUsage
-					? {
-							input: externalUsage.input,
-							output: externalUsage.output,
-							cacheRead: externalUsage.cachedInput,
-							cacheWrite: externalUsage.cacheWrite,
-							totalTokens:
-								externalUsage.input +
-								externalUsage.cachedInput +
-								externalUsage.cacheWrite +
-								externalUsage.output,
-							reasoningTokens: 0,
-							cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-						}
-					: undefined;
-				const message = {
-					role: "assistant",
-					content: [{ type: "text", text: finalText }],
-					...(usage ? { usage } : {}),
-				};
-				forward({ type: "message_end", message } as unknown as AgentEvent);
-				forward({ type: "agent_end", messages: [message] } as unknown as AgentEvent);
-				if (event.stopReason === "stop") {
-					recordExtractedToolData("yield", { useLastTurn: true });
-				}
-				break;
-			}
-			case "error":
-				progress.lastIntent = "external-engine error";
-				scheduleProgress(true);
-				break;
-		}
-	};
-
-	const publishAdvisorState = (session: AgentSession | null): void => {`,
-	},
-	{
-		file: "src/task/executor.ts",
-		marker: "\t\tacceptExternalEvent,",
-		anchor: `		attach,
-		captureSalvage,`,
-		patched: `		attach,
-		acceptExternalEvent,
-		captureSalvage,`,
-	},
-	{
-		file: "src/task/executor.ts",
-		marker: "Running maker with external engine",
-		anchor: `			const sessionManagerPromise = sessionFile
-				? SessionManager.open(sessionFile, undefined, undefined, {
-						initialCwd: effectiveCwd,
-						parentSession: options.sessionFile ?? undefined,
-						suppressBreadcrumb: true,
-					})
-				: Promise.resolve(SessionManager.inMemory(effectiveCwd));`,
-		patched: `			const externalSelection = resolveExternalMakerEngine(agent.name, model);
-			if (externalSelection) {
-				const { engine, runtimeDir } = externalSelection;
-				progress.resolvedModelRoute = \`external-engine: \${engine}\`;
-				logger.info("Running maker with external engine", {
-					id,
-					engine,
-					provider: model?.provider,
-					model: model?.id,
-				});
-				emitSubagentFrame(options.eventBus, options.subagentEventBus, TASK_SUBAGENT_LIFECYCLE_CHANNEL, {
-					id,
-					agent: agent.name,
-					parentToolCallId: options.parentToolCallId,
-					detached: options.detached,
-					agentSource: agent.source,
-					description: options.description,
-					status: "started" as const,
-					sessionFile: subtaskSessionFile,
-					index,
-				});
-				const runtime = await awaitAbortable(loadExternalMakerRuntime(engine, runtimeDir));
-				const sessionPromise = runtime.createSession({
-					cwd: effectiveCwd,
-					model: model?.id,
-					thinking: effectiveThinkingLevel,
-				});
-				let externalSession: ExternalMakerSession;
-				try {
-					externalSession = await awaitAbortable(sessionPromise);
-				} catch (err) {
-					if (abortSignal.aborted) void sessionPromise.then(session => session.dispose()).catch(() => {});
-					throw err;
-				}
-				let stopReason: "stop" | "aborted" | "error" | undefined;
-				let externalError: string | undefined;
-				const unsubscribeExternal = externalSession.onEvent(event => {
-					if (event.type === "turn_completed") stopReason = event.stopReason;
-					if (event.type === "error") externalError = event.message;
-					monitor.acceptExternalEvent(event, engine);
-				});
-				const onExternalAbort = () => {
-					void externalSession.abort().catch(err => {
-						logger.debug("External maker abort failed", {
-							id,
-							engine,
-							error: err instanceof Error ? err.message : String(err),
-						});
-					});
-				};
-				abortSignal.addEventListener("abort", onExternalAbort, { once: true });
-				try {
-					const externalSystemPrompt = prompt.render(subagentSystemPromptTemplate, {
-						agent: agent.systemPrompt,
-						context: options.context?.trim() ?? "",
-						planReference: options.planReference?.content ?? "",
-						planReferencePath: options.planReference?.path ?? "",
-						worktree: worktree ?? "",
-						outputSchema: undefined,
-						outputSchemaOverridesAgent: false,
-						workPoolYieldItems: [],
-						ircPeers: [],
-						ircParkedCount: 0,
-						ircOmittedCount: 0,
-						ircSelfId: "",
-					});
-					const externalPrompt =
-						\`\${externalSystemPrompt}\\n\\n§ External engine completion\\n\` +
-						"Complete the assignment and return the final report as ordinary text in this turn. " +
-						"The bridge normalizes that text into the parent task result; the OMP yield tool is unavailable.\\n\\n" +
-						\`§ Assignment\\n\${task}\`;
-					readyAt = performance.now();
-					await awaitAbortable(externalSession.prompt(externalPrompt));
-					if (abortSignal.aborted || stopReason === "aborted") {
-						return {
-							exitCode: 1,
-							aborted: true,
-							abortReason: monitor.resolveAbortReasonText(),
-							durationMs: Date.now() - startTime,
-						};
-					}
-					if (stopReason !== "stop") {
-						throw new Error(externalError ?? \`External maker engine \${engine} ended without a successful turn\`);
-					}
-					return { exitCode: 0, durationMs: Date.now() - startTime };
-				} finally {
-					abortSignal.removeEventListener("abort", onExternalAbort);
-					unsubscribeExternal();
-					await externalSession.dispose();
-				}
-			}
-
-			const sessionManagerPromise = sessionFile
-				? SessionManager.open(sessionFile, undefined, undefined, {
-						initialCwd: effectiveCwd,
-						parentSession: options.sessionFile ?? undefined,
-						suppressBreadcrumb: true,
-					})
-				: Promise.resolve(SessionManager.inMemory(effectiveCwd));`,
-	},
-	{
-		file: "src/task/executor.ts",
-		marker: 'const externalEngineResult = progress.resolvedModelRoute?.startsWith("external-engine:") === true;',
-		anchor: `	// Breadcrumb the synchronous yield-payload shaping (O(rawOutput)) so a block
-	// here is attributed to this subagent rather than logged as "unknown".
-	pushLoopPhase(\`subagent:\${id}\`);
-	let finalized: FinalizeSubprocessOutputResult;`,
-		patched: `	// Breadcrumb the synchronous yield-payload shaping (O(rawOutput)) so a block
-	// here is attributed to this subagent rather than logged as "unknown".
-	pushLoopPhase(\`subagent:\${id}\`);
-	const externalEngineResult = progress.resolvedModelRoute?.startsWith("external-engine:") === true;
-	let finalized: FinalizeSubprocessOutputResult;`,
-	},
-	{
-		file: "src/task/executor.ts",
-		marker: 'outputSchemaSource: externalEngineResult ? "none" : args.outputSchemaSource,',
-		anchor: `			outputSchema: args.outputSchema,
-			outputSchemaMode: args.outputSchemaMode,
-			outputSchemaSource: args.outputSchemaSource,`,
-		patched: `			// Optional runtimes return one ordinary-text turn and do not expose the
-			// core yield tool. Keep their result on the normal SingleResult path,
-			// but do not claim caller-schema validation that never ran.
-			outputSchema: externalEngineResult ? undefined : args.outputSchema,
-			outputSchemaMode: externalEngineResult ? undefined : args.outputSchemaMode,
-			outputSchemaSource: externalEngineResult ? "none" : args.outputSchemaSource,`,
-	},
 	// ---- task per-item model selector (Arena hypothesis makers) ----
 	// 네이티브 task wire 계약에는 per-spawn 모델 선택기가 없고 모델은 agent 정의에서만
 	// 왔다. StructuredSubagentRequest.model → resolveEffectiveSubagentPolicy의
@@ -2438,19 +2215,37 @@ async function loadExternalMakerRuntime(
 	// 인증/approved-fallback/재시도 체인·task-guard 상한은 건드리지 않는다.
 	// 잘못된 값은 기존 fall-through(다음 소스로 전이)를 따르므로, 엄격한 거부는
 	// 호출자(Arena 런타임의 사전 해석)가 맡는다.
+	// 18.5.0 RETIRE: upstream 이 같은 per-call model selector 를 넣었다(string | string[], batch 최상위는 never,
+	// 해석 실패 시 대체 금지; pi-tui task.ts:2156·2185, types.ts 각 schema, index.ts:306·330·820·1631). 아래 11항목은
+	// 18.4.12 본 후보를 유지하고, 18.5.0 에는 upstream 줄 자체의 no-op 후보를 둔다. 본 후보 앵커는 18.5.0 이 바로 뒤에
+	// 넣은 upstream 줄과 겹치지 않는 범위까지 넓혀 새 판 순정에서 성립하지 않게 한다. index.ts 의 preflight·launch 두
+	// 줄은 18.5.0 순정과 18.4.12 적용본이 국소 문맥까지 같아 같은 파일의 18.5.0 전용 import(invalidModelSelectorReason)
+	// 유무로 가른다. Maker 단일 모델은 maker-routing guard(`typeof item.model === "string"`)가 계속 막는다.
 	{
 		// 18.2.5: upstream 이 TaskItem 을 @oh-my-pi/pi-tui 로 옮기고 effort 타입을 인라인했다.
 		file: "../pi-tui/src/tools/task.ts",
 		marker: "Standard model selector for this spawn (item)",
-		anchor: "\t/** Per-spawn thinking effort: lowest/middle/highest level the resolved model supports. Overrides the agent's default selector (e.g. `auto`). */\n\teffort?: \"lo\" | \"med\" | \"hi\";",
-		patched: "\t/** Per-spawn thinking effort: lowest/middle/highest level the resolved model supports. Overrides the agent's default selector (e.g. `auto`). */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/**\n\t * Standard model selector for this spawn (item), e.g. \"provider/model-id:max\".\n\t * Forwards to the existing subagent model resolution (`requestModel` first,\n\t * then `task.agentModelOverrides`, then the agent definition); omitted\n\t * preserves existing behavior. Unresolvable values fall through to the next\n\t * source per existing precedence, so callers needing strictness must\n\t * pre-resolve. A `:level` suffix pins exact thinking effort unless\n\t * per-spawn `effort` overrides it.\n\t */\n\tmodel?: string;",
+		anchor: "\t/** Per-spawn thinking effort: lowest/middle/highest level the resolved model supports. Overrides the agent's default selector (e.g. `auto`). */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/** Caller-provided output schema;",
+		patched: "\t/** Per-spawn thinking effort: lowest/middle/highest level the resolved model supports. Overrides the agent's default selector (e.g. `auto`). */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/**\n\t * Standard model selector for this spawn (item), e.g. \"provider/model-id:max\".\n\t * Forwards to the existing subagent model resolution (`requestModel` first,\n\t * then `task.agentModelOverrides`, then the agent definition); omitted\n\t * preserves existing behavior. Unresolvable values fall through to the next\n\t * source per existing precedence, so callers needing strictness must\n\t * pre-resolve. A `:level` suffix pins exact thinking effort unless\n\t * per-spawn `effort` overrides it.\n\t */\n\tmodel?: string;\n\t/** Caller-provided output schema;",
+		alternates: [{
+			file: "../pi-tui/src/tools/task.ts",
+			marker: "\t/** Per-spawn thinking effort: lowest/middle/highest level the resolved model supports. Overrides the agent's default selector (e.g. `auto`). */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/** Per-spawn model selector or ordered selector array; overrides agent and settings preferences. */\n\tmodel?: string | string[];",
+			anchor: "\t/** Per-spawn thinking effort: lowest/middle/highest level the resolved model supports. Overrides the agent's default selector (e.g. `auto`). */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/** Per-spawn model selector or ordered selector array; overrides agent and settings preferences. */\n\tmodel?: string | string[];",
+			patched: "\t/** Per-spawn thinking effort: lowest/middle/highest level the resolved model supports. Overrides the agent's default selector (e.g. `auto`). */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/** Per-spawn model selector or ordered selector array; overrides agent and settings preferences. */\n\tmodel?: string | string[];",
+		}],
 	},
 	{
 		// 18.2.5: upstream 이 TaskParams 를 @oh-my-pi/pi-tui 로 옮기고 effort 타입을 인라인했다.
 		file: "../pi-tui/src/tools/task.ts",
 		marker: "Standard model selector for this spawn (flat form)",
-		anchor: "\t/** Per-spawn thinking effort (flat form): lowest/middle/highest level the resolved model supports. */\n\teffort?: \"lo\" | \"med\" | \"hi\";",
-		patched: "\t/** Per-spawn thinking effort (flat form): lowest/middle/highest level the resolved model supports. */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/**\n\t * Standard model selector for this spawn (flat form), e.g. \"provider/model-id:max\".\n\t * Same forwarding and fall-through semantics as the batch item field.\n\t */\n\tmodel?: string;",
+		anchor: "\t/** Per-spawn thinking effort (flat form): lowest/middle/highest level the resolved model supports. */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/** Caller-provided output schema;",
+		patched: "\t/** Per-spawn thinking effort (flat form): lowest/middle/highest level the resolved model supports. */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/**\n\t * Standard model selector for this spawn (flat form), e.g. \"provider/model-id:max\".\n\t * Same forwarding and fall-through semantics as the batch item field.\n\t */\n\tmodel?: string;\n\t/** Caller-provided output schema;",
+		alternates: [{
+			file: "../pi-tui/src/tools/task.ts",
+			marker: "\t/** Per-spawn thinking effort (flat form): lowest/middle/highest level the resolved model supports. */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/** Per-spawn model selector or ordered selector array; overrides agent and settings preferences. */\n\tmodel?: string | string[];",
+			anchor: "\t/** Per-spawn thinking effort (flat form): lowest/middle/highest level the resolved model supports. */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/** Per-spawn model selector or ordered selector array; overrides agent and settings preferences. */\n\tmodel?: string | string[];",
+			patched: "\t/** Per-spawn thinking effort (flat form): lowest/middle/highest level the resolved model supports. */\n\teffort?: \"lo\" | \"med\" | \"hi\";\n\t/** Per-spawn model selector or ordered selector array; overrides agent and settings preferences. */\n\tmodel?: string | string[];",
+		}],
 	},
 	{
 		// 18.3.4는 모든 task schema에 필수 `solutionSpace: "string"` 을 `task` 바로 뒤에 넣었다
@@ -2503,6 +2298,27 @@ const taskItemSchemaIsolated = type({
 	"isolated?": "boolean",
 	"+": "delete",
 });`,
+		alternates: [{
+			file: "src/task/types.ts",
+			marker: `export const taskItemSchema = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+			anchor: `export const taskItemSchema = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+			patched: `export const taskItemSchema = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+		}],
 	},
 	{
 		file: "src/task/types.ts",
@@ -2525,6 +2341,27 @@ const taskItemSchemaIsolated = type({
 	solutionSpace: "string",
 	"model?": "string",
 	"outputSchema?": outputSchemaInputSchema,`,
+		alternates: [{
+			file: "src/task/types.ts",
+			marker: `export const taskSchema = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+			anchor: `export const taskSchema = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+			patched: `export const taskSchema = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+		}],
 	},
 	{
 		file: "src/task/types.ts",
@@ -2547,6 +2384,27 @@ const taskItemSchemaIsolated = type({
 	solutionSpace: "string",
 	"model?": "string",
 	"outputSchema?": outputSchemaInputSchema,`,
+		alternates: [{
+			file: "src/task/types.ts",
+			marker: `const taskSchemaNoIsolation = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+			anchor: `const taskSchemaNoIsolation = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+			patched: `const taskSchemaNoIsolation = type({
+	"name?": "string",
+	agent: "string = 'task'",
+	task: "string",
+	solutionSpace: "string",
+	"model?": "string | string[]",`,
+		}],
 	},
 	{
 		file: "src/task/types.ts",
@@ -2585,6 +2443,18 @@ const taskItemSchemaIsolated = type({
 				"isolated?": "boolean",
 				"+": "delete",
 			});`,
+		alternates: [{
+			file: "src/task/types.ts",
+			marker: `				solutionSpace: "string",
+				...effortField,
+				"model?": "string | string[]",`,
+			anchor: `				solutionSpace: "string",
+				...effortField,
+				"model?": "string | string[]",`,
+			patched: `				solutionSpace: "string",
+				...effortField,
+				"model?": "string | string[]",`,
+		}],
 	},
 	{
 		file: "src/task/types.ts",
@@ -2618,23 +2488,92 @@ const taskItemSchemaIsolated = type({
 			...toolsField,
 			"+": "delete",
 		});`,
+		alternates: [{
+			file: "src/task/types.ts",
+			marker: `			solutionSpace: "string",
+			...effortField,
+			"model?": "string | string[]",`,
+			anchor: `			solutionSpace: "string",
+			...effortField,
+			"model?": "string | string[]",`,
+			patched: `			solutionSpace: "string",
+			...effortField,
+			"model?": "string | string[]",`,
+		}],
 	},
 	{
 		file: "src/task/index.ts",
-		marker: "item.model = params.model;",
-		anchor: `	const item: TaskItem = { name: params.name, agent: params.agent, task: params.task };`,
-		patched: `	const item: TaskItem = { name: params.name, agent: params.agent, task: params.task };
+		marker: `	const item: TaskItem = { name: params.name, agent: params.agent, task: params.task };
 	if ("model" in params) item.model = params.model;`,
+		anchor: `	const item: TaskItem = { name: params.name, agent: params.agent, task: params.task };
+	if ("solutionSpace" in params) item.solutionSpace = params.solutionSpace;
+	if ("outputSchema" in params) item.outputSchema = params.outputSchema;
+	if ("schemaMode" in params) item.schemaMode = params.schemaMode;
+	if ("tools" in params) item.tools = params.tools;
+	if ("effort" in params) item.effort = params.effort;
+	if ("isolated" in params) item.isolated = params.isolated;`,
+		patched: `	const item: TaskItem = { name: params.name, agent: params.agent, task: params.task };
+	if ("model" in params) item.model = params.model;
+	if ("solutionSpace" in params) item.solutionSpace = params.solutionSpace;
+	if ("outputSchema" in params) item.outputSchema = params.outputSchema;
+	if ("schemaMode" in params) item.schemaMode = params.schemaMode;
+	if ("tools" in params) item.tools = params.tools;
+	if ("effort" in params) item.effort = params.effort;
+	if ("isolated" in params) item.isolated = params.isolated;`,
+		alternates: [{
+			file: "src/task/index.ts",
+			marker: `	if ("effort" in params) item.effort = params.effort;
+	if ("model" in params) item.model = params.model;
+	if ("isolated" in params) item.isolated = params.isolated;`,
+			anchor: `	if ("effort" in params) item.effort = params.effort;
+	if ("model" in params) item.model = params.model;
+	if ("isolated" in params) item.isolated = params.isolated;`,
+			patched: `	if ("effort" in params) item.effort = params.effort;
+	if ("model" in params) item.model = params.model;
+	if ("isolated" in params) item.isolated = params.isolated;`,
+		}],
 	},
 	{
 		file: "src/task/index.ts",
-		marker: "spawn.model = item.model;",
-		anchor: `	const spawn: TaskParams = { agent: item.agent?.trim() || defaultAgent };`,
-		patched: `	const spawn: TaskParams = { agent: item.agent?.trim() || defaultAgent };
+		marker: `	const spawn: TaskParams = { agent: item.agent?.trim() || defaultAgent };
 	if ("model" in item) spawn.model = item.model;`,
+		anchor: `	const spawn: TaskParams = { agent: item.agent?.trim() || defaultAgent };
+	if (item.name !== undefined) spawn.name = item.name;
+	if (item.task !== undefined) spawn.task = item.task;
+	if (item.solutionSpace !== undefined) spawn.solutionSpace = item.solutionSpace;
+	if (params.context !== undefined) spawn.context = params.context;
+	if ("outputSchema" in item) spawn.outputSchema = item.outputSchema;
+	if ("schemaMode" in item) spawn.schemaMode = item.schemaMode;
+	if ("tools" in item) spawn.tools = item.tools;
+	if ("effort" in item) spawn.effort = item.effort;
+	if (item.isolated !== undefined) {`,
+		patched: `	const spawn: TaskParams = { agent: item.agent?.trim() || defaultAgent };
+	if ("model" in item) spawn.model = item.model;
+	if (item.name !== undefined) spawn.name = item.name;
+	if (item.task !== undefined) spawn.task = item.task;
+	if (item.solutionSpace !== undefined) spawn.solutionSpace = item.solutionSpace;
+	if (params.context !== undefined) spawn.context = params.context;
+	if ("outputSchema" in item) spawn.outputSchema = item.outputSchema;
+	if ("schemaMode" in item) spawn.schemaMode = item.schemaMode;
+	if ("tools" in item) spawn.tools = item.tools;
+	if ("effort" in item) spawn.effort = item.effort;
+	if (item.isolated !== undefined) {`,
+		alternates: [{
+			file: "src/task/index.ts",
+			marker: `	if ("effort" in item) spawn.effort = item.effort;
+	if ("model" in item) spawn.model = item.model;
+	if (item.isolated !== undefined) {`,
+			anchor: `	if ("effort" in item) spawn.effort = item.effort;
+	if ("model" in item) spawn.model = item.model;
+	if (item.isolated !== undefined) {`,
+			patched: `	if ("effort" in item) spawn.effort = item.effort;
+	if ("model" in item) spawn.model = item.model;
+	if (item.isolated !== undefined) {`,
+		}],
 	},
 	{
 		file: "src/task/index.ts",
+		excludes: "invalidModelSelectorReason",
 		marker: `...(params.model !== undefined ? { model: params.model } : {}),
 			...("isolated" in params`,
 		anchor: `			...(params.effort !== undefined ? { effort: params.effort } : {}),
@@ -2642,9 +2581,23 @@ const taskItemSchemaIsolated = type({
 		patched: `			...(params.effort !== undefined ? { effort: params.effort } : {}),
 			...(params.model !== undefined ? { model: params.model } : {}),
 			...("isolated" in params ? { isolation: { requested: params.isolated } } : {}),`,
+		alternates: [{
+			file: "src/task/index.ts",
+			requires: "invalidModelSelectorReason",
+			marker: `			...(params.effort !== undefined ? { effort: params.effort } : {}),
+			...(params.model !== undefined ? { model: params.model } : {}),
+			...("isolated" in params ? { isolation: { requested: params.isolated } } : {}),`,
+			anchor: `			...(params.effort !== undefined ? { effort: params.effort } : {}),
+			...(params.model !== undefined ? { model: params.model } : {}),
+			...("isolated" in params ? { isolation: { requested: params.isolated } } : {}),`,
+			patched: `			...(params.effort !== undefined ? { effort: params.effort } : {}),
+			...(params.model !== undefined ? { model: params.model } : {}),
+			...("isolated" in params ? { isolation: { requested: params.isolated } } : {}),`,
+		}],
 	},
 	{
 		file: "src/task/index.ts",
+		excludes: "invalidModelSelectorReason",
 		marker: `...(params.model !== undefined ? { model: params.model } : {}),
 				...(params.tools?.length`,
 		// 18.3.4는 effort 다음 줄에 `solutionSpace: params.solutionSpace,` 를 넣었다(index.ts:1506).
@@ -2655,6 +2608,19 @@ const taskItemSchemaIsolated = type({
 				solutionSpace: params.solutionSpace,
 				...(params.model !== undefined ? { model: params.model } : {}),
 				...(params.tools?.length`,
+		alternates: [{
+			file: "src/task/index.ts",
+			requires: "invalidModelSelectorReason",
+			marker: `				solutionSpace: params.solutionSpace,
+				...(params.model !== undefined ? { model: params.model } : {}),
+				...(params.tools?.length`,
+			anchor: `				solutionSpace: params.solutionSpace,
+				...(params.model !== undefined ? { model: params.model } : {}),
+				...(params.tools?.length`,
+			patched: `				solutionSpace: params.solutionSpace,
+				...(params.model !== undefined ? { model: params.model } : {}),
+				...(params.tools?.length`,
+		}],
 	},
 	{
 		// 18.3.3 BLOCK: upstream 은 `task`·`bash` 를 가진 SubAgent 정의에 `wait` 를 자동으로 더한다
@@ -2730,7 +2696,8 @@ import { isUnexpectedSocketCloseMessage } from "@oh-my-pi/pi-utils/fetch-retry";
 	},
 	{
 		file: "src/session/turn-recovery.ts",
-		marker: `!baiTransportSameModelRetry`,
+		marker: `!(retryBudgetExhausted && classifierRefusal) &&
+				!baiTransportSameModelRetry`,
 		anchor: `			if (
 				allowModelFallback &&
 				retrySettings.modelFallback &&
@@ -2748,6 +2715,23 @@ import { isUnexpectedSocketCloseMessage } from "@oh-my-pi/pi-utils/fetch-retry";
 				!baiTransportSameModelRetry
 			) {
 `,
+		// 18.5.0: upstream 이 같은 조건 끝에 첫 시도·스트리밍 진행이 있는 socket drop 의 같은 모델 1회 재시도를 넣었다
+		// (turn-recovery.ts:1623-1636·2630). 합집합으로 둔다: upstream 조건은 그대로 두고 b-ai 전송 장애(2회차 이후,
+		// 내용 없는 끊김, stream read 오류)만 뒤에 덧붙인다.
+		alternates: [{
+			file: "src/session/turn-recovery.ts",
+			marker: `!this.#isFirstAttemptMidStreamSocketDrop(message, id, retryBudgetExhausted) &&
+				!baiTransportSameModelRetry`,
+			anchor: `				!(retryBudgetExhausted && classifierRefusal) &&
+				!this.#isFirstAttemptMidStreamSocketDrop(message, id, retryBudgetExhausted)
+			) {
+`,
+			patched: `				!(retryBudgetExhausted && classifierRefusal) &&
+				!this.#isFirstAttemptMidStreamSocketDrop(message, id, retryBudgetExhausted) &&
+				!baiTransportSameModelRetry
+			) {
+`,
+		}],
 	},
 	{
 		file: "src/registry/agent-lifecycle.ts",
@@ -7618,10 +7602,10 @@ export interface MCPDeferredServer {
 		// MCP 선택 연결: 매 사용자 요청의 system prompt 전에 mcp_select를 보내 고른 deferred 서버만 연결하고 노출 subset을 적용한다. 실패는 새 연결 0.
 		file: "src/session/agent-session.ts",
 		marker: `import type { MCPManager } from "../mcp/manager";`,
-		anchor: `} from "@oh-my-pi/pi-utils";
-import type { AdvisorConfig } from "@oh-my-pi/pi-tui/overlays/advisor-config";`,
-		patched: `} from "@oh-my-pi/pi-utils";
-import type { MCPManager } from "../mcp/manager";
+		// 18.5.0: upstream 이 pi-utils import 블록 바로 뒤에 `@oh-my-pi/pi-utils/ar` import 를 넣어 두 줄 앵커가 끊겼다.
+		// AdvisorConfig import 한 줄(두 판 모두 파일 안 1회)만 잡는다. 적용 결과 바이트는 18.4.12 와 같다.
+		anchor: `import type { AdvisorConfig } from "@oh-my-pi/pi-tui/overlays/advisor-config";`,
+		patched: `import type { MCPManager } from "../mcp/manager";
 import type { AdvisorConfig } from "@oh-my-pi/pi-tui/overlays/advisor-config";`,
 	},
 	{
@@ -8314,11 +8298,14 @@ function parentSubagentServiceTiers(
 		// 18.4.10(#14019)은 이 행에 prefixBinding을 넣었지만 binding controls는 false로 남긴다. 18.4.10 후보는 binding controls만 켠다.
 		// 그 결과가 18.4.6 적용본과 바이트까지 같으면 두 후보가 함께 applied(ambiguous)이고, 문맥으로도 가를 수 없다(가장 가까운
 		// 18.4.6↔18.4.10 차이가 앵커 앞 53K자·뒤 249K자). 그래서 18.4.10 결과만 `": true"` 공백으로 구분한다. JSON.parse는 이 공백을 무시한다.
+		// 18.4.12: 같은 행의 측정값 tps가 95.2→92.9로 바뀌어 18.4.10 앵커가 사라졌다. thinking(prefixBinding true)·compat(binding
+		// controls false)는 18.4.10과 같으므로 본 후보는 18.4.10 후보에서 tps만 바꾼다. 두 판 결과는 tps 뒤가 같아 예전 marker(tps
+		// 뒤 조각)로는 둘 다 applied(ambiguous)가 되므로, 18.4.12·18.4.10 후보 모두 tps를 포함한 patched 전체를 marker로 쓴다.
 		file: "../pi-catalog/src/models.json",
-		marker: OPUS55_ROW_1846.marker.replace('"supportsThinkingBindingControls":true', '"supportsThinkingBindingControls": true'),
-		anchor: OPUS55_ROW_1846.anchor.replace('"supportsDisplay":true}', '"supportsDisplay":true,"prefixBinding":true}'),
-		patched: OPUS55_ROW_1846.patched.replace('"supportsThinkingBindingControls":true', '"supportsThinkingBindingControls": true'),
-		alternates: [OPUS55_ROW_1846],
+		marker: OPUS55_ROW_18410.patched.replace(OPUS55_TPS_18410, OPUS55_TPS_18412),
+		anchor: OPUS55_ROW_18410.anchor.replace(OPUS55_TPS_18410, OPUS55_TPS_18412),
+		patched: OPUS55_ROW_18410.patched.replace(OPUS55_TPS_18410, OPUS55_TPS_18412),
+		alternates: [OPUS55_ROW_18410, OPUS55_ROW_1846],
 	},
 	{
 		// 모든 provider의 Opus 5.5 규칙 계보에 prefixBinding(Sonnet 5.5 규칙과 같은 모양). 18.4.10은 upstream #14019가 kdl:61에
@@ -8516,23 +8503,45 @@ function parentSubagentServiceTiers(
 	// 파일은 읽기만 한다. 웹 route는 번들 `dist/cli.js --export`를 먼저 실행하므로 번들의 같은 함수에도 같은 조건을
 	// 넣는다(min 식별자까지 정확히 일치하는 18.4.5 앵커, 버전이 바뀌면 조용히 어긋나지 않고 anchor-lost).
 	// 회귀: patches/core-export-advisor-test.ts(실제 SDK exportFromFile과 bun dist/cli.js --export의 HTML).
+	// 18.5.0: upstream 이 같은 수집을 `session/sub-sessions.ts` 로 옮기고 그 루프에서 isAdvisorTranscriptName 으로
+	// 거른다(sub-sessions.ts:11·61, 번들도 같은 조건). 세 항목 모두 그 upstream 줄의 no-op 후보를 둔다(RETIRE).
+	// 본 후보 앵커는 18.5.0 에서 지워진 loadEntriesFromFile import 를 함께 잡아 새 판 순정에서 성립하지 않게 한다.
 	{
 		file: "src/export/html/index.ts",
 		marker: 'import { isAdvisorTranscriptName } from "../../advisor/transcript-recorder";',
-		anchor: 'import type { SessionEntry, SessionHeader } from "../../session/session-entries";',
-		patched: 'import { isAdvisorTranscriptName } from "../../advisor/transcript-recorder";\nimport type { SessionEntry, SessionHeader } from "../../session/session-entries";',
+		anchor: 'import type { SessionEntry, SessionHeader } from "../../session/session-entries";\nimport { loadEntriesFromFile } from "../../session/session-loader";',
+		patched: 'import { isAdvisorTranscriptName } from "../../advisor/transcript-recorder";\nimport type { SessionEntry, SessionHeader } from "../../session/session-entries";\nimport { loadEntriesFromFile } from "../../session/session-loader";',
+		alternates: [{
+			file: "src/session/sub-sessions.ts",
+			marker: 'import { isAdvisorTranscriptName } from "../advisor/transcript-recorder";',
+			anchor: 'import { isAdvisorTranscriptName } from "../advisor/transcript-recorder";',
+			patched: 'import { isAdvisorTranscriptName } from "../advisor/transcript-recorder";',
+		}],
 	},
 	{
 		file: "src/export/html/index.ts",
 		marker: '		// Advisor transcripts share this directory but are the advisor\'s own prompts and reviews, not subagents.\n',
 		anchor: '		if (!name.endsWith(".jsonl") || name.includes(".bak")) continue;\n',
 		patched: '		if (!name.endsWith(".jsonl") || name.includes(".bak")) continue;\n		// Advisor transcripts share this directory but are the advisor\'s own prompts and reviews, not subagents.\n		if (isAdvisorTranscriptName(name)) continue;\n',
+		alternates: [{
+			file: "src/session/sub-sessions.ts",
+			marker: '		if (!name.endsWith(".jsonl") || name.includes(".bak") || isAdvisorTranscriptName(name)) continue;\n',
+			anchor: '		if (!name.endsWith(".jsonl") || name.includes(".bak") || isAdvisorTranscriptName(name)) continue;\n',
+			patched: '		if (!name.endsWith(".jsonl") || name.includes(".bak") || isAdvisorTranscriptName(name)) continue;\n',
+		}],
 	},
 	{
 		file: "dist/cli.js",
 		marker: 'if(!o.endsWith(".jsonl")||o.includes(".bak")||o==="__advisor.jsonl"||o.startsWith("__advisor.")&&o.endsWith(".jsonl"))continue;let r=o.slice(0,-6),',
 		anchor: 'if(!o.endsWith(".jsonl")||o.includes(".bak"))continue;let r=o.slice(0,-6),',
 		patched: 'if(!o.endsWith(".jsonl")||o.includes(".bak")||o==="__advisor.jsonl"||o.startsWith("__advisor.")&&o.endsWith(".jsonl"))continue;let r=o.slice(0,-6),',
+		// 18.5.0 번들의 upstream 조건(XTe = isAdvisorTranscriptName) 자체의 no-op.
+		alternates: [{
+			file: "dist/cli.js",
+			marker: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||XTe(i))continue;let a=i.slice(0,-6),',
+			anchor: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||XTe(i))continue;let a=i.slice(0,-6),',
+			patched: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||XTe(i))continue;let a=i.slice(0,-6),',
+		}],
 	},
 	// 18.4.5 는 /ratchet 을 새로 넣으면서 `src/ratchet/prelude.ts`(코드)와 `prelude.js`(eval 텍스트 자산)를 같은 stem 으로
 	// 두고 sdk.ts 가 `./ratchet/prelude` 로 import 한다. Bun 1.4.2 는 node_modules 안의 확장자 없는 import 를 .js 부터
@@ -8977,20 +8986,23 @@ class HarmonyLeakInterruption extends Error {`,
 // 비교·치환이 어긋나지 않는다. core 파일 자체의 줄 끝은 건드리지 않는다.
 for (const entry of EDITS) {
 	for (const candidate of [entry, ...(entry.alternates ?? [])]) {
-		for (const key of ["anchor", "marker", "patched", "legacyPatched"]) {
+		for (const key of ["anchor", "marker", "patched", "legacyPatched", "requires", "excludes"]) {
 			if (typeof candidate[key] === "string") candidate[key] = candidate[key].replaceAll("\r\n", "\n");
 		}
 	}
 }
 
 
-
 /**
  * 항목 하나를 이 설치에서 성립하는 후보로 좁힌다. 후보는 항목 자신과 `alternates` 이고 각 후보는
  * file·anchor·marker·patched 묶음이다. upstream 이 그 조각을 다른 모듈이나 다른 패키지로 옮기면
  * 옛 설치와 새 설치에서 앵커의 파일과 문구가 갈라지므로, 같은 목적을 양쪽 설치에 그대로 적용하려면
  * 후보가 필요하다(18.2.5의 pi-coding-agent → pi-tui 이동). 성립하는 후보는 정확히 하나여야 한다.
  * 둘 이상이면 어느 쪽이 정본인지 알 수 없으므로 한쪽을 조용히 고르지 않고 실패한다.
+ * 선택 키 `requires`·`excludes` 는 같은 파일 안에 그 문자열이 있어야/없어야 후보로 본다. 옛 판의 적용본과
+ * 새 판의 순정이 국소 문맥까지 바이트가 같을 때만 쓴다(18.5.0 task/index.ts 의 model 전달: upstream 이 우리
+ * 패치와 같은 줄을 넣어 marker 만으로는 "옛 판 적용본"과 "새 판 순정"을 가를 수 없고, 잘못 가르면 --revert 가
+ * upstream 줄을 지운다). 조건은 marker·anchor 판별 전에 적용하고, 남은 후보 수 규칙은 그대로다.
  */
 function resolveEdit(entry, target) {
 	const candidates = [entry, ...(entry.alternates ?? [])];
@@ -8999,6 +9011,8 @@ function resolveEdit(entry, target) {
 	const live = present
 		.map(candidate => {
 			const text = readFileSync(join(target, candidate.file), "utf8");
+			if (candidate.requires !== undefined && !text.includes(candidate.requires)) return undefined;
+			if (candidate.excludes !== undefined && text.includes(candidate.excludes)) return undefined;
 			if (candidate.legacyPatched && text.includes(candidate.legacyPatched)) return { ...candidate, path: join(target, candidate.file), text, status: "legacy" };
 			if (text.includes(candidate.marker)) return { ...candidate, path: join(target, candidate.file), text, status: "applied" };
 			if (text.includes(candidate.anchor)) return { ...candidate, path: join(target, candidate.file), text, status: "appliable" };