open-agents-ai 0.103.44 → 0.103.46

package/dist/index.js

@@ -12601,6 +12601,18 @@ async function handleCmd(cmd) {
 
       // \u2500\u2500 Metered Inference Exposure \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
       case 'expose': {
+        // Clear old inference capabilities before registering new ones
+        // (prevents stale local Ollama models when switching to passthrough, or vice versa)
+        if (typeof nexus.getRegisteredCapabilities === 'function' && typeof nexus.unregisterCapability === 'function') {
+          var oldCaps = nexus.getRegisteredCapabilities();
+          for (var oci = 0; oci < oldCaps.length; oci++) {
+            if (oldCaps[oci].startsWith('inference:') || oldCaps[oci] === 'system_metrics' || oldCaps[oci] === '__list_capabilities') {
+              try { nexus.unregisterCapability(oldCaps[oci]); } catch {}
+            }
+          }
+          dlog('expose: cleared ' + oldCaps.length + ' old capabilities');
+        }
+
         // Auth key for gating inference access (passed from ExposeP2PGateway)
         var exposeAuthKey = args.auth_key || '';
         if (exposeAuthKey) {
@@ -13629,23 +13641,56 @@ process.on('SIGINT', () => process.emit('SIGTERM'));
       // =========================================================================
       async doConnect(args) {
         await this.ensureDir();
+        const currentScriptHash = createHash("sha256").update(DAEMON_SCRIPT).digest("hex").slice(0, 16);
         const existingPid = this.getDaemonPid();
         if (existingPid) {
-          const statusFile2 = join30(this.nexusDir, "status.json");
-          if (existsSync23(statusFile2)) {
+          const daemonPath2 = join30(this.nexusDir, "nexus-daemon.mjs");
+          let needsRestart = true;
+          if (existsSync23(daemonPath2)) {
             try {
-              const status = JSON.parse(await readFile13(statusFile2, "utf8"));
-              if (status.connected && status.peerId) {
-                return `Already connected (pid: ${existingPid}, peerId: ${status.peerId})`;
+              const onDisk = readFileSync16(daemonPath2, "utf8");
+              const diskHash = createHash("sha256").update(onDisk).digest("hex").slice(0, 16);
+              if (diskHash === currentScriptHash) {
+                needsRestart = false;
               }
             } catch {
             }
           }
-          try {
-            process.kill(existingPid, "SIGTERM");
-          } catch {
+          if (needsRestart) {
+            try {
+              process.kill(existingPid, "SIGTERM");
+            } catch {
+            }
+            await new Promise((r) => setTimeout(r, 1e3));
+            try {
+              process.kill(existingPid, 0);
+              process.kill(existingPid, "SIGKILL");
+            } catch {
+            }
+            for (const f of ["daemon.pid", "status.json", "cmd.json", "resp.json"]) {
+              const p = join30(this.nexusDir, f);
+              if (existsSync23(p))
+                await unlink(p).catch(() => {
+                });
+            }
+          } else {
+            const statusFile2 = join30(this.nexusDir, "status.json");
+            if (existsSync23(statusFile2)) {
+              try {
+                const status = JSON.parse(await readFile13(statusFile2, "utf8"));
+                if (status.connected && status.peerId) {
+                  await this.ensureWallet();
+                  return `Already connected (pid: ${existingPid}, peerId: ${status.peerId})`;
+                }
+              } catch {
+              }
+            }
+            try {
+              process.kill(existingPid, "SIGTERM");
+            } catch {
+            }
+            await new Promise((r) => setTimeout(r, 500));
           }
-          await new Promise((r) => setTimeout(r, 500));
         }
         for (const f of ["daemon.pid", "status.json", "cmd.json", "resp.json"]) {
           const p = join30(this.nexusDir, f);
@@ -28492,7 +28537,7 @@ ${this.formatConnectionInfo()}`);
       }
     };
     P2P_STATE_FILE_NAME = "expose-p2p-state.json";
-    ExposeP2PGateway = class _ExposeP2PGateway extends EventEmitter3 {
+    ExposeP2PGateway = class extends EventEmitter3 {
       _nexusTool;
       // NexusTool instance
       _kind;
@@ -28640,51 +28685,20 @@ ${this.formatConnectionInfo()}`);
       }
       /**
        * Check for and reconnect to a surviving P2P expose from a previous session.
-       * Verifies the nexus daemon is still running and the peer ID is valid,
-       * then resumes metering poll without re-registering capabilities
-       * (the daemon keeps them registered across OA restarts).
+       *
+       * IMPORTANT: We no longer blindly reconnect to surviving daemons because:
+       * 1. The daemon script may be outdated (OA was updated since daemon spawned)
+       * 2. The registered capabilities may be stale (e.g., local Ollama from a previous expose)
+       * 3. Only a fresh start() → doConnect() → expose can guarantee correct state
+       *
+       * Instead, we clean up the stale state so the next /expose command starts fresh.
        */
-      static async checkAndReconnect(stateDir, nexusTool, options) {
-        const state = readP2PExposeState(stateDir);
-        if (!state)
-          return null;
-        const nexusDir = nexusTool.getNexusDir();
-        const statusPath = join35(nexusDir, "status.json");
-        try {
-          if (!existsSync27(statusPath)) {
-            removeP2PExposeState(stateDir);
-            return null;
-          }
-          const status = JSON.parse(readFileSync19(statusPath, "utf8"));
-          if (!status.connected || !status.peerId) {
-            removeP2PExposeState(stateDir);
-            return null;
-          }
-          if (status.peerId !== state.peerId) {
-            removeP2PExposeState(stateDir);
-            return null;
-          }
-        } catch {
-          removeP2PExposeState(stateDir);
-          return null;
+      static async checkAndReconnect(_stateDir, _nexusTool, _options) {
+        const state = readP2PExposeState(_stateDir);
+        if (state) {
+          removeP2PExposeState(_stateDir);
         }
-        const gateway = new _ExposeP2PGateway({
-          kind: state.kind,
-          targetUrl: state.targetUrl,
-          authKey: state.authKey,
-          stateDir,
-          margin: state.margin,
-          passthrough: state.passthrough,
-          loadbalance: state.loadbalance,
-          ...options
-        }, nexusTool);
-        gateway._peerId = state.peerId;
-        gateway._stats.status = "active";
-        gateway._stats.startedAt = new Date(state.startedAt).getTime();
-        gateway.emitStats();
-        gateway.startMeteringPoll(nexusDir);
-        options.onInfo?.(`P2P expose reconnected: ${state.peerId}`);
-        return gateway;
+        return null;
       }
       /** Poll the daemon's metering.jsonl and status.json for stats */
       startMeteringPoll(nexusDir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.103.44",
+  "version": "0.103.46",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",