ryco-cli 0.1.20 → 0.1.22

package/dist/{AcpNativeLogging-Bh7MX3rC.cjs → AcpNativeLogging-COepku4a.cjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const require_rolldown_runtime = require("./rolldown-runtime-LGfotAqq.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-CDu-bszH.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-DStwNTTK.cjs");
 const require_bin = require("./bin.cjs");
 let effect_Effect = require("effect/Effect");
 effect_Effect = require_rolldown_runtime.__toESM(effect_Effect, 1);
@@ -3966,9 +3966,152 @@ function extractTextContentFromToolCallContent(content) {
 	}).filter((entry) => entry !== void 0);
 	return chunks.length > 0 ? chunks.join("\n") : void 0;
 }
+/**
+* Above this many changed lines per side the LCS diff is skipped (quadratic
+* memory); counts stay exact via multiset comparison instead.
+*/
+const UNIFIED_DIFF_MIDDLE_LINE_CAP = 2e3;
+/** LCS DP table cell budget for the changed middle region after prefix/suffix trim. */
+const UNIFIED_DIFF_LCS_CELL_CAP = 4e5;
+function splitDiffLines(text) {
+	const lines = text.split("\n");
+	const last = lines[lines.length - 1];
+	if (lines.length > 1 && last === "") lines.pop();
+	return lines;
+}
+function countLineChanges(oldLines, newLines) {
+	const oldCounts = /* @__PURE__ */ new Map();
+	for (const line of oldLines) oldCounts.set(line, (oldCounts.get(line) ?? 0) + 1);
+	let additions = 0;
+	for (const line of newLines) {
+		const remaining = oldCounts.get(line) ?? 0;
+		if (remaining > 0) oldCounts.set(line, remaining - 1);
+		else additions += 1;
+	}
+	let deletions = 0;
+	for (const count of oldCounts.values()) deletions += count;
+	return {
+		additions,
+		deletions
+	};
+}
+function diffMiddleLines(middleOld, middleNew) {
+	if (middleOld.length * middleNew.length > UNIFIED_DIFF_LCS_CELL_CAP) return [...middleOld.map((text) => ({
+		marker: "-",
+		text
+	})), ...middleNew.map((text) => ({
+		marker: "+",
+		text
+	}))];
+	const rows = middleOld.length;
+	const cols = middleNew.length;
+	const table = new Uint32Array((rows + 1) * (cols + 1));
+	for (let i = rows - 1; i >= 0; i -= 1) for (let j = cols - 1; j >= 0; j -= 1) {
+		const diagonal = table[(i + 1) * (cols + 1) + j + 1] ?? 0;
+		const down = table[(i + 1) * (cols + 1) + j] ?? 0;
+		const right = table[i * (cols + 1) + j + 1] ?? 0;
+		const oldLine = middleOld[i];
+		const newLine = middleNew[j];
+		table[i * (cols + 1) + j] = oldLine !== void 0 && newLine !== void 0 && oldLine === newLine ? diagonal + 1 : Math.max(down, right);
+	}
+	const ops = [];
+	let i = 0;
+	let j = 0;
+	while (i < rows && j < cols) {
+		const oldLine = middleOld[i];
+		const newLine = middleNew[j];
+		if (oldLine !== void 0 && newLine !== void 0 && oldLine === newLine) {
+			ops.push({
+				marker: " ",
+				text: oldLine
+			});
+			i += 1;
+			j += 1;
+		} else if (oldLine !== void 0 && (newLine === void 0 || (table[(i + 1) * (cols + 1) + j] ?? 0) >= (table[i * (cols + 1) + j + 1] ?? 0))) {
+			ops.push({
+				marker: "-",
+				text: oldLine
+			});
+			i += 1;
+		} else if (newLine !== void 0) {
+			ops.push({
+				marker: "+",
+				text: newLine
+			});
+			j += 1;
+		} else break;
+	}
+	while (i < rows) {
+		const oldLine = middleOld[i];
+		if (oldLine !== void 0) ops.push({
+			marker: "-",
+			text: oldLine
+		});
+		i += 1;
+	}
+	while (j < cols) {
+		const newLine = middleNew[j];
+		if (newLine !== void 0) ops.push({
+			marker: "+",
+			text: newLine
+		});
+		j += 1;
+	}
+	return ops;
+}
+function buildLineUnifiedDiff(path, oldText, newText) {
+	const oldLines = splitDiffLines(oldText);
+	const newLines = splitDiffLines(newText);
+	if (oldLines.length > UNIFIED_DIFF_MIDDLE_LINE_CAP || newLines.length > UNIFIED_DIFF_MIDDLE_LINE_CAP) return;
+	let start = 0;
+	while (start < oldLines.length && start < newLines.length && oldLines[start] === newLines[start]) start += 1;
+	let endOld = oldLines.length;
+	let endNew = newLines.length;
+	while (endOld > start && endNew > start && oldLines[endOld - 1] === newLines[endNew - 1] && oldLines[endOld - 1] !== void 0) {
+		endOld -= 1;
+		endNew -= 1;
+	}
+	const middleOld = oldLines.slice(start, endOld);
+	const middleNew = newLines.slice(start, endNew);
+	if (middleOld.length === 0 && middleNew.length === 0) return;
+	const ops = diffMiddleLines(middleOld, middleNew);
+	return `--- a/${path}\n+++ b/${path}\n@@ -${middleOld.length > 0 ? start + 1 : start},${middleOld.length} +${middleNew.length > 0 ? start + 1 : start},${middleNew.length} @@\n` + ops.map((op) => `${op.marker}${op.text}`).join("\n");
+}
+/**
+* Normalizes ACP `type: "diff"` tool-call content into the shared
+* `changes[{path, diff, additions, deletions}]` shape the web fold already
+* consumes generically (same convention as Codex `fileChange` items).
+*/
+function extractToolCallChanges(content) {
+	if (!content) return void 0;
+	const changes = [];
+	for (const entry of content) {
+		if (entry.type !== "diff" || !entry.path.trim()) continue;
+		const path = entry.path.trim();
+		const oldText = entry.oldText ?? "";
+		const newText = entry.newText ?? "";
+		const { additions, deletions } = countLineChanges(splitDiffLines(oldText), splitDiffLines(newText));
+		const diff = oldText.length > 0 || newText.length > 0 ? buildLineUnifiedDiff(path, oldText, newText) : void 0;
+		changes.push({
+			path,
+			...additions > 0 || deletions > 0 ? {
+				additions,
+				deletions
+			} : {},
+			...diff !== void 0 ? { diff } : {}
+		});
+	}
+	return changes.length > 0 ? changes : void 0;
+}
 function normalizeToolKind(kind) {
 	return typeof kind === "string" && kind.trim().length > 0 ? kind.trim() : void 0;
 }
+function firstToolCallLocationPath(locations) {
+	for (const location of locations ?? []) {
+		const path = typeof location.path === "string" ? location.path.trim() : "";
+		if (path) return path;
+	}
+}
 function containsSubagentKeyword(value) {
 	return value !== void 0 && /\b(sub[-\s]?agent|subtask|delegate|delegation)\b/i.test(value);
 }
@@ -3977,10 +4120,11 @@ function hasExplicitSubagentType(data) {
 	return typeof subagentType === "string" && subagentType.trim().length > 0;
 }
 function isAcpSubagentToolCall(input) {
-	if (containsSubagentKeyword(input.kind) || containsSubagentKeyword(input.title) || containsSubagentKeyword(input.command) || containsSubagentKeyword(input.detail)) return true;
 	if (hasExplicitSubagentType(input.data)) return true;
+	if (input.kind && input.kind !== "other" && !containsSubagentKeyword(input.kind)) return false;
 	const rawInput = isRecord(input.data?.rawInput) ? input.data.rawInput : void 0;
-	return containsSubagentKeyword(typeof rawInput?.tool === "string" ? rawInput.tool : void 0) || containsSubagentKeyword(typeof rawInput?.name === "string" ? rawInput.name : void 0);
+	const namedDelegation = (value) => typeof value === "string" && /^(?:sub[-_ ]?agent|subtask|delegate|delegation|spawn_agent|delegate_task)$/i.test(value.trim());
+	return namedDelegation(input.kind) || namedDelegation(rawInput?.tool) || namedDelegation(rawInput?.name) || input.title !== void 0 && /^(?:(?:launch|spawn|run|start)\s+)?(?:sub[-\s]?agent|subtask|delegate|delegation)(?:$|[:\s])/i.test(input.title);
 }
 function canonicalItemTypeFromAcpTool(input) {
 	if (isAcpSubagentToolCall(input)) return "collab_agent_tool_call";
@@ -4019,6 +4163,9 @@ function makeAcpSubagentSummaryState(input) {
 		["command", input.command]
 	].filter(([, value]) => value !== void 0));
 	const status = acpSubagentStatusFromToolStatus(input.status);
+	const output = require_bin.extractToolResultText(input.data?.rawOutput) ?? require_bin.extractToolContentText(input.data?.content);
+	const model = rawInputStringField(input.data, "model");
+	const role = rawInputStringField(input.data, "subagent_type");
 	return {
 		subagent: {
 			subagentId: require_collectUint8StreamText.RuntimeSubagentId.make(input.toolCallId),
@@ -4027,10 +4174,14 @@ function makeAcpSubagentSummaryState(input) {
 			label,
 			...detail ? { description: detail } : {},
 			parentProviderItemId: require_collectUint8StreamText.ProviderItemId.make(input.toolCallId),
-			metadata
+			...model ? { model } : {},
+			metadata: {
+				...metadata,
+				...role ? { role } : {}
+			}
 		},
 		...status ? { status } : {},
-		summary: label,
+		summary: (status === "completed" || status === "failed") && output ? output : label,
 		...detail ? { detail } : {}
 	};
 }
@@ -4049,6 +4200,10 @@ function makeToolCallState(input, options) {
 	if (input.rawOutput !== void 0) data.rawOutput = input.rawOutput;
 	if (input.content !== void 0) data.content = input.content;
 	if (input.locations !== void 0) data.locations = input.locations;
+	const changes = extractToolCallChanges(input.content);
+	if (changes) data.changes = changes;
+	const primaryPath = changes?.[0]?.path ?? firstToolCallLocationPath(input.locations);
+	if (primaryPath) data.path = primaryPath;
 	const fallbackDetail = command ?? normalizedTitle ?? textContent;
 	const presentation = title !== void 0 || kind !== void 0 || command !== void 0 || normalizedTitle !== void 0 || textContent !== void 0 ? deriveToolActivityPresentation({
 		itemType: canonicalItemTypeFromAcpTool({
@@ -4194,12 +4349,19 @@ function parseSessionUpdateEvent(params) {
 				rawPayload: params
 			});
 			break;
-		case "usage_update": if (upd.used > 0) events.push({
+		case "agent_thought_chunk":
+			if (upd.content.type === "text" && upd.content.text.length > 0) events.push({
+				_tag: "ThoughtDelta",
+				text: upd.content.text,
+				rawPayload: params
+			});
+			break;
+		case "usage_update": if (Number.isSafeInteger(upd.used) && upd.used >= 0) events.push({
 			_tag: "UsageUpdated",
 			usage: {
 				usedTokens: upd.used,
 				lastUsedTokens: upd.used,
-				...upd.size > 0 ? { maxTokens: upd.size } : {}
+				...Number.isSafeInteger(upd.size) && upd.size > 0 ? { maxTokens: upd.size } : {}
 			},
 			rawPayload: params
 		});
@@ -4517,6 +4679,14 @@ const handleSessionUpdate = ({ queue, modeStateRef, toolCallsRef, assistantSegme
 			});
 			continue;
 		}
+		if (event._tag === "ThoughtDelta") {
+			yield* closeActiveAssistantSegment({
+				queue,
+				assistantSegmentRef
+			});
+			yield* effect.Queue.offer(queue, event);
+			continue;
+		}
 		yield* effect.Queue.offer(queue, event);
 	}
 });
@@ -4556,6 +4726,63 @@ const closeActiveAssistantSegment = ({ queue, assistantSegmentRef }) => effect.R
 	}, { nextSegmentIndex: current.nextSegmentIndex }];
 }).pipe(effect.Effect.flatMap((event) => event ? effect.Queue.offer(queue, event) : effect.Effect.void));
 //#endregion
+//#region src/provider/acp/AcpSubagentRuntimeEvents.ts
+/** One lifecycle per ACP tool id, shared by every ACP adapter. Scoped to a session. */
+function makeAcpSubagentRuntimeEvents() {
+	const started = /* @__PURE__ */ new Set();
+	const completed = /* @__PURE__ */ new Set();
+	return effect.Effect.fn("makeAcpSubagentRuntimeEvents")(function* (input) {
+		const state = input.state;
+		if (!state) return [];
+		const id = String(state.subagent.subagentId);
+		if (completed.has(id)) return [];
+		const base = {
+			provider: input.provider,
+			threadId: input.threadId,
+			...input.turnId ? { turnId: input.turnId } : {},
+			raw: {
+				source: "acp.jsonrpc",
+				method: "session/update",
+				payload: input.rawPayload
+			}
+		};
+		const events = [];
+		if (!started.has(id)) {
+			started.add(id);
+			events.push({
+				...base,
+				...yield* input.makeStamp(),
+				type: "subagent.started",
+				payload: { subagent: state.subagent }
+			});
+		}
+		if (state.status === "completed" || state.status === "failed" || state.status === "stopped") {
+			completed.add(id);
+			events.push({
+				...base,
+				...yield* input.makeStamp(),
+				type: "subagent.completed",
+				payload: {
+					subagent: state.subagent,
+					status: state.status,
+					...state.summary ? { summary: state.summary } : {}
+				}
+			});
+		} else events.push({
+			...base,
+			...yield* input.makeStamp(),
+			type: "subagent.updated",
+			payload: {
+				subagent: state.subagent,
+				...state.status ? { status: state.status } : {},
+				...state.summary ? { summary: state.summary } : {},
+				...state.detail ? { detail: state.detail } : {}
+			}
+		});
+		return events;
+	});
+}
+//#endregion
 //#region src/provider/acp/AcpAdapterSupport.ts
 function mapAcpToAdapterError(provider, threadId, method, error) {
 	if (effect.Schema.is(AcpProcessExitedError)(error)) return new require_bin.ProviderAdapterSessionClosedError({
@@ -4721,6 +4948,24 @@ function makeAcpContentDeltaEvent(input) {
 		}
 	};
 }
+function makeAcpThoughtDeltaEvent(input) {
+	return {
+		type: "content.delta",
+		...input.stamp,
+		provider: input.provider,
+		threadId: input.threadId,
+		turnId: input.turnId,
+		payload: {
+			streamKind: "reasoning_text",
+			delta: input.text
+		},
+		raw: {
+			source: "acp.jsonrpc",
+			method: "session/update",
+			payload: input.rawPayload
+		}
+	};
+}
 function makeAcpTokenUsageEvent(input) {
 	return {
 		type: "thread.token-usage.updated",
@@ -4847,6 +5092,18 @@ Object.defineProperty(exports, "makeAcpRequestResolvedEvent", {
 		return makeAcpRequestResolvedEvent;
 	}
 });
+Object.defineProperty(exports, "makeAcpSubagentRuntimeEvents", {
+	enumerable: true,
+	get: function() {
+		return makeAcpSubagentRuntimeEvents;
+	}
+});
+Object.defineProperty(exports, "makeAcpThoughtDeltaEvent", {
+	enumerable: true,
+	get: function() {
+		return makeAcpThoughtDeltaEvent;
+	}
+});
 Object.defineProperty(exports, "makeAcpTokenUsageEvent", {
 	enumerable: true,
 	get: function() {

package/dist/{AcpNativeLogging-CLM3p9JD.mjs → AcpNativeLogging-D7e1dn7s.mjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { Jo as RuntimeItemId, Zo as RuntimeSubagentId, qo as ProviderItemId } from "./collectUint8StreamText-B3klZuIF.mjs";
-import { dt as redactAgentControlSecrets, ht as ProviderAdapterSessionClosedError, mt as ProviderAdapterRequestError } from "./bin.mjs";
+import { ls as ProviderItemId, ps as RuntimeSubagentId, us as RuntimeItemId } from "./collectUint8StreamText-C_VNyArd.mjs";
+import { St as ProviderAdapterSessionClosedError, f as extractToolContentText, p as extractToolResultText, vt as redactAgentControlSecrets, xt as ProviderAdapterRequestError } from "./bin.mjs";
 import * as Effect$1 from "effect/Effect";
 import * as Layer$1 from "effect/Layer";
 import { Cause, Context, Deferred, Effect, Exit, Layer, Queue, Ref, Schema, Scope, Stream } from "effect";
@@ -3946,9 +3946,152 @@ function extractTextContentFromToolCallContent(content) {
 	}).filter((entry) => entry !== void 0);
 	return chunks.length > 0 ? chunks.join("\n") : void 0;
 }
+/**
+* Above this many changed lines per side the LCS diff is skipped (quadratic
+* memory); counts stay exact via multiset comparison instead.
+*/
+const UNIFIED_DIFF_MIDDLE_LINE_CAP = 2e3;
+/** LCS DP table cell budget for the changed middle region after prefix/suffix trim. */
+const UNIFIED_DIFF_LCS_CELL_CAP = 4e5;
+function splitDiffLines(text) {
+	const lines = text.split("\n");
+	const last = lines[lines.length - 1];
+	if (lines.length > 1 && last === "") lines.pop();
+	return lines;
+}
+function countLineChanges(oldLines, newLines) {
+	const oldCounts = /* @__PURE__ */ new Map();
+	for (const line of oldLines) oldCounts.set(line, (oldCounts.get(line) ?? 0) + 1);
+	let additions = 0;
+	for (const line of newLines) {
+		const remaining = oldCounts.get(line) ?? 0;
+		if (remaining > 0) oldCounts.set(line, remaining - 1);
+		else additions += 1;
+	}
+	let deletions = 0;
+	for (const count of oldCounts.values()) deletions += count;
+	return {
+		additions,
+		deletions
+	};
+}
+function diffMiddleLines(middleOld, middleNew) {
+	if (middleOld.length * middleNew.length > UNIFIED_DIFF_LCS_CELL_CAP) return [...middleOld.map((text) => ({
+		marker: "-",
+		text
+	})), ...middleNew.map((text) => ({
+		marker: "+",
+		text
+	}))];
+	const rows = middleOld.length;
+	const cols = middleNew.length;
+	const table = new Uint32Array((rows + 1) * (cols + 1));
+	for (let i = rows - 1; i >= 0; i -= 1) for (let j = cols - 1; j >= 0; j -= 1) {
+		const diagonal = table[(i + 1) * (cols + 1) + j + 1] ?? 0;
+		const down = table[(i + 1) * (cols + 1) + j] ?? 0;
+		const right = table[i * (cols + 1) + j + 1] ?? 0;
+		const oldLine = middleOld[i];
+		const newLine = middleNew[j];
+		table[i * (cols + 1) + j] = oldLine !== void 0 && newLine !== void 0 && oldLine === newLine ? diagonal + 1 : Math.max(down, right);
+	}
+	const ops = [];
+	let i = 0;
+	let j = 0;
+	while (i < rows && j < cols) {
+		const oldLine = middleOld[i];
+		const newLine = middleNew[j];
+		if (oldLine !== void 0 && newLine !== void 0 && oldLine === newLine) {
+			ops.push({
+				marker: " ",
+				text: oldLine
+			});
+			i += 1;
+			j += 1;
+		} else if (oldLine !== void 0 && (newLine === void 0 || (table[(i + 1) * (cols + 1) + j] ?? 0) >= (table[i * (cols + 1) + j + 1] ?? 0))) {
+			ops.push({
+				marker: "-",
+				text: oldLine
+			});
+			i += 1;
+		} else if (newLine !== void 0) {
+			ops.push({
+				marker: "+",
+				text: newLine
+			});
+			j += 1;
+		} else break;
+	}
+	while (i < rows) {
+		const oldLine = middleOld[i];
+		if (oldLine !== void 0) ops.push({
+			marker: "-",
+			text: oldLine
+		});
+		i += 1;
+	}
+	while (j < cols) {
+		const newLine = middleNew[j];
+		if (newLine !== void 0) ops.push({
+			marker: "+",
+			text: newLine
+		});
+		j += 1;
+	}
+	return ops;
+}
+function buildLineUnifiedDiff(path, oldText, newText) {
+	const oldLines = splitDiffLines(oldText);
+	const newLines = splitDiffLines(newText);
+	if (oldLines.length > UNIFIED_DIFF_MIDDLE_LINE_CAP || newLines.length > UNIFIED_DIFF_MIDDLE_LINE_CAP) return;
+	let start = 0;
+	while (start < oldLines.length && start < newLines.length && oldLines[start] === newLines[start]) start += 1;
+	let endOld = oldLines.length;
+	let endNew = newLines.length;
+	while (endOld > start && endNew > start && oldLines[endOld - 1] === newLines[endNew - 1] && oldLines[endOld - 1] !== void 0) {
+		endOld -= 1;
+		endNew -= 1;
+	}
+	const middleOld = oldLines.slice(start, endOld);
+	const middleNew = newLines.slice(start, endNew);
+	if (middleOld.length === 0 && middleNew.length === 0) return;
+	const ops = diffMiddleLines(middleOld, middleNew);
+	return `--- a/${path}\n+++ b/${path}\n@@ -${middleOld.length > 0 ? start + 1 : start},${middleOld.length} +${middleNew.length > 0 ? start + 1 : start},${middleNew.length} @@\n` + ops.map((op) => `${op.marker}${op.text}`).join("\n");
+}
+/**
+* Normalizes ACP `type: "diff"` tool-call content into the shared
+* `changes[{path, diff, additions, deletions}]` shape the web fold already
+* consumes generically (same convention as Codex `fileChange` items).
+*/
+function extractToolCallChanges(content) {
+	if (!content) return void 0;
+	const changes = [];
+	for (const entry of content) {
+		if (entry.type !== "diff" || !entry.path.trim()) continue;
+		const path = entry.path.trim();
+		const oldText = entry.oldText ?? "";
+		const newText = entry.newText ?? "";
+		const { additions, deletions } = countLineChanges(splitDiffLines(oldText), splitDiffLines(newText));
+		const diff = oldText.length > 0 || newText.length > 0 ? buildLineUnifiedDiff(path, oldText, newText) : void 0;
+		changes.push({
+			path,
+			...additions > 0 || deletions > 0 ? {
+				additions,
+				deletions
+			} : {},
+			...diff !== void 0 ? { diff } : {}
+		});
+	}
+	return changes.length > 0 ? changes : void 0;
+}
 function normalizeToolKind(kind) {
 	return typeof kind === "string" && kind.trim().length > 0 ? kind.trim() : void 0;
 }
+function firstToolCallLocationPath(locations) {
+	for (const location of locations ?? []) {
+		const path = typeof location.path === "string" ? location.path.trim() : "";
+		if (path) return path;
+	}
+}
 function containsSubagentKeyword(value) {
 	return value !== void 0 && /\b(sub[-\s]?agent|subtask|delegate|delegation)\b/i.test(value);
 }
@@ -3957,10 +4100,11 @@ function hasExplicitSubagentType(data) {
 	return typeof subagentType === "string" && subagentType.trim().length > 0;
 }
 function isAcpSubagentToolCall(input) {
-	if (containsSubagentKeyword(input.kind) || containsSubagentKeyword(input.title) || containsSubagentKeyword(input.command) || containsSubagentKeyword(input.detail)) return true;
 	if (hasExplicitSubagentType(input.data)) return true;
+	if (input.kind && input.kind !== "other" && !containsSubagentKeyword(input.kind)) return false;
 	const rawInput = isRecord(input.data?.rawInput) ? input.data.rawInput : void 0;
-	return containsSubagentKeyword(typeof rawInput?.tool === "string" ? rawInput.tool : void 0) || containsSubagentKeyword(typeof rawInput?.name === "string" ? rawInput.name : void 0);
+	const namedDelegation = (value) => typeof value === "string" && /^(?:sub[-_ ]?agent|subtask|delegate|delegation|spawn_agent|delegate_task)$/i.test(value.trim());
+	return namedDelegation(input.kind) || namedDelegation(rawInput?.tool) || namedDelegation(rawInput?.name) || input.title !== void 0 && /^(?:(?:launch|spawn|run|start)\s+)?(?:sub[-\s]?agent|subtask|delegate|delegation)(?:$|[:\s])/i.test(input.title);
 }
 function canonicalItemTypeFromAcpTool(input) {
 	if (isAcpSubagentToolCall(input)) return "collab_agent_tool_call";
@@ -3999,6 +4143,9 @@ function makeAcpSubagentSummaryState(input) {
 		["command", input.command]
 	].filter(([, value]) => value !== void 0));
 	const status = acpSubagentStatusFromToolStatus(input.status);
+	const output = extractToolResultText(input.data?.rawOutput) ?? extractToolContentText(input.data?.content);
+	const model = rawInputStringField(input.data, "model");
+	const role = rawInputStringField(input.data, "subagent_type");
 	return {
 		subagent: {
 			subagentId: RuntimeSubagentId.make(input.toolCallId),
@@ -4007,10 +4154,14 @@ function makeAcpSubagentSummaryState(input) {
 			label,
 			...detail ? { description: detail } : {},
 			parentProviderItemId: ProviderItemId.make(input.toolCallId),
-			metadata
+			...model ? { model } : {},
+			metadata: {
+				...metadata,
+				...role ? { role } : {}
+			}
 		},
 		...status ? { status } : {},
-		summary: label,
+		summary: (status === "completed" || status === "failed") && output ? output : label,
 		...detail ? { detail } : {}
 	};
 }
@@ -4029,6 +4180,10 @@ function makeToolCallState(input, options) {
 	if (input.rawOutput !== void 0) data.rawOutput = input.rawOutput;
 	if (input.content !== void 0) data.content = input.content;
 	if (input.locations !== void 0) data.locations = input.locations;
+	const changes = extractToolCallChanges(input.content);
+	if (changes) data.changes = changes;
+	const primaryPath = changes?.[0]?.path ?? firstToolCallLocationPath(input.locations);
+	if (primaryPath) data.path = primaryPath;
 	const fallbackDetail = command ?? normalizedTitle ?? textContent;
 	const presentation = title !== void 0 || kind !== void 0 || command !== void 0 || normalizedTitle !== void 0 || textContent !== void 0 ? deriveToolActivityPresentation({
 		itemType: canonicalItemTypeFromAcpTool({
@@ -4174,12 +4329,19 @@ function parseSessionUpdateEvent(params) {
 				rawPayload: params
 			});
 			break;
-		case "usage_update": if (upd.used > 0) events.push({
+		case "agent_thought_chunk":
+			if (upd.content.type === "text" && upd.content.text.length > 0) events.push({
+				_tag: "ThoughtDelta",
+				text: upd.content.text,
+				rawPayload: params
+			});
+			break;
+		case "usage_update": if (Number.isSafeInteger(upd.used) && upd.used >= 0) events.push({
 			_tag: "UsageUpdated",
 			usage: {
 				usedTokens: upd.used,
 				lastUsedTokens: upd.used,
-				...upd.size > 0 ? { maxTokens: upd.size } : {}
+				...Number.isSafeInteger(upd.size) && upd.size > 0 ? { maxTokens: upd.size } : {}
 			},
 			rawPayload: params
 		});
@@ -4497,6 +4659,14 @@ const handleSessionUpdate = ({ queue, modeStateRef, toolCallsRef, assistantSegme
 			});
 			continue;
 		}
+		if (event._tag === "ThoughtDelta") {
+			yield* closeActiveAssistantSegment({
+				queue,
+				assistantSegmentRef
+			});
+			yield* Queue.offer(queue, event);
+			continue;
+		}
 		yield* Queue.offer(queue, event);
 	}
 });
@@ -4536,6 +4706,63 @@ const closeActiveAssistantSegment = ({ queue, assistantSegmentRef }) => Ref.modi
 	}, { nextSegmentIndex: current.nextSegmentIndex }];
 }).pipe(Effect.flatMap((event) => event ? Queue.offer(queue, event) : Effect.void));
 //#endregion
+//#region src/provider/acp/AcpSubagentRuntimeEvents.ts
+/** One lifecycle per ACP tool id, shared by every ACP adapter. Scoped to a session. */
+function makeAcpSubagentRuntimeEvents() {
+	const started = /* @__PURE__ */ new Set();
+	const completed = /* @__PURE__ */ new Set();
+	return Effect.fn("makeAcpSubagentRuntimeEvents")(function* (input) {
+		const state = input.state;
+		if (!state) return [];
+		const id = String(state.subagent.subagentId);
+		if (completed.has(id)) return [];
+		const base = {
+			provider: input.provider,
+			threadId: input.threadId,
+			...input.turnId ? { turnId: input.turnId } : {},
+			raw: {
+				source: "acp.jsonrpc",
+				method: "session/update",
+				payload: input.rawPayload
+			}
+		};
+		const events = [];
+		if (!started.has(id)) {
+			started.add(id);
+			events.push({
+				...base,
+				...yield* input.makeStamp(),
+				type: "subagent.started",
+				payload: { subagent: state.subagent }
+			});
+		}
+		if (state.status === "completed" || state.status === "failed" || state.status === "stopped") {
+			completed.add(id);
+			events.push({
+				...base,
+				...yield* input.makeStamp(),
+				type: "subagent.completed",
+				payload: {
+					subagent: state.subagent,
+					status: state.status,
+					...state.summary ? { summary: state.summary } : {}
+				}
+			});
+		} else events.push({
+			...base,
+			...yield* input.makeStamp(),
+			type: "subagent.updated",
+			payload: {
+				subagent: state.subagent,
+				...state.status ? { status: state.status } : {},
+				...state.summary ? { summary: state.summary } : {},
+				...state.detail ? { detail: state.detail } : {}
+			}
+		});
+		return events;
+	});
+}
+//#endregion
 //#region src/provider/acp/AcpAdapterSupport.ts
 function mapAcpToAdapterError(provider, threadId, method, error) {
 	if (Schema.is(AcpProcessExitedError)(error)) return new ProviderAdapterSessionClosedError({
@@ -4701,6 +4928,24 @@ function makeAcpContentDeltaEvent(input) {
 		}
 	};
 }
+function makeAcpThoughtDeltaEvent(input) {
+	return {
+		type: "content.delta",
+		...input.stamp,
+		provider: input.provider,
+		threadId: input.threadId,
+		turnId: input.turnId,
+		payload: {
+			streamKind: "reasoning_text",
+			delta: input.text
+		},
+		raw: {
+			source: "acp.jsonrpc",
+			method: "session/update",
+			payload: input.rawPayload
+		}
+	};
+}
 function makeAcpTokenUsageEvent(input) {
 	return {
 		type: "thread.token-usage.updated",
@@ -4767,4 +5012,4 @@ function makeAcpNativeLoggers(input) {
 	};
 }
 //#endregion
-export { makeAcpRequestOpenedEvent as a, makeAcpToolCallEvent as c, AcpSessionRuntime as d, parsePermissionRequest as f, makeAcpPlanUpdatedEvent as i, acpPermissionOutcome as l, SessionConfigOption as m, makeAcpAssistantItemEvent as n, makeAcpRequestResolvedEvent as o, AcpTransportError as p, makeAcpContentDeltaEvent as r, makeAcpTokenUsageEvent as s, makeAcpNativeLoggers as t, mapAcpToAdapterError as u };
+export { makeAcpRequestOpenedEvent as a, makeAcpTokenUsageEvent as c, mapAcpToAdapterError as d, makeAcpSubagentRuntimeEvents as f, SessionConfigOption as g, AcpTransportError as h, makeAcpPlanUpdatedEvent as i, makeAcpToolCallEvent as l, parsePermissionRequest as m, makeAcpAssistantItemEvent as n, makeAcpRequestResolvedEvent as o, AcpSessionRuntime as p, makeAcpContentDeltaEvent as r, makeAcpThoughtDeltaEvent as s, makeAcpNativeLoggers as t, acpPermissionOutcome as u };