@addai/node 0.24.1 → 0.25.0

package/dist/gemini-spawn.js

@@ -104,8 +104,8 @@ function writeGeminiWorkspaceSettings(cwd, servers) {
             ...(s.env && Object.keys(s.env).length > 0 ? { env: s.env } : {}),
         };
     }
-    // Start with the host's settings so auth method (security.auth.selectedType
-    // = oauth-personal etc.) and theme carry through. Override just mcpServers.
+    // Start with the host's settings so auth method and theme carry through.
+    // Override just mcpServers — and the auth type, below.
     const hostSettingsPath = path.join(os.homedir(), '.gemini', 'settings.json');
     let baseSettings = {};
     if (fs.existsSync(hostSettingsPath)) {
@@ -115,6 +115,24 @@ function writeGeminiWorkspaceSettings(cwd, servers) {
         catch { /* corrupt — start fresh */ }
     }
     const merged = { ...baseSettings, mcpServers };
+    // Google retired individual Gemini Code Assist OAuth on 18 June 2026: a CLI
+    // set to 'oauth-personal' now answers IneligibleTierError and points at
+    // Antigravity, whatever else is configured. Most hosts still carry that
+    // retired value in ~/.gemini/settings.json, so inheriting it verbatim means
+    // the run cannot start.
+    //
+    // An API key is the supported path that survives (as is vertex-ai for
+    // enterprise), so when one is present the auth type is forced to match it
+    // rather than trusting whatever the host was left set to. childEnv already
+    // passes GEMINI_API_KEY through from the daemon's own environment.
+    if (process.env.GEMINI_API_KEY) {
+        const security = { ...(baseSettings.security ?? {}) };
+        security.auth = {
+            ...(security.auth ?? {}),
+            selectedType: 'gemini-api-key',
+        };
+        merged.security = security;
+    }
     const settingsPath = path.join(dir, 'settings.json');
     fs.writeFileSync(settingsPath, JSON.stringify(merged, null, 2), { mode: 0o600 });
     return settingsPath;
@@ -274,6 +292,40 @@ function spawnGemini(input) {
     if (input.resumeSessionId && isGeminiSessionId(input.resumeSessionId)) {
         args.push('--resume', input.resumeSessionId);
     }
+    // Fail early and legibly when there is nothing to authenticate with. Without
+    // this the run dies inside gemini with "IneligibleTierError: This client is no
+    // longer supported for Gemini Code Assist for individuals", which reads like
+    // an account problem rather than a missing key on this machine.
+    if (!process.env.GEMINI_API_KEY) {
+        const host = path.join(os.homedir(), '.gemini', 'settings.json');
+        let selected = 'oauth-personal';
+        try {
+            const raw = JSON.parse(fs.readFileSync(host, 'utf8'));
+            selected = raw.security?.auth?.selectedType ?? selected;
+        }
+        catch { /* no host settings — the default is the retired one anyway */ }
+        if (selected === 'oauth-personal') {
+            const events = (0, events_1.bufferedEvents)([
+                {
+                    type: 'error',
+                    code: 'gemini_auth_retired',
+                    message: 'gemini cannot start on this machine: Google retired individual ' +
+                        'Gemini Code Assist OAuth on 18 June 2026, and this host is still set ' +
+                        "to 'oauth-personal'. Set GEMINI_API_KEY on the node (or switch the " +
+                        'host to vertex-ai for an enterprise licence), or point this entity at ' +
+                        'another agent.',
+                },
+                { type: 'turn_complete', stopReason: 'failed' },
+            ]);
+            return {
+                pid: undefined,
+                sessionId: null,
+                kill: () => { },
+                onEvent: events.onEvent,
+                done: Promise.resolve(1),
+            };
+        }
+    }
     // No HOME override — gemini's auth + shell-out tools all need the
     // real $HOME. Workspace-scope settings.json (written above) is enough
     // to override the host's mcpServers without poisoning everything else.

package/dist/grok-spawn.js

@@ -74,7 +74,6 @@ const grok_binary_1 = require("./grok-binary");
 const win_1 = require("./win");
 const events_1 = require("./events");
 const think_split_1 = require("./think-split");
-const mcp_headers_1 = require("./mcp-headers");
 /** Real config dir for the logged-in account. GROK_HOME points here so the
  *  entity uses the same account and token refresh works. */
 function realGrokHome() {
@@ -161,44 +160,16 @@ function writeProjectMcpConfig(workingDirectory, servers) {
     }
     const lines = [];
     for (const s of usable) {
-        // Remote MCP servers are BRIDGED through mcp-remote, because grok cannot
-        // speak HTTP MCP itself.
-        //
-        // Its bundled README documents `url` + a `headers` inline table, and this
-        // code used to emit exactly that. Measured against grok 1.0.3, that entry
-        // is SILENTLY IGNORED: in one run grok loaded ten stdio servers and skipped
-        // both url-based ones — ours and a pre-existing third-party entry — with no
-        // error for either. The docs describe a transport the binary does not have.
-        //
-        // That is why entities on grok lost every Connection the moment the
-        // registry moved from `npx` to `http`: the servers were simply not there,
-        // and grok reported it to the model as "(auth required)".
-        //
-        // mcp-remote is the standard stdio<->HTTP shim (grok's own README reaches
-        // for it in its Linear example) and it is verified working here. The cost
-        // is an npx start per remote server on grok runs only — the very cost the
-        // HTTP move removed for every other agent. Revisit when grok ships real
-        // remote-MCP support.
-        //
-        // Folder trust still gates repo-local config.toml servers, so the --trust
-        // launch flag remains load-bearing for these entries to start at all.
-        if ((0, mcp_headers_1.isRemoteMcp)(s.command)) {
-            const url = (0, mcp_headers_1.remoteMcpUrl)(s.args);
-            if (!url) {
-                console.error(`[grok] MCP ${s.slug}: ${s.command} server has no URL — skipped`);
-                continue;
-            }
-            // The bridge itself is shared — see AGENTS_WITHOUT_HTTP_MCP for which
-            // agents need it and the evidence for each.
-            const bridge = (0, mcp_headers_1.remoteMcpBridge)(url, s.env);
-            const bridged = (0, win_1.wrapMcpCommandForPlatform)(bridge.command, bridge.args);
-            lines.push(`[mcp_servers.${tomlStr(s.slug)}]`);
-            lines.push(`command = ${tomlStr(bridged.command)}`);
-            lines.push(`args = [${bridged.args.map(tomlStr).join(', ')}]`);
-            lines.push('enabled = true');
-            // The first run on a machine downloads mcp-remote, which 30s does not cover.
-            lines.push('startup_timeout_sec = 90');
-            lines.push('');
+        // Remote MCP servers (registry command='http'|'sse', args=[url]) have no
+        // verified grok config spelling, and writing the row verbatim is worse
+        // than skipping: grok would try to exec a binary called `http`, the
+        // server would never start, and its tools would vanish with no error —
+        // the exact silent failure that cost an entity its GitHub access after a
+        // provider-ladder hop. Skip it, and say so loudly enough to be findable.
+        if (s.command === 'http' || s.command === 'sse') {
+            console.error(`[grok] MCP ${s.slug}: remote ${s.command} servers are not supported by the grok ` +
+                `adapter — skipping. Its tools will be ABSENT from this run. Use claude (or codex, ` +
+                `which supports url + bearer_token_env_var) for entities that depend on it.`);
             continue;
         }
         // `cmd /c` wrapper for npm-shim commands on native Windows (no-op on POSIX).

package/dist/heartbeat.js

@@ -13,6 +13,8 @@ const supabase_client_1 = require("./supabase-client");
 const store_1 = require("./store");
 const capabilities_1 = require("./capabilities");
 const request_pump_1 = require("./request-pump");
+const pump_1 = require("./flows/pump");
+const manager_1 = require("./desktop/manager");
 const config_1 = require("./config");
 let timer = null;
 let stopped = false;
@@ -59,6 +61,19 @@ async function tick() {
         // whatever it already had (its own default of 4).
         if (res && res.max_concurrent_runs != null)
             (0, request_pump_1.setMaxConcurrent)(res.max_concurrent_runs);
+        // Flows and desktops ride the same heartbeat for the same reason: they are
+        // fields on this node's own row and we are already talking every 30s.
+        //
+        // Each is applied only when the server actually said something. An older
+        // server that has not had the migration says nothing, and nothing must
+        // read as "leave it alone" — never as "turn flows off" (which would
+        // silently strand a queue) or "cap desktops at zero".
+        if (res && typeof res.flows_enabled === 'boolean')
+            (0, pump_1.setFlowsEnabled)(res.flows_enabled);
+        if (res && res.max_concurrent_flows != null)
+            (0, pump_1.setMaxConcurrentFlows)(res.max_concurrent_flows);
+        if (res && res.max_concurrent_desktops != null)
+            (0, manager_1.setMaxConcurrentDesktops)(res.max_concurrent_desktops);
     }
     catch (err) {
         if (err instanceof supabase_client_1.RpcError && err.status === 401) {
@@ -124,6 +139,15 @@ async function runTick() {
             p_token: pairing.daemonToken,
             p_request_ids: (0, request_pump_1.activeRequestIdList)(),
         });
+        // Flow runs are claimed rows too, and the server's reclaim sweep is just
+        // as capable of requeueing a healthy one that happens to be quiet. Sent in
+        // the same tick so the two never drift apart under load; the empty call
+        // matters, because it is what tells the server this build reports flow
+        // runs at all.
+        await (0, supabase_client_1.rpc)('flow_run_heartbeat', {
+            p_token: pairing.daemonToken,
+            p_run_ids: (0, pump_1.activeFlowRunIds)(),
+        });
         lastRunBeatError = '';
     }
     catch (err) {

package/dist/index.js

@@ -56,6 +56,7 @@ const autostart_1 = require("./autostart");
 const sleep_detector_1 = require("./sleep-detector");
 const claude_config_1 = require("./claude-config");
 const request_pump_1 = require("./request-pump");
+const pump_1 = require("./flows/pump");
 const projects_1 = require("./projects");
 const manager_1 = require("./desktop/manager");
 const relay_client_1 = require("./desktop/relay-client");
@@ -210,6 +211,12 @@ async function start(argv = []) {
     (0, projects_1.start)();
     // …and to keep desktops and the containers behind them in agreement.
     (0, manager_1.startDesktopManager)();
+    // The flows pump starts idle and stays that way until the heartbeat reports
+    // this machine has flows switched on. Starting it unconditionally is right:
+    // the alternative is a daemon that only notices the switch on restart, and
+    // "turn it on, then restart the node" is not a setup step anyone should have
+    // to be told about.
+    (0, pump_1.start)();
     // …and dial out to the relay. That socket is this node's live link: the
     // server pushes work down it the instant it exists, so a command no longer
     // waits up to 30s for the next heartbeat to notice it. The heartbeat and
@@ -231,6 +238,7 @@ async function start(argv = []) {
         (0, manager_1.stopDesktopManager)();
         (0, relay_client_1.stopRelayClient)();
         (0, request_pump_1.stop)();
+        (0, pump_1.stop)();
         (0, heartbeat_1.stop)();
         (0, auto_update_1.stop)();
         sleepMonitor.stop();
@@ -241,10 +249,20 @@ async function start(argv = []) {
         // leave paused flow runs stuck `waiting` until server-side reclaim
         // (5 min) requeued or failed them.
         try {
-            const { drained, timedOut } = await (0, request_pump_1.drain)(drainTimeoutMs);
-            lastDrain = { drained, timedOut };
-            if (drained || timedOut) {
-                console.log(`[shutdown] drained ${drained} request(s); ${timedOut} still in-flight (timed out)`);
+            // Both pools drain against the SAME deadline, in parallel. Draining them
+            // one after the other would give a machine holding both up to twice the
+            // timeout to shut down, and the timeout is there because something
+            // upstream is waiting for this process to be gone.
+            const [requests, flows] = await Promise.all([
+                (0, request_pump_1.drain)(drainTimeoutMs),
+                (0, pump_1.drain)(drainTimeoutMs),
+            ]);
+            lastDrain = { drained: requests.drained, timedOut: requests.timedOut };
+            if (requests.drained || requests.timedOut) {
+                console.log(`[shutdown] drained ${requests.drained} request(s); ${requests.timedOut} still in-flight (timed out)`);
+            }
+            if (flows.drained || flows.timedOut) {
+                console.log(`[shutdown] drained ${flows.drained} flow run(s); ${flows.timedOut} still in-flight (timed out)`);
             }
         }
         catch (err) {

package/dist/mcp-headers.d.ts

@@ -20,12 +20,18 @@ export declare function remoteMcpHeaders(env?: Record<string, string> | null): R
  *   claude  YES  — proven in production; entities use these every day.
  *   codex   YES  — `codex mcp list` shows a `url` entry under Url, enabled.
  *   kimi    YES  — `kimi mcp list` prints "<slug> (http): <url>".
- *   gemini  ?    — UNVERIFIED. The CLI on hand cannot authenticate at all
- *                  ("no longer supported for Gemini Code Assist for
- *                  individuals"), so its httpUrl handling was never observed
- *                  connecting. No entity runs gemini today. If one ever does,
- *                  verify before trusting it — this exact assumption is what
- *                  cost us grok.
+ *   gemini  YES  — its shipped bundle treats httpUrl as a network transport
+ *                  (hasNetworkTransport), carries StreamableHTTPClientTransport,
+ *                  and documents "httpUrl (for Streamable HTTP), url (for SSE),
+ *                  and command (for stdio)" with a headers map. Read out of the
+ *                  installed bundle rather than the docs, because docs are what
+ *                  lied about grok. It was never watched connecting, though:
+ *                  gemini-cli cannot authenticate at all on a personal account
+ *                  since Google retired individual Gemini Code Assist OAuth on
+ *                  18 June 2026 (IneligibleTierError -> migrate to Antigravity).
+ *                  API-key and enterprise auth are unaffected. So gemini's
+ *                  blocker is AUTH, not MCP transport — bridging it would fix
+ *                  nothing. No entity runs gemini today.
  *   grok    NO   — grok 1.0.3 SILENTLY IGNORES url-based entries. In one run it
  *                  loaded ten stdio servers and skipped every remote one, ours
  *                  and a third party's, with no error, while its own bundled

package/dist/mcp-headers.js

@@ -57,12 +57,18 @@ function remoteMcpHeaders(env) {
  *   claude  YES  — proven in production; entities use these every day.
  *   codex   YES  — `codex mcp list` shows a `url` entry under Url, enabled.
  *   kimi    YES  — `kimi mcp list` prints "<slug> (http): <url>".
- *   gemini  ?    — UNVERIFIED. The CLI on hand cannot authenticate at all
- *                  ("no longer supported for Gemini Code Assist for
- *                  individuals"), so its httpUrl handling was never observed
- *                  connecting. No entity runs gemini today. If one ever does,
- *                  verify before trusting it — this exact assumption is what
- *                  cost us grok.
+ *   gemini  YES  — its shipped bundle treats httpUrl as a network transport
+ *                  (hasNetworkTransport), carries StreamableHTTPClientTransport,
+ *                  and documents "httpUrl (for Streamable HTTP), url (for SSE),
+ *                  and command (for stdio)" with a headers map. Read out of the
+ *                  installed bundle rather than the docs, because docs are what
+ *                  lied about grok. It was never watched connecting, though:
+ *                  gemini-cli cannot authenticate at all on a personal account
+ *                  since Google retired individual Gemini Code Assist OAuth on
+ *                  18 June 2026 (IneligibleTierError -> migrate to Antigravity).
+ *                  API-key and enterprise auth are unaffected. So gemini's
+ *                  blocker is AUTH, not MCP transport — bridging it would fix
+ *                  nothing. No entity runs gemini today.
  *   grok    NO   — grok 1.0.3 SILENTLY IGNORES url-based entries. In one run it
  *                  loaded ten stdio servers and skipped every remote one, ours
  *                  and a third party's, with no error, while its own bundled

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addai/node",
-  "version": "0.24.1",
+  "version": "0.25.0",
   "description": "Daemon that pairs a machine with your +Ai account and runs Claude / Codex / Kimi / Gemini agents on its behalf. Reachable via Supabase from Vault, Entity Studio, or any other +Ai surface.",
   "license": "MIT",
   "keywords": [
@@ -49,6 +49,7 @@
     "node": ">=18"
   },
   "dependencies": {
+    "@addai/node-flows": "^1.0.0",
     "node-pty": "^1.1.0",
     "ws": "^8.21.3"
   },