@telora/daemon 0.20.32 → 0.20.53

package/dist/discovery-poll.d.ts

@@ -10,59 +10,9 @@
  * Runs once per focus-poll cycle, org-scoped, best-effort: a failure here must
  * never disturb the spawn/merge poll work it rides alongside.
  */
-/** Time-box a single endpoint fetch so an unreachable host fails fast to error. */
-export declare const DISCOVERY_FETCH_TIMEOUT_MS = 5000;
-/**
- * Hard ceiling on a discovery response body. A `/models` listing is tiny; this
- * cap defends against a malicious endpoint streaming an unbounded body to OOM
- * the daemon (TEL-6). Enforced both via the declared Content-Length and a
- * streamed byte ceiling so a lying header can't slip past.
- */
-export declare const MAX_DISCOVERY_BYTES = 1000000;
+export { isAllowedDiscoveryUrl, normalizeModelList, buildDiscoveryHeaders, fetchModels, DISCOVERY_FETCH_TIMEOUT_MS, MAX_DISCOVERY_BYTES, DISCOVERY_ERROR_STATUS, DISCOVERY_ERROR_UNREACHABLE, DISCOVERY_ERROR_INVALID, DISCOVERY_ERROR_AUTH, } from './discovery-fetch.js';
 /** Number of claimed discovery requests fetched concurrently per cycle (TEL-7). */
 export declare const DISCOVERY_FETCH_CONCURRENCY = 4;
-/** Generic, address-free error strings written back to the DB (TEL-5). The raw
- *  detail (URL, system error) is logged daemon-side only -- the DB-written value
- *  is readable by org members and must not leak a probe oracle. */
-export declare const DISCOVERY_ERROR_STATUS = "Endpoint returned an error status";
-export declare const DISCOVERY_ERROR_UNREACHABLE = "Endpoint unreachable or timed out";
-export declare const DISCOVERY_ERROR_INVALID = "Endpoint response was not valid";
-/** A 401/403 probe result. Distinct from the generic status message so an
- *  authenticated org admin operating their own endpoint sees the one actionable
- *  cause -- it's auth, fix the key -- instead of the address-free catch-all. Stays
- *  address-free itself (no URL/IP/system detail): the probe-oracle defense (TEL-5)
- *  is preserved; only the failure *category* is disclosed, never the endpoint. */
-export declare const DISCOVERY_ERROR_AUTH = "Authentication failed -- check the API key";
-/**
- * True only for a base_url that parses as a URL whose protocol is exactly
- * `http:` or `https:`. Rejects `file:`, `ftp:`, `gopher:`, non-URL strings, and
- * empty -- the SSRF guard predicate (TEL-5). Pure + exported for unit testing.
- */
-export declare function isAllowedDiscoveryUrl(raw: string): boolean;
-/**
- * Extract served model id strings from an OpenAI-compatible `/models` payload
- * (`{ object: 'list', data: [{ id }, ...] }`). Pure + defensive: tolerates a
- * missing/!array `data`, non-object items, and non-string/blank ids, returning
- * a de-duplicated, trimmed string[] (possibly empty). Exported for unit testing.
- */
-export declare function normalizeModelList(payload: unknown): string[];
-/**
- * Build the request headers for a discovery fetch (D8). When a bearer key VALUE
- * is provided (resolved server-side from the Telora-stored discovery secret), an
- * `Authorization: Bearer <value>` header is added so an auth-protected endpoint
- * (the common case) lists its models instead of 401-ing. A blank/absent value
- * yields no auth header (unauthenticated probe). Pure + exported for unit
- * testing; the value is never persisted or logged.
- */
-export declare function buildDiscoveryHeaders(apiKey: string | null | undefined): Record<string, string>;
-/**
- * Fetch + normalize an endpoint's model list. Throws a `DiscoveryError` whose
- * `dbMessage` is a generic, address-free string (TEL-5/TEL-6) -- the caller
- * writes that to the DB and logs the rich `.message` daemon-side only. When a
- * bearer key VALUE is provided (resolved from the Telora discovery secret), an
- * Authorization bearer is sent (D8).
- */
-export declare function fetchModels(baseUrl: string, apiKey?: string | null): Promise<string[]>;
 /**
  * Claim and resolve all of the org's pending discovery requests. Best-effort:
  * a claim failure logs and returns; per-request fetches run with bounded

package/dist/discovery-poll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discovery-poll.d.ts","sourceRoot":"","sources":["../src/discovery-poll.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAaH,mFAAmF;AACnF,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,UAAY,CAAC;AAE7C,mFAAmF;AACnF,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C;;mEAEmE;AACnE,eAAO,MAAM,sBAAsB,sCAAsC,CAAC;AAC1E,eAAO,MAAM,2BAA2B,sCAAsC,CAAC;AAC/E,eAAO,MAAM,uBAAuB,oCAAoC,CAAC;AACzE;;;;kFAIkF;AAClF,eAAO,MAAM,oBAAoB,+CAA+C,CAAC;AAEjF;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAQ1D;AAkBD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAc7D;AA8CD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAChC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAKxB;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqD5F;AAwDD;;;;;GAKG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAoB5D"}
+{"version":3,"file":"discovery-poll.d.ts","sourceRoot":"","sources":["../src/discovery-poll.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAiBH,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,WAAW,EACX,0BAA0B,EAC1B,mBAAmB,EACnB,sBAAsB,EACtB,2BAA2B,EAC3B,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAI9B,mFAAmF;AACnF,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAwD7C;;;;;GAKG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAoB5D"}

package/dist/discovery-poll.js

@@ -11,202 +11,20 @@
  * never disturb the spawn/merge poll work it rides alongside.
  */
 import { getPendingDiscoveryRequests, resolveDiscoveryRequest, pruneDiscoveryRequests, } from './queries/local-models.js';
-import { readLoadableCatalog } from './host-control/index.js';
+// Import readLoadableCatalog from its defining module (host-control/catalog.ts),
+// NOT the host-control/index.js barrel: the barrel re-exports members that
+// import back from this file, so routing through it would close a static cycle.
+import { readLoadableCatalog } from './host-control/catalog.js';
 import { createLogger } from './log.js';
+// The `/v1/models` fetch primitives live in discovery-fetch.ts (a leaf module
+// shared with host-control's catalog floor). Import what this orchestration
+// layer uses directly, and re-export the full public surface for back-compat:
+// existing importers and tests read these symbols from './discovery-poll.js'.
+import { DiscoveryError, DISCOVERY_ERROR_UNREACHABLE } from './discovery-fetch.js';
+export { isAllowedDiscoveryUrl, normalizeModelList, buildDiscoveryHeaders, fetchModels, DISCOVERY_FETCH_TIMEOUT_MS, MAX_DISCOVERY_BYTES, DISCOVERY_ERROR_STATUS, DISCOVERY_ERROR_UNREACHABLE, DISCOVERY_ERROR_INVALID, DISCOVERY_ERROR_AUTH, } from './discovery-fetch.js';
 const log = createLogger({ module: 'discovery' });
-/** Time-box a single endpoint fetch so an unreachable host fails fast to error. */
-export const DISCOVERY_FETCH_TIMEOUT_MS = 5000;
-/**
- * Hard ceiling on a discovery response body. A `/models` listing is tiny; this
- * cap defends against a malicious endpoint streaming an unbounded body to OOM
- * the daemon (TEL-6). Enforced both via the declared Content-Length and a
- * streamed byte ceiling so a lying header can't slip past.
- */
-export const MAX_DISCOVERY_BYTES = 1_000_000;
 /** Number of claimed discovery requests fetched concurrently per cycle (TEL-7). */
 export const DISCOVERY_FETCH_CONCURRENCY = 4;
-/** Generic, address-free error strings written back to the DB (TEL-5). The raw
- *  detail (URL, system error) is logged daemon-side only -- the DB-written value
- *  is readable by org members and must not leak a probe oracle. */
-export const DISCOVERY_ERROR_STATUS = 'Endpoint returned an error status';
-export const DISCOVERY_ERROR_UNREACHABLE = 'Endpoint unreachable or timed out';
-export const DISCOVERY_ERROR_INVALID = 'Endpoint response was not valid';
-/** A 401/403 probe result. Distinct from the generic status message so an
- *  authenticated org admin operating their own endpoint sees the one actionable
- *  cause -- it's auth, fix the key -- instead of the address-free catch-all. Stays
- *  address-free itself (no URL/IP/system detail): the probe-oracle defense (TEL-5)
- *  is preserved; only the failure *category* is disclosed, never the endpoint. */
-export const DISCOVERY_ERROR_AUTH = 'Authentication failed -- check the API key';
-/**
- * True only for a base_url that parses as a URL whose protocol is exactly
- * `http:` or `https:`. Rejects `file:`, `ftp:`, `gopher:`, non-URL strings, and
- * empty -- the SSRF guard predicate (TEL-5). Pure + exported for unit testing.
- */
-export function isAllowedDiscoveryUrl(raw) {
-    let parsed;
-    try {
-        parsed = new URL(raw);
-    }
-    catch {
-        return false;
-    }
-    return parsed.protocol === 'http:' || parsed.protocol === 'https:';
-}
-/**
- * A daemon-side error carrying a sanitized, address-free message for the DB.
- * `fetchModels` throws these so the catch can write `dbMessage` verbatim while
- * still logging the rich `message` daemon-side.
- */
-class DiscoveryError extends Error {
-    dbMessage;
-    constructor(message, 
-    /** Generic string safe to write to the org-readable `error` column. */
-    dbMessage) {
-        super(message);
-        this.dbMessage = dbMessage;
-        this.name = 'DiscoveryError';
-    }
-}
-/**
- * Extract served model id strings from an OpenAI-compatible `/models` payload
- * (`{ object: 'list', data: [{ id }, ...] }`). Pure + defensive: tolerates a
- * missing/!array `data`, non-object items, and non-string/blank ids, returning
- * a de-duplicated, trimmed string[] (possibly empty). Exported for unit testing.
- */
-export function normalizeModelList(payload) {
-    if (!payload || typeof payload !== 'object')
-        return [];
-    const data = payload.data;
-    if (!Array.isArray(data))
-        return [];
-    const seen = new Set();
-    for (const item of data) {
-        if (!item || typeof item !== 'object')
-            continue;
-        const id = item.id;
-        if (typeof id === 'string') {
-            const trimmed = id.trim();
-            if (trimmed)
-                seen.add(trimmed);
-        }
-    }
-    return [...seen];
-}
-/**
- * Read a fetch response body with a hard byte ceiling, aborting once the cap is
- * exceeded so a lying Content-Length (or a chunked body with none) can't OOM the
- * daemon (TEL-6). Returns the decoded text. Throws past the ceiling.
- */
-async function readBodyCapped(res) {
-    const body = res.body;
-    if (!body) {
-        // No stream available (shouldn't happen on Node fetch) -- fall back but still
-        // cap by post-read byteLength.
-        const buf = await res.arrayBuffer();
-        if (buf.byteLength > MAX_DISCOVERY_BYTES) {
-            throw new DiscoveryError('Response body exceeded byte ceiling', DISCOVERY_ERROR_INVALID);
-        }
-        return new TextDecoder().decode(buf);
-    }
-    const reader = body.getReader();
-    const chunks = [];
-    let total = 0;
-    try {
-        for (;;) {
-            const { done, value } = await reader.read();
-            if (done)
-                break;
-            if (value) {
-                total += value.byteLength;
-                if (total > MAX_DISCOVERY_BYTES) {
-                    throw new DiscoveryError('Response body exceeded byte ceiling', DISCOVERY_ERROR_INVALID);
-                }
-                chunks.push(value);
-            }
-        }
-    }
-    finally {
-        // Stop the underlying transfer; ignore cancel errors.
-        await reader.cancel().catch((err) => { log.debug('SSE reader cancel failed', { error: String(err?.message ?? err) }); });
-    }
-    const merged = new Uint8Array(total);
-    let offset = 0;
-    for (const c of chunks) {
-        merged.set(c, offset);
-        offset += c.byteLength;
-    }
-    return new TextDecoder().decode(merged);
-}
-/**
- * Build the request headers for a discovery fetch (D8). When a bearer key VALUE
- * is provided (resolved server-side from the Telora-stored discovery secret), an
- * `Authorization: Bearer <value>` header is added so an auth-protected endpoint
- * (the common case) lists its models instead of 401-ing. A blank/absent value
- * yields no auth header (unauthenticated probe). Pure + exported for unit
- * testing; the value is never persisted or logged.
- */
-export function buildDiscoveryHeaders(apiKey) {
-    const headers = { accept: 'application/json' };
-    const value = typeof apiKey === 'string' ? apiKey.trim() : '';
-    if (value)
-        headers.Authorization = `Bearer ${value}`;
-    return headers;
-}
-/**
- * Fetch + normalize an endpoint's model list. Throws a `DiscoveryError` whose
- * `dbMessage` is a generic, address-free string (TEL-5/TEL-6) -- the caller
- * writes that to the DB and logs the rich `.message` daemon-side only. When a
- * bearer key VALUE is provided (resolved from the Telora discovery secret), an
- * Authorization bearer is sent (D8).
- */
-export async function fetchModels(baseUrl, apiKey) {
-    // TEL-5: validate the operator-supplied base_url before any network call --
-    // reject anything that isn't a parseable http/https URL (no file:, ftp:, etc).
-    if (!isAllowedDiscoveryUrl(baseUrl)) {
-        throw new DiscoveryError(`Rejected non-http(s) discovery URL: ${baseUrl}`, DISCOVERY_ERROR_INVALID);
-    }
-    // base_url already includes /v1 (e.g. http://host:8888/v1); append /models.
-    const url = `${baseUrl.replace(/\/+$/, '')}/models`;
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), DISCOVERY_FETCH_TIMEOUT_MS);
-    try {
-        const res = await fetch(url, { signal: controller.signal, headers: buildDiscoveryHeaders(apiKey) });
-        if (!res.ok) {
-            // 401/403: disclose the failure CATEGORY (auth) so an authenticated operator
-            // can act, while keeping the message address-free (TEL-5). All other non-2xx
-            // codes stay the generic catch-all so we never leak which path/host exists.
-            const dbMessage = res.status === 401 || res.status === 403 ? DISCOVERY_ERROR_AUTH : DISCOVERY_ERROR_STATUS;
-            throw new DiscoveryError(`Endpoint returned HTTP ${res.status}`, dbMessage);
-        }
-        // TEL-6: reject a too-large declared body up front...
-        const declared = Number(res.headers.get('content-length'));
-        if (Number.isFinite(declared) && declared > MAX_DISCOVERY_BYTES) {
-            throw new DiscoveryError(`Declared Content-Length ${declared} exceeds cap`, DISCOVERY_ERROR_INVALID);
-        }
-        // ...and defensively cap the actual stream in case the header lied / is absent.
-        const text = await readBodyCapped(res);
-        let json;
-        try {
-            json = JSON.parse(text);
-        }
-        catch {
-            throw new DiscoveryError('Response body was not valid JSON', DISCOVERY_ERROR_INVALID);
-        }
-        return normalizeModelList(json);
-    }
-    catch (err) {
-        if (err instanceof DiscoveryError)
-            throw err;
-        if (err.name === 'AbortError') {
-            throw new DiscoveryError(`Timed out after ${DISCOVERY_FETCH_TIMEOUT_MS}ms reaching ${url}`, DISCOVERY_ERROR_UNREACHABLE);
-        }
-        // Network-level failure (DNS, connection refused, TLS): generic to the DB.
-        throw new DiscoveryError(err.message || `Failed to reach ${url}`, DISCOVERY_ERROR_UNREACHABLE);
-    }
-    finally {
-        clearTimeout(timer);
-    }
-}
 /**
  * Process one claimed discovery request: fetch + normalize, then write back its
  * own loaded/error result. Never throws -- one request's failure must not abort

package/dist/discovery-poll.js.map

@@ -1 +1 @@
-{"version":3,"file":"discovery-poll.js","sourceRoot":"","sources":["../src/discovery-poll.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EACL,2BAA2B,EAC3B,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;AAGlD,mFAAmF;AACnF,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;AAE7C,mFAAmF;AACnF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAE7C;;mEAEmE;AACnE,MAAM,CAAC,MAAM,sBAAsB,GAAG,mCAAmC,CAAC;AAC1E,MAAM,CAAC,MAAM,2BAA2B,GAAG,mCAAmC,CAAC;AAC/E,MAAM,CAAC,MAAM,uBAAuB,GAAG,iCAAiC,CAAC;AACzE;;;;kFAIkF;AAClF,MAAM,CAAC,MAAM,oBAAoB,GAAG,4CAA4C,CAAC;AAEjF;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,IAAI,MAAW,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC;AACrE,CAAC;AAED;;;;GAIG;AACH,MAAM,cAAe,SAAQ,KAAK;IAIrB;IAHX,YACE,OAAe;IACf,uEAAuE;IAC9D,SAAiB;QAE1B,KAAK,CAAC,OAAO,CAAC,CAAC;QAFN,cAAS,GAAT,SAAS,CAAQ;QAG1B,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAC/B,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAgB;IACjD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IACvD,MAAM,IAAI,GAAI,OAA8B,CAAC,IAAI,CAAC;IAClD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,SAAS;QAChD,MAAM,EAAE,GAAI,IAAyB,CAAC,EAAE,CAAC;QACzC,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,OAAO;gBAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,cAAc,CAAC,GAAa;IACzC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,8EAA8E;QAC9E,+BAA+B;QAC/B,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,GAAG,CAAC,UAAU,GAAG,mBAAmB,EAAE,CAAC;YACzC,MAAM,IAAI,cAAc,CAAC,qCAAqC,EAAE,uBAAuB,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAChC,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,CAAC;QACH,SAAS,CAAC;YACR,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,MAAM;YAChB,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC;gBAC1B,IAAI,KAAK,GAAG,mBAAmB,EAAE,CAAC;oBAChC,MAAM,IAAI,cAAc,CAAC,qCAAqC,EAAE,uBAAuB,CAAC,CAAC;gBAC3F,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;YAAS,CAAC;QACT,sDAAsD;QACtD,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,MAAM,CAAE,GAAa,EAAE,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtI,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACtB,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAiC;IAEjC,MAAM,OAAO,GAA2B,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;IACvE,MAAM,KAAK,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,IAAI,KAAK;QAAE,OAAO,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAC;IACrD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAe,EAAE,MAAsB;IACvE,4EAA4E;IAC5E,+EAA+E;IAC/E,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,cAAc,CAAC,uCAAuC,OAAO,EAAE,EAAE,uBAAuB,CAAC,CAAC;IACtG,CAAC;IACD,4EAA4E;IAC5E,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,0BAA0B,CAAC,CAAC;IAC/E,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,6EAA6E;YAC7E,6EAA6E;YAC7E,4EAA4E;YAC5E,MAAM,SAAS,GACb,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,sBAAsB,CAAC;YAC3F,MAAM,IAAI,cAAc,CAAC,0BAA0B,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC;QAC9E,CAAC;QACD,sDAAsD;QACtD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC3D,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,mBAAmB,EAAE,CAAC;YAChE,MAAM,IAAI,cAAc,CACtB,2BAA2B,QAAQ,cAAc,EACjD,uBAAuB,CACxB,CAAC;QACJ,CAAC;QACD,gFAAgF;QAChF,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,cAAc,CAAC,kCAAkC,EAAE,uBAAuB,CAAC,CAAC;QACxF,CAAC;QACD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,cAAc;YAAE,MAAM,GAAG,CAAC;QAC7C,IAAK,GAAa,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACzC,MAAM,IAAI,cAAc,CACtB,mBAAmB,0BAA0B,eAAe,GAAG,EAAE,EACjE,2BAA2B,CAC5B,CAAC;QACJ,CAAC;QACD,2EAA2E;QAC3E,MAAM,IAAI,cAAc,CACrB,GAAa,CAAC,OAAO,IAAI,mBAAmB,GAAG,EAAE,EAClD,2BAA2B,CAC5B,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,uBAAuB,CAAC,GAA4D;IACjG,IAAI,CAAC;QACH,8EAA8E;QAC9E,8EAA8E;QAC9E,8EAA8E;QAC9E,wEAAwE;QACxE,mEAAmE;QACnE,+EAA+E;QAC/E,8EAA8E;QAC9E,6EAA6E;QAC7E,+BAA+B;QAC/B,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;QAC3B,MAAM,uBAAuB,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1F,GAAG,CAAC,IAAI,CACN,eAAe,GAAG,CAAC,OAAO,gBAAgB,MAAM,CAAC,MAAM,WAAW;YAChE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAClF,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,4EAA4E;QAC5E,MAAM,SAAS,GACb,GAAG,YAAY,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,2BAA2B,CAAC;QAC9E,MAAM,SAAS,GAAI,GAAa,CAAC,OAAO,IAAI,kBAAkB,CAAC;QAC/D,MAAM,uBAAuB,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAClG,GAAG,CAAC,IAAI,CAAC,6BAA6B,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAG,QAAkB,CAAC,OAAO,CAAC,CAC1F,CAAC;QACF,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,6EAA6E;AAC7E,KAAK,UAAU,eAAe,CAC5B,KAAU,EACV,KAAa,EACb,IAAgC;IAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC;QACxC,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAE7B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB;IAC1C,IAAI,gBAAgB;QAAE,OAAO;IAC7B,gBAAgB,GAAG,IAAI,CAAC;IACxB,IAAI,CAAC;QACH,IAAI,OAAO,CAAC;QACZ,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,2BAA2B,EAAE,CAAC;QAChD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CAAC,6CAA6C,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YAChF,OAAO;QACT,CAAC;QACD,MAAM,eAAe,CAAC,OAAO,EAAE,2BAA2B,EAAE,uBAAuB,CAAC,CAAC;QACrF,4EAA4E;QAC5E,oDAAoD;QACpD,MAAM,sBAAsB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC3C,GAAG,CAAC,IAAI,CAAC,eAAe,EAAG,GAAa,CAAC,OAAO,CAAC,CAClD,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,gBAAgB,GAAG,KAAK,CAAC;IAC3B,CAAC;AACH,CAAC"}
+{"version":3,"file":"discovery-poll.js","sourceRoot":"","sources":["../src/discovery-poll.ts"],"names":[],"mappings":"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"}

package/dist/drain-teardown.d.ts

@@ -33,13 +33,18 @@ export interface DrainToIdleOptions {
     /** Poll cadence for the idle gate (ms). Default 1000. */
     pollIntervalMs?: number;
     /**
-     * Optional safety cap (ms). When set and the fleet has not idled within it,
-     * the teardown is FORCED with a loud warning -- an operator-set bound that
-     * opts into a forced stop after waiting. Unset (default) waits indefinitely;
-     * the fleet is never killed unless `immediate` is passed. The daemon runs
-     * this in the background, so an indefinite wait never blocks the CLI.
+     * REQUIRED deadline for the drain wait -- an unbounded wait must be chosen
+     * explicitly, never defaulted into. Either a positive safety cap in ms (when
+     * the fleet has not idled within it the teardown is FORCED with a loud
+     * warning -- an operator-set bound that opts into a forced stop after
+     * waiting), or the literal `'unbounded'` to wait indefinitely for the fleet
+     * to finish work naturally. `'unbounded'` is legitimate ONLY where a separate
+     * escalation can still force teardown (the stop path upgrades a second signal
+     * to an immediate `shutdown()`); the daemon runs this in the background so an
+     * indefinite wait never blocks the CLI. Making this non-optional keeps an
+     * accidental silent-unbounded wait from being expressible.
      */
-    maxWaitMs?: number;
+    maxWaitMs: number | 'unbounded';
     /** Logical clock (ms), injectable for tests. Default Date.now. */
     now?: () => number;
     /** Logger seam. Defaults to console.log. */

package/dist/drain-teardown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drain-teardown.d.ts","sourceRoot":"","sources":["../src/drain-teardown.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AAEH,kEAAkE;AAClE,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uFAAuF;IACvF,eAAe,EAAE,MAAM,OAAO,CAAC;IAC/B,kEAAkE;IAClE,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,kFAAkF;IAClF,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,0CAA0C;IAC1C,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,yDAAyD;IACzD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,4CAA4C;IAC5C,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAED,gEAAgE;AAChE,MAAM,WAAW,iBAAiB;IAChC,6EAA6E;IAC7E,aAAa,EAAE,OAAO,CAAC;IACvB,qDAAqD;IACrD,SAAS,EAAE,OAAO,CAAC;IACnB,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAwCjG"}
+{"version":3,"file":"drain-teardown.d.ts","sourceRoot":"","sources":["../src/drain-teardown.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AAEH,kEAAkE;AAClE,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uFAAuF;IACvF,eAAe,EAAE,MAAM,OAAO,CAAC;IAC/B,kEAAkE;IAClE,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,kFAAkF;IAClF,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,0CAA0C;IAC1C,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,yDAAyD;IACzD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;;;;;;OAWG;IACH,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,4CAA4C;IAC5C,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAED,gEAAgE;AAChE,MAAM,WAAW,iBAAiB;IAChC,6EAA6E;IAC7E,aAAa,EAAE,OAAO,CAAC;IACvB,qDAAqD;IACrD,SAAS,EAAE,OAAO,CAAC;IACnB,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyCjG"}

package/dist/drain-teardown.js

@@ -23,11 +23,12 @@ export async function runDrainToIdleTeardown(opts) {
     const startedAt = now();
     let timedOut = false;
     // Fast path: already idle.
+    const cap = opts.maxWaitMs;
     while (!opts.isBatchSafeIdle()) {
         const waited = now() - startedAt;
-        if (opts.maxWaitMs !== undefined && waited >= opts.maxWaitMs) {
+        if (cap !== 'unbounded' && waited >= cap) {
             timedOut = true;
-            log(`[drain-teardown] WARNING: fleet did not reach a zero-team boundary within ${Math.round(opts.maxWaitMs / 1000)}s ` +
+            log(`[drain-teardown] WARNING: fleet did not reach a zero-team boundary within ${Math.round(cap / 1000)}s ` +
                 '-- forcing teardown now (operator-set cap)');
             break;
         }

package/dist/drain-teardown.js.map

@@ -1 +1 @@
-{"version":3,"file":"drain-teardown.js","sourceRoot":"","sources":["../src/drain-teardown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,MAAM,IAAI,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;AA8DxD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAAwB;IACnE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACjC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC;IAEnD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,GAAG,CAAC,6DAA6D,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAChF,CAAC;IAED,2EAA2E;IAC3E,qCAAqC;IACrC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAChB,GAAG,CAAC,iFAAiF,CAAC,CAAC;IAEvF,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC;IACxB,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,2BAA2B;IAC3B,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,GAAG,EAAE,GAAG,SAAS,CAAC;QACjC,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC7D,QAAQ,GAAG,IAAI,CAAC;YAChB,GAAG,CACD,6EAA6E,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI;gBAChH,4CAA4C,CAC/C,CAAC;YACF,MAAM;QACR,CAAC;QACD,MAAM,KAAK,CAAC,cAAc,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,SAAS,CAAC;IACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,GAAG,CAAC,oCAAoC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,iDAAiD,CAAC,CAAC;IACxH,CAAC;IACD,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACtB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AACvE,CAAC"}
+{"version":3,"file":"drain-teardown.js","sourceRoot":"","sources":["../src/drain-teardown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,MAAM,IAAI,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAmExD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAAwB;IACnE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACjC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC;IAEnD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,GAAG,CAAC,6DAA6D,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAChF,CAAC;IAED,2EAA2E;IAC3E,qCAAqC;IACrC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAChB,GAAG,CAAC,iFAAiF,CAAC,CAAC;IAEvF,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC;IACxB,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,2BAA2B;IAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,GAAG,EAAE,GAAG,SAAS,CAAC;QACjC,IAAI,GAAG,KAAK,WAAW,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;YACzC,QAAQ,GAAG,IAAI,CAAC;YAChB,GAAG,CACD,6EAA6E,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI;gBACrG,4CAA4C,CAC/C,CAAC;YACF,MAAM;QACR,CAAC;QACD,MAAM,KAAK,CAAC,cAAc,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,SAAS,CAAC;IACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,GAAG,CAAC,oCAAoC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,iDAAiD,CAAC,CAAC;IACxH,CAAC;IACD,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACtB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AACvE,CAAC"}

package/dist/focus-branch-ahead.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Landed-work check for focus completion.
+ *
+ * A focus reads complete only when its agent work has measurably LANDED where a
+ * human inspecting the tree will find it. The observed failure: an agent branch
+ * carried four substantive commits, was never merged, and the board still read
+ * complete because completion was inferred from delivery status, not from where
+ * the work actually landed.
+ *
+ * This reads branch state DETERMINISTICALLY from git (a standing daemon
+ * invariant -- never inferred from agent claims): true when the focus's agent
+ * branch carries commits not reachable from the product's integration branch.
+ * The focus-completion evaluate phase consults it and holds `complete` open while
+ * the branch is ahead; the merge-back loop lands the branch (the normal outcome)
+ * and files a stuck_focus_branch escalation for a genuinely-unmergeable one.
+ *
+ * @module focus-branch-ahead
+ */
+import { getAllFocusWorktrees } from './focus-worktree-state.js';
+import { branchHasUnmergedCommits } from './worktree/index.js';
+import type { DaemonConfig } from './types.js';
+/** Injected seam so the check is unit-testable without a real worktree/git. */
+export interface FocusBranchAheadDeps {
+    getAllFocusWorktrees: typeof getAllFocusWorktrees;
+    branchHasUnmergedCommits: typeof branchHasUnmergedCommits;
+}
+/**
+ * True when the focus's agent branch carries commits not reachable from the
+ * product's integration branch -- i.e. its work has NOT landed.
+ *
+ * `productConfig` must be product-SCOPED (configForProduct) so integrationBranch
+ * and repoPath resolve to the focus's own product in a multi-product daemon.
+ *
+ * Returns false when the focus has no tracked worktree (nothing to land). The
+ * git primitive returns false on any git failure rather than throwing, so a git
+ * hiccup fails OPEN (allows complete) rather than wedging completion forever --
+ * the merge-back loop's stuck_focus_branch escalation is the durable backstop
+ * for work that genuinely cannot land, and the evaluate phase re-checks every
+ * tick so a transient false-open self-corrects.
+ */
+export declare function focusBranchAhead(focusId: string, productConfig: DaemonConfig, deps?: FocusBranchAheadDeps): boolean;
+//# sourceMappingURL=focus-branch-ahead.d.ts.map

package/dist/focus-branch-ahead.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"focus-branch-ahead.d.ts","sourceRoot":"","sources":["../src/focus-branch-ahead.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,+EAA+E;AAC/E,MAAM,WAAW,oBAAoB;IACnC,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;IAClD,wBAAwB,EAAE,OAAO,wBAAwB,CAAC;CAC3D;AAOD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,YAAY,EAC3B,IAAI,GAAE,oBAAkC,GACvC,OAAO,CAQT"}

package/dist/focus-branch-ahead.js

@@ -0,0 +1,45 @@
+/**
+ * Landed-work check for focus completion.
+ *
+ * A focus reads complete only when its agent work has measurably LANDED where a
+ * human inspecting the tree will find it. The observed failure: an agent branch
+ * carried four substantive commits, was never merged, and the board still read
+ * complete because completion was inferred from delivery status, not from where
+ * the work actually landed.
+ *
+ * This reads branch state DETERMINISTICALLY from git (a standing daemon
+ * invariant -- never inferred from agent claims): true when the focus's agent
+ * branch carries commits not reachable from the product's integration branch.
+ * The focus-completion evaluate phase consults it and holds `complete` open while
+ * the branch is ahead; the merge-back loop lands the branch (the normal outcome)
+ * and files a stuck_focus_branch escalation for a genuinely-unmergeable one.
+ *
+ * @module focus-branch-ahead
+ */
+import { getAllFocusWorktrees } from './focus-worktree-state.js';
+import { branchHasUnmergedCommits } from './worktree/index.js';
+const defaultDeps = {
+    getAllFocusWorktrees,
+    branchHasUnmergedCommits,
+};
+/**
+ * True when the focus's agent branch carries commits not reachable from the
+ * product's integration branch -- i.e. its work has NOT landed.
+ *
+ * `productConfig` must be product-SCOPED (configForProduct) so integrationBranch
+ * and repoPath resolve to the focus's own product in a multi-product daemon.
+ *
+ * Returns false when the focus has no tracked worktree (nothing to land). The
+ * git primitive returns false on any git failure rather than throwing, so a git
+ * hiccup fails OPEN (allows complete) rather than wedging completion forever --
+ * the merge-back loop's stuck_focus_branch escalation is the durable backstop
+ * for work that genuinely cannot land, and the evaluate phase re-checks every
+ * tick so a transient false-open self-corrects.
+ */
+export function focusBranchAhead(focusId, productConfig, deps = defaultDeps) {
+    const wt = deps.getAllFocusWorktrees().get(focusId);
+    if (!wt)
+        return false;
+    return deps.branchHasUnmergedCommits(wt.branchName, productConfig.integrationBranch, productConfig.repoPath);
+}
+//# sourceMappingURL=focus-branch-ahead.js.map

package/dist/focus-branch-ahead.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"focus-branch-ahead.js","sourceRoot":"","sources":["../src/focus-branch-ahead.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAS/D,MAAM,WAAW,GAAyB;IACxC,oBAAoB;IACpB,wBAAwB;CACzB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAe,EACf,aAA2B,EAC3B,OAA6B,WAAW;IAExC,MAAM,EAAE,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IACtB,OAAO,IAAI,CAAC,wBAAwB,CAClC,EAAE,CAAC,UAAU,EACb,aAAa,CAAC,iBAAiB,EAC/B,aAAa,CAAC,QAAQ,CACvB,CAAC;AACJ,CAAC"}

package/dist/focus-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"focus-engine.d.ts","sourceRoot":"","sources":["../src/focus-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,aAAa,EACb,UAAU,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAA2B,gBAAgB,EAAoC,MAAM,qBAAqB,CAAC;AAClH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAwD/C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAOT;AAMD,qBAAa,WAAY,YAAW,eAAe;IACjD,QAAQ,CAAC,IAAI,WAAW;IAExB,wCAAwC;IACxC,OAAO,CAAC,MAAM,CAA6B;IAE3C;;;;OAIG;IACH,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAEzC;;;;OAIG;IACH,SAAS,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,EAAE,CAAM;IAEjD,8EAA8E;IAC9E,OAAO,CAAC,qBAAqB,CAA6B;IAE1D;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;IAUlC,IAAI,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEjE,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsEjC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkGtB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;YA8C1C,wBAAwB;IA+BtC,IAAI,IAAI,IAAI;IAeN,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA2G/B,WAAW,IAAI,YAAY;IA0D3B,gBAAgB,IAAI,aAAa;IAwBjC;;;OAGG;IACH,OAAO,CAAC,aAAa;CAStB"}
+{"version":3,"file":"focus-engine.d.ts","sourceRoot":"","sources":["../src/focus-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,aAAa,EACb,UAAU,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAA2B,gBAAgB,EAAoC,MAAM,qBAAqB,CAAC;AAClH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAwD/C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAOT;AAMD,qBAAa,WAAY,YAAW,eAAe;IACjD,QAAQ,CAAC,IAAI,WAAW;IAExB,wCAAwC;IACxC,OAAO,CAAC,MAAM,CAA6B;IAE3C;;;;OAIG;IACH,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAEzC;;;;OAIG;IACH,SAAS,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,EAAE,CAAM;IAEjD,8EAA8E;IAC9E,OAAO,CAAC,qBAAqB,CAA6B;IAE1D;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;IAUlC,IAAI,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEjE,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsEjC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2FtB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;YAuD1C,wBAAwB;IA+BtC,IAAI,IAAI,IAAI;IAeN,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA+F/B,WAAW,IAAI,YAAY;IAwC3B,gBAAgB,IAAI,aAAa;IAsBjC;;;OAGG;IACH,OAAO,CAAC,aAAa;CAStB"}

package/dist/focus-engine.js

@@ -29,14 +29,14 @@ import { hydrateFromDb } from './focus-worktree-state.js';
 import { rebuildFocusWorktreeState, reconcileGitState } from './focus-lifecycle.js';
 import { pruneOldLogs } from './log-manager.js';
 import { getActiveTeams, terminateAllTeams, waitForTeamExit, initGovernor as initExecutorGovernor, } from './focus-executor.js';
-import { getRunningAgents } from './agent-state.js';
-import { terminateAllAgents, initGovernor as initSpawnerGovernor, checkAgentLiveness } from './spawner/index.js';
+import { initGovernor as initSpawnerGovernor } from './spawner/index.js';
 import { updateSession } from './queries/sessions.js';
 import { getAllFocusWorktrees } from './focus-worktree-state.js';
 import { scanGitActivity } from './git/index.js';
 import { upsertGitActivity, getLatestGitActivityTimestamp } from './queries/git-activity.js';
 import { getActiveFocuses } from './queries/deliveries.js';
-import { runFocusLoopOnce } from './focus-loop.js';
+import { runFocusLoopOnce, buildFocusLoopDeps } from './focus-loop.js';
+import { focusBranchAhead } from './focus-branch-ahead.js';
 import { runAuditPhase } from './audit-phase.js';
 import { registerScanner } from './security-scan-engine.js';
 import { depsScanner } from './scanners/deps.js';
@@ -179,7 +179,7 @@ export class FocusEngine {
         // Hydrate worktree state from DB for all products (non-fatal per product)
         for (const product of config.products) {
             try {
-                await hydrateFromDb(product.id);
+                await hydrateFromDb(product.id, product.repoPath);
             }
             catch (err) {
                 log.warn(`Worktree state hydration failed for product ${product.id} (non-fatal):`, err instanceof Error ? err.message : String(err));
@@ -245,10 +245,6 @@ export class FocusEngine {
                 await pruneOldLogs(pc);
             }
         }, 3_600_000, 'log-prune', { skipIfRunning: true }));
-        // Periodic agent liveness check (60s)
-        this.intervals.push(safeInterval(async () => {
-            await checkAgentLiveness(config, getRunningAgents());
-        }, 60_000, 'agent-liveness', { skipIfRunning: true }));
         // Periodic tracker-auth liveness (5 min): a token revoked WHILE running
         // must halt the daemon, not leave the poll loop hitting 401/403 forever.
         // Startup already validates once in init(); this re-checks at runtime and
@@ -316,7 +312,13 @@ export class FocusEngine {
                         log.warn(`[focus-loop] scope-time audit refresh failed for focus ${focus.focus_id}:`, err.message);
                     }
                     try {
-                        await runFocusLoopOnce(focus.focus_id);
+                        // Inject the landed-work check, product-scoped so a multi-product
+                        // daemon resolves each focus's own integration branch/repo. The
+                        // evaluate phase holds `complete` open while the focus branch is
+                        // ahead of integration (unlanded work).
+                        await runFocusLoopOnce(focus.focus_id, buildFocusLoopDeps({
+                            isFocusBranchAhead: (fid) => focusBranchAhead(fid, configForProduct(config, product)),
+                        }));
                     }
                     catch (err) {
                         log.warn(`[focus-loop] tick failed for focus ${focus.focus_id}:`, err.message);
@@ -424,21 +426,14 @@ export class FocusEngine {
                 await Promise.allSettled(updates);
             }
         }
-        // Wait for running agents (legacy agents still in flight)
-        const runningAgents = getRunningAgents();
-        if (runningAgents.size > 0) {
-            log.info(`Waiting for ${runningAgents.size} running agents to complete...`);
-            // Give agents 30 seconds to reach a checkpoint
-            const timeout = setTimeout(() => {
-                log.info('Timeout reached, terminating remaining agents...');
-                terminateAllAgents();
-            }, 30_000);
-            // Poll for completion
-            while (getRunningAgents().size > 0) {
-                await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
-            clearTimeout(timeout);
-        }
+        // NOTE: the former unbounded `while (getRunningAgents().size > 0)` legacy-agent
+        // drain loop was removed here. It polled a map that no live spawn path ever
+        // populated and had no deadline -- an agent that ignored SIGTERM would wedge
+        // shutdown forever (the PRIMARY FINDING of the bounded-teardown review). The
+        // only live fleet is `activeTeams`, drained above by the bounded
+        // `waitForTeamExit(engineDrainMs)` and SIGKILL-escalated by the single
+        // `reapWorkerFleet` backstop in unified-shell Phase 2.4. There is no
+        // unbounded wait left in shutdown().
         // Drain: allow pending async session updates to flush
         log.info('Draining pending session updates...');
         await new Promise((resolve) => setTimeout(resolve, 2000));
@@ -449,8 +444,7 @@ export class FocusEngine {
     // -----------------------------------------------------------------------
     healthCheck() {
         const teams = getActiveTeams();
-        const agents = getRunningAgents();
-        const activeWorkItems = teams.size + agents.size;
+        const activeWorkItems = teams.size;
         // Determine overall status
         let status = 'healthy';
         if (this.config === null) {
@@ -469,26 +463,12 @@ export class FocusEngine {
                 deliveryCount: team.knownDeliveryIds.size,
             });
         }
-        const agentDetails = [];
-        for (const agent of agents.values()) {
-            const durationSec = Math.round((Date.now() - agent.startedAt.getTime()) / 1000);
-            agentDetails.push({
-                sessionId: agent.sessionId,
-                deliveryName: agent.deliveryName,
-                roleName: agent.roleName,
-                pid: agent.pid,
-                durationSec,
-                streamState: agent.streamState,
-            });
-        }
         return {
             status,
             activeWorkItems,
             details: {
                 activeTeams: teams.size,
-                activeLegacyAgents: agents.size,
                 teams: teamDetails,
-                agents: agentDetails,
             },
         };
     }
@@ -497,16 +477,14 @@ export class FocusEngine {
     // -----------------------------------------------------------------------
     getResourceUsage() {
         const teams = getActiveTeams();
-        const agents = getRunningAgents();
         const worktrees = getAllFocusWorktrees();
-        // Active Claude processes: team lead processes + legacy agent processes
+        // Active Claude processes: team lead processes (the only live spawn fleet).
         let activeClaudeProcesses = 0;
         for (const team of teams.values()) {
             if (team.leadPid) {
                 activeClaudeProcesses++;
             }
         }
-        activeClaudeProcesses += agents.size;
         return {
             activeClaudeProcesses,
             activeWorktrees: worktrees.size,