@nylorun/runtime 0.26.0-beta → 0.28.0-beta

package/dist/tenant/sweep.js

@@ -8,19 +8,19 @@
  *    a delivery after commit that failed, or that a crash between the commit and the send cut
  *    off. The first pass on this process takes every row, so a previous process's are not
  *    left waiting; later passes take those whose delivery after commit failed and those older
- *    than `OUTBOX_GRACE_MS` (the database's clock), batch after batch within
- *    `DRAIN_BUDGET_MS`. Each row carries the idempotency key it was first sent with, so a
+ *    than `sweep.outboxGraceMs` (Host tuning) (the database's clock), batch after batch within
+ *    `sweep.drainBudgetMs`. Each row carries the idempotency key it was first sent with, so a
  *    request the execution did accept before the crash, or one still being sent after its
  *    commit, runs once. Rows are delivered one by one: a row that fails is retried with
- *    backoff and parked after `MAX_OUTBOX_ATTEMPTS` (`deliverOutbox`), and no delivery fails
+ *    backoff and parked after `sweep.outboxAttempts` (`deliverOutbox`), and no delivery fails
  *    the step.
  * 2. **Linked agents.** Pending workflow `agent` effects whose linked turn already settled
  *    are completed and the workflow is woken. A linked turn's settle does both in its own
  *    transaction; this is the backstop for one that settle left pending, such as an effect
  *    an older Runtime wrote.
  * 3. **Orphaned sessions.** On this process's first pass for the Tenant, then at most every
- *    `ORPHAN_SCAN_MS`: `running` or `runnable` sessions with no owner, or an owner whose lease
- *    expired, are woken with reason `recover`, page by page within `DRAIN_BUDGET_MS`; a scan
+ *    `sweep.orphanScanMs`: `running` or `runnable` sessions with no owner, or an owner whose lease
+ *    expired, are woken with reason `recover`, page by page within `sweep.drainBudgetMs`; a scan
  *    the budget cut short goes on at the next pass. Neither a lost wake (step 1) nor a Worker
  *    that died mid-advance (the execution retries that advance, which takes over, §11.4)
  *    needs it: it is the backstop for what the execution itself lost or ended without an
@@ -33,8 +33,10 @@
  *    workspaces). Idle MCP connections of the in-process harness are closed. As often as the
  *    orphan scan, pod Environments whose change stalled get a reconcile (`reconcileStalePods`).
  *    Environments unused for their `lifecycle.deleteAfter` are deleted
- *    (`sweepUnusedEnvironments`).
- * 5. **Control signals.** Signals on the control bus older than `SIGNAL_RETENTION_MS` are
+ *    (`sweepUnusedAgents`).
+ *    Triggers (track T4, `triggers.ts`): on this process's first pass every active trigger's
+ *    timer is armed, later overdue ones only, and runs past `triggerRunRetentionMs` are deleted.
+ * 5. **Control signals.** Signals on the control bus older than `sweep.signalRetentionMs` are
  *    deleted: followers read back only the last two minutes (`store/postgres/control.ts`).
  * 6. **Hooks.** Callbacks registered with `ctx.onSweep`.
  *
@@ -43,30 +45,25 @@
  * step does not stop the others; the first error is rethrown at the end so the execution
  * reports it.
  */
-import { sweepUnusedEnvironments } from "./environments.js";
+import { sweepUnusedAgents } from "./agents.js";
+import { reconcileTriggers } from "./triggers.js";
 import { sweepPendingSeeds } from "../artifacts/disk.js";
 import { pendingAgentEffects, reconcilePendingAgentEffect, } from "../core/flow-host.js";
-const BATCH = 100;
-/** How long a control signal is kept after it was written. */
-const SIGNAL_RETENTION_MS = 60 * 60 * 1000;
-/**
- * How old an outbox row is before the sweep delivers it, unless its delivery after commit
- * already failed (then it is due at once): longer than that delivery can take with its
- * retries, so the sweep does not send again, and double the load on, an execution that is
- * only slow. Sending one twice is harmless either way (the idempotency key).
- */
-export const OUTBOX_GRACE_MS = 30_000;
-/**
- * How often the orphan scan, and the stale pod sandbox check, run after the first pass of a
- * Tenant opened on this process.
- */
-export const ORPHAN_SCAN_MS = 60_000;
-/**
- * How long one pass may spend draining the outbox, and paging through orphaned sessions.
- * A backlog is worked off over several passes rather than holding one (and with it the
- * Tenant's sweep object in the execution) for long.
+import { hostTuning } from "../tuning.js";
+import { sweepStartChecks } from "./agent-versions.js";
+/*
+ * The sweep's timings are the Host tuning's `sweep` group (`tuning.ts`):
+ * - `outboxGraceMs`: how old an outbox row is before the sweep delivers it, unless its delivery
+ *   after commit already failed (then it is due at once): longer than that delivery can take with
+ *   its retries, so the sweep does not send again, and double the load on, an execution that is
+ *   only slow. Sending one twice is harmless either way (the idempotency key).
+ * - `orphanScanMs`: how often the orphan scan, and the stale pod sandbox check, run after the
+ *   first pass of a Tenant opened on this process.
+ * - `drainBudgetMs`: how long one pass may spend draining the outbox, and paging through
+ *   orphaned sessions. A backlog is worked off over several passes rather than holding one (and
+ *   with it the Tenant's sweep object in the execution) for long.
+ * - `batchSize`, `signalRetentionMs`, `outboxAttempts`, `outboxRetry`, `stalePodMs`.
  */
-export const DRAIN_BUDGET_MS = 2000;
 /**
  * Each open Tenant's sweep state on this process: when its last orphan scan finished, the
  * last session id of one that ran out of budget, which the next pass goes on from, and when
@@ -82,10 +79,10 @@ export async function sweep(ctx) {
     passes.set(ctx, pass);
     const scanOrphans = pass.orphansAt === undefined ||
         pass.orphansAfter !== undefined ||
-        now.getTime() - pass.orphansAt >= ORPHAN_SCAN_MS;
-    const checkPods = pass.podsAt === undefined || now.getTime() - pass.podsAt >= ORPHAN_SCAN_MS;
+        now.getTime() - pass.orphansAt >= hostTuning().sweep.orphanScanMs;
+    const checkPods = pass.podsAt === undefined || now.getTime() - pass.podsAt >= hostTuning().sweep.orphanScanMs;
     const steps = [
-        ["outbox", () => deliverOutbox(ctx, first ? 0 : OUTBOX_GRACE_MS)],
+        ["outbox", () => deliverOutbox(ctx, first ? 0 : hostTuning().sweep.outboxGraceMs)],
         ["linked", () => reconcileLinkedAgents(ctx)],
         ...(scanOrphans
             ? [
@@ -120,14 +117,19 @@ export async function sweep(ctx) {
             ]
             : []),
         // Environments unused for their `lifecycle.deleteAfter`: one query when none is due.
-        ["environments", () => sweepUnusedEnvironments(ctx, now.getTime())],
+        ["agents", () => sweepUnusedAgents(ctx, now.getTime())],
+        // Pods slower than `tenant.upgradeStartMs` to start on a new version go back (track T3).
+        ["starts", () => sweepStartChecks(ctx, now.getTime())],
+        // Triggers (track T4): every active one armed on this process's first pass, overdue ones after;
+        // runs past their retention deleted.
+        ["triggers", () => reconcileTriggers(ctx, first)],
         // Seeds of new volumes whose engine is connected and no process copies (R2d step 3).
         ["seeds", () => sweepPendingSeeds(ctx)],
         // A harness elsewhere closes its own idle MCP connections.
         ["mcp", async () => ctx.mcp?.sweep()],
         [
             "signals",
-            () => ctx.store.tx((t) => t.pruneSignals(new Date(now.getTime() - SIGNAL_RETENTION_MS))),
+            () => ctx.store.tx((t) => t.pruneSignals(new Date(now.getTime() - hostTuning().sweep.signalRetentionMs))),
         ],
         ...[...ctx.sweepHooks].map((hook) => ["hook", hook]),
     ];
@@ -149,30 +151,26 @@ export async function sweep(ctx) {
     if (failure)
         throw failure.error;
 }
-/** Failed deliveries after which the sweep parks an outbox row (`Tx.failOutbox`). */
-export const MAX_OUTBOX_ATTEMPTS = 10;
-/** How long after its first failed delivery the sweep tries a row again; doubled each time. */
-const RETRY_MS = 5000;
-const RETRY_MAX_MS = 10 * 60_000;
 /**
  * Deliver the outbox rows that are due (`Tx.pendingOutbox`: older than `graceMs`, or whose
  * delivery failed), oldest first, batch after batch until none is left or `budgetMs` is
  * spent, and delete the delivered ones. Each row is delivered on its own: one that fails
  * (Restate refuses it, or a Runtime that does not know a wake's reason) is tried again later,
- * with backoff, so it never holds back the rows behind it, and after `MAX_OUTBOX_ATTEMPTS`
+ * with backoff, so it never holds back the rows behind it, and after `sweep.outboxAttempts`
  * failures it is parked: logged once, at error, and kept in the outbox for an operator. A
  * parked wake's session is still re-woken by the orphan scan while it is runnable, and a
  * parked sandbox signal's pod by the stale pod check. A row the Tenant declines (it is
  * closing) stays as it is, and ends the drain. Never throws for a delivery; returns the rows
  * delivered.
  */
-export async function deliverOutbox(ctx, graceMs = 0, budgetMs = DRAIN_BUDGET_MS) {
+export async function deliverOutbox(ctx, graceMs = 0, budgetMs = hostTuning().sweep.drainBudgetMs) {
     const deadline = Date.now() + budgetMs;
     const delivered = [];
+    const batchSize = hostTuning().sweep.batchSize;
     for (;;) {
-        const pending = await ctx.store.tx((t) => t.pendingOutbox(graceMs, BATCH));
+        const pending = await ctx.store.tx((t) => t.pendingOutbox(graceMs, batchSize));
         const batch = [];
-        let done = pending.length < BATCH;
+        let done = pending.length < batchSize;
         try {
             for (const row of pending) {
                 if (Date.now() >= deadline) {
@@ -206,8 +204,11 @@ export async function deliverOutbox(ctx, graceMs = 0, budgetMs = DRAIN_BUDGET_MS
 /** Records a failed delivery of `row`: retried with backoff, parked after the last attempt. */
 async function failed(ctx, row, error) {
     const attempts = row.attempts + 1;
-    const park = attempts >= MAX_OUTBOX_ATTEMPTS;
-    const retryInMs = Math.min(RETRY_MS * 2 ** (attempts - 1), RETRY_MAX_MS);
+    // Parked after `sweep.outboxAttempts` failed deliveries (`Tx.failOutbox`); tried again after
+    // `outboxRetry.minMs`, doubled each time.
+    const { outboxAttempts, outboxRetry } = hostTuning().sweep;
+    const park = attempts >= outboxAttempts;
+    const retryInMs = Math.min(outboxRetry.minMs * 2 ** (attempts - 1), outboxRetry.maxMs);
     await ctx.store.tx((t) => t.failOutbox(row, { retryInMs, park }));
     const { request } = row;
     const fields = {
@@ -235,29 +236,28 @@ export async function reconcileLinkedAgents(ctx) {
  * after `after`, until none is left or `budgetMs` is spent. Returns the ids woken, and the last
  * id when the budget ran out first (`next`, where the next scan goes on).
  */
-export async function wakeOrphanedSessions(ctx, now = new Date(), after, budgetMs = DRAIN_BUDGET_MS) {
+export async function wakeOrphanedSessions(ctx, now = new Date(), after, budgetMs = hostTuning().sweep.drainBudgetMs) {
     const deadline = Date.now() + budgetMs;
     const woken = [];
+    const batchSize = hostTuning().sweep.batchSize;
     let cursor = after;
     for (;;) {
-        const page = await ctx.store.tx((t) => t.orphanedSessions(now, BATCH, cursor));
+        const page = await ctx.store.tx((t) => t.orphanedSessions(now, batchSize, cursor));
         for (const session of page) {
             await ctx.wake(session.id, { reason: "recover" });
             woken.push(session.id);
             cursor = session.id;
         }
-        if (page.length < BATCH)
+        if (page.length < batchSize)
             return { woken };
         if (Date.now() >= deadline)
             return { woken, next: cursor };
     }
 }
-/** A pod sandbox in a change this long without a reconcile gets one from the sweep. */
-const STALE_POD_MS = 60_000;
 /**
  * Pod sandboxes (F7.2) whose change has not finished (creating, deleting, an old volume still
  * to delete, an expiry not yet recorded), or that should run but whose engine is not connected,
- * and whose row has not moved for a minute, get a reconcile: a pod or volume deleted outside
+ * and whose row has not moved for `sweep.stalePodMs` (a minute), get a reconcile: a pod or volume deleted outside
  * the Runtime is found, and a change goes on whose reconcile the execution itself lost (its
  * retry timer, an invocation an operator killed, Restate's state wiped) or whose outbox row
  * was parked. A reconcile a commit asked for is never lost: it is in the outbox.
@@ -267,7 +267,7 @@ async function reconcileStalePods(ctx, now) {
         return;
     const stale = await ctx.store.tx(async (t) => (await t.listEnvironments()).filter((row) => {
         const pod = row.pod;
-        if (!pod || now.getTime() - Date.parse(row.updatedAt) < STALE_POD_MS)
+        if (!pod || now.getTime() - Date.parse(row.updatedAt) < hostTuning().sweep.stalePodMs)
             return false;
         return (pod.desired === "deleted" ||
             pod.retiring !== undefined ||

package/dist/tenant/transcript.d.ts

@@ -6,6 +6,8 @@
 import type { HostEffect } from "@nylorun/harness/run";
 import type { PluginLabel } from "@nylorun/core/define";
 import type { TOOL_CALL_KINDS, TOOL_CALL_STATUSES } from "@nylorun/core/contracts";
+import { type CompactionFacts } from "@nylorun/core/harness-api";
+import type { Tx } from "../store/types.js";
 export type ToolCallStatus = (typeof TOOL_CALL_STATUSES)[number];
 export type ToolCallKind = (typeof TOOL_CALL_KINDS)[number];
 /** The model's tool call id and the harness invocation, for tool effects. */
@@ -51,25 +53,52 @@ export declare function assistantMessage(request: HostEffect, value: unknown): {
     usage?: object | undefined;
 } | undefined;
 /**
- * `context.compacted` for a model effect that summarized history (Model Calls §8): the
- * engine replaced the older transcript with that summary. A partial summary (one call of
- * several) is marked `partial: true` (R7.1): only the last call's event replaced the history.
+ * `context.compacted` for a compaction a harness reported with its transcript edit (Q4, protocol
+ * 15): its facts, the last summary call's step and model facts, and the agent. Every summary
+ * effect it names must be a completed, successful model call of turn `turnId` made for a summary
+ * (`purpose: "summary"`); otherwise the edit is refused (`invalid`).
  */
-export declare function contextCompacted(request: HostEffect, value: unknown): {
+export declare function contextCompacted(t: Tx, sessionId: string, turnId: string | null, facts: CompactionFacts): Promise<{
     agent: import("@nylorun/core/define").AgentRef;
     invocationId?: string | undefined;
     trigger: "overflow" | "threshold";
     tokensBefore: number;
     tokensAfter: number;
-    partial?: true | undefined;
+    effectId: string;
+    durationMs?: number | undefined;
+    gate?: {
+        startedAt: string;
+        endedAt: string;
+    } | undefined;
+    firstTokenMs?: number | undefined;
+    meteredUsage?: {
+        inputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+        cachedTokens?: number | undefined;
+        costUsd?: number | undefined;
+    } | undefined;
 } | {
     agent?: undefined;
     invocationId?: string | undefined;
     trigger: "overflow" | "threshold";
     tokensBefore: number;
     tokensAfter: number;
-    partial?: true | undefined;
-} | undefined;
+    effectId: string;
+    durationMs?: number | undefined;
+    gate?: {
+        startedAt: string;
+        endedAt: string;
+    } | undefined;
+    firstTokenMs?: number | undefined;
+    meteredUsage?: {
+        inputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+        cachedTokens?: number | undefined;
+        costUsd?: number | undefined;
+    } | undefined;
+}>;
 /** `model.failed` for a model effect that completed with a failure outcome (Model Calls §6.4). */
 export declare function modelFailed(request: HostEffect, value: unknown): {
     agent: import("@nylorun/core/define").AgentRef;
@@ -137,6 +166,8 @@ export interface ToolCallFacts {
     readonly status: ToolCallStatus;
     readonly kind?: ToolCallKind;
     readonly server?: string;
+    /** The tool's identity: an MCP tool's name on `server`, an HTTP tool's declared name. */
+    readonly tool?: string;
     readonly skill?: string;
     readonly plugin?: PluginLabel;
     readonly attempts?: number;
@@ -161,8 +192,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted: number;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -182,8 +214,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted: number;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -203,8 +236,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted?: undefined;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -224,8 +258,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted?: undefined;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -240,8 +275,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted: number;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -256,8 +292,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted: number;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -272,8 +309,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted?: undefined;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -288,8 +326,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted?: undefined;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -311,8 +350,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted: number;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -334,8 +374,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted: number;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -357,8 +398,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted?: undefined;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -380,8 +422,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted?: undefined;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -398,8 +441,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted: number;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -416,8 +460,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted: number;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -434,8 +479,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted?: undefined;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
@@ -452,8 +498,9 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     redacted?: undefined;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "runtime" | "sandbox" | undefined;
     server?: string | undefined;
+    tool?: string | undefined;
     skill?: string | undefined;
     plugin?: PluginLabel | undefined;
     attempts?: number | undefined;

package/dist/tenant/transcript.js

@@ -1,4 +1,5 @@
 import { isModelFailureOutcome } from "@nylorun/core/define";
+import { HarnessApiError } from "@nylorun/core/harness-api";
 /** The model's tool call id and the harness invocation, for tool effects. */
 export function toolIds(context) {
     const c = context;
@@ -52,31 +53,35 @@ export function assistantMessage(request, value) {
     };
 }
 /**
- * `context.compacted` for a model effect that summarized history (Model Calls §8): the
- * engine replaced the older transcript with that summary. A partial summary (one call of
- * several) is marked `partial: true` (R7.1): only the last call's event replaced the history.
+ * `context.compacted` for a compaction a harness reported with its transcript edit (Q4, protocol
+ * 15): its facts, the last summary call's step and model facts, and the agent. Every summary
+ * effect it names must be a completed, successful model call of turn `turnId` made for a summary
+ * (`purpose: "summary"`); otherwise the edit is refused (`invalid`).
  */
-export function contextCompacted(request, value) {
-    const compaction = request.context?.compaction;
-    if (!compaction || isModelFailureOutcome(value))
-        return undefined;
-    const summary = typeof value === "string"
-        ? value
-        : Array.isArray(value?.output)
-            ? value.output
-                .map((block) => (block.type === "text" && typeof block.text === "string" ? block.text : ""))
-                .join("")
-            : "";
-    const invocationId = request.context?.invocationId;
-    const tokensBefore = Number(compaction.tokensBefore) || 0;
-    const keptTokens = Number(compaction.keptTokens) || 0;
+export async function contextCompacted(t, sessionId, turnId, facts) {
+    let last;
+    for (const effectId of facts.summaryEffectIds) {
+        const row = await t.get("effects", effectId);
+        const request = row?.request;
+        if (!row ||
+            row.status !== "completed" ||
+            request?.kind !== "model" ||
+            request.sessionId !== sessionId ||
+            request.turnId !== turnId ||
+            request.purpose !== "summary" ||
+            isModelFailureOutcome(row.outcome?.value))
+            throw new HarnessApiError("invalid", `The compaction names ${effectId}, which is not a completed summary call of this turn`);
+        last = { effectId, row };
+    }
+    const { effectId, row } = last;
+    const invocationId = row.request.context?.invocationId;
     return {
         ...(typeof invocationId === "string" ? { invocationId } : {}),
-        trigger: compaction.trigger === "overflow" ? "overflow" : "threshold",
-        tokensBefore,
-        tokensAfter: keptTokens + Math.ceil(summary.trim().length / 4),
-        ...(compaction.partial ? { partial: true } : {}),
-        ...agentOf(request),
+        trigger: facts.trigger,
+        tokensBefore: facts.tokensBefore,
+        tokensAfter: facts.tokensAfter,
+        ...modelOutcomeFacts(effectId, row, await t.modelUsageOf(effectId)),
+        ...agentOf(row.request),
     };
 }
 /** `model.failed` for a model effect that completed with a failure outcome (Model Calls §6.4). */
@@ -164,6 +169,7 @@ export function toolCompleted(request, value, facts) {
                 status: facts.status,
                 ...(facts.kind === undefined ? {} : { kind: facts.kind }),
                 ...(facts.server === undefined ? {} : { server: facts.server }),
+                ...(facts.tool === undefined ? {} : { tool: facts.tool }),
                 ...(facts.skill === undefined ? {} : { skill: facts.skill }),
                 ...(facts.plugin === undefined ? {} : { plugin: facts.plugin }),
                 ...(facts.attempts === undefined ? {} : { attempts: facts.attempts }),