@f5-sales-demo/xcsh 19.58.1 → 19.58.3

package/package.json

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

package/src/commands/worker.ts

@@ -23,7 +23,7 @@ import { initializeWithSettings } from "../discovery";
 import { createAgentSession } from "../sdk";
 import { activateTenantContext } from "../services/session-context-binding";
 import { ContextService } from "../services/xcsh-context";
-import { sessionKeyFromUrl } from "../services/xcsh-env";
+import { deriveTenantEnv } from "../services/xcsh-env";
 
 /** Mutable worker identity. Seeded from env at spawn (backward compat); replaced by a
  * late IPC bind on a pre-warmed spare. `null` fields fall back to env, then the "spare"
@@ -64,17 +64,13 @@ export function sessionInfoForWorker(): {
 		/* ContextService not initialized — fall through to the tenant key; contextBound stays false. */
 	}
 	apiUrl = apiUrl ?? process.env.XCSH_API_URL ?? null;
-	if (apiUrl) {
-		const key = sessionKeyFromUrl(apiUrl);
-		return { tenant: key?.tenant ?? null, env: key?.env ?? null, apiUrl, contextBound, sessionId };
-	}
-	// Contextless: advertise the tenant carried by the bind (or spawn env).
-	const raw = boundIdentity?.tenantKey ?? process.env.XCSH_SESSION_TENANT;
-	if (raw) {
-		const [tenant, env] = raw.split("|");
-		return { tenant: tenant || null, env: env || null, apiUrl: null, contextBound, sessionId };
-	}
-	return { tenant: null, env: null, apiUrl: null, contextBound, sessionId };
+	// Prefer the apiUrl-derived key (active context wins), but fall back to the
+	// tenant this worker was assigned (IPC bind or spawn env) so an apiUrl whose
+	// host we can't parse never blanks a KNOWN tenant — which would make the
+	// extension drop the bridge and show "No xcsh running for this tenant" (#1872).
+	const tenantKey = boundIdentity?.tenantKey ?? process.env.XCSH_SESSION_TENANT ?? null;
+	const { tenant, env } = deriveTenantEnv(apiUrl, tenantKey);
+	return { tenant, env, apiUrl, contextBound, sessionId };
 }
 
 /** Browser-automation tool set — identical scoping to `main.ts`'s extension path.

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.58.1",
-	"commit": "f72a3fa845f24642e4db4d84aa427bb2e2d64538",
-	"shortCommit": "f72a3fa",
+	"version": "19.58.3",
+	"commit": "1e0e9e203ce3f95f2e4bb1069f4371d9b7529e91",
+	"shortCommit": "1e0e9e2",
 	"branch": "main",
-	"tag": "v19.58.1",
-	"commitDate": "2026-07-05T13:33:19Z",
-	"buildDate": "2026-07-05T13:53:37.495Z",
+	"tag": "v19.58.3",
+	"commitDate": "2026-07-05T18:06:30Z",
+	"buildDate": "2026-07-05T18:27:55.948Z",
 	"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/f72a3fa845f24642e4db4d84aa427bb2e2d64538",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.58.1"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/1e0e9e203ce3f95f2e4bb1069f4371d9b7529e91",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.58.3"
 };

package/src/main.ts

@@ -815,7 +815,7 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 		// tenant), so the panel can lock its session and route per tenant.
 		{
 			const { ContextService } = await import("./services/xcsh-context");
-			const { sessionKeyFromUrl } = await import("./services/xcsh-env");
+			const { deriveTenantEnv } = await import("./services/xcsh-env");
 			const readInfo = () => {
 				let apiUrl: string | null = null;
 				let contextBound = false;
@@ -828,15 +828,13 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 				}
 				// Fall back to the env override when no context is active (env-only mode).
 				apiUrl = apiUrl ?? process.env.XCSH_API_URL ?? null;
-				const key = apiUrl ? sessionKeyFromUrl(apiUrl) : null;
+				// Prefer the apiUrl-derived key; fall back to the assigned tenant key so an
+				// unparseable apiUrl never blanks a known tenant (#1872). Same contract as
+				// the worker path (sessionInfoForWorker).
+				const tenantKey = process.env.XCSH_SESSION_TENANT ?? null;
+				const { tenant, env } = deriveTenantEnv(apiUrl, tenantKey);
 				// Interactive path has no per-tab XCSH_SESSION_ID; workers echo one, this doesn't.
-				return {
-					tenant: key?.tenant ?? null,
-					env: key?.env ?? null,
-					apiUrl,
-					contextBound,
-					sessionId: null,
-				};
+				return { tenant, env, apiUrl, contextBound, sessionId: null };
 			};
 			bridgeServer.setSessionInfo(readInfo);
 			ContextService.onContextChange(() => bridgeServer?.broadcastTenantChanged());

package/src/services/xcsh-env.ts

@@ -128,6 +128,31 @@ export function sessionKeyFromUrl(url: string | undefined): SessionKey | null {
 	return null;
 }
 
+/**
+ * Resolve the `{tenant, env}` a worker advertises to the extension's `hello`
+ * handshake. Prefers the session key parsed from `apiUrl` (the live/active
+ * context is authoritative) but falls back to the worker's assigned tenant key
+ * (`"tenant|env"`, from `boundIdentity.tenantKey` / `XCSH_SESSION_TENANT`) when
+ * `apiUrl` is absent OR its host doesn't parse to a key.
+ *
+ * The fallback is load-bearing (#1872): the extension's `liveTenants` filter
+ * keeps a bridge only when BOTH `tenant` and `env` are set, so returning
+ * `{tenant:null, env:null}` for a worker that KNOWS its tenant (e.g. an
+ * activated context whose stored `apiUrl` isn't `<tenant>.console.ves.volterra.io`)
+ * silently drops the bridge and the panel shows "No xcsh running for this tenant".
+ */
+export function deriveTenantEnv(
+	apiUrl: string | null,
+	tenantKey: string | null | undefined,
+): { tenant: string | null; env: string | null } {
+	const key = apiUrl ? sessionKeyFromUrl(apiUrl) : null;
+	const [assignedTenant, assignedEnv] = (tenantKey ?? "").split("|");
+	return {
+		tenant: key?.tenant ?? (assignedTenant || null),
+		env: key?.env ?? (assignedEnv || null),
+	};
+}
+
 /**
  * Reduce an API URL to its origin (`https://host[:port]`) — the canonical stored
  * form for a context endpoint.