Merge branch 'dev' into feature/heartbeat

# Conflicts:
#	src/app/App.svelte
#	src/app/store.svelte.ts
#	src/app/store.test.ts
#	src/features/workspaces/ui/WorkspaceCard.test.ts

1 files changed, 64 insertions, 64 deletions

diff --git a/src/features/mcp/logic/view-model.ts b/src/features/mcp/logic/view-model.ts
index 247f804..fdff78a 100644
--- a/src/features/mcp/logic/view-model.ts
+++ b/src/features/mcp/logic/view-model.ts
@@ -16,8 +16,8 @@ import type { McpServerInfo, McpServerState } from "@dispatch/transport-contract
 
 /** Outcome of `GET /conversations/:id/mcp`; `null` when no real conversation is focused. */
 export type McpStatusResult =
-	| { readonly ok: true; readonly cwd: string | null; readonly servers: readonly McpServerInfo[] }
-	| { readonly ok: false; readonly error: string };
+  | { readonly ok: true; readonly cwd: string | null; readonly servers: readonly McpServerInfo[] }
+  | { readonly ok: false; readonly error: string };
 
 export type LoadMcpStatus = () => Promise<McpStatusResult | null>;
 
@@ -26,18 +26,18 @@ export type LoadMcpStatus = () => Promise<McpStatusResult | null>;
 export type Badge = "success" | "warning" | "error" | "neutral";
 
 export interface McpServerView {
-	readonly id: string;
-	readonly state: McpServerState;
-	readonly statusLabel: string;
-	readonly badge: Badge;
-	/** True while the state is transient (show a spinner). */
-	readonly busy: boolean;
-	/** The error reason when `state === "error"`, else null. */
-	readonly error: string | null;
-	/** Number of tools discovered from this server. */
-	readonly toolCount: number;
-	/** Which config source the server was resolved from, else null. */
-	readonly configSource: string | null;
+  readonly id: string;
+  readonly state: McpServerState;
+  readonly statusLabel: string;
+  readonly badge: Badge;
+  /** True while the state is transient (show a spinner). */
+  readonly busy: boolean;
+  /** The error reason when `state === "error"`, else null. */
+  readonly error: string | null;
+  /** Number of tools discovered from this server. */
+  readonly toolCount: number;
+  /** Which config source the server was resolved from, else null. */
+  readonly configSource: string | null;
 }
 
 /**
@@ -47,42 +47,42 @@ export interface McpServerView {
  * → error, and `disconnected` (a stable idle state) → neutral.
  */
 export function viewMcpServer(server: McpServerInfo): McpServerView {
-	let statusLabel: string;
-	let badge: Badge;
-	let busy = false;
-	switch (server.state) {
-		case "connected":
-			statusLabel = "Connected";
-			badge = "success";
-			break;
-		case "connecting":
-			statusLabel = "Connecting…";
-			badge = "warning";
-			busy = true;
-			break;
-		case "disconnected":
-			statusLabel = "Disconnected";
-			badge = "neutral";
-			break;
-		case "error":
-			statusLabel = "Error";
-			badge = "error";
-			break;
-	}
-	return {
-		id: server.id,
-		state: server.state,
-		statusLabel,
-		badge,
-		busy,
-		error: server.state === "error" ? (server.error ?? "Failed to connect") : null,
-		toolCount: server.toolCount,
-		configSource: server.configSource ?? null,
-	};
+  let statusLabel: string;
+  let badge: Badge;
+  let busy = false;
+  switch (server.state) {
+    case "connected":
+      statusLabel = "Connected";
+      badge = "success";
+      break;
+    case "connecting":
+      statusLabel = "Connecting…";
+      badge = "warning";
+      busy = true;
+      break;
+    case "disconnected":
+      statusLabel = "Disconnected";
+      badge = "neutral";
+      break;
+    case "error":
+      statusLabel = "Error";
+      badge = "error";
+      break;
+  }
+  return {
+    id: server.id,
+    state: server.state,
+    statusLabel,
+    badge,
+    busy,
+    error: server.state === "error" ? (server.error ?? "Failed to connect") : null,
+    toolCount: server.toolCount,
+    configSource: server.configSource ?? null,
+  };
 }
 
 export function viewMcpServers(servers: readonly McpServerInfo[]): readonly McpServerView[] {
-	return servers.map(viewMcpServer);
+  return servers.map(viewMcpServer);
 }
 
 /**
@@ -90,21 +90,21 @@ export function viewMcpServers(servers: readonly McpServerInfo[]): readonly McpS
  * 1 error". Only non-zero buckets are listed.
  */
 export function summarizeMcpServers(servers: readonly McpServerInfo[]): string {
-	if (servers.length === 0) return "No MCP servers";
-	let connected = 0;
-	let connecting = 0;
-	let disconnected = 0;
-	let errored = 0;
-	for (const s of servers) {
-		if (s.state === "connected") connected++;
-		else if (s.state === "error") errored++;
-		else if (s.state === "connecting") connecting++;
-		else disconnected++;
-	}
-	const parts: string[] = [];
-	if (connected > 0) parts.push(`${connected} connected`);
-	if (connecting > 0) parts.push(`${connecting} connecting`);
-	if (disconnected > 0) parts.push(`${disconnected} disconnected`);
-	if (errored > 0) parts.push(`${errored} error${errored === 1 ? "" : "s"}`);
-	return parts.join(", ");
+  if (servers.length === 0) return "No MCP servers";
+  let connected = 0;
+  let connecting = 0;
+  let disconnected = 0;
+  let errored = 0;
+  for (const s of servers) {
+    if (s.state === "connected") connected++;
+    else if (s.state === "error") errored++;
+    else if (s.state === "connecting") connecting++;
+    else disconnected++;
+  }
+  const parts: string[] = [];
+  if (connected > 0) parts.push(`${connected} connected`);
+  if (connecting > 0) parts.push(`${connecting} connecting`);
+  if (disconnected > 0) parts.push(`${disconnected} disconnected`);
+  if (errored > 0) parts.push(`${errored} error${errored === 1 ? "" : "s"}`);
+  return parts.join(", ");
 }