@f5-sales-demo/xcsh 19.91.1 → 19.92.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "19.91.1",
+	"version": "19.92.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",
@@ -56,13 +56,13 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "1.3.0",
 		"@mozilla/readability": "^0.6",
-		"@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",
+		"@f5-sales-demo/xcsh-stats": "19.92.1",
+		"@f5-sales-demo/pi-agent-core": "19.92.1",
+		"@f5-sales-demo/pi-ai": "19.92.1",
+		"@f5-sales-demo/pi-natives": "19.92.1",
+		"@f5-sales-demo/pi-resource-management": "19.92.1",
+		"@f5-sales-demo/pi-tui": "19.92.1",
+		"@f5-sales-demo/pi-utils": "19.92.1",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.20",

package/src/browser/chat-handler.ts

@@ -3,6 +3,7 @@ import * as path from "node:path";
 import type { AssistantMessage, ImageContent } from "@f5-sales-demo/pi-ai";
 import { settings } from "../config/settings";
 import { DEFAULT_MODEL_ROLE } from "../config/settings-schema";
+import { toSkillSummaries } from "../extensibility/skills";
 import {
 	isRpcHostToolResult,
 	isRpcHostToolUpdate,
@@ -428,8 +429,8 @@ export class ChatHandler {
 	 *  already loaded on the session; the model actions them via the read tool + the
 	 *  system prompt (Phase 2A enabled `read`), so this is enumeration only. */
 	#handleListSkills(): void {
-		const skills = this.#session.skills.map(s => ({ name: s.name, description: s.description }));
-		this.#server.send({ type: "skills", skills } satisfies SkillsList);
+		// Shared projection: one place decides what crosses to a client (never paths).
+		this.#server.send({ type: "skills", skills: toSkillSummaries(this.#session.skills) } satisfies SkillsList);
 	}
 
 	#sendTerminal(chat: ActiveChat, frame: ChatDone | ChatError): void {

package/src/extensibility/skills.ts

@@ -19,6 +19,26 @@ export interface Skill {
 	_source?: SourceMeta;
 }
 
+/** A skill as a CLIENT sees it: enough to render a menu entry, nothing more. */
+export interface SkillSummary {
+	name: string;
+	description: string;
+}
+
+/**
+ * Project loaded skills onto the client-facing summary.
+ *
+ * `Skill` also carries `filePath`, `baseDir`, `source` and `_source` — the
+ * operator's on-disk layout. A UI surface (Office pane, Chrome side panel, VS Code
+ * webview) needs only the name and description to populate a menu, so this is the
+ * one place that decides what crosses the boundary. Shared by every transport
+ * (the `list_skills` bridge frame and the `list_skills` RPC command) so they can't
+ * drift into leaking different amounts.
+ */
+export function toSkillSummaries(skills: readonly Skill[]): SkillSummary[] {
+	return skills.map(s => ({ name: s.name, description: s.description }));
+}
+
 export interface SkillWarning {
 	skillPath: string;
 	message: string;

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.91.1",
-	"commit": "cb975aa015ff199ecdc38c20544471ebf32e3737",
-	"shortCommit": "cb975aa",
+	"version": "19.92.1",
+	"commit": "f3e12dd43623f1171d4dff7c837532e64ab8bb4b",
+	"shortCommit": "f3e12dd",
 	"branch": "main",
-	"tag": "v19.91.1",
-	"commitDate": "2026-07-25T17:10:56Z",
-	"buildDate": "2026-07-25T17:31:09.895Z",
+	"tag": "v19.92.1",
+	"commitDate": "2026-07-26T01:09:53Z",
+	"buildDate": "2026-07-26T01:30:47.762Z",
 	"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/cb975aa015ff199ecdc38c20544471ebf32e3737",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.91.1"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/f3e12dd43623f1171d4dff7c837532e64ab8bb4b",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.92.1"
 };

package/src/modes/rpc/rpc-client.ts

@@ -389,6 +389,15 @@ export class RpcClient {
 		return this.#getData(response);
 	}
 
+	/**
+	 * List the session's loaded skills (name + description) so a host can populate a
+	 * skills menu. Enumeration only — invoking one is just a prompt beginning `/name`.
+	 */
+	async listSkills(): Promise<{ skills: Array<{ name: string; description: string }> }> {
+		const response = await this.#send({ type: "list_skills" });
+		return this.#getData(response);
+	}
+
 	/**
 	 * Set thinking level.
 	 */

package/src/modes/rpc/rpc-mode.ts

@@ -16,6 +16,7 @@ import type {
 	ExtensionUIDialogOptions,
 	ExtensionWidgetOptions,
 } from "../../extensibility/extensions";
+import { toSkillSummaries } from "../../extensibility/skills";
 import {
 	isRpcHostToolResult,
 	isRpcHostToolUpdate,
@@ -636,6 +637,13 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 				});
 			}
 
+			case "list_skills": {
+				// Enumeration only: skills already work through the read tool + system
+				// prompt. Mirrors the `list_skills` bridge frame the Office pane uses, via
+				// the same shared projection so neither transport can leak on-disk paths.
+				return success(id, "list_skills", { skills: toSkillSummaries(session.skills) });
+			}
+
 			// =================================================================
 			// Model
 			// =================================================================

package/src/modes/rpc/rpc-types.ts

@@ -7,6 +7,7 @@
 import type { AgentMessage, ThinkingLevel } from "@f5-sales-demo/pi-agent-core";
 import type { Effort, ImageContent, Model } from "@f5-sales-demo/pi-ai";
 import type { BashResult } from "../../exec/bash-executor";
+import type { SkillSummary } from "../../extensibility/skills";
 // The host-tool wire types are transport-neutral and live in the shared host-tool
 // core so both the stdio RPC driver and the WS chat bridge use one vocabulary.
 import type {
@@ -48,6 +49,7 @@ export type RpcCommand =
 	| { id?: string; type: "set_todos"; phases: TodoPhase[] }
 	| { id?: string; type: "set_host_tools"; tools: RpcHostToolDefinition[] }
 	| { id?: string; type: "get_integrations" }
+	| { id?: string; type: "list_skills" }
 
 	// Model
 	| { id?: string; type: "set_model"; provider: string; modelId: string }
@@ -132,6 +134,13 @@ export type RpcResponse =
 	| { id?: string; type: "response"; command: "get_state"; success: true; data: RpcSessionState }
 	| { id?: string; type: "response"; command: "set_todos"; success: true; data: { todoPhases: TodoPhase[] } }
 	| { id?: string; type: "response"; command: "set_host_tools"; success: true; data: { toolNames: string[] } }
+	| {
+			id?: string;
+			type: "response";
+			command: "list_skills";
+			success: true;
+			data: { skills: SkillSummary[] };
+	  }
 	| {
 			id?: string;
 			type: "response";

package/src/system-prompt.ts

@@ -6,7 +6,16 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import type { AgentTool } from "@f5-sales-demo/pi-agent-core";
-import { $env, getGpuCachePath, getProjectDir, hasFsCode, isEnoent, logger, prompt } from "@f5-sales-demo/pi-utils";
+import {
+	$env,
+	getGpuCachePath,
+	getProjectDir,
+	hasFsCode,
+	isEnoent,
+	logger,
+	prompt,
+	withTimeout,
+} from "@f5-sales-demo/pi-utils";
 import { $ } from "bun";
 import { contextFileCapability } from "./capability/context-file";
 import { systemPromptCapability } from "./capability/system-prompt";
@@ -125,13 +134,42 @@ export interface AgentsMdSearch {
 	files: string[];
 }
 
-/** Mutable traversal budget shared across the recursive walk. */
-interface WalkBudget {
+/** Reads one directory. Injectable so tests can simulate a readdir that never settles. */
+type ReaddirFn = (dir: string) => Promise<fs.Dirent[]>;
+
+/** Mutable traversal budget + the reader, shared across the recursive walk. */
+interface WalkContext {
 	readonly maxDirs: number;
 	readonly deadline: number;
+	readonly readdir: ReaddirFn;
 	dirsVisited: number;
 }
 
+/**
+ * Read one directory, giving up when the walk's deadline passes.
+ *
+ * The budget checks between directories are NOT enough on their own: a `readdir`
+ * that never settles — a TCC-protected or cloud-synced directory such as
+ * ~/Documents on a managed Mac — would park the walk forever at zero CPU, hanging
+ * `createAgentSession` and with it the Office pane's `set_host_tools` (#2399). The
+ * deadline has to be enforced HERE, around the syscall itself.
+ *
+ * Returns null when the directory could not be read in time (or at all); the
+ * caller treats that as "nothing here" and moves on.
+ *
+ * The abandoned read keeps a thread-pool slot until the OS releases it. That is
+ * bounded by the number of pathological directories and is strictly better than
+ * never returning.
+ */
+async function readdirWithinBudget(dir: string, ctx: WalkContext): Promise<fs.Dirent[] | null> {
+	const remaining = ctx.deadline - Date.now();
+	if (remaining <= 0) return null;
+	// `withTimeout` rejects on expiry and clears its own timer; here expiry is an
+	// ordinary outcome, so both it and a real read failure collapse to null — the
+	// caller treats either as "nothing here".
+	return await withTimeout(ctx.readdir(dir), remaining, `readdir exceeded the walk budget: ${dir}`).catch(() => null);
+}
+
 function normalizePath(value: string): string {
 	return value.replace(/\\/g, "/");
 }
@@ -148,7 +186,7 @@ async function collectAgentsMdFiles(
 	limit: number,
 	maxDepth: number,
 	discovered: Set<string>,
-	budget: WalkBudget,
+	budget: WalkContext,
 ): Promise<void> {
 	// Stop on any bound: depth, enough matches, the directory-visit budget, or the
 	// wall-clock deadline. The last two keep a match-poor tree (e.g. $HOME) bounded.
@@ -165,12 +203,9 @@ async function collectAgentsMdFiles(
 	// sibling sees the updated count before it yields, making the cap effectively hard.
 	budget.dirsVisited++;
 
-	let entries: fs.Dirent[];
-	try {
-		entries = await fs.promises.readdir(dir, { withFileTypes: true });
-	} catch {
-		return;
-	}
+	// Deadline-guarded: a directory that never answers must not park the whole walk.
+	const entries = await readdirWithinBudget(dir, budget);
+	if (!entries) return;
 
 	if (depth >= AGENTS_MD_MIN_DEPTH) {
 		const hasAgentsMd = entries.some(entry => entry.isFile() && entry.name === "XCSH.md");
@@ -208,12 +243,18 @@ export interface DiscoverAgentsMdOptions {
 	maxDepth?: number;
 	maxDirs?: number;
 	budgetMs?: number;
+	/** Directory reader; defaults to `fs.promises.readdir`. A test seam for
+	 *  simulating a filesystem that never answers. */
+	readdir?: ReaddirFn;
 }
 
 /**
  * Walk `root` (bounded by depth, match-limit, directory budget, and a wall-clock
  * deadline) collecting nested `XCSH.md` paths. Returns the sorted matches plus the
  * number of directories visited (for observability/tests). Never throws.
+ *
+ * The deadline is PREEMPTIVE: it bounds each `readdir` as well as the walk as a
+ * whole, so a directory that never answers cannot stall startup (#2399).
  */
 export async function discoverAgentsMdFiles(
 	root: string,
@@ -221,17 +262,18 @@ export async function discoverAgentsMdFiles(
 ): Promise<{ files: string[]; dirsVisited: number }> {
 	const limit = opts.limit ?? AGENTS_MD_LIMIT;
 	const maxDepth = opts.maxDepth ?? AGENTS_MD_MAX_DEPTH;
-	const budget: WalkBudget = {
+	const ctx: WalkContext = {
 		maxDirs: opts.maxDirs ?? AGENTS_MD_MAX_DIRS,
 		deadline: Date.now() + (opts.budgetMs ?? AGENTS_MD_WALK_BUDGET_MS),
+		readdir: opts.readdir ?? ((dir: string) => fs.promises.readdir(dir, { withFileTypes: true })),
 		dirsVisited: 0,
 	};
 	try {
 		const discovered = new Set<string>();
-		await collectAgentsMdFiles(root, root, 0, limit, maxDepth, discovered, budget);
-		return { files: Array.from(discovered).sort().slice(0, limit), dirsVisited: budget.dirsVisited };
+		await collectAgentsMdFiles(root, root, 0, limit, maxDepth, discovered, ctx);
+		return { files: Array.from(discovered).sort().slice(0, limit), dirsVisited: ctx.dirsVisited };
 	} catch {
-		return { files: [], dirsVisited: budget.dirsVisited };
+		return { files: [], dirsVisited: ctx.dirsVisited };
 	}
 }