oomi-ai 0.2.23 → 0.2.24

package/bin/oomi-ai.js

@@ -1931,11 +1931,11 @@ async function runBridgePreflight({ brokerWs, gatewayUrl, gatewayConfigPath }) {
   await assertTcpReachable(parsedGatewayUrl.toString());
 }
 
-function buildBridgeDetachArgs(rawFlags = {}) {
-  const orderedKeys = [
-    'broker-http',
-    'broker-ws',
-    'pair-code',
+function buildBridgeDetachArgs(rawFlags = {}) {
+  const orderedKeys = [
+    'broker-http',
+    'broker-ws',
+    'pair-code',
     'app-url',
     'device-id',
     'device-token',
@@ -1953,9 +1953,13 @@ function buildBridgeDetachArgs(rawFlags = {}) {
     if (!text) continue;
     args.push(`--${key}`, text);
   }
-
-  return args;
-}
+
+  return args;
+}
+
+function isServiceManagedBridgeStart(flags = {}) {
+  return isTruthyFlag(flags['service-managed']);
+}
 
 function startBridgeDetachedProcess(rawFlags = {}) {
   const existing = findRunningBridgeProcess();
@@ -2126,17 +2130,17 @@ function runLaunchctl(args, { allowFailure = false } = {}) {
   return { status, stdout, stderr };
 }
 
-function buildBridgeLaunchAgentPlist() {
-  const scriptPath = (() => {
-    try {
-      return fs.realpathSync(process.argv[1]);
-    } catch {
-      return process.argv[1];
-    }
-  })();
-  const programArgs = [process.execPath, scriptPath, 'openclaw', 'bridge', 'start'];
-  const bridgeLogPath = resolveBridgeLiveLogPath();
-  const argsXml = programArgs.map((arg) => `<string>${xmlEscape(arg)}</string>`).join('\n      ');
+function buildBridgeLaunchAgentPlist() {
+  const scriptPath = (() => {
+    try {
+      return fs.realpathSync(process.argv[1]);
+    } catch {
+      return process.argv[1];
+    }
+  })();
+  const programArgs = [process.execPath, scriptPath, 'openclaw', 'bridge', 'start', '--service-managed'];
+  const bridgeLogPath = resolveBridgeLiveLogPath();
+  const argsXml = programArgs.map((arg) => `<string>${xmlEscape(arg)}</string>`).join('\n      ');
 
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -2192,17 +2196,18 @@ function readBridgeLaunchdStatus() {
   };
 }
 
-function startBridgeLaunchdService() {
-  assertMacOSLaunchdAvailable();
-  const plistPath = resolveBridgeLaunchAgentPlistPath();
-  if (!fs.existsSync(plistPath)) {
-    throw new Error('Bridge service is not installed. Run: oomi openclaw bridge service install');
-  }
-  const domain = launchctlDomain();
-  const target = launchctlServiceTarget();
-  runLaunchctl(['bootout', domain, plistPath], { allowFailure: true });
-  runLaunchctl(['bootstrap', domain, plistPath]);
-  runLaunchctl(['enable', target], { allowFailure: true });
+function startBridgeLaunchdService() {
+  assertMacOSLaunchdAvailable();
+  const plistPath = resolveBridgeLaunchAgentPlistPath();
+  if (!fs.existsSync(plistPath)) {
+    throw new Error('Bridge service is not installed. Run: oomi openclaw bridge service install');
+  }
+  writeFile(plistPath, buildBridgeLaunchAgentPlist());
+  const domain = launchctlDomain();
+  const target = launchctlServiceTarget();
+  runLaunchctl(['bootout', domain, plistPath], { allowFailure: true });
+  runLaunchctl(['bootstrap', domain, plistPath]);
+  runLaunchctl(['enable', target], { allowFailure: true });
   runLaunchctl(['kickstart', '-k', target], { allowFailure: true });
 }
 
@@ -3976,12 +3981,17 @@ async function handleBridgeServiceCommand(actionRaw = '', flags = {}) {
   );
 }
 
-async function startBridgeLifecycle(flags = {}) {
-  if (Boolean(flags.detach)) {
-    const detachedFlags = { ...flags };
-    delete detachedFlags.detach;
-    const result = startBridgeDetachedProcess(detachedFlags);
-    if (result.alreadyRunning) {
+async function startBridgeLifecycle(flags = {}) {
+  const serviceManaged = isServiceManagedBridgeStart(flags);
+  if (serviceManaged && Boolean(flags.detach)) {
+    throw new Error('Detached bridge mode cannot be combined with --service-managed.');
+  }
+
+  if (Boolean(flags.detach)) {
+    const detachedFlags = { ...flags };
+    delete detachedFlags.detach;
+    const result = startBridgeDetachedProcess(detachedFlags);
+    if (result.alreadyRunning) {
       incrementBridgeMetric('duplicate_start_attempt_count');
       console.log(`Bridge already running (pid: ${result.pid}).`);
       return;
@@ -3990,19 +4000,30 @@ async function startBridgeLifecycle(flags = {}) {
     console.log(`Bridge started in background (pid: ${result.pid}).`);
     return;
   }
-
-  const running = findRunningBridgeProcess();
-  if (running) {
-    incrementBridgeMetric('duplicate_start_attempt_count');
-    console.log(
-      `Bridge already running (pid ${running.pid})${running.deviceId ? ` for device ${running.deviceId}` : ''}.`
-    );
-    return;
-  }
-
-  incrementBridgeMetric('bridge_start_count');
-  await startOpenclawBridge(flags);
-}
+
+  const running = findRunningBridgeProcess();
+  if (running) {
+    if (!serviceManaged) {
+      incrementBridgeMetric('duplicate_start_attempt_count');
+      console.log(
+        `Bridge already running (pid ${running.pid})${running.deviceId ? ` for device ${running.deviceId}` : ''}.`
+      );
+      return;
+    }
+
+    incrementBridgeMetric('bridge_restart_count');
+    console.log(
+      `Service-managed bridge start detected existing bridge (pid ${running.pid})${running.deviceId ? ` for device ${running.deviceId}` : ''}; reclaiming ownership.`
+    );
+    const result = await stopBridgeProcesses();
+    if (Array.isArray(result.stillAlive) && result.stillAlive.length > 0) {
+      throw new Error(`Failed to stop bridge processes: ${result.stillAlive.join(', ')}`);
+    }
+  }
+
+  incrementBridgeMetric('bridge_start_count');
+  await startOpenclawBridge(flags);
+}
 
 async function handleBridgeLifecycleCommand(flags = {}, actionRaw = '') {
   const action = String(actionRaw || 'start').trim().toLowerCase();
@@ -4237,16 +4258,18 @@ if (__isDirectExecution) {
 export {
   prepareGatewayFrameForLocalGateway,
   ensureVoiceAssistantSpokenMetadata,
+  buildBridgeLaunchAgentPlist,
   classifyBridgeFailure,
   classifyBridgeSessionScope,
   createBridgeProcessFaultHandler,
-  computeReconnectDelayMs,
-  resolveBridgeStatusForBrokerOpen,
-  resolveBridgeStatusForRuntimeFault,
-  runBridgeCallbackSafely,
-  extractGatewayRequestMeta,
-  extractGatewayResponseMeta,
-  isGatewayRunStartedFrame,
-  isBridgeWorkerCommand,
-  parsePositiveInteger,
-};
+  computeReconnectDelayMs,
+  resolveBridgeStatusForBrokerOpen,
+  resolveBridgeStatusForRuntimeFault,
+  runBridgeCallbackSafely,
+  extractGatewayRequestMeta,
+  extractGatewayResponseMeta,
+  isServiceManagedBridgeStart,
+  isGatewayRunStartedFrame,
+  isBridgeWorkerCommand,
+  parsePositiveInteger,
+};

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "oomi-ai",
   "name": "Oomi Channel Plugin",
   "description": "Managed Oomi channel integration for OpenClaw.",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "author": "Oomi",
   "license": "MIT",
   "openclawVersion": ">=0.5.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oomi-ai",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "Oomi OpenClaw channel plugin and bridge tooling",
   "bin": {
     "oomi": "bin/oomi-ai.js"