cuelo 0.9.5 → 0.9.7

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

@@ -85,6 +85,131 @@ const OPUS55_ROW_18410 = {
  */
 const OPUS55_ROW_1851 = OPUS55_ROW_1846.patched.replace('"tps":95.2,', '"tps":93,');
 
+/**
+ * learn topic upsert 적용본. 갱신 때 metadata 의 session_id/cwd 는 최초 저장자로 남고,
+ * updated_session_id/updated_cwd/updated_at 이 최신 정정자·시점이며 context 는 최신 이유다.
+ * first_context/first_timestamp 는 기존 revision 이 명시적으로 1 일 때만 갱신 직전 값으로 보존한다
+ * (revision 없음/2+ 는 최초 이유·시점을 알 수 없으므로 지어내지 않는다). `$` 중괄호와 백틱은 쓰지 않는다.
+ */
+const learnTopicUpsertBlock = `// HANSE: topic-key learn upsert
+function upsertLearnTopic(
+	state: MnemopiSessionState,
+	params: LearnParams,
+	target: ReturnType<MnemopiSessionState["getScopedRetainTarget"]>,
+): { id: string; revision: number } {
+	const topic = params.topic!.normalize("NFKC").trim().toLowerCase();
+	if (!topic) throw new Error("Learn topic must not be blank.");
+	if (redactMemorySecrets(topic) !== topic) throw new Error("Learn topic contains a credential.");
+	const db = target.memory.conn;
+	const existing = db.query(
+		"SELECT id, timestamp, metadata_json FROM working_memory WHERE json_extract(metadata_json, '$.topic_key') = ? ORDER BY timestamp DESC, id DESC LIMIT 1",
+	).get(topic) as { id: string; timestamp: string; metadata_json: string } | null;
+	const revision = existing ? (Number(JSON.parse(existing.metadata_json).revision) || 1) + 1 : 1;
+	if (existing) return db.transaction(() => {
+		const content = redactMemorySecrets(params.memory);
+		const stored = JSON.parse(existing.metadata_json);
+		const now = new Date().toISOString();
+		// HANSE: learn topic provenance keeps first and latest source
+		const firstSeen = stored.revision === 1 ? { first_context: stored.context ?? null, first_timestamp: existing.timestamp } : {};
+		const latest = { updated_session_id: state.sessionId, updated_cwd: state.session.sessionManager.getCwd(), updated_at: now };
+		db.query("UPDATE working_memory SET content = ?, embed_text = NULL, timestamp = ?, metadata_json = ? WHERE id = ?").run(
+			content, now,
+			JSON.stringify({ ...firstSeen, ...stored, context: params.context == null ? null : redactMemorySecrets(params.context), topic_key: topic, revision, ...latest }),
+			existing.id,
+		);
+		db.query("DELETE FROM memory_embeddings WHERE memory_id = ?").run(existing.id);
+		return { id: existing.id, revision };
+	})();
+	const id = state.rememberScoped(params.memory, {
+		source: "coding-agent-learn", importance: 0.8,
+		metadata: { session_id: state.sessionId, cwd: state.session.sessionManager.getCwd(), context: params.context ?? null, tool: "learn", topic_key: topic, revision },
+		scope: "bank", extract: true, extractEntities: true, veracity: "tool", memoryType: "fact",
+	}, target);
+	return { id, revision };
+}
+
+export class LearnTool implements AgentTool<LearnSchema> {`;
+
+/**
+ * 회상 줄의 범위(global/project)·정정 표시 보조. 순수 표시이며 DB 와 RecallResult 원본은 바꾸지 않는다.
+ * 범위는 collectScopedRecallResults 가 고른 결과의 실제 bank 로 붙인 일시 필드(recallScope)에서만 읽는다.
+ * 정정 표시는 revision>1 일 때만, 최초 시점은 first_timestamp 가 있을 때만, 정정 시점은 updated_at 이 있을 때만 쓴다.
+ */
+const recallProvenanceBlock = String.raw`// HANSE: recall provenance note
+type RecallProvenance = { scope?: string; revision: number; first?: string; corrected?: string };
+function recallProvenance(result: RecallResult): RecallProvenance {
+	const scope = (result as { recallScope?: string }).recallScope;
+	let meta: Record<string, unknown> | null = null;
+	try {
+		const raw: unknown = result.metadata ?? (result.metadata_json ? JSON.parse(result.metadata_json) : null);
+		if (raw && typeof raw === "object") meta = raw as Record<string, unknown>;
+	} catch {
+		meta = null;
+	}
+	const day = (value: unknown): string | undefined =>
+		typeof value === "string" && /^\d{4}-\d{2}-\d{2}/.test(value) ? value.slice(0, 10) : undefined;
+	const revision = Number(meta?.revision);
+	return {
+		scope,
+		revision: Number.isInteger(revision) ? revision : 0,
+		first: day(meta?.first_timestamp),
+		corrected: day(meta?.updated_at),
+	};
+}
+function recallProvenanceNote(result: RecallResult): string {
+	const info = recallProvenance(result);
+	const parts: string[] = [];
+	if (info.scope) parts.push(info.scope);
+	if (info.revision > 1) {
+		parts.push("corrected r" + info.revision);
+		parts.push("first " + (info.first ?? "unknown"));
+		if (info.corrected) parts.push("corrected " + info.corrected);
+	}
+	return parts.length > 0 ? " {" + parts.join("; ") + "}" : "";
+}
+function recallRevisionFooter(results: readonly RecallResult[]): string {
+	return results.some(result => recallProvenance(result).revision > 1)
+		? "\n\nCorrected rows: read memory://<id> for the full metadata and correction reason."
+		: "";
+}
+
+`;
+
+/** 출처 구분 이전 learn topic upsert 적용본. 새 판(learnTopicUpsertBlock)이 이 본문을 대체한다(legacyPatched). */
+const learnTopicUpsertLegacyBlock = `// HANSE: topic-key learn upsert
+function upsertLearnTopic(
+	state: MnemopiSessionState,
+	params: LearnParams,
+	target: ReturnType<MnemopiSessionState["getScopedRetainTarget"]>,
+): { id: string; revision: number } {
+	const topic = params.topic!.normalize("NFKC").trim().toLowerCase();
+	if (!topic) throw new Error("Learn topic must not be blank.");
+	if (redactMemorySecrets(topic) !== topic) throw new Error("Learn topic contains a credential.");
+	const db = target.memory.conn;
+	const existing = db.query(
+		"SELECT id, metadata_json FROM working_memory WHERE json_extract(metadata_json, '$.topic_key') = ? ORDER BY timestamp DESC, id DESC LIMIT 1",
+	).get(topic) as { id: string; metadata_json: string } | null;
+	const revision = existing ? (Number(JSON.parse(existing.metadata_json).revision) || 1) + 1 : 1;
+	if (existing) return db.transaction(() => {
+		const content = redactMemorySecrets(params.memory);
+		db.query("UPDATE working_memory SET content = ?, embed_text = NULL, timestamp = ?, metadata_json = ? WHERE id = ?").run(
+			content, new Date().toISOString(),
+			JSON.stringify({ ...JSON.parse(existing.metadata_json), context: params.context == null ? null : redactMemorySecrets(params.context), topic_key: topic, revision }),
+			existing.id,
+		);
+		db.query("DELETE FROM memory_embeddings WHERE memory_id = ?").run(existing.id);
+		return { id: existing.id, revision };
+	})();
+	const id = state.rememberScoped(params.memory, {
+		source: "coding-agent-learn", importance: 0.8,
+		metadata: { session_id: state.sessionId, cwd: state.session.sessionManager.getCwd(), context: params.context ?? null, tool: "learn", topic_key: topic, revision },
+		scope: "bank", extract: true, extractEntities: true, veracity: "tool", memoryType: "fact",
+	}, target);
+	return { id, revision };
+}
+
+export class LearnTool implements AgentTool<LearnSchema> {`;
+
 /**
  * 기억 임베딩 (6) 항목의 본문. 0.9.3 은 recall 이 e5 여부로 dense 하한을 고르게 `usesE5Prefix` 를 export 한다.
  * 0.9.2 적용본(export 없음)은 legacyPatched 로 남겨 같은 항목이 새 판으로 바꾼다.
@@ -219,6 +344,131 @@ const TASK_AGENT_OPTIONAL_EDITS = [
 	},
 ];
 
+/**
+ * 부모 steer bracket 장부(#ircTurnBracketOpen·adopted steer)와 입양·continuation 관찰 메서드. setIrcWakeTurnObserver
+ * 항목의 18.6.1 후보와 18.6.3 후보가 같은 본문을 붙이므로 한 곳에 둔다(값은 18.6.1 후보 patched 의 해당 구간 그대로).
+ */
+const IRC_STEER_BRACKET_MEMBERS = `
+
+	/** True while some bracket already owes the steering parent this turn's
+	 *  result: the wake monitor, a continuation that started owing a steer, or an
+	 *  adoption below. One owner per turn - never two relays for one turn. */
+	#ircTurnBracketOpen = false;
+
+	/** Parent steers that landed after this turn's bracket was already open - a
+	 *  sibling peer's wake turn, or an earlier adoption. The open bracket owns
+	 *  them: a turn finalizes exactly once, so they ride that finalization
+	 *  instead of opening a second monitor for the same turn. */
+	#adoptedParentSteerEntries: ParentSteerRelay[] = [];
+
+	/** Hands the open bracket the adopted steers this turn actually consumed, so
+	 *  its single finalization answers their sender too. Stranded ones stay parked
+	 *  for the continuation that consumes them. */
+	#takeAdoptedParentSteerRecords(): AgentMessage[] {
+		const entries = this.#adoptedParentSteerEntries;
+		if (entries.length === 0) return [];
+		this.#adoptedParentSteerEntries = [];
+		const queued = this.agent.peekSteeringQueue();
+		return entries.filter(entry => !queued.some(message => message === entry.steered)).map(entry => entry.record);
+	}
+
+	/**
+	 * A parent steer landed inside a turn that is ALREADY running, so no bracket
+	 * could have been opened for it at turn start. Ownership follows consumption:
+	 * if this running turn polls the steer out of the agent-core queue, this
+	 * turn's result is the answer, and nothing else will ever send one - the
+	 * spawn job settled long ago and #scheduleAgentContinue only brackets turns
+	 * that START owing a steer. So bracket the running turn now, while the
+	 * monitor can still watch it, and decide at settle from the queue itself:
+	 *   - steer gone   -> this turn consumed it -> relay its result, exactly once;
+	 *   - steer queued -> genuinely stranded    -> stay silent and leave the
+	 *     parked record to the continuation that will consume it.
+	 * No-ops while the spawn job still owns the run (no observer installed).
+	 */
+	#adoptParentSteerForRunningTurn(): void {
+		if (this.#promptInFlightCount === 0 || !this.isStreaming) return;
+		const observer = this.#ircWakeTurnObserver;
+		if (observer === undefined) return;
+		const entries = this.#irc.peekParentSteerRelays();
+		if (entries.length === 0) return;
+		if (this.#ircTurnBracketOpen) {
+			// Another bracket already owes this turn's one finalization (a sibling's
+			// wake turn, or an earlier adoption). Opening a second monitor would
+			// finalize the same turn twice - two lifecycle frames, two artifacts -
+			// while dropping the steer would leave the parent unanswered whenever
+			// this turn consumes it. Ride the open bracket instead.
+			for (const entry of entries) {
+				if (!this.#adoptedParentSteerEntries.includes(entry)) this.#adoptedParentSteerEntries.push(entry);
+			}
+			return;
+		}
+		let finish:
+			| ((error?: unknown, suppressRelay?: boolean, adoptedRecords?: AgentMessage[]) => void | Promise<void>)
+			| undefined;
+		try {
+			// The parent's steer did not wake this turn, and it may still strand:
+			// the monitor must not claim the parent's answer up front.
+			finish = observer(entries.map(entry => entry.record), { runningTurn: true });
+		} catch (error) {
+			logger.warn("IRC steer continuation observer failed to start", { error: String(error) });
+			return;
+		}
+		if (finish === undefined) return;
+		this.#ircTurnBracketOpen = true;
+		// Same settle hook every other bracket uses; it runs before the queue
+		// reconciliation in #drainStrandedQueuedMessages, so the entries this turn
+		// consumed are still parked here and retire immediately afterwards.
+		this.#inFlightSettledCallbacks.push(async () => {
+			this.#ircTurnBracketOpen = false;
+			const queued = this.agent.peekSteeringQueue();
+			const stranded = entries.some(entry => queued.some(message => message === entry.steered));
+			try {
+				await finish?.(undefined, stranded, this.#takeAdoptedParentSteerRecords());
+			} catch (error) {
+				logger.warn("IRC steer continuation observer failed to finish", { error: String(error) });
+			}
+		});
+	}
+
+	/**
+	 * Brackets an autonomous continuation with the wake-turn monitor when a parent
+	 * IRC steer is what it resumes. \`#ircWakeTurnObserver\` exists only after the
+	 * kept-alive subagent's spawn run settled (task executor
+	 * \`installIrcWakeTurnMonitor\`), so its presence is exactly the condition "this
+	 * agent's job can no longer deliver its results". That flag is handed to the
+	 * bridge rather than short-circuiting here: while the job still owns the run
+	 * the record must stay parked, and the queue-backed reconciliation in
+	 * #drainStrandedQueuedMessages - not this call - decides when it retires.
+	 * Returns the consumed entries so a continuation that never ran can re-arm.
+	 */
+	#beginIrcSteerContinuationObservation():
+		| {
+				entries: ParentSteerRelay[];
+				finish:
+					| ((error?: unknown, suppressRelay?: boolean, adoptedRecords?: AgentMessage[]) => void | Promise<void>)
+					| undefined;
+		  }
+		| undefined {
+		const observer = this.#ircWakeTurnObserver;
+		// A bracket is already open for this turn: #adoptParentSteerForRunningTurn
+		// took the running turn and settles the same obligation from the queue.
+		// Taking the entries here would open a second monitor for one obligation -
+		// two "started" lifecycle frames, two finalized run artifacts, and a parent
+		// notice that stays single only because the bus drops the duplicate send.
+		if (this.#ircTurnBracketOpen) return undefined;
+		const entries = this.#irc.takeParentSteerRelays(observer !== undefined);
+		if (observer === undefined || entries.length === 0) return undefined;
+		const records = entries.map(entry => entry.record);
+		try {
+			const finish = observer(records);
+			if (finish !== undefined) this.#ircTurnBracketOpen = true;
+			return { entries, finish };
+		} catch (error) {
+			logger.warn("IRC steer continuation observer failed to start", { error: String(error) });
+			return { entries, finish: undefined };
+		}
+	}`;
+
 /** 각 항목: 원본 앵커를 찾아 patched 로 바꾼다. marker 가 있으면 이미 적용된 것으로 본다. */
 const EDITS = [
 	{
@@ -1254,6 +1504,9 @@ export interface IrcBridgeHost {
 		// 더 이상 결과를 전달할 수 없다"는 조건이다.
 		file: "src/session/agent-session.ts",
 		marker: "#beginIrcSteerContinuationObservation",
+		// 18.6.3(#14428)은 이 setter 의 주석을 바꾸고 관찰 수명을 #openTurnObservation 으로 관리한다. 두 판의 결과가 같은
+		// marker 를 가지므로 그 필드 유무로 후보를 가른다. 붙이는 장부·메서드 본문은 같다(IRC_STEER_BRACKET_MEMBERS).
+		excludes: "#openTurnObservation",
 		anchor: `	/** Installs task-executor monitoring around autonomous IRC wake turns. */
 	setIrcWakeTurnObserver(
 		observer: ((records: AgentMessage[]) => ((error?: unknown) => void | Promise<void>) | undefined) | undefined,
@@ -1280,126 +1533,45 @@ export interface IrcBridgeHost {
 			| undefined,
 	): void {
 		this.#ircWakeTurnObserver = observer;
-	}
-
-	/** True while some bracket already owes the steering parent this turn's
-	 *  result: the wake monitor, a continuation that started owing a steer, or an
-	 *  adoption below. One owner per turn - never two relays for one turn. */
-	#ircTurnBracketOpen = false;
-
-	/** Parent steers that landed after this turn's bracket was already open - a
-	 *  sibling peer's wake turn, or an earlier adoption. The open bracket owns
-	 *  them: a turn finalizes exactly once, so they ride that finalization
-	 *  instead of opening a second monitor for the same turn. */
-	#adoptedParentSteerEntries: ParentSteerRelay[] = [];
-
-	/** Hands the open bracket the adopted steers this turn actually consumed, so
-	 *  its single finalization answers their sender too. Stranded ones stay parked
-	 *  for the continuation that consumes them. */
-	#takeAdoptedParentSteerRecords(): AgentMessage[] {
-		const entries = this.#adoptedParentSteerEntries;
-		if (entries.length === 0) return [];
-		this.#adoptedParentSteerEntries = [];
-		const queued = this.agent.peekSteeringQueue();
-		return entries.filter(entry => !queued.some(message => message === entry.steered)).map(entry => entry.record);
-	}
-
-	/**
-	 * A parent steer landed inside a turn that is ALREADY running, so no bracket
-	 * could have been opened for it at turn start. Ownership follows consumption:
-	 * if this running turn polls the steer out of the agent-core queue, this
-	 * turn's result is the answer, and nothing else will ever send one - the
-	 * spawn job settled long ago and #scheduleAgentContinue only brackets turns
-	 * that START owing a steer. So bracket the running turn now, while the
-	 * monitor can still watch it, and decide at settle from the queue itself:
-	 *   - steer gone   -> this turn consumed it -> relay its result, exactly once;
-	 *   - steer queued -> genuinely stranded    -> stay silent and leave the
-	 *     parked record to the continuation that will consume it.
-	 * No-ops while the spawn job still owns the run (no observer installed).
+	}` + IRC_STEER_BRACKET_MEMBERS,
+		alternates: [{
+			file: "src/session/agent-session.ts",
+			requires: "#openTurnObservation",
+			marker: "#beginIrcSteerContinuationObservation",
+			anchor: `	/**
+	 * Installs task-executor monitoring around turns no executor drives: autonomous IRC
+	 * wake turns and user prompts (focused-session steering of a kept-alive subagent).
 	 */
-	#adoptParentSteerForRunningTurn(): void {
-		if (this.#promptInFlightCount === 0 || !this.isStreaming) return;
-		const observer = this.#ircWakeTurnObserver;
-		if (observer === undefined) return;
-		const entries = this.#irc.peekParentSteerRelays();
-		if (entries.length === 0) return;
-		if (this.#ircTurnBracketOpen) {
-			// Another bracket already owes this turn's one finalization (a sibling's
-			// wake turn, or an earlier adoption). Opening a second monitor would
-			// finalize the same turn twice - two lifecycle frames, two artifacts -
-			// while dropping the steer would leave the parent unanswered whenever
-			// this turn consumes it. Ride the open bracket instead.
-			for (const entry of entries) {
-				if (!this.#adoptedParentSteerEntries.includes(entry)) this.#adoptedParentSteerEntries.push(entry);
-			}
-			return;
-		}
-		let finish:
-			| ((error?: unknown, suppressRelay?: boolean, adoptedRecords?: AgentMessage[]) => void | Promise<void>)
-			| undefined;
-		try {
-			// The parent's steer did not wake this turn, and it may still strand:
-			// the monitor must not claim the parent's answer up front.
-			finish = observer(entries.map(entry => entry.record), { runningTurn: true });
-		} catch (error) {
-			logger.warn("IRC steer continuation observer failed to start", { error: String(error) });
-			return;
-		}
-		if (finish === undefined) return;
-		this.#ircTurnBracketOpen = true;
-		// Same settle hook every other bracket uses; it runs before the queue
-		// reconciliation in #drainStrandedQueuedMessages, so the entries this turn
-		// consumed are still parked here and retire immediately afterwards.
-		this.#inFlightSettledCallbacks.push(async () => {
-			this.#ircTurnBracketOpen = false;
-			const queued = this.agent.peekSteeringQueue();
-			const stranded = entries.some(entry => queued.some(message => message === entry.steered));
-			try {
-				await finish?.(undefined, stranded, this.#takeAdoptedParentSteerRecords());
-			} catch (error) {
-				logger.warn("IRC steer continuation observer failed to finish", { error: String(error) });
-			}
-		});
-	}
-
-	/**
-	 * Brackets an autonomous continuation with the wake-turn monitor when a parent
-	 * IRC steer is what it resumes. \`#ircWakeTurnObserver\` exists only after the
-	 * kept-alive subagent's spawn run settled (task executor
-	 * \`installIrcWakeTurnMonitor\`), so its presence is exactly the condition "this
-	 * agent's job can no longer deliver its results". That flag is handed to the
-	 * bridge rather than short-circuiting here: while the job still owns the run
-	 * the record must stay parked, and the queue-backed reconciliation in
-	 * #drainStrandedQueuedMessages - not this call - decides when it retires.
-	 * Returns the consumed entries so a continuation that never ran can re-arm.
+	setIrcWakeTurnObserver(
+		observer: ((records: AgentMessage[]) => ((error?: unknown) => void | Promise<void>) | undefined) | undefined,
+	): void {
+		this.#ircWakeTurnObserver = observer;
+	}`,
+			patched: `	/**
+	 * Installs task-executor monitoring around turns no executor drives: autonomous IRC
+	 * wake turns and user prompts (focused-session steering of a kept-alive subagent).
+	 * \`suppressRelay\` lets the session finalize a bracketed turn without
+	 * claiming it answered the parent (see #adoptParentSteerForRunningTurn).
+	 * \`adoptedRecords\` carries steers that landed after the bracket opened and
+	 * that this same turn consumed: one finalization answers every source.
+	 * \`bracket.runningTurn\` marks a bracket opened over a turn that was ALREADY
+	 * running (the parent's steer did not wake it), so the monitor must not
+	 * treat it as parent-woken work: whether it owns the answer is only known
+	 * at settle.
 	 */
-	#beginIrcSteerContinuationObservation():
-		| {
-				entries: ParentSteerRelay[];
-				finish:
+	setIrcWakeTurnObserver(
+		observer:
+			| ((
+					records: AgentMessage[],
+					bracket?: { runningTurn?: boolean },
+			  ) =>
 					| ((error?: unknown, suppressRelay?: boolean, adoptedRecords?: AgentMessage[]) => void | Promise<void>)
-					| undefined;
-		  }
-		| undefined {
-		const observer = this.#ircWakeTurnObserver;
-		// A bracket is already open for this turn: #adoptParentSteerForRunningTurn
-		// took the running turn and settles the same obligation from the queue.
-		// Taking the entries here would open a second monitor for one obligation -
-		// two "started" lifecycle frames, two finalized run artifacts, and a parent
-		// notice that stays single only because the bus drops the duplicate send.
-		if (this.#ircTurnBracketOpen) return undefined;
-		const entries = this.#irc.takeParentSteerRelays(observer !== undefined);
-		if (observer === undefined || entries.length === 0) return undefined;
-		const records = entries.map(entry => entry.record);
-		try {
-			const finish = observer(records);
-			if (finish !== undefined) this.#ircTurnBracketOpen = true;
-			return { entries, finish };
-		} catch (error) {
-			logger.warn("IRC steer continuation observer failed to start", { error: String(error) });
-			return { entries, finish: undefined };
-		}
-	}`,
+					| undefined)
+			| undefined,
+	): void {
+		this.#ircWakeTurnObserver = observer;
+	}` + IRC_STEER_BRACKET_MEMBERS,
+		}],
 	},
 	{
 		// 실제 bracket. #wakeForIrc 가 wake turn 을 감싸는 방식과 같은 계약이다:
@@ -1640,6 +1812,50 @@ export interface IrcBridgeHost {
 				} catch (error) {
 					logger.warn("IRC wake turn observer failed to start", { error: String(error) });
 				}`,
+		// 18.6.3(#14428)은 wake 와 사용자 prompt 의 관찰을 #startTurnObservation 으로 모으고 "세션당 열린 관찰 하나"를
+		// #openTurnObservation 으로 지킨다. 우리 장부도 그 관찰을 이 turn 의 bracket 으로 본다. 반대로 우리 bracket(입양·
+		// stranded steer continuation)이 돌고 있는 turn 을 잡고 있으면, 상류가 자기 관찰의 turn 이 아직 돌 때 하듯 시작하지
+		// 않는다. 두 장부가 서로를 모르면 같은 turn 을 두 monitor 가 정산한다(ADAPT).
+		alternates: [{
+			file: "src/session/agent-session.ts",
+			marker: "this.#openTurnObservation = observation;\n\t\t// The observation is this turn's bracket",
+			anchor: `		const open = this.#openTurnObservation;
+		if (open) {
+			if (!open.turnEnded) return undefined;
+			void this.#closeTurnObservation(open);
+		}
+		let finish: TurnObservation["finish"] | undefined;
+		try {
+			finish = this.#ircWakeTurnObserver?.(records);
+		} catch (error) {
+			logger.warn("Turn observer failed to start", { error: String(error) });
+		}
+		if (!finish) return undefined;
+		const observation: TurnObservation = { finish, turnEnded: false, closed: false, turnError: undefined };
+		this.#openTurnObservation = observation;`,
+			patched: `		const open = this.#openTurnObservation;
+		if (open) {
+			if (!open.turnEnded) return undefined;
+			void this.#closeTurnObservation(open);
+		} else if (this.#ircTurnBracketOpen) {
+			// A parent-steer bracket (#adoptParentSteerForRunningTurn, or the
+			// continuation that resumes a stranded steer) already owns the running
+			// turn. One monitor per turn, as for an open observation whose turn runs.
+			return undefined;
+		}
+		let finish: TurnObservation["finish"] | undefined;
+		try {
+			finish = this.#ircWakeTurnObserver?.(records);
+		} catch (error) {
+			logger.warn("Turn observer failed to start", { error: String(error) });
+		}
+		if (!finish) return undefined;
+		const observation: TurnObservation = { finish, turnEnded: false, closed: false, turnError: undefined };
+		this.#openTurnObservation = observation;
+		// The observation is this turn's bracket: a parent steer landing in it rides
+		// its single finalization instead of opening a second monitor.
+		this.#ircTurnBracketOpen = true;`,
+		}],
 	},
 	{
 		// wake turn 의 지역 선언도 같은 계약을 실어야 한다. 이 turn 도중에 도착해
@@ -1650,6 +1866,15 @@ export interface IrcBridgeHost {
 		patched: `		let finishObservation:
 			| ((error?: unknown, suppressRelay?: boolean, adoptedRecords?: AgentMessage[]) => void | Promise<void>)
 			| undefined;`,
+		// 18.6.3: wake 지역 변수 대신 TurnObservation.finish 가 같은 계약을 싣는다(ADAPT).
+		alternates: [{
+			file: "src/session/agent-session.ts",
+			marker: "type TurnObservation = {\n\tfinish: (error?: unknown, suppressRelay?: boolean",
+			anchor: `type TurnObservation = {
+	finish: (error?: unknown) => void | Promise<void>;`,
+			patched: `type TurnObservation = {
+	finish: (error?: unknown, suppressRelay?: boolean, adoptedRecords?: AgentMessage[]) => void | Promise<void>;`,
+		}],
 	},
 	{
 		// wake bracket 의 닫는 쪽. 같은 장부를 되돌린다.
@@ -1703,6 +1928,54 @@ export interface IrcBridgeHost {
 				};
 				if (this.#promptInFlightCount > 0) this.#inFlightSettledCallbacks.push(finishWakeObservation);
 				else await finishWakeObservation();`,
+		}, {
+			// 18.6.3: 같은 정산이 #finishTurnObservation(settle 대기)과 #closeTurnObservation(한 번만 finish)으로 옮겨졌다.
+			// settle 뒤에도 turn 이 in-flight 면 그 settle 콜백에서 닫고, 닫을 때 장부를 내리고 adopted steer 를 넘긴다(ADAPT).
+			// 새 wake·사용자 prompt 가 먼저 닫으면(상류 supersede) 미뤄 둔 닫기는 closed 로 끝난다.
+			file: "src/session/agent-session.ts",
+			marker: "await observation.finish(observation.turnError, undefined, adoptedRecords);",
+			anchor: `		try {
+			await this.settleAsyncWork();
+		} catch (error) {
+			logger.warn("Turn observation async-work settle failed", { error: String(error) });
+		}
+		await this.#closeTurnObservation(observation);
+	}
+
+	/** Runs an observation's finish exactly once; the observer detaches synchronously before the first await. */
+	async #closeTurnObservation(observation: TurnObservation): Promise<void> {
+		if (observation.closed) return;
+		observation.closed = true;
+		if (this.#openTurnObservation === observation) this.#openTurnObservation = undefined;
+		try {
+			await observation.finish(observation.turnError);`,
+			patched: `		try {
+			await this.settleAsyncWork();
+		} catch (error) {
+			logger.warn("Turn observation async-work settle failed", { error: String(error) });
+		}
+		// The settle waits for agent streaming only. A turn still in flight past it
+		// (a continuation between #beginInFlight and agent.continue that resumes a
+		// stranded parent steer) runs inside this bracket, so close at its own
+		// settle: the adopted steers it consumes then ride this one finalization.
+		if (this.#promptInFlightCount > 0) {
+			this.#inFlightSettledCallbacks.push(() => this.#closeTurnObservation(observation));
+			return;
+		}
+		await this.#closeTurnObservation(observation);
+	}
+
+	/** Runs an observation's finish exactly once; the observer detaches synchronously before the first await. */
+	async #closeTurnObservation(observation: TurnObservation): Promise<void> {
+		if (observation.closed) return;
+		observation.closed = true;
+		if (this.#openTurnObservation === observation) this.#openTurnObservation = undefined;
+		// The bracket ledger closes with the observation; parent steers that landed
+		// after it opened and that its turn consumed ride this finalization.
+		this.#ircTurnBracketOpen = false;
+		const adoptedRecords = this.#takeAdoptedParentSteerRecords();
+		try {
+			await observation.finish(observation.turnError, undefined, adoptedRecords);`,
 		}],
 	},
 	{
@@ -5551,6 +5824,39 @@ export function hostNextServerEnvUnsets(
 		: hostNextServerEnvUnsets(process.env, shellEnv).filter(name => !(options?.env && name in options.env));
 	if (hostEnvUnsets.length > 0) preflight.command = \`unset -v \${hostEnvUnsets.join(" ")}; \${preflight.command}\`;
 	const commandEnv = buildNonInteractiveEnv(preflight.env);
+`,
+	},
+	{
+		// 2026-10-07 Linux: 위 항목이 건너뛰는 PTY 경로(zsh/fish 사용자 셸의 `!` 핫키)는 map 에서 지운 서버 변수가 되살아났다.
+		// native PTY 가 넘긴 env map 을 OS environ 위에 덧씌우기 때문이다(실측: zsh 이름 셸 + usePty 에서 NODE_ENV=production).
+		// 셸과 무관하게 argv 앞에 `env -u NAME…` 를 붙여 뺀다. 이름 목록은 위 `unset -v` 와 같은 규칙이고, 비면 argv 는 그대로다.
+		// Windows 는 사용자 셸 PTY 를 쓰지 않는다(resolveUserShellConfig 가 기본 셸로 돌아간다).
+		file: "src/exec/bash-executor.ts",
+		marker: "\tenvUnsets: string[]; // HANSE: CUELO next server env",
+		anchor: "\tcwd: string | undefined;\n\tenv: Record<string, string>;\n\tpty: BashPtyOptions;\n",
+		patched: "\tcwd: string | undefined;\n\tenv: Record<string, string>;\n\tenvUnsets: string[]; // HANSE: CUELO next server env\n\tpty: BashPtyOptions;\n",
+	},
+	{
+		file: "src/exec/bash-executor.ts",
+		marker: '...(run.envUnsets.length > 0 ? [...run.envUnsets.flatMap(name => ["-u", name]), run.shell] : []),',
+		anchor: "\t\t\tapplication: run.shell,\n\t\t\targs: [...ensureInteractiveShellArgs(run.shell, run.args), run.command],\n",
+		patched: `			// HANSE: CUELO next server env stays out of the user-shell PTY. The native PTY layers the env map
+			// over the OS environ, so names dropped from the map come back unless env -u removes them at exec.
+			application: run.envUnsets.length > 0 ? "env" : run.shell,
+			args: [
+				...(run.envUnsets.length > 0 ? [...run.envUnsets.flatMap(name => ["-u", name]), run.shell] : []),
+				...ensureInteractiveShellArgs(run.shell, run.args),
+				run.command,
+			],
+`,
+	},
+	{
+		file: "src/exec/bash-executor.ts",
+		marker: "envUnsets: hostNextServerEnvUnsets(process.env, shellEnv).filter(",
+		anchor: "\t\t\t\tenv: buildUserShellPtyEnv(shellEnv, commandEnv),\n\t\t\t\tpty: ptyRequest,\n",
+		patched: `				env: buildUserShellPtyEnv(shellEnv, commandEnv),
+				envUnsets: hostNextServerEnvUnsets(process.env, shellEnv).filter(name => !(options?.env && name in options.env)),
+				pty: ptyRequest,
 `,
 	},
 	{
@@ -5568,15 +5874,54 @@ export function hostNextServerEnvUnsets(
 		anchor: 'import { workerEnvFromParent } from "../subprocess/worker-client";\n',
 		patched: 'import { workerEnvFromParent } from "../subprocess/worker-client";\nimport { hostNextServerEnvUnsets } from "@oh-my-pi/pi-utils/env";\n',
 	},
+	{
+		// 2026-10-07 Linux: 아래 startup 의 `delete process.env` 는 Windows 에서는 OS env 에도 반영되지만, Linux Bun 에서는 OS
+		// environ 까지 내려가지 않는다. pi-natives PtySession 은 OS environ 위에 넘긴 env map 을 덧씌우므로 pty service 에
+		// 서버 변수가 되살아났다(실측: map·pipe 는 unset, pty 는 OS 값). 지운 이름을 기억해 POSIX PTY 실행에서 뺀다(아래 항목).
+		file: "src/launch/broker.ts",
+		marker: "const brokerDroppedHostEnv = new Set<string>();",
+		anchor: 'const LOG_FILE = "output.log";\n',
+		patched: `/** HANSE: CUELO Next server env names this broker dropped from its own env at startup. */
+const brokerDroppedHostEnv = new Set<string>();
+const LOG_FILE = "output.log";
+`,
+	},
 	{
 		file: "src/launch/broker.ts",
-		marker: "// HANSE: broker env drops inherited CUELO next server env",
+		marker: "brokerDroppedHostEnv.add(name);",
 		anchor: "\tdelete process.env[DAEMON_IDLE_GRACE_ENV];\n",
 		patched: `	delete process.env[DAEMON_IDLE_GRACE_ENV];
 	// HANSE: broker env drops inherited CUELO next server env
+	for (const name of hostNextServerEnvUnsets(process.env, {})) {
+		delete process.env[name];
+		brokerDroppedHostEnv.add(name);
+	}
+`,
+		// 2026-10-07 이전 적용본(이름을 기억하지 않는다). 그 위에 다시 적용하면 이 본문으로 바뀐다.
+		legacyPatched: `	delete process.env[DAEMON_IDLE_GRACE_ENV];
+	// HANSE: broker env drops inherited CUELO next server env
 	for (const name of hostNextServerEnvUnsets(process.env, {})) delete process.env[name];
 `,
 	},
+	{
+		// POSIX PTY service 는 사용자 셸(bash·zsh·fish)로 `exec <argv>` 를 띄운다. 셸과 무관하게 argv 앞에 `env -u NAME…` 를
+		// 붙여 OS environ 에서 온 서버 변수를 뺀다(`exec env` 가 같은 pid 로 app 을 exec 한다). 호출자가 준 이름은 map 에 있으니
+		// 남긴다. Windows(startArgv)·pipe 경로와 서버 변수가 없던 broker 는 그대로다.
+		file: "src/launch/broker.ts",
+		marker: "const dropped = [...brokerDroppedHostEnv]",
+		anchor: `			const argv = [record.spec.application, ...record.spec.args];
+			const command = \`exec \${argv.map(quoteShellArg).join(" ")}\`;`,
+		patched: `			// HANSE: CUELO next server env stays out of POSIX PTY services. The native PTY layers its env
+			// map over the OS environ, and the startup delete of process.env does not reach the OS environ
+			// on Linux, so drop those names at exec. Names the caller set are in the map and stay.
+			const dropped = [...brokerDroppedHostEnv].filter(name => !(name in options.env));
+			const argv = [
+				...(dropped.length > 0 ? ["env", ...dropped.flatMap(name => ["-u", name])] : []),
+				record.spec.application,
+				...record.spec.args,
+			];
+			const command = \`exec \${argv.map(quoteShellArg).join(" ")}\`;`,
+	},
 	{
 		// 2026-09-29 jevgrep 비교(.omp/jevgrep-comparison/SUMMARY.md §4): jfind 의 비밀 파일 제외는 이름을
 		// 대소문자 구분으로 비교해, Windows(NTFS 대소문자 무시)에서 같은 파일인 `Credentials.json`·`ID_RSA`
@@ -5723,7 +6068,35 @@ function operationFromNative(op: string): Operation | undefined {
 		file: "src/mnemopi/state.ts",
 		marker: "// HANSE: recall line carries memory id",
 		anchor: "\t\treturn `- ${content}${source}${date}`;\n",
-		patched: "\t\t// HANSE: recall line carries memory id\n\t\tconst memoryId = result.id ? ` (id: ${result.id})` : \"\";\n\t\treturn `- ${content}${source}${date}${memoryId}`;\n",
+		patched: "\t\t// HANSE: recall line carries memory id\n\t\tconst memoryId = result.id ? ` (id: ${result.id})` : \"\";\n\t\treturn `- ${content}${source}${date}${recallProvenanceNote(result)}${memoryId}`;\n",
+		legacyPatched: "\t\t// HANSE: recall line carries memory id\n\t\tconst memoryId = result.id ? ` (id: ${result.id})` : \"\";\n\t\treturn `- ${content}${source}${date}${memoryId}`;\n",
+	},
+	{
+		// 위 항목의 짝. 범위·정정 표시 보조 함수와 정정 행이 있을 때만 붙는 한 줄 안내(상세는 memory://<id>).
+		file: "src/mnemopi/state.ts",
+		marker: "// HANSE: recall provenance note",
+		anchor: "function formatRecallBlock(results: RecallResult[]): string {\n",
+		patched: recallProvenanceBlock + "function formatRecallBlock(results: RecallResult[]): string {\n",
+	},
+	{
+		file: "src/mnemopi/state.ts",
+		marker: "${lines.join(\"\\n\\n\")}${recallRevisionFooter(results)}\\n</memories>",
+		anchor: "${lines.join(\"\\n\\n\")}\\n</memories>`;\n",
+		patched: "${lines.join(\"\\n\\n\")}${recallRevisionFooter(results)}\\n</memories>`;\n",
+	},
+	{
+		// recall 도구 출력도 같은 표시를 쓴다.
+		file: "src/mnemopi/state.ts",
+		marker: "${source}${date}${recallProvenanceNote(result)}${confidence}",
+		anchor: "\t\t\treturn `- ${result.content}${id}${source}${date}${confidence}`;\n\t\t});\n\t\treturn lines.join(\"\\n\\n\");\n",
+		patched: "\t\t\treturn `- ${result.content}${id}${source}${date}${recallProvenanceNote(result)}${confidence}`;\n\t\t});\n\t\treturn lines.join(\"\\n\\n\") + recallRevisionFooter(results);\n",
+	},
+	{
+		// 결과가 실제로 나온 bank 로 범위를 일시 표시한다(DB 저장 없음). 전역 bank 가 없는 구성은 추정하지 않는다.
+		file: "src/mnemopi/state.ts",
+		marker: "// HANSE: recall result carries its bank scope",
+		anchor: "\t\t\t\t\tfor (const result of results) {\n\t\t\t\t\t\tmergeRecallResult(merged, byId, byContent, result);\n",
+		patched: "\t\t\t\t\tfor (const result of results) {\n\t\t\t\t\t\t// HANSE: recall result carries its bank scope\n\t\t\t\t\t\tconst recallScope = this.scoped.global ? (target.bank === this.scoped.global.bank ? \"global\" : \"project\") : undefined;\n\t\t\t\t\t\tmergeRecallResult(merged, byId, byContent, { ...result, recallScope } as RecallResult);\n",
 	},
 	{
 		file: "src/tools/learn.ts",
@@ -5744,42 +6117,12 @@ function operationFromNative(op: string): Operation | undefined {
 		patched: '\t"topic?": type("string").describe("stable topic key; later lessons with this key replace the prior project lesson"),\n\t"scope?": type("\'project\' | \'global\'").describe(',
 	},
 	{
+		// 출처 구분: 갱신해도 최초 session/cwd 는 남고 updated_* 가 최신 정정자다. legacyPatched 는 출처 구분 이전 적용본이다.
 		file: "src/tools/learn.ts",
-		marker: "// HANSE: topic-key learn upsert",
+		marker: "// HANSE: learn topic provenance keeps first and latest source",
 		anchor: "export class LearnTool implements AgentTool<LearnSchema> {",
-		patched: `// HANSE: topic-key learn upsert
-function upsertLearnTopic(
-	state: MnemopiSessionState,
-	params: LearnParams,
-	target: ReturnType<MnemopiSessionState["getScopedRetainTarget"]>,
-): { id: string; revision: number } {
-	const topic = params.topic!.normalize("NFKC").trim().toLowerCase();
-	if (!topic) throw new Error("Learn topic must not be blank.");
-	if (redactMemorySecrets(topic) !== topic) throw new Error("Learn topic contains a credential.");
-	const db = target.memory.conn;
-	const existing = db.query(
-		"SELECT id, metadata_json FROM working_memory WHERE json_extract(metadata_json, '$.topic_key') = ? ORDER BY timestamp DESC, id DESC LIMIT 1",
-	).get(topic) as { id: string; metadata_json: string } | null;
-	const revision = existing ? (Number(JSON.parse(existing.metadata_json).revision) || 1) + 1 : 1;
-	if (existing) return db.transaction(() => {
-		const content = redactMemorySecrets(params.memory);
-		db.query("UPDATE working_memory SET content = ?, embed_text = NULL, timestamp = ?, metadata_json = ? WHERE id = ?").run(
-			content, new Date().toISOString(),
-			JSON.stringify({ ...JSON.parse(existing.metadata_json), context: params.context == null ? null : redactMemorySecrets(params.context), topic_key: topic, revision }),
-			existing.id,
-		);
-		db.query("DELETE FROM memory_embeddings WHERE memory_id = ?").run(existing.id);
-		return { id: existing.id, revision };
-	})();
-	const id = state.rememberScoped(params.memory, {
-		source: "coding-agent-learn", importance: 0.8,
-		metadata: { session_id: state.sessionId, cwd: state.session.sessionManager.getCwd(), context: params.context ?? null, tool: "learn", topic_key: topic, revision },
-		scope: "bank", extract: true, extractEntities: true, veracity: "tool", memoryType: "fact",
-	}, target);
-	return { id, revision };
-}
-
-export class LearnTool implements AgentTool<LearnSchema> {`,
+		legacyPatched: learnTopicUpsertLegacyBlock,
+		patched: learnTopicUpsertBlock,
 	},
 	{
 		// learn 은 rememberScoped 가 돌려준 기억 id 를 버리고 "Lesson stored." 만 알렸다. 교훈을 뒤에서
@@ -7240,6 +7583,10 @@ class El {
 		// 모든 ref에 지문을 남기고, find()/ref()는 발급하는 요소에 지문을 남긴다.
 		file: "src/tools/computer/worker.ts",
 		marker: "return windowInputResult(action, this.id, options);",
+		// 18.6.3 은 같은 클래스에 holdKeys·holdMouse·observe·menu·bringToCurrentSpace 를 넣고 move 에 pointerOptions() 를
+		// 넘긴다. 결과가 같은 marker 를 가지므로 holdKeys 유무로 후보를 가른다. 새 메서드는 상류 그대로 두고, observe 만
+		// ax() 와 같은 규칙(텍스트의 모든 ref 에 지문, goal probe 안에서는 출력 없음)을 따른다(ADAPT).
+		excludes: "async holdKeys(",
 		anchor: `	async click(x: number, y: number, options?: ClickOptions): Promise<void> {
 		const context = this.#getContext();
 		guardRun(context, "click");
@@ -7280,18 +7627,230 @@ class El {
 		);
 	}
 
-	async type(text: string, options?: InputOptions): Promise<void> {
-		const context = this.#getContext();
-		guardRun(context, "type");
-		await nativeCall(context.signal, () => this.#session.typeText(this.id, text, pointerOptions(options)));
+	async type(text: string, options?: InputOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "type");
+		await nativeCall(context.signal, () => this.#session.typeText(this.id, text, pointerOptions(options)));
+	}
+
+	async press(chord: string | string[], options?: InputOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "press");
+		await nativeCall(context.signal, () =>
+			this.#session.keyChord(this.id, chordKeys(chord), pointerOptions(options)),
+		);
+	}
+
+	async raise(): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "raise");
+		await nativeCall(context.signal, () => this.#session.raiseWindow(this.id));
+	}
+
+	async ax(options?: AxOptions): Promise<string> {
+		const { signal } = this.#getContext();
+		return (await nativeCall(signal, () => this.#session.axSnapshot(this.id, options))).text;
+	}
+
+	async find(query: AxQuery): Promise<El[]> {
+		const { signal } = this.#getContext();
+		return (await nativeCall(signal, () => this.#session.axQuery(this.id, query))).map(
+			node => new El(this.#session, this.#getContext, node),
+		);
+	}
+
+	async ref(ref: string): Promise<El> {
+		const { signal } = this.#getContext();
+		return new El(this.#session, this.#getContext, await nativeCall(signal, () => this.#session.axNode(ref)));
+	}`,
+		patched: `	async #input(action: string, options: InputOptions | undefined, call: () => Promise<void>): Promise<ComputerActionResult> {
+		const context = this.#getContext();
+		guardRun(context, action);
+		try {
+			await nativeCall(context.signal, call);
+		} catch (error) {
+			throw refuseAction(error, action, undefined, options?.takeover);
+		}
+		return windowInputResult(action, this.id, options);
+	}
+
+	click(x: number, y: number, options?: ClickOptions): Promise<ComputerActionResult> {
+		return this.#input("click", options, () => this.#session.click(this.id, x, y, pointerOptions(options)));
+	}
+
+	doubleClick(x: number, y: number, options?: Omit<ClickOptions, "count">): Promise<ComputerActionResult> {
+		return this.#input("doubleClick", options, () =>
+			this.#session.click(this.id, x, y, pointerOptions({ ...options, count: 2 })),
+		);
+	}
+
+	move(x: number, y: number): Promise<ComputerActionResult> {
+		return this.#input("move", undefined, () => this.#session.moveMouse(this.id, x, y));
+	}
+
+	drag(points: Array<[number, number]>, options?: DragOptions): Promise<ComputerActionResult> {
+		return this.#input("drag", options, () =>
+			this.#session.drag(
+				this.id,
+				points.map(([x, y]) => ({ x, y })),
+				pointerOptions(options),
+			),
+		);
+	}
+
+	scroll(x: number, y: number, options: ScrollOptions = {}): Promise<ComputerActionResult> {
+		return this.#input("scroll", options, () =>
+			this.#session.scroll(this.id, x, y, options.dx ?? 0, options.dy ?? 0, pointerOptions(options)),
+		);
+	}
+
+	type(text: string, options?: InputOptions): Promise<ComputerActionResult> {
+		return this.#input("type", options, () => this.#session.typeText(this.id, text, pointerOptions(options)));
+	}
+
+	press(chord: string | string[], options?: InputOptions): Promise<ComputerActionResult> {
+		return this.#input("press", options, () =>
+			this.#session.keyChord(this.id, chordKeys(chord), pointerOptions(options)),
+		);
+	}
+
+	raise(): Promise<ComputerActionResult> {
+		return this.#input("raise", undefined, () => this.#session.raiseWindow(this.id));
+	}
+
+	async ax(options?: AxOptions): Promise<string> {
+		const { signal } = this.#getContext();
+		const text = (await nativeCall(signal, () => this.#session.axSnapshot(this.id, options))).text;
+		refBook(this.#session).noteSnapshot(this.id, text);
+		return text;
+	}
+
+	async find(query: AxQuery): Promise<El[]> {
+		const { signal } = this.#getContext();
+		const nodes = await nativeCall(signal, () => this.#session.axQuery(this.id, query));
+		return issueElements(this.#session, this.#getContext, nodes, this.id);
+	}
+
+	ref(ref: string): Promise<El> {
+		return resolveElement(this.#session, this.#getContext, ref, this.id);
+	}`,
+		alternates: [{
+			file: "src/tools/computer/worker.ts",
+			requires: "async holdKeys(",
+			marker: "return windowInputResult(action, this.id, options);",
+			anchor: `	async click(x: number, y: number, options?: ClickOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "click");
+		await nativeCall(context.signal, () => this.#session.click(this.id, x, y, pointerOptions(options)));
+	}
+
+	async doubleClick(x: number, y: number, options?: Omit<ClickOptions, "count">): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "doubleClick");
+		await nativeCall(context.signal, () =>
+			this.#session.click(this.id, x, y, pointerOptions({ ...options, count: 2 })),
+		);
+	}
+
+	async move(x: number, y: number): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "move");
+		await nativeCall(context.signal, () => this.#session.moveMouse(this.id, x, y, pointerOptions()));
+	}
+
+	async drag(points: Array<[number, number]>, options?: DragOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "drag");
+		await nativeCall(context.signal, () =>
+			this.#session.drag(
+				this.id,
+				points.map(([x, y]) => ({ x, y })),
+				pointerOptions(options),
+			),
+		);
+	}
+
+	async scroll(x: number, y: number, options: ScrollOptions = {}): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "scroll");
+		await nativeCall(context.signal, () =>
+			this.#session.scroll(this.id, x, y, options.dx ?? 0, options.dy ?? 0, pointerOptions(options)),
+		);
+	}
+
+	async type(text: string, options?: InputOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "type");
+		await nativeCall(context.signal, () => this.#session.typeText(this.id, text, pointerOptions(options)));
+	}
+
+	async press(chord: string | string[], options?: InputOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "press");
+		await nativeCall(context.signal, () =>
+			this.#session.keyChord(this.id, chordKeys(chord), pointerOptions(options)),
+		);
+	}
+
+	async holdKeys(keys: string[], options: HoldOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "holdKeys");
+		validateHold(options);
+		validateKeys(keys, "keys");
+		await nativeCall(context.signal, () => this.#session.holdKeys(this.id, keys, options));
+	}
+
+	async holdMouse(x: number, y: number, options: HoldMouseOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "holdMouse");
+		validateHold(options);
+		if (options.keys !== undefined) validateKeys(options.keys, "keys");
+		await nativeCall(context.signal, () => this.#session.holdMouse(this.id, x, y, options));
+	}
+
+	async observe(options?: ScreenshotOptions & AxOptions): Promise<ObservationResult> {
+		const context = this.#getContext();
+		const result = await nativeCall(context.signal, () =>
+			this.#session.observe(
+				this.id,
+				{
+					maxWidth: context.snapshot.captureMaxWidth,
+					maxHeight: context.snapshot.captureMaxHeight,
+				},
+				options && { all: options.all, maxDepth: options.maxDepth },
+			),
+		);
+		const screenshot = await emitScreenshot(context, result.capture, options);
+		if (!options?.silent) context.output.push({ type: "text", text: result.accessibility.text });
+		return {
+			...screenshot,
+			ax: result.accessibility.text,
+			nodeCount: result.accessibility.nodeCount,
+			truncated: result.accessibility.truncated,
+		};
+	}
+
+	get menu() {
+		return {
+			items: async (path?: string | string[]): Promise<MenuItem[]> => {
+				const context = this.#getContext();
+				const segments = path === undefined ? undefined : typeof path === "string" ? [path] : path;
+				if (segments !== undefined) validateKeys(segments, "menu path", { allowEmpty: true });
+				return await nativeCall(context.signal, () => this.#session.menuItems(this.id, segments));
+			},
+			select: async (path: string[]): Promise<void> => {
+				const context = this.#getContext();
+				guardRun(context, "menu.select");
+				validateKeys(path, "menu path");
+				await nativeCall(context.signal, () => this.#session.menuSelect(this.id, path));
+			},
+		};
 	}
 
-	async press(chord: string | string[], options?: InputOptions): Promise<void> {
+	async bringToCurrentSpace(): Promise<void> {
 		const context = this.#getContext();
-		guardRun(context, "press");
-		await nativeCall(context.signal, () =>
-			this.#session.keyChord(this.id, chordKeys(chord), pointerOptions(options)),
-		);
+		guardRun(context, "bringToCurrentSpace");
+		await nativeCall(context.signal, () => this.#session.bringToCurrentSpace(this.id));
 	}
 
 	async raise(): Promise<void> {
@@ -7316,7 +7875,7 @@ class El {
 		const { signal } = this.#getContext();
 		return new El(this.#session, this.#getContext, await nativeCall(signal, () => this.#session.axNode(ref)));
 	}`,
-		patched: `	async #input(action: string, options: InputOptions | undefined, call: () => Promise<void>): Promise<ComputerActionResult> {
+			patched: `	async #input(action: string, options: InputOptions | undefined, call: () => Promise<void>): Promise<ComputerActionResult> {
 		const context = this.#getContext();
 		guardRun(context, action);
 		try {
@@ -7338,7 +7897,7 @@ class El {
 	}
 
 	move(x: number, y: number): Promise<ComputerActionResult> {
-		return this.#input("move", undefined, () => this.#session.moveMouse(this.id, x, y));
+		return this.#input("move", undefined, () => this.#session.moveMouse(this.id, x, y, pointerOptions()));
 	}
 
 	drag(points: Array<[number, number]>, options?: DragOptions): Promise<ComputerActionResult> {
@@ -7367,6 +7926,69 @@ class El {
 		);
 	}
 
+	async holdKeys(keys: string[], options: HoldOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "holdKeys");
+		validateHold(options);
+		validateKeys(keys, "keys");
+		await nativeCall(context.signal, () => this.#session.holdKeys(this.id, keys, options));
+	}
+
+	async holdMouse(x: number, y: number, options: HoldMouseOptions): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "holdMouse");
+		validateHold(options);
+		if (options.keys !== undefined) validateKeys(options.keys, "keys");
+		await nativeCall(context.signal, () => this.#session.holdMouse(this.id, x, y, options));
+	}
+
+	async observe(options?: ScreenshotOptions & AxOptions): Promise<ObservationResult> {
+		const context = this.#getContext();
+		const result = await nativeCall(context.signal, () =>
+			this.#session.observe(
+				this.id,
+				{
+					maxWidth: context.snapshot.captureMaxWidth,
+					maxHeight: context.snapshot.captureMaxHeight,
+				},
+				options && { all: options.all, maxDepth: options.maxDepth },
+			),
+		);
+		const screenshot = await emitScreenshot(context, result.capture, options);
+		// Same tree text as ax(): every ref it shows gets a fingerprint, and a goal probe stays silent.
+		refBook(this.#session).noteSnapshot(this.id, result.accessibility.text);
+		if (!options?.silent && !context.goalProbe) context.output.push({ type: "text", text: result.accessibility.text });
+		return {
+			...screenshot,
+			ax: result.accessibility.text,
+			nodeCount: result.accessibility.nodeCount,
+			truncated: result.accessibility.truncated,
+		};
+	}
+
+	get menu() {
+		return {
+			items: async (path?: string | string[]): Promise<MenuItem[]> => {
+				const context = this.#getContext();
+				const segments = path === undefined ? undefined : typeof path === "string" ? [path] : path;
+				if (segments !== undefined) validateKeys(segments, "menu path", { allowEmpty: true });
+				return await nativeCall(context.signal, () => this.#session.menuItems(this.id, segments));
+			},
+			select: async (path: string[]): Promise<void> => {
+				const context = this.#getContext();
+				guardRun(context, "menu.select");
+				validateKeys(path, "menu path");
+				await nativeCall(context.signal, () => this.#session.menuSelect(this.id, path));
+			},
+		};
+	}
+
+	async bringToCurrentSpace(): Promise<void> {
+		const context = this.#getContext();
+		guardRun(context, "bringToCurrentSpace");
+		await nativeCall(context.signal, () => this.#session.bringToCurrentSpace(this.id));
+	}
+
 	raise(): Promise<ComputerActionResult> {
 		return this.#input("raise", undefined, () => this.#session.raiseWindow(this.id));
 	}
@@ -7387,6 +8009,7 @@ class El {
 	ref(ref: string): Promise<El> {
 		return resolveElement(this.#session, this.#getContext, ref, this.id);
 	}`,
+		}],
 	},
 	{
 		// Python·JS 직접 헬퍼는 win.ref(ref)도 매번 desktop.ref(ref)로 푼다. 재획득은 이 경로에서도 일어나야 한다.
@@ -7402,6 +8025,9 @@ class El {
 		// 모델이 보는 타입: 행동 결과·거절 필드와 재획득 규칙을 적는다.
 		file: "src/tools/computer/declarations.d.ts",
 		marker: "interface ComputerActionResult {",
+		// 18.6.3 은 ComputerInputTarget 에 zoom·holdKeys·holdMouse 를 넣고 좌표 설명을 "full screenshot" 기준으로 바꿨다.
+		// 새 멤버와 설명은 상류 그대로 두고, 우리 결과 타입이 걸린 멤버만 바꾼다. holdKeys 유무로 후보를 가른다(ADAPT).
+		excludes: "holdKeys(keys: string[]",
 		anchor: `/** Live accessibility element resolved from a snapshot ref; expired refs throw \`StaleRef\`. */
 interface ComputerElement {
 	/** Snapshot ref tag, e.g. \`e5\`. */
@@ -7511,6 +8137,122 @@ interface ComputerInputTarget {
 	/** Key chord such as \`"cmd+shift+p"\` or \`["cmd", "shift", "p"]\`. */
 	press(chord: string | string[], options?: ComputerInputOptions): Promise<ComputerActionResult>;
 }`,
+		alternates: [{
+			file: "src/tools/computer/declarations.d.ts",
+			requires: "holdKeys(keys: string[]",
+			marker: "interface ComputerActionResult {",
+			anchor: `/** Live accessibility element resolved from a snapshot ref; expired refs throw \`StaleRef\`. */
+interface ComputerElement {
+	/** Snapshot ref tag, e.g. \`e5\`. */
+	readonly ref: string;
+	readonly role: string;
+	readonly nativeRole: string;
+	readonly title?: string;
+	readonly description?: string;
+	readonly enabled: boolean;
+	readonly focused: boolean;
+	readonly childCount: number;
+	value(): Promise<string | undefined>;
+	setValue(value: string): Promise<void>;
+	/** Bounds in global desktop coordinates, or null when the element has none. */
+	bounds(): Promise<ComputerBounds | null>;
+	attributes(): Promise<Record<string, string>>;
+	actions(): Promise<string[]>;
+	perform(action: string): Promise<void>;
+	/** Perform the element's native press action; needs no screenshot. */
+	press(): Promise<void>;
+	/** Click the element's center with native input. */
+	click(options?: ComputerInputOptions): Promise<void>;
+	focus(): Promise<void>;
+	parent(): Promise<ComputerElement | null>;
+	children(): Promise<ComputerElement[]>;
+}
+
+/** Native input helpers shared by the desktop root and window handles; \`x\`/\`y\` are pixels in the most recent full screenshot of the same target, never zoom pixels. */
+interface ComputerInputTarget {
+	screenshot(options?: ComputerScreenshotOptions): Promise<ComputerScreenshotResult>;
+	/** Display a detailed region without replacing the input frame. Use base full screenshot coordinates for subsequent input, not zoom pixels. */
+	zoom(region: CaptureRegion, options?: ComputerScreenshotOptions): Promise<ComputerScreenshotResult>;
+	click(x: number, y: number, options?: ComputerClickOptions): Promise<void>;
+	doubleClick(x: number, y: number, options?: Omit<ComputerClickOptions, "count">): Promise<void>;
+	move(x: number, y: number): Promise<void>;
+	drag(points: Array<[number, number]>, options?: ComputerDragOptions): Promise<void>;
+	scroll(x: number, y: number, options?: ComputerScrollOptions): Promise<void>;
+	type(text: string, options?: ComputerInputOptions): Promise<void>;
+	/** Key chord such as \`"cmd+shift+p"\` or \`["cmd", "shift", "p"]\`. */
+	press(chord: string | string[], options?: ComputerInputOptions): Promise<void>;`,
+			patched: `/** Result of an input or element action. Delivery is not proof of effect. */
+interface ComputerActionResult {
+	action: string;
+	/** \`verified\`: an AX readback shows the change. \`unverified\`: delivered, effect not observed. \`suspected_noop\`: the readback contradicts the intended change. */
+	status: "verified" | "unverified" | "suspected_noop";
+	/** \`reobserve\`: screenshot or AX before relying on the effect. \`escalate\`: follow \`escalation\`. */
+	suggestedNext: "continue" | "reobserve" | "escalate";
+	escalation?: { target: "pixel" | "takeover"; reason: string };
+	/** Readback the status rests on. */
+	evidence?: string;
+	ref?: string;
+	/** Present when the action ran on an element reacquired from a stale ref. */
+	reacquired?: { from: string; to: string; matchedBy: string };
+}
+
+/** Attached to a failed action's error as \`error.computerAction\` (visible inside \`computer.run\`); the error message is unchanged. */
+interface ComputerActionRefusal {
+	action: string;
+	status: "refused";
+	suggestedNext: "reobserve" | "escalate";
+	escalation?: { target: "takeover"; reason: string };
+	ref?: string;
+	/** Why a stale ref was not reacquired, with up to five candidates. */
+	reacquire?: {
+		outcome: "no-fingerprint" | "no-window" | "no-candidate" | "parent-mismatch" | "ambiguous";
+		candidates: Array<{ ref: string; role: string; title?: string; bounds?: ComputerBounds }>;
+	};
+}
+
+/** Live accessibility element resolved from a snapshot ref. A stale ref is reacquired only when its fingerprint matches exactly one element; otherwise it throws \`StaleRef\`. */
+interface ComputerElement {
+	/** Snapshot ref tag, e.g. \`e5\`; the new ref after a reacquisition. */
+	readonly ref: string;
+	/** Stale ref this element was reacquired from. */
+	readonly reacquiredFrom?: string;
+	readonly role: string;
+	readonly nativeRole: string;
+	readonly title?: string;
+	readonly description?: string;
+	readonly enabled: boolean;
+	readonly focused: boolean;
+	readonly childCount: number;
+	value(): Promise<string | undefined>;
+	setValue(value: string): Promise<ComputerActionResult>;
+	/** Bounds in global desktop coordinates, or null when the element has none. */
+	bounds(): Promise<ComputerBounds | null>;
+	attributes(): Promise<Record<string, string>>;
+	actions(): Promise<string[]>;
+	perform(action: string): Promise<ComputerActionResult>;
+	/** Perform the element's native press action; needs no screenshot. */
+	press(): Promise<ComputerActionResult>;
+	/** Click the element's center with native input. */
+	click(options?: ComputerInputOptions): Promise<ComputerActionResult>;
+	focus(): Promise<ComputerActionResult>;
+	parent(): Promise<ComputerElement | null>;
+	children(): Promise<ComputerElement[]>;
+}
+
+/** Native input helpers shared by the desktop root and window handles; \`x\`/\`y\` are pixels in the most recent full screenshot of the same target, never zoom pixels. Pointer and keyboard action results are always \`unverified\`. */
+interface ComputerInputTarget {
+	screenshot(options?: ComputerScreenshotOptions): Promise<ComputerScreenshotResult>;
+	/** Display a detailed region without replacing the input frame. Use base full screenshot coordinates for subsequent input, not zoom pixels. */
+	zoom(region: CaptureRegion, options?: ComputerScreenshotOptions): Promise<ComputerScreenshotResult>;
+	click(x: number, y: number, options?: ComputerClickOptions): Promise<ComputerActionResult>;
+	doubleClick(x: number, y: number, options?: Omit<ComputerClickOptions, "count">): Promise<ComputerActionResult>;
+	move(x: number, y: number): Promise<ComputerActionResult>;
+	drag(points: Array<[number, number]>, options?: ComputerDragOptions): Promise<ComputerActionResult>;
+	scroll(x: number, y: number, options?: ComputerScrollOptions): Promise<ComputerActionResult>;
+	type(text: string, options?: ComputerInputOptions): Promise<ComputerActionResult>;
+	/** Key chord such as \`"cmd+shift+p"\` or \`["cmd", "shift", "p"]\`. */
+	press(chord: string | string[], options?: ComputerInputOptions): Promise<ComputerActionResult>;`,
+		}],
 	},
 	{
 		file: "src/tools/computer/declarations.d.ts",
@@ -7524,6 +8266,15 @@ interface ComputerInputTarget {
 		marker: "Actions return `{ action, status, suggestedNext",
 		anchor: "- Each window `.ax()` starts a ref generation. Current/previous snapshot refs remain valid; older refs throw `StaleRef`. Re-snapshot; NEVER guess.\n",
 		patched: "- Each window `.ax()` starts a ref generation. Current/previous snapshot refs remain valid. An older ref is reacquired only when its saved fingerprint (role, name, AutomationId, named parents, position) matches exactly one element; the element's `ref` changes and the action result carries `reacquired`. Otherwise it throws `StaleRef` naming why and the candidates: re-snapshot; NEVER guess.\n- Actions return `{ action, status, suggestedNext, evidence?, escalation?, reacquired? }`. `verified` rests on an AX readback; `unverified` (all pointer/keyboard input) means delivered but unobserved: `reobserve` before relying on it; `suspected_noop` → follow `escalation`. Inside `computer.run`, a thrown action error carries `error.computerAction`.\n",
+		// 18.6.3(#14485)은 ref 가 role·label 이 바뀔 때까지 유지되고 마지막 두 `.ax()` 에 없는 요소의 ref 만 StaleRef 라고
+		// 고쳐 적었다. 그 규칙은 상류 그대로 두고, StaleRef 가 날 때의 지문 재획득과 결과 필드 읽는 법을 잇는다. 결과를
+		// 돌려주는 helper 는 상류가 새로 넣은 hold·menu 와 구별해 이름으로 적는다(ADAPT).
+		alternates: [{
+			file: "src/prompts/tools/computer.md",
+			marker: "snapshots is reacquired only when its saved fingerprint",
+			anchor: "- An element keeps its `[ref=eN]` across `.ax()`/`find()` reads until its role or label changes; a ref whose element is missing from the window's last two `.ax()` snapshots throws `StaleRef`. Re-snapshot; NEVER guess.\n",
+			patched: "- An element keeps its `[ref=eN]` across `.ax()`/`find()` reads until its role or label changes. A ref whose element is missing from the window's last two `.ax()` snapshots is reacquired only when its saved fingerprint (role, name, AutomationId, named parents, position) matches exactly one element; the element's `ref` changes and the action result carries `reacquired`. Otherwise it throws `StaleRef` naming why and the candidates: re-snapshot; NEVER guess.\n- Element actions and window/display `click`, `doubleClick`, `move`, `drag`, `scroll`, `type`, `press`, `raise` return `{ action, status, suggestedNext, evidence?, escalation?, reacquired? }`. `verified` rests on an AX readback; `unverified` (all pointer/keyboard input) means delivered but unobserved: `reobserve` before relying on it; `suspected_noop` → follow `escalation`. Inside `computer.run`, a thrown action error carries `error.computerAction`.\n",
+		}],
 	},
 	{
 		// 2026-09-30 computer 목표 대기(사용자 요청 0.6.6): 행동은 사용자 코드에서 한 번, 목표는 wait(predicate)가 로컬 읽기로만 확인한다.
@@ -7538,6 +8289,9 @@ import * as postmortem from "@oh-my-pi/pi-utils/postmortem";`,
 	{
 		file: "src/tools/computer/worker.ts",
 		marker: "	goalProbe?: boolean;",
+		// 18.6.3 은 run context 에 confirmControl(전경 제어 승인 요청)을 넣었다. probe 는 context 를 펼쳐 복제하므로 그 필드도
+		// 따라가고, control.acquire 는 guardRun 에서 probe 거절된다. 두 판 결과가 같은 marker 를 가지므로 그 필드로 가른다(ADAPT).
+		excludes: "confirmControl(reason: string): Promise<boolean>;",
 		anchor: `interface ComputerRunContext {
 	signal: AbortSignal;
 	readOnly: boolean;
@@ -7564,6 +8318,39 @@ function goalProbeRefusal(method: string): ToolError {
 		\`wait(predicate) probe cannot run '\${method}': probes only read desktop state (windows, ax, find, value); act once before wait()\`,
 	);
 }`,
+		alternates: [{
+			file: "src/tools/computer/worker.ts",
+			requires: "confirmControl(reason: string): Promise<boolean>;",
+			marker: "	goalProbe?: boolean;",
+			anchor: `interface ComputerRunContext {
+	signal: AbortSignal;
+	readOnly: boolean;
+	snapshot: ComputerSessionSnapshot;
+	output: RunOutput;
+	confirmControl(reason: string): Promise<boolean>;
+	screenshots: ComputerScreenshot[];
+}`,
+			patched: `interface ComputerRunContext {
+	signal: AbortSignal;
+	readOnly: boolean;
+	/** Set while a \`wait(predicate)\` probe runs; \`signal\` then also ends at the wait's deadline and when it settles. */
+	goalProbe?: boolean;
+	snapshot: ComputerSessionSnapshot;
+	output: RunOutput;
+	confirmControl(reason: string): Promise<boolean>;
+	screenshots: ComputerScreenshot[];
+}
+
+/** Pauses between goal probes when \`interval\` is not given: Playwright's \`pollAgainstDeadline\` default; the last one repeats. */
+const GOAL_POLL_INTERVALS = [100, 250, 500, 1000] as const;
+
+/** A goal probe only reads: desktop input, clipboard writes, and tool-bridge calls would repeat on every probe. */
+function goalProbeRefusal(method: string): ToolError {
+	return new ToolError(
+		\`wait(predicate) probe cannot run '\${method}': probes only read desktop state (windows, ax, find, value); act once before wait()\`,
+	);
+}`,
+		}],
 	},
 	{
 		file: "src/tools/computer/worker.ts",
@@ -7703,8 +8490,18 @@ function goalProbeRefusal(method: string): ToolError {
 		// 모델 지시: 행동은 한 번, 목표는 wait(predicate)로 읽고, 미달이면 다시 누르지 않는다.
 		file: "src/prompts/tools/computer.md",
 		marker: "- Goal after an action: act ONCE",
+		// 18.6.3 은 같은 줄 끝에 "Group predictable actions …" 문장을 붙였다. 그 문장 뒤에 같은 지시를 잇는다. 두 판 결과가
+		// 같은 marker 를 가지므로 그 문장 유무로 후보를 가른다(ADAPT).
+		excludes: "Group predictable actions and their verification in one run",
 		anchor: "Plain data, functions, and `RegExp` values are supported in `args`.\n",
 		patched: "Plain data, functions, and `RegExp` values are supported in `args`.\n- Goal after an action: act ONCE, then `await wait(async () => …read…, { timeout })` for the row, text, or value the user asked for; it resolves with that value. Inside the predicate, desktop input, `clipboard.write`, and tool calls throw and screenshots stay silent; probes back off 100→1000 ms, and a late read cannot continue past the deadline. The predicate is still unsandboxed Bun/Node code. On `wait(predicate) timed out` NEVER re-click, take over, or switch windows: reobserve and report. A button state change alone does not prove a save.\n",
+		alternates: [{
+			file: "src/prompts/tools/computer.md",
+			requires: "Group predictable actions and their verification in one run",
+			marker: "- Goal after an action: act ONCE",
+			anchor: "Plain data, functions, and `RegExp` values are supported in `args`. Group predictable actions and their verification in one run; stop and inspect when the outcome is uncertain.\n",
+			patched: "Plain data, functions, and `RegExp` values are supported in `args`. Group predictable actions and their verification in one run; stop and inspect when the outcome is uncertain.\n- Goal after an action: act ONCE, then `await wait(async () => …read…, { timeout })` for the row, text, or value the user asked for; it resolves with that value. Inside the predicate, desktop input, `clipboard.write`, and tool calls throw and screenshots stay silent; probes back off 100→1000 ms, and a late read cannot continue past the deadline. The predicate is still unsandboxed Bun/Node code. On `wait(predicate) timed out` NEVER re-click, take over, or switch windows: reobserve and report. A button state change alone does not prove a save.\n",
+		}],
 	},
 	{
 		file: "src/prompts/tools/computer.md",
@@ -7712,6 +8509,287 @@ function goalProbeRefusal(method: string): ToolError {
 		anchor: "\treturn await target.ax();\n}, { timeout: 30 });\n",
 		patched: "\treturn await target.ax();\n}, { timeout: 30 });\nawait computer.run(async ({ desktop, wait }) => {\n\tconst orders = await desktop.window({ title: \"Orders\" });\n\tconst [save] = await orders.find({ role: \"button\", title: \"Save\" });\n\tawait save.press();\n\treturn await wait(async () => (await orders.find({ title: \"Saved row 1\" }))[0]?.title, { timeout: 5000 });\n}, { timeout: 30 });\n",
 	},
+	{
+		// 2026-10-06 WSL 단일 CUELO의 Windows 화면 조작. upstream computer worker는 같은 프로세스의 Bun Worker라
+		// Linux CUELO는 linux-x64 addon(WSLg)만 본다. Windows helper exe(Tools/CUELO_Setup/wsl/windows-computer)를
+		// interop 자식으로 띄우고 stdin/stdout으로 아래 frame을 주고받는다. 포트·리스너 없음.
+		file: "src/tools/computer/protocol.ts",
+		marker: `import { deserialize, serialize } from "bun:jsc";`,
+		excludes: "CaptureRegion, DesktopCapabilities",
+		anchor: `import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
+import type { DesktopCapabilities } from "@oh-my-pi/pi-natives";`,
+		patched: `import { deserialize, serialize } from "bun:jsc";
+import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
+import type { DesktopCapabilities } from "@oh-my-pi/pi-natives";`,
+		// 18.6.3 은 같은 import 에 CaptureRegion 을 더했다(zoom). 프레임 직렬화 import 는 그대로 앞에 둔다. 두 판 결과가 같은
+		// marker 를 가지므로 그 import 이름으로 후보를 가른다(ADAPT).
+		alternates: [{
+			file: "src/tools/computer/protocol.ts",
+			requires: "CaptureRegion, DesktopCapabilities",
+			marker: `import { deserialize, serialize } from "bun:jsc";`,
+			anchor: `import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
+import type { CaptureRegion, DesktopCapabilities } from "@oh-my-pi/pi-natives";`,
+			patched: `import { deserialize, serialize } from "bun:jsc";
+import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
+import type { CaptureRegion, DesktopCapabilities } from "@oh-my-pi/pi-natives";`,
+		}],
+	},
+	{
+		// frame: "CMP1" magic + big-endian u32 길이 + Bun structured clone 본문. Worker postMessage와 같은 값 의미.
+		// 잘못된 magic·읽을 수 없는 본문은 throw해 읽는 쪽이 fail closed 한다. 조각난 frame은 완성될 때 한 번만 복사한다.
+		file: "src/tools/computer/protocol.ts",
+		marker: "export class ComputerFrameReader {",
+		anchor: `/** Transport used by the worker core in Bun workers and tests. */
+export interface ComputerWorkerTransport {
+	send(message: ComputerWorkerOutbound, transfer?: Bun.Transferable[]): void;
+	onMessage(handler: (message: ComputerWorkerInbound) => void): () => void;
+	close(): void;
+}`,
+		patched: `/** Transport used by the worker core in Bun workers and tests. */
+export interface ComputerWorkerTransport {
+	send(message: ComputerWorkerOutbound, transfer?: Bun.Transferable[]): void;
+	onMessage(handler: (message: ComputerWorkerInbound) => void): () => void;
+	close(): void;
+}
+
+/**
+ * CUELO: stdio framing for a computer worker hosted in another process (a WSL CUELO driving the
+ * Windows host executable through interop). Each frame is the "CMP1" magic, a big-endian u32 body
+ * length, and a Bun structured-clone body, so values cross exactly as through Worker postMessage.
+ * A wrong magic or an unreadable body throws: the stream is corrupt and the reader fails closed
+ * instead of guessing where the next frame starts.
+ */
+const COMPUTER_FRAME_MAGIC = 0x434d5031;
+const COMPUTER_FRAME_HEADER_BYTES = 8;
+
+/** Encodes one worker message as a stdio frame; a non-cloneable message throws like postMessage. */
+export function encodeComputerFrame(message: ComputerWorkerInbound | ComputerWorkerOutbound): Uint8Array {
+	const body = new Uint8Array(serialize(message));
+	const frame = new Uint8Array(COMPUTER_FRAME_HEADER_BYTES + body.byteLength);
+	const view = new DataView(frame.buffer);
+	view.setUint32(0, COMPUTER_FRAME_MAGIC);
+	view.setUint32(4, body.byteLength);
+	frame.set(body, COMPUTER_FRAME_HEADER_BYTES);
+	return frame;
+}
+
+/** Reassembles frames from stdio chunks. After a throw the stream is corrupt; drop the reader. */
+export class ComputerFrameReader {
+	#chunks: Uint8Array[] = [];
+	#buffered = 0;
+
+	/** Adds one chunk and returns every message it completes, in order. */
+	push(chunk: Uint8Array): unknown[] {
+		this.#chunks.push(chunk);
+		this.#buffered += chunk.byteLength;
+		const messages: unknown[] = [];
+		while (this.#buffered >= COMPUTER_FRAME_HEADER_BYTES) {
+			const header = this.#read(COMPUTER_FRAME_HEADER_BYTES);
+			const view = new DataView(header.buffer, header.byteOffset, COMPUTER_FRAME_HEADER_BYTES);
+			if (view.getUint32(0) !== COMPUTER_FRAME_MAGIC) throw new Error("computer frame stream is corrupt: bad magic");
+			const length = view.getUint32(4);
+			if (this.#buffered < COMPUTER_FRAME_HEADER_BYTES + length) break;
+			const frame = this.#read(COMPUTER_FRAME_HEADER_BYTES + length);
+			this.#drop(COMPUTER_FRAME_HEADER_BYTES + length);
+			messages.push(deserialize(frame.subarray(COMPUTER_FRAME_HEADER_BYTES)));
+		}
+		return messages;
+	}
+
+	/** The first \`size\` buffered bytes: a view when one chunk holds them, else one copy. */
+	#read(size: number): Uint8Array {
+		const first = this.#chunks[0]!;
+		if (first.byteLength >= size) return first.subarray(0, size);
+		const bytes = new Uint8Array(size);
+		let filled = 0;
+		for (const chunk of this.#chunks) {
+			const take = Math.min(chunk.byteLength, size - filled);
+			bytes.set(chunk.subarray(0, take), filled);
+			filled += take;
+			if (filled === size) break;
+		}
+		return bytes;
+	}
+
+	#drop(size: number): void {
+		this.#buffered -= size;
+		let left = size;
+		while (left > 0) {
+			const chunk = this.#chunks[0]!;
+			if (chunk.byteLength <= left) {
+				this.#chunks.shift();
+				left -= chunk.byteLength;
+			} else {
+				this.#chunks[0] = chunk.subarray(left);
+				left = 0;
+			}
+		}
+	}
+}`,
+	},
+	{
+		file: "src/tools/computer/supervisor.ts",
+		marker: "\tComputerFrameReader,\n\ttype ComputerRunOk,",
+		anchor: `import {
+	COMPUTER_WORKER_ARG,
+	type ComputerRunOk,
+	type ComputerSessionSnapshot,
+	type ComputerWorkerInbound,
+	type ComputerWorkerOutbound,
+	type RunErrorPayload,
+} from "./protocol";`,
+		patched: `import {
+	COMPUTER_WORKER_ARG,
+	ComputerFrameReader,
+	type ComputerRunOk,
+	type ComputerSessionSnapshot,
+	type ComputerWorkerInbound,
+	type ComputerWorkerOutbound,
+	encodeComputerFrame,
+	type RunErrorPayload,
+} from "./protocol";`,
+	},
+	{
+		// linux + CUELO_WINDOWS_COMPUTER_HOST 일 때만 helper를 쓴다. 다른 OS·변수 없음은 upstream Worker 경로 그대로이고,
+		// helper 실패는 오류로 보고할 뿐 WSLg desktop으로 바꾸지 않는다. spawn 실패·host 종료·끊긴 pipe·손상 frame은
+		// onError로 한 번 알려 supervisor가 대기 중인 호출을 바로 실패시킨다. terminate는 stdin EOF → 2초 → kill.
+		file: "src/tools/computer/supervisor.ts",
+		marker: "export function spawnInteropComputerWorker(command: string[]): ComputerWorkerHandle {",
+		anchor: `/** Spawns the computer worker through the active CLI host when available. */
+export function spawnComputerWorker(): ComputerWorkerHandle {
+	const hostEntry = workerHostEntry();`,
+		patched: `/** CUELO: names the Windows computer host executable a WSL CUELO runs through interop. */
+const WINDOWS_COMPUTER_HOST_ENV = "CUELO_WINDOWS_COMPUTER_HOST";
+/** Wait after closing the host's stdin before killing it; the host exits on EOF. */
+const INTEROP_TERMINATE_MS = 2_000;
+/** Wait for the exit status after the host closes its output, so the error names it. */
+const INTEROP_EXIT_AFTER_EOF_MS = 1_000;
+const INTEROP_STDERR_TAIL_CHARS = 2_000;
+
+function errorText(error: unknown): string {
+	return error instanceof Error ? error.message : String(error);
+}
+
+/**
+ * CUELO: runs the computer worker in a separate process speaking {@link encodeComputerFrame} frames on
+ * stdin/stdout. A WSL CUELO starts the Windows host executable this way through interop: only the
+ * parent's pipes connect the two (no port, no listener), and the host exits when its stdin closes. A
+ * spawn failure, an exited host, a closed pipe, or a corrupt frame surfaces once through \`onError\`, so
+ * the supervisor fails pending calls instead of waiting for them.
+ */
+export function spawnInteropComputerWorker(command: string[]): ComputerWorkerHandle {
+	let child: Bun.Subprocess<"pipe", "pipe", "pipe">;
+	try {
+		child = Bun.spawn(command, { stdin: "pipe", stdout: "pipe", stderr: "pipe" });
+	} catch (error) {
+		throw new ToolError(\`Cannot start the computer host \${command[0]}: \${errorText(error)}\`);
+	}
+	const messageHandlers = new Set<(message: ComputerWorkerOutbound) => void>();
+	const errorHandlers = new Set<(error: Error) => void>();
+	let failure: Error | undefined;
+	let stderrTail = "";
+	const describe = (text: string): Error => {
+		const tail = stderrTail.trim();
+		return new Error(tail ? \`\${text}: \${tail}\` : text);
+	};
+	const fail = (error: Error): void => {
+		if (failure) return;
+		failure = error;
+		for (const handler of [...errorHandlers]) handler(error);
+	};
+
+	void (async () => {
+		const decoder = new TextDecoder();
+		try {
+			for await (const chunk of child.stderr) {
+				const text = decoder.decode(chunk, { stream: true });
+				stderrTail = (stderrTail + text).slice(-INTEROP_STDERR_TAIL_CHARS);
+				logger.debug("Computer host stderr", { text });
+			}
+		} catch {
+			// stderr only feeds diagnostics; the exit and stdout paths report the failure.
+		}
+	})();
+	void (async () => {
+		const reader = new ComputerFrameReader();
+		try {
+			for await (const chunk of child.stdout) {
+				let messages: unknown[];
+				try {
+					messages = reader.push(chunk);
+				} catch (error) {
+					child.kill(9);
+					fail(describe(\`Computer host sent an unreadable frame (\${errorText(error)}); rebuild the host for this CUELO build\`));
+					return;
+				}
+				for (const message of messages) {
+					// The host is built from this core's protocol, exactly like a Worker entry.
+					const outbound = message as ComputerWorkerOutbound;
+					for (const handler of [...messageHandlers]) handler(outbound);
+				}
+			}
+		} catch (error) {
+			fail(describe(\`Computer host output failed: \${errorText(error)}\`));
+			return;
+		}
+		const exited = await Promise.race([child.exited.then(() => true), Bun.sleep(INTEROP_EXIT_AFTER_EOF_MS).then(() => false)]);
+		if (!exited) fail(describe("Computer host closed its output"));
+	})();
+	void child.exited.then(code => fail(describe(\`Computer host exited (\${code ?? child.signalCode})\`)));
+
+	return {
+		send(message) {
+			if (failure) throw failure;
+			// A non-cloneable message throws here, before any byte is written, exactly like postMessage.
+			const frame = encodeComputerFrame(message);
+			try {
+				child.stdin.write(frame);
+				const flushed = child.stdin.flush();
+				if (flushed instanceof Promise) flushed.catch(error => fail(describe(\`Computer host input closed: \${errorText(error)}\`)));
+			} catch (error) {
+				const closed = describe(\`Computer host input closed: \${errorText(error)}\`);
+				fail(closed);
+				throw closed;
+			}
+		},
+		onMessage(handler) {
+			messageHandlers.add(handler);
+			return () => {
+				messageHandlers.delete(handler);
+			};
+		},
+		onError(handler) {
+			errorHandlers.add(handler);
+			const early = failure;
+			if (early) queueMicrotask(() => handler(early));
+			return () => {
+				errorHandlers.delete(handler);
+			};
+		},
+		async terminate() {
+			try {
+				await child.stdin.end();
+			} catch {
+				// Already closed: the host has its EOF.
+			}
+			const deadline = Promise.withResolvers<boolean>();
+			const timer = setTimeout(() => deadline.resolve(false), INTEROP_TERMINATE_MS);
+			const exited = await Promise.race([child.exited.then(() => true), deadline.promise]);
+			clearTimeout(timer);
+			if (!exited) child.kill(9);
+		},
+	};
+}
+
+/** Spawns the computer worker through the active CLI host when available. */
+export function spawnComputerWorker(): ComputerWorkerHandle {
+	// CUELO: a WSL CUELO drives the Windows desktop through the host executable named by
+	// CUELO_WINDOWS_COMPUTER_HOST. Linux only; without the variable nothing changes, and a host
+	// failure is reported, never replaced by the Linux (WSLg) desktop.
+	const windowsHost = process.platform === "linux" ? process.env[WINDOWS_COMPUTER_HOST_ENV]?.trim() : undefined;
+	if (windowsHost) return spawnInteropComputerWorker([windowsHost]);
+	const hostEntry = workerHostEntry();`,
+	},
 	{
 		// MCP 선택 연결: 요청별 MCP 선택(opt-in). all이 기본이며 per-request면 시작 시 연결하지 않고 요청마다 확장이 고른다.
 		file: "src/mcp/settings.ts",
@@ -8721,6 +9799,13 @@ export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from:
 			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(",
+		}, {
+			// 18.6.3: upstream 이 상수를 AIError.CODEX_NATIVE_LANE_STEER_REJECTED_CODE 로 옮겼다(#14242). 같은 upstream 줄의 no-op.
+			file: "../pi-ai/src/providers/openai-codex-responses.ts",
+			requires: "AIError.CODEX_NATIVE_LANE_STEER_REJECTED_CODE",
+			marker: "\t\t\t\tif (parsed.type === \"error\" && parsed.code === AIError.CODEX_NATIVE_LANE_STEER_REJECTED_CODE) {\n\t\t\t\t\tthis.#refuseSteerWaiters(",
+			anchor: "\t\t\t\tif (parsed.type === \"error\" && parsed.code === AIError.CODEX_NATIVE_LANE_STEER_REJECTED_CODE) {\n\t\t\t\t\tthis.#refuseSteerWaiters(",
+			patched: "\t\t\t\tif (parsed.type === \"error\" && parsed.code === AIError.CODEX_NATIVE_LANE_STEER_REJECTED_CODE) {\n\t\t\t\t\tthis.#refuseSteerWaiters(",
 		}],
 	},
 	{
@@ -8774,9 +9859,19 @@ export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from:
 	},
 	{
 		file: "src/tools/ask.ts",
+		// 18.6.3(#14369)은 formatQuestionResult 를 다시 짜 timeout 접미사를 `timeoutSuffix` 한 줄로 옮겼다. 그 줄에 같은 문구를 넣는다(ADAPT).
+		// 두 판 결과가 같은 marker 를 가지므로 `timeoutSuffix` 유무로 후보를 가른다.
+		excludes: "const timeoutSuffix = ",
 		marker: "no user response, not user approval",
 		anchor: `		const suffix = \`\${result.timedOut ? " (auto-selected after timeout)" : ""}\${noteSuffix}\`;`,
 		patched: `		const suffix = \`\${result.timedOut ? " (auto-selected recommended option after timeout; no user response, not user approval)" : ""}\${noteSuffix}\`;`,
+		alternates: [{
+			file: "src/tools/ask.ts",
+			requires: "const timeoutSuffix = ",
+			marker: "no user response, not user approval",
+			anchor: `	const timeoutSuffix = result.timedOut ? " (auto-selected after timeout)" : "";`,
+			patched: `	const timeoutSuffix = result.timedOut ? " (auto-selected recommended option after timeout; no user response, not user approval)" : "";`,
+		}],
 	},
 	{
 		file: "src/tools/ask.ts",
@@ -8895,6 +9990,12 @@ function parentSubagentServiceTiers(
 			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",',
+		}, {
+			// 18.6.3: 같은 upstream 규칙이 kdl:150(뒤 Sonnet 규칙 kdl:166)로 옮겨졌다. 본문은 그대로다. 그 줄의 no-op.
+			file: "../pi-catalog/src/compat/rules.json",
+			marker: '{"source":"classes/anthropic.kdl:150","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:166",',
+			anchor: '{"source":"classes/anthropic.kdl:150","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:166",',
+			patched: '{"source":"classes/anthropic.kdl:150","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:166",',
 		}],
 	},
 	{
@@ -8932,6 +10033,12 @@ function parentSubagentServiceTiers(
 			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}}',
+		}, {
+			// 18.6.3: 같은 upstream 규칙이 kdl:240 으로 옮겨졌다. 본문·provider 범위는 그대로다. 그 줄의 no-op.
+			file: "../pi-catalog/src/compat/rules.json",
+			marker: '{"source":"classes/anthropic.kdl:240","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:240","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:240","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가
@@ -9133,6 +10240,12 @@ function parentSubagentServiceTiers(
 			marker: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||NRe(i))continue;let a=i.slice(0,-6),',
 			anchor: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||NRe(i))continue;let a=i.slice(0,-6),',
 			patched: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||NRe(i))continue;let a=i.slice(0,-6),',
+		}, {
+			// 18.6.3 번들의 같은 upstream 조건(ZRe = isAdvisorTranscriptName) no-op. 이름만 바뀌었다.
+			file: "dist/cli.js",
+			marker: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||ZRe(i))continue;let a=i.slice(0,-6),',
+			anchor: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||ZRe(i))continue;let a=i.slice(0,-6),',
+			patched: 'if(!i.endsWith(".jsonl")||i.includes(".bak")||ZRe(i))continue;let a=i.slice(0,-6),',
 		}],
 	},
 	// 18.4.5 는 /ratchet 을 새로 넣으면서 `src/ratchet/prelude.ts`(코드)와 `prelude.js`(eval 텍스트 자산)를 같은 stem 으로