cuelo 0.7.2 → 0.8.1

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의
@@ -3296,24 +3073,27 @@ import { resolveUsedFraction } from "../usage";`,
 		patched: "import {\n\torderUsageRankedCandidates,\n\tPRIMARY_WINDOW_HOT_FRACTION,\n\tplanPriority,\n",
 	},
 	{
-		// 2026-09-29 사용자 정책: Anthropic 새/cold 재선택은 RIN(저장 순서 0)을 먼저 쓰고, RIN 이 주간 한도의
-		// 하루 구간(사용량 패널 paceOf 와 같은 기준: 지난 날 수 + 1 일치)을 넘으면 MIO 로 넘긴다. 날이 바뀌어
-		// 허용치가 늘면 다시 RIN 이다. 둘 다 넘었으면 덜 넘은 쪽. 옛 "주간 reset 이 빠른 계정 우선"(2026-09-26)을
-		// 대체한다(legacyPatched). 사용량 그림이 완전하고 건강한 후보만, upstream ranking 에서 이미 차지한
-		// 자리들 안에서만 재배열한다. unknown·partial·blocked·reserve·plan 부적격·5h hot 후보는 upstream 자리
-		// 그대로다. exact summon 은 이 앞에서 return 하고 warm/explicit pin·plan pin 재승격은 이 뒤에 온다.
-		// 18.4.5(#13889)는 비ranking 후보 목록 끝을 `}));` 에서 삼항 map 으로 바꾸고 ranking 비교기에 spent
-		// allowance 를 reserve 보다 앞에 넣었다. 재배열 대상은 한도 미도달·측정 완료(used<1) 후보뿐이라 spent
-		// 후보는 upstream 자리 그대로다. 앵커는 두 버전 모두 한 번 있는 preflightFailures 선언 한 줄이다.
+		// 2026-10-02 사용자 정책: "리셋이 얼마 안 남았는데 한도가 많이 남은 계정을 적극 쓴다". Anthropic 새/cold
+		// 선택에서 오늘 몫(사용량 패널 paceOf 와 같은 기준: (지난 날 수 + 1) / 창 일수) 안쪽 계정끼리는 저장
+		// 순서 대신 7d required drain(남은 비율 ÷ 리셋까지 남은 시간, upstream windowRequiredDrain 그대로)이 큰
+		// 계정을 먼저 쓴다. 몫을 넘은 계정은 몫 안쪽 계정 뒤(페이스 보호), 둘 다 넘었으면 덜 넘은 쪽, 동률은 저장
+		// 순서(위치 0 먼저). 2026-09-29 "몫 안쪽은 RIN(저장 순서 0) 먼저" 적용본을 대체한다(legacyPatched).
+		// 사용량 그림이 완전하고 건강한 후보만, upstream ranking 에서 이미 차지한 자리들 안에서만 재배열한다.
+		// unknown·partial·blocked·reserve·plan 부적격·5h hot 후보는 upstream 자리 그대로다. exact summon 은 이
+		// 앞에서 return 하고 warm/explicit pin·plan pin 재승격은 이 뒤에 온다(warm pin 은 shouldRank=false).
+		// 재배열 대상은 한도 미도달·측정 완료(used<1) 후보뿐이라 18.4.5 spent allowance 후보는 upstream 자리 그대로다.
+		// 앵커는 18.4.4~18.4.6 모두 한 번 있는 preflightFailures 선언 한 줄이다. 검증: core-account-order-test.ts.
 		file: "../pi-ai/src/auth/select.ts",
-		marker: "// Prefer RIN (first Anthropic account) while it stays inside its daily slice of the weekly quota.",
+		marker: "// Prefer the Anthropic account whose unused weekly quota expires soonest, inside its daily slice.",
 		anchor: "\t\tconst preflightFailures = new Set<OAuthCandidate>();",
-		legacyPatched: `		// Prefer the healthy Anthropic account whose weekly window resets first.
+		legacyPatched: `		// Prefer RIN (first Anthropic account) while it stays inside its daily slice of the weekly quota.
 		// Only candidates with a complete, healthy usage picture move, and only among the slots they
 		// already hold in the upstream ranking: unknown, partial, blocked, reserve, plan-ineligible or
-		// 5h-hot candidates keep their place. Ties: larger remaining weekly quota, then upstream order.
+		// 5h-hot candidates keep their place. Daily slice = (elapsed whole days + 1) / window days.
+		// Inside the slice: storage order. Over it: smaller overshoot first, then storage order.
 		if (provider === "anthropic" && shouldRank && strategy) {
 			const nowMs = Date.now();
+			const dayMs = 86_400_000;
 			const weekly = candidates.map(candidate => {
 				const usage = candidate.usage;
 				if (!candidate.usageChecked || !usage || candidate.inReserve === true) return undefined;
@@ -3343,17 +3123,21 @@ import { resolveUsedFraction } from "../usage";`,
 					return undefined;
 				}
 				const resetAt = secondary.window?.resetsAt;
+				const durationMs = secondary.window?.durationMs;
 				const used = resolveUsedFraction(secondary);
 				if (typeof resetAt !== "number" || !Number.isFinite(resetAt) || resetAt <= nowMs) return undefined;
+				if (typeof durationMs !== "number" || !Number.isFinite(durationMs) || durationMs < dayMs) return undefined;
 				if (typeof used !== "number" || !Number.isFinite(used)) return undefined;
-				return { resetAt, remaining: 1 - used };
+				const elapsedMs = Math.min(durationMs, Math.max(0, durationMs - (resetAt - nowMs)));
+				const allowance = Math.min(1, ((Math.floor(elapsedMs / dayMs) + 1) * dayMs) / durationMs);
+				return { overshoot: Math.max(0, used - allowance), index: candidate.selection.index };
 			});
 			const slots = candidates.flatMap((_candidate, pos) => (weekly[pos] ? [pos] : []));
 			const preferred = [...slots]
 				.sort((left, right) => {
-					const leftWeekly = weekly[left]!;
-					const rightWeekly = weekly[right]!;
-					return leftWeekly.resetAt - rightWeekly.resetAt || rightWeekly.remaining - leftWeekly.remaining || left - right;
+					const a = weekly[left]!;
+					const b = weekly[right]!;
+					return Number(a.overshoot > 0) - Number(b.overshoot > 0) || a.overshoot - b.overshoot || a.index - b.index;
 				})
 				.map(pos => candidates[pos]!);
 			slots.forEach((pos, order) => {
@@ -3361,11 +3145,12 @@ import { resolveUsedFraction } from "../usage";`,
 			});
 		}
 		const preflightFailures = new Set<OAuthCandidate>();`,
-		patched: `		// Prefer RIN (first Anthropic account) while it stays inside its daily slice of the weekly quota.
+		patched: `		// Prefer the Anthropic account whose unused weekly quota expires soonest, inside its daily slice.
 		// Only candidates with a complete, healthy usage picture move, and only among the slots they
 		// already hold in the upstream ranking: unknown, partial, blocked, reserve, plan-ineligible or
 		// 5h-hot candidates keep their place. Daily slice = (elapsed whole days + 1) / window days.
-		// Inside the slice: storage order. Over it: smaller overshoot first, then storage order.
+		// Inside the slice: larger weekly required drain (upstream windowRequiredDrain) first.
+		// Over it: after every in-slice account, smaller overshoot first. Ties: storage order.
 		if (provider === "anthropic" && shouldRank && strategy) {
 			const nowMs = Date.now();
 			const dayMs = 86_400_000;
@@ -3405,14 +3190,23 @@ import { resolveUsedFraction } from "../usage";`,
 				if (typeof used !== "number" || !Number.isFinite(used)) return undefined;
 				const elapsedMs = Math.min(durationMs, Math.max(0, durationMs - (resetAt - nowMs)));
 				const allowance = Math.min(1, ((Math.floor(elapsedMs / dayMs) + 1) * dayMs) / durationMs);
-				return { overshoot: Math.max(0, used - allowance), index: candidate.selection.index };
+				return {
+					overshoot: Math.max(0, used - allowance),
+					drain: windowRequiredDrain(secondary, nowMs, strategy.windowDefaults.secondaryMs),
+					index: candidate.selection.index,
+				};
 			});
 			const slots = candidates.flatMap((_candidate, pos) => (weekly[pos] ? [pos] : []));
 			const preferred = [...slots]
 				.sort((left, right) => {
 					const a = weekly[left]!;
 					const b = weekly[right]!;
-					return Number(a.overshoot > 0) - Number(b.overshoot > 0) || a.overshoot - b.overshoot || a.index - b.index;
+					return (
+						Number(a.overshoot > 0) - Number(b.overshoot > 0) ||
+						a.overshoot - b.overshoot ||
+						(a.overshoot > 0 ? 0 : b.drain - a.drain) ||
+						a.index - b.index
+					);
 				})
 				.map(pos => candidates[pos]!);
 			slots.forEach((pos, order) => {
@@ -3421,6 +3215,64 @@ import { resolveUsedFraction } from "../usage";`,
 		}
 		const preflightFailures = new Set<OAuthCandidate>();`,
 	},
+	// 2026-10-02 사용자 정책: summon marker 없이 띄운 일반 maker child 는 부모 세션의 Anthropic 계정 고정(warm 자동
+	// pin·교체 exact pin 모두)을 물려받지 않고 위 순서 규칙으로 새로 고른다. 실제 경로: task 도구(task/index.ts) →
+	// runStructuredSubagent(structured-subagent.ts: credentialSourceSessionId = 부모 agent.sessionId) → runSubprocess
+	// → createAgentSession(sdk.ts) → authStorage.sessions.inherit. ‘린/미오 호출’ summon child 는 상속 뒤 character-voice
+	// before_agent_start 가 지정 위치 exact pin 을 다시 걸므로 그대로 둔다. 다른 provider·maker 아닌 child 상속은 그대로.
+	// 아래 네 파일 다섯 항목: inherit 의 provider 제외 인자, 그 타입, sdk 옵션·전달, executor 의 maker 판정.
+	// 검증: core-account-order-test.ts [상속].
+	{
+		file: "../pi-ai/src/auth/affinity.ts",
+		marker: "\tinherit(sourceSessionId: string, targetSessionId: string, skipProviders?: readonly string[]): number {",
+		anchor: `	inherit(sourceSessionId: string, targetSessionId: string): number {
+		if (!sourceSessionId || !targetSessionId || sourceSessionId === targetSessionId) return 0;
+		let inherited = 0;
+		for (const provider of this.#pool.providers()) {
+			const credential = this.get(provider, sourceSessionId);
+			if (!credential) continue;`,
+		patched: `	inherit(sourceSessionId: string, targetSessionId: string, skipProviders?: readonly string[]): number {
+		if (!sourceSessionId || !targetSessionId || sourceSessionId === targetSessionId) return 0;
+		let inherited = 0;
+		for (const provider of this.#pool.providers()) {
+			if (skipProviders?.includes(provider)) continue;
+			const credential = this.get(provider, sourceSessionId);
+			if (!credential) continue;`,
+	},
+	{
+		file: "../pi-ai/src/auth/types.ts",
+		marker: "\tinherit(sourceSessionId: string, targetSessionId: string, skipProviders?: readonly string[]): number;",
+		anchor: "\tinherit(sourceSessionId: string, targetSessionId: string): number;",
+		patched: `	/** \`skipProviders\`: providers whose affinity the target must choose fresh instead of copying. */
+	inherit(sourceSessionId: string, targetSessionId: string, skipProviders?: readonly string[]): number;`,
+	},
+	{
+		file: "src/sdk.ts",
+		marker: "\tcredentialInheritSkipProviders?: readonly string[];",
+		anchor: "\tcredentialSourceSessionId?: string;\n\n\t/** Model to use. Default: from settings, else first available */",
+		patched: `	credentialSourceSessionId?: string;
+	/** Providers whose {@link credentialSourceSessionId} affinity is not copied; the child selects them fresh. */
+	credentialInheritSkipProviders?: readonly string[];
+
+	/** Model to use. Default: from settings, else first available */`,
+	},
+	{
+		file: "src/sdk.ts",
+		marker: "options.credentialSourceSessionId, providerSessionId, options.credentialInheritSkipProviders);",
+		anchor: "\t\tmodelRegistry.authStorage.sessions.inherit(options.credentialSourceSessionId, providerSessionId);",
+		patched: `		modelRegistry.authStorage.sessions.inherit(
+			options.credentialSourceSessionId, providerSessionId, options.credentialInheritSkipProviders);`,
+	},
+	{
+		file: "src/task/executor.ts",
+		marker: "\t\t\t\tcredentialInheritSkipProviders:",
+		anchor: "\t\t\t\tcredentialSourceSessionId: options.credentialSourceSessionId,\n",
+		patched: `				credentialSourceSessionId: options.credentialSourceSessionId,
+				// A plain maker picks its own Anthropic account; a character summon re-pins its exact one.
+				credentialInheritSkipProviders:
+					agent.name === "maker" && !/\\[character-summon\\s/u.test(task) ? ["anthropic"] : undefined,
+`,
+	},
 	{
 		// exact OAuth 가 해석되지 않으면 login API 키·18.4.5 config fallback 키(#13815)·env 키로 조용히 넘어가지 않는다.
 		// 18.4.5는 resolveOAuth 성공 분기에 oauthIdentity 전달을 넣어 옛 한 덩어리 앵커가 사라졌다. 라벨은
@@ -8239,11 +8091,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에
@@ -8909,7 +8764,6 @@ for (const entry of EDITS) {
 }
 
 
-
 /**
  * 항목 하나를 이 설치에서 성립하는 후보로 좁힌다. 후보는 항목 자신과 `alternates` 이고 각 후보는
  * file·anchor·marker·patched 묶음이다. upstream 이 그 조각을 다른 모듈이나 다른 패키지로 옮기면