@grantx/fleet-core 0.1.2 → 0.1.4

package/package.json

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

package/src/conductor-loop.js

@@ -8,6 +8,7 @@ import { SmartDispatcher } from './smart-dispatcher.js';
 import { ConductorRunner, parseDispatchBlock } from './conductor-runner.js';
 import { fetchFleetState, executeDecisions } from './fleet-utils.js';
 import { buildConductorEventPrompt } from './dispatch-prompts.js';
+import { checkCredentialHealth } from './platform.js';
 
 export class ConductorLoop {
   /**
@@ -35,6 +36,8 @@ export class ConductorLoop {
     // Cron trackers
     this._lastHealthCheck = Date.now();
     this._lastSynthesis = Date.now();
+    this._lastCredCheck = Date.now();
+    this._credHealthy = true;
 
     // Stats
     this.stats = {
@@ -307,6 +310,33 @@ export class ConductorLoop {
       this.pushEvent({ type: 'synthesis', timestamp: new Date().toISOString() });
       log.info('conductor-loop', 'Cron: synthesis');
     }
+
+    // Credential health (every 30 min)
+    const credIntervalMs = (this.cronConfig.credCheckMinutes || 30) * 60 * 1000;
+    if (now - this._lastCredCheck >= credIntervalMs) {
+      this._lastCredCheck = now;
+      this._checkCredentials();
+    }
+  }
+
+  async _checkCredentials() {
+    try {
+      const result = await checkCredentialHealth();
+      if (!result.ok && this._credHealthy) {
+        this._credHealthy = false;
+        log.error('conductor-loop', `Credential check FAILED: ${result.reason}`);
+        this.pushEvent({
+          type: 'credential_expired',
+          reason: result.reason,
+          timestamp: new Date().toISOString(),
+        });
+      } else if (result.ok && !this._credHealthy) {
+        this._credHealthy = true;
+        log.info('conductor-loop', 'Credentials restored');
+      }
+    } catch (err) {
+      log.warn('conductor-loop', `Credential check error: ${err.message}`);
+    }
   }
 
   // ── Dedup helpers ─────────────────────────────────────────────────

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';
@@ -9,4 +9,4 @@ export { ConductorLoop } from './conductor-loop.js';
 export { SupabaseClient } from './supabase-client.js';
 export { fetchFleetState, executeDecisions, dispatchAgent, recordTaskFailure } from './fleet-utils.js';
 export { log } from './logger.js';
-export * from './platform.js';
+export { isWindows, isMac, isLinux, lockDir, ensureLockDir, buildAgentEnv, setupCredentials, refreshCredentials, fleetDir, agentHome, checkCredentialHealth } from './platform.js';

package/src/platform.js

@@ -23,14 +23,15 @@ export function ensureLockDir() {
 
 /**
  * Build environment variables for a spawned agent process.
- * Inherits the user's PATH (no hardcoded /opt/homebrew).
+ * Inherits the full parent environment (TMPDIR, USER, SHELL, LANG, etc.
+ * are required by claude CLI). Overrides only isolation vars.
  */
 export function buildAgentEnv(agentName, agentHome, teamId, extra = {}) {
   const env = {
+    ...process.env,
     HOME: agentHome,
     FLEET_AGENT_ID: agentName,
     FLEET_TEAM_ID: teamId,
-    PATH: process.env.PATH,
     CLOUDSDK_CONFIG: process.env.CLOUDSDK_CONFIG || path.join(os.homedir(), '.config', 'gcloud'),
     ...extra,
   };
@@ -100,3 +101,26 @@ export function fleetDir(projectRoot) {
 export function agentHome(projectRoot, agentName) {
   return path.join(projectRoot, '.fleet', 'agents', agentName);
 }
+
+/**
+ * Check if Claude credentials are valid by spawning a quick test.
+ * Returns { ok: true } or { ok: false, reason: string }.
+ */
+export async function checkCredentialHealth() {
+  const { execFile } = await import('node:child_process');
+  return new Promise((resolve) => {
+    const child = execFile('claude', ['-p', 'respond PONG', '--max-turns', '1'], {
+      timeout: 30000,
+      env: process.env,
+    }, (err, stdout, stderr) => {
+      if (err) {
+        const reason = stderr?.includes('OAuth') || stderr?.includes('expired')
+          ? 'OAuth token expired — run `claude login` on host'
+          : err.message;
+        resolve({ ok: false, reason });
+      } else {
+        resolve({ ok: true });
+      }
+    });
+  });
+}