@solarisdk/mcp 0.3.2 → 0.3.4

package/README.md

@@ -178,7 +178,7 @@ cookie count and origins it stored, so they can see what was persisted.
 |---|---|
 | `solari_sandbox_create` | Create a headless sandbox → `sessionId` |
 | `solari_desktop_create` | Create a GUI desktop → `sessionId` + `streamUrl` |
-| `solari_list` | List the org's sandboxes |
+| `solari_list` | List the org's VMs — **both** sandboxes and desktops, each labelled with its `kind` (optional `kind`/`state` filters) |
 | `solari_kill` | Destroy a session |
 | `solari_connect` | Re-attach to a session by id across restarts (auto-resumes if paused) |
 | `solari_exec` | Run a shell command (via `sh -c`) → `{stdout,stderr,exitCode}` |

package/dist/browser.js

@@ -363,10 +363,15 @@ export function makeBrowserToolset(cfg, reg, deps = defaultDeps) {
                 catch {
                     /* already gone — that is the point */
                 }
+                // Prefer the short link when the gateway offers one — it is far easier
+                // to relay to someone on a phone. Fall back to the long URL for older
+                // gateways that do not return shortUrl yet.
+                const showUrl = h.shortUrl ?? h.url;
                 return text({
                     mode: "hot",
                     handoffId: h.handoffId,
-                    url: h.url,
+                    url: showUrl,
+                    fullUrl: h.url,
                     expiresAt: h.expiresAt,
                     next: "Show the url to the user, then call solari_browser_await_login.",
                 });

package/dist/server.js

@@ -12,11 +12,14 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 import { SolariClient } from "@solarisdk/sdk";
+import { VERSION } from "./version.js";
 import { makeBrowserToolset, releaseAllBrowserSessions, } from "./browser.js";
 // Guest output (file reads, command stdout, code results) is unbounded on the
 // wire; cap it so one `cat` of a big file can't blow the MCP payload budget or
 // OOM the shared hosted task.
 const MAX_TOOL_TEXT = 30_000;
+// Pages of `GET /sandboxes` solari_list will follow per kind (100 rows each).
+const MAX_LIST_PAGES = 5;
 const text = (o) => {
     const s = typeof o === "string" ? o : JSON.stringify(o, null, 2);
     const capped = s.length > MAX_TOOL_TEXT
@@ -81,9 +84,59 @@ export function makeToolset(client, reg) {
             },
         },
         solari_list: {
-            description: "List the org's sandboxes.",
-            inputSchema: {},
-            handler: async () => text(await client.sandboxes.list()),
+            description: "List the org's live VMs — BOTH sandboxes and desktops. Each entry is labelled " +
+                "with its `kind`; `registered:true` means this MCP session already holds a handle " +
+                "so the other tools accept its sessionId directly (otherwise call solari_connect " +
+                "first). Optional kind/state filters.",
+            inputSchema: {
+                kind: z.enum(["sandbox", "desktop"]).optional(),
+                state: z.string().optional(),
+            },
+            handler: async (a) => {
+                // GET /sandboxes is the unified VM index (desktops write the same
+                // SandboxRecord), but it is queried per-kind here so the two flavours
+                // are merged EXPLICITLY: an agent asking "what do I have running"
+                // must never silently lose desktops to a default filter, and the
+                // per-kind counts are what make the answer legible.
+                const kinds = a.kind ? [a.kind] : ["sandbox", "desktop"];
+                const vms = [];
+                const counts = { sandbox: 0, desktop: 0 };
+                let truncated = false;
+                for (const kind of kinds) {
+                    // Follow nextCursor so a big org's desktops aren't cut off by the
+                    // gateway's 100-row default page — bounded so one call can't spin.
+                    let cursor;
+                    for (let page = 0; page < MAX_LIST_PAGES; page++) {
+                        const res = await client.sandboxes.list({
+                            kind,
+                            // `state` is a closed union on the SDK; an unknown value is
+                            // simply ignored by the gateway, so pass it through.
+                            ...(a.state ? { state: a.state } : {}),
+                            ...(cursor ? { cursor } : {}),
+                        });
+                        for (const v of res.sandboxes ?? []) {
+                            const rec = v;
+                            // The wire calls the id `sandboxId` for both kinds; re-label it
+                            // `sessionId` because that is what every other tool here takes.
+                            const id = (rec.sandboxId ?? rec.sessionId);
+                            const k = rec.kind ?? kind;
+                            vms.push({
+                                ...rec,
+                                ...(id ? { sessionId: id } : {}),
+                                kind: k,
+                                registered: id ? reg.sessions.has(id) : false,
+                            });
+                            counts[k] = (counts[k] ?? 0) + 1;
+                        }
+                        cursor = res.nextCursor;
+                        if (!cursor)
+                            break;
+                        if (page === MAX_LIST_PAGES - 1)
+                            truncated = true;
+                    }
+                }
+                return text({ counts, total: vms.length, ...(truncated ? { truncated } : {}), vms });
+            },
         },
         solari_kill: {
             description: "Destroy a session by id.",
@@ -284,7 +337,7 @@ export function buildServerParts(client, browserCfg) {
             process.env.SOLARI_BASE_URL ??
             "https://api.getsolari.com",
     };
-    const server = new McpServer({ name: "solari-mcp", version: "0.3.0" });
+    const server = new McpServer({ name: "solari-mcp", version: VERSION });
     const browserReg = { sessions: new Map() };
     const vmReg = { sessions: new Map() };
     registerToolset(server, {

package/dist/solari-mcp-http.bundle.cjs

@@ -112357,6 +112357,9 @@ var SolariClient = class {
   }
 };
 
+// src/version.ts
+var VERSION = "0.3.4";
+
 // node_modules/puppeteer-core/lib/esm/puppeteer/index.js
 init_index_browser();
 
@@ -113919,10 +113922,12 @@ function makeBrowserToolset(cfg, reg, deps = defaultDeps) {
           await e.browser.close();
         } catch {
         }
+        const showUrl = h.shortUrl ?? h.url;
         return text({
           mode: "hot",
           handoffId: h.handoffId,
-          url: h.url,
+          url: showUrl,
+          fullUrl: h.url,
           expiresAt: h.expiresAt,
           next: "Show the url to the user, then call solari_browser_await_login."
         });
@@ -114238,6 +114243,7 @@ async function releaseAllBrowserSessions(cfg, reg, fetchApi = api) {
 // src/server.ts
 var import_meta2 = {};
 var MAX_TOOL_TEXT = 3e4;
+var MAX_LIST_PAGES = 5;
 var text2 = (o) => {
   const s = typeof o === "string" ? o : JSON.stringify(o, null, 2);
   const capped = s.length > MAX_TOOL_TEXT ? `${s.slice(0, MAX_TOOL_TEXT)}
@@ -114294,9 +114300,45 @@ function makeToolset(client, reg) {
       }
     },
     solari_list: {
-      description: "List the org's sandboxes.",
-      inputSchema: {},
-      handler: async () => text2(await client.sandboxes.list())
+      description: "List the org's live VMs \u2014 BOTH sandboxes and desktops. Each entry is labelled with its `kind`; `registered:true` means this MCP session already holds a handle so the other tools accept its sessionId directly (otherwise call solari_connect first). Optional kind/state filters.",
+      inputSchema: {
+        kind: external_exports.enum(["sandbox", "desktop"]).optional(),
+        state: external_exports.string().optional()
+      },
+      handler: async (a2) => {
+        const kinds = a2.kind ? [a2.kind] : ["sandbox", "desktop"];
+        const vms = [];
+        const counts = { sandbox: 0, desktop: 0 };
+        let truncated = false;
+        for (const kind of kinds) {
+          let cursor;
+          for (let page = 0; page < MAX_LIST_PAGES; page++) {
+            const res = await client.sandboxes.list({
+              kind,
+              // `state` is a closed union on the SDK; an unknown value is
+              // simply ignored by the gateway, so pass it through.
+              ...a2.state ? { state: a2.state } : {},
+              ...cursor ? { cursor } : {}
+            });
+            for (const v2 of res.sandboxes ?? []) {
+              const rec = v2;
+              const id = rec.sandboxId ?? rec.sessionId;
+              const k = rec.kind ?? kind;
+              vms.push({
+                ...rec,
+                ...id ? { sessionId: id } : {},
+                kind: k,
+                registered: id ? reg.sessions.has(id) : false
+              });
+              counts[k] = (counts[k] ?? 0) + 1;
+            }
+            cursor = res.nextCursor;
+            if (!cursor) break;
+            if (page === MAX_LIST_PAGES - 1) truncated = true;
+          }
+        }
+        return text2({ counts, total: vms.length, ...truncated ? { truncated } : {}, vms });
+      }
     },
     solari_kill: {
       description: "Destroy a session by id.",
@@ -114470,7 +114512,7 @@ function buildServerParts(client, browserCfg) {
     apiKey: process.env.SOLARI_BROWSER_API_KEY ?? apiKey,
     baseUrl: process.env.SOLARI_BROWSER_URL ?? process.env.SOLARI_BASE_URL ?? "https://api.getsolari.com"
   };
-  const server = new McpServer({ name: "solari-mcp", version: "0.3.0" });
+  const server = new McpServer({ name: "solari-mcp", version: VERSION });
   const browserReg = { sessions: /* @__PURE__ */ new Map() };
   const vmReg = { sessions: /* @__PURE__ */ new Map() };
   registerToolset(server, {

package/dist/solari-mcp.bundle.cjs

@@ -111026,6 +111026,9 @@ var SolariClient = class {
   }
 };
 
+// src/version.ts
+var VERSION = "0.3.4";
+
 // node_modules/puppeteer-core/lib/esm/puppeteer/index.js
 init_index_browser();
 
@@ -112588,10 +112591,12 @@ function makeBrowserToolset(cfg, reg, deps = defaultDeps) {
           await e.browser.close();
         } catch {
         }
+        const showUrl = h.shortUrl ?? h.url;
         return text({
           mode: "hot",
           handoffId: h.handoffId,
-          url: h.url,
+          url: showUrl,
+          fullUrl: h.url,
           expiresAt: h.expiresAt,
           next: "Show the url to the user, then call solari_browser_await_login."
         });
@@ -112907,6 +112912,7 @@ async function releaseAllBrowserSessions(cfg, reg, fetchApi = api) {
 // src/server.ts
 var import_meta2 = {};
 var MAX_TOOL_TEXT = 3e4;
+var MAX_LIST_PAGES = 5;
 var text2 = (o) => {
   const s = typeof o === "string" ? o : JSON.stringify(o, null, 2);
   const capped = s.length > MAX_TOOL_TEXT ? `${s.slice(0, MAX_TOOL_TEXT)}
@@ -112963,9 +112969,45 @@ function makeToolset(client, reg) {
       }
     },
     solari_list: {
-      description: "List the org's sandboxes.",
-      inputSchema: {},
-      handler: async () => text2(await client.sandboxes.list())
+      description: "List the org's live VMs \u2014 BOTH sandboxes and desktops. Each entry is labelled with its `kind`; `registered:true` means this MCP session already holds a handle so the other tools accept its sessionId directly (otherwise call solari_connect first). Optional kind/state filters.",
+      inputSchema: {
+        kind: external_exports.enum(["sandbox", "desktop"]).optional(),
+        state: external_exports.string().optional()
+      },
+      handler: async (a2) => {
+        const kinds = a2.kind ? [a2.kind] : ["sandbox", "desktop"];
+        const vms = [];
+        const counts = { sandbox: 0, desktop: 0 };
+        let truncated = false;
+        for (const kind of kinds) {
+          let cursor;
+          for (let page = 0; page < MAX_LIST_PAGES; page++) {
+            const res = await client.sandboxes.list({
+              kind,
+              // `state` is a closed union on the SDK; an unknown value is
+              // simply ignored by the gateway, so pass it through.
+              ...a2.state ? { state: a2.state } : {},
+              ...cursor ? { cursor } : {}
+            });
+            for (const v2 of res.sandboxes ?? []) {
+              const rec = v2;
+              const id = rec.sandboxId ?? rec.sessionId;
+              const k = rec.kind ?? kind;
+              vms.push({
+                ...rec,
+                ...id ? { sessionId: id } : {},
+                kind: k,
+                registered: id ? reg.sessions.has(id) : false
+              });
+              counts[k] = (counts[k] ?? 0) + 1;
+            }
+            cursor = res.nextCursor;
+            if (!cursor) break;
+            if (page === MAX_LIST_PAGES - 1) truncated = true;
+          }
+        }
+        return text2({ counts, total: vms.length, ...truncated ? { truncated } : {}, vms });
+      }
     },
     solari_kill: {
       description: "Destroy a session by id.",
@@ -113139,7 +113181,7 @@ function buildServerParts(client, browserCfg) {
     apiKey: process.env.SOLARI_BROWSER_API_KEY ?? apiKey,
     baseUrl: process.env.SOLARI_BROWSER_URL ?? process.env.SOLARI_BASE_URL ?? "https://api.getsolari.com"
   };
-  const server = new McpServer({ name: "solari-mcp", version: "0.3.0" });
+  const server = new McpServer({ name: "solari-mcp", version: VERSION });
   const browserReg = { sessions: /* @__PURE__ */ new Map() };
   const vmReg = { sessions: /* @__PURE__ */ new Map() };
   registerToolset(server, {

package/dist/version.d.ts

@@ -0,0 +1 @@
+export declare const VERSION = "0.3.4";

package/dist/version.js

@@ -0,0 +1,11 @@
+// The single source of truth for the version this server reports to MCP
+// clients (`initialize` → serverInfo.version).
+//
+// It CANNOT be imported straight from package.json: tsconfig pins
+// `rootDir: "src"`, so `import "../package.json"` is outside the root and tsc
+// refuses it; widening rootDir would emit `dist/src/*.js` and break the `bin`
+// path + the esbuild bundles. So it is a literal here — and
+// `test/version.test.mjs` FAILS the build if it ever drifts from package.json.
+//
+// KEEP IN SYNC WITH sdk/mcp/package.json "version".
+export const VERSION = "0.3.4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solarisdk/mcp",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Model Context Protocol server for the Solari cloud browser, sandboxes + desktops \u2014 drive them from Claude Desktop/Cowork, Claude Code, Cursor, etc.",
   "type": "module",
   "bin": {