cuelo 0.6.4 → 0.6.6

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

@@ -341,7 +341,7 @@ const EDITS = [
 	},
 	{
 		file: "../pi-agent-core/src/agent.ts",
-		marker: "for (const listener of this.#userSteeringListeners) listener();",
+		marker: "for (const listener of this.#userSteeringListeners) listener();\n\t\t}\n\t\tthis.#notifySteeringWaiters();\n\t}",
 		anchor: `	steer(m: AgentMessage) {
 		this.#steeringQueue.push(m);
 		this.#notifySteeringWaiters();
@@ -353,6 +353,25 @@ const EDITS = [
 		}
 		this.#notifySteeringWaiters();
 	}`,
+		// 18.4.4(#11872): steer() 가 큐 mutator 마다 `#emitQueueChanged()` 를 정확히 한 번 부른다. 사용자 steer 리스너는
+		// 큐 push 직후·notifyWaiters 이전이라는 위치만 그대로 두고 upstream 의 emit 은 건드리지 않는다.
+		alternates: [{
+			file: "../pi-agent-core/src/agent.ts",
+			marker: "for (const listener of this.#userSteeringListeners) listener();\n\t\t}\n\t\tthis.#notifySteeringWaiters();\n\t\tthis.#emitQueueChanged();",
+			anchor: `	steer(m: AgentMessage) {
+		this.#steeringQueue.push(m);
+		this.#notifySteeringWaiters();
+		this.#emitQueueChanged();
+	}`,
+			patched: `	steer(m: AgentMessage) {
+		this.#steeringQueue.push(m);
+		if (m.role === "user" && ("attribution" in m ? m.attribution !== "agent" : true) && !("synthetic" in m && m.synthetic === true)) {
+			for (const listener of this.#userSteeringListeners) listener();
+		}
+		this.#notifySteeringWaiters();
+		this.#emitQueueChanged();
+	}`,
+		}],
 	},
 	{
 		file: "../pi-agent-core/src/agent-loop.ts",
@@ -5308,6 +5327,12 @@ export class LearnTool implements AgentTool<LearnSchema> {`,
 			marker: "// HANSE: env without a service name exports into the command\n\t\t\tpendingNotices.push(",
 			anchor: "\t\t} else if (ready !== undefined || env !== undefined) {\n\t\t\t// Nothing can honour ready/env without a service to attach them to;\n\t\t\t// running the command the caller did ask for beats failing the call.\n\t\t\tconst ignored = [ready && \"ready\", env && \"env\"].filter(Boolean).join(\" and \");\n\t\t\tpendingNotices.push(`Ignored ${ignored}: service-only, and no service name was given.`);\n",
 			patched: "\t\t} else if (ready !== undefined) {\n\t\t\t// HANSE: env without a service name exports into the command\n\t\t\tpendingNotices.push(\"Ignored ready: service-only, and no service name was given.\");\n",
+		}, {
+			// 18.4.4: upstream 이 env 파라미터를 지우면서 알림은 ready 만 남았다. 이미 우리가 바라는 형태라 적용할 것이 없다.
+			file: "src/tools/bash.ts",
+			marker: "\t\t} else if (ready !== undefined) {\n\t\t\t// Nothing can honour ready without a service to attach it to;\n",
+			anchor: "\t\t} else if (ready !== undefined) {\n\t\t\t// Nothing can honour ready without a service to attach it to;\n",
+			patched: "\t\t} else if (ready !== undefined) {\n\t\t\t// Nothing can honour ready without a service to attach it to;\n",
 		}],
 	},
 	{
@@ -5316,8 +5341,8 @@ export class LearnTool implements AgentTool<LearnSchema> {`,
 		marker: "// HANSE: non-service env becomes a leading export",
 		anchor: "\t\tinvalidateGithubCacheForBashCommand(command);\n",
 		patched: `		invalidateGithubCacheForBashCommand(command);
-		// HANSE: non-service env becomes a leading export
-		if (name === undefined && env) {
+		// HANSE: non-service env becomes a leading export (18.4.4: service env too — upstream dropped launch env)
+		if (env) {
 			const exports: string[] = [];
 			for (const [key, value] of Object.entries(env)) {
 				if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) throw new ToolError("Invalid env name: " + key);
@@ -5327,11 +5352,94 @@ export class LearnTool implements AgentTool<LearnSchema> {`,
 		}
 `,
 	},
+	// 18.4.4 는 bash 도구의 `env` 파라미터를 통째로 지웠다(pi-coding-agent CHANGELOG "Removed"). env 는 사용자의 기존 도구
+	// 계약이라 upstream 삭제 hunk 를 되돌린다(아래 여섯 항목). 각 항목의 본 후보는 18.4.4 원문에 `// HANSE: env restored` 를
+	// 붙여 복원하고, alternate 는 env 가 원래 있는 18.4.3 원문의 no-op 이다. 18.4.3 에서 --revert 가 upstream 의
+	// env 코드를 지우지 않도록 두 후보의 marker 가 서로의 결과에 들어 있지 않게 나눴다.
+	// service 는 launch 가 env 를 받지 않으므로 위 export 항목이 service·일반 명령 모두 명령 앞 export 로 넣는다.
+	{
+		file: "src/tools/bash.ts",
+		marker: "\t\"env?\": type.record(\"string\", \"string\"), // HANSE: env restored\n});\n\nconst bashSchemaWithAsyncAndService = type({",
+		anchor: "\t}),\n});\n\nconst bashSchemaWithAsyncAndService = type({",
+		patched: "\t}),\n\t\"env?\": type.record(\"string\", \"string\"), // HANSE: env restored\n});\n\nconst bashSchemaWithAsyncAndService = type({",
+		alternates: [{
+			file: "src/tools/bash.ts",
+			marker: "\t}),\n\t\"env?\": type.record(\"string\", \"string\"),\n});\n\nconst bashSchemaWithAsyncAndService = type({",
+			anchor: "\t}),\n\t\"env?\": type.record(\"string\", \"string\"),\n});\n\nconst bashSchemaWithAsyncAndService = type({",
+			patched: "\t}),\n\t\"env?\": type.record(\"string\", \"string\"),\n});\n\nconst bashSchemaWithAsyncAndService = type({",
+		}],
+	},
+	{
+		file: "src/tools/bash.ts",
+		marker: "\t\"env?\": type.record(\"string\", \"string\"), // HANSE: env restored\n});\n\ntype BashToolSchema =",
+		anchor: "\t}),\n});\n\ntype BashToolSchema =",
+		patched: "\t}),\n\t\"env?\": type.record(\"string\", \"string\"), // HANSE: env restored\n});\n\ntype BashToolSchema =",
+		alternates: [{
+			file: "src/tools/bash.ts",
+			marker: "\t}),\n\t\"env?\": type.record(\"string\", \"string\"),\n});\n\ntype BashToolSchema =",
+			anchor: "\t}),\n\t\"env?\": type.record(\"string\", \"string\"),\n});\n\ntype BashToolSchema =",
+			patched: "\t}),\n\t\"env?\": type.record(\"string\", \"string\"),\n});\n\ntype BashToolSchema =",
+		}],
+	},
+	{
+		file: "src/tools/bash.ts",
+		marker: "\tenv?: Record<string, string>; // HANSE: env restored\n",
+		anchor: "\tready?: ServiceReady;\n\tasync?: boolean;",
+		patched: "\tready?: ServiceReady;\n\tenv?: Record<string, string>; // HANSE: env restored\n\tasync?: boolean;",
+		alternates: [{
+			file: "src/tools/bash.ts",
+			marker: "\tready?: ServiceReady;\n\tenv?: Record<string, string>;\n\tasync?: boolean;",
+			anchor: "\tready?: ServiceReady;\n\tenv?: Record<string, string>;\n\tasync?: boolean;",
+			patched: "\tready?: ServiceReady;\n\tenv?: Record<string, string>;\n\tasync?: boolean;",
+		}],
+	},
+	{
+		file: "src/tools/bash.ts",
+		marker: "/** HANSE: env restored. Drops a record with no keys",
+		anchor: "\treturn { log, host, port, timeout };\n}\n\nexport interface BashToolOptions {}",
+		patched: "\treturn { log, host, port, timeout };\n}\n\n/** HANSE: env restored. Drops a record with no keys: `env: {}` sets nothing, so it requests nothing. */\nfunction nonEmptyRecord(record: Record<string, string> | undefined): Record<string, string> | undefined {\n\tif (!record) return undefined;\n\tfor (const _key in record) return record;\n\treturn undefined;\n}\n\nexport interface BashToolOptions {}",
+		alternates: [{
+			file: "src/tools/bash.ts",
+			marker: "/** Drops a record with no keys: `env: {}` sets nothing, so it requests nothing. */\nfunction nonEmptyRecord(record: Record<string, string> | undefined)",
+			anchor: "/** Drops a record with no keys: `env: {}` sets nothing, so it requests nothing. */\nfunction nonEmptyRecord(record: Record<string, string> | undefined)",
+			patched: "/** Drops a record with no keys: `env: {}` sets nothing, so it requests nothing. */\nfunction nonEmptyRecord(record: Record<string, string> | undefined)",
+		}],
+	},
+	{
+		file: "src/tools/bash.ts",
+		marker: "\t\t\tenv: rawEnv, // HANSE: env restored\n",
+		anchor: "\t\t\tready: rawReady,\n\t\t\tasync: rawAsync,",
+		patched: "\t\t\tready: rawReady,\n\t\t\tenv: rawEnv, // HANSE: env restored\n\t\t\tasync: rawAsync,",
+		alternates: [{
+			file: "src/tools/bash.ts",
+			marker: "\t\t\tready: rawReady,\n\t\t\tenv: rawEnv,\n\t\t\tasync: rawAsync,",
+			anchor: "\t\t\tready: rawReady,\n\t\t\tenv: rawEnv,\n\t\t\tasync: rawAsync,",
+			patched: "\t\t\tready: rawReady,\n\t\t\tenv: rawEnv,\n\t\t\tasync: rawAsync,",
+		}],
+	},
+	{
+		file: "src/tools/bash.ts",
+		marker: "\t\tconst env = nonEmptyRecord(rawEnv); // HANSE: env restored\n",
+		anchor: "\t\tconst ready = normalizeReady(rawReady);\n\t\tconst asyncRequested = rawAsync === true;\n",
+		patched: "\t\tconst ready = normalizeReady(rawReady);\n\t\tconst env = nonEmptyRecord(rawEnv); // HANSE: env restored\n\t\tconst asyncRequested = rawAsync === true;\n",
+		alternates: [{
+			file: "src/tools/bash.ts",
+			marker: "\t\tconst ready = normalizeReady(rawReady);\n\t\tconst env = nonEmptyRecord(rawEnv);\n",
+			anchor: "\t\tconst ready = normalizeReady(rawReady);\n\t\tconst env = nonEmptyRecord(rawEnv);\n",
+			patched: "\t\tconst ready = normalizeReady(rawReady);\n\t\tconst env = nonEmptyRecord(rawEnv);\n",
+		}],
+	},
 	{
 		file: "src/prompts/tools/bash.md",
 		marker: "ready requires name; no async/timeout. env adds variables (without name: exported before the command)",
 		anchor: "unique name; ready/env require name; no async/timeout. env adds variables;",
 		patched: "unique name; ready requires name; no async/timeout. env adds variables (without name: exported before the command);",
+		alternates: [{
+			file: "src/prompts/tools/bash.md",
+			marker: "env adds variables (exported before the command)",
+			anchor: "unique name; ready requires name; no async/timeout; pty defaults true.",
+			patched: "unique name; ready requires name; no async/timeout. env adds variables (exported before the command); pty defaults true.",
+		}],
 	},
 	{
 		// 같은 집계: `todo` append 에 phase 를 빠뜨리면 거절됐다(사흘간 9건). phase 가 없으면 아직 안 끝난
@@ -5589,9 +5697,15 @@ function raiseToAutoThinkingFloor(model: Model, level: Effort | undefined, setti
 		// 조건이 하나도 걸리지 않아 모든 창이 일치했고("multiple windows match 65822"), `title: /정규식/`은
 		// 안내 없이 TypeError로 죽었다. 필터 값은 문자열만 받고, 아니면 무엇이 틀렸는지 말하는 ToolError를 낸다.
 		file: "src/tools/computer/worker.ts",
-		marker: "function assertWindowFilter(filter: unknown)",
+		// 18.4.3: matchesFilter 가 `window.id === filter.id` 라 숫자 id 필터는 어떤 창과도 일치하지 않는다.
+		// 그래서 이 버전에서는 숫자 id 필터도 거절하는 원래 검사를 유지한다(아래 alternate 는 18.4.4 전용).
+		marker: "\"exact window id\" : \"case-insensitive substring\"",
 		anchor: `function matchesFilter(window: DesktopWindow, filter?: WindowFilter): boolean {
-	if (!filter) return true;`,
+	if (!filter) return true;
+	const app = filter.app?.toLocaleLowerCase();
+	const title = filter.title?.toLocaleLowerCase();
+	return (
+		(filter.id === undefined || window.id === filter.id) &&`,
 		patched: `/** A filter is a plain \`{ id?, app?, title? }\` of strings; anything else used to match every window. */
 function assertWindowFilter(filter: unknown): asserts filter is WindowFilter | undefined {
 	if (filter === undefined) return;
@@ -5608,7 +5722,45 @@ function assertWindowFilter(filter: unknown): asserts filter is WindowFilter | u
 }
 
 function matchesFilter(window: DesktopWindow, filter?: WindowFilter): boolean {
-	if (!filter) return true;`,
+	if (!filter) return true;
+	const app = filter.app?.toLocaleLowerCase();
+	const title = filter.title?.toLocaleLowerCase();
+	return (
+		(filter.id === undefined || window.id === filter.id) &&`,
+		// 18.4.4(#13649): matchesFilter 가 `String(filter.id)` 로 정규화한다. 안전한 정수 id 는 문자열 id 와 같은 창이라
+		// 허용하고, 그 밖의 값(정규식·객체·소수 등)만 거절한다.
+		alternates: [{
+			file: "src/tools/computer/worker.ts",
+			marker: "Number.isSafeInteger(value)) continue;",
+			anchor: `function matchesFilter(window: DesktopWindow, filter?: WindowFilter): boolean {
+	if (!filter) return true;
+	const app = filter.app?.toLocaleLowerCase();
+	const title = filter.title?.toLocaleLowerCase();
+	return (
+		(filter.id === undefined || window.id === String(filter.id)) &&`,
+			patched: `/** A filter is a plain \`{ id?, app?, title? }\`; string app/title and a string or integer id. Anything else used to match every window. */
+function assertWindowFilter(filter: unknown): asserts filter is WindowFilter | undefined {
+	if (filter === undefined) return;
+	if (filter === null || typeof filter !== "object" || Array.isArray(filter)) {
+		throw new ToolError(\`window filter must be an object like { app?, title?, id? }; got \${filter === null ? "null" : typeof filter}\`);
+	}
+	for (const key of ["id", "app", "title"] as const) {
+		const value = (filter as Record<string, unknown>)[key];
+		if (key === "id" && typeof value === "number" && Number.isSafeInteger(value)) continue;
+		if (value !== undefined && typeof value !== "string") {
+			const got = value instanceof RegExp ? \`RegExp \${value}\` : typeof value;
+			throw new ToolError(\`window filter \${key} must be a string (\${key === "id" ? "exact window id, or an integer" : "case-insensitive substring"}); got \${got}\`);
+		}
+	}
+}
+
+function matchesFilter(window: DesktopWindow, filter?: WindowFilter): boolean {
+	if (!filter) return true;
+	const app = filter.app?.toLocaleLowerCase();
+	const title = filter.title?.toLocaleLowerCase();
+	return (
+		(filter.id === undefined || window.id === String(filter.id)) &&`,
+		}],
 	},
 	{
 		// 숫자 id는 창 id(숫자 문자열)와 뜻이 하나뿐이라 문자열로 바꿔 id로 찾는다. 그 밖의 값은 위에서 거절한다.
@@ -5626,6 +5778,23 @@ function matchesFilter(window: DesktopWindow, filter?: WindowFilter): boolean {
 					typeof byId === "string"
 						? windows.filter(window => window.id === byId)
 						: windows.filter(window => matchesFilter(window, byId));`,
+		// 18.4.4: upstream(#13649)이 숫자 id 를 `String(selector)` 로 직접 푼다. 숫자 변환은 upstream 것을 쓰고, 우리는
+		// 객체 필터(null·배열·정규식 값)를 거절하는 검사만 남긴다.
+		alternates: [{
+			file: "src/tools/computer/worker.ts",
+			marker: "if (typeof selector !== \"string\" && typeof selector !== \"number\") assertWindowFilter(selector);",
+			anchor: `				const windows = await nativeCall(signal, () => session.listWindows());
+				const matches =
+					typeof selector === "string" || typeof selector === "number"
+						? windows.filter(window => window.id === String(selector))
+						: windows.filter(window => matchesFilter(window, selector));`,
+			patched: `				if (typeof selector !== "string" && typeof selector !== "number") assertWindowFilter(selector);
+				const windows = await nativeCall(signal, () => session.listWindows());
+				const matches =
+					typeof selector === "string" || typeof selector === "number"
+						? windows.filter(window => window.id === String(selector))
+						: windows.filter(window => matchesFilter(window, selector));`,
+		}],
 	},
 	{
 		file: "src/tools/computer/worker.ts",
@@ -6618,6 +6787,193 @@ interface ComputerInputTarget {
 		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",
 	},
+	{
+		// 2026-09-30 computer 목표 대기(사용자 요청 0.6.6): 행동은 사용자 코드에서 한 번, 목표는 wait(predicate)가 로컬 읽기로만 확인한다.
+		// 이 편집부터 worker.ts 7개는 한 묶음이다. probe 는 run context 를 복제해 goalProbe 를 켜고, 그 signal 은 deadline·wait 종료에도 끝난다.
+		// 간격은 Playwright pollAgainstDeadline 기본값(https://github.com/microsoft/playwright/blob/main/packages/isomorphic/timeoutRunner.ts)을 따른다.
+		file: "src/tools/computer/worker.ts",
+		marker: "import { untilAborted } from \"@oh-my-pi/pi-utils/abortable\";",
+		anchor: `import * as postmortem from "@oh-my-pi/pi-utils/postmortem";`,
+		patched: `import { untilAborted } from "@oh-my-pi/pi-utils/abortable";
+import * as postmortem from "@oh-my-pi/pi-utils/postmortem";`,
+	},
+	{
+		file: "src/tools/computer/worker.ts",
+		marker: "	goalProbe?: boolean;",
+		anchor: `interface ComputerRunContext {
+	signal: AbortSignal;
+	readOnly: boolean;
+	snapshot: ComputerSessionSnapshot;
+	output: RunOutput;
+	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;
+	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",
+		marker: "	if (context.goalProbe) throw goalProbeRefusal(method);",
+		anchor: `function guardRun(context: ComputerRunContext, method: string): void {
+	if (context.readOnly)`,
+		patched: `function guardRun(context: ComputerRunContext, method: string): void {
+	if (context.goalProbe) throw goalProbeRefusal(method);
+	if (context.readOnly)`,
+	},
+	{
+		// probe 안 screenshot 은 로컬 읽기로 허용하되, 기존 silent 경로로 probe 마다 이미지가 붙지 않게 한다.
+		file: "src/tools/computer/worker.ts",
+		marker: "	if (!options?.silent && !context.goalProbe) {",
+		anchor: "	if (!options?.silent) {",
+		patched: "	if (!options?.silent && !context.goalProbe) {",
+	},
+	{
+		file: "src/tools/computer/worker.ts",
+		marker: "this.#waitForGoal(",
+		anchor: `				wait: (msOrPredicate: number | (() => unknown), options?: WaitPredicateOptions): Promise<unknown> => {
+					const resolved =
+						typeof msOrPredicate === "number"
+							? undefined
+							: {
+									timeout: resolvePredicateTimeout(message.timeoutMs, options?.timeout),
+									interval: options?.interval,
+								};
+					return markHandled(waitForRun(msOrPredicate, signal, resolved));
+				},`,
+		patched: `				wait: (msOrPredicate: number | (() => unknown), options?: WaitPredicateOptions): Promise<unknown> => {
+					if (typeof msOrPredicate !== "function") return markHandled(waitForRun(msOrPredicate, signal));
+					return markHandled(
+						this.#waitForGoal(
+							this.#runContexts.getStore() ?? runContext,
+							msOrPredicate,
+							resolvePredicateTimeout(message.timeoutMs, options?.timeout),
+							options?.interval,
+						),
+					);
+				},`,
+	},
+	{
+		file: "src/tools/computer/worker.ts",
+		marker: "if (this.#runContexts.getStore()?.goalProbe) throw goalProbeRefusal(`tool:${name}`);",
+		anchor: `			callTool: (name, args) => {
+				throwIfAborted(active.signal);
+				return this.#callTool(active, name, args);`,
+		patched: `			callTool: (name, args) => {
+				throwIfAborted(active.signal);
+				if (this.#runContexts.getStore()?.goalProbe) throw goalProbeRefusal(\`tool:\${name}\`);
+				return this.#callTool(active, name, args);`,
+	},
+	{
+		file: "src/tools/computer/worker.ts",
+		marker: "	async #waitForGoal(",
+		anchor: `	#createDesktopScope(session: NativeDesktopSession): object {`,
+		patched: `	/**
+	 * \`wait(predicate)\` for the goal state after an action. The first probe runs at once, then after
+	 * Playwright's back-off (or the fixed \`interval\`), each pause capped at the time left; no probe starts
+	 * after the deadline. Every probe runs in a derived context whose signal also ends at the deadline and
+	 * when the wait settles, and whose input, clipboard writes, and tool calls refuse, so a native read that
+	 * returns late cannot continue into further reads or input. Predicate errors propagate on first
+	 * occurrence; an unmet deadline is the named timeout; run cancellation stays an abort.
+	 */
+	async #waitForGoal(base: ComputerRunContext, predicate: () => unknown, timeout: number, interval?: number): Promise<unknown> {
+		throwIfAborted(base.signal);
+		const deadline = new AbortController();
+		const timer = setTimeout(
+			() => deadline.abort(postmortem.markExpectedCleanupError(new ToolAbortError("wait(predicate) deadline"))),
+			timeout,
+		);
+		const signal = AbortSignal.any([base.signal, deadline.signal]);
+		const probe: ComputerRunContext = { ...base, signal, goalProbe: true };
+		const started = performance.now();
+		let probes = 0;
+		let probing = false;
+		try {
+			for (let step = 0; performance.now() - started < timeout; step++) {
+				probes++;
+				probing = true;
+				const value = await untilAborted(signal, async () => await this.#runContexts.run(probe, predicate));
+				// A probe that ends past the deadline never counts, even when truthy (a synchronous predicate can outrun the timer).
+				if (performance.now() - started > timeout) break;
+				probing = false;
+				if (value) return value;
+				const pause = interval === undefined ? GOAL_POLL_INTERVALS[Math.min(step, GOAL_POLL_INTERVALS.length - 1)]! : Math.max(interval, 10);
+				const left = Math.max(0, timeout - (performance.now() - started));
+				await untilAborted(signal, async () => await Bun.sleep(Math.min(pause, left)));
+			}
+		} catch (error) {
+			// Only a rejection caused by this wait's own signal is remapped; predicate, native, and permission errors pass through as thrown.
+			const aborted = signal.aborted && error instanceof Error && (error === signal.reason || error.cause === signal.reason);
+			if (!aborted) throw error;
+			throwIfAborted(base.signal);
+		} finally {
+			clearTimeout(timer);
+			deadline.abort(postmortem.markExpectedCleanupError(new ToolAbortError("wait(predicate) ended")));
+		}
+		throw new ToolError(
+			\`wait(predicate) timed out after \${timeout}ms — predicate never returned truthy (\${probes} probe\${probes === 1 ? "" : "s"}\${probing ? "; the probe still running at the deadline was abandoned" : ""})\`,
+		);
+	}
+
+	#createDesktopScope(session: NativeDesktopSession): object {`,
+	},
+	{
+		// 모델이 보는 타입: 목표 대기 규칙.
+		file: "src/tools/computer/declarations.d.ts",
+		marker: "or poll a goal predicate until truthy and resolve with its value.",
+		anchor: `	/** Sleep for milliseconds or poll a predicate until truthy. */
+	readonly wait: (
+		msOrPredicate: number | (() => unknown),
+		options?: {
+			/** Maximum polling time in milliseconds. */
+			timeout?: number;
+			/** Delay between predicate calls in milliseconds. */
+			interval?: number;
+		},
+	) => Promise<unknown>;`,
+		patched: `	/**
+	 * Sleep for milliseconds, or poll a goal predicate until truthy and resolve with its value.
+	 * Act once before \`wait\`; inside the predicate, desktop input, \`clipboard.write\`, and tool calls throw, and screenshots stay silent.
+	 * An unmet goal throws \`wait(predicate) timed out after …\`; predicate errors propagate unretried; cancel stays cancel.
+	 */
+	readonly wait: (
+		msOrPredicate: number | (() => unknown),
+		options?: {
+			/** Maximum polling time in milliseconds (default 30s, kept below the run budget). */
+			timeout?: number;
+			/** Fixed delay between predicate calls in milliseconds; by default 100, 250, 500, then 1000. */
+			interval?: number;
+		},
+	) => Promise<unknown>;`,
+	},
+	{
+		// 모델 지시: 행동은 한 번, 목표는 wait(predicate)로 읽고, 미달이면 다시 누르지 않는다.
+		file: "src/prompts/tools/computer.md",
+		marker: "- Goal after an action: act ONCE",
+		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",
+	},
+	{
+		file: "src/prompts/tools/computer.md",
+		marker: "return await wait(async () => (await orders.find(",
+		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",
+	},
 	{
 		// MCP 선택 연결: 요청별 MCP 선택(opt-in). all이 기본이며 per-request면 시작 시 연결하지 않고 요청마다 확장이 고른다.
 		file: "src/mcp/settings.ts",
@@ -7406,8 +7762,10 @@ export interface McpSelectEventResult {
 	{
 		// 교훈 자동 저장 표시(2026-09-29 사용자 지적 "교훈 저장이 안 뜬다"): autolearn capture Agent는 본 대화와
 		// 분리돼 저장해도 화면·다음 턴 문맥에 아무것도 남지 않았다. 성공한 learn·manage_skill만 요약해 돌려준다.
+		// r3(2026-09-30 사용자 지적 "... 로 잘리는 것보다 몇 줄 요약이 낫다"): 160자 절단 대신 교훈의 첫 문장(=capture가
+		// 맨 앞에 쓰는 제목, 아래 nudge 항목)만 보여 주고, 그마저 120자를 넘으면 단어 경계에서 줄인다. legacyPatched는 r1 적용본.
 		file: "src/sdk.ts",
-		marker: `export function summarizeAutoLearnSaved(`,
+		marker: `	if (first.length <= 120) return first;`,
 		anchor: `	createSessionId?: () => string;
 }
 
@@ -7417,6 +7775,53 @@ export interface McpSelectEventResult {
 	onCaptured?: (saved: string[]) => void;
 }
 
+/**
+ * Summarize a capture run's successful \`learn\`/\`manage_skill\` calls. Each call is paired with its
+ * result, so a rejected or failed save is never reported as stored.
+ */
+export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from: number): string[] {
+	const text = (value: unknown): string => (typeof value === "string" ? value.replace(/\\s+/g, " ").trim() : "");
+	const calls = new Map<string, { name: string; args: Record<string, unknown> }>();
+	const saved: string[] = [];
+	for (const message of messages.slice(from)) {
+		if (message.role === "assistant") {
+			for (const block of message.content) {
+				if (block.type === "toolCall") {
+					calls.set(block.id, { name: block.name, args: (block.arguments ?? {}) as Record<string, unknown> });
+				}
+			}
+			continue;
+		}
+		if (message.role !== "toolResult" || message.isError) continue;
+		const call = calls.get(message.toolCallId);
+		if (!call) continue;
+		if (call.name === "learn") {
+			const memory = text(call.args.memory);
+			const skill = call.args.skill as { action?: unknown; name?: unknown } | undefined;
+			const skillNote = skill ? " (스킬 " + text(skill.action) + " " + text(skill.name) + ")" : "";
+			saved.push("교훈: " + autoLearnHeadline(memory) + skillNote);
+		} else if (call.name === "manage_skill") {
+			saved.push("스킬 " + text(call.args.action) + ": " + text(call.args.name));
+		}
+	}
+	return saved;
+}
+
+/** The notice headline: the lesson's first sentence, shortened at a word boundary past 120 chars. */
+function autoLearnHeadline(memory: string): string {
+	const first = /^.+?[.!?](?=\\s|$)/.exec(memory)?.[0] ?? memory;
+	if (first.length <= 120) return first;
+	const cut = first.slice(0, 120);
+	const space = cut.lastIndexOf(" ");
+	return (space > 60 ? cut.slice(0, space) : cut).replace(/[\\s,;:(]+$/, "") + "…";
+}
+
+/** Build a private capture runner over a detached message snapshot and provider session. */`,
+		legacyPatched: `	createSessionId?: () => string;
+	/** Receives the capture run's successful \`learn\`/\`manage_skill\` saves so the session can show them. */
+	onCaptured?: (saved: string[]) => void;
+}
+
 /**
  * Summarize a capture run's successful \`learn\`/\`manage_skill\` calls. Each call is paired with its
  * result, so a rejected or failed save is never reported as stored.
@@ -7464,11 +7869,25 @@ export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from:
 	},
 	{
 		// 저장 결과를 보이는 custom 메시지로 남긴다. idle이면 턴을 시작하지 않고 붙이고, 진행 중이면 aside로 끼운다.
+		// r2: 머리글을 "[교훈 자동 저장] N건"으로 줄이고 3건까지만 보인다. legacyPatched는 r1 적용본.
 		file: "src/sdk.ts",
-		marker: `						{ customType: "autolearn-saved", content, display: true, attribution: "agent" },`,
+		marker: `				const content = ["[교훈 자동 저장] " + saved.length + "건", ...shown].join("\\n");`,
 		anchor: `		const runAutoLearnCapture = createAutoLearnCaptureRunner({
 			sourceAgent: agent,`,
 		patched: `		const runAutoLearnCapture = createAutoLearnCaptureRunner({
+			sourceAgent: agent,
+			onCaptured: saved => {
+				const shown = saved.slice(0, 3).map(line => "- " + line);
+				if (saved.length > 3) shown.push("- 외 " + (saved.length - 3) + "건");
+				const content = ["[교훈 자동 저장] " + saved.length + "건", ...shown].join("\\n");
+				void session
+					.sendCustomMessage(
+						{ customType: "autolearn-saved", content, display: true, attribution: "agent" },
+						session.isStreaming ? { deliverAs: "aside" } : undefined,
+					)
+					.catch(error => logger.warn("Failed to show auto-learn capture result", { error: String(error) }));
+			},`,
+		legacyPatched: `		const runAutoLearnCapture = createAutoLearnCaptureRunner({
 			sourceAgent: agent,
 			onCaptured: saved => {
 				const content = ["[교훈 자동 저장] 이번 턴이 끝난 뒤 별도 capture가 저장했다.", ...saved.map(line => "- " + line)].join("\\n");
@@ -7480,6 +7899,164 @@ export function summarizeAutoLearnSaved(messages: readonly AgentMessage[], from:
 					.catch(error => logger.warn("Failed to show auto-learn capture result", { error: String(error) }));
 			},`,
 	},
+	{
+		// capture가 교훈 맨 앞에 짧은 제목 한 문장을 쓰게 한다(2026-09-30). 알림은 그 첫 문장을 보여 주므로,
+		// 긴 설명형 첫 문장이 잘려 "…"로 끝나지 않는다. 기억 검색에도 제목이 앞에 오는 편이 낫다.
+		file: "src/prompts/system/autolearn-nudge-autocontinue.md",
+		marker: "Begin each `learn` memory with one short headline sentence",
+		anchor: "remember with `learn` when memory enabled. If nothing worth keeping, do nothing.",
+		patched: "remember with `learn` when memory enabled. Begin each `learn` memory with one short headline sentence (under 80 characters) that states the lesson, then give the details. If nothing worth keeping, do nothing.",
+	},
+	// Codex native turn lane 는 실행 중 `response.steer`를 `response.steer.failed`가 아니라 일반
+	// error 프레임(code=unsupported_native_inflight_message)으로 거절한다(2026-09-30 사용자 보고).
+	// 그 프레임은 steer 제출자가 아니라 응답 스트림으로 들어가 진행 중 턴이 죽었다. steer 대기자가
+	// 있을 때만 이 정확한 코드를 거절 ack 로 돌려 기존 claim.reject() → 다음 경계 일반 전달 경로를
+	// 타게 하고, 같은 소켓은 이후 steer 를 전송하지 않는다(새 소켓은 다시 한 번 시도한다).
+	// 대기자가 없거나 다른 코드인 error 프레임은 그대로 스트림에 push 한다.
+	{
+		file: "../pi-ai/src/providers/openai-codex-responses.ts",
+		marker: "#steerUnsupported = false;",
+		anchor: `	/** Steering whose automatic successor the active attach request is reading. */
+	#attachSteerIds?: ReadonlySet<string>;`,
+		patched: `	/** Steering whose automatic successor the active attach request is reading. */
+	#attachSteerIds?: ReadonlySet<string>;
+	/** The server answered a steer with unsupported_native_inflight_message; this socket no longer submits steers. */
+	#steerUnsupported = false;`,
+	},
+	{
+		file: "../pi-ai/src/providers/openai-codex-responses.ts",
+		marker: "this.#steerWaiters.shift()?.resolve({",
+		anchor: `				// Steering acknowledgements belong to the submitter, not to the
+				// response stream they interleave with.
+				if (typeof parsed.type === "string" && parsed.type.startsWith("response.steer.")) {`,
+		patched: `				// The native turn lane refuses steering with a bare error frame. It answers the
+				// pending steer, not the response stream, so settle that waiter as rejected.
+				if (
+					parsed.type === "error" &&
+					parsed.code === "unsupported_native_inflight_message" &&
+					this.#steerWaiters.length > 0
+				) {
+					this.#steerUnsupported = true;
+					this.#steerWaiters.shift()?.resolve({
+						accepted: false,
+						code: parsed.code,
+						message: typeof parsed.message === "string" ? parsed.message : undefined,
+					});
+					return;
+				}
+				// Steering acknowledgements belong to the submitter, not to the
+				// response stream they interleave with.
+				if (typeof parsed.type === "string" && parsed.type.startsWith("response.steer.")) {`,
+	},
+	{
+		file: "../pi-ai/src/providers/openai-codex-responses.ts",
+		marker: "code: \"unsupported_native_inflight_message\", message: undefined",
+		anchor: `			return Promise.reject(new CodexWebSocketTransportError(\`websocket connection is unavailable\`));
+		}
+		const event = { type: "response.steer", previous_response_id: previousResponseId, input };`,
+		patched: `			return Promise.reject(new CodexWebSocketTransportError(\`websocket connection is unavailable\`));
+		}
+		if (this.#steerUnsupported) {
+			return Promise.resolve({ accepted: false, code: "unsupported_native_inflight_message", message: undefined });
+		}
+		const event = { type: "response.steer", previous_response_id: previousResponseId, input };`,
+	},
+	// 2026-09-30 사용자 요청(0.6.6): 일반 구현 선택 질문만 `ask.timeout` 무응답 시 추천안으로 진행한다.
+	// 자동선택은 긍정 opt-in(`autoSelectRecommended: true`)이고 유효한 `recommended`가 필수다. 한 호출의
+	// 모든 질문이 조건을 채울 때만 timeout 을 넘기고, 나머지(기존 호출·승인 질문·plan mode)는 무기한 기다린다.
+	// 타임아웃 결과는 사용자 응답·승인이 아니라고 결과 문구에 적는다. 키워드 판정은 두지 않는다.
+	{
+		file: "src/tools/ask.ts",
+		marker: `"autoSelectRecommended?": arkType("boolean")`,
+		anchor: `	"recommended?": arkType("number").describe("0-based default index"),
+}).narrow((question, ctx) => {`,
+		patched: `	"recommended?": arkType("number").describe("0-based default index"),
+	"autoSelectRecommended?": arkType("boolean").describe(
+		"opt-in: pick recommended after ask.timeout with no answer; reversible implementation choices only",
+	),
+}).narrow((question, ctx) => {`,
+	},
+	{
+		file: "src/tools/ask.ts",
+		marker: "never guess the first option on the user's behalf",
+		anchor: `		return [options[recommended]!.label];
+	}
+	return [options[0]!.label];
+}`,
+		patched: `		return [options[recommended]!.label];
+	}
+	// No valid recommendation: never guess the first option on the user's behalf.
+	return [];
+}`,
+	},
+	{
+		file: "src/tools/ask.ts",
+		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}\`;`,
+	},
+	{
+		file: "src/tools/ask.ts",
+		marker: "No user response: auto-selected the recommended option after timeout",
+		anchor: `		responseParts.push(result.timedOut ? \`\${selectedText} (auto-selected after timeout)\` : selectedText);`,
+		patched: `		responseParts.push(
+			result.timedOut
+				? \`No user response: auto-selected the recommended option after timeout: \${result.selectedOptions.join(", ")} (not user approval)\`
+				: selectedText,
+		);`,
+	},
+	{
+		file: "src/tools/ask.ts",
+		marker: "Auto-selection is a positive opt-in",
+		anchor: `		const timeout = planModeEnabled ? null : settingsTimeout;`,
+		patched: `		// Auto-selection is a positive opt-in: every question must ask for it and carry a valid
+		// recommendation. Legacy calls, approvals, and questions without one wait indefinitely.
+		const autoSelectable = params.questions.every(
+			q =>
+				q.autoSelectRecommended === true &&
+				typeof q.recommended === "number" &&
+				Number.isInteger(q.recommended) &&
+				q.recommended >= 0 &&
+				q.recommended < q.options.length,
+		);
+		const timeout = planModeEnabled || !autoSelectable ? null : settingsTimeout;`,
+	},
+	{
+		file: "src/prompts/tools/ask.md",
+		marker: "`autoSelectRecommended: true`",
+		anchor: `- \`recommended\` auto-adds " (Recommended)"; \`multi: true\` permits multiple selections.`,
+		patched: `- \`recommended\` auto-adds " (Recommended)"; \`multi: true\` permits multiple selections.
+- \`autoSelectRecommended: true\` (requires a valid \`recommended\`): if nobody answers before \`ask.timeout\`, the recommended option is picked. Use ONLY for reversible implementation choices; NEVER for deployment, deletion, cost, account/permission, provider safety, or other high-impact confirmations. A timed-out pick is not user approval.`,
+	},
+	// 2026-09-30 사용자 요청(0.6.6): Main 의 Fast(OpenAI `priority`)만 새 child 에 상속한다.
+	// `tier.subagent: inherit` 해석(및 agentServiceTierOverrides 의 inherit)이 부모 map 전체를 넘기면
+	// Main 이 Anthropic Fast 일 때 Sonnet child 까지 `speed: "fast"` 로 과금된다. 상속 결과를
+	// openai=priority 하나로 좁힌다. 명시 concrete tier·override·revive persist 경로는 그대로다.
+	{
+		file: "src/task/executor.ts",
+		marker: "function parentSubagentServiceTiers(",
+		anchor: `function inheritedSubagentServiceTiers(
+	baseSettings: Settings,
+	inheritedServiceTier?: ServiceTierByFamily | null,
+): ServiceTierByFamily {
+	if (inheritedServiceTier === undefined) {`,
+		patched: `function inheritedSubagentServiceTiers(
+	baseSettings: Settings,
+	inheritedServiceTier?: ServiceTierByFamily | null,
+): ServiceTierByFamily {
+	// CUELO: inheritance carries only the parent's OpenAI Fast (\`priority\`). Anthropic/Google
+	// tiers and other OpenAI tiers (ultrafast, flex, ...) stay with the parent; an explicit
+	// concrete \`tier.subagent\` or per-agent override still applies on its own path.
+	const parent = parentSubagentServiceTiers(baseSettings, inheritedServiceTier);
+	return parent.openai === "priority" ? { openai: "priority" } : {};
+}
+
+function parentSubagentServiceTiers(
+	baseSettings: Settings,
+	inheritedServiceTier?: ServiceTierByFamily | null,
+): ServiceTierByFamily {
+	if (inheritedServiceTier === undefined) {`,
+	},
 ];
 // EDITS 문자열의 줄 끝을 LF로 통일한다. 이 파일의 작업 사본이 CRLF여도 core 파일(LF)과
 // 비교·치환이 어긋나지 않는다. core 파일 자체의 줄 끝은 건드리지 않는다.