@f5xc-salesdemos/xcsh 16.0.0 → 17.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "16.0.0",
+	"version": "17.0.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5xc-salesdemos/xcsh",
 	"author": "Can Boluk",
@@ -46,12 +46,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5xc-salesdemos/xcsh-stats": "16.0.0",
-		"@f5xc-salesdemos/pi-agent-core": "16.0.0",
-		"@f5xc-salesdemos/pi-ai": "16.0.0",
-		"@f5xc-salesdemos/pi-natives": "16.0.0",
-		"@f5xc-salesdemos/pi-tui": "16.0.0",
-		"@f5xc-salesdemos/pi-utils": "16.0.0",
+		"@f5xc-salesdemos/xcsh-stats": "17.0.1",
+		"@f5xc-salesdemos/pi-agent-core": "17.0.1",
+		"@f5xc-salesdemos/pi-ai": "17.0.1",
+		"@f5xc-salesdemos/pi-natives": "17.0.1",
+		"@f5xc-salesdemos/pi-tui": "17.0.1",
+		"@f5xc-salesdemos/pi-utils": "17.0.1",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/async/index.ts

@@ -1 +1,2 @@
 export * from "./job-manager";
+export * from "./support";

package/src/async/job-manager.ts

@@ -1,4 +1,4 @@
-import { logger, Snowflake } from "@f5xc-salesdemos/pi-utils";
+import { logger } from "@f5xc-salesdemos/pi-utils";
 
 const DELIVERY_RETRY_BASE_MS = 500;
 const DELIVERY_RETRY_MAX_MS = 30_000;
@@ -48,6 +48,7 @@ export class AsyncJobManager {
 	readonly #jobs = new Map<string, AsyncJob>();
 	readonly #deliveries: AsyncJobDelivery[] = [];
 	readonly #suppressedDeliveries = new Set<string>();
+	readonly #watchedJobs = new Set<string>();
 	readonly #evictionTimers = new Map<string, NodeJS.Timeout>();
 	readonly #onJobComplete: AsyncJobManagerOptions["onJobComplete"];
 	readonly #maxRunningJobs: number;
@@ -184,6 +185,25 @@ export class AsyncJobManager {
 		return this.#deliveries.length > 0;
 	}
 
+	watchJobs(jobIds: string[]): number {
+		const uniqueJobIds = Array.from(new Set(jobIds.map(id => id.trim()).filter(id => id.length > 0)));
+		for (const jobId of uniqueJobIds) {
+			this.#watchedJobs.add(jobId);
+		}
+		return uniqueJobIds.length;
+	}
+
+	unwatchJobs(jobIds: string[]): number {
+		const uniqueJobIds = Array.from(new Set(jobIds.map(id => id.trim()).filter(id => id.length > 0)));
+		let removed = 0;
+		for (const jobId of uniqueJobIds) {
+			if (this.#watchedJobs.delete(jobId)) {
+				removed += 1;
+			}
+		}
+		return removed;
+	}
+
 	acknowledgeDeliveries(jobIds: string[]): number {
 		const uniqueJobIds = Array.from(new Set(jobIds.map(id => id.trim()).filter(id => id.length > 0)));
 		if (uniqueJobIds.length === 0) return 0;
@@ -196,7 +216,7 @@ export class AsyncJobManager {
 		this.#deliveries.splice(
 			0,
 			this.#deliveries.length,
-			...this.#deliveries.filter(delivery => !this.#suppressedDeliveries.has(delivery.jobId)),
+			...this.#deliveries.filter(delivery => !this.isDeliverySuppressed(delivery.jobId)),
 		);
 		return before - this.#deliveries.length;
 	}
@@ -254,12 +274,21 @@ export class AsyncJobManager {
 		this.#jobs.clear();
 		this.#deliveries.length = 0;
 		this.#suppressedDeliveries.clear();
+		this.#watchedJobs.clear();
 		return drained;
 	}
 
 	#resolveJobId(preferredId?: string): string {
-		if (!preferredId || preferredId.trim().length === 0) {
-			return `bg_${Snowflake.next()}`;
+		preferredId = preferredId?.trim();
+		if (!preferredId) {
+			let candidate = 1;
+			while (true) {
+				const id = `bg_${candidate}`;
+				if (!this.#jobs.has(id)) {
+					return id;
+				}
+				candidate += 1;
+			}
 		}
 
 		const base = preferredId.trim();
@@ -278,6 +307,7 @@ export class AsyncJobManager {
 		if (this.#retentionMs <= 0) {
 			this.#jobs.delete(jobId);
 			this.#suppressedDeliveries.delete(jobId);
+			this.#watchedJobs.delete(jobId);
 			return;
 		}
 		const existing = this.#evictionTimers.get(jobId);
@@ -288,6 +318,7 @@ export class AsyncJobManager {
 			this.#evictionTimers.delete(jobId);
 			this.#jobs.delete(jobId);
 			this.#suppressedDeliveries.delete(jobId);
+			this.#watchedJobs.delete(jobId);
 		}, this.#retentionMs);
 		timer.unref();
 		this.#evictionTimers.set(jobId, timer);
@@ -300,12 +331,13 @@ export class AsyncJobManager {
 		this.#evictionTimers.clear();
 	}
 
-	#isDeliverySuppressed(jobId: string): boolean {
-		return this.#suppressedDeliveries.has(jobId);
+	isDeliverySuppressed(jobId: string): boolean {
+		return this.#suppressedDeliveries.has(jobId) || this.#watchedJobs.has(jobId);
 	}
 
 	#enqueueDelivery(jobId: string, text: string): void {
-		if (this.#isDeliverySuppressed(jobId)) {
+		// Skip delivery if already acknowledged
+		if (this.isDeliverySuppressed(jobId)) {
 			return;
 		}
 		this.#deliveries.push({
@@ -337,7 +369,7 @@ export class AsyncJobManager {
 	async #runDeliveryLoop(): Promise<void> {
 		while (this.#deliveries.length > 0) {
 			const delivery = this.#deliveries[0];
-			if (this.#isDeliverySuppressed(delivery.jobId)) {
+			if (this.isDeliverySuppressed(delivery.jobId)) {
 				this.#deliveries.shift();
 				continue;
 			}
@@ -348,7 +380,8 @@ export class AsyncJobManager {
 			if (this.#deliveries[0] !== delivery) {
 				continue;
 			}
-			if (this.#isDeliverySuppressed(delivery.jobId)) {
+			// Check again after sleep
+			if (this.isDeliverySuppressed(delivery.jobId)) {
 				this.#deliveries.shift();
 				continue;
 			}
@@ -361,7 +394,7 @@ export class AsyncJobManager {
 				delivery.lastError = error instanceof Error ? error.message : String(error);
 				delivery.nextAttemptAt = Date.now() + this.#getRetryDelay(delivery.attempt);
 				this.#deliveries.shift();
-				if (!this.#isDeliverySuppressed(delivery.jobId)) {
+				if (!this.isDeliverySuppressed(delivery.jobId)) {
 					this.#deliveries.push(delivery);
 				}
 				logger.warn("Async job completion delivery failed", {

package/src/async/support.ts

@@ -0,0 +1,5 @@
+import type { Settings } from "../config/settings";
+
+export function isBackgroundJobSupportEnabled(settings: Pick<Settings, "get">): boolean {
+	return settings.get("async.enabled") || settings.get("bash.autoBackground.enabled");
+}

package/src/cli/list-models.ts

@@ -6,6 +6,45 @@ import { formatNumber } from "@f5xc-salesdemos/pi-utils";
 import type { ModelRegistry } from "../config/model-registry";
 import { fuzzyFilter } from "../utils/fuzzy";
 
+interface ProviderRow {
+	provider: string;
+	model: string;
+	context: string;
+	maxOut: string;
+	thinking: string;
+	images: string;
+}
+
+interface CanonicalRow {
+	canonical: string;
+	selected: string;
+	variants: string;
+	context: string;
+	maxOut: string;
+}
+
+function writeLine(line = ""): void {
+	process.stdout.write(`${line}\n`);
+}
+
+function renderTable<T extends Record<string, string>>(rows: T[], headers: T): void {
+	const widths = Object.fromEntries(
+		Object.keys(headers).map(key => [key, Math.max(headers[key]!.length, ...rows.map(row => row[key]!.length))]),
+	) as Record<keyof T, number>;
+
+	const headerLine = Object.keys(headers)
+		.map(key => headers[key as keyof T]!.padEnd(widths[key as keyof T]))
+		.join("  ");
+	writeLine(headerLine);
+
+	for (const row of rows) {
+		const line = Object.keys(headers)
+			.map(key => row[key as keyof T]!.padEnd(widths[key as keyof T]))
+			.join("  ");
+		writeLine(line);
+	}
+}
+
 /**
  * List available models, optionally filtered by search pattern
  */
@@ -13,77 +52,77 @@ export async function listModels(modelRegistry: ModelRegistry, searchPattern?: s
 	const models = modelRegistry.getAvailable();
 
 	if (models.length === 0) {
-		console.log("No models available. Set API keys in environment variables.");
+		writeLine("No models available. Set API keys in environment variables.");
 		return;
 	}
 
-	// Apply fuzzy filter if search pattern provided
 	let filteredModels: Model<Api>[] = models;
 	if (searchPattern) {
-		filteredModels = fuzzyFilter(models, searchPattern, m => `${m.provider} ${m.id}`);
+		filteredModels = fuzzyFilter(models, searchPattern, model => `${model.provider} ${model.id}`);
 	}
 
-	if (filteredModels.length === 0) {
-		console.log(`No models matching "${searchPattern}"`);
+	const filteredCanonical = modelRegistry
+		.getCanonicalModels({ availableOnly: true, candidates: filteredModels })
+		.map(record => {
+			const selected = modelRegistry.resolveCanonicalModel(record.id, {
+				availableOnly: true,
+				candidates: filteredModels,
+			});
+			if (!selected) return undefined;
+			return {
+				canonical: record.id,
+				selected: `${selected.provider}/${selected.id}`,
+				variants: String(record.variants.length),
+				context: formatNumber(selected.contextWindow),
+				maxOut: formatNumber(selected.maxTokens),
+			} satisfies CanonicalRow;
+		})
+		.filter((row): row is CanonicalRow => row !== undefined)
+		.sort((left, right) => left.canonical.localeCompare(right.canonical));
+
+	if (filteredModels.length === 0 && filteredCanonical.length === 0) {
+		writeLine(`No models matching "${searchPattern}"`);
 		return;
 	}
 
-	// Sort by provider, then by model id
-	filteredModels.sort((a, b) => {
-		const providerCmp = a.provider.localeCompare(b.provider);
+	filteredModels.sort((left, right) => {
+		const providerCmp = left.provider.localeCompare(right.provider);
 		if (providerCmp !== 0) return providerCmp;
-		return a.id.localeCompare(b.id);
+		return left.id.localeCompare(right.id);
 	});
 
-	// Calculate column widths
-	const rows = filteredModels.map(m => ({
-		provider: m.provider,
-		model: m.id,
-		context: formatNumber(m.contextWindow),
-		maxOut: formatNumber(m.maxTokens),
-		thinking: m.thinking ? getSupportedEfforts(m).join(",") : m.reasoning ? "yes" : "-",
-		images: m.input.includes("image") ? "yes" : "no",
-	}));
+	const providerRows = filteredModels.map(model => ({
+		provider: model.provider,
+		model: model.id,
+		context: formatNumber(model.contextWindow),
+		maxOut: formatNumber(model.maxTokens),
+		thinking: model.thinking ? getSupportedEfforts(model).join(",") : model.reasoning ? "yes" : "-",
+		images: model.input.includes("image") ? "yes" : "no",
+	})) satisfies ProviderRow[];
 
-	const headers = {
-		provider: "provider",
-		model: "model",
-		context: "context",
-		maxOut: "max-out",
-		thinking: "thinking",
-		images: "images",
-	};
-
-	const widths = {
-		provider: Math.max(headers.provider.length, ...rows.map(r => r.provider.length)),
-		model: Math.max(headers.model.length, ...rows.map(r => r.model.length)),
-		context: Math.max(headers.context.length, ...rows.map(r => r.context.length)),
-		maxOut: Math.max(headers.maxOut.length, ...rows.map(r => r.maxOut.length)),
-		thinking: Math.max(headers.thinking.length, ...rows.map(r => r.thinking.length)),
-		images: Math.max(headers.images.length, ...rows.map(r => r.images.length)),
-	};
-
-	// Print header
-	const headerLine = [
-		headers.provider.padEnd(widths.provider),
-		headers.model.padEnd(widths.model),
-		headers.context.padEnd(widths.context),
-		headers.maxOut.padEnd(widths.maxOut),
-		headers.thinking.padEnd(widths.thinking),
-		headers.images.padEnd(widths.images),
-	].join("  ");
-	console.log(headerLine);
+	if (filteredCanonical.length > 0) {
+		writeLine("Canonical models");
+		renderTable(filteredCanonical, {
+			canonical: "canonical",
+			selected: "selected",
+			variants: "variants",
+			context: "context",
+			maxOut: "max-out",
+		});
+		if (providerRows.length > 0) {
+			writeLine();
+		}
+	}
 
-	// Print rows
-	for (const row of rows) {
-		const line = [
-			row.provider.padEnd(widths.provider),
-			row.model.padEnd(widths.model),
-			row.context.padEnd(widths.context),
-			row.maxOut.padEnd(widths.maxOut),
-			row.thinking.padEnd(widths.thinking),
-			row.images.padEnd(widths.images),
-		].join("  ");
-		console.log(line);
+	if (providerRows.length > 0) {
+		writeLine("Provider models");
+		renderTable(providerRows, {
+			provider: "provider",
+			model: "model",
+			context: "context",
+			maxOut: "max-out",
+			thinking: "thinking",
+			images: "images",
+		});
 	}
 }

package/src/commit/agentic/tools/analyze-file.ts

@@ -43,7 +43,6 @@ function buildToolSession(
 		settings: options.settings,
 		authStorage: options.authStorage,
 		modelRegistry: options.modelRegistry,
-		searchDb: ctx.searchDb,
 	};
 }
 
@@ -79,7 +78,7 @@ export function createAnalyzeFileTool(options: {
 			});
 			const taskParams: TaskParams = {
 				agent: "quick_task",
-				schema: analyzeFileOutputSchema,
+				schema: JSON.stringify(analyzeFileOutputSchema),
 				tasks,
 			};
 			return taskTool.execute(toolCallId, taskParams, signal, onUpdate);

package/src/commit/model-selection.ts

@@ -1,7 +1,12 @@
 import type { ThinkingLevel } from "@f5xc-salesdemos/pi-agent-core";
 import type { Api, Model } from "@f5xc-salesdemos/pi-ai";
 import { MODEL_ROLE_IDS } from "../config/model-registry";
-import { parseModelPattern, resolveModelRoleValue, resolveRoleSelection } from "../config/model-resolver";
+import {
+	type ModelLookupRegistry,
+	parseModelPattern,
+	resolveModelRoleValue,
+	resolveRoleSelection,
+} from "../config/model-resolver";
 import type { Settings } from "../config/settings";
 import MODEL_PRIO from "../priority.json" with { type: "json" };
 
@@ -11,19 +16,20 @@ export interface ResolvedCommitModel {
 	thinkingLevel?: ThinkingLevel;
 }
 
+type CommitModelRegistry = ModelLookupRegistry & {
+	getApiKey: (model: Model<Api>) => Promise<string | undefined>;
+};
+
 export async function resolvePrimaryModel(
 	override: string | undefined,
 	settings: Settings,
-	modelRegistry: {
-		getAvailable: () => Model<Api>[];
-		getApiKey: (model: Model<Api>) => Promise<string | undefined>;
-	},
+	modelRegistry: CommitModelRegistry,
 ): Promise<ResolvedCommitModel> {
 	const available = modelRegistry.getAvailable();
 	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
 	const resolved = override
-		? resolveModelRoleValue(override, available, { settings, matchPreferences })
-		: resolveRoleSelection(["commit", "smol", ...MODEL_ROLE_IDS], settings, available);
+		? resolveModelRoleValue(override, available, { settings, matchPreferences, modelRegistry })
+		: resolveRoleSelection(["commit", "smol", ...MODEL_ROLE_IDS], settings, available, modelRegistry);
 	const model = resolved?.model;
 	if (!model) {
 		throw new Error("No model available for commit generation");
@@ -37,15 +43,12 @@ export async function resolvePrimaryModel(
 
 export async function resolveSmolModel(
 	settings: Settings,
-	modelRegistry: {
-		getAvailable: () => Model<Api>[];
-		getApiKey: (model: Model<Api>) => Promise<string | undefined>;
-	},
+	modelRegistry: CommitModelRegistry,
 	fallbackModel: Model<Api>,
 	fallbackApiKey: string,
 ): Promise<ResolvedCommitModel> {
 	const available = modelRegistry.getAvailable();
-	const resolvedSmol = resolveRoleSelection(["smol"], settings, available);
+	const resolvedSmol = resolveRoleSelection(["smol"], settings, available, modelRegistry);
 	if (resolvedSmol?.model) {
 		const apiKey = await modelRegistry.getApiKey(resolvedSmol.model);
 		if (apiKey) return { model: resolvedSmol.model, apiKey, thinkingLevel: resolvedSmol.thinkingLevel };
@@ -53,7 +56,7 @@ export async function resolveSmolModel(
 
 	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
 	for (const pattern of MODEL_PRIO.smol) {
-		const candidate = parseModelPattern(pattern, available, matchPreferences).model;
+		const candidate = parseModelPattern(pattern, available, matchPreferences, { modelRegistry }).model;
 		if (!candidate) continue;
 		const apiKey = await modelRegistry.getApiKey(candidate);
 		if (apiKey) return { model: candidate, apiKey };