cuelo 0.8.2 → 0.9.0

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

@@ -78,6 +78,13 @@ const OPUS55_ROW_18410 = {
 	patched: OPUS55_ROW_18410_PATCHED,
 };
 
+/**
+ * #310의 18.5.1 no-op 후보(RETIRE). upstream #14168이 이 행에 prefixBinding과 binding controls를 둘 다 넣어 18.4.6 적용본과
+ * tps(93)만 다르다. 18.4.6 후보의 marker는 tps 뒤 조각이라 이 순정에서도 applied로 읽히고, 그러면 --revert가 없는 patched를
+ * 찾다 실패하므로 18.4.6 후보는 이 행이 있는 파일에서 빠진다(EDITS 항목의 excludes).
+ */
+const OPUS55_ROW_1851 = OPUS55_ROW_1846.patched.replace('"tps":95.2,', '"tps":93,');
+
 /** 각 항목: 원본 앵커를 찾아 patched 로 바꾼다. marker 가 있으면 이미 적용된 것으로 본다. */
 const EDITS = [
 	{
@@ -786,6 +793,8 @@ Project-wide validation is the main agent's job, run once after all subagents la
 		// 페이지를 닫지 않으므로, 만들어진 작업 탭도 사용자가 직접 닫는다.
 		file: "src/tools/browser/tab-supervisor.ts",
 		marker: "createRelayTab",
+		// 18.5.1(#13375)은 pickElectronTarget 에 relayJson·signal 을 더했다. 사용자 탭 채택은 그대로라 새 탭 의미는 유지한다(ADAPT).
+		excludes: 'relayJson: browser.kind.kind === "relay"',
 		anchor: `	// Connected and relay browsers are user-driven. When no target is requested,
 	// adopt the visible tab and avoid raising it before screenshots. An explicit
 	// target may be backgrounded, so retain activation for target-correct pixels.
@@ -811,6 +820,40 @@ Project-wide validation is the main agent's job, run once after all subagents la
 				matcher: opts.target,
 				preferVisible: !activateForScreenshot,
 			});`,
+		alternates: [{
+			file: "src/tools/browser/tab-supervisor.ts",
+			requires: 'relayJson: browser.kind.kind === "relay"',
+			marker: "createRelayTab",
+			anchor: `	// Connected and relay browsers are user-driven. When no target is requested,
+	// adopt the visible tab and avoid raising it before screenshots. An explicit
+	// target may be backgrounded, so retain activation for target-correct pixels.
+	const userDriven = browser.kind.kind === "connected" || browser.kind.kind === "relay";
+	const activateForScreenshot = !userDriven || !shouldPreserveConnectedBrowserFocus(opts.target);
+	const page = await pickElectronTarget(browser.browser, {
+		matcher: opts.target,
+		preferVisible: !activateForScreenshot,
+		relayJson: browser.kind.kind === "relay" ? browser.kind.cdpUrl : undefined,
+		signal: opts.signal,
+	});`,
+			patched: `	// Connected and relay browsers are user-driven. An explicit target may be
+	// backgrounded, so retain activation for target-correct pixels.
+	const userDriven = browser.kind.kind === "connected" || browser.kind.kind === "relay";
+	// Relay with no target used to adopt the user's visible tab and navigate it.
+	// Open our own tab instead (\`newPage\` = \`Target.createTarget\`, which the
+	// relay bridge implements with \`chrome.tabs.create\`). An explicit target
+	// still selects an existing tab, and reopening the same name still reuses
+	// this tab. Still attach mode: release keeps the page, it is never closed.
+	const createRelayTab = browser.kind.kind === "relay" && shouldPreserveConnectedBrowserFocus(opts.target);
+	const activateForScreenshot = createRelayTab || !userDriven || !shouldPreserveConnectedBrowserFocus(opts.target);
+	const page = createRelayTab
+		? await browser.browser.newPage()
+		: await pickElectronTarget(browser.browser, {
+				matcher: opts.target,
+				preferVisible: !activateForScreenshot,
+				relayJson: browser.kind.kind === "relay" ? browser.kind.cdpUrl : undefined,
+				signal: opts.signal,
+			});`,
+		}],
 	},
 	{
 		// 도구 프롬프트가 "target 없으면 visible 탭을 채택한다"고 명시한다.
@@ -919,6 +962,9 @@ export interface IrcBridgeHost {
 		// 위 항목의 기록 지점. 같은 파일의 두 번째 편집이므로 marker 를 분리한다.
 		file: "src/session/irc-bridge.ts",
 		marker: "this.queueParentSteerRelay({ steered, record })",
+		// 18.5.1(#13914)은 fromParent 를 앞에서 계산하고 본문을 escapeHarnessTags 로 감싼다. streaming steer 분기는 여전히
+		// 관찰자를 설치하지 않으므로 빚 기록은 그대로 필요하다(ADAPT).
+		excludes: "const fromParent = AgentRegistry.global().get(msg.to)?.parentId === msg.from;",
 		anchor: `		if (streaming) {
 			const recipientParentId = AgentRegistry.global().get(msg.to)?.parentId;
 			if (recipientParentId === msg.from) {
@@ -962,6 +1008,52 @@ export interface IrcBridgeHost {
 					this.#host.adoptParentSteerForRunningTurn();
 				}
 			} else {`,
+		alternates: [{
+			file: "src/session/irc-bridge.ts",
+			requires: "const fromParent = AgentRegistry.global().get(msg.to)?.parentId === msg.from;",
+			marker: "this.queueParentSteerRelay({ steered, record })",
+			anchor: `		if (streaming) {
+			if (fromParent) {
+				this.#host.agent.steer({
+					role: "user",
+					content: prompt.render(parentIrcSteerTemplate, { from: msg.from, message: envelopeBody }),
+					attribution: "agent",
+					timestamp: msg.ts,
+					steering: true,
+				});
+			} else {`,
+			patched: `		if (streaming) {
+			if (fromParent) {
+				const steered: AgentMessage = {
+					role: "user",
+					content: prompt.render(parentIrcSteerTemplate, { from: msg.from, message: envelopeBody }),
+					attribution: "agent",
+					timestamp: msg.ts,
+					steering: true,
+				};
+				this.#host.agent.steer(steered);
+				// The turn that consumes this steer - the running one, or the
+				// continuation that resumes it when it strands past the loop's
+				// final queue poll - owes the parent a \`<task-result>\` if it ends
+				// in a \`yield\`. The wake branch below gets that from its observer;
+				// this branch installs none, and a kept-alive subagent's spawn job
+				// settled long ago, so its later yields reached nobody. Park the
+				// obligation against \`steered\` itself: agent-core holds that exact
+				// object until a turn consumes it, so the settle-time reconciliation
+				// can tell "this steer was answered" from "some other queue item is
+				// pending". A relay itself is an answer, never a new obligation (it
+				// would ping-pong two idle peers).
+				if (msg.wakeRelay !== true) {
+					this.queueParentSteerRelay({ steered, record });
+					// The running turn may be the one that consumes it, and nothing
+					// else would then answer: the spawn job settled long ago and the
+					// continuation bracket only covers turns that START owing a
+					// steer. Let the session bracket the turn now; it decides at
+					// settle, from the queue, whether this turn owned the answer.
+					this.#host.adoptParentSteerForRunningTurn();
+				}
+			} else {`,
+		}],
 	},
 	{
 		// 세션 경계. 전환이 큐를 비우면 그 transcript 에 속한 relay 빚도 함께 물러나고,
@@ -1173,6 +1265,9 @@ export interface IrcBridgeHost {
 		// turn 시작에서 observer 를 열고, #endInFlight 의 settle 콜백에서 닫는다.
 		file: "src/session/agent-session.ts",
 		marker: "const steerObservation = this.#beginIrcSteerContinuationObservation()",
+		// 18.5.1(#14143)은 agent_end 가 낸 continue 를 기다렸다 새로 시작하고 attempt 에 turnEnded 를 단다. bracket 은
+		// 실제로 새 turn 을 시작하는 #beginInFlight 자리에만 걸므로 그 의미는 같다(ADAPT).
+		excludes: "turnEnded: boolean;",
 		anchor: `				this.#beginInFlight();
 				const coalescedSources = new Set([options.source]);
 				const promise = this.#runAgentContinue(signal, request, coalescedSources);
@@ -1218,6 +1313,58 @@ export interface IrcBridgeHost {
 					}
 					this.#handleAgentContinueOutcome(outcome, request);
 				} finally {`,
+		alternates: [{
+			file: "src/session/agent-session.ts",
+			requires: "turnEnded: boolean;",
+			marker: "const steerObservation = this.#beginIrcSteerContinuationObservation()",
+			anchor: `				this.#beginInFlight();
+				const coalescedSources = new Set([options.source]);
+				const promise = this.#runAgentContinue(signal, request, coalescedSources);
+				const attempt: ActiveAgentContinue = {
+					schedulerToken: request.schedulerToken,
+					turnEnded: false,
+					source: options.source,
+					coalescedSources,
+					promise,
+				};
+				this.#activeAgentContinue = attempt;
+				try {
+					this.#handleAgentContinueOutcome(await promise, request);
+				} finally {`,
+			patched: `				this.#beginInFlight();
+				// A parent IRC steer that missed the running turn's final queue poll
+				// strands in the agent-core queue, and this drain is what resumes it.
+				// For a kept-alive subagent that continuation is a full autonomous
+				// turn whose \`yield\` republishes agent://<id>, yet it was the one
+				// turn with no monitor bracket — the wake observer is installed only
+				// by #wakeForIrc and the spawn job settled long ago — so its terminal
+				// result notified nobody. Bracket it with the same observer: the
+				// steering parent gets exactly one <task-result>, and
+				// relayWakeTurnOutput still suppresses it when the agent already
+				// answered them itself.
+				const steerObservation = this.#beginIrcSteerContinuationObservation();
+				const coalescedSources = new Set([options.source]);
+				const promise = this.#runAgentContinue(signal, request, coalescedSources);
+				const attempt: ActiveAgentContinue = {
+					schedulerToken: request.schedulerToken,
+					turnEnded: false,
+					source: options.source,
+					coalescedSources,
+					promise,
+				};
+				this.#activeAgentContinue = attempt;
+				let steerObservationError: unknown;
+				try {
+					const outcome = await promise;
+					if (steerObservation) {
+						// The turn never ran: re-arm the obligation so the next
+						// continuation still owes the parent its answer.
+						if (outcome.status === "skipped") this.#irc.queueParentSteerRelay(...steerObservation.entries);
+						else if (outcome.status === "failed") steerObservationError = outcome.error;
+					}
+					this.#handleAgentContinueOutcome(outcome, request);
+				} finally {`,
+		}],
 	},
 	{
 		// 위 bracket 의 닫는 쪽. wake 경로(#wakeForIrc)와 같이 settle 콜백에서 닫아야
@@ -1374,6 +1521,47 @@ export interface IrcBridgeHost {
 					this.#ircTurnBracketOpen = false;
 					try {
 						await finishObservation?.(turnError, undefined, this.#takeAdoptedParentSteerRecords());`,
+		// 18.5.1(#13703)은 endInFlight() 뒤 settleAsyncWork() 를 기다린 다음 관찰자를 닫아, async 후속 turn 의 yield 까지
+		// 같은 monitor 가 본다. bracket 도 그 구간 끝까지 열어 둔다: 먼저 닫으면 그 사이 continuation 이 관찰자를 하나 더 열고
+		// 관찰자 시작이 공유 yield 상태(resetYieldTurnState)를 지운다. settle 은 agent streaming 만 기다리므로, 그 뒤에도
+		// turn 이 진행 중이면(continuation 이 #beginInFlight 와 agent.continue 사이의 await 에 있음) 그 turn 의 settle
+		// 콜백에서 닫아 그 turn 이 소비한 adopted steer 까지 한 번에 답한다(ADAPT).
+		alternates: [{
+			file: "src/session/agent-session.ts",
+			marker: "const finishWakeObservation = async (): Promise<void> => {",
+			anchor: `				try {
+					await this.settleAsyncWork();
+				} catch (error) {
+					logger.warn("IRC wake async-work settle failed", { error: String(error) });
+				}
+				try {
+					await finishObservation?.(turnError);
+				} catch (error) {
+					logger.warn("IRC wake turn observer failed to finish", { error: String(error) });
+				}`,
+			patched: `				try {
+					await this.settleAsyncWork();
+				} catch (error) {
+					logger.warn("IRC wake async-work settle failed", { error: String(error) });
+				}
+				// The bracket stays open across the settle pause above: this one
+				// monitor owns every turn in it, so a continuation that resumes a
+				// stranded parent steer opens no second observer (starting one resets
+				// the shared yield state). The settle waits for agent streaming only;
+				// a turn still in flight past it (a continuation between
+				// #beginInFlight and agent.continue) is closed at its own settle, so
+				// the adopted steers it consumes ride this one finalization.
+				const finishWakeObservation = async (): Promise<void> => {
+					this.#ircTurnBracketOpen = false;
+					try {
+						await finishObservation?.(turnError, undefined, this.#takeAdoptedParentSteerRecords());
+					} catch (error) {
+						logger.warn("IRC wake turn observer failed to finish", { error: String(error) });
+					}
+				};
+				if (this.#promptInFlightCount > 0) this.#inFlightSettledCallbacks.push(finishWakeObservation);
+				else await finishWakeObservation();`,
+		}],
 	},
 	{
 		// 18.2.1은 relay 호출을 `finally`로 옮기고 실패·취소·빈 turn·finalize 오류까지
@@ -1452,6 +1640,9 @@ export interface IrcBridgeHost {
 		// `tools/wait.ts` 로 옮겼다(buildJobResult 의 6번째 인자가 agents, async/job-control.ts:226-233).
 		file: "src/tools/wait.ts",
 		marker: "runningAgentsOutsideJobs,",
+		// 18.5.1 은 wait 가 자기 job·service 만 기다리게 하고 빈 결과(nothingToWaitForResult)를 오류로 바꿨다. buildJobResult 의
+		// 6번째 인자 agents 는 그대로라 job 결과에 job row 없는 SubAgent 를 싣는 의미는 유지한다(ADAPT).
+		requires: "nothingToWaitForResult",
 		anchor: `import { buildJobResult, nothingToWaitForResult, snapshotJobs, undeliveredJobs } from "../async/job-control";`,
 		patched: `import {
 	buildJobResult,
@@ -1460,11 +1651,18 @@ export interface IrcBridgeHost {
 	snapshotJobs,
 	undeliveredJobs,
 } from "../async/job-control";`,
+		alternates: [{
+			file: "src/tools/wait.ts",
+			marker: `import { buildJobResult, runningAgentsOutsideJobs, snapshotJobs, undeliveredJobs } from "../async/job-control";`,
+			anchor: `import { buildJobResult, snapshotJobs, undeliveredJobs } from "../async/job-control";`,
+			patched: `import { buildJobResult, runningAgentsOutsideJobs, snapshotJobs, undeliveredJobs } from "../async/job-control";`,
+		}],
 	},
 	{
 		// 이미 정산됐으나 아직 전달되지 않은 결과를 즉시 돌려주는 자리.
 		file: "src/tools/wait.ts",
 		marker: "Same roster source as the empty result and `read proc://`",
+		requires: "nothingToWaitForResult",
 		anchor: `				return buildJobResult(this.session, manager, "wait", [...undelivered, ...jobs], []);`,
 		patched: `				// Same roster source as the empty result and \`read proc://\`: the 6th
 				// argument (\`agents\`); the 5th stays the empty cancel-outcome list.
@@ -1476,6 +1674,23 @@ export interface IrcBridgeHost {
 					[],
 					runningAgentsOutsideJobs(this.session),
 				);`,
+		// 18.5.1: 같은 줄이 루프 밖으로 나와 들여쓰기가 한 단계 얕다. 그 줄은 18.5.0 줄의 부분 문자열이라 excludes 로 가른다.
+		alternates: [{
+			file: "src/tools/wait.ts",
+			excludes: "nothingToWaitForResult",
+			marker: "Same roster source as `read proc://`",
+			anchor: `			return buildJobResult(this.session, manager, "wait", [...undelivered, ...jobs], []);`,
+			patched: `			// Same roster source as \`read proc://\`: the 6th argument (\`agents\`);
+			// the 5th stays the empty cancel-outcome list.
+			return buildJobResult(
+				this.session,
+				manager,
+				"wait",
+				[...undelivered, ...jobs],
+				[],
+				runningAgentsOutsideJobs(this.session),
+			);`,
+		}],
 	},
 	{
 		// 사건(job 종료)·30분 상한 뒤의 반환. 여기가 Main 이 "## Still Running" 만 받고
@@ -8140,8 +8355,15 @@ export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from:
 	// 있을 때만 이 정확한 코드를 거절 ack 로 돌려 기존 claim.reject() → 다음 경계 일반 전달 경로를
 	// 타게 하고, 같은 소켓은 이후 steer 를 전송하지 않는다(새 소켓은 다시 한 번 시도한다).
 	// 대기자가 없거나 다른 코드인 error 프레임은 그대로 스트림에 push 한다.
+	// 18.5.1 RETIRE(#13705): upstream 이 같은 프레임을 처리한다(openai-codex-responses.ts). onmessage 가 steer 대기자를
+	// 거절(#refuseSteerWaiters, :4084-4088)한 뒤 프레임을 스트림에 그대로 push 하고, 이 코드는 재시도 가능 오류
+	// (CODEX_RETRYABLE_EVENT_CODES, :276-288)라 #recoverStreamError(:2762)가 #stopSteeringOnNativeLaneRejection(:2747)으로
+	// 세션 단위 steeringUnsupported 를 세우고 죽은 소켓을 버린 뒤 #tryRetryProviderError 로 새 소켓에서 재생한다.
+	// 이후 #startSteering(:2477)은 steer 를 다시 보내지 않는다. 우리 swallow(return)가 남으면 그 복구 경로를 가로채므로
+	// 세 항목 모두 18.5.1 에서는 upstream 줄의 no-op 후보만 성립한다(본 후보 excludes).
 	{
 		file: "../pi-ai/src/providers/openai-codex-responses.ts",
+		excludes: "CODEX_NATIVE_LANE_STEER_REJECTED_CODE",
 		marker: "#steerUnsupported = false;",
 		anchor: `	/** Steering whose automatic successor the active attach request is reading. */
 	#attachSteerIds?: ReadonlySet<string>;`,
@@ -8149,9 +8371,17 @@ export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from:
 	#attachSteerIds?: ReadonlySet<string>;
 	/** The server answered a steer with unsupported_native_inflight_message; this socket no longer submits steers. */
 	#steerUnsupported = false;`,
+		alternates: [{
+			file: "../pi-ai/src/providers/openai-codex-responses.ts",
+			requires: "CODEX_NATIVE_LANE_STEER_REJECTED_CODE",
+			marker: "\t/** The server refused steering for this session (native turn lane); later responses are not steered. */\n\tsteeringUnsupported?: boolean;",
+			anchor: "\t/** The server refused steering for this session (native turn lane); later responses are not steered. */\n\tsteeringUnsupported?: boolean;",
+			patched: "\t/** The server refused steering for this session (native turn lane); later responses are not steered. */\n\tsteeringUnsupported?: boolean;",
+		}],
 	},
 	{
 		file: "../pi-ai/src/providers/openai-codex-responses.ts",
+		excludes: "CODEX_NATIVE_LANE_STEER_REJECTED_CODE",
 		marker: "this.#steerWaiters.shift()?.resolve({",
 		anchor: `				// Steering acknowledgements belong to the submitter, not to the
 				// response stream they interleave with.
@@ -8174,9 +8404,17 @@ export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from:
 				// Steering acknowledgements belong to the submitter, not to the
 				// response stream they interleave with.
 				if (typeof parsed.type === "string" && parsed.type.startsWith("response.steer.")) {`,
+		alternates: [{
+			file: "../pi-ai/src/providers/openai-codex-responses.ts",
+			requires: "CODEX_NATIVE_LANE_STEER_REJECTED_CODE",
+			marker: "\t\t\t\tif (parsed.type === \"error\" && parsed.code === CODEX_NATIVE_LANE_STEER_REJECTED_CODE) {\n\t\t\t\t\tthis.#refuseSteerWaiters(",
+			anchor: "\t\t\t\tif (parsed.type === \"error\" && parsed.code === CODEX_NATIVE_LANE_STEER_REJECTED_CODE) {\n\t\t\t\t\tthis.#refuseSteerWaiters(",
+			patched: "\t\t\t\tif (parsed.type === \"error\" && parsed.code === CODEX_NATIVE_LANE_STEER_REJECTED_CODE) {\n\t\t\t\t\tthis.#refuseSteerWaiters(",
+		}],
 	},
 	{
 		file: "../pi-ai/src/providers/openai-codex-responses.ts",
+		excludes: "CODEX_NATIVE_LANE_STEER_REJECTED_CODE",
 		marker: "code: \"unsupported_native_inflight_message\", message: undefined",
 		anchor: `			return Promise.reject(new CodexWebSocketTransportError(\`websocket connection is unavailable\`));
 		}
@@ -8187,6 +8425,13 @@ export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from:
 			return Promise.resolve({ accepted: false, code: "unsupported_native_inflight_message", message: undefined });
 		}
 		const event = { type: "response.steer", previous_response_id: previousResponseId, input };`,
+		alternates: [{
+			file: "../pi-ai/src/providers/openai-codex-responses.ts",
+			requires: "CODEX_NATIVE_LANE_STEER_REJECTED_CODE",
+			marker: "\t\t\tstate?.steeringUnsupported ||\n",
+			anchor: "\t\t\tstate?.steeringUnsupported ||\n",
+			patched: "\t\t\tstate?.steeringUnsupported ||\n",
+		}],
 	},
 	// 2026-09-30 사용자 요청(0.6.6): 일반 구현 선택 질문만 `ask.timeout` 무응답 시 추천안으로 진행한다.
 	// 자동선택은 긍정 opt-in(`autoSelectRecommended: true`)이고 유효한 `recommended`가 필수다. 한 호출의
@@ -8305,7 +8550,12 @@ function parentSubagentServiceTiers(
 		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],
+		// 18.5.1: 위 OPUS55_ROW_1851 no-op(RETIRE). 18.4.6 후보는 그 행이 있으면 성립하지 않는다.
+		alternates: [
+			OPUS55_ROW_18410,
+			{ ...OPUS55_ROW_1846, excludes: OPUS55_ROW_1851 },
+			{ file: "../pi-catalog/src/models.json", marker: OPUS55_ROW_1851, anchor: OPUS55_ROW_1851, patched: OPUS55_ROW_1851 },
+		],
 	},
 	{
 		// 모든 provider의 Opus 5.5 규칙 계보에 prefixBinding(Sonnet 5.5 규칙과 같은 모양). 18.4.10은 upstream #14019가 kdl:61에
@@ -8328,6 +8578,12 @@ function parentSubagentServiceTiers(
 			marker: '{"source":"classes/anthropic.kdl:60","class":"anthropic","family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsForcedToolChoice":false},"thinking":{"prefixBinding":true}}',
 			anchor: '{"source":"classes/anthropic.kdl:60","class":"anthropic","family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsForcedToolChoice":false}}',
 			patched: '{"source":"classes/anthropic.kdl:60","class":"anthropic","family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsForcedToolChoice":false},"thinking":{"prefixBinding":true}}',
+		}, {
+			// 18.5.1: 같은 upstream 규칙이 kdl:85(뒤 Sonnet 규칙 kdl:101)로 옮겨졌다. 그 줄의 no-op.
+			file: "../pi-catalog/src/compat/rules.json",
+			marker: '{"source":"classes/anthropic.kdl:85","class":"anthropic","family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsForcedToolChoice":false},"thinking":{"prefixBinding":true}},{"source":"classes/anthropic.kdl:101",',
+			anchor: '{"source":"classes/anthropic.kdl:85","class":"anthropic","family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsForcedToolChoice":false},"thinking":{"prefixBinding":true}},{"source":"classes/anthropic.kdl:101",',
+			patched: '{"source":"classes/anthropic.kdl:85","class":"anthropic","family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsForcedToolChoice":false},"thinking":{"prefixBinding":true}},{"source":"classes/anthropic.kdl:101",',
 		}],
 	},
 	{
@@ -8358,6 +8614,13 @@ function parentSubagentServiceTiers(
 			marker: '{"source":"cuelo:opus-5.5-thinking-binding","class":"anthropic","providers":["anthropic","cloudflare-ai-gateway","google-vertex"],"family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsThinkingBindingControls":true}}',
 			anchor: '{"source":"classes/anthropic.kdl:106","class":"anthropic","providers":["anthropic","cloudflare-ai-gateway","google-vertex"],"family":"sonnet","revision":[{"op":">=","revision":"5.5.0"}],"wire":{"supportsMidConversationSystem":true,"supportsMidConversationToolChanges":true,"supportsTurnScopedSystem":true,"supportsPerMessageEffort":true,"supportsThinkingBindingControls":true}}',
 			patched: '{"source":"classes/anthropic.kdl:106","class":"anthropic","providers":["anthropic","cloudflare-ai-gateway","google-vertex"],"family":"sonnet","revision":[{"op":">=","revision":"5.5.0"}],"wire":{"supportsMidConversationSystem":true,"supportsMidConversationToolChanges":true,"supportsTurnScopedSystem":true,"supportsPerMessageEffort":true,"supportsThinkingBindingControls":true}},{"source":"cuelo:opus-5.5-thinking-binding","class":"anthropic","providers":["anthropic","cloudflare-ai-gateway","google-vertex"],"family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsThinkingBindingControls":true}}',
+		}, {
+			// 18.5.1 RETIRE(#14168): upstream 이 같은 provider 범위(anthropic·cloudflare)의 Opus 5.5 binding controls 규칙을
+			// kdl:175 로 넣었다. 그 upstream 규칙의 no-op.
+			file: "../pi-catalog/src/compat/rules.json",
+			marker: '{"source":"classes/anthropic.kdl:175","class":"anthropic","providers":["anthropic","cloudflare-ai-gateway"],"family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsThinkingBindingControls":true}}',
+			anchor: '{"source":"classes/anthropic.kdl:175","class":"anthropic","providers":["anthropic","cloudflare-ai-gateway"],"family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsThinkingBindingControls":true}}',
+			patched: '{"source":"classes/anthropic.kdl:175","class":"anthropic","providers":["anthropic","cloudflare-ai-gateway"],"family":"opus","revision":[{"op":">=","revision":"5.5.0"},{"op":"<","revision":"6.0.0"}],"wire":{"supportsThinkingBindingControls":true}}',
 		}],
 	},
 	// 위 세 항목과 짝: modelOverrides의 thinking은 buildModel이 규칙으로 채운 thinking을 통째로 덮어써서, override가
@@ -8541,6 +8804,18 @@ function parentSubagentServiceTiers(
 			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.5.1 번들의 같은 upstream 조건(ERe = isAdvisorTranscriptName) no-op.
+			file: "dist/cli.js",
+			marker: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||ERe(i))continue;let a=i.slice(0,-6),',
+			anchor: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||ERe(i))continue;let a=i.slice(0,-6),',
+			patched: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||ERe(i))continue;let a=i.slice(0,-6),',
+		}, {
+			// 18.6.0 번들의 같은 upstream 조건(_Re = isAdvisorTranscriptName) no-op. 이름만 바뀌었다.
+			file: "dist/cli.js",
+			marker: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||_Re(i))continue;let a=i.slice(0,-6),',
+			anchor: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||_Re(i))continue;let a=i.slice(0,-6),',
+			patched: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||_Re(i))continue;let a=i.slice(0,-6),',
 		}],
 	},
 	// 18.4.5 는 /ratchet 을 새로 넣으면서 `src/ratchet/prelude.ts`(코드)와 `prelude.js`(eval 텍스트 자산)를 같은 stem 으로
@@ -8794,6 +9069,9 @@ class HarmonyLeakInterruption extends Error {`,
 	{
 		file: "../pi-agent-core/src/agent-loop.ts",
 		marker: "if (steerRestartController?.signal.aborted && !requestSignal?.aborted) await restartForSteering();",
+		// 18.5.1(#13847)은 이 결과를 retainCompletedToolCalls·recoverTransientErrorToolTurn 로 감싼다. 재시작 판정은 그 정산 전
+		// 같은 자리에 둔다(ADAPT). 두 판 적용본이 같은 marker 를 가지므로 그 upstream 호출로 가른다.
+		excludes: "let trailing = recoverTransientErrorToolTurn(",
 		anchor: `			try {
 				let trailing = await response.result();`,
 		patched: `			// CUELO P55: the iterator ended after a restart was requested; restart instead of finalizing.
@@ -8801,6 +9079,18 @@ class HarmonyLeakInterruption extends Error {`,
 			steerRestartClosed = true;
 			try {
 				let trailing = await response.result();`,
+		alternates: [{
+			file: "../pi-agent-core/src/agent-loop.ts",
+			requires: "let trailing = recoverTransientErrorToolTurn(",
+			marker: "if (steerRestartController?.signal.aborted && !requestSignal?.aborted) await restartForSteering();",
+			anchor: `			try {
+				let trailing = recoverTransientErrorToolTurn(`,
+			patched: `			// CUELO P55: the iterator ended after a restart was requested; restart instead of finalizing.
+			if (steerRestartController?.signal.aborted && !requestSignal?.aborted) await restartForSteering();
+			steerRestartClosed = true;
+			try {
+				let trailing = recoverTransientErrorToolTurn(`,
+		}],
 	},
 	{
 		file: "../pi-agent-core/src/agent-loop.ts",
@@ -8981,6 +9271,291 @@ class HarmonyLeakInterruption extends Error {`,
 		anchor: "\t\t\t() => (hasSession ? session.getAsyncJobSnapshot() : null),",
 		patched: "\t\t\toptions => (hasSession ? session.getAsyncJobSnapshot(options) : null),",
 	},
+	{
+		// 2026-10-04 사용자 결정: 실행 중 사용자 steering·follow-up 으로 목표가 늘어나면 Main auto 강도를 다시
+		// 판정한다. 같은 턴 안에서는 올리기만 하고(raiseOnly), 다음 새 사용자 턴은 평소처럼 양방향으로 다시 고른다.
+		// 근거: 같은 계정의 effort 변경은 캐시를 대체로 유지했다(Astra medium→high→medium, Opus 자동 변경 4건 중 3건).
+		// 아래 여섯 항목: 분류 옵션·raise 판정(model-controls), 턴 입력 보관·갱신과 큐 입력 연결(agent-session).
+		// 검증: core-agent-thinking-test.ts [raise-only], core-steer-auto-thinking-test.ts.
+		file: "src/session/model-controls.ts",
+		marker: "options?: { raiseOnly?: boolean },",
+		anchor: "\tasync applyAutoThinkingLevel(promptText: string, generation: number, solutionSpace?: string): Promise<void> {",
+		patched: `\tasync applyAutoThinkingLevel(
+		promptText: string,
+		generation: number,
+		solutionSpace?: string,
+		// CUELO: 실행 중 사용자 steering·follow-up 재판정은 같은 턴 안에서 강도를 올리기만 한다.
+		options?: { raiseOnly?: boolean },
+	): Promise<void> {`,
+	},
+	{
+		file: "src/session/model-controls.ts",
+		marker: "// CUELO: raise-only",
+		anchor: "\t\tif (effort === undefined) return;\n",
+		patched: `\t\tif (effort === undefined) return;
+		// CUELO: raise-only — 같은 턴의 재판정은 현재보다 높을 때만 반영한다(상태·기록·이벤트 모두 그대로).
+		if (
+			options?.raiseOnly &&
+			this.#thinkingLevel !== undefined &&
+			THINKING_EFFORTS.indexOf(effort) <= THINKING_EFFORTS.indexOf(this.#thinkingLevel as Effort)
+		) {
+			return;
+		}
+`,
+	},
+	{
+		file: "src/session/agent-session.ts",
+		marker: "\t#autoThinkingTurnText: string | undefined;",
+		anchor: "\t#promptGeneration = 0;\n",
+		patched: `\t#promptGeneration = 0;
+	// CUELO: 이번 사용자 턴의 auto 분류 입력. 실행 중 사용자 steering·follow-up 이 이어 붙어 재판정 입력이 된다.
+	#autoThinkingTurnText: string | undefined;
+`,
+	},
+	{
+		file: "src/session/agent-session.ts",
+		marker: "\t\t\tif (isUserTurn) this.#autoThinkingTurnText = expandedText;",
+		anchor: "\t\t\tif (this.isAutoThinking && isUserTurn) {\n\t\t\t\tawait this.#models.applyAutoThinkingLevel(expandedText, generation, options?.solutionSpace);",
+		// 턴 중에 auto 로 바꿔도 이전 턴 문장이 섞이지 않도록 모든 사용자 턴에서 보관한다.
+		patched: "\t\t\tif (isUserTurn) this.#autoThinkingTurnText = expandedText;\n\t\t\tif (this.isAutoThinking && isUserTurn) {\n\t\t\t\tawait this.#models.applyAutoThinkingLevel(expandedText, generation, options?.solutionSpace);",
+	},
+	{
+		// CUELO 화면의 실행 중 입력은 steer()가 아니라 prompt(..., { streamingBehavior })로 들어와 이 함수에서
+		// 바로 큐에 들어간다. 그래서 연결은 steer()·followUp()이 아니라 모든 사용자 큐 입력이 지나는 여기 한 곳이다.
+		file: "src/session/agent-session.ts",
+		marker: "#raiseAutoThinkingForQueuedInput(text: string",
+		anchor: "\tasync #queueUserMessage(\n",
+		patched: `\t/**
+	 * CUELO: 실행 중 사용자 steering·follow-up 으로 목표가 늘어나면 auto 강도를 다시 판정한다.
+	 * 이번 턴 요청에 지금까지의 입력을 이어 붙여 분류하고, 같은 턴 안에서는 올리기만 한다.
+	 * 분류(최대 4초)를 기다리지 않으므로 메시지 전달은 늦어지지 않고, 결과는 다음 모델 요청부터 쓴다.
+	 * agent 가 넣은 메시지, aside, auto 가 아닌 세션(고정 effort 인 Maker 포함)은 건드리지 않는다.
+	 */
+	#raiseAutoThinkingForQueuedInput(text: string, attribution: MessageAttribution): void {
+		if (!this.isAutoThinking || attribution === "agent" || !text.trim()) return;
+		const request = this.#autoThinkingTurnText ? \`\${this.#autoThinkingTurnText}\\n\\n\${text}\` : text;
+		this.#autoThinkingTurnText = request;
+		void this.#models.applyAutoThinkingLevel(request, this.#promptGeneration, undefined, { raiseOnly: true });
+	}
+
+	async #queueUserMessage(
+`,
+	},
+	{
+		file: "src/session/agent-session.ts",
+		marker: "\t\tif (mode !== \"aside\") this.#raiseAutoThinkingForQueuedInput(text, attribution);",
+		anchor: "\t\tconst attribution = options?.attribution ?? \"user\";\n",
+		patched: "\t\tconst attribution = options?.attribution ?? \"user\";\n\t\tif (mode !== \"aside\") this.#raiseAutoThinkingForQueuedInput(text, attribution);\n",
+	},
+	// CUELO 계정 자리(2026-10-04). upstream oauth.accounts()의 position은 활성 credential 배열 index라서,
+	// 한 계정이 인증 실패로 비활성화되면 뒤 계정이 앞 자리로 당겨진다(RIN 자리 0이 비면 MIO 계정이 RIN이 된다).
+	// 재로그인도 새 행을 만들고 tombstone을 지우므로 [11, 12]처럼 순서가 뒤집힌다. 자리 = (활성 OAuth id ∪
+	// 인증 실패로 자리를 지키는 tombstone id) 오름차순 index로 바꾸고, 같은 identity의 재로그인은 그
+	// tombstone 행을 같은 id로 되살린다. 로그아웃(deleted by user)·교체(replaced by)는 자리를 반납한다.
+	// accounts()는 계속 활성 계정만 돌려주므로 position과 배열 index가 다를 수 있다.
+	{
+		file: "../pi-ai/src/auth/sqlite-credential-store.ts",
+		marker: "function holdsOAuthSeat(row: AuthRow): boolean {",
+		anchor: "\nfunction matchesReplacementCredential(\n",
+		patched: `
+/**
+ * CUELO: a tombstone that keeps its account seat (\`oauth.accounts\` position) — an OAuth row
+ * disabled by an auth failure. Replacement and logout tombstones give their seat up.
+ */
+function holdsOAuthSeat(row: AuthRow): boolean {
+	return (
+		row.credential_type !== "api_key" &&
+		row.disabled_cause !== null &&
+		!/^(replaced by|deleted by user)/i.test(row.disabled_cause)
+	);
+}
+
+function matchesReplacementCredential(
+`,
+	},
+	{
+		file: "../pi-ai/src/auth/sqlite-credential-store.ts",
+		marker: "\t\t\t// CUELO: an auth-failed account that logs in again revives its own tombstone in place",
+		anchor: "\t\t\t\tthis.#deleteStmt.run(\"replaced by newer credential\", row.id);\n\t\t\t}\n\n\t\t\tif (targetId === null) {\n\t\t\t\tconst row = this.#insertStmt.get(\n",
+		patched: `\t\t\t\tthis.#deleteStmt.run("replaced by newer credential", row.id);
+\t\t\t}
+
+\t\t\t// CUELO: an auth-failed account that logs in again revives its own tombstone in place
+\t\t\t// instead of getting a new row, so its credential id, account seat and the session pins
+\t\t\t// that name it survive re-authentication. Upstream's replacement matcher decides identity:
+\t\t\t// another member of the same org never claims the row. Blocks on the id stay as they were.
+\t\t\tif (targetId === null && item.type === "oauth") {
+\t\t\t\tfor (const row of this.#listDisabledByProviderStmt.all(providerName) as AuthRow[]) {
+\t\t\t\t\tif (!holdsOAuthSeat(row)) continue;
+\t\t\t\t\tconst identityKey = resolveRowCredentialIdentityKey(providerName, row);
+\t\t\t\t\tif (!matchesReplacementCredential(providerName, deserializeCredential(row), identityKey, item)) continue;
+\t\t\t\t\tconst revived = this.#db
+\t\t\t\t\t\t.query(
+\t\t\t\t\t\t\t\`UPDATE auth_credentials SET credential_type = ?, data = ?, identity_key = ?, disabled_cause = NULL, updated_at = \${SQLITE_NOW_EPOCH} WHERE id = ? AND disabled_cause IS NOT NULL\`,
+\t\t\t\t\t\t)
+\t\t\t\t\t\t.run(serialized.credentialType, serialized.data, serialized.identityKey, row.id) as { changes: number };
+\t\t\t\t\tif (revived.changes > 0) {
+\t\t\t\t\t\ttargetId = row.id;
+\t\t\t\t\t\tbreak;
+\t\t\t\t\t}
+\t\t\t\t}
+\t\t\t}
+
+\t\t\tif (targetId === null) {
+\t\t\t\tconst row = this.#insertStmt.get(
+`,
+	},
+	{
+		file: "../pi-ai/src/auth/sqlite-credential-store.ts",
+		marker: "\tlistOAuthSeatHolderIds(provider: string): number[] {",
+		anchor: "\tasync listDisabledCredentials(provider?: string): Promise<DisabledCredentialSummary[]> {\n",
+		patched: `\t/**
+\t * CUELO: ids of \`provider\` tombstones that keep their account seat — auth failures whose
+\t * identity no active row has taken over (the superseded-tombstone purge's own rule).
+\t */
+\tlistOAuthSeatHolderIds(provider: string): number[] {
+\t\tconst active: AuthCredential[] = [];
+\t\tfor (const row of this.#listActiveByProviderStmt.all(provider) as AuthRow[]) {
+\t\t\tconst credential = deserializeCredential(row);
+\t\t\tif (credential?.type === "oauth") active.push(credential);
+\t\t}
+\t\tconst ids: number[] = [];
+\t\tfor (const row of this.#listDisabledByProviderStmt.all(provider) as AuthRow[]) {
+\t\t\tif (!holdsOAuthSeat(row)) continue;
+\t\t\tconst credential = deserializeCredential(row);
+\t\t\tif (credential === null) continue;
+\t\t\tconst identityKey = resolveRowCredentialIdentityKey(provider, row);
+\t\t\tif (active.some(current => matchesReplacementCredential(provider, credential, identityKey, current))) continue;
+\t\t\tids.push(row.id);
+\t\t}
+\t\treturn ids;
+\t}
+
+\tasync listDisabledCredentials(provider?: string): Promise<DisabledCredentialSummary[]> {
+`,
+	},
+	{
+		file: "../pi-ai/src/auth/store.ts",
+		marker: "\tlistOAuthSeatHolderIds?(provider: string): number[];",
+		anchor: "\tlistDisabledCredentials?(provider?: string, signal?: AbortSignal): Promise<DisabledCredentialSummary[]>;\n",
+		patched: "\tlistDisabledCredentials?(provider?: string, signal?: AbortSignal): Promise<DisabledCredentialSummary[]>;\n\t/** CUELO: ids of tombstones that keep their account seat. Local stores only; others keep upstream's compacted order. */\n\tlistOAuthSeatHolderIds?(provider: string): number[];\n",
+	},
+	{
+		file: "../pi-ai/src/auth/pool.ts",
+		marker: "\toauthSeatIds(provider: string): number[] {",
+		anchor: "\t/**\n\t * Disabled credential tombstones for display surfaces (`omp usage`,\n\t * broker `GET /v1/credentials/disabled`). Empty when the backing store\n\t * keeps no tombstones or the remote broker predates the endpoint.\n\t */\n\tasync listDisabled(",
+		patched: `\t/**
+\t * CUELO: the account seats of \`provider\` — active OAuth rows plus tombstones that keep their
+\t * seat, by id. \`oauth.accounts\` reports an account's index here as its \`position\`, so an
+\t * auth-failed account leaves its seat empty instead of shifting every later account.
+\t */
+\toauthSeatIds(provider: string): number[] {
+\t\tconst ids = new Set<number>();
+\t\tfor (const entry of this.entries(provider)) if (entry.credential.type === "oauth") ids.add(entry.id);
+\t\tfor (const id of this.#store.listOAuthSeatHolderIds?.(provider) ?? []) ids.add(id);
+\t\treturn [...ids].sort((a, b) => a - b);
+\t}
+
+\t/**
+\t * Disabled credential tombstones for display surfaces (\`omp usage\`,
+\t * broker \`GET /v1/credentials/disabled\`). Empty when the backing store
+\t * keeps no tombstones or the remote broker predates the endpoint.
+\t */
+\tasync listDisabled(`,
+	},
+	{
+		file: "../pi-ai/src/auth/types.ts",
+		marker: "\toauthSeatIds(provider: string): number[];",
+		anchor: "\tlistDisabled(provider?: string, signal?: AbortSignal): Promise<DisabledCredentialSummary[]>;\n",
+		patched: "\tlistDisabled(provider?: string, signal?: AbortSignal): Promise<DisabledCredentialSummary[]>;\n\t/** CUELO: account seats by id — active OAuth rows plus auth-failed tombstones awaiting re-login. A seat's index is `OAuthAccountSummary.position`. */\n\toauthSeatIds(provider: string): number[];\n",
+	},
+	{
+		file: "../pi-ai/src/auth/types.ts",
+		marker: " * Returned by {@link AuthStorage.oauth.accounts}; `position` (0-based) is the\n * account seat.",
+		anchor: " * Returned by {@link AuthStorage.oauth.accounts}; `position` (0-based) is the\n * selector accepted by {@link AuthStorage.oauth.accessById}.\n",
+		patched: " * Returned by {@link AuthStorage.oauth.accounts}; `position` (0-based) is the\n * account seat. CUELO: an auth-failed account keeps its seat until it logs in again, so\n * positions can have gaps — select by `position` or `credentialId`, never by array index.\n",
+	},
+	{
+		file: "../pi-ai/src/auth/types.ts",
+		marker: "\t * order, WITHOUT refreshing any token. Each account's `position` (0-based) is its\n\t * account seat",
+		anchor: "\t * order, WITHOUT refreshing any token. The array position (0-based) is the\n\t * selector accepted by {@link AuthStorage.oauth.accessById}; a \"pick the Nth\n\t * account\" UI should render `position + 1`.\n",
+		patched: "\t * order, WITHOUT refreshing any token. Each account's `position` (0-based) is its\n\t * account seat; a \"pick the Nth account\" UI should render `position + 1`. CUELO: an\n\t * auth-failed account keeps its seat empty, so positions can have gaps.\n",
+	},
+	{
+		file: "../pi-ai/src/auth/oauth.ts",
+		marker: "\t * order, WITHOUT refreshing any token. Each account's `position` (0-based) is its\n\t * account seat",
+		anchor: "\t * order, WITHOUT refreshing any token. The array position (0-based) is the\n\t * selector displayed by a \"pick the Nth account\" UI as `position + 1`.\n",
+		patched: "\t * order, WITHOUT refreshing any token. Each account's `position` (0-based) is its\n\t * account seat, displayed by a \"pick the Nth account\" UI as `position + 1`. CUELO: an\n\t * auth-failed account keeps its seat empty, so positions can have gaps.\n",
+	},
+	{
+		file: "../pi-ai/src/auth/oauth.ts",
+		marker: "\t\tconst seats = this.#deps.pool.oauthSeatIds(provider);",
+		anchor: "\t\treturn this.#getStoredOAuthSelections(provider).map((selection, position) => {\n\t\t\tconst active = selection.credentialId === activeCredentialId;\n\t\t\treturn {\n\t\t\t\tposition,\n",
+		patched: `\t\t// CUELO: \`position\` is the account seat (CredentialPool.oauthSeatIds), not the index in this
+\t\t// active-only list, so a later account is never renumbered into an auth-failed account's seat.
+\t\tconst seats = this.#deps.pool.oauthSeatIds(provider);
+\t\treturn this.#getStoredOAuthSelections(provider).map(selection => {
+\t\t\tconst active = selection.credentialId === activeCredentialId;
+\t\t\treturn {
+\t\t\t\tposition: seats.indexOf(selection.credentialId),
+`,
+	},
+	{
+		// 같은 org의 다른 사람 tombstone을 활성 계정이 숨기던 판정. upstream 주석("neither email nor
+		// accountId contradicts")대로 email·accountId가 다르면 org가 같아도 다른 identity다.
+		file: "src/cli/usage-cli.ts",
+		marker: "\t\tif (summaryEmail && accountEmail) return summaryEmail === accountEmail;",
+		anchor: "\t\tif (summaryEmail && accountEmail && summaryEmail === accountEmail) return true;\n\t\tif (summaryAccountId && accountAccountId && summaryAccountId === accountAccountId) return true;\n",
+		patched: "\t\t// CUELO: a differing email or accountId is another person even inside one org (or a shared\n\t\t// Codex workspace id), so that member's auth failure stays visible.\n\t\tif (summaryEmail && accountEmail) return summaryEmail === accountEmail;\n\t\tif (summaryAccountId && accountAccountId) return summaryAccountId === accountAccountId;\n",
+	},
+	{
+		// --list 가 position + 1 로 번호를 보여 주므로 --account 도 같은 번호(자리)로 고른다.
+		file: "src/commands/token.ts",
+		marker: "\t\t\t\tconst selected = n === undefined ? undefined : accounts.find(acct => acct.position === n - 1);",
+		anchor: `\t\t\t\tconst n = flags.account;
+\t\t\t\tif (n === undefined || n < 1 || n > accounts.length) {
+\t\t\t\t\tprocess.stderr.write(
+\t\t\t\t\t\t\`\${chalk.red(\`Invalid --account \${n ?? "(missing)"}.\`)} Provider "\${providerName}" has \${accounts.length} OAuth account(s) (1-\${accounts.length}).\\n\`,
+\t\t\t\t\t);
+\t\t\t\t\tprocess.exitCode = 1;
+\t\t\t\t\treturn;
+\t\t\t\t}
+\t\t\t\tconst resolution = managedMcpOAuth
+\t\t\t\t\t? await resolveManagedMcpOAuthToken(authStorage, provider, {
+\t\t\t\t\t\t\tcredentialId: accounts[n - 1]?.credentialId,
+\t\t\t\t\t\t\tforceRefresh: flags["force-refresh"],
+\t\t\t\t\t\t})
+\t\t\t\t\t: await authStorage.oauth.accessById(provider, accounts[n - 1]!.credentialId, {
+`,
+		patched: `\t\t\t\tconst n = flags.account;
+\t\t\t\t// CUELO: account numbers are seats (\`position + 1\`, as --list prints them); an auth-failed
+\t\t\t\t// account leaves its number empty instead of shifting the others.
+\t\t\t\tconst selected = n === undefined ? undefined : accounts.find(acct => acct.position === n - 1);
+\t\t\t\tif (n === undefined || selected === undefined) {
+\t\t\t\t\tprocess.stderr.write(
+\t\t\t\t\t\t\`\${chalk.red(\`Invalid --account \${n ?? "(missing)"}.\`)} Provider "\${providerName}" has OAuth account(s) \${accounts.map(acct => acct.position + 1).join(", ")}.\\n\`,
+\t\t\t\t\t);
+\t\t\t\t\tprocess.exitCode = 1;
+\t\t\t\t\treturn;
+\t\t\t\t}
+\t\t\t\tconst resolution = managedMcpOAuth
+\t\t\t\t\t? await resolveManagedMcpOAuthToken(authStorage, provider, {
+\t\t\t\t\t\t\tcredentialId: selected.credentialId,
+\t\t\t\t\t\t\tforceRefresh: flags["force-refresh"],
+\t\t\t\t\t\t})
+\t\t\t\t\t: await authStorage.oauth.accessById(provider, selected.credentialId, {
+`,
+	},
+	{
+		// 첫 줄이 read 예산보다 크면 hashline 모드는 그 줄을 한 바이트도 내지 않고 거부 문구만 낸다. 그런데
+		// upstream은 preview 크기를 전달량으로 보고해 "[Showing line 1 (partial, 150.0KB of 195.3KB)]"처럼
+		// 모델이 받은 적 없는 150KB를 받았다고 말한다(2026-10-04 실측). 전달량은 본문에 실제로 실린 것만 센다.
+		// :raw·hashline을 끈 모드의 preview, 재개 offset 미제공, 수집 예산은 그대로다.
+		file: "src/tools/read.ts",
+		marker: "\t\t\t\t\t// CUELO: hashline mode refuses the oversized line outright",
+		anchor: "\t\t\t\t\tconst previewBytes = firstLineExceedsLimit ? (firstLinePreview?.bytes ?? 0) : 0;\n",
+		patched: "\t\t\t\t\t// CUELO: hashline mode refuses the oversized line outright and delivers none of it, so its\n\t\t\t\t\t// notice must report 0 bytes shown, not the preview it never rendered.\n\t\t\t\t\tconst previewBytes =\n\t\t\t\t\t\tfirstLineExceedsLimit && (rawSelector || !displayMode.hashLines) ? (firstLinePreview?.bytes ?? 0) : 0;\n",
+	},
 ];
 // EDITS 문자열의 줄 끝을 LF로 통일한다. 이 파일의 작업 사본이 CRLF여도 core 파일(LF)과
 // 비교·치환이 어긋나지 않는다. core 파일 자체의 줄 끝은 건드리지 않는다.