colana 1.0.0-beta.64 → 1.0.0-beta.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "colana",
-  "version": "1.0.0-beta.64",
+  "version": "1.0.0-beta.65",
   "description": "Agent-First. Multiplied. Multi-agent command center for AI coding agents.",
   "type": "module",
   "main": "server/index.js",

package/public/app.js

@@ -818,10 +818,17 @@ function maximizePersonalPanel() {
   }
 }
 
+// Personal agent launch guards — prevent duplicate spawns from concurrent calls
+let _personalAgentLaunching = false;
+let _personalAgentAutoStartTimer = null;
+
 /** Launch the personal agent (get/create Personal project via dedicated endpoint, start openclaw PTY) */
 async function launchPersonalAgent() {
   // Guard: don't launch if a personal agent session is already running
   if (state.personalAgent.sessionId) return;
+  // Guard: don't launch if another launch call is already in-flight
+  if (_personalAgentLaunching) return;
+  _personalAgentLaunching = true;
   try {
     // Get or create the personal project via dedicated endpoint (not in state.projects —
     // personal projects are architecturally separate from coding projects)
@@ -865,6 +872,8 @@ async function launchPersonalAgent() {
     } else {
       showToast('Failed to start personal agent: ' + (err.message || err), 'error');
     }
+  } finally {
+    _personalAgentLaunching = false;
   }
 }
 
@@ -2111,11 +2120,14 @@ function handleWebSocketMessage(message) {
 
       // Auto-start personal agent if setting enabled.
       // Delay 5s (not 2s) so server-side auto-resume (3s) completes first.
-      // Re-check sessionId before launching to avoid duplicate sessions.
+      // Debounce: clear any pending timer so only one auto-start attempt runs,
+      // even if multiple activeSessionsUpdated events arrive in quick succession.
       if (localStorage.getItem('colana_personalAutostart') === 'true'
           && state.personalAgent.configured
           && !state.personalAgent.sessionId) {
-        setTimeout(() => {
+        if (_personalAgentAutoStartTimer) clearTimeout(_personalAgentAutoStartTimer);
+        _personalAgentAutoStartTimer = setTimeout(() => {
+          _personalAgentAutoStartTimer = null;
           if (!state.personalAgent.sessionId) launchPersonalAgent();
         }, 5000);
       }

package/server/agent-control-routes.js

@@ -74,6 +74,21 @@ export function createAgentControlRoutes(app, { agentLimiter, ptyManager, ptyAva
         : 'gemini';
       const providerConfig = config.providers[provider];
 
+      // Prevent duplicate personal agent sessions.
+      // If a personal provider is already running, return the existing session
+      // instead of spawning a second one. Guards against race conditions between
+      // server-side auto-resume and frontend auto-start.
+      // Checked BEFORE preflight to avoid unnecessary binary validation when
+      // the session is already live.
+      if (providerConfig?.isPersonal) {
+        const existingPersonal = activeSessions.find(
+          s => s.provider === provider && (s.status === 'running' || s.status === 'starting')
+        );
+        if (existingPersonal) {
+          return res.status(200).json(existingPersonal);
+        }
+      }
+
       // Pre-flight validation: project path, CLI binary, provider-specific checks
       const check = preflightCheck(provider, project.path);
       if (!check.ok) {

package/server/pty-manager.js

@@ -28,7 +28,7 @@ import { syncBeforeSpawn } from './context-sync.js';
 import { trackEvent } from './analytics.js';
 import { addNotification as persistNotification } from './personal-chat-store.js';
 import { shouldAutoIsolate, createWorktree } from './worktree-manager.js';
-import { syncAuthProfilesFromEnv, getOrCreateGatewayToken, ensureGatewayAuthToken, getOpenClawConfig, syncGatewayTokenToEnv } from './openclaw-config.js';
+import { syncAuthProfilesFromEnv, getOrCreateGatewayToken, ensureGatewayAuthToken, getOpenClawConfig, syncGatewayTokenToEnv, getOpenClawAuthToken } from './openclaw-config.js';
 
 // Provider-specific regex patterns for detecting session IDs from PTY output
 const SESSION_ID_PATTERNS = {
@@ -477,11 +477,28 @@ async function killGatewayOnPort(port) {
   } catch { /* best effort */ }
 }
 
+// Singleton promise guard: only one ensureOpenClawGateway call runs at a time.
+// Concurrent callers piggyback on the in-flight promise.
+let _gatewayEnsurePromise = null;
+
 /**
  * Ensure the OpenClaw gateway daemon is running on the given port.
- * If not, spawn it detached and poll until it's reachable (up to 8 s).
+ * Uses a singleton promise so concurrent callers coalesce into one execution.
+ * After completion, subsequent calls run fresh (not cached).
  */
 async function ensureOpenClawGateway(port) {
+  if (_gatewayEnsurePromise) return _gatewayEnsurePromise;
+  _gatewayEnsurePromise = _ensureOpenClawGatewayImpl(port).finally(() => {
+    _gatewayEnsurePromise = null;
+  });
+  return _gatewayEnsurePromise;
+}
+
+/**
+ * Implementation: ensure the OpenClaw gateway daemon is running on the given port.
+ * If not, spawn it detached and poll until it's reachable (up to 8 s).
+ */
+async function _ensureOpenClawGatewayImpl(port) {
   // Always sync API keys into auth-profiles.json — even when the gateway is
   // already running — so keys saved via Settings are picked up on next request.
   const authSync = syncAuthProfilesFromEnv();
@@ -2272,6 +2289,8 @@ export async function restartOpenClawGateway() {
 
   if (isRunning) {
     console.log('[pty-manager] Restarting OpenClaw gateway to reload MCP config...');
+    // Clear any in-flight singleton promise so the ensure call below runs fresh
+    _gatewayEnsurePromise = null;
     // Clear marker before kill so ensureOpenClawGateway knows to respawn
     try { fs.unlinkSync(GATEWAY_MARKER_PATH); } catch { /* may not exist */ }
     await killGatewayOnPort(gwPort);