modelrig 0.8.1 → 0.10.0

package/dist/adapters/responses-api.js

@@ -0,0 +1,124 @@
+"use strict";
+/**
+ * Responses-API dispatch path (Native Web Search lane, spec N1–N2) — the SHARED
+ * request/response mapping for providers whose native `web_search` tool lives only
+ * on `/v1/responses` (OpenAI + xAI/Grok today; same shape). This is a NEW dispatch
+ * path, NOT an extension of the Chat Completions `tools` block — see research §2.
+ *
+ * DOCTRINE (inherited from CE-9):
+ *  - ABSENT ⇒ BYTE-IDENTICAL. This path is entered ONLY for a grounded request
+ *    (`req.grounding === true`). A non-grounded request stays on the adapter's
+ *    existing `chat.completions.create` call, unchanged. The per-adapter branch
+ *    lives in openai.ts / grok.ts (Step 2); this module owns only the Responses shape.
+ *  - FORWARD-VERBATIM + CLASSIFY-TEACHABLY: forward the web_search tool + sampling/
+ *    reasoning under their Responses-dialect names; let the provider enforce; map a
+ *    rejection onto an EXISTING FailureClass with a teaching fixHint (no new class).
+ *  - CITATIONS: map `response` citations onto the `url_citation` shape already used
+ *    by the inject rung (src/run/grounding.ts) — do NOT invent a second type.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildResponsesParams = buildResponsesParams;
+exports.mapResponsesResult = mapResponsesResult;
+const sampling_1 = require("./sampling");
+const raw_support_1 = require("../run/raw-support");
+/** Parity with the Chat Completions default output cap (openai.ts / grok.ts). */
+const DEFAULT_MAX_OUTPUT_TOKENS = 32000;
+/**
+ * Build the `responses.create` params for a grounded request. Appends the
+ * `web_search` tool; forwards sampling/reasoning. Callers MUST only invoke this when
+ * `req.grounding === true` (the guard already enforced provider support pre-dispatch).
+ *
+ * Reasoning maps 1:1 for OpenAI (`level` → `reasoning.effort`); for grok the neutral
+ * four-level `level` is coarsened to xAI's `low|high` via `coarsenGrokReasoningEffort`
+ * (the SAME disclosed mapping the Chat Completions path uses — never a silent drop).
+ */
+function buildResponsesParams(req) {
+    const input = [
+        ...(req.systemPrompt !== "" ? [{ role: "system", content: req.systemPrompt }] : []),
+        { role: "user", content: req.userPrompt },
+    ];
+    const reasoning = req.reasoning !== undefined
+        ? {
+            reasoning: {
+                effort: req.candidate.provider === "grok"
+                    ? (0, raw_support_1.coarsenGrokReasoningEffort)(req.reasoning.level)
+                    : req.reasoning.level,
+            },
+        }
+        : {};
+    return {
+        model: req.candidate.model,
+        input,
+        // Native web-search server tool, left at defaults. As of openai@7.x the
+        // `web_search` tool type also accepts `filters`, `external_web_access`, and
+        // `search_context_size` (a token/context-budget knob) — NOT wired here on
+        // purpose (they need product knobs); available for a follow-up mission.
+        tools: [{ type: "web_search" }],
+        max_output_tokens: (0, sampling_1.effectiveMaxOutputTokens)(req, DEFAULT_MAX_OUTPUT_TOKENS),
+        // temperature / top_p share the Chat Completions dialect names on the
+        // Responses API — reuse the one sampling mapper (absent ⇒ no keys added).
+        ...(0, sampling_1.openAISamplingFields)(req),
+        ...reasoning,
+    };
+}
+/**
+ * Map a raw `responses.create` result onto ModelRig's normalized shape: output text,
+ * AdapterUsage (cache-read is a SUBSET of `tokensIn`, per the WS-A invariant), and
+ * citations in the `url_citation` shape. A zero-citation grounded response is
+ * SURFACED (empty array), never thrown (spec N2).
+ */
+function mapResponsesResult(response) {
+    const r = (typeof response === "object" && response !== null ? response : {});
+    const items = Array.isArray(r.output) ? r.output : [];
+    // Text: prefer the SDK convenience aggregate, else concatenate output_text parts.
+    const aggregate = typeof r.output_text === "string" ? r.output_text : "";
+    const text = aggregate !== ""
+        ? aggregate
+        : items
+            .filter((it) => it.type === "message")
+            .flatMap((it) => it.content ?? [])
+            .filter((c) => c.type === "output_text" && typeof c.text === "string")
+            .map((c) => c.text)
+            .join("");
+    // Citations: url_citation annotations on output_text parts, deduped by URL,
+    // first-seen title wins. Reuses the inject rung's UrlCitation shape.
+    const seen = new Set();
+    const citations = [];
+    for (const it of items) {
+        if (it.type !== "message")
+            continue;
+        for (const part of it.content ?? []) {
+            if (part.type !== "output_text")
+                continue;
+            for (const ann of part.annotations ?? []) {
+                if (ann.type !== "url_citation" || typeof ann.url !== "string" || ann.url === "")
+                    continue;
+                if (seen.has(ann.url))
+                    continue;
+                seen.add(ann.url);
+                citations.push({
+                    type: "url_citation",
+                    url: ann.url,
+                    ...(typeof ann.title === "string" && ann.title !== "" ? { title: ann.title } : {}),
+                });
+            }
+        }
+    }
+    // usage: input_tokens already INCLUDES cached_tokens → tokensIn is subset-correct
+    // (WS-A). The Responses API reports no cache-write on these providers ⇒ 0/omit.
+    const usage = {
+        tokensIn: r.usage?.input_tokens ?? 0,
+        tokensOut: r.usage?.output_tokens ?? 0,
+        tokensCached: r.usage?.input_tokens_details?.cached_tokens ?? 0,
+        servedTier: "standard",
+    };
+    // searchCalls: count the web_search_call output items (spec N3). None ⇒ undefined
+    // (the raw success path assumes 1, disclosed).
+    const searchCalls = items.filter((it) => it.type === "web_search_call").length;
+    return {
+        text,
+        usage,
+        citations,
+        ...(searchCalls > 0 ? { searchCalls } : {}),
+    };
+}

package/dist/artifacts/artifact.d.ts

@@ -1,7 +1,7 @@
 /**
  * Artifact namespace — Expansion E2 chunk B (spec §2.2, §9).
  *
- * `save/load/link/evaluate` over a durable work product's METADATA. The
+ * `save/load/link` over a durable work product's METADATA. The
  * serialized value is hashed (sha256, node:crypto — no new dep) and the bytes
  * are DISCARDED; nothing but the metadata row is persisted (the 00030
  * counter-annotation). Lineage v0: artifacts saved within a run get
@@ -16,14 +16,24 @@
 import type { ArtifactStore } from "../telemetry/artifact-store";
 import type { EvalCaseOrigin } from "../types/telemetry";
 import { type ScrubMode } from "./scrub";
+import { type TaskSettingsResolver } from "../settings/task-settings";
 import type { ContentUploadInput, ContentUploadOutcome } from "./content-uploader";
+import { type Manifest } from "../prompts/manifest";
 /** The upload transport `save` fires content through — injected so the SDK's
  * networked implementation and the tests share one seam. */
 export type ArtifactContentUploader = (input: ContentUploadInput) => Promise<ContentUploadOutcome>;
 /** Per-rig content-custody wiring passed to the artifact api (E2-C). Absent =
  * metadata + hash only, today's behaviour. */
 export interface ArtifactContentDeps {
-    readonly scrub: ScrubMode;
+    /** Per-task scrub resolver (settings-plane §1.5; P15 CP-3b). The control-plane
+     * task/account setting WINS — scrub is an account setting, not a client env var
+     * (`MODELRIG_ARTIFACTS_SCRUB` was deleted). null for local-only / direct rigs
+     * that have no control plane, and for a run with no task identity — then
+     * `defaultScrub` governs. */
+    readonly resolver: TaskSettingsResolver | null;
+    /** Fallback scrub mode when no resolver answers for the task. The content-on
+     * default (`detect`). */
+    readonly defaultScrub: ScrubMode;
     readonly upload: ArtifactContentUploader;
 }
 export interface ArtifactHandle {
@@ -55,13 +65,14 @@ export interface ArtifactSaveOptions {
     readonly supersedes?: ArtifactHandle;
     readonly expiresAt?: string;
 }
-export interface ArtifactEvaluateOptions {
-    readonly evaluator: string;
-    readonly kind: "deterministic" | "model-judge" | "human";
-    readonly score?: number;
-    readonly passed?: boolean;
-    readonly label?: string;
-    readonly explanation?: string;
+/** Options for {@link ArtifactApi.saveManifest} — the grouping keys the manifest
+ * artifact inherits from its prompt (task/step), mirroring a normal save. */
+export interface ArtifactManifestOptions {
+    /** Artifact name; defaults to `<prompt name>.manifest` / `"manifest"`. */
+    readonly name?: string;
+    readonly task?: string;
+    readonly stepKey?: string;
+    readonly attemptNo?: number;
 }
 export interface ArtifactPromoteOptions {
     readonly note?: string;
@@ -80,12 +91,20 @@ export interface ArtifactApi {
      * a handle. Returns null when the namespace is disabled or a zeroRetention run
      * refuses it (fail-closed). */
     save(value: unknown, opts: ArtifactSaveOptions): ArtifactHandle | null;
+    /** PSR-1: attach a **structure-only** assembly manifest (spec §2.1) to a
+     * `prompt` artifact. Validates the manifest, saves it as a linked free-text
+     * `type: "manifest"` artifact (ZERO-DDL — the `type` column is open), and
+     * links `prompt → manifest` with a `derived_from` edge so the manifest joins
+     * the existing prompt lineage and stays addressable for PSR-2 ingest. Returns
+     * the manifest handle, or null when the manifest is invalid (a counted,
+     * teaching warn — never throws) or custody/zeroRetention refuses the save.
+     * A no-op unless explicitly called, so `save` stays byte-identical (the emit
+     * is inert without a manifest). */
+    saveManifest(prompt: ArtifactHandle | string, manifest: Manifest, opts?: ArtifactManifestOptions): ArtifactHandle | null;
     /** Mark an artifact consumed by the current run (feeds derived_from lineage). */
     load(ref: ArtifactHandle | string): void;
     /** Explicit lineage edge the runtime cannot infer. */
     link(from: ArtifactHandle | string, to: ArtifactHandle | string, kind: "consumed" | "derived_from"): void;
-    /** Record an evaluation against an artifact. */
-    evaluate(ref: ArtifactHandle | string, opts: ArtifactEvaluateOptions): void;
     /** Promote an artifact into the org's durable eval suite (E4 chunk A) — a
      * regression case replayable via `bakeoff --from-eval-cases`. `corrected` set
      * ⇒ a golden-corrected pair; absent ⇒ a failure-case. The `task` binds the
@@ -94,7 +113,7 @@ export interface ArtifactApi {
      * Returns the new case id on success. */
     promoteToEval(ref: ArtifactHandle | string, opts?: ArtifactPromoteOptions): string | null;
     /** Run `fn` inside a single store transaction and return its value (H8), so a
-     * step's several save/link/evaluate writes commit with ONE fsync. On a
+     * step's several save/link writes commit with ONE fsync. On a
      * disabled/inert namespace `fn` runs directly (no store, no transaction). */
     batch<T>(fn: () => T): T;
     /** Await every in-flight content upload (E2-C). Content upload is fire-and-

package/dist/artifacts/artifact.d.ts.map

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