grain-tools 0.10.12 → 0.10.13

package/dist/mcp-app.html

@@ -148961,7 +148961,7 @@ function App() {
     var _a3, _b3;
     if (!isReady || !activeTab) return;
     const tabId = activeTab.id;
-    updateTab(tabId, { isLoading: true, error: null });
+    updateTab(tabId, { isLoading: true, error: null, cancelled: false, errorDetails: null });
     try {
       const callResult = await callServerTool("run_query", { sql, session: "mcp-app-manual" });
       if (callResult.isError) {
@@ -149105,7 +149105,10 @@ function App() {
             data: result,
             domLayout: "autoHeight"
           }
-        ) }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "sp-empty", children: "No results yet." }) })
+        ) }) : activeTab.cancelled ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "sp-cancelled-bar sp-empty", children: [
+          "Query cancelled",
+          activeTab.errorDetails ? `: ${activeTab.errorDetails}` : ""
+        ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "sp-empty", children: "No results yet." }) })
       ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ConnectionsManager, { theme: theme2 })
     ] })
   ] });

package/out/server/standalone.js

@@ -19277,13 +19277,27 @@ var init_StdioBridge = __esm({
         }
       }
       async forwardAgentMessage(message, fatal) {
+        const isInitialize = "method" in message && message.method === "initialize";
+        const isHandshake = isInitialize || "method" in message && message.method === "notifications/initialized";
+        if (!isInitialize && this.sessionOpening) {
+          await this.sessionOpening;
+        }
         if (this.reconnecting) {
-          this.queuedAgentMessages.push(message);
+          if (!isHandshake) {
+            this.queuedAgentMessages.push(message);
+          }
           return;
         }
+        const sending = this.daemonTransport.send(message);
+        if (isInitialize) {
+          this.sessionOpening = sending.catch(() => void 0);
+        }
         try {
-          await this.daemonTransport.send(message);
+          await sending;
         } catch {
+          if (!isHandshake) {
+            this.queuedAgentMessages.push(message);
+          }
           void this.reconnect(fatal);
         }
       }
@@ -20473,7 +20487,11 @@ var init_TelemetrySchema = __esm({
         duration_bucket: "durationBucket",
         error_kind: "errorKind"
       },
-      ledger_health: { entries_bucket: "rowCountBucket", write_failures_bucket: "rowCountBucket" },
+      ledger_health: {
+        entries_bucket: "rowCountBucket",
+        write_failures_bucket: "rowCountBucket",
+        outcome: "safeString"
+      },
       ledger_verify_completed: {
         outcome: "safeString",
         entries_checked_bucket: "rowCountBucket",
@@ -21816,7 +21834,7 @@ var require_package = __commonJS({
       name: "grain",
       displayName: "Grain SQL",
       description: "Run SQL in VS Code and expose safe, visible MCP database tools for Claude, Cursor, and other AI agents.",
-      version: "0.10.12",
+      version: "0.10.13",
       license: "UNLICENSED",
       mcpName: "io.github.pattrnlabs/grain",
       publisher: "pattrnlabs",
@@ -101556,13 +101574,26 @@ var init_QueryOperationRunner = __esm({
           sql
         };
       }
+      getNextResultNumber(session) {
+        let maxCount = 0;
+        session.tabs.forEach((tab) => {
+          const match = tab.title.match(/^Result (\d+)$/);
+          if (match && match[1]) {
+            const count2 = parseInt(match[1], 10);
+            if (count2 > maxCount) {
+              maxCount = count2;
+            }
+          }
+        });
+        return maxCount + 1;
+      }
       resolveTab(session, providedTabId, shouldCreateNewTab, providedTitle) {
         if (providedTabId) {
           const tab = session.tabs.get(providedTabId);
           return {
             tab,
             tabId: providedTabId,
-            tabTitle: providedTitle || tab?.title || `Result ${session.tabs.size + 1}`
+            tabTitle: providedTitle || tab?.title || `Result ${this.getNextResultNumber(session)}`
           };
         }
         if (!shouldCreateNewTab && session.activeTabId) {
@@ -101578,7 +101609,7 @@ var init_QueryOperationRunner = __esm({
         return {
           tab: void 0,
           tabId: `t${Math.random().toString(36).substring(2, 10)}`,
-          tabTitle: providedTitle || `Result ${session.tabs.size + 1}`
+          tabTitle: providedTitle || `Result ${this.getNextResultNumber(session)}`
         };
       }
       async executeAndStore(sessionId, tabId, sql, connectionId, connectionProfile, authHeader, controller, origin2, loadAllRows, enforceReadOnly, clientConsent, workspaceRoot) {
@@ -183984,13 +184015,25 @@ This link expires at ${new Date(
         };
       }
       async handleLedgerStats(clientConsent) {
-        if (!this.ledger)
+        if (!this.ledger) {
+          this.options.telemetry?.capture(
+            "ledger_health",
+            {
+              state: "daemon",
+              outcome: "disabled",
+              entries_bucket: "0",
+              write_failures_bucket: "0"
+            },
+            clientConsent
+          );
           return textToolResult("Ledger disabled.");
+        }
         const stats = await this.ledger.stats();
         this.options.telemetry?.capture(
           "ledger_health",
           {
             state: "daemon",
+            outcome: "enabled",
             entries_bucket: bucketRowCount(stats.persisted_entries),
             write_failures_bucket: bucketRowCount(stats.write_failures)
           },
@@ -183999,8 +184042,19 @@ This link expires at ${new Date(
         return { content: [{ type: "text", text: JSON.stringify(stats) }], structuredContent: stats };
       }
       async handleVerifyLedger(clientConsent) {
-        if (!this.ledger)
+        if (!this.ledger) {
+          this.options.telemetry?.capture(
+            "ledger_verify_completed",
+            {
+              state: "daemon",
+              outcome: "disabled",
+              entries_checked_bucket: "0",
+              duration_bucket: "<100ms"
+            },
+            clientConsent
+          );
           return textToolResult("Ledger disabled.");
+        }
         const startedAt = Date.now();
         const result = await verifyLedger(this.ledger);
         this.options.telemetry?.capture(
@@ -251308,7 +251362,14 @@ function confirmsExpectedInstance(expected, identity2) {
   if (expected.token && identity2.pid === void 0) {
     return false;
   }
-  return classifyRecordInstance(expected, identity2, Date.now()) !== "mismatch";
+  if (expected.pid === void 0 || expected.startedAt === void 0) {
+    return true;
+  }
+  return classifyRecordInstance(
+    { pid: expected.pid, startedAt: expected.startedAt },
+    identity2,
+    Date.now()
+  ) !== "mismatch";
 }
 function probeSharedDaemonOnce(port, timeoutMs, expected) {
   return new Promise((resolve11) => {
@@ -251363,10 +251424,33 @@ function probeSharedDaemonOnce(port, timeoutMs, expected) {
     });
   });
 }
+function isTokenAccepted(port, token, timeoutMs) {
+  return new Promise((resolve11) => {
+    const request2 = http.get(
+      {
+        host: "127.0.0.1",
+        port,
+        path: "/bridge-token-check",
+        timeout: timeoutMs,
+        headers: { Authorization: `Bearer ${token}` }
+      },
+      (response) => {
+        response.resume();
+        resolve11(response.statusCode !== 401 && response.statusCode !== 403);
+      }
+    );
+    request2.on("timeout", () => {
+      request2.destroy();
+      resolve11(true);
+    });
+    request2.on("error", () => resolve11(true));
+  });
+}
 
 // src/server/standalone.ts
 init_StdioBridge();
 init_DaemonAuthToken();
+init_AgentToken();
 init_ConfigLoader();
 
 // src/server/cli/subcommands.ts
@@ -253035,12 +253119,12 @@ async function main() {
     const configDir = defaultDaemonConfigDir();
     const { address, source, record: record2 } = resolveDaemonAddress({ args, env: process.env, configDir });
     if (address) {
-      const expected = record2 ? {
-        pid: record2.pid,
-        startedAt: record2.startedAt,
-        token: readDaemonAuthToken(configDir)
-      } : void 0;
-      const probe = await probeSharedDaemon(address.port, 500, expected);
+      const accessToken = readDaemonAuthToken(configDir);
+      const expected = record2 ? { pid: record2.pid, startedAt: record2.startedAt, token: accessToken } : accessToken ? { token: accessToken } : void 0;
+      const probed = await probeSharedDaemon(address.port, 500, expected);
+      const agentToken = readAgentToken(configDir);
+      const foreignReason = !probed.identity ? void 0 : !agentToken ? "no-agent-token" : await isTokenAccepted(address.port, agentToken, 500) ? void 0 : "agent-token-rejected";
+      const probe = foreignReason ? { attempts: probed.attempts, failureReason: foreignReason } : probed;
       if (probe.identity) {
         console.error(
           `[grain] bridging stdio to shared daemon v${probe.identity.version ?? "?"} on ${address.host}:${address.port} (via ${source}, RFC-082) after ${probe.attempts} attempt(s)`
@@ -253050,8 +253134,9 @@ async function main() {
         return;
       }
       const reasonStr = probe.failureReason === "stale-record" ? `stale-record pid ${expected?.pid}` : probe.failureReason;
+      const detail = probe.failureReason === "no-agent-token" ? `answered, but ${configDir} has no agent-token for this bridge to present` : probe.failureReason === "wrong-instance" || probe.failureReason === "agent-token-rejected" ? `answered, but it does not accept the tokens in ${configDir}, so it belongs to a different Grain home` : void 0;
       console.error(
-        `[grain] no shared daemon at ${address.host}:${address.port} (via ${source}) after ${probe.attempts} attempt(s) (${reasonStr}); starting embedded stdio daemon \u2014 this session's queries will not appear in the extension's results panel`
+        (detail ? `[grain] the daemon at ${address.host}:${address.port} (via ${source}) ${detail} (${reasonStr}); check GRAIN_HOME in this MCP server's config. Starting embedded stdio ` : `[grain] no shared daemon at ${address.host}:${address.port} (via ${source}) after ${probe.attempts} attempt(s) (${reasonStr}); starting embedded stdio `) + `daemon \u2014 this session's queries will not appear in the extension's results panel`
       );
       notSetUpMessage = resolveNotSetUpMessage(Boolean(process.env["GRAIN_CONNECTIONS"]));
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grain-tools",
-  "version": "0.10.12",
+  "version": "0.10.13",
   "mcpName": "io.github.pattrnlabs/grain",
   "description": "Standalone Grain MCP database server for VS Code, Claude Desktop, Cursor, and other MCP clients.",
   "main": "out/server/standalone.js",

package/server.json

@@ -8,14 +8,14 @@
     "source": "github",
     "id": "1348511592"
   },
-  "version": "0.10.12",
+  "version": "0.10.13",
   "websiteUrl": "https://grain.tools",
   "packages": [
     {
       "registryType": "npm",
       "registryBaseUrl": "https://registry.npmjs.org",
       "identifier": "grain-tools",
-      "version": "0.10.12",
+      "version": "0.10.13",
       "runtimeHint": "npx",
       "runtimeArguments": [
         {