@bradygaster/squad-cli 0.9.2-insider.5 → 0.9.3-insider.1

package/dist/cli/commands/watch/capabilities/rate-pool.js

@@ -0,0 +1,187 @@
+/**
+ * Cooperative Rate Pool — shared API call budget across Ralph instances.
+ *
+ * Ported from ralph-watch.ps1 `New-RatePool` / `Read-RatePool` /
+ * `Write-RatePool` / `Update-RatePool` budget coordination logic.
+ *
+ * Multiple Ralph instances on different machines (or in different
+ * terminals) share a single `.squad/ralph-rate-pool.json` file.
+ * Advisory file-based locking (read-modify-write with PID stamps)
+ * keeps the pool consistent without an external lock manager.
+ *
+ * Config (via squad.config.ts → watch.ratePool):
+ *   maxCallsPerInterval  – max API calls in the window (default: 50)
+ *   intervalSeconds      – window length in seconds (default: 600)
+ *   poolFile             – override path (default: .squad/ralph-rate-pool.json)
+ */
+import path from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
+// ── Defaults ─────────────────────────────────────────────────────────
+const DEFAULT_MAX_CALLS = 50;
+const DEFAULT_INTERVAL_SECONDS = 600; // 10 minutes
+const MAX_RETRIES = 3;
+const RETRY_BASE_MS = 200;
+const STALE_MACHINE_MS = 30 * 60 * 1000; // 30 minutes
+// ── Helpers ──────────────────────────────────────────────────────────
+function machineId() {
+    return `${os.hostname()}-${process.pid}`;
+}
+function nowISO() {
+    return new Date().toISOString();
+}
+// ── Rate Pool Class ──────────────────────────────────────────────────
+export class RatePool {
+    poolPath;
+    maxSlots;
+    intervalSeconds;
+    constructor(squadDir, config) {
+        this.poolPath =
+            config?.poolFile ?? path.join(squadDir, 'ralph-rate-pool.json');
+        this.maxSlots = config?.maxCallsPerInterval ?? DEFAULT_MAX_CALLS;
+        this.intervalSeconds = config?.intervalSeconds ?? DEFAULT_INTERVAL_SECONDS;
+    }
+    // ── Public API ───────────────────────────────────────────────────
+    /**
+     * Try to acquire a slot from the shared pool.
+     * Returns `true` if a slot was reserved, `false` if budget is exhausted.
+     */
+    acquireSlot() {
+        const pool = this.read();
+        if (pool.slotsUsed >= pool.maxSlots) {
+            return false;
+        }
+        pool.slotsUsed++;
+        this.touchMachine(pool, 1);
+        this.write(pool);
+        return true;
+    }
+    /**
+     * Release a slot back to the pool.
+     * Safe to call even if no slot is held (clamps to zero).
+     */
+    releaseSlot() {
+        const pool = this.read();
+        pool.slotsUsed = Math.max(0, pool.slotsUsed - 1);
+        this.touchMachine(pool, -1);
+        this.write(pool);
+    }
+    /** Return a snapshot of the current pool status. */
+    getPoolStatus() {
+        const pool = this.read();
+        const elapsed = (Date.now() - new Date(pool.windowStart).getTime()) / 1000;
+        const windowLeft = Math.max(0, pool.intervalSeconds - elapsed);
+        const activeMachines = Object.values(pool.machines).filter((m) => Date.now() - new Date(m.lastActive).getTime() < STALE_MACHINE_MS).length;
+        return {
+            available: pool.slotsUsed < pool.maxSlots,
+            slotsUsed: pool.slotsUsed,
+            maxSlots: pool.maxSlots,
+            remaining: Math.max(0, pool.maxSlots - pool.slotsUsed),
+            windowSecondsLeft: Math.round(windowLeft),
+            activeMachines,
+        };
+    }
+    // ── Persistence ──────────────────────────────────────────────────
+    newPool() {
+        return {
+            windowStart: nowISO(),
+            slotsUsed: 0,
+            maxSlots: this.maxSlots,
+            intervalSeconds: this.intervalSeconds,
+            machines: {},
+        };
+    }
+    /** Read with retry + window-expiry reset (mirrors Read-RatePool). */
+    read() {
+        if (!fs.existsSync(this.poolPath)) {
+            const pool = this.newPool();
+            this.write(pool);
+            return pool;
+        }
+        for (let i = 0; i < MAX_RETRIES; i++) {
+            try {
+                const raw = fs.readFileSync(this.poolPath, 'utf-8');
+                const pool = JSON.parse(raw);
+                // Apply authoritative config (pool file may have been created by
+                // another instance with different settings — this instance's config wins)
+                pool.maxSlots = this.maxSlots;
+                pool.intervalSeconds = this.intervalSeconds;
+                // Window expiry check
+                const elapsed = (Date.now() - new Date(pool.windowStart).getTime()) / 1000;
+                if (elapsed >= pool.intervalSeconds) {
+                    pool.windowStart = nowISO();
+                    pool.slotsUsed = 0;
+                    this.pruneStale(pool);
+                    this.write(pool);
+                }
+                return pool;
+            }
+            catch {
+                if (i < MAX_RETRIES - 1) {
+                    // Busy-wait with escalating backoff (matches PS1 pattern)
+                    const waitMs = RETRY_BASE_MS * (i + 1);
+                    const end = Date.now() + waitMs;
+                    while (Date.now() < end) {
+                        /* spin */
+                    }
+                }
+            }
+        }
+        // All retries exhausted — create fresh pool
+        const pool = this.newPool();
+        this.write(pool);
+        return pool;
+    }
+    /** Atomic write: temp file → rename (mirrors Write-RatePool). */
+    write(pool) {
+        const dir = path.dirname(this.poolPath);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        const tmpFile = `${this.poolPath}.tmp.${process.pid}`;
+        for (let i = 0; i < MAX_RETRIES; i++) {
+            try {
+                fs.writeFileSync(tmpFile, JSON.stringify(pool, null, 2), 'utf-8');
+                fs.renameSync(tmpFile, this.poolPath);
+                return;
+            }
+            catch {
+                if (i >= MAX_RETRIES - 1) {
+                    try {
+                        fs.unlinkSync(tmpFile);
+                    }
+                    catch {
+                        /* ignore */
+                    }
+                }
+                else {
+                    const waitMs = RETRY_BASE_MS * (i + 1);
+                    const end = Date.now() + waitMs;
+                    while (Date.now() < end) {
+                        /* spin */
+                    }
+                }
+            }
+        }
+    }
+    // ── Machine tracking ─────────────────────────────────────────────
+    touchMachine(pool, slotDelta) {
+        const id = machineId();
+        const existing = pool.machines[id];
+        const held = Math.max(0, (existing?.slotsHeld ?? 0) + slotDelta);
+        pool.machines[id] = {
+            lastActive: nowISO(),
+            pid: process.pid,
+            slotsHeld: held,
+        };
+    }
+    pruneStale(pool) {
+        const now = Date.now();
+        for (const [id, entry] of Object.entries(pool.machines)) {
+            if (now - new Date(entry.lastActive).getTime() > STALE_MACHINE_MS) {
+                delete pool.machines[id];
+            }
+        }
+    }
+}
+//# sourceMappingURL=rate-pool.js.map

package/dist/cli/commands/watch/capabilities/rate-pool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rate-pool.js","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/rate-pool.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/watch/capabilities/self-pull.d.ts

@@ -1,5 +1,8 @@
 /**
- * SelfPull capability — git fetch + pull --ff-only at round start.
+ * SelfPull capability — git stash + fetch + pull --ff-only + stash pop.
+ *
+ * Matches PS1 behavior: stashes local changes before pulling, pops after,
+ * and warns if watch source files changed (restart recommended).
  */
 import type { WatchCapability, WatchContext, PreflightResult, CapabilityResult } from '../types.js';
 export declare class SelfPullCapability implements WatchCapability {

package/dist/cli/commands/watch/capabilities/self-pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"self-pull.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/self-pull.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpG,qBAAa,kBAAmB,YAAW,eAAe;IACxD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,6DAA6D;IACjF,QAAQ,CAAC,WAAW,EAAG,SAAS,CAAU;IAC1C,QAAQ,CAAC,QAAQ,WAAW;IAC5B,QAAQ,CAAC,KAAK,EAAG,UAAU,CAAU;IAE/B,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAQ3D,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiBhE"}
+{"version":3,"file":"self-pull.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/self-pull.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpG,qBAAa,kBAAmB,YAAW,eAAe;IACxD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,6DAA6D;IACjF,QAAQ,CAAC,WAAW,EAAG,SAAS,CAAU;IAC1C,QAAQ,CAAC,QAAQ,WAAW;IAC5B,QAAQ,CAAC,KAAK,EAAG,UAAU,CAAU;IAE/B,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAQ3D,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAkEhE"}

package/dist/cli/commands/watch/capabilities/self-pull.js

@@ -1,7 +1,10 @@
 /**
- * SelfPull capability — git fetch + pull --ff-only at round start.
+ * SelfPull capability — git stash + fetch + pull --ff-only + stash pop.
+ *
+ * Matches PS1 behavior: stashes local changes before pulling, pops after,
+ * and warns if watch source files changed (restart recommended).
  */
-import { execFile } from 'node:child_process';
+import { execFile, execFileSync } from 'node:child_process';
 export class SelfPullCapability {
     name = 'self-pull';
     description = 'Git fetch/pull at round start to keep work-tree current';
@@ -16,14 +19,59 @@ export class SelfPullCapability {
         });
     }
     async execute(context) {
+        const cwd = context.teamRoot;
         try {
+            // Capture HEAD before pull for change detection
+            let headBefore = '';
+            try {
+                headBefore = execFileSync('git', ['rev-parse', 'HEAD'], { cwd, encoding: 'utf-8' }).trim();
+            }
+            catch { /* non-fatal */ }
+            // Stash if there are local changes
+            let didStash = false;
+            try {
+                const status = execFileSync('git', ['status', '--porcelain'], { cwd, encoding: 'utf-8' }).trim();
+                if (status.length > 0) {
+                    execFileSync('git', ['stash', '--include-untracked'], { cwd, encoding: 'utf-8' });
+                    didStash = true;
+                }
+            }
+            catch { /* non-fatal — proceed without stash */ }
+            // Fetch + pull
             await new Promise((resolve, reject) => {
-                execFile('git', ['fetch', '--quiet'], { cwd: context.teamRoot }, (err) => err ? reject(err) : resolve());
+                execFile('git', ['fetch', '--quiet'], { cwd }, (err) => err ? reject(err) : resolve());
             });
             await new Promise((resolve, reject) => {
-                execFile('git', ['pull', '--ff-only', '--quiet'], { cwd: context.teamRoot }, (err) => err ? reject(err) : resolve());
+                execFile('git', ['pull', '--ff-only', '--quiet'], { cwd }, (err) => err ? reject(err) : resolve());
             });
-            return { success: true, summary: 'git pull ok' };
+            // Pop stash if we created one
+            if (didStash) {
+                try {
+                    execFileSync('git', ['stash', 'pop'], { cwd, encoding: 'utf-8' });
+                }
+                catch {
+                    console.log('⚠️  git stash pop failed (possible merge conflict) — changes remain in stash');
+                }
+            }
+            // Check if watch source files changed
+            let sourceChanged = false;
+            if (headBefore) {
+                try {
+                    const headAfter = execFileSync('git', ['rev-parse', 'HEAD'], { cwd, encoding: 'utf-8' }).trim();
+                    if (headBefore !== headAfter) {
+                        const diff = execFileSync('git', ['diff', '--name-only', headBefore, headAfter, '--', 'packages/squad-cli/src/'], { cwd, encoding: 'utf-8' }).trim();
+                        if (diff.length > 0) {
+                            sourceChanged = true;
+                            console.log('⚠️  Watch source changed — restart recommended for latest behavior');
+                        }
+                    }
+                }
+                catch { /* non-fatal */ }
+            }
+            return {
+                success: true,
+                summary: sourceChanged ? 'git pull ok (source changed — restart recommended)' : 'git pull ok',
+            };
         }
         catch {
             return { success: true, summary: 'git pull skipped (not on tracking branch or conflicts)' };

package/dist/cli/commands/watch/capabilities/self-pull.js.map

@@ -1 +1 @@
-{"version":3,"file":"self-pull.js","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/self-pull.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAG9C,MAAM,OAAO,kBAAkB;IACpB,IAAI,GAAG,WAAW,CAAC;IACnB,WAAW,GAAG,yDAAyD,CAAC;IACxE,WAAW,GAAG,SAAkB,CAAC;IACjC,QAAQ,GAAG,CAAC,KAAK,CAAC,CAAC;IACnB,KAAK,GAAG,UAAmB,CAAC;IAErC,KAAK,CAAC,SAAS,CAAC,QAAsB;QACpC,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,EAAE;YAC9C,QAAQ,CAAC,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;gBACrC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAqB;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,QAAQ,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CACvE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAC9B,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CACnF,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAC9B,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,wDAAwD,EAAE,CAAC;QAC9F,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"self-pull.js","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/self-pull.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/watch/capabilities/stale-reclaim.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Stale work reclaim capability — find assigned issues with no activity
+ * and unassign them so they can be re-queued.
+ *
+ * Ported from ralph-watch.ps1 `Get-StaleIssues`.
+ *
+ * Runs in the `pre-scan` phase.
+ *
+ * Config (via squad.config.ts → watch.capabilities["stale-reclaim"]):
+ *   staleHours       – hours since last update to consider stale (default: 24)
+ *   dryRun           – log but don't actually unassign (default: false)
+ */
+import type { WatchCapability, WatchContext, PreflightResult, CapabilityResult } from '../types.js';
+export declare class StaleReclaimCapability implements WatchCapability {
+    readonly name = "stale-reclaim";
+    readonly description = "Reclaim issues assigned >24h with no activity";
+    readonly configShape: "object";
+    readonly requires: string[];
+    readonly phase: "pre-scan";
+    preflight(_context: WatchContext): Promise<PreflightResult>;
+    execute(context: WatchContext): Promise<CapabilityResult>;
+}
+//# sourceMappingURL=stale-reclaim.d.ts.map

package/dist/cli/commands/watch/capabilities/stale-reclaim.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stale-reclaim.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/stale-reclaim.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIpG,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,QAAQ,CAAC,IAAI,mBAAmB;IAChC,QAAQ,CAAC,WAAW,mDAAmD;IACvE,QAAQ,CAAC,WAAW,EAAG,QAAQ,CAAU;IACzC,QAAQ,CAAC,QAAQ,WAAU;IAC3B,QAAQ,CAAC,KAAK,EAAG,UAAU,CAAU;IAE/B,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAI3D,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAoEhE"}

package/dist/cli/commands/watch/capabilities/stale-reclaim.js

@@ -0,0 +1,87 @@
+/**
+ * Stale work reclaim capability — find assigned issues with no activity
+ * and unassign them so they can be re-queued.
+ *
+ * Ported from ralph-watch.ps1 `Get-StaleIssues`.
+ *
+ * Runs in the `pre-scan` phase.
+ *
+ * Config (via squad.config.ts → watch.capabilities["stale-reclaim"]):
+ *   staleHours       – hours since last update to consider stale (default: 24)
+ *   dryRun           – log but don't actually unassign (default: false)
+ */
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
+export class StaleReclaimCapability {
+    name = 'stale-reclaim';
+    description = 'Reclaim issues assigned >24h with no activity';
+    configShape = 'object';
+    requires = ['gh'];
+    phase = 'pre-scan';
+    async preflight(_context) {
+        return { ok: true };
+    }
+    async execute(context) {
+        const config = context.config;
+        const staleHours = config['staleHours'] ?? 24;
+        const dryRun = config['dryRun'] ?? false;
+        const cutoff = new Date(Date.now() - staleHours * 60 * 60 * 1000);
+        let reclaimed = 0;
+        try {
+            // List open squad-labeled issues that have assignees
+            const { stdout } = await execFileAsync('gh', [
+                'issue', 'list',
+                '--label', 'squad',
+                '--state', 'open',
+                '--json', 'number,title,assignees,updatedAt',
+                '--limit', '50',
+            ], { cwd: context.teamRoot, timeout: 30_000 });
+            const issues = JSON.parse(stdout);
+            for (const issue of issues) {
+                if (!issue.assignees || issue.assignees.length === 0)
+                    continue;
+                const lastUpdate = new Date(issue.updatedAt);
+                if (lastUpdate >= cutoff)
+                    continue;
+                const staleHrs = Math.round((Date.now() - lastUpdate.getTime()) / (1000 * 60 * 60));
+                if (dryRun) {
+                    console.log(`  [stale-reclaim] Would unassign #${issue.number} "${issue.title}" (stale ${staleHrs}h)`);
+                }
+                else {
+                    try {
+                        // Unassign all current assignees
+                        for (const assignee of issue.assignees) {
+                            await execFileAsync('gh', [
+                                'issue', 'edit', String(issue.number),
+                                '--remove-assignee', assignee.login,
+                            ], { cwd: context.teamRoot, timeout: 10_000 });
+                        }
+                        // Add a comment so there's an audit trail
+                        await execFileAsync('gh', [
+                            'issue', 'comment', String(issue.number),
+                            '--body', `🔄 Auto-reclaimed by watch (stale ${staleHrs}h, threshold ${staleHours}h). Re-queued for assignment.`,
+                        ], { cwd: context.teamRoot, timeout: 10_000 });
+                        reclaimed++;
+                    }
+                    catch {
+                        // best-effort per issue
+                    }
+                }
+            }
+            const mode = dryRun ? ' (dry-run)' : '';
+            return {
+                success: true,
+                summary: `${reclaimed} issue(s) reclaimed${mode}`,
+                data: { reclaimed },
+            };
+        }
+        catch (e) {
+            return {
+                success: false,
+                summary: `stale-reclaim failed: ${e.message}`,
+            };
+        }
+    }
+}
+//# sourceMappingURL=stale-reclaim.js.map

package/dist/cli/commands/watch/capabilities/stale-reclaim.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stale-reclaim.js","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/stale-reclaim.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/watch/capabilities/webhook-alerts.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Webhook alerts capability — POST to a webhook URL on consecutive failures.
+ *
+ * Ported from ralph-watch.ps1 Teams alert logic in `Invoke-PostFailureRemediation`.
+ * Org-agnostic: works with any webhook that accepts JSON POST (Slack, Discord,
+ * Teams Incoming Webhook, generic HTTP endpoint).
+ *
+ * Runs in the `housekeeping` phase.
+ *
+ * Config (via squad.config.ts → watch.capabilities["webhook-alerts"]):
+ *   webhookUrl       – URL to POST to (also settable via --webhook-url flag)
+ *   alertThreshold   – consecutive failures before alerting (default: 3, also --alert-threshold)
+ *   includeHostname  – include machine hostname in payload (default: true)
+ *
+ * CLI flags:
+ *   --webhook-url <url>       Override webhook URL
+ *   --alert-threshold <n>     Override failure threshold
+ */
+import type { WatchCapability, WatchContext, PreflightResult, CapabilityResult } from '../types.js';
+export declare class WebhookAlertCapability implements WatchCapability {
+    readonly name = "webhook-alerts";
+    readonly description = "POST to webhook on consecutive failures above threshold";
+    readonly configShape: "object";
+    readonly requires: never[];
+    readonly phase: "housekeeping";
+    preflight(context: WatchContext): Promise<PreflightResult>;
+    execute(context: WatchContext): Promise<CapabilityResult>;
+}
+//# sourceMappingURL=webhook-alerts.d.ts.map

package/dist/cli/commands/watch/capabilities/webhook-alerts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhook-alerts.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/webhook-alerts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpG,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,QAAQ,CAAC,IAAI,oBAAoB;IACjC,QAAQ,CAAC,WAAW,6DAA6D;IACjF,QAAQ,CAAC,WAAW,EAAG,QAAQ,CAAU;IACzC,QAAQ,CAAC,QAAQ,UAAM;IACvB,QAAQ,CAAC,KAAK,EAAG,cAAc,CAAU;IAEnC,SAAS,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAS1D,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAkFhE"}

package/dist/cli/commands/watch/capabilities/webhook-alerts.js

@@ -0,0 +1,114 @@
+/**
+ * Webhook alerts capability — POST to a webhook URL on consecutive failures.
+ *
+ * Ported from ralph-watch.ps1 Teams alert logic in `Invoke-PostFailureRemediation`.
+ * Org-agnostic: works with any webhook that accepts JSON POST (Slack, Discord,
+ * Teams Incoming Webhook, generic HTTP endpoint).
+ *
+ * Runs in the `housekeeping` phase.
+ *
+ * Config (via squad.config.ts → watch.capabilities["webhook-alerts"]):
+ *   webhookUrl       – URL to POST to (also settable via --webhook-url flag)
+ *   alertThreshold   – consecutive failures before alerting (default: 3, also --alert-threshold)
+ *   includeHostname  – include machine hostname in payload (default: true)
+ *
+ * CLI flags:
+ *   --webhook-url <url>       Override webhook URL
+ *   --alert-threshold <n>     Override failure threshold
+ */
+import * as os from 'node:os';
+import { getConsecutiveFailures } from './heartbeat.js';
+export class WebhookAlertCapability {
+    name = 'webhook-alerts';
+    description = 'POST to webhook on consecutive failures above threshold';
+    configShape = 'object';
+    requires = [];
+    phase = 'housekeeping';
+    async preflight(context) {
+        const config = context.config;
+        const url = config['webhookUrl'];
+        if (!url) {
+            return { ok: false, reason: 'No webhookUrl configured (use --webhook-url or config)' };
+        }
+        return { ok: true };
+    }
+    async execute(context) {
+        const config = context.config;
+        const webhookUrl = config['webhookUrl'];
+        const threshold = config['alertThreshold'] ?? 3;
+        const includeHostname = config['includeHostname'] ?? true;
+        const failures = getConsecutiveFailures();
+        if (failures < threshold) {
+            return {
+                success: true,
+                summary: `${failures} failure(s) — below threshold (${threshold})`,
+            };
+        }
+        // Build generic JSON payload (works with Slack, Discord, Teams, etc.)
+        const hostname = includeHostname ? os.hostname() : 'unknown';
+        const payload = {
+            text: `🚨 Squad Watch Alert: ${failures} consecutive failures on ${hostname} (round ${context.round})`,
+            // Slack-compatible fields
+            blocks: [
+                {
+                    type: 'section',
+                    text: {
+                        type: 'mrkdwn',
+                        text: `*🚨 Squad Watch Alert*\n${failures} consecutive failures`,
+                    },
+                },
+                {
+                    type: 'section',
+                    fields: [
+                        { type: 'mrkdwn', text: `*Machine:* ${hostname}` },
+                        { type: 'mrkdwn', text: `*Round:* ${context.round}` },
+                        { type: 'mrkdwn', text: `*Failures:* ${failures}` },
+                        { type: 'mrkdwn', text: `*Timestamp:* ${new Date().toISOString()}` },
+                    ],
+                },
+            ],
+            // Teams-compatible fields (MessageCard format)
+            '@type': 'MessageCard',
+            '@context': 'https://schema.org/extensions',
+            summary: `Squad Watch: ${failures} consecutive failures on ${hostname}`,
+            themeColor: 'FF0000',
+            title: `🚨 Squad Watch Alert — ${hostname}`,
+            sections: [
+                {
+                    activityTitle: `${failures} consecutive failures detected`,
+                    facts: [
+                        { name: 'Machine', value: hostname },
+                        { name: 'Round', value: String(context.round) },
+                        { name: 'Consecutive Failures', value: String(failures) },
+                        { name: 'Timestamp', value: new Date().toISOString() },
+                    ],
+                },
+            ],
+        };
+        try {
+            const response = await fetch(webhookUrl, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(payload),
+                signal: AbortSignal.timeout(10_000),
+            });
+            if (!response.ok) {
+                return {
+                    success: false,
+                    summary: `Webhook POST failed: ${response.status} ${response.statusText}`,
+                };
+            }
+            return {
+                success: true,
+                summary: `Alert sent (${failures} failures, threshold ${threshold})`,
+            };
+        }
+        catch (e) {
+            return {
+                success: false,
+                summary: `Webhook error: ${e.message}`,
+            };
+        }
+    }
+}
+//# sourceMappingURL=webhook-alerts.js.map

package/dist/cli/commands/watch/capabilities/webhook-alerts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhook-alerts.js","sourceRoot":"","sources":["../../../../../src/cli/commands/watch/capabilities/webhook-alerts.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/watch/config.d.ts

@@ -3,6 +3,8 @@
  *
  * Priority: CLI flag > .squad/config.json "watch" section > defaults.
  */
+/** Dispatch strategy for issue execution. */
+export type DispatchMode = 'task' | 'fleet' | 'hybrid';
 /** Fully-resolved watch configuration. */
 export interface WatchConfig {
     interval: number;
@@ -12,8 +14,24 @@ export interface WatchConfig {
     copilotFlags?: string;
     /** Hidden — fully override the agent command. */
     agentCmd?: string;
+    /** Dispatch mode: 'task' (default 1:1), 'fleet' (batch read-only), 'hybrid' (auto-classify). */
+    dispatchMode?: DispatchMode;
+    /** Optional path to a log file. When set, console output is tee'd to the file with timestamps. */
+    logFile?: string;
     /** Per-capability config: `true` / `false` / object with sub-options. */
     capabilities: Record<string, boolean | Record<string, unknown>>;
+    /** Enable verbose diagnostic output for debugging. */
+    verbose?: boolean;
+    /** Preferred auth user for platform operations (e.g. gh auth switch --user). */
+    authUser?: string;
+    /** Optional webhook URL for notifications. */
+    webhookUrl?: string;
+    /** Alert threshold for budget warnings. */
+    alertThreshold?: number;
+    /** Maximum budget cap. */
+    maxBudget?: number;
+    /** Machine-level capability tags. */
+    machineCapabilities?: string[];
 }
 /**
  * Load watch config from `.squad/config.json` then merge CLI overrides.

package/dist/cli/commands/watch/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/watch/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,0CAA0C;AAC1C,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iDAAiD;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yEAAyE;IACzE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACjE;AAUD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,GACjC,WAAW,CAgCb"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/watch/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,6CAA6C;AAC7C,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEvD,0CAA0C;AAC1C,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iDAAiD;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gGAAgG;IAChG,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,kGAAkG;IAClG,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yEAAyE;IACzE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAChE,sDAAsD;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gFAAgF;IAChF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0BAA0B;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAWD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,GACjC,WAAW,CAwCb"}