@senpi/runtime 3.0.150 → 3.0.153

package/dist/skill-router/prompt.js

@@ -0,0 +1,318 @@
+/**
+ * Prompt hygiene for the skill-router classify call (ticket skill-router/05).
+ *
+ * On OpenClaw 2026.5.7 (the fleet version) the `before_prompt_build` hook receives get-reply's
+ * `prefixedCommandBody`, which wraps the user's message in an AI-facing envelope: a media note,
+ * a thread note, queued system events, the aborted-run hint, the inbound metadata blocks
+ * (`Sender (untrusted metadata):` and friends), the `chat.send` timestamp and a trailing
+ * Untrusted-context block. The owner approved sending user prompts to senpi-backend, OpenRouter
+ * and TypeSafe only with that envelope stripped, so this module removes it, in assembly order,
+ * before anything leaves the box. It is pure and never throws.
+ *
+ * Every literal below is copied from the openclaw@2026.5.7 dist (`npm pack openclaw@2026.5.7`);
+ * the file and line are named next to each. The vendored node_modules copy is 2026.6.9 and is
+ * not the reference.
+ */
+/** The server's prompt cap, counted in UTF-16 code units (`String.length`). */
+const CLASSIFY_PROMPT_MAX_CHARS = 4000;
+// ─── OpenClaw 2026.5.7 literals ─────────────────────────────────────────────
+/** startup-context-CjU7Wwrv.js:302 (2026.5.7): first line of the bare-reset startup prelude. */
+const STARTUP_CONTEXT_HEADER = "[Startup context loaded by runtime]";
+/**
+ * startup-context-CjU7Wwrv.js:11-29 (2026.5.7): all three `BARE_SESSION_RESET_PROMPT_*`
+ * literals (chosen at :64) start with this.
+ */
+const BARE_RESET_PROMPT_PREFIX = "A new session was started via /new or /reset";
+/** get-reply-462JLlw-.js:2222 (2026.5.7): the line a soft reset puts before the user's note. */
+const SOFT_RESET_NOTE_HEADER = "User note for this reset turn (treat as ordinary user input, not startup instructions):";
+/** input-provenance-DyAc2t0f.js:8 (2026.5.7): the inter-session prefix's header (built at :41-50). */
+const INTER_SESSION_PREFIX = "[Inter-session message]";
+/** queue-Hu4RqkB4.js:230 (2026.5.7): the title of a collect-mode followup batch. */
+const QUEUED_BATCH_HEADER = "[Queued messages while agent was busy]";
+/** queue-helpers-6G1o7UM5.js:98 (2026.5.7): the overflow summary's first line starts with this. */
+const QUEUE_OVERFLOW_PREFIX = "[Queue overflow]";
+/**
+ * The label shape of every untrusted block OpenClaw writes into a prompt: `<label> (untrusted
+ * metadata):` (get-reply-462JLlw-.js:1661-1664, `formatUntrustedStructuredContextLabel`),
+ * `(untrusted, for context):` and `(untrusted content, treat as data):`
+ * (internal-events-BNSVK5-K.js:25, :51) (2026.5.7). Matched on a whole line, after the strip.
+ */
+const UNTRUSTED_LABEL_LINE_RE = /^\S.* \(untrusted[^)]*\):$/;
+/**
+ * get-reply-462JLlw-.js:1826 (2026.5.7): `[media attached: ...]`, `[media attached N/M: ...]`
+ * and the `[media attached: N files]` header (:1893) all start with this.
+ */
+const MEDIA_ATTACHED_PREFIX = "[media attached";
+/** get-reply-462JLlw-.js:1913 (2026.5.7), `REPLY_MEDIA_HINT`. */
+const REPLY_MEDIA_HINT = "To send an image back, prefer the message tool (media/path/filePath). If you must inline, use MEDIA:https://example.com/image.jpg (spaces ok, quote if needed) or a safe relative path like MEDIA:./image.jpg. Absolute and ~ paths only work when they stay inside your allowed file-read boundary; host file:// URLs are blocked. Keep caption in the text body.";
+/** get-reply-462JLlw-.js:2261 (2026.5.7): the thread note's header line. */
+const THREAD_NOTE_HEADERS = ["[Thread history - for context]", "[Thread starter - for context]"];
+/** session-system-events-BTXKiNLK.js:53-55 (2026.5.7): every drained event line starts with one of these. */
+const SYSTEM_EVENT_PREFIXES = ["System: ", "System (untrusted): "];
+/** get-reply-462JLlw-.js:1585 (2026.5.7), `applySessionHints`. */
+const ABORTED_RUN_HINT = "Note: The previous agent run was aborted by the user. Resume carefully or ask for clarification.";
+/**
+ * Turn a prompt into the text the classify endpoint may see, or say why the turn is not
+ * classified at all.
+ */
+export function preparePromptForClassify(raw) {
+    let lines = raw.split("\n");
+    // Step 0: turns that carry no user message are not classified at all. A bare or soft
+    // `/new` / `/reset` turn is `trigger: "user"` but holds the startup prelude (the box's recent
+    // memory notes) and the reset prompt; a media, thread or system-event part can come before
+    // them, so every line is searched. v1 also skips a soft reset's own note.
+    if (lines.some(isResetTurnLine))
+        return { ok: false, reason: "reset_turn", envelopeStripped: false };
+    // Inter-session content was routed from another session; it is not the user's own text.
+    if (lines[0].startsWith(INTER_SESSION_PREFIX)) {
+        return { ok: false, reason: "inter_session", envelopeStripped: false };
+    }
+    // A collect-mode followup batches several queued turns, each with its own sender label,
+    // timestamp and envelope (queue-Hu4RqkB4.js:144-148, :228-234); the stripper only works at the
+    // top, so the batch is not classified. Every line is searched, as for a reset turn.
+    if (lines.some(isQueueBatchLine))
+        return { ok: false, reason: "queued_batch", envelopeStripped: false };
+    let stripped = false;
+    const apply = (step) => {
+        const next = step(lines);
+        if (next !== lines) {
+            lines = next;
+            stripped = true;
+        }
+    };
+    // Step 1: a leading media block, then REPLY_MEDIA_HINT.
+    apply(stripLeadingMediaBlock);
+    // Step 2: a leading thread note, up to the next envelope part.
+    apply(stripLeadingThreadNote);
+    // Step 3: the run of system-event lines at the top, through the blank line after it.
+    apply(stripLeadingSystemEvents);
+    // Step 4: the aborted-run hint paragraph.
+    apply(stripAbortedRunHint);
+    // Step 5: OpenClaw's own inbound-metadata stripper.
+    const joined = lines.join("\n");
+    let text = stripInboundMetadata(joined);
+    if (text !== joined)
+        stripped = true;
+    // Step 6: a timestamp exposed by the earlier steps.
+    const unstamped = text.replace(LEADING_TIMESTAMP_PREFIX_RE, "");
+    if (unstamped !== text) {
+        text = unstamped;
+        stripped = true;
+    }
+    // Step 7: an untrusted block the port doesn't strip (Location, structured context, a task
+    // result, or a known label without its fence) means the turn isn't sent at all, rather than
+    // widen the port beyond OpenClaw's own stripper (ticket skill-router/16).
+    if (text.split("\n").some((line) => UNTRUSTED_LABEL_LINE_RE.test(line.trim()))) {
+        return { ok: false, reason: "unknown_envelope", envelopeStripped: stripped };
+    }
+    // Step 8: nothing left, nothing sent.
+    if (text.trim().length === 0)
+        return { ok: false, reason: "empty_prompt", envelopeStripped: stripped };
+    // Step 9: the server's cap.
+    const prompt = truncateCodeUnits(text, CLASSIFY_PROMPT_MAX_CHARS);
+    return {
+        ok: true,
+        prompt,
+        length: prompt.length,
+        truncated: prompt.length < text.length,
+        envelopeStripped: stripped,
+    };
+}
+/** Cut to at most `max` UTF-16 code units, backing off one unit rather than split a surrogate pair. */
+function truncateCodeUnits(text, max) {
+    if (text.length <= max)
+        return text;
+    let cut = max;
+    const last = text.charCodeAt(cut - 1);
+    if (last >= 0xd800 && last <= 0xdbff)
+        cut -= 1;
+    return text.slice(0, cut);
+}
+function isResetTurnLine(line) {
+    const trimmed = line.trim();
+    return (trimmed === STARTUP_CONTEXT_HEADER ||
+        trimmed === SOFT_RESET_NOTE_HEADER ||
+        trimmed.startsWith(BARE_RESET_PROMPT_PREFIX));
+}
+function isQueueBatchLine(line) {
+    const trimmed = line.trim();
+    return trimmed === QUEUED_BATCH_HEADER || trimmed.startsWith(QUEUE_OVERFLOW_PREFIX);
+}
+// Each step returns `lines` itself when it removed nothing.
+function stripLeadingMediaBlock(lines) {
+    let end = 0;
+    while (end < lines.length && lines[end].startsWith(MEDIA_ATTACHED_PREFIX))
+        end += 1;
+    if (end === 0)
+        return lines;
+    // buildReplyPromptBodies joins the media note, the hint and the rest with a single "\n".
+    if (end < lines.length && lines[end] === REPLY_MEDIA_HINT)
+        end += 1;
+    return lines.slice(end);
+}
+/**
+ * The note's end is structural, not the first blank line: a Slack history joins its messages
+ * with "\n\n" (prepare-Crp4izYK.js:617, 2026.5.7), so it has blank lines inside it. And the
+ * history is other people's raw text (:600-617), so a paragraph inside it can look like any
+ * later layout part: a `System:` line (rewritten to `System (untrusted):`,
+ * inbound-text-CNPDSrja.js:6-11, still an event prefix), the aborted-run hint, or a pasted
+ * inbound-metadata block. A note that ends at the first such line sends the rest of the history.
+ *
+ * So the end is found from the back, where a forged part can only strip more of the user's own
+ * body, never send the history:
+ *   - the last inbound-metadata block (a sentinel line after a blank line, then a ```json line),
+ *     because get-reply puts the metadata right before the body (get-reply-462JLlw-.js:2219-2223);
+ *     the system events and the aborted hint before it go with the note;
+ *   - with no block, the last line after a blank line that starts a system event or is the
+ *     aborted-run hint (steps 3-4 then strip it).
+ * With neither, the note's end can't be told from the user's body, so everything is dropped (the
+ * prompt is empty and nothing is sent) rather than guessed.
+ */
+function stripLeadingThreadNote(lines) {
+    if (lines.length === 0 || !THREAD_NOTE_HEADERS.includes(lines[0]))
+        return lines;
+    let lastBlock = -1;
+    let lastOther = -1;
+    for (let i = 2; i < lines.length; i += 1) {
+        if (lines[i - 1].trim() !== "")
+            continue;
+        const line = lines[i];
+        if (isInboundMetaSentinelLine(line) && lines[i + 1]?.trim() === "```json")
+            lastBlock = i;
+        else if (isSystemEventLine(line) || line === ABORTED_RUN_HINT)
+            lastOther = i;
+    }
+    const end = lastBlock !== -1 ? lastBlock : lastOther;
+    return end === -1 ? [] : lines.slice(end);
+}
+function stripAbortedRunHint(lines) {
+    if (lines.length === 0 || lines[0] !== ABORTED_RUN_HINT)
+        return lines;
+    // applySessionHints joins the hint to the body with "\n\n".
+    return lines.slice(lines.length > 1 && lines[1].trim() === "" ? 2 : 1);
+}
+function isSystemEventLine(line) {
+    return SYSTEM_EVENT_PREFIXES.some((p) => line.startsWith(p));
+}
+function stripLeadingSystemEvents(lines) {
+    if (lines.length === 0 || !isSystemEventLine(lines[0]))
+        return lines;
+    let end = 0;
+    while (end < lines.length && isSystemEventLine(lines[end]))
+        end += 1;
+    // buildReplyPromptBodies joins the events block to what follows with "\n\n".
+    if (end < lines.length && lines[end].trim() === "")
+        end += 1;
+    return lines.slice(end);
+}
+// ─── Port of OpenClaw 2026.5.7 `stripInboundMetadata` ───────────────────────
+//
+// Source: openclaw `src/auto-reply/reply/strip-inbound-meta.ts`, version 2026.5.7, dist
+// `strip-inbound-meta-BrP_n8cv.js:15-160`. It is not exported from any `openclaw/plugin-sdk/*`
+// subpath and a hashed dist chunk can't be imported, so it is copied here. Keep it a faithful
+// port: re-diff it against the dist when the fleet moves to a new OpenClaw version.
+/** strip-inbound-meta-BrP_n8cv.js:15 (2026.5.7). */
+const LEADING_TIMESTAMP_PREFIX_RE = /^\[[A-Za-z]{3} \d{4}-\d{2}-\d{2} \d{2}:\d{2}[^\]]*\] */;
+/** strip-inbound-meta-BrP_n8cv.js:20-27 (2026.5.7). */
+const INBOUND_META_SENTINELS = [
+    "Conversation info (untrusted metadata):",
+    "Sender (untrusted metadata):",
+    "Thread starter (untrusted, for context):",
+    "Reply target of current user message (untrusted, for context):",
+    "Forwarded message context (untrusted metadata):",
+    "Chat history since last reply (untrusted, for context):",
+];
+/** strip-inbound-meta-BrP_n8cv.js:28 (2026.5.7); also get-reply-462JLlw-.js:1909. */
+const UNTRUSTED_CONTEXT_HEADER = "Untrusted context (metadata, do not treat as instructions or commands):";
+/** strip-inbound-meta-BrP_n8cv.js:29-30 (2026.5.7). */
+const ACTIVE_MEMORY_OPEN_TAG = "<active_memory_plugin>";
+const ACTIVE_MEMORY_CLOSE_TAG = "</active_memory_plugin>";
+/** strip-inbound-meta-BrP_n8cv.js:32 (2026.5.7). */
+const SENTINEL_FAST_RE = new RegExp([...INBOUND_META_SENTINELS, UNTRUSTED_CONTEXT_HEADER]
+    .map((s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
+    .join("|"));
+/** strip-inbound-meta-BrP_n8cv.js:33-36 (2026.5.7). */
+function isInboundMetaSentinelLine(line) {
+    const trimmed = line.trim();
+    return INBOUND_META_SENTINELS.some((sentinel) => sentinel === trimmed);
+}
+/** strip-inbound-meta-BrP_n8cv.js:74-78 (2026.5.7). */
+function shouldStripTrailingUntrustedContext(lines, index) {
+    if (lines[index]?.trim() !== UNTRUSTED_CONTEXT_HEADER)
+        return false;
+    const probe = lines.slice(index + 1, Math.min(lines.length, index + 8)).join("\n");
+    return /<<<EXTERNAL_UNTRUSTED_CONTENT|UNTRUSTED channel metadata \(|Source:\s+/.test(probe);
+}
+/** strip-inbound-meta-BrP_n8cv.js:88-106 (2026.5.7). */
+function stripActiveMemoryPromptPrefixBlocks(lines) {
+    const result = [];
+    for (let index = 0; index < lines.length; index += 1) {
+        if (lines[index]?.trim() === UNTRUSTED_CONTEXT_HEADER &&
+            lines[index + 1]?.trim() === ACTIVE_MEMORY_OPEN_TAG) {
+            let closeIndex = -1;
+            for (let probe = index + 2; probe < lines.length; probe += 1) {
+                if (lines[probe]?.trim() === ACTIVE_MEMORY_CLOSE_TAG) {
+                    closeIndex = probe;
+                    break;
+                }
+            }
+            if (closeIndex !== -1) {
+                index = closeIndex;
+                while (index + 1 < lines.length && lines[index + 1]?.trim() === "")
+                    index += 1;
+                continue;
+            }
+        }
+        result.push(lines[index]);
+    }
+    return result;
+}
+/** strip-inbound-meta-BrP_n8cv.js:122-160 (2026.5.7). */
+function stripInboundMetadata(text) {
+    if (!text)
+        return text;
+    const withoutTimestamp = text.replace(LEADING_TIMESTAMP_PREFIX_RE, "");
+    if (!SENTINEL_FAST_RE.test(withoutTimestamp))
+        return withoutTimestamp;
+    const lines = stripActiveMemoryPromptPrefixBlocks(withoutTimestamp.split("\n"));
+    const result = [];
+    let inMetaBlock = false;
+    let inFencedJson = false;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (!inMetaBlock && shouldStripTrailingUntrustedContext(lines, i))
+            break;
+        if (!inMetaBlock && isInboundMetaSentinelLine(line)) {
+            if (lines[i + 1]?.trim() !== "```json") {
+                result.push(line);
+                continue;
+            }
+            inMetaBlock = true;
+            inFencedJson = false;
+            continue;
+        }
+        if (inMetaBlock) {
+            if (!inFencedJson && line.trim() === "```json") {
+                inFencedJson = true;
+                continue;
+            }
+            if (inFencedJson) {
+                if (line.trim() === "```") {
+                    inMetaBlock = false;
+                    inFencedJson = false;
+                }
+                continue;
+            }
+            if (line.trim() === "")
+                continue;
+            inMetaBlock = false;
+        }
+        result.push(line);
+    }
+    return result
+        .join("\n")
+        .replace(/^\n+/, "")
+        .replace(/\n+$/, "")
+        .replace(LEADING_TIMESTAMP_PREFIX_RE, "");
+}
+//# sourceMappingURL=prompt.js.map

package/dist/skill-router/prompt.js.map

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

package/dist/skill-router/resolve.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Narrow the server's `fired` list to what this box may point the model at (ticket
+ * skill-router/05).
+ *
+ * Under D3 option A the server computes `fired` (its minConfidence, at most two). The box can
+ * only narrow it: a name survives when it was in this turn's sent list, is installed per the
+ * catalog, matches the name pattern and has a valid score, and, when a local floor is set,
+ * scores at or above it. At most two survive, highest score first.
+ *
+ * Never inject text taken from the response: the names and paths returned here are the
+ * catalog's own strings, and the scores are validated numbers the hook formats itself.
+ */
+import type { CatalogSnapshot } from "./catalog.js";
+import { type ClassifySuccess, type SkillRef, type WarnLogger } from "./classify-client.js";
+export interface InjectableSkill {
+    /** The catalog's name. */
+    name: string;
+    score: number;
+    /** The catalog's absolute `SKILL.md` path. */
+    skillMdPath: string;
+}
+export interface Resolution {
+    injectable: InjectableSkill[];
+    /** Entries of the server's `fired` that were not kept. */
+    droppedCount: number;
+}
+export declare function resolveInjectable(params: {
+    result: Pick<ClassifySuccess, "fired" | "scores">;
+    /** Exactly what this turn's request carried. */
+    sent: readonly SkillRef[];
+    catalog: CatalogSnapshot;
+    /** `resolveLocalFloor()`; can only remove names. */
+    floor?: number;
+}): Resolution;
+/**
+ * Read the optional local floor from the value of `SENPI_SKILL_ROUTER_FLOOR`: a plain decimal in
+ * [0, 1]. Unset or blank means no floor. An invalid value is ignored with one warning that names
+ * the variable, never its value.
+ */
+export declare function resolveLocalFloor(raw: string | undefined, logger?: WarnLogger): number | undefined;
+//# sourceMappingURL=resolve.d.ts.map

package/dist/skill-router/resolve.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/skill-router/resolve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAsB,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAKhH,MAAM,WAAW,eAAe;IAC9B,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,8CAA8C;IAC9C,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,0DAA0D;IAC1D,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IACxC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC;IAClD,gDAAgD;IAChD,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC1B,OAAO,EAAE,eAAe,CAAC;IACzB,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,UAAU,CAiBb;AAQD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CASlG"}

package/dist/skill-router/resolve.js

@@ -0,0 +1,43 @@
+import { SKILL_NAME_PATTERN } from "./classify-client.js";
+/** The most skills one pointer names. */
+const MAX_INJECTED_SKILLS = 2;
+export function resolveInjectable(params) {
+    const { result, catalog, floor } = params;
+    const sent = new Set(params.sent.map((s) => s.name));
+    const kept = new Map();
+    for (const name of result.fired) {
+        if (kept.has(name) || !sent.has(name) || !SKILL_NAME_PATTERN.test(name))
+            continue;
+        const skill = catalog.skills.get(name);
+        if (!skill)
+            continue;
+        const score = Object.hasOwn(result.scores, name) ? result.scores[name] : undefined;
+        if (!isScore(score))
+            continue;
+        if (floor !== undefined && score < floor)
+            continue;
+        kept.set(name, { name: skill.name, score, skillMdPath: skill.skillMdPath });
+    }
+    const injectable = [...kept.values()].sort((a, b) => b.score - a.score).slice(0, MAX_INJECTED_SKILLS);
+    return { injectable, droppedCount: result.fired.length - injectable.length };
+}
+function isScore(v) {
+    return typeof v === "number" && Number.isFinite(v) && v >= 0 && v <= 1;
+}
+const FLOOR_ENV_NAME = "SENPI_SKILL_ROUTER_FLOOR";
+/**
+ * Read the optional local floor from the value of `SENPI_SKILL_ROUTER_FLOOR`: a plain decimal in
+ * [0, 1]. Unset or blank means no floor. An invalid value is ignored with one warning that names
+ * the variable, never its value.
+ */
+export function resolveLocalFloor(raw, logger) {
+    const value = raw?.trim() ?? "";
+    if (value.length === 0)
+        return undefined;
+    const floor = /^(?:\d+(?:\.\d*)?|\.\d+)$/.test(value) ? Number(value) : Number.NaN;
+    if (Number.isFinite(floor) && floor >= 0 && floor <= 1)
+        return floor;
+    logger?.warn(`[senpi-runtime][skill-router] ${FLOOR_ENV_NAME} is invalid (it must be a number from 0 to 1); no local floor is applied`);
+    return undefined;
+}
+//# sourceMappingURL=resolve.js.map

package/dist/skill-router/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/skill-router/resolve.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAwD,MAAM,sBAAsB,CAAC;AAEhH,yCAAyC;AACzC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAgB9B,MAAM,UAAU,iBAAiB,CAAC,MAOjC;IACC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAC1C,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,IAAI,GAAG,EAA2B,CAAC;IAEhD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,SAAS;QAClF,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,SAAS;QAC9B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,GAAG,KAAK;YAAE,SAAS;QACnD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;IACtG,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;AAC/E,CAAC;AAED,SAAS,OAAO,CAAC,CAAU;IACzB,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,cAAc,GAAG,0BAA0B,CAAC;AAElD;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAuB,EAAE,MAAmB;IAC5E,MAAM,KAAK,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,KAAK,GAAG,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;IACnF,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACrE,MAAM,EAAE,IAAI,CACV,iCAAiC,cAAc,0EAA0E,CAC1H,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/skills-manager/version-manager.d.ts

@@ -26,6 +26,20 @@ export declare function normalizeVersion(v: string): string;
  * Returns null when the frontmatter block is absent or the field is missing.
  */
 export declare function parseSkillMdVersion(content: string): string | null;
+/**
+ * The YAML frontmatter block of a SKILL.md (between the leading `---` lines), or null when
+ * there is none. The one frontmatter rule shared by {@link parseSkillMdVersion} and
+ * {@link parseSkillMdName}.
+ */
+export declare function extractSkillMdFrontmatter(content: string): string | null;
+/**
+ * Extract the top-level `name` from a SKILL.md frontmatter block.
+ *
+ * Only an unindented `name:` key counts, so a nested `metadata.name` never matches. Quotes and
+ * a trailing ` # comment` are removed. Returns null when the frontmatter block is absent or has
+ * no non-empty top-level name; callers fall back to the skill's directory name, as OpenClaw does.
+ */
+export declare function parseSkillMdName(content: string): string | null;
 /**
  * Read the installed version for a skill from its local SKILL.md.
  *

package/dist/skills-manager/version-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-manager.d.ts","sourceRoot":"","sources":["../../src/skills-manager/version-manager.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,KAAK,EAAE,UAAU,EAAmB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGhF;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMlE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACrC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoBxB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,UAAU,GAAE,MAA4B,EACxC,SAAS,GAAE,OAAO,KAAa,EAC/B,UAAU,GAAE,MAAkB,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoCxB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACrC,SAAS,EAAE,MAAM,EACjB,UAAU,GAAE,MAA4B,EACxC,SAAS,GAAE,OAAO,KAAa,EAC/B,MAAM,CAAC,EAAE,UAAU,EACnB,UAAU,GAAE,MAAkB,GAC7B,OAAO,CAAC,gBAAgB,CAAC,CAyC3B"}
+{"version":3,"file":"version-manager.d.ts","sourceRoot":"","sources":["../../src/skills-manager/version-manager.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,KAAK,EAAE,UAAU,EAAmB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGhF;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKlE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGxE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAU/D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACrC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoBxB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,UAAU,GAAE,MAA4B,EACxC,SAAS,GAAE,OAAO,KAAa,EAC/B,UAAU,GAAE,MAAkB,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoCxB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACrC,SAAS,EAAE,MAAM,EACjB,UAAU,GAAE,MAA4B,EACxC,SAAS,GAAE,OAAO,KAAa,EAC/B,MAAM,CAAC,EAAE,UAAU,EACnB,UAAU,GAAE,MAAkB,GAC7B,OAAO,CAAC,gBAAgB,CAAC,CAyC3B"}

package/dist/skills-manager/version-manager.js

@@ -32,13 +32,41 @@ export function normalizeVersion(v) {
  * Returns null when the frontmatter block is absent or the field is missing.
  */
 export function parseSkillMdVersion(content) {
-    const match = /^---\r?\n([\s\S]*?)\r?\n---/.exec(content.trim());
-    if (!match)
+    const frontmatter = extractSkillMdFrontmatter(content);
+    if (frontmatter === null)
         return null;
-    const frontmatter = match[1];
     const versionMatch = /(?:^|\n)[ \t]*version:[ \t]*["']?([^\s"'\r\n]+)["']?/i.exec(frontmatter);
     return versionMatch ? versionMatch[1].trim() : null;
 }
+/**
+ * The YAML frontmatter block of a SKILL.md (between the leading `---` lines), or null when
+ * there is none. The one frontmatter rule shared by {@link parseSkillMdVersion} and
+ * {@link parseSkillMdName}.
+ */
+export function extractSkillMdFrontmatter(content) {
+    const match = /^---\r?\n([\s\S]*?)\r?\n---/.exec(content.trim());
+    return match ? match[1] : null;
+}
+/**
+ * Extract the top-level `name` from a SKILL.md frontmatter block.
+ *
+ * Only an unindented `name:` key counts, so a nested `metadata.name` never matches. Quotes and
+ * a trailing ` # comment` are removed. Returns null when the frontmatter block is absent or has
+ * no non-empty top-level name; callers fall back to the skill's directory name, as OpenClaw does.
+ */
+export function parseSkillMdName(content) {
+    const frontmatter = extractSkillMdFrontmatter(content);
+    if (frontmatter === null)
+        return null;
+    const nameMatch = /^name:[ \t]*(.*?)[ \t]*\r?$/m.exec(frontmatter);
+    if (!nameMatch)
+        return null;
+    let value = nameMatch[1];
+    const quoted = /^(["'])(.*?)\1(?:[ \t]+#.*)?$/.exec(value);
+    value = quoted ? quoted[2] : value.replace(/[ \t]+#.*$/, "");
+    value = value.trim();
+    return value.length > 0 ? value : null;
+}
 /**
  * Read the installed version for a skill from its local SKILL.md.
  *

package/dist/skills-manager/version-manager.js.map

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

package/dist/telemetry/spans/span-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"span-hooks.d.ts","sourceRoot":"","sources":["../../../src/telemetry/spans/span-hooks.ts"],"names":[],"mappings":"AA6DA,gEAAgE;AAChE,MAAM,WAAW,kBAAkB;IACjC,EAAE,CACA,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACrD,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3B,IAAI,CAAC;CACT;AAED,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,kBAAkB,CAAC;CACzB;AAED;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAW5C,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI,CA2kBzE"}
+{"version":3,"file":"span-hooks.d.ts","sourceRoot":"","sources":["../../../src/telemetry/spans/span-hooks.ts"],"names":[],"mappings":"AAmEA,gEAAgE;AAChE,MAAM,WAAW,kBAAkB;IACjC,EAAE,CACA,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACrD,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3B,IAAI,CAAC;CACT;AAED,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,kBAAkB,CAAC;CACzB;AAED;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAW5C,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI,CA+kBzE"}

package/dist/telemetry/spans/span-hooks.js

@@ -25,6 +25,11 @@ import { elapsedSeconds, recordToolCall, recordInvokeAgentDuration, recordOperat
 import { emitToolCalled, offeredToolNames, requestedToolNames, } from "../../telemetry/tool-plane.js";
 import { createLogger } from "../../utils/logger.js";
 const logger = createLogger("[senpi-core][span-hooks]");
+/**
+ * OpenClaw's per-run `runId` on the chat and execute_tool spans: the join key the skill router's
+ * `skill_router.decision` event shares (`src/utils/event-catalog.ts`). Distinct from `senpi.run.id`.
+ */
+const OPENCLAW_RUN_ID_ATTR = "senpi.openclaw.run_id";
 /**
  * Grace window the `agent_end` sweep holds a finished model span before ending it, so a
  * trailing `llm_output` (observed ~1 ms later in the codex/harness flow, but timed generously)
@@ -121,6 +126,9 @@ export function registerSpanHooks(options) {
                 // Session key as the conversation id, so consecutive turns of one session correlate (a
                 // single per-turn trace otherwise can't be tied to its neighbours — e.g. a runaway loop).
                 [GEN_AI.CONVERSATION_ID]: sessionKey,
+                // OpenClaw's own run id, so the skill router's decision event joins this turn exactly.
+                // Not `senpi.run.id`, which is the trading run id from the correlation header.
+                [OPENCLAW_RUN_ID_ATTR]: runId,
                 [GEN_AI.PROVIDER_NAME]: provider,
                 [GEN_AI.REQUEST_MODEL]: requestModel,
                 [GEN_AI.REQUEST_TEMPERATURE]: firstNumber(ev.temperature),
@@ -288,6 +296,7 @@ export function registerSpanHooks(options) {
             setDefinedAttributes(span, {
                 [GEN_AI.OPERATION_NAME]: "execute_tool",
                 [GEN_AI.CONVERSATION_ID]: resolved.sessionKey,
+                [OPENCLAW_RUN_ID_ATTR]: resolved.runId,
                 [GEN_AI.TOOL_NAME]: toolName,
                 [GEN_AI.TOOL_CALL_ID]: toolCallId ?? undefined,
                 // Best-effort skill attribution from a skill-file read (no first-class skill hook exists).