generated from nhcarrigan/template
b745100bd5
## Summary This PR covers the full audit of Claude CLI changes from 2.1.50 to 2.1.53, plus a batch of bug fixes, new features, and maintenance work identified during that review. ### New Features - **Workspace trust gate** — detects hooks, MCP servers, and custom commands in a workspace before connecting; persists trust decisions so users aren't prompted repeatedly - **Custom background image** — users can set a background image with configurable opacity; character panel and compact mode go transparent when active - **Draggable tab reordering** — conversation tabs can be reordered via pointer-event drag-and-drop (HTML5 drag is intercepted by Tauri/WebView2, so pointer events are used instead) - **Org UUID in account info** — exposes the org UUID from Claude auth status ### Bug Fixes - **Unread dot false positives** — initialise unread counts on mount to prevent all tabs showing the blue dot after toggling the file editor (Closes #164) - **Watchdog for hung WSL bridge** — detects connections that never receive `system:init` and kills the stale process after 1 minute (Closes #166) - **Suppress terminal window flash on Windows** — applies `CREATE_NO_WINDOW` to all subprocesses via a `HideWindow` trait extension (Closes #165) - **HTML escaping in markdown renderer** — escape `<` and `>` in `codespan` and `html` renderer callbacks to prevent raw HTML injection (Closes #169) ### Maintenance - Verify stream-JSON handles tool results above the 50K threshold correctly (Closes #162) - Reviewed hook security fixes from CLI 2.1.51 — not applicable to our setup (Closes #163) - Expose org UUID from `claude auth status` (Closes #160) - Clean up Svelte and Vite build warnings (`a11y_click_events_have_key_events`, `state_referenced_locally`, `non_reactive_update`, `codeSplitting`, chunk size, CodeMirror dynamic import) - Update all npm dependencies to latest compatible versions with exact pinning (Closes #81, Closes #82, Closes #83, Closes #84, Closes #85, Closes #86, Closes #87, Closes #90, Closes #91, Closes #93, Closes #94, Closes #95, Closes #96, Closes #97, Closes #98, Closes #99, Closes #101, Closes #141, Closes #142, Closes #143, Closes #145, Closes #146, Closes #147) - Run `cargo update` to bring Cargo.lock up to date ### Closes Closes #160 Closes #162 Closes #163 Closes #164 Closes #165 Closes #166 Closes #167 Closes #168 Closes #169 Closes #81 Closes #82 Closes #83 Closes #84 Closes #85 Closes #86 Closes #87 Closes #90 Closes #91 Closes #93 Closes #94 Closes #95 Closes #96 Closes #97 Closes #98 Closes #99 Closes #101 Closes #141 Closes #142 Closes #143 Closes #145 Closes #146 Closes #147 ✨ This PR was created with help from Hikari~ 🌸 Reviewed-on: #171 Co-authored-by: Hikari <hikari@nhcarrigan.com> Co-committed-by: Hikari <hikari@nhcarrigan.com>
417 lines
15 KiB
Svelte
417 lines
15 KiB
Svelte
<script lang="ts">
|
|
import { invoke } from "@tauri-apps/api/core";
|
|
import { onMount } from "svelte";
|
|
import { Trash2, RefreshCw, Server, Globe, Terminal } from "lucide-svelte";
|
|
|
|
interface Props {
|
|
onClose: () => void;
|
|
}
|
|
|
|
interface McpServerInfo {
|
|
name: string;
|
|
command: string | null;
|
|
url: string | null;
|
|
transport: string; // "stdio", "http", or "sse"
|
|
env: Record<string, string> | null;
|
|
status: string | null; // "Connected" or "Failed to connect"
|
|
}
|
|
|
|
const { onClose }: Props = $props();
|
|
|
|
let servers = $state<McpServerInfo[]>([]);
|
|
let isLoading = $state(true);
|
|
let error = $state<string | null>(null);
|
|
let selectedServer = $state<McpServerInfo | null>(null);
|
|
let isLoadingDetails = $state(false);
|
|
let actionInProgress = $state<string | null>(null);
|
|
let showAddForm = $state(false);
|
|
let serverDetails = $state<string>("");
|
|
|
|
// Add server form fields
|
|
let newServerName = $state("");
|
|
let newServerUrl = $state("");
|
|
let newServerTransport = $state("stdio");
|
|
let isAdding = $state(false);
|
|
|
|
async function loadServers(): Promise<void> {
|
|
try {
|
|
isLoading = true;
|
|
error = null;
|
|
servers = await invoke<McpServerInfo[]>("list_mcp_servers");
|
|
} catch (e) {
|
|
error = `Failed to load MCP servers: ${e}`;
|
|
console.error(error);
|
|
} finally {
|
|
isLoading = false;
|
|
}
|
|
}
|
|
|
|
async function loadServerDetails(name: string): Promise<void> {
|
|
try {
|
|
isLoadingDetails = true;
|
|
error = null;
|
|
selectedServer = await invoke<McpServerInfo>("get_mcp_server", { name });
|
|
serverDetails = await invoke<string>("get_mcp_server_details", { name });
|
|
} catch (e) {
|
|
error = `Failed to load server details: ${e}`;
|
|
console.error(error);
|
|
} finally {
|
|
isLoadingDetails = false;
|
|
}
|
|
}
|
|
|
|
async function removeServer(name: string): Promise<void> {
|
|
try {
|
|
actionInProgress = name;
|
|
error = null;
|
|
await invoke("remove_mcp_server", { name });
|
|
if (selectedServer?.name === name) {
|
|
selectedServer = null;
|
|
serverDetails = "";
|
|
}
|
|
await loadServers();
|
|
} catch (e) {
|
|
error = `Failed to remove server: ${e}`;
|
|
console.error(error);
|
|
} finally {
|
|
actionInProgress = null;
|
|
}
|
|
}
|
|
|
|
async function addServer(): Promise<void> {
|
|
if (!newServerName.trim() || !newServerUrl.trim()) return;
|
|
|
|
try {
|
|
isAdding = true;
|
|
error = null;
|
|
await invoke("add_mcp_server", {
|
|
name: newServerName.trim(),
|
|
commandOrUrl: newServerUrl.trim(),
|
|
transport: newServerTransport,
|
|
envVars: null,
|
|
headers: null,
|
|
});
|
|
newServerName = "";
|
|
newServerUrl = "";
|
|
newServerTransport = "stdio";
|
|
showAddForm = false;
|
|
await loadServers();
|
|
} catch (e) {
|
|
error = `Failed to add server: ${e}`;
|
|
console.error(error);
|
|
} finally {
|
|
isAdding = false;
|
|
}
|
|
}
|
|
|
|
function getTransportIcon(transport: string) {
|
|
switch (transport) {
|
|
case "http":
|
|
return Globe;
|
|
case "stdio":
|
|
return Terminal;
|
|
case "sse":
|
|
return Server;
|
|
default:
|
|
return Server;
|
|
}
|
|
}
|
|
|
|
function getTransportColor(transport: string) {
|
|
switch (transport) {
|
|
case "http":
|
|
return "text-blue-400";
|
|
case "stdio":
|
|
return "text-green-400";
|
|
case "sse":
|
|
return "text-purple-400";
|
|
default:
|
|
return "text-[var(--text-secondary)]";
|
|
}
|
|
}
|
|
|
|
onMount(() => {
|
|
loadServers();
|
|
});
|
|
</script>
|
|
|
|
<div
|
|
class="fixed top-0 right-0 h-full w-[700px] bg-[var(--bg-primary)] border-l border-[var(--accent-primary)]/30 shadow-2xl flex flex-col z-50"
|
|
>
|
|
<!-- Header -->
|
|
<div class="flex items-center justify-between p-4 border-b border-[var(--accent-primary)]/30">
|
|
<div class="flex items-center gap-3">
|
|
<div class="text-[var(--accent-primary)]">
|
|
<Server class="w-6 h-6" />
|
|
</div>
|
|
<div>
|
|
<h2 class="text-lg font-semibold text-[var(--text-primary)]">MCP Server Management</h2>
|
|
<p class="text-xs text-[var(--text-secondary)]">
|
|
{servers.length} server{servers.length !== 1 ? "s" : ""} configured
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<button
|
|
onclick={onClose}
|
|
class="text-[var(--text-secondary)] hover:text-[var(--text-primary)] transition-colors p-1 rounded-lg hover:bg-[var(--bg-secondary)]"
|
|
aria-label="Close MCP panel"
|
|
>
|
|
<svg
|
|
xmlns="http://www.w3.org/2000/svg"
|
|
class="h-5 w-5"
|
|
viewBox="0 0 20 20"
|
|
fill="currentColor"
|
|
>
|
|
<path
|
|
fill-rule="evenodd"
|
|
d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
|
|
clip-rule="evenodd"
|
|
/>
|
|
</svg>
|
|
</button>
|
|
</div>
|
|
|
|
<!-- Add Server Button -->
|
|
<div class="p-4 border-b border-[var(--border-color)]">
|
|
<button
|
|
onclick={() => (showAddForm = !showAddForm)}
|
|
class="w-full px-4 py-2 bg-[var(--accent-primary)] text-white rounded-lg text-sm font-medium hover:opacity-80 transition-opacity flex items-center justify-center gap-2"
|
|
>
|
|
<Server class="w-4 h-4" />
|
|
{showAddForm ? "Cancel" : "Add New Server"}
|
|
</button>
|
|
</div>
|
|
|
|
<!-- Add Server Form -->
|
|
{#if showAddForm}
|
|
<div
|
|
class="mx-4 mt-4 p-4 bg-[var(--bg-secondary)]/50 border border-[var(--border-color)] rounded-lg"
|
|
>
|
|
<h3 class="text-sm font-medium text-[var(--text-primary)] mb-3">Add MCP Server</h3>
|
|
<div class="space-y-3">
|
|
<div>
|
|
<label
|
|
for="mcp-new-name"
|
|
class="text-xs text-[var(--text-secondary)] uppercase tracking-wider block mb-1"
|
|
>Server Name</label
|
|
>
|
|
<input
|
|
id="mcp-new-name"
|
|
type="text"
|
|
bind:value={newServerName}
|
|
placeholder="my-server"
|
|
class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] text-sm focus:outline-none focus:border-[var(--accent-primary)]"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="mcp-new-transport"
|
|
class="text-xs text-[var(--text-secondary)] uppercase tracking-wider block mb-1"
|
|
>Transport</label
|
|
>
|
|
<select
|
|
id="mcp-new-transport"
|
|
bind:value={newServerTransport}
|
|
class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] text-sm focus:outline-none focus:border-[var(--accent-primary)]"
|
|
>
|
|
<option value="stdio">STDIO</option>
|
|
<option value="http">HTTP</option>
|
|
<option value="sse">SSE</option>
|
|
</select>
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="mcp-new-url"
|
|
class="text-xs text-[var(--text-secondary)] uppercase tracking-wider block mb-1"
|
|
>
|
|
{newServerTransport === "stdio" ? "Command" : "URL"}
|
|
</label>
|
|
<input
|
|
id="mcp-new-url"
|
|
type="text"
|
|
bind:value={newServerUrl}
|
|
placeholder={newServerTransport === "stdio"
|
|
? "npx my-mcp-server"
|
|
: "https://mcp.example.com"}
|
|
class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] text-sm focus:outline-none focus:border-[var(--accent-primary)]"
|
|
/>
|
|
</div>
|
|
<button
|
|
onclick={addServer}
|
|
disabled={isAdding || !newServerName.trim() || !newServerUrl.trim()}
|
|
class="w-full px-4 py-2 bg-[var(--accent-primary)] text-white rounded-lg text-sm font-medium hover:opacity-80 disabled:opacity-40 disabled:cursor-not-allowed flex items-center justify-center gap-2"
|
|
>
|
|
{#if isAdding}
|
|
<RefreshCw class="w-4 h-4 animate-spin" />
|
|
{:else}
|
|
<Server class="w-4 h-4" />
|
|
{/if}
|
|
Add Server
|
|
</button>
|
|
</div>
|
|
</div>
|
|
{/if}
|
|
|
|
<!-- Error Display -->
|
|
{#if error}
|
|
<div class="mx-4 mt-4 p-3 bg-red-500/20 border border-red-500/30 rounded-lg">
|
|
<p class="text-sm text-red-400">{error}</p>
|
|
</div>
|
|
{/if}
|
|
|
|
<!-- Content -->
|
|
<div class="flex-1 overflow-y-auto p-4 flex gap-4">
|
|
<!-- Server List -->
|
|
<div class="flex-1">
|
|
{#if isLoading}
|
|
<div class="flex items-center justify-center h-full text-[var(--text-secondary)]">
|
|
<RefreshCw class="w-8 h-8 animate-spin" />
|
|
</div>
|
|
{:else if servers.length === 0}
|
|
<div class="flex flex-col items-center justify-center h-full text-[var(--text-secondary)]">
|
|
<Server class="w-16 h-16 mb-4 opacity-50" />
|
|
<p class="text-center">No MCP servers configured</p>
|
|
<p class="text-sm text-center mt-2">Add servers via Settings</p>
|
|
</div>
|
|
{:else}
|
|
<div class="space-y-2">
|
|
{#each servers as server (server.name)}
|
|
{@const TransportIcon = getTransportIcon(server.transport)}
|
|
<button
|
|
onclick={() => loadServerDetails(server.name)}
|
|
class="w-full bg-[var(--bg-secondary)]/50 rounded-lg p-3 border border-[var(--border-color)] hover:border-[var(--accent-primary)]/50 transition-all text-left"
|
|
class:border-[var(--accent-primary)]={selectedServer?.name === server.name}
|
|
>
|
|
<div class="flex items-start justify-between">
|
|
<div class="flex-1">
|
|
<h4 class="font-medium text-[var(--text-primary)] flex items-center gap-2">
|
|
<TransportIcon class="w-4 h-4 {getTransportColor(server.transport)}" />
|
|
{server.name}
|
|
{#if server.status}
|
|
{#if server.status.includes("Connected")}
|
|
<span
|
|
class="px-2 py-0.5 bg-[var(--success-color)]/20 text-[var(--success-color)] text-xs rounded border border-[var(--success-color)]/30"
|
|
>
|
|
✓
|
|
</span>
|
|
{:else}
|
|
<span
|
|
class="px-2 py-0.5 bg-red-500/20 text-red-400 text-xs rounded border border-red-500/30"
|
|
>
|
|
✗
|
|
</span>
|
|
{/if}
|
|
{/if}
|
|
</h4>
|
|
<p class="text-xs text-[var(--text-secondary)] mt-1">
|
|
{server.transport.toUpperCase()}
|
|
{#if server.url}
|
|
• {server.url}
|
|
{:else if server.command}
|
|
• {server.command}
|
|
{/if}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</button>
|
|
{/each}
|
|
</div>
|
|
{/if}
|
|
</div>
|
|
|
|
<!-- Server Details Panel -->
|
|
{#if selectedServer}
|
|
<div
|
|
class="w-80 bg-[var(--bg-secondary)]/50 rounded-lg p-4 border border-[var(--border-color)]"
|
|
>
|
|
<h3 class="text-lg font-semibold text-[var(--text-primary)] mb-4">Server Details</h3>
|
|
|
|
{#if isLoadingDetails}
|
|
<div class="flex items-center justify-center h-32">
|
|
<RefreshCw class="w-6 h-6 animate-spin text-[var(--text-secondary)]" />
|
|
</div>
|
|
{:else}
|
|
{@const TransportIcon = getTransportIcon(selectedServer.transport)}
|
|
<div class="space-y-4">
|
|
<!-- Name -->
|
|
<div>
|
|
<p class="text-xs text-[var(--text-secondary)] uppercase tracking-wider">Name</p>
|
|
<p class="text-sm text-[var(--text-primary)] mt-1">{selectedServer.name}</p>
|
|
</div>
|
|
|
|
<!-- Transport -->
|
|
<div>
|
|
<p class="text-xs text-[var(--text-secondary)] uppercase tracking-wider">Transport</p>
|
|
<p class="text-sm text-[var(--text-primary)] mt-1 flex items-center gap-2">
|
|
<TransportIcon class="w-4 h-4 {getTransportColor(selectedServer.transport)}" />
|
|
{selectedServer.transport.toUpperCase()}
|
|
</p>
|
|
</div>
|
|
|
|
<!-- URL or Command -->
|
|
{#if selectedServer.url}
|
|
<div>
|
|
<p class="text-xs text-[var(--text-secondary)] uppercase tracking-wider">URL</p>
|
|
<p
|
|
class="text-sm text-[var(--text-primary)] mt-1 break-all font-mono bg-[var(--bg-primary)] p-2 rounded border border-[var(--border-color)]"
|
|
>
|
|
{selectedServer.url}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
|
|
{#if selectedServer.command}
|
|
<div>
|
|
<p class="text-xs text-[var(--text-secondary)] uppercase tracking-wider">Command</p>
|
|
<p
|
|
class="text-sm text-[var(--text-primary)] mt-1 font-mono bg-[var(--bg-primary)] p-2 rounded border border-[var(--border-color)]"
|
|
>
|
|
{selectedServer.command}
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
|
|
<!-- Environment Variables -->
|
|
{#if selectedServer.env}
|
|
<div>
|
|
<p class="text-xs text-[var(--text-secondary)] uppercase tracking-wider">
|
|
Environment
|
|
</p>
|
|
<pre
|
|
class="text-xs text-[var(--text-primary)] mt-1 font-mono bg-[var(--bg-primary)] p-2 rounded border border-[var(--border-color)] overflow-x-auto">{JSON.stringify(
|
|
selectedServer.env,
|
|
null,
|
|
2
|
|
)}</pre>
|
|
</div>
|
|
{/if}
|
|
|
|
<!-- Full Server Details -->
|
|
{#if serverDetails}
|
|
<div>
|
|
<p class="text-xs text-[var(--text-secondary)] uppercase tracking-wider">
|
|
Full Details
|
|
</p>
|
|
<pre
|
|
class="text-xs text-[var(--text-primary)] mt-1 font-mono bg-[var(--bg-primary)] p-2 rounded border border-[var(--border-color)] overflow-x-auto whitespace-pre-wrap">{serverDetails}</pre>
|
|
</div>
|
|
{/if}
|
|
|
|
<!-- Actions -->
|
|
<div class="pt-4 border-t border-[var(--border-color)]">
|
|
<button
|
|
onclick={() => selectedServer && removeServer(selectedServer.name)}
|
|
disabled={actionInProgress === selectedServer?.name}
|
|
class="w-full px-4 py-2 bg-red-500/20 border border-red-500/30 rounded-lg text-sm text-red-400 hover:bg-red-500/30 transition-colors disabled:opacity-40 disabled:cursor-not-allowed flex items-center justify-center gap-2"
|
|
>
|
|
<Trash2 class="w-4 h-4" />
|
|
Remove Server
|
|
</button>
|
|
</div>
|
|
</div>
|
|
{/if}
|
|
</div>
|
|
{/if}
|
|
</div>
|
|
</div>
|