@fungi.computer/shiitake 0.6.0 → 0.7.0

package/dist/fleet.d.ts

@@ -82,8 +82,8 @@ export type AgentLifecycleFact = Readonly<{
 }>;
 /** Refusal of supplied authority; no host policy lookup is performed. */
 export declare class AgentGrantError extends Error {
-    readonly reason: "agent" | "action" | "expired" | "delegation_loop" | "delegation_depth";
-    constructor(reason: "agent" | "action" | "expired" | "delegation_loop" | "delegation_depth");
+    readonly reason: "agent" | "action" | "expired" | "delegation_loop" | "delegation_depth" | "delegator_missing";
+    constructor(reason: "agent" | "action" | "expired" | "delegation_loop" | "delegation_depth" | "delegator_missing");
 }
 /** Check every operation against its explicit authority. */
 export declare function assertAgentGrant(grant: AgentGrant, action: AgentAction, agentId?: string): void;
@@ -196,6 +196,7 @@ export declare const agentDelegationTaskSchema: z.ZodLazy<z.ZodObject<{
         followUp: "followUp";
         steer: "steer";
     }>>;
+    goal: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodLiteral<false>]>>;
     text: z.ZodString;
 }, z.core.$strict>>;
 /** A caller reuses this task unchanged while polling Pending. */
@@ -271,6 +272,8 @@ export declare function delegationSendMeta(sender: Readonly<{
  * while the verified reply retains the failed recipient's identity.
  */
 export declare function delegationReplyMeta(delegation: AuthenticatedDelegationReply, replierName: string): DelegationReplyMeta;
+/** An original one-way report can only name an ancestor of its Agent sender. */
+export declare function isOneWayAncestorNotice(mail: BirdDogMail): boolean;
 /**
  * Delegated work an owner still waits on; `unreadable` says why its state
  * could not be read, when it could not.
@@ -281,6 +284,11 @@ export type OutstandingDelegation = Readonly<{
     commandId: string;
     unreadable?: string;
 }>;
+/** Read confirmed sender receipts that have no locally observed settlement.
+ * Call inside the Agent owner's transaction that also changes archived state.
+ * Remote reads happen separately; an unobserved settlement remains busy.
+ */
+export declare function readOutstandingDelegationSync(storage: WatchdogSqliteOwner): OutstandingDelegation | undefined;
 /**
  * BirdDog submission and reply authentication. The durable row freezes
  * correspondence before transport; an ambiguous delivery reuses that exact mail.

package/dist/fleet.js

@@ -1,5 +1,5 @@
 export { commandSettlementSchema } from "./client-wire.js";
-import { createFleetDirectoryStore, createFleetDelegationStore, } from "./internal/woodstock/index.js";
+import { createFleetDirectoryStore, createFleetDelegationStore, readSessionDelegator, } from "./internal/woodstock/index.js";
 import { pending } from "@fungi.computer/agar";
 import { BirdDogMailSchema } from "@fungi.computer/bird-dog/effect";
 import * as Schema from "effect/Schema";
@@ -280,17 +280,23 @@ export function settlementReadableBy(facts, agentId) {
         (facts.acceptedSender === null && facts.delegator === agentId));
 }
 /** Replay identity and work, with the parent supplied exclusively by the grant. */
-export const agentDelegationTaskSchema = z.lazy(() => z.strictObject({
+export const agentDelegationTaskSchema = z.lazy(() => z
+    .strictObject({
     requestId: identity,
     agentId: identity,
     sessionId: identity.optional(),
     /** A live steer into the recipient's running turn; queued follow-up when omitted. */
     delivery: z.enum(["followUp", "steer"]).optional(),
+    /** Only a new-Session follow-up carries goal intent. */
+    goal: z
+        .union([z.string().min(1).max(4_000), z.literal(false)])
+        .optional(),
     text: z
         .string()
         .min(1)
         .max(256 * 1024),
-}));
+})
+    .refine(({ goal, sessionId, delivery }) => goal === undefined || (sessionId === undefined && delivery !== "steer"), { path: ["goal"], error: "goal requires a new-Session follow-up" }));
 /**
  * Provenance for one delegated send from the invoking Agent's Session. The
  * model program's digest is frozen with the replay input, so a retried tool
@@ -355,6 +361,19 @@ export function delegationReplyMeta(delegation, replierName) {
 const delegationMetadata = z.object({
     delegation: FungiMessageMetaSchema.shape.delegation,
 });
+/** An original one-way report can only name an ancestor of its Agent sender. */
+export function isOneWayAncestorNotice(mail) {
+    if (mail.reply !== undefined ||
+        mail.replyTo.length !== 0 ||
+        mail.from.kind !== "agent" ||
+        mail.to.sessionId === undefined)
+        return false;
+    const parsed = delegationMetadata.safeParse(mail.meta);
+    return (parsed.success &&
+        parsed.data.delegation !== undefined &&
+        parsed.data.delegation.ancestors.includes(mail.to.agentId) &&
+        parsed.data.delegation.ancestors.at(-1) === mail.from.agentId);
+}
 const delegationRowSchema = z.lazy(() => z.strictObject({
     input: z.string(),
     mail: z.string(),
@@ -375,6 +394,25 @@ function bindRecipientSession(mail, sessionId) {
         to: { ...mail.to, sessionId },
     };
 }
+/** Read confirmed sender receipts that have no locally observed settlement.
+ * Call inside the Agent owner's transaction that also changes archived state.
+ * Remote reads happen separately; an unobserved settlement remains busy.
+ */
+export function readOutstandingDelegationSync(storage) {
+    const raw = createFleetDelegationStore(storage).unsettled()[0];
+    if (raw === undefined)
+        return undefined;
+    const row = delegationRowSchema.parse(raw);
+    const mail = decodeMail(row.mail);
+    const sessionId = mail.to.sessionId;
+    if (sessionId === undefined)
+        throw new DirectoryError(503, "partial_init");
+    return {
+        agentId: mail.to.agentId,
+        sessionId,
+        commandId: parseAccepted(z.string().parse(row.receipt)).commandId,
+    };
+}
 /**
  * BirdDog submission and reply authentication. The durable row freezes
  * correspondence before transport; an ambiguous delivery reuses that exact mail.
@@ -402,13 +440,18 @@ export function createFleetCorrespondence(options) {
             : undefined;
         const ancestors = inherited?.ancestors ?? [];
         const maxDepth = Math.min(grant.maxDepth ?? 8, inherited?.maxDepth ?? 8);
-        // Ancestry bounds work depth; it does not remove authorized peer targets.
+        // A report to an ancestor is one-way: the parent handles the work but
+        // must not send its settlement back as a new prompt to the worker.
         if (parent.agentId === task.agentId)
             throw new AgentGrantError("delegation_loop");
         if (ancestors.length >= maxDepth)
             throw new AgentGrantError("delegation_depth");
         const path = { ancestors: [...ancestors, parent.agentId], maxDepth };
-        const delegation = task.delivery === "steer" ? { ...path, steer: true } : path;
+        const delegation = {
+            ...path,
+            ...(task.delivery === "steer" && { steer: true }),
+            ...(task.goal !== undefined && { goal: task.goal }),
+        };
         const outgoingMeta = {
             ...(objectMeta.success
                 ? objectMeta.data
@@ -427,10 +470,20 @@ export function createFleetCorrespondence(options) {
         let row = read(task.requestId);
         if (row === undefined) {
             const from = { kind: "agent", ...parent };
+            const ancestor = ancestors.includes(task.agentId);
+            // A sessionless report to a parent goes to the creator's recorded
+            // Session. Never create a fresh Session merely to carry a notice.
+            const targetSessionId = task.sessionId ??
+                (ancestor
+                    ? readSessionDelegator(options.storage, parent.sessionId)?.replyTo.find(({ agentId }) => agentId === task.agentId)
+                        ?.sessionId
+                    : undefined);
+            if (ancestor && targetSessionId === undefined)
+                throw new AgentGrantError("delegator_missing");
             let mail = {
                 key: task.requestId,
                 from,
-                to: task.sessionId === undefined
+                to: targetSessionId === undefined
                     ? {
                         kind: "agent",
                         agentId: task.agentId,
@@ -438,9 +491,9 @@ export function createFleetCorrespondence(options) {
                     : {
                         kind: "agent",
                         agentId: task.agentId,
-                        sessionId: task.sessionId,
+                        sessionId: targetSessionId,
                     },
-                replyTo: [from],
+                replyTo: ancestor ? [] : [from],
                 content: task.text,
                 createdAt: Date.now(),
             };
@@ -677,6 +730,8 @@ export function createFleetDelegation(options) {
         if (sessionId === undefined)
             throw new DirectoryError(503, "partial_init");
         const settlement = await options.readSettlement(mail.to.agentId, sessionId, accepted.commandId);
+        if (settlement !== undefined)
+            store.recordSettled(task.requestId);
         return settlement === undefined
             ? pending(1000)
             : {
@@ -691,7 +746,8 @@ export function createFleetDelegation(options) {
      * target, so the owner is still waiting for a reply; undefined when none.
      */
     async function outstanding() {
-        for (const raw of store.sent()) {
+        let waiting;
+        for (const raw of store.unsettled()) {
             const row = delegationRowSchema.parse(raw);
             if (row.receipt === null)
                 continue;
@@ -706,21 +762,23 @@ export function createFleetDelegation(options) {
                 sessionId: to.sessionId,
                 commandId,
             };
-            let settlement;
-            try {
-                settlement = await options.readSettlement(to.agentId, to.sessionId, commandId);
-            }
-            catch (cause) {
+            const result = await options
+                .readSettlement(to.agentId, to.sessionId, commandId)
+                .then((settlement) => ({ kind: "read", settlement }), (cause) => ({ kind: "unreadable", cause }));
+            if (result.kind === "unreadable") {
                 // Work whose state cannot be read is still owed; say why.
-                return {
+                waiting ??= {
                     ...target,
-                    unreadable: cause instanceof Error ? cause.message : "unreadable",
+                    unreadable: result.cause instanceof Error ? result.cause.message : "unreadable",
                 };
+                continue;
             }
-            if (settlement === undefined)
-                return target;
+            if (result.settlement === undefined)
+                waiting ??= target;
+            else
+                store.recordSettled(decodeMail(row.mail).key);
         }
-        return undefined;
+        return waiting;
     }
     return {
         /** The delegated work this owner still waits on, if any. */

package/dist/http-routes.d.ts

@@ -42,7 +42,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                 };
             };
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;
@@ -109,7 +109,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                 };
             };
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;
@@ -150,7 +150,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
         $get: {
             input: {};
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;
@@ -238,7 +238,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                 };
             };
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;
@@ -276,7 +276,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                 };
             };
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;
@@ -352,7 +352,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                 };
             };
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;
@@ -481,7 +481,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                 };
             };
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;
@@ -557,7 +557,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                 };
             };
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;
@@ -821,6 +821,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                             readonly kind: "session";
                             readonly sessionId: string;
                             readonly commandId: string;
+                            readonly title: string;
                         } | {
                             readonly kind: "host";
                             readonly lane: string;
@@ -849,6 +850,8 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                     readonly revision: number;
                     readonly text: string;
                     readonly thinking: string;
+                    readonly textOffset: number;
+                    readonly thinkingOffset: number;
                     readonly textTruncated: boolean;
                     readonly thinkingTruncated: boolean;
                 } | null;
@@ -926,7 +929,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                 };
             };
             output: {
-                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure";
+                readonly cause: "closed" | "conflict" | "incompatible" | "invalid" | "rejected" | "unavailable" | "state_reset_required" | "storage_pressure" | "archived";
                 readonly _tag: "ShiitakeError";
                 readonly boundary: "contract" | "extensions" | "instructions" | "model" | "runtime" | "store" | "tools";
                 readonly message: string;

package/dist/http.d.ts

@@ -1 +1,2 @@
 export { createShiitakeHttpRoutes, type ShiitakeHttpEnv, type ShiitakeSessionResolver, } from "./http-routes.js";
+export { toShiitakeErrorWire } from "./errors.js";

package/dist/http.js

@@ -1 +1,2 @@
 export { createShiitakeHttpRoutes, } from "./http-routes.js";
+export { toShiitakeErrorWire } from "./errors.js";

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import type { VerifiedAgentReply } from "./internal/woodstock/index.js";
 import type { BirdDogEffect } from "@fungi.computer/bird-dog/effect";
 import type { Accepted } from "./client.js";
 import type { ShiitakeOptions, ShiitakeOwnerAgent } from "./internal/contracts.js";
-export type { AbortCommand, AgentExtensionControls, BranchCommand, CompactCommand, CancelCommand, CancelResult, Accepted, DelegationReceipt, Held, ForkCommand, ForkedSession, OperatorCommand, TitleCommand, PromptCommand, PromptDelivery, SendOptions, ReadOptions, SessionCommand, SessionCommandHandler, SessionExtensionControls, SessionExtensionSlots, SessionFrame, SessionMessage, SessionProgress, SessionToolOutput, SessionContext, SessionSnapshot, SessionInboxState, SessionSummary, SessionSummaryPage, SessionSummaryRow, SessionActivity, AgentRunningWork, SessionTerminal, SessionCompactionMarker, SessionCompactionNotice, SessionCompactionTrigger, ShiitakeEventSourceConstructor, SessionWatch, ShiitakeAgent, ShiitakeSession, SubscribeOptions, TooLate, UnknownRequest, WatchOptions, } from "./client.js";
+export type { AbortCommand, AgentExtensionControls, BranchCommand, CompactCommand, CancelCommand, CancelResult, Accepted, DelegationReceipt, Held, ForkCommand, ForkedSession, OperatorCommand, TitleCommand, PromptCommand, PromptDelivery, SendOptions, ReadOptions, SessionCommand, SessionCommandHandler, SessionExtensionControls, SessionExtensionSlots, SessionFrame, SessionMessage, SessionProgress, SessionProgressDelta, SessionToolOutput, SessionContext, SessionSnapshot, SessionInboxState, SessionSummary, SessionSummaryPage, SessionSummaryRow, SessionActivity, AgentRunningWork, SessionTerminal, SessionCompactionMarker, SessionCompactionNotice, SessionCompactionTrigger, ShiitakeEventSourceConstructor, SessionWatch, ShiitakeAgent, ShiitakeSession, SubscribeOptions, TooLate, UnknownRequest, WatchOptions, } from "./client.js";
 export type { ColdSessionPage, ColdSessionPageRequest, ColdSessionRow, } from "./cold-sessions.js";
 export { parseForkedSession, parseSessionFrame, parseSessionSnapshot, } from "./client.js";
 export type { InstructionSnapshot, InstructionSource, ModelAcquisition, ModelDescription, ModelSource, RuntimeHost, RuntimePendingWork, SqliteCursor, SqliteOwner, SqliteValue, SqliteRow, StoragePressureCheck, CompactionBudget, CompactionOptions, GrantsDelivery, GrantsDeliveryResult, ShiitakeOptions, ShiitakeOwnerAgent, ToolAccess, HostMetaOptions, StandardHostMetaResult, StandardHostMetaSchema, ToolSource, } from "./internal/contracts.js";

package/dist/internal/admission-door.d.ts

@@ -32,7 +32,7 @@ export type AdmitRequest = Readonly<{
      * host passes it, after checking the reply against the mail it sent.
      */
     reply?: VerifiedAgentReply;
-    /** Synchronous owner-local side effect committed with a mail admission. */
+    /** Synchronous owner-local side effect on first admission, in its transaction. */
     onAccepted?: (sessionId: string, commandId: string) => void;
     /**
      * New work that continues earlier work in this Session (for example, the

package/dist/internal/admission-door.js

@@ -5,7 +5,7 @@ import { checkHostMeta } from "./host-meta.js";
 import { ShiitakeError } from "../errors.js";
 import { decodeClientAcceptedCommand, decodeClientSessionId, decodeClientSessionCreationRequestId, requireDecoded, } from "./client-boundary.js";
 import { publishOwnerObservation } from "./observation-kernel.js";
-import { AdmissionOriginSchema, acceptSessionCommandOwned, readSessionCommandAdmissionByRequest, withdrawSessionRequestOwned, assertSessionRequestNotWithdrawn, hasStoredSession, readWorkSender, recordWorkSender, recordSessionDelegator, VerifiedAgentReplySchema, } from "./woodstock/index.js";
+import { AdmissionOriginSchema, acceptSessionCommandOwned, readSessionCommandAdmissionByRequest, withdrawSessionRequestOwned, assertSessionRequestNotWithdrawn, hasStoredSession, hasRecordedRunTerminal, readWorkSender, recordWorkSender, VerifiedAgentReplySchema, } from "./woodstock/index.js";
 const decodeOrigin = Schema.decodeUnknownResult(AdmissionOriginSchema, {
     onExcessProperty: "error",
 });
@@ -87,7 +87,8 @@ export function openAdmissionDoor(input) {
         const targetWorkId = command.type === "prompt" &&
             command.delivery === "steer" &&
             head.state === "running" &&
-            !head.cancellationRequested
+            !head.cancellationRequested &&
+            !hasRecordedRunTerminal(input.owner, sessionId, head.jobId)
             ? head.jobId
             : undefined;
         const accepted = acceptSessionCommandOwned(input.owner, sessionId, command, request.meta, origin, input.contract(), targetWorkId === undefined
@@ -100,8 +101,11 @@ export function openAdmissionDoor(input) {
             if (sender !== undefined)
                 recordWorkSender(input.owner, sessionId, accepted.accepted.commandId, sender);
         }
-        recordSessionDelegator(input.owner, sessionId, request.mail);
-        request.onAccepted?.(sessionId, accepted.accepted.commandId);
+        // The mail notice is staged in the same transaction as the first command.
+        // Replaying that admission must not stage a new notice with a different
+        // createdAt under the original Post key.
+        if (accepted.delivery === "new")
+            request.onAccepted?.(sessionId, accepted.accepted.commandId);
         touched.set(sessionId, (touched.get(sessionId) ?? false) || accepted.delivery === "new");
         return Object.freeze({
             status: "accepted",

package/dist/internal/contracts.d.ts

@@ -188,6 +188,11 @@ export type ShiitakeOptions = Readonly<{
     store: SqliteOwner;
     /** Host storage-pressure check; absent never refuses for storage pressure. */
     storagePressure?: StoragePressureCheck;
+    /** Host-owned, synchronous admission for new Sessions and prompts only. */
+    admission?: Readonly<{
+        /** Check the host's current flag synchronously inside admission's transaction. */
+        assertOpen: () => void;
+    }>;
     /** Compaction budgets; absent uses Pi's defaults for every model. */
     compaction?: CompactionOptions;
     /** Runtime host that schedules the opaque durable reconciler. */

package/dist/internal/coordinator.js

@@ -7,11 +7,11 @@ import * as Option from "effect/Option";
 import * as Stream from "effect/Stream";
 import { ShiitakeError } from "../errors.js";
 import { decodeClientReadOptions, decodeClientSettlementRequest, requireDecoded, decodeClientSessionCommand, decodeClientSessionId, decodeClientSubscribeOptions, } from "./client-boundary.js";
-import { mergeObservationSignals, openObservationKernel, publishOwnerObservation, } from "./observation-kernel.js";
+import { mergeObservationSignals, openObservationKernel, publishAgentExecutionChange, publishOwnerObservation, } from "./observation-kernel.js";
 import { checkHostMeta } from "./host-meta.js";
-import { readSessionActivity } from "./session-status.js";
-import { readSessionContext } from "./session-context.js";
-import { abortSession, cancelSession, branchSession, recordOperatorLine, forkSession, readSession, readCommandSettlement, readSessionModelPreference, readSessionReplayPage, readSessionInbox, readLatestPendingPrompt, createSession, deleteSession, deliverSessionGrants, readSessionGrants, setSessionModelPreference, setSessionTitle, readAdmissionIdentity, assertAdmissionIdentity, } from "./woodstock/index.js";
+import { readSessionActivity, } from "./session-status.js";
+import { prepareSessionContext } from "./session-context.js";
+import { progressPosition, readProcessProgressDelta, abortSession, cancelSession, branchSession, recordOperatorLine, forkSession, readSession, readCommandSettlement, readSessionModelPreference, readSessionReplayPage, readSessionInbox, readLatestPendingPrompt, createSession, deleteSession, deliverSessionGrants, readSessionGrants, setSessionModelPreference, setSessionTitle, readAdmissionIdentity, assertAdmissionIdentity, } from "./woodstock/index.js";
 /** Generic Agent-scope extension controls over the runtime's one call door. */
 function agentExtensions(runtime) {
     return Object.freeze({
@@ -20,12 +20,15 @@ function agentExtensions(runtime) {
         call: (extensionId, command, input) => runtime.assertOpen.pipe(Effect.andThen(runtime.extensions.call({ scope: "agent" }, extensionId, command, input))),
     });
 }
-function currentSessionActivity(options, runtime, sessionId) {
+function currentSessionWork(runtime, sessionId) {
     return runtime
         .readQueueHead(sessionId)
         .pipe(Effect.flatMap((head) => (head.state === "queued"
         ? runtime.runningWork(head.jobId)
-        : Effect.succeed(null)).pipe(Effect.map((runningWork) => readSessionActivity(options.store, sessionId, head, runningWork)))));
+        : Effect.succeed(null)).pipe(Effect.map((runningWork) => ({ head, runningWork })))));
+}
+function currentSessionActivity(options, runtime, sessionId) {
+    return currentSessionWork(runtime, sessionId).pipe(Effect.map(({ head, runningWork }) => readSessionActivity(options.store, sessionId, head, runningWork)));
 }
 /** Carry the Session's context use on a baseline, when it has one. */
 function withContext(snapshot, context) {
@@ -35,7 +38,10 @@ function withContext(snapshot, context) {
 }
 /** Read the baseline and its context use for one Session. */
 function readSessionWithContext(options, runtime, sessionId, input) {
-    return currentSessionActivity(options, runtime, sessionId).pipe(Effect.flatMap((activity) => readSession(options.store, sessionId, activity, input, () => runtime.extensions.project(sessionId))), Effect.flatMap((snapshot) => readSessionContext(options, sessionId, snapshot.cursor, input?.before === undefined).pipe(Effect.map((context) => withContext(snapshot, context)))));
+    return currentSessionWork(runtime, sessionId).pipe(Effect.flatMap(({ head, runningWork }) => readSession(options.store, sessionId, () => readSessionActivity(options.store, sessionId, head, runningWork), input, () => runtime.extensions.project(sessionId), (snapshot) => ({
+        snapshot,
+        context: prepareSessionContext(options, sessionId, snapshot.cursor, input?.before === undefined),
+    }))), Effect.flatMap(({ snapshot, context }) => context.pipe(Effect.map((value) => withContext(snapshot, value)))));
 }
 function sessionOwnerOperation(runtime, sessionId, operation) {
     return runtime.assertOpen.pipe(Effect.andThen(Effect.try({
@@ -92,7 +98,46 @@ function continueFromReset(frame) {
         }),
     ];
 }
-function subscriptionFrames(options, runtime, registration, sessionId, after, delivery, includeSandboxFailures = false) {
+function subscriptionFrames(options, runtime, registration, sessionId, after, delivery, includeSandboxFailures = false, baselineProgress = null) {
+    let position = progressPosition(baselineProgress);
+    let toolOutput = [];
+    const reset = () => resetFrame(options, runtime, sessionId, includeSandboxFailures).pipe(Effect.map((frame) => {
+        position = progressPosition(frame.baseline.progress);
+        toolOutput = frame.baseline.toolOutput;
+        return continueFromReset(frame);
+    }));
+    const liveFrames = (activity) => {
+        const queue = activity.facts.queue;
+        const delta = queue.state !== "running"
+            ? null
+            : readProcessProgressDelta(options.store, sessionId, queue.commandId, position);
+        if (delta === undefined)
+            return undefined;
+        const frames = [];
+        if (delta !== null) {
+            frames.push({
+                kind: "progress",
+                progress: delta,
+                activity: activity.facts,
+            });
+            position = {
+                messageId: delta.messageId,
+                revision: delta.revision,
+                text: delta.text.offset + delta.text.append.length,
+                thinking: delta.thinking.offset + delta.thinking.append.length,
+            };
+        }
+        if (toolOutput.length !== activity.toolOutput.length ||
+            toolOutput.some((slot, index) => slot !== activity.toolOutput[index])) {
+            toolOutput = activity.toolOutput;
+            frames.push({
+                kind: "tool_output",
+                toolOutput,
+                activity: activity.facts,
+            });
+        }
+        return frames;
+    };
     const initial = {
         after,
         delivery,
@@ -106,64 +151,73 @@ function subscriptionFrames(options, runtime, registration, sessionId, after, de
         if (signal === "closed")
             return Effect.succeed([[], Option.none()]);
         if (signal === "reset")
-            return resetFrame(options, runtime, sessionId, includeSandboxFailures).pipe(Effect.map(continueFromReset));
+            return reset();
         return runtime.assertOpen.pipe(Effect.andThen(currentSessionActivity(options, runtime, sessionId)), Effect.flatMap((activity) => {
             registration.setQueued(activity.facts.queue.state === "queued");
-            if (signal === "activity" && state.delivery === "live")
-                return Effect.succeed([
-                    [{ kind: "activity", activity: activity.facts }],
-                    Option.some({ ...state, awaitSignal: true }),
-                ]);
-            if (signal === "progress" && state.delivery === "live") {
+            if ((signal === "progress" || signal === "activity") &&
+                state.delivery === "live") {
+                const frames = liveFrames(activity);
+                if (frames === undefined)
+                    return reset();
                 return Effect.succeed([
                     [
-                        ...(activity.progress === null
-                            ? []
-                            : [
+                        ...(signal === "activity"
+                            ? [
                                 {
-                                    kind: "progress",
-                                    progress: activity.progress,
+                                    kind: "activity",
                                     activity: activity.facts,
                                 },
-                            ]),
-                        {
-                            kind: "tool_output",
-                            toolOutput: activity.toolOutput,
-                            activity: activity.facts,
-                        },
+                            ]
+                            : []),
+                        ...frames,
                     ],
                     Option.some({ ...state, awaitSignal: true }),
                 ]);
             }
-            return readSessionReplayPage(options.store, sessionId, state.after, state.delivery, activity, () => runtime.extensions.project(sessionId), includeSandboxFailures).pipe(Effect.flatMap((page) => {
+            return readSessionReplayPage(options.store, sessionId, state.after, state.delivery, activity, () => runtime.extensions.project(sessionId), includeSandboxFailures, (page) => {
+                const latestCursor = page.kind === "page"
+                    ? page.frames
+                        .flatMap((frame) => frame.kind === "progress" ||
+                        frame.kind === "activity" ||
+                        frame.kind === "tool_output"
+                        ? []
+                        : [frame.cursor])
+                        .at(-1)
+                    : undefined;
+                // Prepare a figure only for the final moving update,
+                // while its cursor and stored context share the read.
+                const context = page.kind === "page" &&
+                    !page.hasMore &&
+                    page.frames.some((frame) => frame.kind === "update" &&
+                        frame.cursor !== state.after)
+                    ? prepareSessionContext(options, sessionId, latestCursor ?? null)
+                    : Effect.succeed(undefined);
+                return { page, latestCursor, context };
+            }).pipe(Effect.flatMap(({ page, latestCursor, context, }) => {
                 if (page.kind === "reset")
-                    return resetFrame(options, runtime, sessionId, includeSandboxFailures).pipe(Effect.map(continueFromReset));
-                const latestCursor = page.frames
-                    .flatMap((frame) => frame.kind === "progress" ||
-                    frame.kind === "activity" ||
-                    frame.kind === "tool_output"
+                    return reset();
+                if (!page.hasMore)
+                    toolOutput = activity.toolOutput;
+                const progressFrames = page.hasMore
                     ? []
-                    : [frame.cursor])
-                    .at(-1);
+                    : liveFrames(activity);
+                if (progressFrames === undefined)
+                    return reset();
                 const next = {
                     after: latestCursor ?? state.after,
                     delivery: page.hasMore ? state.delivery : "live",
                     awaitSignal: !page.hasMore,
                 };
-                // Only a final update that moves the cursor gets a
-                // figure. A wake that moved nothing never re-reads the
-                // whole kept window.
-                const movedHistory = page.frames.some((frame) => frame.kind === "update" &&
-                    frame.cursor !== state.after);
-                return (movedHistory && !page.hasMore
-                    ? readSessionContext(options, sessionId, latestCursor ?? null)
-                    : Effect.succeed(undefined)).pipe(Effect.map((context) => [
-                    context === undefined
-                        ? page.frames
-                        : page.frames.map((frame) => frame.kind === "update" &&
-                            frame.cursor === latestCursor
-                            ? Object.freeze({ ...frame, context })
-                            : frame),
+                return context.pipe(Effect.map((context) => [
+                    [
+                        ...(context === undefined
+                            ? page.frames
+                            : page.frames.map((frame) => frame.kind === "update" &&
+                                frame.cursor === latestCursor
+                                ? Object.freeze({ ...frame, context })
+                                : frame)),
+                        ...progressFrames,
+                    ],
                     Option.some(next),
                 ]));
             }));
@@ -191,7 +245,7 @@ function watchSession(options, runtime, observation, sessionId, input) {
             registration.setQueued(snapshot.activity.queue.state === "queued");
             return Object.freeze({
                 snapshot,
-                changes: subscriptionFrames(options, runtime, registration, decoded.sessionId, snapshot.cursor ?? undefined, "live", decoded.options.includeSandboxFailures === true).pipe(Stream.ensuring(Effect.sync(registration.close))),
+                changes: subscriptionFrames(options, runtime, registration, decoded.sessionId, snapshot.cursor ?? undefined, "live", decoded.options.includeSandboxFailures === true, snapshot.progress).pipe(Stream.ensuring(Effect.sync(registration.close))),
                 close: Effect.sync(registration.close),
             });
         }))).pipe(Effect.onError(() => Effect.sync(registration.close)));
@@ -289,7 +343,9 @@ function executeSessionCommand(options, runtime, sessionId, meta, input) {
                     .commit(sessionOwnerOperation(runtime, decodedSessionId, (decoded) => {
                     setSessionTitle(options.store, decoded, command.title);
                 }))
-                    .pipe(Effect.as(undefined));
+                    .pipe(Effect.tap(() => Effect.sync(() => {
+                    publishAgentExecutionChange(options.store);
+                })), Effect.as(undefined));
         }
     }));
 }
@@ -455,6 +511,7 @@ export function acceptAddressedMail(runtime, mail, meta, reply, stageMail, sessi
             const result = admit(meta === undefined ? request : { ...request, meta });
             if (result.status !== "accepted")
                 throw new Error("Sessionless addressed mail was not admitted");
+            runtime.recordCreatedSessionDelegatorWithinTransaction(sessionId, addressed);
             return {
                 status: "accepted",
                 commandId: result.commandId,