@poolzin/pool-bot 2026.2.21 → 2026.2.22

package/dist/gateway/ws-log.js

@@ -1,9 +1,9 @@
 import chalk from "chalk";
 import { isVerbose } from "../globals.js";
-import { parseAgentSessionKey } from "../routing/session-key.js";
 import { shouldLogSubsystemToConsole } from "../logging/console.js";
-import { createSubsystemLogger } from "../logging/subsystem.js";
 import { getDefaultRedactPatterns, redactSensitiveText } from "../logging/redact.js";
+import { createSubsystemLogger } from "../logging/subsystem.js";
+import { parseAgentSessionKey } from "../routing/session-key.js";
 import { DEFAULT_WS_SLOW_MS, getGatewayWsLogStyle } from "./ws-logging.js";
 const LOG_VALUE_LIMIT = 240;
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -16,27 +16,78 @@ let wsLastCompactConnId;
 const wsInflightOptimized = new Map();
 const wsInflightSince = new Map();
 const wsLog = createSubsystemLogger("gateway/ws");
+const WS_META_SKIP_KEYS = new Set(["connId", "id", "method", "ok", "event"]);
+function collectWsRestMeta(meta) {
+    const restMeta = [];
+    if (!meta) {
+        return restMeta;
+    }
+    for (const [key, value] of Object.entries(meta)) {
+        if (value === undefined) {
+            continue;
+        }
+        if (WS_META_SKIP_KEYS.has(key)) {
+            continue;
+        }
+        restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
+    }
+    return restMeta;
+}
+function buildWsHeadline(params) {
+    if ((params.kind === "req" || params.kind === "res") && params.method) {
+        return chalk.bold(params.method);
+    }
+    if (params.kind === "event" && params.event) {
+        return chalk.bold(params.event);
+    }
+    return undefined;
+}
+function buildWsStatusToken(kind, ok) {
+    if (kind !== "res" || ok === undefined) {
+        return undefined;
+    }
+    return ok ? chalk.greenBright("✓") : chalk.redBright("✗");
+}
+function logWsInfoLine(params) {
+    const tokens = [
+        params.prefix,
+        params.statusToken,
+        params.headline,
+        params.durationToken,
+        ...params.restMeta,
+        ...params.trailing,
+    ].filter((t) => Boolean(t));
+    wsLog.info(tokens.join(" "));
+}
+export function shouldLogWs() {
+    return shouldLogSubsystemToConsole("gateway/ws");
+}
 export function shortId(value) {
     const s = value.trim();
-    if (UUID_RE.test(s))
+    if (UUID_RE.test(s)) {
         return `${s.slice(0, 8)}…${s.slice(-4)}`;
-    if (s.length <= 24)
+    }
+    if (s.length <= 24) {
         return s;
+    }
     return `${s.slice(0, 12)}…${s.slice(-4)}`;
 }
 export function formatForLog(value) {
     try {
         if (value instanceof Error) {
             const parts = [];
-            if (value.name)
+            if (value.name) {
                 parts.push(value.name);
-            if (value.message)
+            }
+            if (value.message) {
                 parts.push(value.message);
+            }
             const code = "code" in value && (typeof value.code === "string" || typeof value.code === "number")
                 ? String(value.code)
                 : "";
-            if (code)
+            if (code) {
                 parts.push(`code=${code}`);
+            }
             const combined = parts.filter(Boolean).join(": ").trim();
             if (combined) {
                 return combined.length > LOG_VALUE_LIMIT
@@ -50,8 +101,9 @@ export function formatForLog(value) {
                 const name = typeof rec.name === "string" ? rec.name.trim() : "";
                 const code = typeof rec.code === "string" || typeof rec.code === "number" ? String(rec.code) : "";
                 const parts = [name, rec.message.trim()].filter(Boolean);
-                if (code)
+                if (code) {
                     parts.push(`code=${code}`);
+                }
                 const combined = parts.join(": ").trim();
                 return combined.length > LOG_VALUE_LIMIT
                     ? `${combined.slice(0, LOG_VALUE_LIMIT)}...`
@@ -61,8 +113,9 @@ export function formatForLog(value) {
         const str = typeof value === "string" || typeof value === "number"
             ? String(value)
             : JSON.stringify(value);
-        if (!str)
+        if (!str) {
             return "";
+        }
         const redacted = redactSensitiveText(str, WS_LOG_REDACT_OPTIONS);
         return redacted.length > LOG_VALUE_LIMIT
             ? `${redacted.slice(0, LOG_VALUE_LIMIT)}...`
@@ -74,13 +127,15 @@ export function formatForLog(value) {
 }
 function compactPreview(input, maxLen = 160) {
     const oneLine = input.replace(/\s+/g, " ").trim();
-    if (oneLine.length <= maxLen)
+    if (oneLine.length <= maxLen) {
         return oneLine;
+    }
     return `${oneLine.slice(0, Math.max(0, maxLen - 1))}…`;
 }
 export function summarizeAgentEventForWsLog(payload) {
-    if (!payload || typeof payload !== "object")
+    if (!payload || typeof payload !== "object") {
         return {};
+    }
     const rec = payload;
     const runId = typeof rec.runId === "string" ? rec.runId : undefined;
     const stream = typeof rec.stream === "string" ? rec.stream : undefined;
@@ -88,8 +143,9 @@ export function summarizeAgentEventForWsLog(payload) {
     const sessionKey = typeof rec.sessionKey === "string" ? rec.sessionKey : undefined;
     const data = rec.data && typeof rec.data === "object" ? rec.data : undefined;
     const extra = {};
-    if (runId)
+    if (runId) {
         extra.run = shortId(runId);
+    }
     if (sessionKey) {
         const parsed = parseAgentSessionKey(sessionKey);
         if (parsed) {
@@ -100,55 +156,69 @@ export function summarizeAgentEventForWsLog(payload) {
             extra.session = sessionKey;
         }
     }
-    if (stream)
+    if (stream) {
         extra.stream = stream;
-    if (seq !== undefined)
+    }
+    if (seq !== undefined) {
         extra.aseq = seq;
-    if (!data)
+    }
+    if (!data) {
         return extra;
+    }
     if (stream === "assistant") {
         const text = typeof data.text === "string" ? data.text : undefined;
-        if (text?.trim())
+        if (text?.trim()) {
             extra.text = compactPreview(text);
+        }
         const mediaUrls = Array.isArray(data.mediaUrls) ? data.mediaUrls : undefined;
-        if (mediaUrls && mediaUrls.length > 0)
+        if (mediaUrls && mediaUrls.length > 0) {
             extra.media = mediaUrls.length;
+        }
         return extra;
     }
     if (stream === "tool") {
         const phase = typeof data.phase === "string" ? data.phase : undefined;
         const name = typeof data.name === "string" ? data.name : undefined;
-        if (phase || name)
+        if (phase || name) {
             extra.tool = `${phase ?? "?"}:${name ?? "?"}`;
+        }
         const toolCallId = typeof data.toolCallId === "string" ? data.toolCallId : undefined;
-        if (toolCallId)
+        if (toolCallId) {
             extra.call = shortId(toolCallId);
+        }
         const meta = typeof data.meta === "string" ? data.meta : undefined;
-        if (meta?.trim())
+        if (meta?.trim()) {
             extra.meta = meta;
-        if (typeof data.isError === "boolean")
+        }
+        if (typeof data.isError === "boolean") {
             extra.err = data.isError;
+        }
         return extra;
     }
     if (stream === "lifecycle") {
         const phase = typeof data.phase === "string" ? data.phase : undefined;
-        if (phase)
+        if (phase) {
             extra.phase = phase;
-        if (typeof data.aborted === "boolean")
+        }
+        if (typeof data.aborted === "boolean") {
             extra.aborted = data.aborted;
+        }
         const error = typeof data.error === "string" ? data.error : undefined;
-        if (error?.trim())
+        if (error?.trim()) {
             extra.error = compactPreview(error, 120);
+        }
         return extra;
     }
     const reason = typeof data.reason === "string" ? data.reason : undefined;
-    if (reason?.trim())
+    if (reason?.trim()) {
         extra.reason = reason;
+    }
     return extra;
 }
 export function logWs(direction, kind, meta) {
-    if (!shouldLogSubsystemToConsole("gateway/ws"))
+    if (!shouldLogSubsystemToConsole("gateway/ws")) {
         return;
+    }
     const style = getGatewayWsLogStyle();
     if (!isVerbose()) {
         logWsOptimized(direction, kind, meta);
@@ -171,8 +241,9 @@ export function logWs(direction, kind, meta) {
     const durationMs = direction === "out" && kind === "res" && inflightKey
         ? (() => {
             const startedAt = wsInflightSince.get(inflightKey);
-            if (startedAt === undefined)
+            if (startedAt === undefined) {
                 return undefined;
+            }
             wsInflightSince.delete(inflightKey);
             return now - startedAt;
         })()
@@ -180,39 +251,18 @@ export function logWs(direction, kind, meta) {
     const dirArrow = direction === "in" ? "←" : "→";
     const dirColor = direction === "in" ? chalk.greenBright : chalk.cyanBright;
     const prefix = `${dirColor(dirArrow)} ${chalk.bold(kind)}`;
-    const headline = (kind === "req" || kind === "res") && method
-        ? chalk.bold(method)
-        : kind === "event" && event
-            ? chalk.bold(event)
-            : undefined;
-    const statusToken = kind === "res" && ok !== undefined
-        ? ok
-            ? chalk.greenBright("✓")
-            : chalk.redBright("✗")
-        : undefined;
+    const headline = buildWsHeadline({ kind, method, event });
+    const statusToken = buildWsStatusToken(kind, ok);
     const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined;
-    const restMeta = [];
-    if (meta) {
-        for (const [key, value] of Object.entries(meta)) {
-            if (value === undefined)
-                continue;
-            if (key === "connId" || key === "id")
-                continue;
-            if (key === "method" || key === "ok")
-                continue;
-            if (key === "event")
-                continue;
-            restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
-        }
-    }
+    const restMeta = collectWsRestMeta(meta);
     const trailing = [];
     if (connId) {
         trailing.push(`${chalk.dim("conn")}=${chalk.gray(shortId(connId))}`);
     }
-    if (id)
+    if (id) {
         trailing.push(`${chalk.dim("id")}=${chalk.gray(shortId(id))}`);
-    const tokens = [prefix, statusToken, headline, durationToken, ...restMeta, ...trailing].filter((t) => Boolean(t));
-    wsLog.info(tokens.join(" "));
+    }
+    logWsInfoLine({ prefix, statusToken, headline, durationToken, restMeta, trailing });
 }
 function logWsOptimized(direction, kind, meta) {
     const connId = typeof meta?.connId === "string" ? meta.connId : undefined;
@@ -222,8 +272,9 @@ function logWsOptimized(direction, kind, meta) {
     const inflightKey = connId && id ? `${connId}:${id}` : undefined;
     if (direction === "in" && kind === "req" && inflightKey) {
         wsInflightOptimized.set(inflightKey, Date.now());
-        if (wsInflightOptimized.size > 2000)
+        if (wsInflightOptimized.size > 2000) {
             wsInflightOptimized.clear();
+        }
         return;
     }
     if (kind === "parse-error") {
@@ -237,39 +288,32 @@ function logWsOptimized(direction, kind, meta) {
             .join(" "));
         return;
     }
-    if (direction !== "out" || kind !== "res")
+    if (direction !== "out" || kind !== "res") {
         return;
+    }
     const startedAt = inflightKey ? wsInflightOptimized.get(inflightKey) : undefined;
-    if (inflightKey)
+    if (inflightKey) {
         wsInflightOptimized.delete(inflightKey);
+    }
     const durationMs = typeof startedAt === "number" ? Date.now() - startedAt : undefined;
     const shouldLog = ok === false || (typeof durationMs === "number" && durationMs >= DEFAULT_WS_SLOW_MS);
-    if (!shouldLog)
+    if (!shouldLog) {
         return;
-    const statusToken = ok === undefined ? undefined : ok ? chalk.greenBright("✓") : chalk.redBright("✗");
-    const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined;
-    const restMeta = [];
-    if (meta) {
-        for (const [key, value] of Object.entries(meta)) {
-            if (value === undefined)
-                continue;
-            if (key === "connId" || key === "id")
-                continue;
-            if (key === "method" || key === "ok")
-                continue;
-            restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
-        }
     }
-    const tokens = [
-        `${chalk.yellowBright("⇄")} ${chalk.bold("res")}`,
+    const statusToken = buildWsStatusToken("res", ok);
+    const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined;
+    const restMeta = collectWsRestMeta(meta);
+    logWsInfoLine({
+        prefix: `${chalk.yellowBright("⇄")} ${chalk.bold("res")}`,
         statusToken,
-        method ? chalk.bold(method) : undefined,
+        headline: method ? chalk.bold(method) : undefined,
         durationToken,
-        ...restMeta,
-        connId ? `${chalk.dim("conn")}=${chalk.gray(shortId(connId))}` : undefined,
-        id ? `${chalk.dim("id")}=${chalk.gray(shortId(id))}` : undefined,
-    ].filter((t) => Boolean(t));
-    wsLog.info(tokens.join(" "));
+        restMeta,
+        trailing: [
+            connId ? `${chalk.dim("conn")}=${chalk.gray(shortId(connId))}` : "",
+            id ? `${chalk.dim("id")}=${chalk.gray(shortId(id))}` : "",
+        ].filter(Boolean),
+    });
 }
 function logWsCompact(direction, kind, meta) {
     const now = Date.now();
@@ -283,8 +327,9 @@ function logWsCompact(direction, kind, meta) {
         return;
     }
     const compactArrow = (() => {
-        if (kind === "req" || kind === "res")
+        if (kind === "req" || kind === "res") {
             return "⇄";
+        }
         return direction === "in" ? "←" : "→";
     })();
     const arrowColor = kind === "req" || kind === "res"
@@ -293,11 +338,7 @@ function logWsCompact(direction, kind, meta) {
             ? chalk.greenBright
             : chalk.cyanBright;
     const prefix = `${arrowColor(compactArrow)} ${chalk.bold(kind)}`;
-    const statusToken = kind === "res" && ok !== undefined
-        ? ok
-            ? chalk.greenBright("✓")
-            : chalk.redBright("✗")
-        : undefined;
+    const statusToken = buildWsStatusToken(kind, ok);
     const startedAt = kind === "res" && direction === "out" && inflightKey
         ? wsInflightCompact.get(inflightKey)?.ts
         : undefined;
@@ -305,32 +346,19 @@ function logWsCompact(direction, kind, meta) {
         wsInflightCompact.delete(inflightKey);
     }
     const durationToken = typeof startedAt === "number" ? chalk.dim(`${now - startedAt}ms`) : undefined;
-    const headline = (kind === "req" || kind === "res") && method
-        ? chalk.bold(method)
-        : kind === "event" && typeof meta?.event === "string"
-            ? chalk.bold(meta.event)
-            : undefined;
-    const restMeta = [];
-    if (meta) {
-        for (const [key, value] of Object.entries(meta)) {
-            if (value === undefined)
-                continue;
-            if (key === "connId" || key === "id")
-                continue;
-            if (key === "method" || key === "ok")
-                continue;
-            if (key === "event")
-                continue;
-            restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
-        }
-    }
+    const headline = buildWsHeadline({
+        kind,
+        method,
+        event: typeof meta?.event === "string" ? meta.event : undefined,
+    });
+    const restMeta = collectWsRestMeta(meta);
     const trailing = [];
     if (connId && connId !== wsLastCompactConnId) {
         trailing.push(`${chalk.dim("conn")}=${chalk.gray(shortId(connId))}`);
         wsLastCompactConnId = connId;
     }
-    if (id)
+    if (id) {
         trailing.push(`${chalk.dim("id")}=${chalk.gray(shortId(id))}`);
-    const tokens = [prefix, statusToken, headline, durationToken, ...restMeta, ...trailing].filter((t) => Boolean(t));
-    wsLog.info(tokens.join(" "));
+    }
+    logWsInfoLine({ prefix, statusToken, headline, durationToken, restMeta, trailing });
 }

package/dist/hooks/frontmatter.js

@@ -1,104 +1,58 @@
-import JSON5 from "json5";
-import { LEGACY_MANIFEST_KEY } from "../compat/legacy-names.js";
 import { parseFrontmatterBlock } from "../markdown/frontmatter.js";
-import { parseBooleanValue } from "../utils/boolean.js";
+import { getFrontmatterString, normalizeStringList, parsePoolbotManifestInstallBase, parseFrontmatterBool, resolvePoolbotManifestBlock, resolvePoolbotManifestInstall, resolvePoolbotManifestOs, resolvePoolbotManifestRequires, } from "../shared/frontmatter.js";
 export function parseFrontmatter(content) {
     return parseFrontmatterBlock(content);
 }
-function normalizeStringList(input) {
-    if (!input)
-        return [];
-    if (Array.isArray(input)) {
-        return input.map((value) => String(value).trim()).filter(Boolean);
-    }
-    if (typeof input === "string") {
-        return input
-            .split(",")
-            .map((value) => value.trim())
-            .filter(Boolean);
-    }
-    return [];
-}
 function parseInstallSpec(input) {
-    if (!input || typeof input !== "object")
-        return undefined;
-    const raw = input;
-    const kindRaw = typeof raw.kind === "string" ? raw.kind : typeof raw.type === "string" ? raw.type : "";
-    const kind = kindRaw.trim().toLowerCase();
-    if (kind !== "bundled" && kind !== "npm" && kind !== "git") {
+    const parsed = parsePoolbotManifestInstallBase(input, ["bundled", "npm", "git"]);
+    if (!parsed) {
         return undefined;
     }
+    const { raw } = parsed;
     const spec = {
-        kind: kind,
+        kind: parsed.kind,
     };
-    if (typeof raw.id === "string")
-        spec.id = raw.id;
-    if (typeof raw.label === "string")
-        spec.label = raw.label;
-    const bins = normalizeStringList(raw.bins);
-    if (bins.length > 0)
-        spec.bins = bins;
-    if (typeof raw.package === "string")
+    if (parsed.id) {
+        spec.id = parsed.id;
+    }
+    if (parsed.label) {
+        spec.label = parsed.label;
+    }
+    if (parsed.bins) {
+        spec.bins = parsed.bins;
+    }
+    if (typeof raw.package === "string") {
         spec.package = raw.package;
-    if (typeof raw.repository === "string")
+    }
+    if (typeof raw.repository === "string") {
         spec.repository = raw.repository;
+    }
     return spec;
 }
-function getFrontmatterValue(frontmatter, key) {
-    const raw = frontmatter[key];
-    return typeof raw === "string" ? raw : undefined;
-}
-function parseFrontmatterBool(value, fallback) {
-    const parsed = parseBooleanValue(value);
-    return parsed === undefined ? fallback : parsed;
-}
 export function resolvePoolbotMetadata(frontmatter) {
-    const raw = getFrontmatterValue(frontmatter, "metadata");
-    if (!raw)
-        return undefined;
-    try {
-        const parsed = JSON5.parse(raw);
-        if (!parsed || typeof parsed !== "object")
-            return undefined;
-        const metadataRaw = parsed.poolbot ?? parsed[LEGACY_MANIFEST_KEY];
-        if (!metadataRaw || typeof metadataRaw !== "object")
-            return undefined;
-        const metadataObj = metadataRaw;
-        const requiresRaw = typeof metadataObj.requires === "object" && metadataObj.requires !== null
-            ? metadataObj.requires
-            : undefined;
-        const installRaw = Array.isArray(metadataObj.install) ? metadataObj.install : [];
-        const install = installRaw
-            .map((entry) => parseInstallSpec(entry))
-            .filter((entry) => Boolean(entry));
-        const osRaw = normalizeStringList(metadataObj.os);
-        const eventsRaw = normalizeStringList(metadataObj.events);
-        return {
-            always: typeof metadataObj.always === "boolean" ? metadataObj.always : undefined,
-            emoji: typeof metadataObj.emoji === "string" ? metadataObj.emoji : undefined,
-            homepage: typeof metadataObj.homepage === "string" ? metadataObj.homepage : undefined,
-            hookKey: typeof metadataObj.hookKey === "string" ? metadataObj.hookKey : undefined,
-            export: typeof metadataObj.export === "string" ? metadataObj.export : undefined,
-            os: osRaw.length > 0 ? osRaw : undefined,
-            events: eventsRaw.length > 0 ? eventsRaw : [],
-            requires: requiresRaw
-                ? {
-                    bins: normalizeStringList(requiresRaw.bins),
-                    anyBins: normalizeStringList(requiresRaw.anyBins),
-                    env: normalizeStringList(requiresRaw.env),
-                    config: normalizeStringList(requiresRaw.config),
-                }
-                : undefined,
-            install: install.length > 0 ? install : undefined,
-        };
-    }
-    catch {
+    const metadataObj = resolvePoolbotManifestBlock({ frontmatter });
+    if (!metadataObj) {
         return undefined;
     }
+    const requires = resolvePoolbotManifestRequires(metadataObj);
+    const install = resolvePoolbotManifestInstall(metadataObj, parseInstallSpec);
+    const osRaw = resolvePoolbotManifestOs(metadataObj);
+    const eventsRaw = normalizeStringList(metadataObj.events);
+    return {
+        always: typeof metadataObj.always === "boolean" ? metadataObj.always : undefined,
+        emoji: typeof metadataObj.emoji === "string" ? metadataObj.emoji : undefined,
+        homepage: typeof metadataObj.homepage === "string" ? metadataObj.homepage : undefined,
+        hookKey: typeof metadataObj.hookKey === "string" ? metadataObj.hookKey : undefined,
+        export: typeof metadataObj.export === "string" ? metadataObj.export : undefined,
+        os: osRaw.length > 0 ? osRaw : undefined,
+        events: eventsRaw.length > 0 ? eventsRaw : [],
+        requires: requires,
+        install: install.length > 0 ? install : undefined,
+    };
 }
 export function resolveHookInvocationPolicy(frontmatter) {
     return {
-        enabled: parseFrontmatterBool(getFrontmatterValue(frontmatter, "enabled"), true),
+        enabled: parseFrontmatterBool(getFrontmatterString(frontmatter, "enabled"), true),
     };
 }
 export function resolveHookKey(hookName, entry) {