@f5-sales-demo/xcsh 19.90.1 → 19.91.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "19.90.1",
+	"version": "19.91.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -54,28 +54,28 @@
 		"check-workflow-field-coverage": "bun scripts/check-workflow-field-coverage.ts"
 	},
 	"dependencies": {
-		"@agentclientprotocol/sdk": "0.16.1",
+		"@agentclientprotocol/sdk": "1.3.0",
 		"@mozilla/readability": "^0.6",
-		"@f5-sales-demo/xcsh-stats": "19.90.1",
-		"@f5-sales-demo/pi-agent-core": "19.90.1",
-		"@f5-sales-demo/pi-ai": "19.90.1",
-		"@f5-sales-demo/pi-natives": "19.90.1",
-		"@f5-sales-demo/pi-resource-management": "19.90.1",
-		"@f5-sales-demo/pi-tui": "19.90.1",
-		"@f5-sales-demo/pi-utils": "19.90.1",
+		"@f5-sales-demo/xcsh-stats": "19.91.1",
+		"@f5-sales-demo/pi-agent-core": "19.91.1",
+		"@f5-sales-demo/pi-ai": "19.91.1",
+		"@f5-sales-demo/pi-natives": "19.91.1",
+		"@f5-sales-demo/pi-resource-management": "19.91.1",
+		"@f5-sales-demo/pi-tui": "19.91.1",
+		"@f5-sales-demo/pi-utils": "19.91.1",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.20",
 		"chalk": "^5.6",
-		"diff": "^8.0",
-		"fflate": "0.8.2",
+		"diff": "^9.0",
+		"fflate": "0.8.3",
 		"handlebars": "^4.7",
 		"linkedom": "^0.18",
-		"lru-cache": "11.3.1",
-		"markit-ai": "0.5.0",
+		"lru-cache": "11.5.2",
+		"markit-ai": "0.5.3",
 		"puppeteer": "^24.37",
 		"yaml": "2.9.0",
-		"zod": "4.3.6"
+		"zod": "4.4.3"
 	},
 	"devDependencies": {
 		"@types/bun": "^1.3"

package/src/browser/chat-handler.ts

@@ -275,6 +275,32 @@ export class ChatHandler {
 					chat.lastKeepaliveAt = nowMs;
 					this.#server.send({ type: "chat_keepalive", id: chat.id } satisfies ChatKeepalive);
 				}
+			} else if (ame.type === "server_tool_start") {
+				// PROVIDER-SIDE ACTIVITY (#2340): the provider runs web search itself, which takes
+				// seconds before any token streams. This notice is the only feedback in that window —
+				// without it the panel shows a bare "Thinking…" and looks hung. It doubles as a
+				// liveness signal, since the panel re-arms its first-token timer on a tool notice.
+				const label = serverToolLabels(ame.toolName);
+				this.#server.send({
+					type: "chat_tool_notice",
+					id: chat.id,
+					tool: ame.toolName,
+					ok: true,
+					detail: ame.query ? `${label.running}: ${ame.query}` : `${label.running}…`,
+				});
+			} else if (ame.type === "server_tool_end") {
+				const label = serverToolLabels(ame.toolName);
+				const failed = ame.errorCode !== undefined;
+				const count = ame.resultCount ?? 0;
+				this.#server.send({
+					type: "chat_tool_notice",
+					id: chat.id,
+					tool: ame.toolName,
+					ok: !failed,
+					detail: failed
+						? `${label.done} failed: ${ame.errorCode}`
+						: `${label.done}: ${count} result${count === 1 ? "" : "s"}`,
+				});
 			}
 		} else if (event.type === "message_end" && event.message.role === "assistant") {
 			const msg = event.message as AssistantMessage;
@@ -686,10 +712,40 @@ function trimTrailingMarkup(url: string): string {
 	return url.replace(/[*_~`,.;:!?'")\]}>]+$/, "");
 }
 
+/** Panel-facing labels for provider-side tools, used for the activity rows (#2340). */
+function serverToolLabels(toolName: string): { running: string; done: string } {
+	switch (toolName) {
+		case "web_search":
+			return { running: "Searching the web", done: "Web search" };
+		case "web_fetch":
+			return { running: "Fetching a page", done: "Page fetch" };
+		default:
+			return { running: `${toolName}: running`, done: toolName };
+	}
+}
+
 export function extractReferences(msg: AssistantMessage): ChatReference[] {
 	const refs: ChatReference[] = [];
 	const seen = new Set<string>();
 
+	// STRUCTURED CITATIONS FIRST (#2340): a provider-side search reports the real page title, so
+	// it beats the regex scrape below — which can only guess a title from the URL path, and finds
+	// nothing at all when the model cites a source without printing its URL in the prose. Done as
+	// its own pass so a citation in a later block still wins over a scrape in an earlier one.
+	for (const block of msg.content) {
+		if (block.type !== "text" || !block.citations) continue;
+		for (const citation of block.citations) {
+			const url = citation.url;
+			if (!url || seen.has(url)) continue;
+			seen.add(url);
+			refs.push({
+				kind: classifyReferenceKind(url),
+				title: citation.title?.trim() || titleFromUrl(url),
+				url,
+			});
+		}
+	}
+
 	for (const block of msg.content) {
 		if (block.type !== "text") continue;
 

package/src/extensibility/extensions/bundled/herdr-reporter.ts

@@ -29,6 +29,24 @@ import type { ExtensionAPI, ExtensionContext } from "@f5-sales-demo/xcsh";
  * The extension is completely inert unless it is running inside a herdr pane
  * (detected via `HERDR_PANE_ID`), so it has zero effect for users who do not run
  * xcsh under herdr.
+ *
+ * Sequencing contract with herdr — do not regress. herdr keeps one monotonic
+ * `seq` per *source*, shared across every method, and silently discards any frame
+ * whose `seq` is not greater than the last it accepted for `herdr:xcsh`. Two
+ * consequences drive the design below, and both previously cost panes their
+ * resume reference:
+ *
+ *   1. `seq` is seeded from the wall clock, not 0, so a restarted xcsh always
+ *      outranks its predecessor in the same pane. With a per-process counter from
+ *      0, every frame from the second xcsh in a pane looks stale and is dropped.
+ *   2. Frames go out one at a time through `enqueue`. They used to be
+ *      fire-and-forget on independent sockets, so ordering was left to chance.
+ *   3. The state frame is always sent *before* the session frame. herdr discards a
+ *      `pane.report_agent_session` for a pane whose agent it does not yet own, so
+ *      the state frame has to establish `herdr:xcsh` as the pane's agent first.
+ *      Verified against a live herdr: session-then-state (even with a correctly
+ *      ascending `seq`) leaves `agent_session` null, while state-then-session
+ *      records it.
  */
 
 const HERDR_AGENT_LABEL = "xcsh";
@@ -42,26 +60,43 @@ const SOCKET_TIMEOUT_MS = 2000;
 
 /**
  * Write one newline-delimited JSON-RPC request to herdr's unix socket and close.
- * Fire-and-forget: the response is ignored and every failure path is reported
- * via `onError` without throwing, so a dead socket never disturbs the agent.
+ * The response is ignored and every failure path is reported via `onError`
+ * without throwing, so a dead socket never disturbs the agent.
+ *
+ * Resolves once the frame has been flushed (or the attempt failed or timed out),
+ * which is what lets callers order frames relative to one another.
  */
 function sendToHerdrSocket(
 	socketPath: string,
 	method: string,
 	params: Record<string, unknown>,
 	onError: (err: unknown) => void,
-): void {
-	const conn = connect({ path: socketPath });
-	// Never let a report keep xcsh's event loop alive.
-	conn.unref();
-	conn.once("error", err => {
-		onError(err);
-		conn.destroy();
-	});
-	conn.once("connect", () => {
-		conn.end(`${JSON.stringify({ id: "xcsh:herdr-reporter", method, params })}\n`);
+): Promise<void> {
+	return new Promise<void>(resolve => {
+		let settled = false;
+		const settle = (): void => {
+			if (settled) {
+				return;
+			}
+			settled = true;
+			resolve();
+		};
+		const conn = connect({ path: socketPath });
+		// Never let a report keep xcsh's event loop alive.
+		conn.unref();
+		conn.once("error", err => {
+			onError(err);
+			conn.destroy();
+			settle();
+		});
+		conn.once("connect", () => {
+			conn.end(`${JSON.stringify({ id: "xcsh:herdr-reporter", method, params })}\n`, settle);
+		});
+		conn.setTimeout(SOCKET_TIMEOUT_MS, () => {
+			conn.destroy();
+			settle();
+		});
 	});
-	conn.setTimeout(SOCKET_TIMEOUT_MS, () => conn.destroy());
 }
 
 /** Translate a JSON-RPC report/release into `herdr` CLI arguments (fallback). */
@@ -90,10 +125,19 @@ export default function herdrReporter(pi: ExtensionAPI): void {
 		return;
 	}
 
-	let seq = 0;
+	// Seeded from the wall clock at microsecond scale rather than 0 so a new xcsh
+	// process in a pane always starts above whatever the previous process reached.
+	// Matches the pi/omp reporters and stays well inside Number.MAX_SAFE_INTEGER.
+	let seq = Date.now() * 1000;
 	// Tracks whether an interactive prompt is currently awaiting the user, so an
 	// agent_end that fires while a prompt is open is reported as blocked, not idle.
 	let promptOpen = false;
+	// Last session ref already delivered, so repeated lifecycle events do not
+	// re-send an unchanged ref every turn.
+	let lastSessionRefKey: string | undefined;
+	// Serializes frames: herdr compares `seq` across all methods for this source,
+	// so frames must reach it in the order they were generated.
+	let queue: Promise<void> = Promise.resolve();
 
 	pi.setLabel(HERDR_AGENT_LABEL);
 
@@ -103,17 +147,27 @@ export default function herdrReporter(pi: ExtensionAPI): void {
 		});
 	};
 
-	const send = (method: string, params: Record<string, unknown>): void => {
+	/** Chain a frame onto the tail of the send queue. Never rejects. */
+	const enqueue = (task: () => Promise<void>): Promise<void> => {
+		queue = queue.then(task, task).catch(onError);
+		return queue;
+	};
+
+	const send = (method: string, params: Record<string, unknown>): Promise<void> => {
 		const socketPath = process.env.HERDR_SOCKET_PATH;
 		if (socketPath) {
-			sendToHerdrSocket(socketPath, method, params, onError);
-			return;
+			return enqueue(() => sendToHerdrSocket(socketPath, method, params, onError));
 		}
 		// Fallback for the rare case herdr did not inject a socket path.
-		pi.exec("herdr", toCliArgs(method, params)).catch(onError);
+		return enqueue(() =>
+			pi
+				.exec("herdr", toCliArgs(method, params))
+				.then(() => undefined)
+				.catch(onError),
+		);
 	};
 
-	const report = (state: "idle" | "working" | "blocked"): void => {
+	const report = (state: "idle" | "working" | "blocked"): Promise<void> =>
 		send(REPORT_METHOD, {
 			pane_id: paneId,
 			source: HERDR_SOURCE,
@@ -121,7 +175,6 @@ export default function herdrReporter(pi: ExtensionAPI): void {
 			state,
 			seq: seq++,
 		});
-	};
 
 	// Report the current session's identity so herdr can resume this pane
 	// (`xcsh --resume=<session>`) after a server restart. This is sent only over
@@ -129,10 +182,16 @@ export default function herdrReporter(pi: ExtensionAPI): void {
 	// reports via the CLI fallback). Prefer the absolute session file path, which
 	// herdr resumes directly; fall back to the session id for non-persisted
 	// sessions (e.g. print/RPC mode, where getSessionFile() is undefined).
-	const reportSession = (ctx: ExtensionContext): void => {
+	//
+	// Called from every lifecycle handler because xcsh creates the session file
+	// lazily: getSessionFile() can still be undefined at session_start and even at
+	// agent_start, and a ref missed there would otherwise be lost until the next
+	// turn — long enough for a restart to lose the pane. Unchanged refs are
+	// suppressed, so the extra call sites cost nothing on the wire.
+	const reportSession = (ctx: ExtensionContext): Promise<void> => {
 		const socketPath = process.env.HERDR_SOCKET_PATH;
 		if (!socketPath) {
-			return;
+			return Promise.resolve();
 		}
 		let sessionRef: Record<string, unknown> | undefined;
 		try {
@@ -147,58 +206,63 @@ export default function herdrReporter(pi: ExtensionAPI): void {
 			}
 		} catch (err) {
 			onError(err);
-			return;
+			return Promise.resolve();
 		}
 		if (!sessionRef) {
-			return;
+			return Promise.resolve();
 		}
-		sendToHerdrSocket(
-			socketPath,
-			SESSION_METHOD,
-			{
-				pane_id: paneId,
-				source: HERDR_SOURCE,
-				agent: HERDR_AGENT_LABEL,
-				seq: seq++,
-				...sessionRef,
-			},
-			onError,
-		);
+		const refKey = JSON.stringify(sessionRef);
+		if (refKey === lastSessionRefKey) {
+			return Promise.resolve();
+		}
+		lastSessionRefKey = refKey;
+		const frame = {
+			pane_id: paneId,
+			source: HERDR_SOURCE,
+			agent: HERDR_AGENT_LABEL,
+			seq: seq++,
+			...sessionRef,
+		};
+		return enqueue(() => sendToHerdrSocket(socketPath, SESSION_METHOD, frame, onError));
 	};
 
 	// Announce presence and session identity as soon as the session is initialized.
-	pi.on("session_start", (_event, ctx) => {
-		reportSession(ctx);
-		report("idle");
+	pi.on("session_start", async (_event, ctx) => {
+		await report("idle");
+		await reportSession(ctx);
 	});
 
 	// Busy while the agent loop is streaming a response. Re-report session identity
 	// in case the active session file changed (e.g. after /new, /resume, or /fork).
-	pi.on("agent_start", (_event, ctx) => {
-		reportSession(ctx);
-		report("working");
+	pi.on("agent_start", async (_event, ctx) => {
+		await report("working");
+		await reportSession(ctx);
 	});
 
 	// Back to idle when the loop ends — unless we are waiting on a user prompt.
-	pi.on("agent_end", () => {
-		report(promptOpen ? "blocked" : "idle");
+	// This is also the first point where a lazily-created session file is certain
+	// to exist, so it is the backstop for capturing the resume ref.
+	pi.on("agent_end", async (_event, ctx) => {
+		await report(promptOpen ? "blocked" : "idle");
+		await reportSession(ctx);
 	});
 
 	// An interactive prompt (permission gate, ask tool, confirm/input) is
 	// awaiting the user: that is herdr's "needs attention" (blocked) state.
 	pi.on("user_prompt_start", () => {
 		promptOpen = true;
-		report("blocked");
+		void report("blocked");
 	});
 
-	pi.on("user_prompt_end", (_event, ctx) => {
+	pi.on("user_prompt_end", async (_event, ctx) => {
 		promptOpen = false;
-		report(ctx.isIdle() ? "idle" : "working");
+		await report(ctx.isIdle() ? "idle" : "working");
+		await reportSession(ctx);
 	});
 
 	// Relinquish pane authority so herdr stops showing xcsh once we exit.
 	pi.on("session_shutdown", () => {
-		send(RELEASE_METHOD, {
+		void send(RELEASE_METHOD, {
 			pane_id: paneId,
 			source: HERDR_SOURCE,
 			agent: HERDR_AGENT_LABEL,

package/src/internal-urls/build-info.generated.ts

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.90.1",
-	"commit": "62761479b0f230d2047ed9b882a436b7041feec9",
-	"shortCommit": "6276147",
+	"version": "19.91.1",
+	"commit": "cb975aa015ff199ecdc38c20544471ebf32e3737",
+	"shortCommit": "cb975aa",
 	"branch": "main",
-	"tag": "v19.90.1",
-	"commitDate": "2026-07-25T02:53:47Z",
-	"buildDate": "2026-07-25T03:26:47.738Z",
+	"tag": "v19.91.1",
+	"commitDate": "2026-07-25T17:10:56Z",
+	"buildDate": "2026-07-25T17:31:09.895Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5-sales-demo/xcsh",
 	"repoSlug": "f5-sales-demo/xcsh",
-	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/62761479b0f230d2047ed9b882a436b7041feec9",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.90.1"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/cb975aa015ff199ecdc38c20544471ebf32e3737",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.91.1"
 };

package/src/internal-urls/console-catalog.generated.ts

@@ -2,10 +2,10 @@
 
 import type { ConsoleCatalogData } from "./console-catalog-types";
 
-export const CONSOLE_CATALOG_VERSION = "f80a8344bc9184cd84f26957168025cef5d9ad07";
+export const CONSOLE_CATALOG_VERSION = "e58701e87983ff5967d0d4f68e74a78c64fdfbf1";
 
 export const CONSOLE_CATALOG_DATA: ConsoleCatalogData = {
-	version: "f80a8344bc9184cd84f26957168025cef5d9ad07",
+	version: "e58701e87983ff5967d0d4f68e74a78c64fdfbf1",
 	workflows: {
 		"address-allocator/create":
 			'schema: urn:xcsh:console:workflow:v1\nid: address-allocator-create\nlabel: Create IP Address Allocators\nresource: address-allocator\noperation: create\npreconditions:\n  - user_logged_in\n  - namespace_selected\n  - "role_minimum: admin"\nparams:\n  namespace:\n    required: true\n    description: Target namespace\n    example: demo\n  name:\n    required: true\n    description: IP Address Allocators name (lowercase alphanumeric and hyphens)\n    example: example-address-allocator\n  address_allocator_mode:\n    required: true\n    description: Address Allocator Mode\n  allocation_unit:\n    required: false\n    description: Allocation Unit\n    default: 0\n  address_pool:\n    required: false\n    description: Address Pool\n    default: value\n  address_allocation_scheme:\n    required: false\n    description: "Server-required: Field should be not nil"\n    default: value\nsteps:\n  - id: navigate-to-list\n    action: navigate\n    url: /web/workspaces/multi-cloud-network-connect/manage/networking/legacy_network_configuration/address_allocators\n    wait_for: text(\'IP Address Allocators\')\n    description: Navigate to IP Address Allocators list page\n  - id: click-add-tab\n    action: click\n    selector: text(\'Add IP Address Allocator\')\n    wait_for: textbox[name=\'Name\']\n    description: Click Add IP Address Allocator to open the create form\n  - id: fill-name\n    action: fill\n    selector: textbox[name=\'Name\']\n    value: "{name}"\n    description: Enter Name\n  - id: select-address_allocator_mode\n    action: select\n    selector: listbox\n    context: Address Allocator Mode section\n    value: "{address_allocator_mode}"\n    description: Select Address Allocator Mode\n  - id: fill-allocation_unit\n    action: fill\n    selector: spinbutton[name=\'Allocation Unit\']\n    value: "{allocation_unit}"\n    description: Set Allocation Unit\n  - id: fill-address_pool\n    action: fill\n    selector: ngx-datatable input.form-control\n    context: Address Pool table\n    value: "{address_pool}"\n    description: Enter Address Pool in the existing table row (no Add Item needed — the table ships one empty row)\n  - id: select-address_allocation_scheme\n    action: select\n    selector: listbox\n    context: Address Allocation Scheme section\n    value: "{address_allocation_scheme}"\n    description: Select Address Allocation Scheme\n  - id: save\n    action: click\n    selector: "[class*=\'save-bt\'],[class*=\'submit-button\']"\n    context: footer\n    wait_for: text(\'{name}\')\n    wait_timeout_ms: 30000\n    description: Save/submit the form (union selector matches save-bt OR submit-button)\npostconditions:\n  - resource_list_page_visible\n  - "resource_name_in_list: {name}"\nmetadata:\n  confidence: inferred\n  discovered_at: 2026-06-24\n  console_version: "2025.06"\n  notes: Auto-generated by scripts/generate-workflows.ts from api-specs-enriched field metadata.\n',

package/src/modes/acp/acp-agent.ts

@@ -25,14 +25,11 @@ import {
 	type ResumeSessionResponse,
 	type SessionConfigOption,
 	type SessionInfo,
-	type SessionModelState,
 	type SessionModeState,
 	type SessionNotification,
 	type SessionUpdate,
 	type SetSessionConfigOptionRequest,
 	type SetSessionConfigOptionResponse,
-	type SetSessionModelRequest,
-	type SetSessionModelResponse,
 	type SetSessionModeRequest,
 	type SetSessionModeResponse,
 	type Usage,
@@ -201,7 +198,6 @@ export class AcpAgent implements Agent {
 		const response: NewSessionResponse = {
 			sessionId: record.session.sessionId,
 			configOptions: this.#buildConfigOptions(record.session),
-			models: this.#buildModelState(record.session),
 			modes: this.#buildModeState(),
 		};
 		this.#scheduleBootstrapUpdates(record.session.sessionId);
@@ -214,7 +210,6 @@ export class AcpAgent implements Agent {
 		await this.#replaySessionHistory(record);
 		const response: LoadSessionResponse = {
 			configOptions: this.#buildConfigOptions(record.session),
-			models: this.#buildModelState(record.session),
 			modes: this.#buildModeState(),
 		};
 		this.#scheduleBootstrapUpdates(record.session.sessionId);
@@ -238,12 +233,11 @@ export class AcpAgent implements Agent {
 		};
 	}
 
-	async unstable_resumeSession(params: ResumeSessionRequest): Promise<ResumeSessionResponse> {
+	async resumeSession(params: ResumeSessionRequest): Promise<ResumeSessionResponse> {
 		this.#assertAbsoluteCwd(params.cwd);
 		const record = await this.#resumeManagedSession(params.sessionId, params.cwd, params.mcpServers ?? []);
 		const response: ResumeSessionResponse = {
 			configOptions: this.#buildConfigOptions(record.session),
-			models: this.#buildModelState(record.session),
 			modes: this.#buildModeState(),
 		};
 		this.#scheduleBootstrapUpdates(record.session.sessionId);
@@ -256,14 +250,13 @@ export class AcpAgent implements Agent {
 		const response: ForkSessionResponse = {
 			sessionId: record.session.sessionId,
 			configOptions: this.#buildConfigOptions(record.session),
-			models: this.#buildModelState(record.session),
 			modes: this.#buildModeState(),
 		};
 		this.#scheduleBootstrapUpdates(record.session.sessionId);
 		return response;
 	}
 
-	async unstable_closeSession(params: CloseSessionRequest): Promise<CloseSessionResponse> {
+	async closeSession(params: CloseSessionRequest): Promise<CloseSessionResponse> {
 		const record = this.#sessions.get(params.sessionId);
 		if (!record) {
 			return {};
@@ -317,19 +310,6 @@ export class AcpAgent implements Agent {
 		return { configOptions };
 	}
 
-	async unstable_setSessionModel(params: SetSessionModelRequest): Promise<SetSessionModelResponse> {
-		const record = this.#getSessionRecord(params.sessionId);
-		await this.#setModelById(record.session, params.modelId);
-		await this.#connection.sessionUpdate({
-			sessionId: record.session.sessionId,
-			update: {
-				sessionUpdate: "config_option_update",
-				configOptions: this.#buildConfigOptions(record.session),
-			},
-		});
-		return {};
-	}
-
 	async prompt(params: PromptRequest): Promise<PromptResponse> {
 		const record = this.#getSessionRecord(params.sessionId);
 		if (record.promptTurn && !record.promptTurn.settled) {
@@ -339,7 +319,7 @@ export class AcpAgent implements Agent {
 		const converted = this.#convertPromptBlocks(params.prompt);
 		const pendingPrompt = Promise.withResolvers<PromptResponse>();
 		record.promptTurn = {
-			userMessageId: params.messageId ?? crypto.randomUUID(),
+			userMessageId: crypto.randomUUID(),
 			cancelRequested: false,
 			settled: false,
 			usageBaseline: this.#cloneUsageStatistics(record.session.sessionManager.getUsageStatistics()),
@@ -371,7 +351,6 @@ export class AcpAgent implements Agent {
 			this.#finishPrompt(record, {
 				stopReason: "cancelled",
 				usage: this.#buildTurnUsage(promptTurn.usageBaseline, record.session.sessionManager.getUsageStatistics()),
-				userMessageId: promptTurn.userMessageId,
 			});
 		} catch (error: unknown) {
 			this.#finishPrompt(record, undefined, error);
@@ -563,7 +542,6 @@ export class AcpAgent implements Agent {
 			this.#finishPrompt(record, {
 				stopReason: promptTurn.cancelRequested ? "cancelled" : "end_turn",
 				usage: this.#buildTurnUsage(promptTurn.usageBaseline, record.session.sessionManager.getUsageStatistics()),
-				userMessageId: promptTurn.userMessageId,
 			});
 		}
 	}
@@ -674,28 +652,6 @@ export class AcpAgent implements Agent {
 		return configOptions;
 	}
 
-	#buildModelState(session: AgentSession): SessionModelState | undefined {
-		const models = session.getAvailableModels();
-		if (models.length === 0) {
-			return undefined;
-		}
-
-		const availableModels = models.map(model => ({
-			modelId: this.#toModelId(model),
-			name: model.name,
-			description: `${model.provider}/${model.id}`,
-		}));
-		const currentModelId = session.model ? this.#toModelId(session.model) : availableModels[0]?.modelId;
-		if (!currentModelId) {
-			return undefined;
-		}
-
-		return {
-			availableModels,
-			currentModelId,
-		};
-	}
-
 	#buildThinkingOptions(session: AgentSession): Array<{ value: string; name: string; description?: string }> {
 		return [
 			{ value: THINKING_OFF, name: "Off" },
@@ -1264,6 +1220,15 @@ export class AcpAgent implements Agent {
 				headers: this.#toNameValueMap(server.headers),
 			};
 		}
+		// ACP 1.x added an `acp` transport, whose descriptor carries a serverId
+		// instead of a url/headers pair. We never opt into it -- `initialize`
+		// advertises only `mcpCapabilities.http` and `.sse` -- so reject it
+		// explicitly rather than letting it fall through to the sse branch.
+		if (server.type === "acp") {
+			throw new Error(
+				`Unsupported MCP transport "acp" for server "${server.name}": xcsh advertises only http and sse`,
+			);
+		}
 		return {
 			type: "sse",
 			url: server.url,
@@ -1301,7 +1266,6 @@ export class AcpAgent implements Agent {
 		this.#finishPrompt(record, {
 			stopReason: "cancelled",
 			usage: this.#buildTurnUsage(promptTurn.usageBaseline, record.session.sessionManager.getUsageStatistics()),
-			userMessageId: promptTurn.userMessageId,
 		});
 	}