@f5-sales-demo/xcsh 19.85.4 → 19.85.6

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "19.85.4",
+	"version": "19.85.6",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -56,13 +56,13 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5-sales-demo/xcsh-stats": "19.85.4",
-		"@f5-sales-demo/pi-agent-core": "19.85.4",
-		"@f5-sales-demo/pi-ai": "19.85.4",
-		"@f5-sales-demo/pi-natives": "19.85.4",
-		"@f5-sales-demo/pi-resource-management": "19.85.4",
-		"@f5-sales-demo/pi-tui": "19.85.4",
-		"@f5-sales-demo/pi-utils": "19.85.4",
+		"@f5-sales-demo/xcsh-stats": "19.85.6",
+		"@f5-sales-demo/pi-agent-core": "19.85.6",
+		"@f5-sales-demo/pi-ai": "19.85.6",
+		"@f5-sales-demo/pi-natives": "19.85.6",
+		"@f5-sales-demo/pi-resource-management": "19.85.6",
+		"@f5-sales-demo/pi-tui": "19.85.6",
+		"@f5-sales-demo/pi-utils": "19.85.6",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.20",

package/src/cli/office-cli.ts

@@ -8,6 +8,8 @@
  * mirroring `stats-cli.ts` / `chrome-cli.ts`.
  */
 import { spawnSync } from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
 import * as path from "node:path";
 import { LOCALIP_HOST } from "../browser/bridge-cert";
 import { type HeadlessChatBridge, startHeadlessChatBridge } from "../browser/headless-bridge";
@@ -133,7 +135,49 @@ async function runServe(): Promise<void> {
 	});
 }
 
-/** Run the Office sideload against the embedded bundle (best-effort). */
+/** The macOS Office desktop containers whose `wef` folder holds sideloaded manifests. */
+const OFFICE_WEF_CONTAINERS = ["com.microsoft.Excel", "com.microsoft.Powerpoint", "com.microsoft.Word"];
+
+/** The `wef` sideload directories for the desktop Office apps under `homeDir`. */
+export function officeWefDirs(homeDir: string): string[] {
+	return OFFICE_WEF_CONTAINERS.map(c => path.join(homeDir, "Library", "Containers", c, "Data", "Documents", "wef"));
+}
+
+/**
+ * `office-addin-debugging` symlinks the add-in manifest into each Office container's
+ * `wef` folder as `<manifestId>.manifest.json` and fails `EEXIST` if a link from a
+ * prior sideload is already there — so a repeat sideload errors even though the
+ * add-in registered fine. Remove any stale copy for our id so `office sideload` is
+ * idempotent. Best-effort per dir (a missing file or container is a no-op). Returns
+ * the paths actually removed.
+ */
+export function removeStaleWefManifests(manifestId: string, homeDir: string = os.homedir()): string[] {
+	const removed: string[] = [];
+	for (const dir of officeWefDirs(homeDir)) {
+		const p = path.join(dir, `${manifestId}.manifest.json`);
+		try {
+			if (fs.existsSync(p)) {
+				fs.rmSync(p);
+				removed.push(p);
+			}
+		} catch {
+			/* best-effort: a permission error or race here must not block the sideload */
+		}
+	}
+	return removed;
+}
+
+/** The add-in manifest id from the bundled manifest.json (the `wef` link's basename). */
+function manifestIdFrom(manifestText: string): string | undefined {
+	try {
+		const id = (JSON.parse(manifestText) as { id?: unknown }).id;
+		return typeof id === "string" && id.length > 0 ? id : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+/** Run the Office sideload against the embedded bundle (idempotent + best-effort). */
 async function runSideload(app: OfficeApp): Promise<void> {
 	// Point office-addin-debugging at the extracted bundle dir, which has
 	// manifest.json AND its referenced `assets/` icons colocated. A bare temp
@@ -141,6 +185,21 @@ async function runSideload(app: OfficeApp): Promise<void> {
 	// step: `File to zip ".../assets/color.png" does not exist`.
 	const dir = await getOfficePaneDir();
 	const manifestPath = path.join(dir, "manifest.json");
+
+	// Idempotency: office-addin-debugging fails EEXIST if a prior sideload left a
+	// `<id>.manifest.json` link in a container's wef folder. Clear stale copies first.
+	const manifestId = manifestIdFrom(
+		await Bun.file(manifestPath)
+			.text()
+			.catch(() => ""),
+	);
+	if (manifestId) {
+		const removed = removeStaleWefManifests(manifestId);
+		if (removed.length > 0) {
+			console.log(`Cleared ${removed.length} stale sideload manifest link(s) from a previous sideload.`);
+		}
+	}
+
 	console.log(`Sideloading ${manifestPath} into ${app} (requires the office-addin-debugging / atk tool on PATH)...`);
 
 	const result = spawnSync("office-addin-debugging", ["start", manifestPath, "desktop", "--app", app], {

package/src/host-tools/host-tools.ts

@@ -82,13 +82,25 @@ class RpcHostToolAdapter<TParams extends TSchema = TSchema, TTheme extends Theme
 	}
 }
 
+/**
+ * How long a host tool may go with NO response — neither a `host_tool_result` nor a
+ * `host_tool_update` — before we give up on it. An unanswered call (e.g. an Office
+ * task-pane whose WebView the host suspended when it lost focus) would otherwise hang
+ * the agent turn forever, and since turns are queued behind the active one, every
+ * later turn wedges too. This is IDLE time, reset by each streamed update, so a
+ * legitimately slow-but-progressing tool is never cut off — only true silence trips it.
+ */
+export const HOST_TOOL_IDLE_TIMEOUT_MS = 60_000;
+
 export class RpcHostToolBridge {
 	#output: RpcHostToolOutput;
 	#definitions = new Map<string, RpcHostToolDefinition>();
 	#pendingCalls = new Map<string, PendingHostToolCall>();
+	#idleTimeoutMs: number;
 
-	constructor(output: RpcHostToolOutput) {
+	constructor(output: RpcHostToolOutput, opts?: { idleTimeoutMs?: number }) {
 		this.#output = output;
+		this.#idleTimeoutMs = opts?.idleTimeoutMs ?? HOST_TOOL_IDLE_TIMEOUT_MS;
 	}
 
 	getToolNames(): string[] {
@@ -141,7 +153,23 @@ export class RpcHostToolBridge {
 		const { promise, resolve, reject } = Promise.withResolvers<AgentToolResult<unknown>>();
 		let settled = false;
 
+		// ---- idle timer (reset by updates; fires → cancel + reject) ----
+		let idleTimer: ReturnType<typeof setTimeout> | undefined;
+		const clearIdle = (): void => {
+			if (idleTimer !== undefined) {
+				clearTimeout(idleTimer);
+				idleTimer = undefined;
+			}
+		};
+		const armIdle = (): void => {
+			clearIdle();
+			idleTimer = setTimeout(onIdleTimeout, this.#idleTimeoutMs);
+			// Don't keep the process alive just for this backstop.
+			if (typeof idleTimer === "object" && "unref" in idleTimer) idleTimer.unref();
+		};
+
 		const cleanup = () => {
+			clearIdle();
 			signal?.removeEventListener("abort", onAbort);
 			this.#pendingCalls.delete(id);
 		};
@@ -158,6 +186,23 @@ export class RpcHostToolBridge {
 			reject(new Error(`Host tool "${definition.name}" was aborted`));
 		};
 
+		const onIdleTimeout = () => {
+			if (settled) return;
+			settled = true;
+			cleanup();
+			this.#output({
+				type: "host_tool_cancel",
+				id: Snowflake.next() as string,
+				targetId: id,
+			});
+			reject(
+				new Error(
+					`Host tool "${definition.name}" did not respond within ${this.#idleTimeoutMs / 1000}s ` +
+						"(the host may be unresponsive — a suspended Office WebView loses its connection)",
+				),
+			);
+		};
+
 		signal?.addEventListener("abort", onAbort, { once: true });
 		this.#pendingCalls.set(id, {
 			resolve: result => {
@@ -172,7 +217,11 @@ export class RpcHostToolBridge {
 				cleanup();
 				reject(error);
 			},
-			onUpdate,
+			onUpdate: partial => {
+				// A streamed update proves the host is alive — reset the idle clock.
+				armIdle();
+				onUpdate?.(partial);
+			},
 		});
 
 		this.#output({
@@ -183,6 +232,9 @@ export class RpcHostToolBridge {
 			arguments: args,
 		});
 
+		// Start the idle clock AFTER sending the call.
+		armIdle();
+
 		return promise;
 	}
 

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.85.4",
-	"commit": "d014668cc60902dc4545082fc2c4c2062dff4046",
-	"shortCommit": "d014668",
+	"version": "19.85.6",
+	"commit": "58616737ba891a0d71cbdec7314292ed2efbd38f",
+	"shortCommit": "5861673",
 	"branch": "main",
-	"tag": "v19.85.4",
-	"commitDate": "2026-07-23T21:02:17Z",
-	"buildDate": "2026-07-23T21:25:20.917Z",
+	"tag": "v19.85.6",
+	"commitDate": "2026-07-23T23:21:56Z",
+	"buildDate": "2026-07-23T23:42:32.289Z",
 	"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/d014668cc60902dc4545082fc2c4c2062dff4046",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.85.4"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/58616737ba891a0d71cbdec7314292ed2efbd38f",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.85.6"
 };