@agentmeshhq/agent 0.4.15 → 0.4.18

package/dist/core/daemon/watcher-state.js

@@ -0,0 +1,151 @@
+/**
+ * Fetches project state from hub APIs and formats it for LLM injection.
+ *
+ * Each tick sends a full snapshot — the LLM reasons from a single tick
+ * without needing conversation history.
+ *
+ * Epic #883
+ */
+async function fetchJson(url, token) {
+    const res = await fetch(url, {
+        headers: { Authorization: `Bearer ${token}` },
+    });
+    if (!res.ok) {
+        throw new Error(`${url} returned ${res.status}`);
+    }
+    return res.json();
+}
+export async function fetchWatcherState(ctx) {
+    const base = `${ctx.hubUrl}/api/v1/workspaces/${ctx.workspace}`;
+    const [handoffsRes, claimsRes, blockersRes, agentsRes, membersRes] = await Promise.all([
+        fetchJson(`${base}/handoffs?limit=50`, ctx.token).catch(() => ({
+            data: [],
+        })),
+        fetchJson(`${base}/claims`, ctx.token).catch(() => ({
+            data: [],
+        })),
+        fetchJson(`${base}/blockers`, ctx.token).catch(() => ({
+            data: [],
+        })),
+        fetchJson(`${base}/agents`, ctx.token).catch(() => ({
+            data: [],
+        })),
+        fetchJson(`${ctx.hubUrl}/api/v1/workspaces/${ctx.workspace}/teams/${ctx.teamId}/members`, ctx.token).catch(() => ({ data: [] })),
+    ]);
+    return {
+        fetchedAt: new Date().toISOString(),
+        handoffs: handoffsRes.data,
+        claims: claimsRes.data.filter((c) => c.status === "active"),
+        blockers: blockersRes.data.filter((b) => b.status === "open"),
+        agents: agentsRes.data,
+        teamMembers: membersRes.data,
+    };
+}
+function timeSince(iso) {
+    const ms = Date.now() - new Date(iso).getTime();
+    const seconds = Math.floor(ms / 1000);
+    if (seconds < 60)
+        return `${seconds}s`;
+    if (seconds < 3600)
+        return `${Math.floor(seconds / 60)}m`;
+    if (seconds < 86400)
+        return `${Math.floor(seconds / 3600)}h`;
+    return `${Math.floor(seconds / 86400)}d`;
+}
+function agentHealth(agent) {
+    if (!agent.last_heartbeat_at)
+        return "unknown";
+    const ago = (Date.now() - new Date(agent.last_heartbeat_at).getTime()) / 1000;
+    if (ago < 15)
+        return "online";
+    if (ago < 45)
+        return "idle";
+    if (ago < 120)
+        return "stale";
+    return "offline";
+}
+export function formatStateForLlm(state, tickNumber, triggerReasons) {
+    const lines = [];
+    lines.push(`[AgentMesh Watcher] === TICK #${tickNumber} === ${state.fetchedAt}`);
+    lines.push(`Triggered by: ${triggerReasons.join(" + ")}`);
+    lines.push("");
+    // Build agent ID → display name lookup
+    const agentNames = new Map();
+    for (const a of state.agents) {
+        agentNames.set(a.agent_id, a.display_name);
+    }
+    const resolveName = (id) => {
+        if (!id)
+            return "-";
+        return agentNames.get(id) ?? id.slice(0, 12);
+    };
+    // Handoffs — only non-completed
+    const activeHandoffs = state.handoffs.filter((h) => h.status !== "completed");
+    lines.push(`## Handoffs (${activeHandoffs.length} active)`);
+    if (activeHandoffs.length === 0) {
+        lines.push("No active handoffs.");
+    }
+    else {
+        lines.push("| ID | From | To | Status | Age |");
+        lines.push("|---|---|---|---|---|");
+        for (const h of activeHandoffs.slice(0, 20)) {
+            const age = h.created_at ? timeSince(h.created_at) : "?";
+            lines.push(`| ${h.handoff_id.slice(0, 12)} | ${resolveName(h.from_agent_id)} | ${resolveName(h.to_agent_id)} | ${h.status} | ${age} |`);
+        }
+    }
+    lines.push("");
+    // Agents
+    lines.push(`## Agents (${state.agents.length})`);
+    if (state.agents.length > 0) {
+        lines.push("| Name | Status | Health | Last Seen |");
+        lines.push("|---|---|---|---|");
+        for (const a of state.agents.slice(0, 20)) {
+            const health = agentHealth(a);
+            const lastSeen = a.last_heartbeat_at ? timeSince(a.last_heartbeat_at) : "never";
+            lines.push(`| ${a.display_name} | ${a.status} | ${health} | ${lastSeen} ago |`);
+        }
+    }
+    lines.push("");
+    // Team members
+    if (state.teamMembers.length > 0) {
+        lines.push(`## Team Members (${state.teamMembers.length})`);
+        for (const m of state.teamMembers) {
+            lines.push(`- ${m.display_name} (${m.role})`);
+        }
+        lines.push("");
+    }
+    // Blockers
+    lines.push(`## Blockers (${state.blockers.length} open)`);
+    if (state.blockers.length === 0) {
+        lines.push("No open blockers.");
+    }
+    else {
+        for (const b of state.blockers.slice(0, 10)) {
+            const age = b.created_at ? timeSince(b.created_at) : "?";
+            lines.push(`- ${b.blocker_id.slice(0, 12)}: "${b.description.slice(0, 80)}" (${b.category}, ${age}, agent: ${resolveName(b.agent_id)})`);
+        }
+    }
+    lines.push("");
+    // Claims
+    lines.push(`## Claims (${state.claims.length} active)`);
+    if (state.claims.length === 0) {
+        lines.push("No active claims.");
+    }
+    else {
+        for (const c of state.claims.slice(0, 10)) {
+            lines.push(`- ${resolveName(c.agent_id)}: ${c.paths.join(", ")} (${c.scope})`);
+        }
+    }
+    lines.push("");
+    // Available actions
+    lines.push("## Available Actions");
+    lines.push('- `agentmesh nudge <agent-name> "<message>"` — nudge an agent');
+    lines.push("- `agentmesh handoff reassign <handoff-id> --to <agent-id>` — reassign a handoff");
+    lines.push("- `agentmesh handoff complete <handoff-id>` — mark handoff done");
+    lines.push('- `agentmesh blocker create "<description>"` — create a blocker');
+    lines.push("- `agentmesh claims release <claim-id>` — release a stale claim");
+    lines.push("");
+    lines.push("Analyze the above state and take any necessary actions. When done, wait for the next tick.");
+    return lines.join("\n");
+}
+//# sourceMappingURL=watcher-state.js.map

package/dist/core/daemon/watcher-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watcher-state.js","sourceRoot":"","sources":["../../../src/core/daemon/watcher-state.ts"],"names":[],"mappings":"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"}

package/dist/core/daemon.d.ts

@@ -62,6 +62,11 @@ export declare class AgentDaemon {
     private autonomous;
     private healthCheckInterval;
     private inboxPollInterval;
+    private commandPollInterval;
+    private leadInterval;
+    private leadContext;
+    private watcherLoopHandle;
+    private watcherQueue;
     private stopCleanupScheduler;
     private authHealthWatcher;
     private _preStartSessionId;
@@ -69,12 +74,14 @@ export declare class AgentDaemon {
     private stuckSince;
     private lastPendingHandoffAlertAt;
     private remoteAutomationPaused;
+    private rateLimitDetected;
     private lastAutonomyPolicyFetchAt;
     private teamId;
     private pendingClaimCreations;
     private sessionRecoveryAttempts;
     private lastSessionRecoveryAt;
     private initialInboxCheckComplete;
+    private commandPollInFlight;
     constructor(options: DaemonOptions);
     start(): Promise<void>;
     /**
@@ -82,6 +89,11 @@ export declare class AgentDaemon {
      * Includes auto-restart logic and progress watchdog
      */
     private autoAcceptPendingHandoffs;
+    /**
+     * GH-887: After accepting a handoff, verify the LLM acknowledged it.
+     * If rate-limited, pause auto-acceptance. If stuck after retries, log warning.
+     */
+    private verifyHandoffInjection;
     private autoAcceptHandoffFromEvent;
     private isAutomationPaused;
     private sweepInboxOnWebSocketConnect;
@@ -95,6 +107,8 @@ export declare class AgentDaemon {
     private releaseAllAutoClaims;
     private reconcileAutoClaims;
     private startHealthMonitor;
+    private startCommandPoller;
+    private pollNextCommand;
     /**
      * Handles session death - logs crash and attempts auto-restart
      */

package/dist/core/daemon.js

@@ -13,15 +13,20 @@ import { formatCrashLog } from "./daemon/crash-log.js";
 import { evaluateRestartState, filterActiveClaimsForAgent, filterCompletedHandoffsForAgent, formatRestartLifecycleLog, } from "./daemon/done-state-guard.js";
 import { cleanupGitAuth, setupGitAuth } from "./daemon/git-auth.js";
 import { getStuckDetail } from "./daemon/health-policy.js";
+import { verifyInjection } from "./daemon/injection-verify.js";
+import { runLeadTick } from "./daemon/lead-loop.js";
+import { isKnownRole, ROLE_DAEMON_BEHAVIOUR, VALID_ROLES } from "./daemon/roles.js";
 import { writeSandboxOpencodeConfig } from "./daemon/sandbox-config.js";
 import { isRecoverableSessionFailure } from "./daemon/session-recovery.js";
 import { captureAgentChildPids, persistRunningState } from "./daemon/state.js";
 import { startTmuxRuntimeSession } from "./daemon/tmux-session.js";
+import { handleWatcherWebSocketEvent, startWatcherLoop, } from "./daemon/watcher-loop.js";
+import { WatcherTickQueue } from "./daemon/watcher-queue.js";
 import { configureGitIdentity, setupWorkspace, updateWorkspaceFromRemote, validatePushAccess, } from "./daemon/workspace.js";
 import { findPendingHandoffBreaches } from "./handoff-sla.js";
 import { Heartbeat } from "./heartbeat.js";
 import { handleWebSocketEvent, injectInboxItems, injectOnboardMessage, injectRestoredContext, injectStartupMessage, } from "./injector.js";
-import { checkInbox, createClaim, createSelfAssignment, fetchAssignments, fetchHandoffsForAgent, fetchOnboard, fetchProjectByCode, getAgentAutonomyState, getHandoff, listClaims, registerAgent, releaseClaim, updateHandoffStatusWithRetry, } from "./registry.js";
+import { checkInbox, createClaim, createSelfAssignment, fetchAssignments, fetchHandoffsForAgent, fetchOnboard, fetchProjectByCode, getAgentAutonomyState, getHandoff, listClaims, patchAgentMetadata, registerAgent, releaseClaim, updateHandoffStatusWithRetry, } from "./registry.js";
 import { getRunnerDisplayName } from "./runner.js";
 import { DockerSandbox } from "./sandbox.js";
 import { getLatestSessionId, waitForNewSessionId } from "./session-id.js";
@@ -72,6 +77,11 @@ export class AgentDaemon {
     autonomous;
     healthCheckInterval = null;
     inboxPollInterval = null;
+    commandPollInterval = null;
+    leadInterval = null;
+    leadContext = null;
+    watcherLoopHandle = null;
+    watcherQueue = null;
     stopCleanupScheduler = null;
     authHealthWatcher = null;
     // Session resume tracking
@@ -81,12 +91,14 @@ export class AgentDaemon {
     stuckSince = null;
     lastPendingHandoffAlertAt = null;
     remoteAutomationPaused = false;
+    rateLimitDetected = false;
     lastAutonomyPolicyFetchAt = null;
     teamId;
     pendingClaimCreations = new Set();
     sessionRecoveryAttempts = 0;
     lastSessionRecoveryAt = null;
     initialInboxCheckComplete = false;
+    commandPollInFlight = false;
     constructor(options) {
         const boot = bootstrapDaemon(options);
         this.config = boot.config;
@@ -107,6 +119,18 @@ export class AgentDaemon {
         this.autonomous = options.autonomous ?? false;
         this.teamId = options.teamId || boot.agentConfig.teamId;
         this.runnerConfig = boot.runnerConfig;
+        // Fail fast for unknown predefined roles — free-form strings are fine
+        if (this.projectRole && this.projectRole !== "dev" && isKnownRole(this.projectRole)) {
+            // Valid predefined role — log it
+            console.log(`Role: ${this.projectRole} (${ROLE_DAEMON_BEHAVIOUR[this.projectRole]})`);
+        }
+        else if (this.projectRole &&
+            this.projectRole !== "dev" &&
+            !isKnownRole(this.projectRole) &&
+            options.role === this.projectRole) {
+            // Explicitly passed unknown role — warn but don't fail (may be free-form auto-assignment role)
+            console.log(`Role: ${this.projectRole} (free-form; predefined roles: ${VALID_ROLES.join(", ")})`);
+        }
         const runnerName = getRunnerDisplayName(this.runnerConfig.type);
         console.log(`Runner: ${runnerName}`);
         console.log(`Effective model: ${this.runnerConfig.model}`);
@@ -162,6 +186,12 @@ export class AgentDaemon {
         });
         this.agentId = registration.agentId;
         this.token = registration.token;
+        // Best-effort: store role in hub agent metadata (once at startup, GH-829)
+        if (this.projectRole && isKnownRole(this.projectRole)) {
+            patchAgentMetadata(this.config.hubUrl, this.agentId, this.token, {
+                role: this.projectRole,
+            }).catch(() => { }); // fire-and-forget; non-fatal
+        }
         // Persist the agentId back to config.json so it survives state.json wipes.
         // On next startup, agentConfig.agentId is the fallback when existingState is absent.
         upsertAgentConfig({ ...this.agentConfig, agentId: this.agentId });
@@ -335,8 +365,14 @@ export class AgentDaemon {
                         token: newToken,
                         onMessage: (event) => {
                             console.log(`[WS] Received event: ${event.type}`);
+                            if (this.watcherQueue) {
+                                handleWatcherWebSocketEvent(event, this.watcherQueue);
+                            }
                             this.autoAcceptHandoffFromEvent(event);
-                            handleWebSocketEvent(this.agentName, event);
+                            handleWebSocketEvent(this.agentName, event, {
+                                hubUrl: this.config.hubUrl,
+                                token: this.token ?? undefined,
+                            });
                         },
                         onConnect: () => {
                             console.log("WebSocket reconnected with new token");
@@ -362,6 +398,10 @@ export class AgentDaemon {
             token: this.token,
             onMessage: (event) => {
                 console.log(`[WS] Received event: ${event.type}`);
+                // Feed watcher queue before standard handlers (GH-883)
+                if (this.watcherQueue) {
+                    handleWatcherWebSocketEvent(event, this.watcherQueue);
+                }
                 this.autoAcceptHandoffFromEvent(event);
                 handleWebSocketEvent(this.agentName, event, {
                     hubUrl: this.config.hubUrl,
@@ -427,6 +467,7 @@ export class AgentDaemon {
             const mdPath = writeClaudeMd({
                 workdir: this.agentConfig.workdir,
                 onboard: this.onboardData,
+                role: this.projectRole,
                 options: {
                     hubUrl: this.config.hubUrl,
                     token: this.token ?? "",
@@ -497,6 +538,40 @@ export class AgentDaemon {
         this.isRunning = true;
         // Start session health monitoring (every 60 seconds)
         this.startHealthMonitor();
+        this.startCommandPoller();
+        // Start lead coordination loop for lead/coordinator roles (GH-824, GH-829)
+        const roleBehaviour = isKnownRole(this.projectRole)
+            ? ROLE_DAEMON_BEHAVIOUR[this.projectRole]
+            : null;
+        if (roleBehaviour === "lead-loop" && this.token) {
+            this.leadContext = {
+                hubUrl: this.config.hubUrl,
+                token: this.token,
+                workspace: this.config.workspace,
+                teamId: this.teamId ?? "",
+                log: (msg) => console.log(msg),
+            };
+            const leadCtx = this.leadContext;
+            this.leadInterval = setInterval(() => {
+                runLeadTick(leadCtx).catch((err) => {
+                    console.error(`[lead-loop] tick error: ${err.message}`);
+                });
+            }, 120_000);
+            console.log("[lead-loop] Lead coordination loop started (2-minute tick)");
+        }
+        // Start LLM watcher loop for watcher role (GH-883)
+        if (roleBehaviour === "watcher-loop" && this.token) {
+            this.watcherQueue = new WatcherTickQueue();
+            this.watcherLoopHandle = startWatcherLoop({
+                hubUrl: this.config.hubUrl,
+                token: this.token,
+                workspace: this.config.workspace,
+                teamId: this.teamId ?? "",
+                agentName: this.agentName,
+                log: (msg) => console.log(msg),
+            }, this.watcherQueue);
+            console.log("[watcher-loop] LLM watcher loop started (2-minute tick)");
+        }
         // Start evicted-agent cleanup scheduler (GH-421)
         if (this.token) {
             this.stopCleanupScheduler = startCleanupScheduler({
@@ -536,6 +611,11 @@ Nudge agent:
             inboxItems.length === 0) {
             return inboxItems;
         }
+        // GH-887: Skip auto-accept if rate-limited
+        if (this.rateLimitDetected) {
+            console.log("[AUTO-ACCEPT] Skipping — agent is rate-limited");
+            return inboxItems;
+        }
         const accepted = new Set();
         for (const item of inboxItems) {
             if (item.type && item.type !== "handoff") {
@@ -547,6 +627,8 @@ Nudge agent:
                     accepted.add(item.id);
                     console.log(`[AUTO-ACCEPT] Accepted handoff ${item.id}`);
                     await this.ensureClaimForHandoff(item.id, item.scope);
+                    // GH-887: Verify the LLM actually started processing
+                    void this.verifyHandoffInjection(item.id, item.scope);
                 }
             }
             catch (error) {
@@ -555,6 +637,34 @@ Nudge agent:
         }
         return inboxItems.filter((item) => !accepted.has(item.id));
     }
+    /**
+     * GH-887: After accepting a handoff, verify the LLM acknowledged it.
+     * If rate-limited, pause auto-acceptance. If stuck after retries, log warning.
+     */
+    async verifyHandoffInjection(handoffId, scope) {
+        try {
+            const result = await verifyInjection(this.agentName, handoffId, scope);
+            if (result.rateLimited) {
+                this.rateLimitDetected = true;
+                console.warn(`[INJECT-VERIFY] Rate limit detected — pausing auto-accept for ${this.agentName}`);
+                // Clear rate limit after 5 minutes (check again then)
+                setTimeout(() => {
+                    this.rateLimitDetected = false;
+                    console.log("[INJECT-VERIFY] Rate limit cooldown expired — resuming auto-accept");
+                }, 300_000);
+                return;
+            }
+            if (result.verified) {
+                console.log(`[INJECT-VERIFY] Handoff ${handoffId} verified (${result.attempts} attempt${result.attempts > 1 ? "s" : ""})`);
+            }
+            else {
+                console.warn(`[INJECT-VERIFY] Handoff ${handoffId} NOT verified after ${result.attempts} attempts — LLM may be stuck`);
+            }
+        }
+        catch (error) {
+            console.warn(`[INJECT-VERIFY] Error verifying ${handoffId}: ${error.message}`);
+        }
+    }
     autoAcceptHandoffFromEvent(event) {
         if (!this.autoAcceptHandoffs || !this.token) {
             return;
@@ -868,6 +978,58 @@ Nudge agent:
             }, 5 * 60 * 1000); // Poll every 5 minutes
         }
     }
+    startCommandPoller() {
+        if (!this.token || !this.agentId || !this.isWorkerAgent) {
+            return;
+        }
+        // Poll every 5s so commands created during WS disconnects are still picked up.
+        this.commandPollInterval = setInterval(() => {
+            void this.pollNextCommand();
+        }, 5000);
+        void this.pollNextCommand();
+    }
+    async pollNextCommand() {
+        if (!this.isRunning || this.commandPollInFlight || !this.token || !this.agentId) {
+            return;
+        }
+        this.commandPollInFlight = true;
+        try {
+            const params = new URLSearchParams({ target_agent_id: this.agentId });
+            const res = await fetch(`${this.config.hubUrl}/api/v1/workspaces/${this.config.workspace}/commands/next?${params.toString()}`, {
+                headers: {
+                    Authorization: `Bearer ${this.token}`,
+                },
+            });
+            if (!res.ok) {
+                if (res.status !== 404) {
+                    const body = await res.text();
+                    console.warn(`[command-poller] hub returned ${res.status}: ${body}`);
+                }
+                return;
+            }
+            const payload = (await res.json());
+            if (!payload.command) {
+                return;
+            }
+            handleWebSocketEvent(this.agentName, {
+                type: "control.command",
+                command_id: payload.command.command_id,
+                workspace_id: payload.command.workspace_id,
+                target_agent_id: payload.command.target_agent_id,
+                command_type: payload.command.command_type,
+                payload: payload.command.payload ?? {},
+            }, {
+                hubUrl: this.config.hubUrl,
+                token: this.token ?? undefined,
+            });
+        }
+        catch (err) {
+            console.warn(`[command-poller] error: ${err.message}`);
+        }
+        finally {
+            this.commandPollInFlight = false;
+        }
+    }
     /**
      * Handles session death - logs crash and attempts auto-restart
      */
@@ -923,12 +1085,21 @@ Nudge agent:
             clearInterval(this.inboxPollInterval);
             this.inboxPollInterval = null;
         }
+        if (this.commandPollInterval) {
+            clearInterval(this.commandPollInterval);
+            this.commandPollInterval = null;
+        }
+        if (this.watcherLoopHandle) {
+            this.watcherLoopHandle.stop();
+            this.watcherLoopHandle = null;
+            this.watcherQueue = null;
+        }
     }
     async tryRecoverSession(reason) {
         if (!this.isWorkerAgent || this.serveMode || this.sandboxMode) {
             return false;
         }
-        if (!isRecoverableSessionFailure(reason)) {
+        if (!isRecoverableSessionFailure(reason, this.agentName)) {
             return false;
         }
         const now = Date.now();
@@ -1026,6 +1197,14 @@ Nudge agent:
             clearInterval(this.inboxPollInterval);
             this.inboxPollInterval = null;
         }
+        if (this.commandPollInterval) {
+            clearInterval(this.commandPollInterval);
+            this.commandPollInterval = null;
+        }
+        if (this.leadInterval) {
+            clearInterval(this.leadInterval);
+            this.leadInterval = null;
+        }
         // Stop evicted-agent cleanup scheduler
         if (this.stopCleanupScheduler) {
             this.stopCleanupScheduler();