pi-soly 1.13.3 → 1.13.5

package/README.md

@@ -39,6 +39,26 @@ Restart pi (`/reload`), and you have:
 
 The LLM drives execution; `plan`/`execute` delegate to a `worker` subagent when one is available (via pi-subagents), with first-party delegation on the roadmap. You focus on the work.
 
+### Known install issue (upstream `pi install`)
+
+`pi install` currently does **not** install transitive `peerDependencies` (it skips them the way `--omit=optional` would). pi-soly's MCP stack depends on `@modelcontextprotocol/ext-apps`, which in turn peer-requires `@modelcontextprotocol/sdk` (declared non-optional upstream). After `pi install npm:pi-soly` you may see:
+
+```
+Error: Cannot find module '@modelcontextprotocol/sdk/types.js'
+Require stack:
+- ~/.pi/agent/npm/node_modules/@modelcontextprotocol/ext-apps/dist/src/app-bridge.js
+```
+
+**Workaround** (one-time, after each `pi install` of pi-soly or any pi-soly-related upgrade):
+
+```bash
+cd ~/.pi/agent/npm && npm install
+```
+
+This makes plain npm resolve the transitive peer deps that `pi install` skipped. After this, restart pi (`/reload`) and the MCP features work.
+
+Tracked upstream — fix is expected on the pi side, not here.
+
 ---
 
 ## 🎯 Why pi-soly?
@@ -69,7 +89,7 @@ soly status        # current position + progress (no LLM round-trip)
 ### State inspection (`/soly`)
 
 ```bash
-/soly              # interactive picker (📍📄📋💡🔬🗺️📊📁✅⭐🎯🔄⚙️)
+/soly              # interactive modal picker (live preview per item, ⏎ to open)
 /soly position     # where am I in the plan
 /soly state        # current STATE.md content
 /soly roadmap      # all phases

package/commands.ts

@@ -828,11 +828,13 @@ What must the LLM do?
 				},
 			};
 
+			// Single-width BMP glyphs only — astral/VS16 emoji are mis-measured by
+			// visibleWidth, overflow the panel, and ghost the modal on ↑↓.
 			const ICONS: Record<string, string> = {
-				position: "📍", state: "📄", plan: "📋", context: "💡",
-				research: "🔬", roadmap: "🗺️", progress: "📊",
-				phases: "📁", tasks: "✅", task: "🔎",
-				features: "⭐", milestone: "🎯", reload: "🔄", config: "⚙️",
+				position: "◎", state: "▤", plan: "▥", context: "◌",
+				research: "⊙", roadmap: "≣", progress: "▰",
+				phases: "▭", tasks: "✓", task: "◍",
+				features: "★", milestone: "◈", reload: "↻", config: "▣",
 			};
 
 			// Short live preview shown in the modal's preview pane per subcommand.

package/index.ts

@@ -892,12 +892,23 @@ export default function solyExtension(pi: ExtensionAPI) {
 	// Bundled into pi-soly as of v1.11.0 with UE5 session-retry fix + framed
 	// notifications + compact per-server status footer.
 	// We import dynamically because mcp/ has heavy deps (modelcontextprotocol/sdk)
-	// and we want soly to still load if MCP fails for any reason.
-	void import("./mcp/index.ts").then((m) => {
-		try {
-			m.default(pi);
-		} catch (err) {
-			console.error("[soly] MCP adapter failed to initialize:", err);
-		}
-	});
+	// and we want soly to still load if MCP fails for any reason. The import()
+	// itself can reject (e.g. `pi install` didn't resolve a transitive peer dep
+	// like @modelcontextprotocol/sdk) or throw synchronously under jiti — both
+	// must be swallowed so a broken MCP never takes down the whole agent.
+	try {
+		void import("./mcp/index.ts")
+			.then((m) => {
+				try {
+					m.default(pi);
+				} catch (err) {
+					console.error("[soly] MCP adapter failed to initialize:", err);
+				}
+			})
+			.catch((err) => {
+				console.error("[soly] MCP adapter unavailable (load failed):", err);
+			});
+	} catch (err) {
+		console.error("[soly] MCP adapter unavailable (load threw):", err);
+	}
 }

package/mcp/ext-apps-bridge.ts

@@ -0,0 +1,76 @@
+// =============================================================================
+// ext-apps-bridge.ts — lazy, guarded access to @modelcontextprotocol/ext-apps
+// =============================================================================
+//
+// `@modelcontextprotocol/ext-apps@1.7.4` (its peer is sdk `^1.29.0`, yet its
+// compiled CJS `app-bridge.js` does `require("@modelcontextprotocol/sdk/types.js")`
+// — a subpath sdk 1.29 no longer exposes to CJS) is currently broken upstream.
+// Importing it statically threw at module-eval and crashed the whole pi agent.
+//
+// So we load it LAZILY, exactly once, behind a try/catch. If it loads, the MCP-UI
+// (app-bridge) features work; if it can't, the cache is null and those features
+// degrade gracefully (no UI resource URIs, empty iframe allow-list, fallback MIME)
+// while core MCP keeps working. `preloadAppBridge()` is awaited early in MCP init
+// so the synchronous accessors below see a populated (or null) cache.
+//
+// The dynamic specifier is typed as `string` on purpose so TypeScript does not
+// resolve ext-apps' types (which themselves reference the missing sdk subpath).
+// =============================================================================
+
+/** Minimal shape of the bits of ext-apps/app-bridge we use. */
+interface AppBridge {
+	RESOURCE_MIME_TYPE: string;
+	getToolUiResourceUri(meta: { _meta?: unknown }): string | undefined;
+	buildAllowAttribute(permissions: unknown): string;
+}
+
+/** Mirrors ext-apps' RESOURCE_MIME_TYPE; used when the module can't be loaded. */
+const FALLBACK_RESOURCE_MIME_TYPE = "text/html;profile=mcp-app";
+
+// `: string` (not a string literal) so `import()` is typed `Promise<any>` and TS
+// never tries to resolve ext-apps' (broken) types.
+const APP_BRIDGE_SPECIFIER: string = "@modelcontextprotocol/ext-apps/app-bridge";
+
+let cached: AppBridge | null = null;
+let attempted = false;
+
+/** Load ext-apps once (idempotent), swallowing any failure. Safe to await many
+ *  times. Call early in MCP init before the sync accessors are used. */
+export async function preloadAppBridge(): Promise<void> {
+	if (attempted) return;
+	attempted = true;
+	try {
+		cached = (await import(APP_BRIDGE_SPECIFIER)) as unknown as AppBridge;
+	} catch {
+		cached = null;
+		console.error(
+			"[soly] MCP UI (ext-apps/app-bridge) could not load — app-bridge features are disabled " +
+				"(upstream ext-apps/sdk version mismatch, not a soly bug). Core MCP is unaffected.",
+		);
+	}
+}
+
+/** ext-apps' RESOURCE_MIME_TYPE when loaded, else the fallback literal. */
+export function resourceMimeType(): string {
+	return cached?.RESOURCE_MIME_TYPE ?? FALLBACK_RESOURCE_MIME_TYPE;
+}
+
+/** ext-apps getToolUiResourceUri, or undefined when the bridge isn't available. */
+export function getToolUiResourceUri(meta: { _meta?: unknown }): string | undefined {
+	if (!cached) return undefined;
+	try {
+		return cached.getToolUiResourceUri(meta);
+	} catch {
+		return undefined;
+	}
+}
+
+/** ext-apps buildAllowAttribute, or "" (most restrictive) when not available. */
+export function buildAllowAttribute(permissions: unknown): string {
+	if (!cached) return "";
+	try {
+		return cached.buildAllowAttribute(permissions);
+	} catch {
+		return "";
+	}
+}

package/mcp/index.ts

@@ -13,6 +13,7 @@ import { getConfigPathFromArgv, truncateAtWord } from "./utils.ts";
 import { initializeOAuth, shutdownOAuth } from "./mcp-auth-flow.ts";
 import { createMcpDirectToolCallRenderer, renderMcpProxyToolCall, renderMcpToolResult } from "./tool-result-renderer.ts";
 import { ToolCache, cacheKey as makeCacheKey } from "./tool-cache.ts";
+import { preloadAppBridge } from "./ext-apps-bridge.ts";
 
 /** Default TTL for cached MCP tool results (60s). Tools that hit a stable
  *  server benefit; volatile ones are penalized for 60s — call sites can
@@ -131,6 +132,10 @@ export default function mcpAdapter(pi: ExtensionAPI) {
       console.error("MCP OAuth initialization failed:", err);
     });
 
+    // Load the (optional, sometimes-broken upstream) ext-apps UI bridge once,
+    // before metadata is built. Guarded — a failure disables UI features only.
+    await preloadAppBridge();
+
     const promise = initializeMcp(pi, ctx);
     initPromise = promise;
 

package/mcp/metadata-cache.ts

@@ -3,7 +3,7 @@ import { existsSync, readFileSync, writeFileSync, renameSync, mkdirSync } from "
 import { dirname } from "node:path";
 import { getAgentPath } from "./agent-dir.ts";
 import { createHash } from "node:crypto";
-import { getToolUiResourceUri } from "@modelcontextprotocol/ext-apps/app-bridge";
+import { getToolUiResourceUri } from "./ext-apps-bridge.ts";
 import type { McpTool, McpResource, ServerEntry, ToolMetadata } from "./types.ts";
 import { formatToolName, isToolExcluded } from "./types.ts";
 import { resourceNameToToolName } from "./resource-tools.ts";

package/mcp/tool-metadata.ts

@@ -1,4 +1,4 @@
-import { getToolUiResourceUri } from "@modelcontextprotocol/ext-apps/app-bridge";
+import { getToolUiResourceUri } from "./ext-apps-bridge.ts";
 import type { McpExtensionState } from "./state.ts";
 import type { ToolMetadata, McpTool, McpResource, ServerEntry } from "./types.ts";
 import { formatToolName, isToolExcluded } from "./types.ts";

package/mcp/ui-resource-handler.ts

@@ -1,4 +1,4 @@
-import { RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/app-bridge";
+import { resourceMimeType } from "./ext-apps-bridge.ts";
 import { UrlElicitationRequiredError, type ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
 import { ResourceFetchError, ResourceParseError } from "./errors.ts";
 import { logger } from "./logger.ts";
@@ -47,7 +47,7 @@ export class UiResourceHandler {
       log.warn("Unsupported MIME type", { mimeType });
       throw new ResourceParseError(
         uri,
-        `unsupported MIME type "${mimeType}" (expected text/html or ${RESOURCE_MIME_TYPE})`,
+        `unsupported MIME type "${mimeType}" (expected text/html or ${resourceMimeType()})`,
         { server: serverName, mimeType }
       );
     }
@@ -69,7 +69,7 @@ export class UiResourceHandler {
     return {
       uri: content.uri ?? uri,
       html,
-      mimeType: mimeType ?? RESOURCE_MIME_TYPE,
+      mimeType: mimeType ?? resourceMimeType(),
       meta: {
         csp: contentMeta.csp ?? listMeta.csp,
         permissions: contentMeta.permissions ?? listMeta.permissions,
@@ -107,7 +107,7 @@ function selectContent(result: ReadResourceResult, preferredUri: string): Resour
 
 function isHtmlMimeType(mimeType: string): boolean {
   const normalized = mimeType.toLowerCase();
-  return normalized.startsWith("text/html") || normalized === RESOURCE_MIME_TYPE.toLowerCase();
+  return normalized.startsWith("text/html") || normalized === resourceMimeType().toLowerCase();
 }
 
 function toHtml(content: ResourceContentRecord): string {

package/mcp/ui-server.ts

@@ -2,7 +2,7 @@ import http, { type IncomingMessage, type ServerResponse } from "node:http";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
-import { buildAllowAttribute } from "@modelcontextprotocol/ext-apps/app-bridge";
+import { buildAllowAttribute } from "./ext-apps-bridge.ts";
 import type {
   CallToolRequest,
   CallToolResult,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "1.13.3",
+  "version": "1.13.5",
   "description": "Project management + workflow framework for pi-coding-agent. Plans, state, MANDATORY rules, self-review, multi-question picker, native footer + welcome chrome — one npm install, zero config. The LLM drives execution and delegates to a worker subagent when available.",
   "type": "module",
   "main": "index.ts",