@rivet-dev/pi 0.5.4 → 0.5.6

package/dist/tracing.js

@@ -1,4 +1,255 @@
-import { context, SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import { withTelemetry } from "@earendil-works/chord/context";
+import { context, createTraceState, isSpanContextValid, ROOT_CONTEXT, SpanKind, SpanStatusCode, trace, } from "@opentelemetry/api";
+const TRACER_NAME = "@rivet-dev/pi";
+const TRACEPARENT = /^00-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})$/;
+/** OpenTelemetry must never break a run, so a call into it that throws does nothing. */
+function guarded(call) {
+    try {
+        return call();
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Runs `body` with `active` as the active context, and without it if entering it throws. */
+function runActive(active, body) {
+    let entered = false;
+    try {
+        return context.with(active, () => {
+            entered = true;
+            return body();
+        });
+    }
+    catch (error) {
+        if (entered)
+            throw error;
+        return body();
+    }
+}
+/** The spans Pi's model layer emits. Users see each as `chat <model>`. */
+const MODEL_SPANS = new Set([
+    "pi.ai.request",
+    "pi.ai.poll",
+]);
+/**
+ * Pi's model span attributes under the names users build dashboards on, from
+ * OpenTelemetry's GenAI conventions. Input tokens include cached ones, as those
+ * conventions ask. A deferred or pending response has no usage to report yet.
+ */
+function modelAttributes(attributes = {}) {
+    const hasUsage = attributes.stop !== "deferred" && attributes.stop !== "pending";
+    const input = attributes["usage.input"];
+    return {
+        "gen_ai.provider.name": attributes.provider,
+        "gen_ai.request.model": attributes.model,
+        ...(hasUsage && {
+            "gen_ai.usage.input_tokens": typeof input === "number"
+                ? input +
+                    Number(attributes["usage.cache_read"] ?? 0) +
+                    Number(attributes["usage.cache_write"] ?? 0)
+                : undefined,
+            "gen_ai.usage.output_tokens": attributes["usage.output"],
+            "gen_ai.usage.cost_usd": attributes["cost.total"],
+        }),
+    };
+}
+function attributesOf(attributes) {
+    const defined = {};
+    for (const [name, value] of Object.entries(attributes ?? {})) {
+        if (value === undefined)
+            continue;
+        defined[name] = (Array.isArray(value) ? [...value] : value);
+    }
+    return defined;
+}
+/** A parent for new spans: the root, or a span extracted from a stored carrier. */
+class OtelTelemetry {
+    adapter;
+    parent;
+    propagation;
+    constructor(adapter, parent) {
+        this.adapter = adapter;
+        this.parent = parent;
+        this.propagation = adapter.propagation;
+    }
+    get settled() {
+        return false;
+    }
+    async startSpan(options, callback) {
+        const { adapter, parent } = this;
+        const isModelSpan = MODEL_SPANS.has(options.name);
+        const native = this.settled
+            ? undefined
+            : guarded(() => adapter.tracer().startSpan(isModelSpan ? `chat ${options.attributes?.model}` : options.name, {
+                attributes: {
+                    ...adapter.attributes,
+                    ...attributesOf(isModelSpan
+                        ? {
+                            "gen_ai.operation.name": "chat",
+                            ...modelAttributes(options.attributes),
+                        }
+                        : options.attributes),
+                },
+                links: options.links?.flatMap(linksOf),
+            }, 
+            // Never the active context, so a background phase does not nest under an unrelated action.
+            parent));
+        const span = new OtelSpan(adapter, native, isModelSpan);
+        try {
+            const result = await runActive(native ? trace.setSpan(parent, native) : parent, () => callback(span));
+            span.finish();
+            return result;
+        }
+        catch (error) {
+            span.finish({
+                status: "error",
+                error: {
+                    name: error instanceof Error ? error.name : "Error",
+                    message: error instanceof Error ? error.message : "",
+                },
+            });
+            throw error;
+        }
+    }
+}
+class OtelSpan extends OtelTelemetry {
+    native;
+    isModelSpan;
+    #settled = false;
+    #status;
+    constructor(adapter, native, isModelSpan = false) {
+        super(adapter, native ? trace.setSpan(ROOT_CONTEXT, native) : ROOT_CONTEXT);
+        this.native = native;
+        this.isModelSpan = isModelSpan;
+    }
+    get settled() {
+        return this.#settled;
+    }
+    #record(call) {
+        const { native } = this;
+        if (!this.#settled && native)
+            guarded(() => call(native));
+    }
+    addLink(link) {
+        for (const otelLink of linksOf(link)) {
+            this.#record((native) => native.addLink(otelLink));
+        }
+    }
+    addEvent(name, attributes) {
+        this.#record((native) => native.addEvent(name, attributesOf(attributes)));
+    }
+    setAttributes(attributes) {
+        const recorded = this.isModelSpan
+            ? modelAttributes(attributes)
+            : attributes;
+        this.#record((native) => native.setAttributes(attributesOf(recorded)));
+    }
+    setStatus(status) {
+        if (!this.#settled)
+            this.#status = status;
+    }
+    /**
+     * Ends the span with the last status set, or else with `thrown`. Success stays
+     * Unset. A failure records its name and drops its message, because Pi's
+     * diagnostics can contain caller content.
+     */
+    finish(thrown) {
+        const status = this.#status ?? thrown;
+        this.#record((native) => {
+            if (status?.status !== "error")
+                return;
+            native.setAttribute("error.type", status.error?.name ?? "_OTHER");
+            native.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: this.adapter.statusMessage?.(status),
+            });
+        });
+        this.#record((native) => native.end());
+        this.#settled = true;
+    }
+}
+function spanContextOf(telemetry) {
+    if (!(telemetry instanceof OtelTelemetry))
+        return undefined;
+    return guarded(() => {
+        const spanContext = trace.getSpanContext(telemetry.parent);
+        return spanContext && isSpanContextValid(spanContext)
+            ? spanContext
+            : undefined;
+    });
+}
+function linksOf(link) {
+    const spanContext = spanContextOf(link.context);
+    return spanContext
+        ? [{ context: spanContext, attributes: attributesOf(link.attributes) }]
+        : [];
+}
+/**
+ * Writes the carrier from the span context and not through the global
+ * propagator, which needs an SDK. With no SDK, spans have no valid context, so
+ * Pi stores nothing.
+ */
+function injectCarrier(telemetry) {
+    const spanContext = spanContextOf(telemetry);
+    if (!spanContext)
+        return undefined;
+    return guarded(() => {
+        const flags = spanContext.traceFlags.toString(16).padStart(2, "0");
+        const tracestate = spanContext.traceState?.serialize();
+        return {
+            traceparent: `00-${spanContext.traceId}-${spanContext.spanId}-${flags}`,
+            ...(tracestate ? { tracestate } : {}),
+        };
+    });
+}
+function extractParent(carrier) {
+    const match = carrier?.traceparent?.match(TRACEPARENT);
+    if (!match)
+        return ROOT_CONTEXT;
+    const parent = guarded(() => ({
+        traceId: match[1],
+        spanId: match[2],
+        traceFlags: Number.parseInt(match[3], 16),
+        isRemote: true,
+        traceState: carrier?.tracestate
+            ? createTraceState(carrier.tracestate)
+            : undefined,
+    }));
+    return parent && isSpanContextValid(parent)
+        ? trace.setSpanContext(ROOT_CONTEXT, parent)
+        : ROOT_CONTEXT;
+}
+/**
+ * Pi Durable's telemetry over `@opentelemetry/api`. Without an SDK, every call
+ * does nothing. `statusMessage` exists for Pi's conformance suite, which
+ * compares messages. Nothing else sets it, so traces hold no diagnostics.
+ */
+export function createPiTelemetry(actorId, options = {}) {
+    const adapter = {
+        // Read per span, so an SDK started after the actor opened still gets its spans.
+        tracer: () => options.tracer ?? trace.getTracer(TRACER_NAME),
+        attributes: { "rivet.actor.id": actorId },
+        statusMessage: options.statusMessage,
+        propagation: {
+            inject: injectCarrier,
+            extract: (carrier) => new OtelTelemetry(adapter, extractParent(carrier)),
+        },
+    };
+    return new OtelTelemetry(adapter, ROOT_CONTEXT);
+}
+/**
+ * `parent` with the active span as its telemetry, so a run's root span links to
+ * its caller. Each run is its own trace, like a scheduled action in RivetKit.
+ */
+export function withCallerSpan(actorId, parent) {
+    const caller = guarded(() => {
+        const span = trace.getSpan(context.active());
+        return span && isSpanContextValid(span.spanContext()) ? span : undefined;
+    });
+    return caller
+        ? withTelemetry(new OtelSpan(createPiTelemetry(actorId).adapter, caller), parent)
+        : parent;
+}
 /**
  * Runs one Pi run inside an `invoke_agent pi` span, a child of the active span,
  * which is the `prompt` action span when RivetKit tracing is on. The action
@@ -8,7 +259,7 @@ import { context, SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
  * results are not recorded.
  */
 export async function traceRun(actorId, conversationId, model, run) {
-    const span = trace.getTracer("@rivet-dev/pi").startSpan("invoke_agent pi", {
+    const span = guarded(() => trace.getTracer(TRACER_NAME).startSpan("invoke_agent pi", {
         kind: SpanKind.INTERNAL,
         attributes: {
             "gen_ai.operation.name": "invoke_agent",
@@ -17,22 +268,92 @@ export async function traceRun(actorId, conversationId, model, run) {
             "gen_ai.request.model": model,
             "rivet.actor.id": actorId,
         },
+    }));
+    const fail = (errorType, message) => guarded(() => {
+        span?.setAttribute("error.type", errorType);
+        span?.setStatus({ code: SpanStatusCode.ERROR, message });
     });
     try {
-        const result = await context.with(trace.setSpan(context.active(), span), run);
-        if (result.status === "unanswered") {
-            span.setAttribute("error.type", "unanswered");
-            span.setStatus({ code: SpanStatusCode.ERROR, message: result.reason });
-        }
+        const result = await (span
+            ? runActive(trace.setSpan(context.active(), span), run)
+            : run());
+        if (result.status === "unanswered")
+            fail("unanswered", result.reason);
         return result;
     }
     catch (error) {
-        span.setAttribute("error.type", "run_error");
-        span.setStatus({ code: SpanStatusCode.ERROR });
+        fail("run_error");
         throw error;
     }
     finally {
-        span.end();
+        guarded(() => span?.end());
     }
 }
+const MODEL_CALL_FAILED = {
+    status: "error",
+    error: { name: "provider_error", message: "" },
+};
+/** Records what a finished model call reports, never its content or its error text. */
+function recordModelResult(span, message) {
+    const { input, output, cacheRead, cacheWrite, cost } = message.usage;
+    span.setAttributes({
+        stop: message.stopReason,
+        "usage.input": input,
+        "usage.output": output,
+        "usage.cache_read": cacheRead,
+        "usage.cache_write": cacheWrite,
+        "cost.total": cost.total,
+    });
+    if (message.stopReason === "error")
+        span.setStatus(MODEL_CALL_FAILED);
+}
+/** Runs one model call in a span of Pi's model vocabulary, ending when its stream does. */
+function traceModelCall(spanName, model, telemetry, call) {
+    if (!telemetry)
+        return call();
+    let stream;
+    let thrown;
+    void telemetry.startSpan({
+        name: spanName,
+        attributes: { provider: model.provider, model: model.id },
+    }, async (span) => {
+        try {
+            stream = call();
+            recordModelResult(span, await stream.result());
+        }
+        catch (error) {
+            thrown = error;
+            span.setStatus(MODEL_CALL_FAILED);
+        }
+    });
+    if (!stream)
+        throw thrown;
+    return stream;
+}
+/**
+ * The default model runtime with a span per model call. `ModelRuntime` skips
+ * the `observeModelRequest` that pi-ai's own `Models` runs, and pi-ai does not
+ * export it, so this emits the same spans. An app's own `models` stays as it is,
+ * so a call never has two spans. tests/tracing-models.test.ts fails when Pi
+ * fixes `ModelRuntime`. Remove this wrapper then: users see the same spans.
+ *
+ * A Proxy and not patched methods: `completeSimple` calls `streamSimple`
+ * inside `ModelRuntime`, so patching both would give that call two spans.
+ */
+export function traceModelRequests(runtime) {
+    const traced = {
+        streamSimple: ((model, context, options) => traceModelCall("pi.ai.request", model, options?.telemetry, () => runtime.streamSimple(model, context, options))),
+        completeSimple: ((model, context, options) => traceModelCall("pi.ai.request", model, options?.telemetry, () => runtime.streamSimple(model, context, options)).result()),
+        fetchDeferred: ((model, handle, options) => traceModelCall("pi.ai.poll", model, options?.telemetry, () => runtime.streamDeferred(model, handle, options)).result()),
+    };
+    return new Proxy(runtime, {
+        get: (target, name) => {
+            const method = traced[name];
+            if (method)
+                return method;
+            const value = Reflect.get(target, name, target);
+            return typeof value === "function" ? value.bind(target) : value;
+        },
+    });
+}
 //# sourceMappingURL=tracing.js.map

package/dist/tracing.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../src/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE9E;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC7B,OAAe,EACf,cAAsB,EACtB,KAAyB,EACzB,GAAqB;IAErB,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,iBAAiB,EAAE;QAC1E,IAAI,EAAE,QAAQ,CAAC,QAAQ;QACvB,UAAU,EAAE;YACX,uBAAuB,EAAE,cAAc;YACvC,mBAAmB,EAAE,IAAI;YACzB,wBAAwB,EAAE,MAAM,CAAC,cAAc,CAAC;YAChD,sBAAsB,EAAE,KAAK;YAC7B,gBAAgB,EAAE,OAAO;SACzB;KACD,CAAC,CAAC;IACH,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAChC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,EACrC,GAAG,CACH,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YACpC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YAC9C,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/C,MAAM,KAAK,CAAC;IACb,CAAC;YAAS,CAAC;QACV,IAAI,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;AACF,CAAC"}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../src/tracing.ts"],"names":[],"mappings":"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"}

package/dist/watches.d.ts

@@ -1,14 +1,12 @@
-import type { Op } from "@earendil-works/chord/delta";
-import { type AgentEvent, type ConversationDocToken, type ConversationId, type ConversationView, type Harness, type JsonObject, type TaskGraph } from "@earendil-works/pi-durable";
+import { type Op } from "@earendil-works/chord/delta";
+import type { ConversationDocToken, ConversationId, ConversationView, Harness, JsonObject, TaskGraph } from "@earendil-works/pi-durable";
 import type { PiContext } from "./runtime.js";
 import { type WatchSpec } from "./storage.js";
-/** One batch of agent events, one commit per batch. */
-export type PiEventsFrame = {
-    conversationId: ConversationId;
-    seq: number;
-    events: readonly AgentEvent[];
-};
-/** `seq` 0 carries the whole view; later frames carry Chord operations. */
+/**
+ * `seq` 0 carries the view; later frames carry Chord operations. `value.entries`
+ * holds the newest entries, not the whole transcript. Page older ones with
+ * `conversation.entries`.
+ */
 export type PiViewFrame = {
     conversationId: ConversationId;
     seq: number;
@@ -38,7 +36,6 @@ export type PiDocFrame = {
  * client that sees a gap calls the watch action again.
  */
 export type PiWatchEvents = {
-    "pi.events": PiEventsFrame;
     "pi.view": PiViewFrame;
     "pi.taskGraph": PiTaskGraphFrame;
     "pi.doc": PiDocFrame;
@@ -59,7 +56,7 @@ type Documents = ReadonlyMap<string, ConversationDocToken<any>>;
  * Starts a watch for a connection, stored so it comes back after sleep, and
  * returns the value it starts from. Watching the same thing again restarts
  * it with a fresh value. `requireTarget` runs in the queue too, so a watch
- * and an unwatch sent right after it take effect in the order they arrive.
+ * and an unwatch take effect in the order they reach this queue.
  */
 export declare function watch(actor: PiContext, watches: ConnectionWatches, harness: Harness, documents: Documents, connId: string, spec: WatchSpec, requireTarget: () => Promise<void>): Promise<unknown>;
 export declare function unwatch(actor: PiContext, watches: ConnectionWatches, connId: string, spec: WatchSpec): Promise<void>;

package/dist/watches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watches.d.ts","sourceRoot":"","sources":["../src/watches.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"watches.d.ts","sourceRoot":"","sources":["../src/watches.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EACX,oBAAoB,EACpB,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,UAAU,EACV,SAAS,EAET,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAKN,KAAK,SAAS,EACd,MAAM,cAAc,CAAC;AAEtB;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IACzB,cAAc,EAAE,cAAc,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,GAAG,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC;CACpB,CAAC;AACF,4EAA4E;AAC5E,MAAM,MAAM,gBAAgB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,GAAG,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC;CACpB,CAAC;AACF;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,cAAc,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,EAAE,WAAW,CAAC;IACvB,cAAc,EAAE,gBAAgB,CAAC;IACjC,QAAQ,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF,KAAK,WAAW,GAAG;IAAE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC;AAE7C,oDAAoD;AACpD,MAAM,MAAM,iBAAiB,GAAG;IAC/B,mDAAmD;IACnD,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IACpD,sGAAsG;IACtG,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,iBAAiB,CAE3D;AAWD,KAAK,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;AAahE;;;;;GAKG;AACH,wBAAsB,KAAK,CAC1B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAChC,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED,wBAAsB,OAAO,CAC5B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAQf;AAED,kDAAkD;AAClD,wBAAsB,iBAAiB,CACtC,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,oGAAoG;AACpG,wBAAsB,cAAc,CACnC,OAAO,EAAE,iBAAiB,GACxB,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACpC,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,GAClB,OAAO,CAAC,IAAI,CAAC,CA6Bf"}

package/dist/watches.js

@@ -1,5 +1,5 @@
 import { BACKGROUND_CONTEXT } from "@earendil-works/chord/context";
-import { watchEvents, } from "@earendil-works/pi-durable";
+import { isReplace } from "@earendil-works/chord/delta";
 import { deleteConnectionWatches, deleteWatch, loadWatches, saveWatch, } from "./storage.js";
 export function createConnectionWatches() {
     return { byConnection: new Map(), queue: Promise.resolve() };
@@ -11,7 +11,6 @@ function serially(watches, change) {
 }
 function watchKey(spec) {
     switch (spec.kind) {
-        case "events":
         case "view":
             return `${spec.kind}:${spec.conversationId}`;
         case "taskGraph":
@@ -24,7 +23,7 @@ function watchKey(spec) {
  * Starts a watch for a connection, stored so it comes back after sleep, and
  * returns the value it starts from. Watching the same thing again restarts
  * it with a fresh value. `requireTarget` runs in the queue too, so a watch
- * and an unwatch sent right after it take effect in the order they arrive.
+ * and an unwatch take effect in the order they reach this queue.
  */
 export async function watch(actor, watches, harness, documents, connId, spec, requireTarget) {
     const key = watchKey(spec);
@@ -71,7 +70,7 @@ export async function reattachWatches(actor, watches, harness, documents) {
     await serially(watches, async () => {
         const open = new Set(actor.conns.keys());
         for (const stored of await loadWatches(actor.db)) {
-            if (!open.has(stored.connId)) {
+            if (!open.has(stored.connId) || stored.spec.kind === "events") {
                 await deleteWatch(actor.db, stored.connId, stored.key);
                 continue;
             }
@@ -114,20 +113,6 @@ async function attach(actor, watches, harness, documents, connId, key, spec, res
 async function start(log, harness, documents, spec, send, resend) {
     const context = BACKGROUND_CONTEXT;
     switch (spec.kind) {
-        case "events": {
-            const conversationId = spec.conversationId;
-            const stream = await watchEvents(harness, conversationId, context);
-            if (resend)
-                send("pi.events", {
-                    conversationId,
-                    events: [stream.snapshot],
-                });
-            stream.start(async (events) => send("pi.events", { conversationId, events }));
-            return {
-                initial: { snapshot: stream.snapshot },
-                stop: async () => void (await stream.stop()),
-            };
-        }
         case "view": {
             const conversationId = spec.conversationId;
             const conversation = await harness.conversation(conversationId, context);
@@ -136,7 +121,10 @@ async function start(log, harness, documents, spec, send, resend) {
             const view = await conversation.watch(context);
             if (resend)
                 send("pi.view", { conversationId, value: view.value });
-            view.start(async (_value, ops) => send("pi.view", { conversationId, ops }));
+            view.start(async (call) => {
+                if (call.kind === "value")
+                    send("pi.view", { conversationId, ops: call.ops });
+            });
             return {
                 initial: { value: view.value },
                 stop: async () => void (await view.stop()),
@@ -146,7 +134,10 @@ async function start(log, harness, documents, spec, send, resend) {
             const graph = await harness.watchTaskGraph(context);
             if (resend)
                 send("pi.taskGraph", { value: graph.value });
-            graph.start(async (_value, ops) => send("pi.taskGraph", { ops }));
+            graph.start(async (call) => {
+                if (call.kind === "value")
+                    send("pi.taskGraph", { ops: call.ops });
+            });
             return {
                 initial: { value: graph.value },
                 stop: async () => void (await graph.stop()),
@@ -157,9 +148,9 @@ async function start(log, harness, documents, spec, send, resend) {
     }
 }
 /**
- * Pi's `watchDoc` never creates a document, and its watch ends when the
- * document is retired. While the document does not exist, the watch attaches
- * when a commit creates it, and its value is the next frame.
+ * Pi's `watchDoc` never creates a document. While the document does not exist,
+ * the watch attaches when a commit creates it, and its value is the next frame.
+ * Once attached, the watch follows the document through retirements.
  */
 async function startDoc(log, harness, documents, spec, send, resend) {
     const token = documents.get(spec.docKind);
@@ -167,20 +158,22 @@ async function startDoc(log, harness, documents, spec, send, resend) {
         throw new Error(`document ${spec.docKind} is not listed in pi({ documents })`);
     const { docKind: kind, conversationId } = spec;
     let docWatch;
-    let unsubscribe;
+    let observation;
     let stopped = false;
     const follow = (handle, sendFirst) => {
         docWatch = handle;
         if (sendFirst)
             send("pi.doc", { kind, conversationId, value: handle.value });
-        handle.start(async (value) => {
-            send("pi.doc", { kind, conversationId, value });
-            if (value !== null || stopped)
+        handle.start(async (call) => {
+            if (call.kind !== "value")
                 return;
-            // A retired document's watch ends, so wait for a commit that creates it again.
-            docWatch = undefined;
-            void handle.stop();
-            awaitCreation();
+            // A retirement keeps the last value and adds no ops. A later document at this address arrives as a root replacement.
+            const retired = call.retired && !call.ops.some(isReplace);
+            send("pi.doc", {
+                kind,
+                conversationId,
+                value: retired ? null : call.value,
+            });
         });
     };
     const awaitCreation = () => {
@@ -196,8 +189,8 @@ async function startDoc(log, harness, documents, spec, send, resend) {
                     attaching = false;
                     return;
                 }
-                unsubscribe?.();
-                unsubscribe = undefined;
+                observation?.detach();
+                observation = undefined;
                 follow(handle, true);
             }
             catch (error) {
@@ -211,16 +204,19 @@ async function startDoc(log, harness, documents, spec, send, resend) {
                 });
             }
         };
-        unsubscribe = harness.subscribeCommits((publication) => {
-            const created = publication.changes.some((change) => change.type === "document" &&
-                change.record.kind === kind &&
-                change.conversationId === conversationId &&
-                change.value !== null);
-            if (!created || attaching)
-                return;
-            attaching = true;
-            // Commit listeners must not call Pi Durable, so the watch attaches after the listener returns.
-            queueMicrotask(() => void attachCreated());
+        observation = harness.observeCommits({
+            advance: (publication) => {
+                const created = publication.changes.some((change) => change.type === "document" &&
+                    change.kind === "change" &&
+                    change.record.kind === kind &&
+                    change.conversationId === conversationId);
+                if (!created || attaching)
+                    return;
+                attaching = true;
+                // Commit observers must not call Pi Durable, so the watch attaches after this returns.
+                queueMicrotask(() => void attachCreated());
+            },
+            end: () => { },
         });
     };
     const existing = await harness.watchDoc(token, conversationId, BACKGROUND_CONTEXT);
@@ -236,7 +232,7 @@ async function startDoc(log, harness, documents, spec, send, resend) {
         initial: { value: existing?.value },
         stop: async () => {
             stopped = true;
-            unsubscribe?.();
+            observation?.detach();
             await docWatch?.stop();
         },
     };