@grantx/fleet-core 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grantx/fleet-core",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "files": ["src/"],
   "exports": {

package/src/agent-runner.js

@@ -174,6 +174,15 @@ export class AgentPool {
         let output = stdout.trim();
         const errText = stderr.trim();
 
+        // Auth failure: bail immediately, no retry
+        if (code === 1 && _isAuthError(errText) || _isAuthError(output)) {
+          const reason = 'OAuth token expired — run `claude login` on host';
+          log.error('agent-runner', `${agent}: auth failure, not retrying: ${(errText || output).slice(0, 200)}`);
+          resolve({ ok: false, message: reason, authFailed: true });
+          this._drainQueue();
+          return;
+        }
+
         // Self-healing: wrong session flag -> retry once. On second failure, fresh session.
         if (code === 1 && retryCount < 2) {
           if (errText.includes('already in use') && !isInitialized) {
@@ -289,3 +298,13 @@ export class AgentPool {
     this.queue = [];
   }
 }
+
+// ── Auth error detection ───────────────────────────────────────────
+
+const AUTH_ERROR_PATTERNS = ['401', 'oauth', 'expired', 'authentication_error', 'token has expired'];
+
+function _isAuthError(text) {
+  if (!text) return false;
+  const lower = text.toLowerCase();
+  return AUTH_ERROR_PATTERNS.some(p => lower.includes(p));
+}

package/src/conductor-loop.js

@@ -38,6 +38,8 @@ export class ConductorLoop {
     this._lastSynthesis = Date.now();
     this._lastCredCheck = Date.now();
     this._credHealthy = true;
+    this._authFailed = false; // Circuit breaker: true = skip ticks until creds recover
+    this._consecutiveFailures = 0;
 
     // Stats
     this.stats = {
@@ -94,6 +96,7 @@ export class ConductorLoop {
     return {
       ...this.stats,
       running: this._running,
+      authFailed: this._authFailed,
       eventQueueDepth: this._events.length,
       uptime: this.stats.startTime ? Math.round((Date.now() - this.stats.startTime) / 1000) : 0,
       dispatcher: this.dispatcher.getStats(),
@@ -110,9 +113,14 @@ export class ConductorLoop {
     try {
       this.stats.ticks++;
 
-      // Inject cron events
+      // Inject cron events (always runs — needed for credential recovery check)
       this._checkCrons();
 
+      // Circuit breaker: skip work when auth is known-broken
+      if (this._authFailed) {
+        return;
+      }
+
       // Detect state changes from Supabase
       await this._detectStateChanges();
 
@@ -270,10 +278,26 @@ export class ConductorLoop {
     const result = await this.conductor.invoke(prompt);
 
     if (!result.ok) {
-      log.warn('conductor-loop', `Conductor failed: ${result.message?.slice(0, 200)}`);
+      const msg = result.message || '';
+      this._consecutiveFailures++;
+      const isAuth = _isAuthError(msg);
+      // Treat 5+ consecutive failures as likely auth issue even without keyword match
+      const likelyAuth = !isAuth && this._consecutiveFailures >= 5 && msg.includes('code 1');
+      if (isAuth || likelyAuth) {
+        this._authFailed = true;
+        this._credHealthy = false;
+        const reason = isAuth ? msg.slice(0, 200) : `${this._consecutiveFailures} consecutive failures (likely auth)`;
+        log.error('conductor-loop', `AUTH FAILURE — pausing loop until credentials recover: ${reason}`);
+        this.pushEvent({ type: 'credential_expired', reason, timestamp: new Date().toISOString() });
+      } else {
+        log.warn('conductor-loop', `Conductor failed: ${msg.slice(0, 200)}`);
+      }
       return;
     }
 
+    // Reset consecutive failure counter on success
+    this._consecutiveFailures = 0;
+
     // Parse dispatch block
     const block = parseDispatchBlock(result.output);
     if (!block) {
@@ -332,7 +356,12 @@ export class ConductorLoop {
         });
       } else if (result.ok && !this._credHealthy) {
         this._credHealthy = true;
-        log.info('conductor-loop', 'Credentials restored');
+        if (this._authFailed) {
+          this._authFailed = false;
+          log.info('conductor-loop', 'Credentials restored — resuming loop');
+        } else {
+          log.info('conductor-loop', 'Credentials restored');
+        }
       }
     } catch (err) {
       log.warn('conductor-loop', `Credential check error: ${err.message}`);
@@ -364,3 +393,12 @@ export class ConductorLoop {
     }
   }
 }
+
+// ── Auth error detection ───────────────────────────────────────────
+
+const AUTH_ERROR_PATTERNS = ['401', 'oauth', 'expired', 'authentication_error', 'token has expired'];
+
+function _isAuthError(message) {
+  const lower = message.toLowerCase();
+  return AUTH_ERROR_PATTERNS.some(p => lower.includes(p));
+}

package/src/conductor-runner.js

@@ -129,7 +129,7 @@ export class ConductorRunner {
           log.info('conductor-runner', `Conductor completed (${output.length} chars)`);
           resolve({ ok: true, output });
         } else {
-          const errMsg = errText.slice(0, 500) || 'No output';
+          const errMsg = errText.slice(0, 500) || output.slice(0, 500) || 'No output';
           log.warn('conductor-runner', `Conductor exited with code ${code}: ${errMsg.slice(0, 200)}`);
           resolve({ ok: false, message: `Conductor exited with code ${code}: ${errMsg}` });
         }

package/src/config.js

@@ -50,11 +50,18 @@ function findConfigFile(dir) {
 }
 
 /**
- * Validate config schema. Throws on invalid.
+ * Valid team IDs. Used by init.js and validated here.
+ */
+export const VALID_TEAM_IDS = ['grantx-ml', 'grantx-data', 'grantx-fullstack', 'grantx-skunkworks'];
+
+/**
+ * Validate config schema. Supports version 1 and 2.
+ * v1: original schema (auto-generated agents)
+ * v2: rich agents with identity, domains, frozenDecisions, repos, slack
  */
 function validate(config, filePath) {
-  if (config.version !== 1) {
-    throw new Error(`${filePath}: unsupported version ${config.version} (expected 1)`);
+  if (config.version !== 1 && config.version !== 2) {
+    throw new Error(`${filePath}: unsupported version ${config.version} (expected 1 or 2)`);
   }
   if (!config.teamId || typeof config.teamId !== 'string') {
     throw new Error(`${filePath}: teamId is required (string)`);
@@ -79,6 +86,16 @@ function validate(config, filePath) {
       throw new Error(`${filePath}: agent "${agent.name}" must have a role (string)`);
     }
   }
+
+  // v2-specific: repos and slack are optional arrays/objects — validate shape if present
+  if (config.repos && !Array.isArray(config.repos)) {
+    throw new Error(`${filePath}: repos must be an array`);
+  }
+  if (config.slack) {
+    if (config.slack.botToken && typeof config.slack.botToken !== 'string') {
+      throw new Error(`${filePath}: slack.botToken must be a string`);
+    }
+  }
 }
 
 /**

package/src/index.js

@@ -1,7 +1,7 @@
 // @grantx/fleet-core — shared engine for the fleet plugin
 // Cross-platform, config-driven, no hardcoded Grantx references.
 
-export { loadConfig, getAgentRoster, getConductor, getWorkerAgents } from './config.js';
+export { loadConfig, getAgentRoster, getConductor, getWorkerAgents, VALID_TEAM_IDS } from './config.js';
 export { AgentPool } from './agent-runner.js';
 export { ConductorRunner, parseDispatchBlock } from './conductor-runner.js';
 export { SmartDispatcher } from './smart-dispatcher.js';