@pentoshi/clai 4.8.4 → 4.10.0

package/dist/ui-core/commands/mcp-commands.js

@@ -0,0 +1,310 @@
+import { displayMcpConfigPath, projectMcpConfigPath, writeProjectMcpServer, } from "../../mcp/config-file.js";
+import { formatCatalog, formatStatuses, formatToolLine } from "../../mcp/format.js";
+import { formatMcpToken } from "../../mcp/mentions.js";
+import { mcpSelectionLabel } from "../../mcp/runtime.js";
+import { MCP_SOURCE_LABELS } from "../../mcp/types.js";
+import { composerActionPort } from "../composer/composer-action-port.js";
+const ADD_VALUE = "__mcp_add__";
+const ALL_VALUE = "__mcp_all__";
+const OFF_VALUE = "__mcp_off__";
+function selectionText(services) {
+    return mcpSelectionLabel(services.mcp.getState().selection);
+}
+function statusDescription(status) {
+    const source = MCP_SOURCE_LABELS[status.source.kind];
+    const detail = status.detail ? ` · ${status.detail}` : "";
+    return `${status.status} · ${status.transport} · ${status.toolCount} tool${status.toolCount === 1 ? "" : "s"} · ${source} (${status.source.kind}) · ${status.source.path}${detail}`;
+}
+function resolveServer(statuses, query) {
+    const needle = query.trim().toLowerCase();
+    const exact = statuses.find((status) => status.name.toLowerCase() === needle);
+    if (exact)
+        return exact;
+    const partial = statuses.filter((status) => status.name.toLowerCase().includes(needle));
+    return partial.length === 1 ? partial[0] : undefined;
+}
+function selectServer(services, status) {
+    if (status.status !== "ready") {
+        services.session.notice("warn", `MCP server ${status.name} is ${status.status}${status.detail ? ` · ${status.detail}` : ""} · use /mcp reconnect ${status.name}`);
+        return;
+    }
+    const token = formatMcpToken(status.name);
+    if (composerActionPort.insert(`${token} `)) {
+        services.focus.focusRegion("composer");
+        return;
+    }
+    services.mcp.selectServer(status.name);
+    services.session.notice("info", `type ${token} in your prompt to use this server · ${status.toolCount} live tool${status.toolCount === 1 ? "" : "s"}`);
+}
+function locationLines(services) {
+    const target = projectMcpConfigPath();
+    const paths = new Set([
+        ...services.mcp.getState().snapshot.statuses.map((status) => status.source.path),
+        ...services.mcp.getState().snapshot.invalid.map((entry) => entry.source.path),
+    ]);
+    paths.delete(target);
+    return [
+        `Project config: ${displayMcpConfigPath(target)}`,
+        ...[...paths].sort().map((path) => `Inherited config: ${path}`),
+    ];
+}
+const ADD_TEMPLATE = `{
+  "docs": {
+    "command": "docs-server",
+    "args": []
+  }
+}`;
+async function addServer(services, supplied = "") {
+    const target = projectMcpConfigPath();
+    const displayPath = displayMcpConfigPath(target);
+    let draft = supplied.trim();
+    for (let attempt = 0; attempt < 5; attempt += 1) {
+        if (!draft) {
+            const input = await services.overlay.openTextEditor({
+                title: "Add MCP server",
+                prompt: `Paste one server JSON object for ${displayPath} — a named object, or a one-entry {"servers":{…}} fragment.`,
+                placeholder: ADD_TEMPLATE,
+                submitLabel: "add server",
+                ...(attempt > 0 ? { initialValue: draft } : {}),
+            });
+            if (input === undefined || input.trim() === "")
+                return;
+            draft = input;
+        }
+        const written = await writeProjectMcpServer(draft);
+        if (!written.ok) {
+            services.session.notice("warn", `MCP config not changed · ${written.displayPath} · ${written.error}`);
+            // Reopen with the text intact so a long paste is never retyped.
+            const retry = await services.overlay.openTextEditor({
+                title: "Add MCP server · fix and retry",
+                prompt: `${written.error}`,
+                initialValue: draft,
+                placeholder: ADD_TEMPLATE,
+                submitLabel: "add server",
+            });
+            if (retry === undefined || retry.trim() === "")
+                return;
+            draft = retry;
+            continue;
+        }
+        const state = await services.mcp.refresh({ force: true });
+        const status = state.snapshot.statuses.find((candidate) => candidate.name === written.serverName);
+        if (status?.status === "ready")
+            selectServer(services, status);
+        services.session.notice(status?.status === "ready" ? "info" : "warn", `${written.replaced ? "updated" : "added"} MCP server ${written.serverName} in ${written.displayPath}${status?.status === "ready" ? ` · use ${formatMcpToken(written.serverName)} in your prompt · ${status.toolCount} tool${status.toolCount === 1 ? "" : "s"}` : ` · ${status?.status ?? "not discovered"}${status?.detail ? ` · ${status.detail}` : ""}`}`);
+        return;
+    }
+}
+function pickerTitle(services) {
+    const state = services.mcp.getState();
+    const statuses = state.snapshot.statuses;
+    const ready = statuses.filter((status) => status.status === "ready").length;
+    const target = displayMcpConfigPath(projectMcpConfigPath());
+    const progress = state.refreshing
+        ? " · connecting…"
+        : state.snapshot.createdAt === 0
+            ? " · discovering…"
+            : "";
+    return `MCP · ${target} · ${ready}/${statuses.length} live · ${state.activeToolCount} active tools${progress}`;
+}
+function pickerOptions(services) {
+    const state = services.mcp.getState();
+    const target = displayMcpConfigPath(projectMcpConfigPath());
+    return [
+        {
+            value: ADD_VALUE,
+            label: "+ add MCP server",
+            description: `paste one JSON server object · merge into ${target}`,
+        },
+        {
+            value: OFF_VALUE,
+            label: "MCP tools off",
+            description: "default · hide MCP tools from agent requests for this session",
+            active: state.selection.mode === "off",
+        },
+        {
+            value: ALL_VALUE,
+            label: "all live servers",
+            description: "expose every ready MCP tool for this session",
+            active: state.selection.mode === "all",
+        },
+        ...state.snapshot.statuses.map((status) => ({
+            value: status.name,
+            label: `${status.status === "ready" ? "live" : status.status} · ${status.name}`,
+            description: statusDescription(status),
+            active: state.selection.mode === "servers" &&
+                state.selection.serverNames.includes(status.name),
+        })),
+    ];
+}
+/**
+ * Opens immediately from the current snapshot: a remote server can take up to
+ * the 30s connect timeout, and blocking the picker on that looked like a hang.
+ * Rows and title are replaced in place once discovery settles.
+ */
+function openPicker(services) {
+    services.overlay.openPicker({
+        title: pickerTitle(services),
+        searchDescription: true,
+        twoLine: true,
+        options: pickerOptions(services),
+    }, (value) => {
+        const statuses = services.mcp.getState().snapshot.statuses;
+        services.overlay.close();
+        if (value === ADD_VALUE) {
+            void addServer(services);
+            return;
+        }
+        if (value === ALL_VALUE) {
+            services.mcp.selectAll();
+            services.session.notice("info", "MCP selection · all live servers · session only");
+            return;
+        }
+        if (value === OFF_VALUE) {
+            services.mcp.selectOff();
+            services.session.notice("info", "MCP tools off for this session");
+            return;
+        }
+        const status = statuses.find((candidate) => candidate.name === value);
+        if (status)
+            selectServer(services, status);
+    });
+}
+function refreshOpenPicker(services) {
+    if (services.overlay.getState().kind !== "picker")
+        return;
+    services.overlay.replacePickerOptions(pickerOptions(services), pickerTitle(services));
+}
+function catalogText(services) {
+    const state = services.mcp.getState();
+    const discovery = state.snapshot;
+    const warnings = services.mcp
+        .getState()
+        .snapshot.statuses.filter((status) => status.detail)
+        .map((status) => `  ${status.name}: ${status.detail}`);
+    return [
+        ...locationLines(services),
+        "",
+        `Selection: ${selectionText(services)} · active tools: ${state.activeToolCount} · catalog: ${state.catalogSignature}`,
+        state.refreshing ? "Refresh: in progress" : "Refresh: idle",
+        state.error ? `Runtime warning: ${state.error}` : "",
+        "",
+        formatCatalog(discovery),
+        ...(warnings.length > 0 ? ["", "Server details:", ...warnings] : []),
+    ]
+        .filter((line, index, lines) => line !== "" || lines[index - 1] !== "")
+        .join("\n")
+        .trim();
+}
+function toolText(services, serverName) {
+    const tools = services.mcp
+        .getState()
+        .snapshot.tools.filter((tool) => !serverName || tool.serverName === serverName);
+    if (tools.length === 0) {
+        return serverName
+            ? `No live tools are available from MCP server ${serverName}.`
+            : "No live MCP tools are available.";
+    }
+    return tools.map(formatToolLine).join("\n");
+}
+async function reconnect(services, query) {
+    const statuses = services.mcp.getState().snapshot.statuses;
+    const status = resolveServer(statuses, query);
+    if (!status) {
+        services.session.notice("warn", query
+            ? `no unique MCP server matching "${query}"`
+            : "usage: /mcp reconnect <server>");
+        return;
+    }
+    services.session.notice("info", `reconnecting MCP server ${status.name}…`);
+    const state = await services.mcp.reconnect(status.name);
+    const next = state.snapshot.statuses.find((candidate) => candidate.name === status.name);
+    if (next?.status === "ready") {
+        services.session.notice("info", `MCP server ${status.name} live · ${next.toolCount} tool${next.toolCount === 1 ? "" : "s"}`);
+    }
+    else {
+        services.session.notice("warn", `MCP server ${status.name} ${next?.status ?? "unavailable"}${next?.detail ? ` · ${next.detail}` : ""}`);
+    }
+}
+export async function handleMcp(services, invocation) {
+    const args = invocation.args.trim();
+    const [rawCommand = "", ...rest] = args.split(/\s+/);
+    const command = rawCommand.toLowerCase();
+    const tail = rest.join(" ").trim();
+    if (!command) {
+        openPicker(services);
+        await services.mcp.ensureReady();
+        refreshOpenPicker(services);
+        return;
+    }
+    await services.mcp.ensureReady();
+    if (command === "add" || command === "new") {
+        await addServer(services, tail);
+        return;
+    }
+    if (command === "locations" || command === "location" || command === "paths") {
+        services.overlay.openPager("MCP configuration locations", locationLines(services).join("\n"), undefined, undefined, "plain");
+        return;
+    }
+    if (command === "all" || command === "auto" || command === "on") {
+        services.mcp.selectAll();
+        services.session.notice("info", "MCP selection · all live servers · session only");
+        return;
+    }
+    if (command === "off" || command === "none") {
+        services.mcp.selectOff();
+        services.session.notice("info", "MCP tools off for this session");
+        return;
+    }
+    if (command === "list" || command === "catalog") {
+        services.overlay.openPager("MCP catalog", catalogText(services), undefined, undefined, "plain");
+        return;
+    }
+    if (command === "status") {
+        const state = services.mcp.getState();
+        services.overlay.openPager("MCP status", [
+            ...locationLines(services),
+            "",
+            `Selection: ${selectionText(services)} · ${state.activeToolCount} active tools`,
+            "",
+            formatStatuses(state.snapshot.statuses),
+            ...(state.snapshot.invalid.length > 0
+                ? [
+                    "",
+                    "Invalid configurations:",
+                    ...state.snapshot.invalid.map((entry) => `  ${entry.name} · ${entry.source.path} · ${entry.errors.join("; ")}`),
+                ]
+                : []),
+        ].join("\n"), undefined, undefined, "plain");
+        return;
+    }
+    if (command === "tools") {
+        const server = tail
+            ? resolveServer(services.mcp.getState().snapshot.statuses, tail)
+            : undefined;
+        if (tail && !server) {
+            services.session.notice("warn", `no unique MCP server matching "${tail}"`);
+            return;
+        }
+        services.overlay.openPager(server ? `MCP tools · ${server.name}` : "MCP tools", toolText(services, server?.name), undefined, undefined, "plain");
+        return;
+    }
+    if (command === "refresh" || command === "reload") {
+        services.session.notice("info", "refreshing MCP configurations and live tools…");
+        const state = await services.mcp.refresh({ force: true });
+        const ready = state.snapshot.statuses.filter((status) => status.status === "ready").length;
+        services.session.notice(state.error ? "warn" : "info", `MCP refresh · ${ready}/${state.snapshot.statuses.length} live · ${state.activeToolCount} active tools${state.error ? ` · ${state.error}` : ""}`);
+        return;
+    }
+    if (command === "reconnect") {
+        await reconnect(services, tail);
+        return;
+    }
+    const status = resolveServer(services.mcp.getState().snapshot.statuses, args);
+    if (!status) {
+        services.session.notice("warn", `no unique MCP server matching "${args}" · use /mcp to browse or /mcp list for details`);
+        return;
+    }
+    selectServer(services, status);
+}
+//# sourceMappingURL=mcp-commands.js.map

package/dist/ui-core/commands/mcp-commands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-commands.js","sourceRoot":"","sources":["../../../src/ui-core/commands/mcp-commands.ts"],"names":[],"mappings":"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"}

package/dist/ui-core/commands/picker-commands.d.ts

@@ -21,5 +21,5 @@ export declare function handleSearch(services: AppServices, invocation: CommandI
 export declare function handleReasoning(services: AppServices, invocation: CommandInvocation): void;
 export declare function handleHistory(services: AppServices, invocation?: CommandInvocation): Promise<void>;
 export declare function handlePermissions(services: AppServices, invocation: CommandInvocation): void;
-export declare function handleOutput(services: AppServices, invocation: CommandInvocation): void;
+export declare function handleOutput(services: AppServices, invocation: CommandInvocation): Promise<void>;
 export declare function handlePlanPager(services: AppServices): void;

package/dist/ui-core/commands/picker-commands.js

@@ -810,6 +810,9 @@ function warnUnacceptedEffort(services, effort) {
 }
 export async function handleHistory(services, invocation) {
     const rawArgs = invocation?.args?.trim() ?? "";
+    const { listLiveSessionRuntimes } = await import("../../session-runtime/discovery.js");
+    const runtimes = await listLiveSessionRuntimes().catch(() => []);
+    const runtimeById = new Map(runtimes.map((runtime) => [runtime.sessionId, runtime]));
     if (rawArgs) {
         const [sub, ...rest] = rawArgs.split(/\s+/);
         const subLower = sub?.toLowerCase() ?? "";
@@ -819,6 +822,10 @@ export async function handleHistory(services, invocation) {
                 services.session.notice("warn", "usage: /history delete <session-id>");
                 return;
             }
+            if (runtimeById.has(finalId)) {
+                services.session.notice("warn", "detach or exit the live session before deleting it");
+                return;
+            }
             const result = await deleteSession(finalId);
             services.session.notice(result.deleted ? "info" : "warn", result.deleted ? `deleted ${finalId}` : result.detail);
             return;
@@ -828,13 +835,15 @@ export async function handleHistory(services, invocation) {
     const currentMessages = services.session.messages;
     const currentId = services.session.sessionId;
     const currentTitle = services.session.getState().title;
-    if (sessions.length === 0 && currentMessages.length === 0) {
+    if (sessions.length === 0 &&
+        runtimes.filter((runtime) => runtime.sessionId !== currentId).length === 0 &&
+        currentMessages.length === 0) {
         services.session.notice("info", "no session history yet — chat once and it will appear here with an AI title");
         return;
     }
-    // Live session once at the top — never also list the same id below
-    // (that looked like two copies of one chat with different item counts).
-    const otherSessions = sessions.filter((s) => s.id !== currentId);
+    const otherSessions = sessions.filter((session) => session.id !== currentId);
+    const historyIds = new Set(sessions.map((session) => session.id));
+    const runtimeOnly = runtimes.filter((runtime) => runtime.sessionId !== currentId && !historyIds.has(runtime.sessionId));
     const liveVisualCount = conversationItemCount(services.transcript.getState());
     const options = [
         {
@@ -845,20 +854,36 @@ export async function handleHistory(services, invocation) {
                 : `id ${currentId}  ·  now  ·  empty session  ·  this window`,
             active: true,
         },
+        ...runtimeOnly.map((runtime) => ({
+            value: runtime.sessionId,
+            label: runtime.title?.trim() || "Live session",
+            description: [
+                `id ${runtime.sessionId}`,
+                runtime.busy ? "agent running" : "live",
+                runtime.attached ? "attached elsewhere" : "detached",
+                shortCwd(runtime.cwd) ? `in ${shortCwd(runtime.cwd)}` : "",
+            ]
+                .filter(Boolean)
+                .join("  ·  "),
+            active: false,
+        })),
         ...otherSessions.map((session) => {
+            const runtime = runtimeById.get(session.id);
             const count = session.itemCount;
             const date = session.updatedAt ?? session.createdAt;
-            const when = relativeTime(date) || "some time ago";
-            const stamp = date.slice(0, 16).replace("T", " ");
-            const where = shortCwd(session.cwd);
             const title = (session.name && session.name.trim()) || "Untitled chat";
-            // Two-line card: title on top; meta chips underneath (full session id).
             const meta = [
                 `id ${session.id}`,
-                when,
-                stamp,
+                runtime
+                    ? runtime.busy
+                        ? "agent running"
+                        : runtime.attached
+                            ? "live · attached elsewhere"
+                            : "live · detached"
+                    : relativeTime(date) || "some time ago",
+                date.slice(0, 16).replace("T", " "),
                 `${count} item${count === 1 ? "" : "s"}`,
-                where ? `in ${where}` : "",
+                shortCwd(session.cwd) ? `in ${shortCwd(session.cwd)}` : "",
             ]
                 .filter(Boolean)
                 .join("  ·  ");
@@ -878,10 +903,17 @@ export async function handleHistory(services, invocation) {
             });
             return;
         }
+        if (runtimeById.has(value)) {
+            services.toast.warn("cannot delete a live session", {
+                key: "history-delete",
+            });
+            return;
+        }
         const index = liveOptions.findIndex((option) => option.value === value);
         if (index === -1)
             return;
-        const label = liveOptions[index].label;
+        const option = liveOptions[index];
+        const label = option.label;
         liveOptions.splice(index, 1);
         services.overlay.replacePickerOptions([...liveOptions]);
         services.toast.info(`deleting ${label}…`, { key: "history-delete" });
@@ -893,6 +925,10 @@ export async function handleHistory(services, invocation) {
                 });
             }
             else {
+                if (!liveOptions.some((candidate) => candidate.value === value)) {
+                    liveOptions.splice(Math.min(index, liveOptions.length), 0, option);
+                    services.overlay.replacePickerOptions([...liveOptions]);
+                }
                 services.toast.error(`could not delete ${label} · ${result.detail}`, {
                     key: "history-delete",
                 });
@@ -913,29 +949,36 @@ export async function handleHistory(services, invocation) {
                 services.overlay.close();
                 return;
             }
-            // Refresh only the selected record so a session changed by another
-            // process while the picker was open cannot be resumed stale. This work
-            // happens after selection and does not delay opening /history.
             const session = await getSession(value);
-            if (!session) {
+            const runtime = runtimeById.get(value);
+            if (!session && !runtime) {
                 services.session.notice("warn", "session not found");
                 services.overlay.close();
                 return;
             }
-            if (session.id === currentId) {
+            if (value === currentId) {
                 services.session.notice("info", "already on this session");
                 services.overlay.close();
                 return;
             }
-            // Persist the outgoing live session before rebinding id, so work is not
-            // lost and we don't orphan a half-saved row under the old id.
             if (currentMessages.length > 0) {
-                try {
-                    await services.session.persistNow();
-                }
-                catch {
-                    /* best-effort */
-                }
+                await services.session.persistNow().catch(() => undefined);
+            }
+            const state = services.session.getState();
+            const busy = state.running ||
+                state.compacting ||
+                state.queued.length > 0 ||
+                state.responder.running > 0 ||
+                state.responder.ready > 0 ||
+                state.responder.delivered > 0;
+            if (services.requestSessionSwitch(value, !busy)) {
+                services.overlay.close();
+                return;
+            }
+            if (!session) {
+                services.session.notice("warn", `session is live in another runtime · use clai --resume ${value}`);
+                services.overlay.close();
+                return;
             }
             const outcome = await applySessionResume(services, session);
             for (const entry of resumeNotices(outcome)) {
@@ -978,7 +1021,7 @@ export function handlePermissions(services, invocation) {
         services.overlay.close();
     });
 }
-export function handleOutput(services, invocation) {
+export async function handleOutput(services, invocation) {
     const state = services.transcript.getState();
     const toolItems = [...state.byId.values()].filter((item) => item.kind === "tool");
     if (toolItems.length === 0) {
@@ -1012,7 +1055,7 @@ export function handleOutput(services, invocation) {
         ? toolItems.find((t) => t.toolCallId === arg || t.id === arg)
         : toolItems.at(-1);
     if (target)
-        void openToolOutputPager(services, target);
+        await openToolOutputPager(services, target);
     else
         services.session.notice("info", arg ? `no tool output: ${arg}` : "no tool output yet");
 }