@ikuma.cloud/pix-mcp 0.0.7 → 0.0.9

package/src/prompt-picker.ts

@@ -0,0 +1,120 @@
+import {
+  DynamicBorder,
+  type ExtensionCommandContext,
+  type Theme,
+} from "@earendil-works/pi-coding-agent";
+import {
+  Container,
+  SelectList,
+  Text,
+  type Component,
+  type SelectItem,
+  type TUI,
+  type TuiMouseEvent,
+} from "@earendil-works/pi-tui";
+import { compact } from "./catalog.ts";
+import { promptKey, type PromptEntry } from "./prompts.ts";
+
+function details(entry: PromptEntry, theme: Theme): string {
+  const title = compact(entry.prompt.title ?? "", 120);
+  const description = compact(entry.prompt.description ?? "", 320);
+  return [
+    ...(title ? [theme.fg("accent", theme.bold(title))] : []),
+    theme.fg(
+      description ? "muted" : "dim",
+      description || "No description provided.",
+    ),
+  ].join("\n");
+}
+
+export function createPromptPicker(
+  entries: PromptEntry[],
+  tui: TUI,
+  theme: Theme,
+  done: (result: string | undefined) => void,
+  signal?: AbortSignal,
+): Component & { dispose(): void } {
+  const items: SelectItem[] = entries.map((entry) => ({
+    value: promptKey(entry.server, entry.prompt.name),
+    label: `${entry.server} / ${entry.prompt.name}`,
+  }));
+  const entriesByKey = new Map(
+    entries.map((entry) => [promptKey(entry.server, entry.prompt.name), entry]),
+  );
+  const container = new Container();
+  container.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
+  container.addChild(
+    new Text(theme.fg("accent", theme.bold("Select MCP prompt"))),
+  );
+
+  const list = new SelectList(items, Math.min(items.length, 10), {
+    selectedPrefix: (text) => theme.fg("accent", text),
+    selectedText: (text) => theme.fg("accent", text),
+    description: (text) => theme.fg("muted", text),
+    scrollInfo: (text) => theme.fg("dim", text),
+    noMatch: (text) => theme.fg("warning", text),
+  });
+  container.addChild(list);
+
+  const focusedDescription = new Text("", 1, 1);
+  const updateDescription = (item: SelectItem) => {
+    const entry = entriesByKey.get(item.value);
+    if (entry) focusedDescription.setText(details(entry, theme));
+  };
+  const initialItem = items[0];
+  if (initialItem) updateDescription(initialItem);
+  list.onSelectionChange = updateDescription;
+  container.addChild(focusedDescription);
+  container.addChild(
+    new Text(theme.fg("dim", "↑↓ navigate • enter select • esc cancel")),
+  );
+  container.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
+
+  let finished = false;
+  const finish = (result: string | undefined) => {
+    if (finished) return;
+    finished = true;
+    done(result);
+  };
+  list.onSelect = (item) => finish(item.value);
+  list.onCancel = () => finish(undefined);
+  const onAbort = () => finish(undefined);
+  signal?.addEventListener("abort", onAbort, { once: true });
+  if (signal?.aborted) onAbort();
+
+  return {
+    render(width: number) {
+      return container.render(width);
+    },
+    invalidate() {
+      container.invalidate();
+    },
+    handleInput(data: string) {
+      list.handleInput(data);
+      tui.requestRender();
+    },
+    handleMouse(event: TuiMouseEvent) {
+      const result = container.handleMouse(event);
+      if (result?.render) tui.requestRender();
+      return result;
+    },
+    dispose() {
+      signal?.removeEventListener("abort", onAbort);
+    },
+  };
+}
+
+export async function pickPrompt(
+  entries: PromptEntry[],
+  ctx: ExtensionCommandContext,
+): Promise<PromptEntry | undefined> {
+  if (ctx.signal?.aborted) return;
+  const selected = await ctx.ui.custom<string | undefined>(
+    (tui, theme, _keybindings, done) =>
+      createPromptPicker(entries, tui, theme, done, ctx.signal),
+  );
+  if (selected === undefined) return;
+  return entries.find(
+    (entry) => promptKey(entry.server, entry.prompt.name) === selected,
+  );
+}

package/src/prompts.ts

@@ -4,6 +4,12 @@ import type {
   Prompt,
 } from "@modelcontextprotocol/sdk/types.js";
 import { compact } from "./catalog.ts";
+import {
+  quoteCommandArgument,
+  renderCommandToken,
+  tokenizeCommand,
+  type CommandToken,
+} from "./command.ts";
 import { formatContent } from "./output.ts";
 
 export interface PromptEntry {
@@ -11,10 +17,7 @@ export interface PromptEntry {
   prompt: Prompt;
 }
 
-export interface PromptArgumentToken {
-  value: string;
-  separator?: number;
-}
+export type PromptArgumentToken = CommandToken;
 
 export type PromptCommand =
   | { action: "list"; server?: string }
@@ -30,7 +33,7 @@ export function promptKey(server: string, name: string): string {
 }
 
 export function parsePromptCommand(input: string): PromptCommand {
-  const tokens = tokenize(input);
+  const tokens = tokenizeCommand(input, "prompt");
   const action = tokens.shift()?.value;
   if (action === "list") {
     if (tokens.length > 1) throw new Error("Usage: /mcp-prompt list [server]");
@@ -120,15 +123,15 @@ export function formatPromptList(
     const argumentsHint = (entry.prompt.arguments ?? [])
       .map((argument) =>
         argument.required
-          ? `<${quote(argument.name)}>`
-          : `[${quote(argument.name)}]`,
+          ? `<${quoteCommandArgument(argument.name)}>`
+          : `[${quoteCommandArgument(argument.name)}]`,
       )
       .join(" ");
     const description = compact(
       entry.prompt.description ?? entry.prompt.title ?? "",
       160,
     );
-    const line = `${entry.server} ${quote(entry.prompt.name)}${argumentsHint ? ` ${argumentsHint}` : ""}${description ? ` — ${description}` : ""}`;
+    const line = `${entry.server} ${quoteCommandArgument(entry.prompt.name)}${argumentsHint ? ` ${argumentsHint}` : ""}${description ? ` — ${description}` : ""}`;
     if (shown >= 100 || lines.join("\n").length + line.length > 15_000) {
       lines.push(`${selected.length - shown} additional prompts omitted.`);
       break;
@@ -149,7 +152,7 @@ export function promptCompletions(
   const trailingSpace = /\s$/.test(prefix);
   let tokens: PromptArgumentToken[];
   try {
-    tokens = tokenize(prefix);
+    tokens = tokenizeCommand(prefix);
   } catch {
     return null;
   }
@@ -191,7 +194,7 @@ export function promptCompletions(
       )
       .sort((a, b) => a.prompt.name.localeCompare(b.prompt.name, "en"));
     return prompts.map((entry) => ({
-      value: `run ${quote(server)} ${quote(entry.prompt.name)}`,
+      value: `run ${quoteCommandArgument(server)} ${quoteCommandArgument(entry.prompt.name)}`,
       label: entry.prompt.name,
       ...(entry.prompt.description || entry.prompt.title
         ? {
@@ -237,9 +240,9 @@ export function promptCompletions(
   }
   const base = [
     "run",
-    quote(server),
-    quote(selected.prompt.name),
-    ...supplied.map((token) => quote(token.value)),
+    quoteCommandArgument(server),
+    quoteCommandArgument(selected.prompt.name),
+    ...supplied.map(renderCommandToken),
   ].join(" ");
   const arguments_ = definitions.filter(
     (argument) =>
@@ -247,7 +250,7 @@ export function promptCompletions(
   );
   return arguments_.length > 0
     ? arguments_.map((argument) => ({
-        value: `${base} ${quote(argument.name)}=`,
+        value: `${base} ${quoteCommandArgument(argument.name)}=`,
         label: `${argument.name}=`,
         ...(argument.description
           ? { description: compact(argument.description, 100) }
@@ -262,81 +265,34 @@ function completionItems(
   label: (value: string) => string,
 ) {
   return values.map((value) => ({
-    value: `${prefix}${quote(value)}`,
+    value: `${prefix}${quoteCommandArgument(value)}`,
     label: label(value),
   }));
 }
 
-function quote(value: string): string {
-  return /^[A-Za-z0-9_.:/-]+$/.test(value)
-    ? value
-    : `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
+function hasUsablePromptContent(
+  content: GetPromptResult["messages"][number]["content"],
+): boolean {
+  if (content.type === "text") return content.text.trim().length > 0;
+  if (content.type === "resource")
+    return "text" in content.resource
+      ? content.resource.text.trim().length > 0
+      : content.resource.blob.length > 0;
+  if (content.type === "resource_link") return content.uri.trim().length > 0;
+  return content.data.length > 0;
 }
 
-function tokenize(input: string): PromptArgumentToken[] {
-  const tokens: PromptArgumentToken[] = [];
-  let token = "";
-  let separator: number | undefined;
-  let quote: '"' | "'" | undefined;
-  let escaped = false;
-  let started = false;
-  for (const character of input) {
-    if (escaped) {
-      token += character;
-      escaped = false;
-      started = true;
-    } else if (character === "\\" && quote !== "'") {
-      escaped = true;
-      started = true;
-    } else if (quote) {
-      if (character === quote) quote = undefined;
-      else token += character;
-      started = true;
-    } else if (character === '"' || character === "'") {
-      quote = character;
-      started = true;
-    } else if (/\s/u.test(character)) {
-      if (started) {
-        tokens.push({
-          value: token,
-          ...(separator !== undefined ? { separator } : {}),
-        });
-        token = "";
-        separator = undefined;
-        started = false;
-      }
-    } else {
-      if (character === "=" && separator === undefined)
-        separator = token.length;
-      token += character;
-      started = true;
-    }
-  }
-  if (quote) throw new Error("Unterminated quote in prompt arguments.");
-  if (escaped) throw new Error("Trailing escape in prompt arguments.");
-  if (started)
-    tokens.push({
-      value: token,
-      ...(separator !== undefined ? { separator } : {}),
-    });
-  return tokens;
-}
-
-export async function formatPromptResult(
-  result: GetPromptResult,
-  server: string,
-  name: string,
-) {
+export async function formatPromptResult(result: GetPromptResult) {
   if (result.messages.length === 0)
     throw new Error("MCP prompt returned no messages.");
-  const blocks: ContentBlock[] = [
-    { type: "text", text: `[MCP prompt from ${server}/${name}]` },
-  ];
+  const blocks: ContentBlock[] = [];
+  let hasSourceContent = false;
   const showRoles =
     result.messages.length > 1 || result.messages[0]?.role !== "user";
   for (const message of result.messages) {
     if (showRoles) blocks.push({ type: "text", text: `[${message.role}]` });
     const content = message.content;
+    if (hasUsablePromptContent(content)) hasSourceContent = true;
     if (content.type === "resource") {
       if ("text" in content.resource) {
         blocks.push({
@@ -362,5 +318,13 @@ export async function formatPromptResult(
       });
     } else blocks.push(content);
   }
-  return formatContent(blocks, { artifact: result, preserveOrder: true });
+  if (!hasSourceContent)
+    throw new Error("MCP prompt returned no usable content.");
+  const formatted = await formatContent(blocks, {
+    artifact: result,
+    preserveOrder: true,
+  });
+  if (formatted.content.length === 0)
+    throw new Error("MCP prompt returned no usable content.");
+  return formatted;
 }

package/src/resource-picker.ts

@@ -0,0 +1,157 @@
+import {
+  DynamicBorder,
+  type ExtensionCommandContext,
+  type Theme,
+} from "@earendil-works/pi-coding-agent";
+import {
+  Container,
+  SelectList,
+  Text,
+  type Component,
+  type SelectItem,
+  type TUI,
+  type TuiMouseEvent,
+} from "@earendil-works/pi-tui";
+import { compact } from "./catalog.ts";
+import { resourceEntryKey, type ResourceEntry } from "./resources.ts";
+
+function metadata(entry: ResourceEntry) {
+  return entry.kind === "resource" ? entry.resource : entry.template;
+}
+
+function identifier(entry: ResourceEntry) {
+  return entry.kind === "resource"
+    ? entry.resource.uri
+    : entry.template.uriTemplate;
+}
+
+function details(entry: ResourceEntry, theme: Theme): string {
+  const item = metadata(entry);
+  const title = compact(item.title ?? item.name, 120);
+  const description = compact(item.description ?? "", 320);
+  const uri = compact(identifier(entry), 500);
+  const annotations = item.annotations;
+  const hints = [
+    ...(item.mimeType ? [`Type: ${compact(item.mimeType, 120)}`] : []),
+    ...(entry.kind === "resource" && entry.resource.size !== undefined
+      ? [`Size: ${entry.resource.size.toLocaleString("en-US")} bytes`]
+      : []),
+    ...(entry.kind === "template" && entry.variables.length > 0
+      ? [
+          `Variables: ${entry.variables.map((value) => compact(value, 80)).join(", ")}`,
+        ]
+      : []),
+    ...(annotations?.audience?.length
+      ? [`Audience: ${annotations.audience.slice(0, 2).join(", ")}`]
+      : []),
+    ...(annotations?.priority !== undefined
+      ? [`Priority: ${annotations.priority}`]
+      : []),
+    ...(annotations?.lastModified
+      ? [`Modified: ${compact(annotations.lastModified, 80)}`]
+      : []),
+  ];
+  return [
+    theme.fg("accent", theme.bold(title)),
+    theme.fg(
+      "muted",
+      `${entry.kind === "template" ? "Template" : "Resource"}: ${uri}`,
+    ),
+    ...(description ? [theme.fg("muted", description)] : []),
+    ...(hints.length > 0 ? [theme.fg("dim", hints.join(" • "))] : []),
+  ].join("\n");
+}
+
+export function createResourcePicker(
+  entries: ResourceEntry[],
+  tui: TUI,
+  theme: Theme,
+  done: (result: string | undefined) => void,
+  signal?: AbortSignal,
+): Component & { dispose(): void } {
+  const items: SelectItem[] = entries.map((entry) => {
+    const item = metadata(entry);
+    return {
+      value: resourceEntryKey(entry),
+      label: `${entry.server} / ${compact(item.title ?? item.name, 120)}`,
+      description: compact(identifier(entry), 180),
+    };
+  });
+  const entriesByKey = new Map(
+    entries.map((entry) => [resourceEntryKey(entry), entry]),
+  );
+  const container = new Container();
+  container.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
+  container.addChild(
+    new Text(theme.fg("accent", theme.bold("Select MCP resource"))),
+  );
+
+  const list = new SelectList(items, Math.min(items.length, 10), {
+    selectedPrefix: (text) => theme.fg("accent", text),
+    selectedText: (text) => theme.fg("accent", text),
+    description: (text) => theme.fg("muted", text),
+    scrollInfo: (text) => theme.fg("dim", text),
+    noMatch: (text) => theme.fg("warning", text),
+  });
+  container.addChild(list);
+
+  const focusedDescription = new Text("", 1, 1);
+  const updateDescription = (item: SelectItem) => {
+    const entry = entriesByKey.get(item.value);
+    if (entry) focusedDescription.setText(details(entry, theme));
+  };
+  const initialItem = items[0];
+  if (initialItem) updateDescription(initialItem);
+  list.onSelectionChange = updateDescription;
+  container.addChild(focusedDescription);
+  container.addChild(
+    new Text(theme.fg("dim", "↑↓ navigate • enter select • esc cancel")),
+  );
+  container.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
+
+  let finished = false;
+  const finish = (result: string | undefined) => {
+    if (finished) return;
+    finished = true;
+    done(result);
+  };
+  list.onSelect = (item) => finish(item.value);
+  list.onCancel = () => finish(undefined);
+  const onAbort = () => finish(undefined);
+  signal?.addEventListener("abort", onAbort, { once: true });
+  if (signal?.aborted) onAbort();
+
+  return {
+    render(width: number) {
+      return container.render(width);
+    },
+    invalidate() {
+      container.invalidate();
+    },
+    handleInput(data: string) {
+      list.handleInput(data);
+      tui.requestRender();
+    },
+    handleMouse(event: TuiMouseEvent) {
+      const result = container.handleMouse(event);
+      if (result?.render) tui.requestRender();
+      return result;
+    },
+    dispose() {
+      signal?.removeEventListener("abort", onAbort);
+    },
+  };
+}
+
+export async function pickResource(
+  entries: ResourceEntry[],
+  ctx: ExtensionCommandContext,
+): Promise<ResourceEntry | undefined> {
+  if (ctx.signal?.aborted) return;
+  const selected = await ctx.ui.custom<string | undefined>(
+    (tui, theme, _keybindings, done) =>
+      createResourcePicker(entries, tui, theme, done, ctx.signal),
+  );
+  if (selected === undefined) return;
+  return entries.find((entry) => resourceEntryKey(entry) === selected);
+}