@f5-sales-demo/xcsh 19.63.6 → 19.63.7

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "19.63.6",
+	"version": "19.63.7",
 	"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.63.6",
-		"@f5-sales-demo/pi-agent-core": "19.63.6",
-		"@f5-sales-demo/pi-ai": "19.63.6",
-		"@f5-sales-demo/pi-natives": "19.63.6",
-		"@f5-sales-demo/pi-resource-management": "19.63.6",
-		"@f5-sales-demo/pi-tui": "19.63.6",
-		"@f5-sales-demo/pi-utils": "19.63.6",
+		"@f5-sales-demo/xcsh-stats": "19.63.7",
+		"@f5-sales-demo/pi-agent-core": "19.63.7",
+		"@f5-sales-demo/pi-ai": "19.63.7",
+		"@f5-sales-demo/pi-natives": "19.63.7",
+		"@f5-sales-demo/pi-resource-management": "19.63.7",
+		"@f5-sales-demo/pi-tui": "19.63.7",
+		"@f5-sales-demo/pi-utils": "19.63.7",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.20",

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.63.6",
-	"commit": "f24790e4f2617287c53171fdc6596bb257dfa499",
-	"shortCommit": "f24790e",
+	"version": "19.63.7",
+	"commit": "60a30a905669791dd0c2f600254d6b95c85ecd49",
+	"shortCommit": "60a30a9",
 	"branch": "main",
-	"tag": "v19.63.6",
-	"commitDate": "2026-07-17T15:34:43Z",
-	"buildDate": "2026-07-17T15:57:30.152Z",
+	"tag": "v19.63.7",
+	"commitDate": "2026-07-19T03:29:22Z",
+	"buildDate": "2026-07-19T03:49:08.769Z",
 	"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/f24790e4f2617287c53171fdc6596bb257dfa499",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.63.6"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/60a30a905669791dd0c2f600254d6b95c85ecd49",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.63.7"
 };

package/src/internal-urls/profile-collectors.ts

@@ -1,5 +1,4 @@
-import { logger } from "@f5-sales-demo/pi-utils";
-import { $ } from "bun";
+import { $which, logger } from "@f5-sales-demo/pi-utils";
 
 import type { UserProfile } from "./user-profile";
 
@@ -17,14 +16,255 @@ export interface ProfileCollector {
 }
 
 // ---------------------------------------------------------------------------
-// System (macOS)
+// Bounded CLI runner
+//
+// Collectors shell out to external CLIs (sf, gh, git, id, …). These run in a
+// fire-and-forget background refresh, so a hung CLI must never leave a promise
+// pending forever. Bun's `$` cannot be cancelled, so we spawn directly with an
+// AbortSignal timeout that actually kills the child on expiry.
+// ---------------------------------------------------------------------------
+
+const CLI_TIMEOUT_MS = 15_000;
+
+export interface CliResult {
+	exitCode: number;
+	stdout: string;
+}
+
+export async function runCli(cmd: string[], timeoutMs = CLI_TIMEOUT_MS): Promise<CliResult> {
+	try {
+		const proc = Bun.spawn(cmd, {
+			stdout: "pipe",
+			stderr: "ignore",
+			signal: AbortSignal.timeout(timeoutMs),
+		});
+		const stdout = await new Response(proc.stdout).text();
+		const exitCode = await proc.exited;
+		return { exitCode, stdout };
+	} catch (err: unknown) {
+		logger.debug("profile collector CLI failed or timed out", { cmd: cmd[0], error: err });
+		return { exitCode: -1, stdout: "" };
+	}
+}
+
+// ---------------------------------------------------------------------------
+// Shared helpers (pure — unit-tested directly, no I/O)
+// ---------------------------------------------------------------------------
+
+/**
+ * Split a full name into given + family. The first whitespace token is the
+ * given name; everything after it is the family name. Blank input yields {}.
+ */
+export function splitFullName(full: string): { givenName?: string; familyName?: string } {
+	const trimmed = full.trim();
+	if (!trimmed) return {};
+	const parts = trimmed.split(/\s+/);
+	const out: { givenName?: string; familyName?: string } = { givenName: parts[0] };
+	if (parts.length > 1) out.familyName = parts.slice(1).join(" ");
+	return out;
+}
+
+// ---------------------------------------------------------------------------
+// Salesforce
+// ---------------------------------------------------------------------------
+
+const SALESFORCE_SOQL_FIELDS =
+	"Id, Username, FirstName, LastName, Email, Title, Department, Division, CompanyName, " +
+	"ManagerId, Manager.Name, Manager.Email, Street, City, State, PostalCode, Country, Phone, MobilePhone";
+
+/** Map a single Salesforce `User` SOQL record onto profile fields. */
+export function parseSalesforceUserRecord(rec: Record<string, unknown>): Partial<UserProfile> {
+	const profile: Partial<UserProfile> = {};
+
+	if (rec.FirstName) profile.givenName = rec.FirstName as string;
+	if (rec.LastName) profile.familyName = rec.LastName as string;
+	if (rec.Email) profile.email = rec.Email as string;
+
+	const phone = (rec.Phone || rec.MobilePhone) as string | undefined;
+	if (phone) profile.telephone = phone;
+
+	if (rec.Title) profile.jobTitle = rec.Title as string;
+	if (rec.Department) profile.department = rec.Department as string;
+	if (rec.Division) profile.division = rec.Division as string;
+
+	profile.worksFor = { name: (rec.CompanyName as string) || "F5" };
+
+	const mgr = rec.Manager as Record<string, unknown> | undefined;
+	if (mgr && (mgr.Name || mgr.Email)) {
+		profile.manager = {};
+		if (mgr.Name) Object.assign(profile.manager, splitFullName(mgr.Name as string));
+		if (mgr.Email) profile.manager.email = mgr.Email as string;
+	}
+
+	const street = rec.Street as string | undefined;
+	const city = rec.City as string | undefined;
+	const state = rec.State as string | undefined;
+	const postalCode = rec.PostalCode as string | undefined;
+	const country = rec.Country as string | undefined;
+	if (street || city || state || postalCode || country) {
+		profile.address = {};
+		if (street) profile.address.streetAddress = street;
+		if (city) profile.address.addressLocality = city;
+		if (state) profile.address.addressRegion = state;
+		if (postalCode) profile.address.postalCode = postalCode;
+		if (country) profile.address.addressCountry = country;
+	}
+
+	if (rec.Id) profile.identifiers = { ...profile.identifiers, salesforceId: rec.Id as string };
+
+	return profile;
+}
+
+const salesforceCollector: ProfileCollector = {
+	id: "salesforce",
+	name: "Salesforce",
+	authoritativeFields: ["givenName", "familyName", "email", "jobTitle", "department", "division", "worksFor"],
+
+	async available(): Promise<boolean> {
+		if (!$which("sf")) return false;
+		const proc = await runCli(["sf", "org", "display", "--json"]);
+		if (proc.exitCode !== 0) return false;
+		try {
+			const parsed = JSON.parse(proc.stdout) as Record<string, unknown>;
+			const result = parsed.result as Record<string, unknown> | undefined;
+			return typeof result?.username === "string" && result.username.length > 0;
+		} catch {
+			return false;
+		}
+	},
+
+	async collect(): Promise<Partial<UserProfile>> {
+		try {
+			const orgProc = await runCli(["sf", "org", "display", "--json"]);
+			if (orgProc.exitCode !== 0) return {};
+			const orgData = JSON.parse(orgProc.stdout) as Record<string, unknown>;
+			const orgResult = orgData.result as Record<string, unknown> | undefined;
+			const username = orgResult?.username as string | undefined;
+			if (!username) return {};
+
+			const soql = `SELECT ${SALESFORCE_SOQL_FIELDS} FROM User WHERE Username = '${username}'`;
+			const queryProc = await runCli(["sf", "data", "query", "--query", soql, "--json"]);
+			if (queryProc.exitCode !== 0) return {};
+
+			const queryData = JSON.parse(queryProc.stdout) as Record<string, unknown>;
+			const queryResult = queryData.result as Record<string, unknown> | undefined;
+			const records = queryResult?.records as Record<string, unknown>[] | undefined;
+			const rec = records?.[0];
+			if (!rec) return {};
+
+			return parseSalesforceUserRecord(rec);
+		} catch (err: unknown) {
+			logger.debug("salesforce collector failed", { error: err });
+			return {};
+		}
+	},
+};
+
+// ---------------------------------------------------------------------------
+// GitHub
+// ---------------------------------------------------------------------------
+
+/** Map `gh api user` JSON output onto profile fields. */
+export function parseGithubUserJson(stdout: string): Partial<UserProfile> {
+	let data: Record<string, unknown>;
+	try {
+		data = JSON.parse(stdout) as Record<string, unknown>;
+	} catch {
+		return {};
+	}
+
+	const profile: Partial<UserProfile> = {};
+	const sameAs: string[] = [];
+
+	const login = data.login as string | undefined;
+	if (login) {
+		profile.identifiers = { ...profile.identifiers, github: login };
+		sameAs.push(`https://github.com/${login}`);
+	}
+
+	const name = data.name as string | undefined;
+	if (name) Object.assign(profile, splitFullName(name));
+
+	const email = data.email as string | undefined;
+	if (email) profile.email = email;
+
+	const bio = data.bio as string | undefined;
+	if (bio) profile.description = bio;
+
+	const blog = data.blog as string | undefined;
+	if (blog) {
+		profile.url = blog;
+		sameAs.push(blog);
+	}
+
+	const twitterUsername = data.twitter_username as string | undefined;
+	if (twitterUsername) {
+		profile.identifiers = { ...profile.identifiers, twitter: twitterUsername };
+		sameAs.push(`https://x.com/${twitterUsername}`);
+	}
+
+	if (sameAs.length > 0) profile.sameAs = sameAs;
+
+	return profile;
+}
+
+const githubCollector: ProfileCollector = {
+	id: "github",
+	name: "GitHub",
+
+	async available(): Promise<boolean> {
+		if (!$which("gh")) return false;
+		const proc = await runCli(["gh", "auth", "status"]);
+		return proc.exitCode === 0;
+	},
+
+	async collect(): Promise<Partial<UserProfile>> {
+		const proc = await runCli(["gh", "api", "user"]);
+		if (proc.exitCode !== 0) return {};
+		return parseGithubUserJson(proc.stdout);
+	},
+};
+
+// ---------------------------------------------------------------------------
+// Git (local config)
+// ---------------------------------------------------------------------------
+
+const gitCollector: ProfileCollector = {
+	id: "git",
+	name: "Git",
+
+	async available(): Promise<boolean> {
+		return Boolean($which("git"));
+	},
+
+	async collect(): Promise<Partial<UserProfile>> {
+		const profile: Partial<UserProfile> = {};
+
+		const nameProc = await runCli(["git", "config", "--get", "user.name"]);
+		if (nameProc.exitCode === 0) {
+			const name = nameProc.stdout.trim();
+			if (name) Object.assign(profile, splitFullName(name));
+		}
+
+		const emailProc = await runCli(["git", "config", "--get", "user.email"]);
+		if (emailProc.exitCode === 0) {
+			const email = emailProc.stdout.trim();
+			if (email) profile.email = email;
+		}
+
+		return profile;
+	},
+};
+
+// ---------------------------------------------------------------------------
+// System (identity + UI languages)
 // ---------------------------------------------------------------------------
 
 async function detectDarwinLanguages(): Promise<string[]> {
-	const proc = await $`defaults read NSGlobalDomain AppleLanguages`.quiet().nothrow();
+	const proc = await runCli(["defaults", "read", "NSGlobalDomain", "AppleLanguages"]);
 	if (proc.exitCode !== 0) return [];
 
-	const raw = proc.stdout.toString().trim();
+	const raw = proc.stdout.trim();
 	const inner = raw.replace(/^\(\s*/, "").replace(/\s*\)$/, "");
 	return inner
 		.split(",")
@@ -56,6 +296,22 @@ function detectLinuxLanguages(): string[] {
 	return languages;
 }
 
+/** Best-effort full name from the OS account record (macOS `id -F`, Linux GECOS). */
+async function detectSystemFullName(): Promise<string> {
+	if (process.platform === "darwin") {
+		const proc = await runCli(["id", "-F"]);
+		return proc.exitCode === 0 ? proc.stdout.trim() : "";
+	}
+
+	// Linux: GECOS field (comma-separated) of the passwd entry for the current user.
+	const user = process.env.USER || process.env.LOGNAME;
+	if (!user || !$which("getent")) return "";
+	const proc = await runCli(["getent", "passwd", user]);
+	if (proc.exitCode !== 0) return "";
+	const gecos = proc.stdout.trim().split(":")[6] ?? "";
+	return gecos.split(",")[0]?.trim() ?? "";
+}
+
 const systemCollector: ProfileCollector = {
 	id: "system",
 	name: "System",
@@ -65,23 +321,32 @@ const systemCollector: ProfileCollector = {
 	},
 
 	async collect(): Promise<Partial<UserProfile>> {
+		const profile: Partial<UserProfile> = {};
+		try {
+			const fullName = await detectSystemFullName();
+			if (fullName) Object.assign(profile, splitFullName(fullName));
+		} catch (err: unknown) {
+			logger.debug("system collector: name detection failed", { error: err });
+		}
 		try {
 			const languages = process.platform === "darwin" ? await detectDarwinLanguages() : detectLinuxLanguages();
-
-			if (languages.length === 0) return {};
-			return { knowsLanguage: languages };
+			if (languages.length > 0) profile.knowsLanguage = languages;
 		} catch (err: unknown) {
-			logger.debug("system collector failed", { error: err });
-			return {};
+			logger.debug("system collector: language detection failed", { error: err });
 		}
+		return profile;
 	},
 };
 
 // ---------------------------------------------------------------------------
 // Registry
+//
+// Order encodes seed priority: `mergeProfile` is first-wins for scalar fields,
+// so higher-trust identity sources come first (Salesforce → GitHub → git →
+// system). Plugins may append more via `registerProfileCollector`.
 // ---------------------------------------------------------------------------
 
-const _collectors: ProfileCollector[] = [systemCollector];
+const _collectors: ProfileCollector[] = [salesforceCollector, githubCollector, gitCollector, systemCollector];
 
 export const PROFILE_COLLECTORS: readonly ProfileCollector[] = _collectors;
 

package/src/internal-urls/user-profile.ts

@@ -45,7 +45,7 @@ export interface UserProfile {
 	description?: string;
 	image?: string;
 	sameAs?: string[];
-	identifiers?: { github?: string; twitter?: string };
+	identifiers?: { github?: string; twitter?: string; salesforceId?: string };
 	/** User-authored: short role label, e.g. 'SE', 'AE', 'CSM', 'SA'. Set manually. */
 	role?: string;
 	/**
@@ -65,7 +65,7 @@ export interface UserProfile {
 	/** User-authored: quarterly quota target in dollars. Used for coverage ratio calculations. */
 	quota?: number;
 	observations?: UserProfileObservation[];
-	sources?: { github?: string; system?: string; conversation?: string };
+	sources?: { github?: string; system?: string; conversation?: string; git?: string; salesforce?: string };
 	updatedAt?: string;
 	/** Tracks which collector ID authoritatively owns each top-level field. */
 	_fieldOwnership?: Record<string, string>;
@@ -120,28 +120,59 @@ export function mergeProfile(target: UserProfile, source: Partial<UserProfile>):
 	}
 }
 
-export async function seedProfile(): Promise<UserProfile> {
+/** Outcome of a single collector during a seed run — surfaced to the session. */
+export interface SeedCollectorResult {
+	id: string;
+	name: string;
+	status: "collected" | "unavailable" | "error";
+	/** Profile fields the collector contributed (only when status === "collected"). */
+	fields?: string[];
+	/** Error message when status === "error". */
+	error?: string;
+}
+
+export interface SeedResult {
+	profile: UserProfile;
+	results: SeedCollectorResult[];
+}
+
+export async function seedProfile(): Promise<SeedResult> {
 	const profile = await loadProfile();
 	if (!profile.sources) profile.sources = {};
 
+	const results: SeedCollectorResult[] = [];
+
 	for (const collector of PROFILE_COLLECTORS) {
 		try {
 			const isAvailable = await collector.available();
 			if (!isAvailable) {
 				logger.debug(`Profile collector '${collector.id}' not available, skipping`);
+				results.push({ id: collector.id, name: collector.name, status: "unavailable" });
 				continue;
 			}
 			const partial = await collector.collect();
 			mergeProfile(profile, partial);
 			(profile.sources as Record<string, string>)[collector.id] = new Date().toISOString();
 			logger.debug(`Profile collector '${collector.id}' completed`);
+			results.push({
+				id: collector.id,
+				name: collector.name,
+				status: "collected",
+				fields: Object.keys(partial),
+			});
 		} catch (err: unknown) {
 			logger.debug(`Profile collector '${collector.id}' failed`, { error: err });
+			results.push({
+				id: collector.id,
+				name: collector.name,
+				status: "error",
+				error: err instanceof Error ? err.message : String(err),
+			});
 		}
 	}
 
 	await saveProfile(profile);
-	return profile;
+	return { profile, results };
 }
 
 const META_FIELDS = new Set(["sources", "observations", "updatedAt", "_fieldOwnership"]);
@@ -219,17 +250,44 @@ function hasValues(obj: Record<string, unknown> | undefined): boolean {
 	return Object.values(obj).some(v => v !== undefined && v !== null && v !== "");
 }
 
+const SOURCE_LABELS: Record<string, string> = {
+	github: "GitHub",
+	system: "System",
+	conversation: "Conversation",
+	git: "Git",
+	salesforce: "Salesforce",
+};
+
+function titleCase(id: string): string {
+	return id.charAt(0).toUpperCase() + id.slice(1);
+}
+
+/**
+ * Render a per-collector seed report so a no-op seed is diagnosable in-session
+ * (which sources ran, which were unavailable, which errored) instead of
+ * silently returning an empty template.
+ */
+export function renderSeedReport(results: SeedCollectorResult[]): string {
+	if (results.length === 0) return "";
+	const lines = ["\n## Seed Report\n"];
+	for (const r of results) {
+		if (r.status === "collected") {
+			const fields = r.fields && r.fields.length > 0 ? ` — ${r.fields.join(", ")}` : " — no fields";
+			lines.push(`- **${r.name}:** collected${fields}`);
+		} else if (r.status === "unavailable") {
+			lines.push(`- **${r.name}:** unavailable (skipped)`);
+		} else {
+			lines.push(`- **${r.name}:** error — ${r.error ?? "unknown error"}`);
+		}
+	}
+	return lines.join("\n");
+}
+
 export function renderProfileMarkdown(profile: UserProfile): string {
 	const sections: string[] = [];
 
 	sections.push("# User Profile\n");
-
-	const isEmpty = !profile.givenName && !profile.familyName && !profile.email && !profile.jobTitle;
-	if (isEmpty) {
-		sections.push("No profile data yet. Use `xcsh://user?seed=true` to populate from GitHub and system sources.\n");
-		sections.push("Profile facts can also be added progressively during conversation.\n");
-		return sections.join("\n");
-	}
+	const headerOnly = sections.length;
 
 	// Identity
 	const identityLines: string[] = [];
@@ -347,14 +405,24 @@ export function renderProfileMarkdown(profile: UserProfile): string {
 		}
 	}
 
-	// Sources
+	// No content sections were produced — show the seed hint instead of an
+	// empty shell (and never render an orphan Sources footer).
+	if (sections.length === headerOnly) {
+		sections.push(
+			"No profile data yet. Use `xcsh://user?seed=true` to populate from Salesforce, GitHub, git, and system sources.\n",
+		);
+		sections.push("Profile facts can also be added progressively during conversation.\n");
+		return sections.join("\n");
+	}
+
+	// Sources — render every recorded source timestamp, not just a fixed subset.
 	if (profile.sources && hasValues(profile.sources as unknown as Record<string, unknown>)) {
 		sections.push("\n---\n");
 		sections.push("**Sources:**");
 		const srcLines: string[] = [];
-		if (profile.sources.github) srcLines.push(`GitHub: ${profile.sources.github}`);
-		if (profile.sources.system) srcLines.push(`System: ${profile.sources.system}`);
-		if (profile.sources.conversation) srcLines.push(`Conversation: ${profile.sources.conversation}`);
+		for (const [id, ts] of Object.entries(profile.sources as Record<string, string>)) {
+			if (ts) srcLines.push(`${SOURCE_LABELS[id] ?? titleCase(id)}: ${ts}`);
+		}
 		sections.push(srcLines.join(" | "));
 		if (profile.updatedAt) sections.push(`\n*Last updated: ${profile.updatedAt}*`);
 	}

package/src/internal-urls/xcsh-protocol.ts

@@ -47,7 +47,8 @@ import extensionApiContent from "./extension-api.md" with { type: "text" };
 import { createTerraformResolver, type TerraformResolver } from "./terraform-resolve";
 import type { TerraformIndex } from "./terraform-types";
 import type { InternalResource, InternalUrl, ProtocolHandler } from "./types";
-import { loadProfile, renderProfileMarkdown, seedProfile } from "./user-profile";
+import type { UserProfile } from "./user-profile";
+import { loadProfile, renderProfileMarkdown, renderSeedReport, seedProfile } from "./user-profile";
 
 const SCHEME_PREFIX = "xcsh://";
 const ABOUT_ROUTE = "about";
@@ -386,8 +387,16 @@ export class InternalDocsProtocolHandler implements ProtocolHandler {
 		const params = new URLSearchParams(url.search);
 		const shouldSeed = params.get("seed") === "true";
 
-		const profile = shouldSeed ? await seedProfile() : await loadProfile();
-		const content = renderProfileMarkdown(profile);
+		let profile: UserProfile;
+		let seedReport = "";
+		if (shouldSeed) {
+			const seeded = await seedProfile();
+			profile = seeded.profile;
+			seedReport = renderSeedReport(seeded.results);
+		} else {
+			profile = await loadProfile();
+		}
+		const content = renderProfileMarkdown(profile) + seedReport;
 
 		const hasOwnership = profile._fieldOwnership && Object.keys(profile._fieldOwnership).length > 0;
 		const notes: string[] = [