@f5xc-salesdemos/xcsh 18.44.0 → 18.46.0

package/package.json

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

package/src/cli/args.ts

@@ -33,6 +33,7 @@ export interface Args {
 	models?: string[];
 	tools?: string[];
 	noTools?: boolean;
+	noMcp?: boolean;
 	noLsp?: boolean;
 	noPty?: boolean;
 	hooks?: string[];
@@ -114,6 +115,8 @@ export function parseArgs(args: string[], extensionFlags?: Map<string, { type: "
 			result.noLsp = true;
 		} else if (arg === "--no-pty") {
 			result.noPty = true;
+		} else if (arg === "--no-mcp") {
+			result.noMcp = true;
 		} else if (arg === "--tools" && i + 1 < args.length) {
 			const toolNames = args[++i]
 				.split(",")

package/src/commands/launch.ts

@@ -76,6 +76,9 @@ export default class Index extends Command {
 		"no-tools": Flags.boolean({
 			description: "Disable all built-in tools",
 		}),
+		"no-mcp": Flags.boolean({
+			description: "Disable MCP server discovery and tools",
+		}),
 		"no-lsp": Flags.boolean({
 			description: "Disable LSP tools, formatting, and diagnostics",
 		}),

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "18.44.0",
-	"commit": "f7fdd6b7707603c64fc09e1ad591af368250a1a2",
-	"shortCommit": "f7fdd6b",
+	"version": "18.46.0",
+	"commit": "c70ff40053bde7f2b4ba3a16404328dd63afcc17",
+	"shortCommit": "c70ff40",
 	"branch": "main",
-	"tag": "v18.44.0",
-	"commitDate": "2026-05-06T02:37:32Z",
-	"buildDate": "2026-05-06T02:56:20.883Z",
+	"tag": "v18.46.0",
+	"commitDate": "2026-05-06T05:14:35Z",
+	"buildDate": "2026-05-06T05:34:34.075Z",
 	"dirty": false,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/f7fdd6b7707603c64fc09e1ad591af368250a1a2",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.44.0"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/c70ff40053bde7f2b4ba3a16404328dd63afcc17",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.46.0"
 };

package/src/main.ts

@@ -56,7 +56,6 @@ import type { AgentSession } from "./session/agent-session";
 import { resolveResumableSession, type SessionInfo, SessionManager } from "./session/session-manager";
 import { resolvePromptInput } from "./system-prompt";
 import type { LspStartupServerInfo } from "./tools";
-import { getChangelogPath, getNewEntries, parseChangelog } from "./utils/changelog";
 import type { EventBus } from "./utils/event-bus";
 
 async function checkForNewVersion(currentVersion: string): Promise<string | undefined> {
@@ -149,7 +148,6 @@ const INITIAL_UPDATE_CHECK_TIMEOUT_MS = 500;
 async function runInteractiveMode(
 	session: AgentSession,
 	version: string,
-	changelogStatus: { hasNew: boolean; version: string } | undefined,
 	notifs: (InteractiveModeNotify | null)[],
 	versionCheckPromise: Promise<string | undefined>,
 	initialMessages: string[],
@@ -171,7 +169,6 @@ async function runInteractiveMode(
 	const mode = new InteractiveMode(
 		session,
 		version,
-		changelogStatus,
 		initialUpdateStatus,
 		setExtensionUIContext,
 		lspServers,
@@ -256,31 +253,6 @@ async function promptForkSession(session: SessionInfo): Promise<boolean> {
 	}
 }
 
-async function getChangelogForDisplay(parsed: Args): Promise<{ hasNew: boolean; version: string } | undefined> {
-	if (parsed.continue || parsed.resume) {
-		return undefined;
-	}
-
-	const lastVersion = settings.get("lastChangelogVersion");
-	const changelogPath = getChangelogPath();
-	const entries = await parseChangelog(changelogPath);
-
-	if (!lastVersion) {
-		if (entries.length > 0) {
-			settings.set("lastChangelogVersion", VERSION);
-			return { hasNew: true, version: VERSION };
-		}
-	} else {
-		const newEntries = getNewEntries(entries, lastVersion);
-		if (newEntries.length > 0) {
-			settings.set("lastChangelogVersion", VERSION);
-			return { hasNew: true, version: VERSION };
-		}
-	}
-
-	return undefined;
-}
-
 async function createSessionManager(parsed: Args, cwd: string): Promise<SessionManager | undefined> {
 	if (parsed.fork) {
 		if (parsed.noSession) {
@@ -556,6 +528,10 @@ async function buildSessionOptions(
 		options.toolNames = parsed.tools;
 	}
 
+	if (parsed.noTools || parsed.noMcp) {
+		options.enableMCP = false;
+	}
+
 	if (parsed.noLsp) {
 		options.enableLsp = false;
 	}
@@ -890,8 +866,6 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 		await runAcpMode(session, createAcpSession);
 	} else if (isInteractive) {
 		const versionCheckPromise = checkForNewVersion(VERSION).catch(() => undefined);
-		logger.time("main:getChangelogForDisplay");
-		const changelogStatus = await getChangelogForDisplay(parsedArgs);
 
 		const scopedModelsForDisplay = sessionOptions.scopedModels ?? scopedModels;
 		if (scopedModelsForDisplay.length > 0) {
@@ -915,7 +889,6 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 		await runInteractiveMode(
 			session,
 			VERSION,
-			changelogStatus,
 			notifs,
 			versionCheckPromise,
 			parsedArgs.messages,

package/src/modes/components/welcome-checks.ts

@@ -331,6 +331,23 @@ export async function checkSalesforceStatus(_cwd: string): Promise<WelcomeSalesf
 	}
 }
 
+export type GitHubCheckState = "connected" | "auth_error";
+
+export interface WelcomeGitHubStatus {
+	state: GitHubCheckState;
+}
+
+export async function checkGitHubStatus(): Promise<WelcomeGitHubStatus | undefined> {
+	try {
+		if (!$which("gh")) return undefined;
+		const result = await $`gh auth status`.quiet().nothrow();
+		return { state: result.exitCode === 0 ? "connected" : "auth_error" };
+	} catch (err) {
+		logger.warn("GitHub startup check failed", { error: String(err) });
+		return { state: "auth_error" };
+	}
+}
+
 export type ServiceState = "connected" | "unauthenticated" | "unavailable";
 
 export interface ServiceStatus {
@@ -372,3 +389,13 @@ export function mapSalesforceStatus(status: WelcomeSalesforceStatus | undefined)
 			return { name: "Salesforce", state: "unauthenticated", hint: "run: sf org login web" };
 	}
 }
+
+export function mapGitHubStatus(status: WelcomeGitHubStatus | undefined): ServiceStatus {
+	if (!status) return { name: "GitHub", state: "unavailable", hint: "not installed" };
+	switch (status.state) {
+		case "connected":
+			return { name: "GitHub", state: "connected" };
+		case "auth_error":
+			return { name: "GitHub", state: "unauthenticated", hint: "run: gh auth login" };
+	}
+}

package/src/modes/components/welcome.ts

@@ -2,47 +2,30 @@ import { type Component, padding, truncateToWidth, visibleWidth } from "@f5xc-sa
 import { APP_NAME } from "@f5xc-salesdemos/pi-utils";
 import { theme } from "../../modes/theme/theme";
 import { formatStatusIcon } from "../../services/f5xc-context-indicators";
-import type { ModelStatus, WelcomeContextStatus, WelcomeGitLabStatus, WelcomeSalesforceStatus } from "./welcome-checks";
+import type { ModelStatus, ServiceStatus } from "./welcome-checks";
 
 export interface UpdateStatus {
 	available: boolean;
 	latestVersion?: string;
 }
 
-export interface ChangelogStatus {
-	hasNew: boolean;
-	version: string;
-}
-
 export class WelcomeComponent implements Component {
 	constructor(
 		private readonly version: string,
 		private modelStatus: ModelStatus,
-		private contextStatus?: WelcomeContextStatus,
+		private services: ServiceStatus[] = [],
 		private updateStatus?: UpdateStatus,
-		private changelogStatus?: ChangelogStatus,
-		private gitlabStatus?: WelcomeGitLabStatus,
-		private salesforceStatus?: WelcomeSalesforceStatus,
 	) {}
 	invalidate(): void {}
 	setModelStatus(status: ModelStatus): void {
 		this.modelStatus = status;
 	}
-	setContextStatus(status: WelcomeContextStatus | undefined): void {
-		this.contextStatus = status;
+	setServices(services: ServiceStatus[]): void {
+		this.services = services;
 	}
 	setUpdateStatus(status: UpdateStatus | undefined): void {
 		this.updateStatus = status;
 	}
-	setChangelogStatus(status: ChangelogStatus | undefined): void {
-		this.changelogStatus = status;
-	}
-	setGitLabStatus(status: WelcomeGitLabStatus | undefined): void {
-		this.gitlabStatus = status;
-	}
-	setSalesforceStatus(status: WelcomeSalesforceStatus | undefined): void {
-		this.salesforceStatus = status;
-	}
 
 	render(termWidth: number): string[] {
 		const minLeftCol = 48;
@@ -63,7 +46,8 @@ export class WelcomeComponent implements Component {
 				? preferredLeftCol
 				: Math.max(minLeftCol, dualContentWidth - idealRight);
 		const dualRightCol = Math.max(0, dualContentWidth - dualLeftCol);
-		const showRightColumn = dualLeftCol >= minLeftCol && dualRightCol >= minRightCol;
+		// Only show dual column when both columns have enough room for their content
+		const showRightColumn = dualLeftCol >= minLeftCol && dualRightCol >= Math.max(minRightCol, naturalRight);
 		const leftCol = showRightColumn ? dualLeftCol : boxWidth - 2;
 		const rightCol = showRightColumn ? dualRightCol : 0;
 
@@ -95,7 +79,10 @@ export class WelcomeComponent implements Component {
 		const logoBlockPad = Math.max(0, Math.floor((leftCol - logoMaxWidth) / 2));
 		const logoPadStr = padding(logoBlockPad);
 		const leftLines = [...logoColored.map(l => logoPadStr + l), ""];
-		const rightLines = this.#buildStatusLines(rightCol);
+		const rightLines = this.#buildStatusLines(showRightColumn ? rightCol : leftCol);
+		if (!showRightColumn) {
+			leftLines.push(...rightLines);
+		}
 		const border = (s: string) => theme.fg("borderMuted", s);
 		const hChar = theme.boxRound.horizontal;
 		const h = border(hChar);
@@ -135,20 +122,11 @@ export class WelcomeComponent implements Component {
 
 	#measureStatusWidth(): number {
 		const lines: string[] = [" Model Provider", ...this.#renderModelStatus()];
-		if (this.contextStatus) {
-			lines.push(" F5 XC Context", ...this.#renderContextStatus());
-		}
-		if (this.gitlabStatus) {
-			lines.push(" GitLab", ...this.#renderGitLabStatus());
-		}
-		if (this.salesforceStatus) {
-			lines.push(" Salesforce", ...this.#renderSalesforceStatus());
+		for (const svc of this.services) {
+			lines.push(this.#renderServiceLine(svc));
 		}
 		if (this.#showUpdateSection()) {
-			lines.push(" Update Available", ...this.#renderUpdateStatus());
-		}
-		if (this.#showChangelogSection()) {
-			lines.push(" What's New", ...this.#renderChangelogStatus());
+			lines.push(this.#renderUpdateLine());
 		}
 		return Math.max(...lines.map(l => visibleWidth(l)));
 	}
@@ -161,41 +139,16 @@ export class WelcomeComponent implements Component {
 		lines.push(` ${theme.bold(theme.fg("contentAccent", "Model Provider"))}`);
 		lines.push(...this.#renderModelStatus());
 		lines.push("");
-		if (this.contextStatus) {
+		if (this.services.length > 0 || this.#showUpdateSection()) {
 			lines.push(separator);
-			lines.push("");
-			lines.push(` ${theme.bold(theme.fg("contentAccent", "F5 XC Context"))}`);
-			lines.push(...this.#renderContextStatus());
-			lines.push("");
-		}
-		if (this.gitlabStatus) {
-			lines.push(separator);
-			lines.push("");
-			lines.push(` ${theme.bold(theme.fg("contentAccent", "GitLab"))}`);
-			lines.push(...this.#renderGitLabStatus());
-			lines.push("");
-		}
-		if (this.salesforceStatus) {
-			lines.push(separator);
-			lines.push("");
-			lines.push(` ${theme.bold(theme.fg("contentAccent", "Salesforce"))}`);
-			lines.push(...this.#renderSalesforceStatus());
-			lines.push("");
-		}
-		if (this.#showUpdateSection()) {
-			lines.push(separator);
-			lines.push("");
-			lines.push(` ${theme.bold(theme.fg("contentAccent", "Update Available"))}`);
-			lines.push(...this.#renderUpdateStatus());
-			lines.push("");
-		}
-		if (this.#showChangelogSection()) {
-			lines.push(separator);
-			lines.push("");
-			lines.push(` ${theme.bold(theme.fg("contentAccent", "What's New"))}`);
-			lines.push(...this.#renderChangelogStatus());
-			lines.push("");
+			for (const svc of this.services) {
+				lines.push(this.#renderServiceLine(svc));
+			}
+			if (this.#showUpdateSection()) {
+				lines.push(this.#renderUpdateLine());
+			}
 		}
+		lines.push("");
 		return lines;
 	}
 
@@ -203,25 +156,18 @@ export class WelcomeComponent implements Component {
 		return this.updateStatus?.available === true;
 	}
 
-	#showChangelogSection(): boolean {
-		return this.changelogStatus?.hasNew === true;
+	#renderServiceLine(service: ServiceStatus): string {
+		if (service.state === "connected") {
+			return ` ${formatStatusIcon("connected")} ${theme.fg("muted", service.name)}`;
+		}
+		const hint = service.hint ?? "";
+		return ` ${formatStatusIcon("warning")} ${theme.fg("muted", service.name)}  ${theme.fg("dim", hint)}`;
 	}
 
-	#renderUpdateStatus(): string[] {
+	#renderUpdateLine(): string {
 		const latest = this.updateStatus?.latestVersion;
 		const label = latest ? `v${latest}` : "new version";
-		return [
-			` ${theme.fg("warning", "\u2191")} ${theme.fg("muted", label)}`,
-			`   ${theme.fg("dim", "Run")} ${theme.fg("contentAccent", "xcsh update")}`,
-		];
-	}
-
-	#renderChangelogStatus(): string[] {
-		const v = this.changelogStatus?.version ?? this.version;
-		return [
-			` ${theme.fg("success", "\u2605")} ${theme.fg("muted", `v${v}`)}`,
-			`   ${theme.fg("dim", "Run")} ${theme.fg("contentAccent", "/changelog")}`,
-		];
+		return ` ${theme.fg("warning", "↑")} ${theme.fg("muted", label)}  ${theme.fg("dim", "run: xcsh update")}`;
 	}
 
 	#renderModelStatus(): string[] {
@@ -243,89 +189,6 @@ export class WelcomeComponent implements Component {
 		}
 	}
 
-	#renderContextStatus(): string[] {
-		if (!this.contextStatus) return [];
-		const { state, name } = this.contextStatus;
-		const n = name ?? "(unknown)";
-		switch (state) {
-			case "connected":
-				return [` ${formatStatusIcon("connected")} ${theme.fg("muted", n)}`];
-			case "auth_error":
-				return [
-					` ${formatStatusIcon("error")} ${theme.fg("muted", n)} ${theme.fg("error", "\u2014 token invalid")}`,
-					`   ${theme.fg("dim", "Run /context to update")}`,
-				];
-			case "offline":
-				if (this.contextStatus?.errorClass === "url_not_found") {
-					return [
-						` ${formatStatusIcon("error")} ${theme.fg("muted", n)} ${theme.fg("error", "\u2014 tenant not found")}`,
-						`   ${theme.fg("dim", "Recreate with /context create or check with /context show")}`,
-					];
-				}
-				return [
-					` ${formatStatusIcon("warning")} ${theme.fg("muted", n)} ${theme.fg("warning", "\u2014 unreachable")}`,
-					`   ${theme.fg("dim", "Check network, /context")}`,
-				];
-			case "no_context":
-				return [
-					` ${formatStatusIcon("warning")} ${theme.fg("warning", "No context configured")}`,
-					`   ${theme.fg("dim", "Run /context create <name> <url> <token>")}`,
-				];
-		}
-	}
-
-	#renderGitLabStatus(): string[] {
-		if (!this.gitlabStatus) return [];
-		const { state, project } = this.gitlabStatus;
-		switch (state) {
-			case "connected":
-				return [` ${formatStatusIcon("connected")} ${theme.fg("muted", project ?? "configured")}`];
-			case "auth_error":
-				return [
-					` ${formatStatusIcon("error")} ${theme.fg("error", "Not authenticated")}`,
-					`   ${theme.fg("dim", "Run")} ${theme.fg("contentAccent", "glab auth login")}`,
-				];
-			case "not_configured":
-				return [
-					` ${formatStatusIcon("warning")} ${theme.fg("warning", "No project configured")}`,
-					`   ${theme.fg("dim", "Run glab_setup action save_project project GROUP/REPO")}`,
-				];
-			case "project_inaccessible":
-				return [
-					` ${formatStatusIcon("warning")} ${theme.fg("muted", project ?? "unknown")} ${theme.fg("warning", "\u2014 access denied")}`,
-					`   ${theme.fg("dim", "Check permissions or run glab_setup with action save_project")}`,
-				];
-			case "not_installed":
-				return [` ${formatStatusIcon("warning")} ${theme.fg("warning", "glab CLI not installed")}`];
-		}
-	}
-
-	#renderSalesforceStatus(): string[] {
-		if (!this.salesforceStatus) return [];
-		const { state, username, orgAlias } = this.salesforceStatus;
-		switch (state) {
-			case "connected":
-				return [
-					` ${formatStatusIcon("connected")} ${theme.fg("muted", orgAlias ?? "org")}${username ? ` ${theme.fg("dim", `(${username})`)}` : ""}`,
-				];
-			case "not_configured":
-				return [
-					` ${formatStatusIcon("warning")} ${theme.fg("warning", "Authenticated (no default org)")}`,
-					`   ${theme.fg("dim", "Run")} ${theme.fg("contentAccent", "sf_setup")} ${theme.fg("dim", "with action set_default")}`,
-				];
-			case "auth_error":
-				return [
-					` ${formatStatusIcon("error")} ${theme.fg("error", "Not authenticated")}`,
-					`   ${theme.fg("dim", "Run")} ${theme.fg("contentAccent", "sf org login web --set-default --alias SFDC")}`,
-				];
-			case "session_expired":
-				return [
-					` ${formatStatusIcon("warning")} ${theme.fg("muted", orgAlias ?? "org")} ${theme.fg("warning", "— session expired")}`,
-					`   ${theme.fg("dim", "Re-authenticate with")} ${theme.fg("contentAccent", "sf org login web --set-default")}`,
-				];
-		}
-	}
-
 	#f5ColorLine(line: string): string {
 		const red = "\x1b[38;5;160m";
 		const white = "\x1b[1;37m";

package/src/modes/interactive-mode.ts

@@ -49,8 +49,17 @@ import type { HookSelectorComponent } from "./components/hook-selector";
 import type { PythonExecutionComponent } from "./components/python-execution";
 import { StatusLineComponent } from "./components/status-line";
 import type { ToolExecutionHandle } from "./components/tool-execution";
-import { type ChangelogStatus, type UpdateStatus, WelcomeComponent } from "./components/welcome";
-import { checkGitLabStatus, checkSalesforceStatus, runWelcomeChecks } from "./components/welcome-checks";
+import { type UpdateStatus, WelcomeComponent } from "./components/welcome";
+import {
+	checkGitHubStatus,
+	checkGitLabStatus,
+	checkSalesforceStatus,
+	mapContextStatus,
+	mapGitHubStatus,
+	mapGitLabStatus,
+	mapSalesforceStatus,
+	runWelcomeChecks,
+} from "./components/welcome-checks";
 import { BtwController } from "./controllers/btw-controller";
 import { CommandController } from "./controllers/command-controller";
 import { EventController } from "./controllers/event-controller";
@@ -161,7 +170,6 @@ export class InteractiveMode implements InteractiveModeContext {
 	#pendingSlashCommands: SlashCommand[] = [];
 	#cleanupUnsubscribe?: () => void;
 	readonly #version: string;
-	readonly #changelogStatus: ChangelogStatus | undefined;
 	readonly #initialUpdateStatus: UpdateStatus | undefined;
 	#planModePreviousTools: string[] | undefined;
 	#planModePreviousModelState: { model: Model; thinkingLevel?: ThinkingLevel } | undefined;
@@ -193,7 +201,6 @@ export class InteractiveMode implements InteractiveModeContext {
 	constructor(
 		session: AgentSession,
 		version: string,
-		changelogStatus: ChangelogStatus | undefined = undefined,
 		initialUpdateStatus: UpdateStatus | undefined = undefined,
 		setToolUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void = () => {},
 		lspServers?: import("../tools").LspStartupServerInfo[],
@@ -206,7 +213,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.keybindings = KeybindingsManager.inMemory();
 		this.agent = session.agent;
 		this.#version = version;
-		this.#changelogStatus = changelogStatus;
 		this.#initialUpdateStatus = initialUpdateStatus;
 		this.#toolUiContextSetter = setToolUIContext;
 		this.lspServers = lspServers;
@@ -310,13 +316,14 @@ export class InteractiveMode implements InteractiveModeContext {
 			getProjectDir(),
 		);
 
-		// Run blocking welcome screen status checks (model + context + gitlab + salesforce) in parallel
-		const [welcomeResult, gitlabStatus, salesforceStatus] = await Promise.all([
+		// Run blocking welcome screen status checks (model + context + gitlab + github + salesforce) in parallel
+		const [welcomeResult, gitlabStatus, salesforceStatus, githubStatus] = await Promise.all([
 			logger.time("InteractiveMode.init:welcomeChecks", () =>
 				runWelcomeChecks(this.session.model, this.session.modelRegistry.authStorage),
 			),
 			checkGitLabStatus(getProjectDir()).catch(() => undefined),
 			checkSalesforceStatus(getProjectDir()).catch(() => undefined),
+			checkGitHubStatus().catch(() => undefined),
 		]);
 
 		const startupQuiet = settings.get("startup.quiet");
@@ -329,15 +336,21 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 
 		if (!startupQuiet) {
-			// Welcome box owns all startup notifications (model, context, update, changelog)
+			// Welcome box owns all startup notifications (model, services, update)
+			const services =
+				welcomeResult.model.state === "connected"
+					? [
+							mapContextStatus(welcomeResult.context ?? { state: "no_context" }),
+							mapGitLabStatus(gitlabStatus),
+							mapGitHubStatus(githubStatus),
+							mapSalesforceStatus(salesforceStatus),
+						]
+					: [];
 			this.#welcomeComponent = new WelcomeComponent(
 				this.#version,
 				welcomeResult.model,
-				welcomeResult.context,
+				services,
 				this.#initialUpdateStatus,
-				this.#changelogStatus,
-				gitlabStatus,
-				salesforceStatus,
 			);
 
 			// Setup UI layout