@gakim-digital/dexter-bridge 0.13.2 → 0.13.3

package/README.md

@@ -126,6 +126,11 @@ records the resolved Claude executable path in `~/.dexter-bridge/config.json`
 so the background service can find installations managed by NVM or another
 shell-specific tool.
 
+The service keeps itself current. When Dexter names a newer bridge release and
+no run is in progress, it runs `brew update` and `brew upgrade`, then restarts
+on the new version. It tries at most once an hour and keeps running the current
+version if the upgrade fails. Logs are in `$(brew --prefix)/var/log/dexter-bridge.log`.
+
 Useful service commands:
 
 ```bash

package/bin/dexter-bridge.js

@@ -7,4 +7,6 @@ runCli(process.argv.slice(2)).catch((error) => {
     : String(error);
   console.error(`Dexter Bridge failed: ${message}`);
   process.exitCode = typeof error?.exitCode === 'number' ? error.exitCode : 1;
+  // launchd restarts the service only once this process is gone.
+  if (error?.code === 'DEXTER_BRIDGE_RESTART') process.exit();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gakim-digital/dexter-bridge",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Local bridge for InstaWebAI and Dexter — runs Codex, Claude Code, or OpenCode on your machine.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -1,7 +1,7 @@
 import os from 'node:os';
 import path from 'node:path';
 import readline from 'node:readline/promises';
-import { spawn } from 'node:child_process';
+import { execFile, spawn } from 'node:child_process';
 import {
   BRIDGE_BUILD_FINGERPRINT,
   BRIDGE_CAPABILITIES,
@@ -313,20 +313,59 @@ function runCommand(command, args) {
   });
 }
 
-// Upgrades the Homebrew install at most once an hour. On success the process
-// exits non-zero so launchd restarts the service on the new version.
-async function selfUpdateWithHomebrew(logger) {
-  const configDir = defaultConfigDir();
+function commandOutput(command, args) {
+  return new Promise((resolve) => {
+    execFile(command, args, { timeout: 60_000 }, (error, stdout) => resolve(error ? '' : String(stdout)));
+  });
+}
+
+function versionParts(value) {
+  return String(value || '').trim().match(/^v?(\d+)\.(\d+)\.(\d+)/)?.slice(1).map(Number) || null;
+}
+
+function isNewerVersion(candidate, current = BRIDGE_VERSION) {
+  const next = versionParts(candidate);
+  const running = versionParts(current);
+  if (!next || !running) return false;
+  for (let index = 0; index < 3; index += 1) {
+    if (next[index] !== running[index]) return next[index] > running[index];
+  }
+  return false;
+}
+
+// `brew list --versions` prints "dexter-bridge 0.13.1 0.13.2" while an old keg remains.
+function newestListedVersion(output) {
+  return String(output || '').trim().split(/\s+/).slice(1)
+    .reduce((newest, version) => (isNewerVersion(version, newest || '0.0.0') ? version : newest), null);
+}
+
+const BRIDGE_RESTART_EXIT_CODE = 75;
+// Set once Homebrew installed a newer bridge. Every polling loop stops at its
+// next turn, so a claimed run finishes before launchd restarts the service.
+let pendingRestart = null;
+
+// Upgrades the Homebrew install at most once an hour, and restarts only when a
+// newer version is actually installed: the tap can trail npm.
+async function selfUpdateWithHomebrew(logger, message, {
+  configDir = defaultConfigDir(),
+  run = runCommand,
+  output = commandOutput,
+} = {}) {
   const lastAttempt = Date.parse(readConfig(configDir).lastSelfUpdateAt || '');
-  if (Number.isFinite(lastAttempt) && Date.now() - lastAttempt < SELF_UPDATE_INTERVAL_MS) return;
+  if (Number.isFinite(lastAttempt) && Date.now() - lastAttempt < SELF_UPDATE_INTERVAL_MS) return false;
   saveConfigPatch({ lastSelfUpdateAt: new Date().toISOString() }, configDir);
-  console.log('A newer Dexter Bridge is required. Updating with Homebrew...');
-  const updated = await runCommand('brew', ['upgrade', HOMEBREW_FORMULA]);
-  logger.info('self_update_finished', { updated });
-  if (!updated) return;
-  const restart = new Error('Dexter Bridge updated. Restarting on the new version.');
-  restart.exitCode = 75;
-  throw restart;
+  console.log(message);
+  const upgraded = await run('brew', ['update', '--quiet']) && await run('brew', ['upgrade', HOMEBREW_FORMULA]);
+  const installedVersion = upgraded
+    ? newestListedVersion(await output('brew', ['list', '--versions', HOMEBREW_FORMULA]))
+    : null;
+  logger.info('self_update_finished', { upgraded, installedVersion, runningVersion: BRIDGE_VERSION });
+  if (!isNewerVersion(installedVersion)) return false;
+  pendingRestart = Object.assign(
+    new Error(`Dexter Bridge ${installedVersion} installed. Restarting on the new version.`),
+    { code: 'DEXTER_BRIDGE_RESTART', exitCode: BRIDGE_RESTART_EXIT_CODE },
+  );
+  return true;
 }
 
 function productConfigDirs(rootDir) {
@@ -778,6 +817,7 @@ async function startCommand({ apiBaseUrl, config, flags, configDir }) {
 
   try {
     while (true) {
+      if (pendingRestart) return;
       if (Date.now() >= nextCatalogRefreshAt) void refreshModelCatalog();
       let poll;
       try {
@@ -812,8 +852,12 @@ async function startCommand({ apiBaseUrl, config, flags, configDir }) {
           pollFailureCount = 0;
           continue;
         }
-        if (isUpdateRequiredError(error) && runsAsBackgroundService()) {
-          await selfUpdateWithHomebrew(pollLogger);
+        if (
+          isUpdateRequiredError(error)
+          && runsAsBackgroundService()
+          && await selfUpdateWithHomebrew(pollLogger, 'A newer Dexter Bridge is required. Updating with Homebrew...')
+        ) {
+          return;
         }
         if (once) throw error;
         pollFailureCount += 1;
@@ -872,6 +916,14 @@ async function startCommand({ apiBaseUrl, config, flags, configDir }) {
         console.log(`No pending ${label} runs.`);
         return;
       }
+      if (
+        runsAsBackgroundService()
+        && !activeRuns.size
+        && isNewerVersion(poll?.latestVersion)
+        && await selfUpdateWithHomebrew(pollLogger, `Dexter Bridge ${poll.latestVersion} is available. Updating with Homebrew...`)
+      ) {
+        return;
+      }
     }
   } finally {
     for (const adapter of providerAdapters.values()) adapter?.close?.();
@@ -893,6 +945,7 @@ async function startPairedBridges({ apiFlag, flags, rootDir }) {
     const apiBaseUrl = resolveApiBaseUrl({ flagValue: apiFlag, config });
     return startCommand({ apiBaseUrl, config: { ...config, apiBaseUrl }, flags, configDir });
   }));
+  if (pendingRestart) throw pendingRestart;
 }
 
 function printDiagnostics(diagnostics) {
@@ -986,6 +1039,8 @@ export const __private__ = {
   executeClaimedRun,
   startRunAwakeGuard,
   isInvalidPairingError,
+  isNewerVersion,
+  newestListedVersion,
   parseArgv,
   pollBackoffMs,
   requestedRuntime,
@@ -993,5 +1048,9 @@ export const __private__ = {
   requireAvailableRuntime,
   requireAvailableAgent,
   selectedAgentCheck,
+  selfUpdateWithHomebrew,
+  resetPendingRestart() {
+    pendingRestart = null;
+  },
   usage,
 };