pi-soly 2.4.0 → 2.4.1

package/index.ts

@@ -973,13 +973,13 @@ export default function solyExtension(pi: ExtensionAPI) {
 				try {
 					m.default(pi);
 				} catch (err) {
-					console.error("[soly] MCP adapter failed to initialize:", err);
+					emit("[soly] MCP adapter failed to initialize:" + ": " + (err instanceof Error ? err.message : String(err)), "error");
 				}
 			})
 			.catch((err) => {
-				console.error("[soly] MCP adapter unavailable (load failed):", err);
+				emit("[soly] MCP adapter unavailable (load failed):" + ": " + (err instanceof Error ? err.message : String(err)), "error");
 			});
 	} catch (err) {
-		console.error("[soly] MCP adapter unavailable (load threw):", err);
+		emit("[soly] MCP adapter unavailable (load threw):" + ": " + (err instanceof Error ? err.message : String(err)), "error");
 	}
 }

package/mcp/config.ts

@@ -4,6 +4,7 @@ import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { getAgentPath } from "./agent-dir.ts";
 import type { McpConfig, ServerEntry, McpSettings, ImportKind, ServerProvenance } from "./types.ts";
+import { emit } from "../visual/event-sink.ts";
 
 const GENERIC_GLOBAL_CONFIG_PATH = join(homedir(), ".config", "mcp", "mcp.json");
 const PROJECT_CONFIG_NAME = ".mcp.json";
@@ -279,7 +280,7 @@ function expandImports(config: McpConfig, cwd = process.cwd()): McpConfig {
         }
       }
     } catch (error) {
-      console.warn(`Failed to import MCP config from ${importKind}:`, error);
+      emit(`Failed to import MCP config from ${importKind}: ${error instanceof Error ? error.message : String(error)}`, "warning");
     }
   }
 
@@ -316,7 +317,7 @@ function readValidatedConfig(path: string, label: string): McpConfig | null {
   try {
     return validateConfig(JSON.parse(readFileSync(path, "utf-8")));
   } catch (error) {
-    console.warn(`Failed to load ${label}:`, error);
+    emit(`Failed to load ${label}: ${error instanceof Error ? error.message : String(error)}`, "warning");
     return null;
   }
 }

package/mcp/direct-tools.ts

@@ -13,6 +13,7 @@ import { resourceNameToToolName } from "./resource-tools.ts";
 import { authenticate, supportsOAuth } from "./mcp-auth-flow.ts";
 import { formatAuthRequiredMessage } from "./utils.ts";
 import { ToolCache, cacheKey } from "./tool-cache.ts";
+import { emit } from "../visual/event-sink.ts";
 
 const BUILTIN_NAMES = new Set(["read", "bash", "edit", "write", "grep", "find", "ls", "mcp"]);
 
@@ -133,11 +134,11 @@ export function resolveDirectTools(
       if (isToolExcluded(tool.name, serverName, prefix, definition.excludeTools)) continue;
       const prefixedName = formatToolName(tool.name, serverName, prefix);
       if (BUILTIN_NAMES.has(prefixedName)) {
-        console.warn(`MCP: skipping direct tool "${prefixedName}" (collides with builtin)`);
+        emit(`MCP: skipping direct tool "${prefixedName}" (collides with builtin)`, "warning");
         continue;
       }
       if (seenNames.has(prefixedName)) {
-        console.warn(`MCP: skipping duplicate direct tool "${prefixedName}" from "${serverName}"`);
+        emit(`MCP: skipping duplicate direct tool "${prefixedName}" from "${serverName}"`, "warning");
         continue;
       }
       seenNames.add(prefixedName);
@@ -159,11 +160,11 @@ export function resolveDirectTools(
         if (isToolExcluded(baseName, serverName, prefix, definition.excludeTools)) continue;
         const prefixedName = formatToolName(baseName, serverName, prefix);
         if (BUILTIN_NAMES.has(prefixedName)) {
-          console.warn(`MCP: skipping direct resource tool "${prefixedName}" (collides with builtin)`);
+          emit(`MCP: skipping direct resource tool "${prefixedName}" (collides with builtin)`, "warning");
           continue;
         }
         if (seenNames.has(prefixedName)) {
-          console.warn(`MCP: skipping duplicate direct resource tool "${prefixedName}" from "${serverName}"`);
+          emit(`MCP: skipping duplicate direct resource tool "${prefixedName}" from "${serverName}"`, "warning");
           continue;
         }
         seenNames.add(prefixedName);

package/mcp/ext-apps-bridge.ts

@@ -17,6 +17,8 @@
 // resolve ext-apps' types (which themselves reference the missing sdk subpath).
 // =============================================================================
 
+import { emit } from "../visual/event-sink.ts";
+
 /** Minimal shape of the bits of ext-apps/app-bridge we use. */
 interface AppBridge {
 	RESOURCE_MIME_TYPE: string;
@@ -43,9 +45,10 @@ export async function preloadAppBridge(): Promise<void> {
 		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.",
+		emit(
+			"MCP UI (ext-apps/app-bridge) could not load — app-bridge features disabled " +
+				"(upstream ext-apps/sdk version mismatch, not a soly bug). Core MCP unaffected.",
+			"warning",
 		);
 	}
 }

package/mcp/host-html-template.ts

@@ -1,4 +1,5 @@
 import type { UiHostContext, UiResourceContent, UiResourceCsp } from "./types.ts";
+import { emit } from "../visual/event-sink.ts";
 
 // Use locally bundled AppBridge to avoid CDN Zod bundling issues
 const DEFAULT_APP_BRIDGE_MODULE_URL = "/app-bridge.bundle.js";
@@ -268,7 +269,7 @@ export function buildHostHtmlTemplate(input: HostHtmlTemplateInput): string {
       const transport = new PostMessageTransport(iframe.contentWindow, null);
       await bridge.connect(transport);
     } catch (error) {
-      console.error("[host] Bridge connection failed:", error);
+      emit("[host] Bridge connection failed:" + ": " + (error instanceof Error ? error.message : String(error)), "error");
       showError("Failed to initialize AppBridge: " + String(error));
     }
 

package/mcp/index.ts

@@ -58,7 +58,7 @@ export default function mcpAdapter(pi: ExtensionAPI) {
       await currentState.lifecycle.gracefulShutdown();
     } catch (error) {
       if (flushError) {
-        console.error("MCP: graceful shutdown failed after metadata flush error", error);
+        emit("MCP: graceful shutdown failed after metadata flush error" + ": " + (error instanceof Error ? error.message : String(error)), "error");
       } else {
         throw error;
       }
@@ -122,7 +122,7 @@ export default function mcpAdapter(pi: ExtensionAPI) {
         shutdownOAuth(),
       ]);
     } catch (error) {
-      console.error("MCP: failed to shut down previous session state", error);
+      emit("MCP: failed to shut down previous session state" + ": " + (error instanceof Error ? error.message : String(error)), "error");
     }
 
     if (generation !== lifecycleGeneration) {
@@ -130,7 +130,7 @@ export default function mcpAdapter(pi: ExtensionAPI) {
     }
 
     await initializeOAuth().catch(err => {
-      console.error("MCP OAuth initialization failed:", err);
+      emit("MCP OAuth initialization failed:" + ": " + (err instanceof Error ? err.message : String(err)), "error");
     });
 
     // Load the (optional, sometimes-broken upstream) ext-apps UI bridge once,
@@ -145,7 +145,7 @@ export default function mcpAdapter(pi: ExtensionAPI) {
         try {
           await shutdownState(nextState, "stale_session_start");
         } catch (error) {
-          console.error("MCP: failed to clean stale session state", error);
+          emit("MCP: failed to clean stale session state" + ": " + (error instanceof Error ? error.message : String(error)), "error");
         }
         return;
       }
@@ -161,7 +161,7 @@ export default function mcpAdapter(pi: ExtensionAPI) {
       if (initPromise !== promise && initPromise !== null) {
         return;
       }
-      console.error("MCP initialization failed:", err);
+      emit("MCP initialization failed:" + ": " + (err instanceof Error ? err.message : String(err)), "error");
       initPromise = null;
     });
   });
@@ -179,7 +179,7 @@ export default function mcpAdapter(pi: ExtensionAPI) {
         shutdownOAuth(),
       ]);
     } catch (error) {
-      console.error("MCP: session shutdown cleanup failed", error);
+      emit("MCP: session shutdown cleanup failed" + ": " + (error instanceof Error ? error.message : String(error)), "error");
     }
   });
 

package/mcp/init.ts

@@ -161,7 +161,7 @@ export async function initializeMcp(
       if (ctx.hasUI) {
         emit(`MCP: Failed to connect to ${name}: ${error}`, "error");
       }
-      console.error(`MCP: Failed to connect to ${name}: ${error}`);
+      emit(`MCP: Failed to connect to ${name}: ${error}`, "error");
       continue;
     }
 

package/mcp/logger.ts

@@ -3,6 +3,8 @@
  * Provides structured, contextual logs with levels.
  */
 
+import { emit as emitEvent } from "../visual/event-sink.ts";
+
 export type LogLevel = "debug" | "info" | "warn" | "error";
 
 export interface LogContext {
@@ -73,19 +75,22 @@ class Logger {
       timestamp: new Date(),
     };
 
-    // Default console output
-    const prefix = LEVEL_PREFIX[level];
+    // Route through the event sink → Working sub-line (no console output).
+    // Context is appended for usefulness; the console-style [MCP-UI:*]
+    // prefix is dropped (the sub-line glyph carries the level).
     const contextStr = formatContext(entry.context);
-    const fullMessage = contextStr ? `${prefix} ${message} ${contextStr}` : `${prefix} ${message}`;
+    const errStr = error ? `: ${error.message}` : "";
+    const text = contextStr ? `${message}${errStr} ${contextStr}` : `${message}${errStr}`;
 
     if (level === "error") {
-      console.error(fullMessage, error ?? "");
+      emitEvent(text, "error");
     } else if (level === "warn") {
-      console.warn(fullMessage);
+      emitEvent(text, "warning");
     } else if (level === "debug") {
-      console.debug(fullMessage);
+      // Debug is too verbose for a single-line toolbar slot; drop unless
+      // a custom handler (e.g. file logger) is registered.
     } else {
-      console.log(fullMessage);
+      emitEvent(text, "info");
     }
 
     // Custom handlers

package/mcp/mcp-auth-flow.ts

@@ -32,6 +32,7 @@ import {
   type StoredTokens,
 } from "./mcp-auth.ts"
 import type { ServerEntry } from "./types.ts"
+import { emit } from "../visual/event-sink.ts";
 
 /** Auth status for a server */
 export type AuthStatus = "authenticated" | "expired" | "not_authenticated"
@@ -399,11 +400,11 @@ export async function authenticate(
     try {
       // Open browser. Always print the URL first so remote/headless users can copy it
       // even when the OS browser handoff is unavailable or invisible.
-      console.log(`MCP Auth: Open this URL to authenticate ${serverName}:\n${authorizationUrl}`)
+      emit(`MCP Auth: Open this URL to authenticate ${serverName}:\n${authorizationUrl}`, "info");
       try {
         await open(authorizationUrl)
       } catch (error) {
-        console.warn(`MCP Auth: Failed to open browser for ${serverName}; waiting for manual callback`, { error })
+        emit(`MCP Auth: Failed to open browser for ${serverName}; waiting for manual callback`, "warning");
       }
 
       // Wait for callback
@@ -462,7 +463,7 @@ export async function getValidToken(
 
   if (expired === true && entry.tokens.refreshToken) {
     // Token is expired, try to refresh
-    console.log(`MCP Auth: Token expired for ${serverName}, attempting refresh`)
+    emit(`MCP Auth: Token expired for ${serverName}, attempting refresh`, "info");
 
     try {
       // Create auth provider for token refresh
@@ -472,7 +473,7 @@ export async function getValidToken(
 
       const clientInfo = await authProvider.clientInformation()
       if (!clientInfo) {
-        console.log(`MCP Auth: No client info for refresh for ${serverName}`)
+        emit(`MCP Auth: No client info for refresh for ${serverName}`, "info");
         return null
       }
 
@@ -483,7 +484,7 @@ export async function getValidToken(
       const refreshed = await getAuthForUrl(serverName, serverUrl)
       return refreshed?.tokens ?? null
     } catch (error) {
-      console.error(`MCP Auth: Token refresh failed for ${serverName}`, { error })
+      emit(`MCP Auth: Token refresh failed for ${serverName}`, "error");
       return null
     }
   }
@@ -519,7 +520,7 @@ export async function removeAuth(serverName: string): Promise<void> {
   await clearPendingAuth(serverName, oauthState)
   clearAllCredentials(serverName)
   await clearOAuthState(serverName)
-  console.log(`MCP Auth: Removed credentials for ${serverName}`)
+  emit(`MCP Auth: Removed credentials for ${serverName}`, "info");
 }
 
 /**

package/mcp/mcp-auth.ts

@@ -12,6 +12,7 @@ import { createHash } from 'crypto';
 import { mkdirSync, readFileSync, writeFileSync, existsSync, rmSync } from 'fs';
 import { join } from 'path';
 import { getAgentPath } from './agent-dir.ts';
+import { emit } from "../visual/event-sink.ts";
 
 /** OAuth token storage format */
 export interface StoredTokens {
@@ -86,7 +87,7 @@ function readAuthEntry(serverName: string): AuthEntry | undefined {
     const data = readFileSync(filePath, 'utf-8');
     return JSON.parse(data) as AuthEntry;
   } catch (error) {
-    console.error(`Failed to read auth entry for ${serverName}:`, error);
+    emit(`Failed to read auth entry for ${serverName}:` + ": " + (error instanceof Error ? error.message : String(error)), "error");
     return undefined;
   }
 }
@@ -155,7 +156,7 @@ export function removeAuthEntry(serverName: string): void {
       }
     }
   } catch (error) {
-    console.error(`Failed to remove auth entry for ${serverName}:`, error);
+    emit(`Failed to remove auth entry for ${serverName}:` + ": " + (error instanceof Error ? error.message : String(error)), "error");
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Workflow + project management for pi-coding-agent. Plans, state, MANDATORY rules, self-review, multi-question picker. One npm install, zero config. LLM drives the workflow inline via the soly_workflow tool — no external subagent plugin.",
   "type": "module",
   "main": "index.ts",

package/quota/zai.ts

@@ -0,0 +1,45 @@
+// =============================================================================
+// quota/zai.ts — Zhipu AI (zai / GLM) quota provider
+// =============================================================================
+//
+// Adapter for the "zai" provider id. Implement fetch() to return a
+// QuotaSnapshot — the poller + footer do the rest.
+//
+// TODO(zai): fill in the real fetch. Options:
+//   (a) shell out to a CLI (like minimax does with `mmx`) if one exists
+//   (b) read the API key from env (ZAI_API_KEY / ZHIPUAI_API_KEY) and
+//       call the billing/quota endpoint directly via fetch()
+// The shape below is the contract — replace the body of fetch().
+
+import type { QuotaProvider, QuotaSnapshot } from "./types.ts";
+
+/** Zhipu AI quota provider.
+ *
+ *  Register in index.ts:
+ *    registerQuotaProvider(zaiProvider);
+ *  Then any model with provider="zai" (or "zai-cn") shows the segment. */
+export const zaiProvider: QuotaProvider = {
+	id: "zai",
+	async fetch(): Promise<QuotaSnapshot | null> {
+		// TODO(zai): real implementation. Example shape if using HTTP:
+		//
+		//   const key = process.env.ZAI_API_KEY ?? process.env.ZHIPUAI_API_KEY;
+		//   if (!key) return null;
+		//   try {
+		//     const res = await fetch("https://open.bigmodel.cn/api/paas/v4/billing", {
+		//       headers: { Authorization: `Bearer ${key}` },
+		//     });
+		//     if (!res.ok) return null;
+		//     const data = await res.json() as { remaining?: number; resetsAt?: string };
+		//     return {
+		//       remainingPercent: data.remaining,
+		//       resetsInMs: data.resetsAt ? Date.parse(data.resetsAt) - Date.now() : null,
+		//     };
+		//   } catch {
+		//     return null; // never throw — poller treats null as "no data"
+		//   }
+		//
+		// Until implemented, return null (segment stays hidden for zai models).
+		return null;
+	},
+};