@fungi.computer/shiitake 0.5.0 → 0.7.0

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";
@@ -269,16 +269,34 @@ export function createAgentDirectory(sql) {
         erasureRosterComplete: store.erasureRosterComplete,
     };
 }
+/**
+ * Whether an Agent may read one command's settlement: the Agent whose mail the
+ * command answered, or the Session's delegator of record for work no Agent's
+ * mail admitted (goal, loop and person turns, the work its reports carry).
+ * Another Agent's correspondence stays with that Agent.
+ */
+export function settlementReadableBy(facts, agentId) {
+    return (facts.acceptedSender === 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
@@ -343,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(),
@@ -363,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.
@@ -390,12 +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 delegation = { ancestors: [...ancestors, parent.agentId], maxDepth };
+        const path = { ancestors: [...ancestors, parent.agentId], maxDepth };
+        const delegation = {
+            ...path,
+            ...(task.delivery === "steer" && { steer: true }),
+            ...(task.goal !== undefined && { goal: task.goal }),
+        };
         const outgoingMeta = {
             ...(objectMeta.success
                 ? objectMeta.data
@@ -414,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,
@@ -425,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(),
             };
@@ -471,13 +537,23 @@ export function createFleetCorrespondence(options) {
      */
     function authenticateReply(mail) {
         // This owner sends to one correspondent, so BirdDog's reply index is zero.
-        const suffix = ":reply:0";
+        // A report names the idle Session's delegator mail and the settled command.
         if (mail.replyTo.length !== 0 ||
             mail.reply === undefined ||
-            mail.reply.outcome === "accepted" ||
-            !mail.key.endsWith(suffix))
+            mail.reply.outcome === "accepted")
+            return undefined;
+        const reportAt = mail.key.lastIndexOf(":report:");
+        // A report's key names the command it settles.
+        const isReport = reportAt >= 0 &&
+            "commandId" in mail.reply &&
+            mail.key.slice(reportAt) === `:report:${mail.reply.commandId}:0`;
+        const mailKey = isReport
+            ? mail.key.slice(0, reportAt)
+            : mail.key.endsWith(":reply:0")
+                ? mail.key.slice(0, -":reply:0".length)
+                : undefined;
+        if (mailKey === undefined)
             return undefined;
-        const mailKey = mail.key.slice(0, -suffix.length);
         const row = read(mailKey);
         if (row === undefined || row.state === "undeliverable")
             return undefined;
@@ -508,7 +584,8 @@ export function createFleetCorrespondence(options) {
             mail.reply.reason === "recipient_offline" &&
             !systemUndeliverable)
             return undefined;
-        if (mail.reply.outcome !== "undeliverable" &&
+        if (!isReport &&
+            mail.reply.outcome !== "undeliverable" &&
             row.state === "accepted" &&
             row.receipt !== null) {
             const sentResult = parseAccepted(row.receipt);
@@ -627,7 +704,9 @@ export function createFleetCorrespondence(options) {
         start,
         /** Match a reply to frozen mail and restore the caller's delegation path. */
         authenticateReply,
+        /** Bind exhausted local delivery to its frozen sender correspondence. */
         recordLocalUndeliverable,
+        /** Prevent replay after a system undeliverable reply is admitted. */
         recordUndeliverableReply,
         /** Read an existing acceptance receipt without reserving or delivering mail. */
         receipt,
@@ -651,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)
             : {
@@ -665,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;
@@ -680,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/hosted.js

@@ -166,12 +166,15 @@ function hostedPort(manifest, revision, grants) {
             }),
             attention: Object.freeze({
                 set: () => Effect.fail(unavailable("Attention")),
+                awaitsPerson: () => Effect.fail(unavailable("Attention")),
                 clear: () => Effect.fail(unavailable("Attention")),
             }),
             hasPendingSteer: () => Effect.fail(unavailable("Steering")),
+            workSender: () => Effect.fail(unavailable("Run sender")),
             sessionPosition: () => Effect.fail(unavailable("Session timeline")),
             hasSuccessfulToolResult: () => Effect.fail(unavailable("A tool result")),
             observe: () => Effect.die(unavailable("Observation")),
+            isObserved: () => false,
             transact: () => Effect.fail(new ShiitakeError("extensions", "rejected", "A hosted extension has no Agent transaction")),
         }),
     });

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;
@@ -502,6 +502,7 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
             };
             output: {
                 readonly acceptedSender: string | null;
+                readonly delegator: string | null;
                 readonly terminal: {
                     readonly commandId: string;
                     readonly outcome: "completed" | "cancelled" | "failed" | "interrupted";
@@ -531,6 +532,11 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                     };
                 }[];
                 readonly toolCalls: number;
+                readonly waitingOnYou: readonly {
+                    readonly itemId: string;
+                    readonly kind: string;
+                    readonly summary: string;
+                }[];
             } | null;
             outputFormat: "json";
             status: 200;
@@ -551,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;
@@ -815,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;
@@ -843,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;
@@ -873,6 +882,11 @@ export declare function createShiitakeHttpRoutes(resolveSession: ShiitakeSession
                     readonly extensionId: string;
                     readonly expiresAt?: number | undefined;
                     readonly inbox?: false | undefined;
+                    readonly waitingOn?: {
+                        readonly agentId: string;
+                        readonly sessionId: string;
+                        readonly name: string;
+                    } | undefined;
                 }[];
                 readonly context?: {
                     readonly tokens: number;
@@ -915,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/accepted-run-executor.js

@@ -9,7 +9,7 @@ import { ExtensionId } from "../extension-contract.js";
 import { publishOwnerObservation } from "./observation-kernel.js";
 import { returnedFailureReason } from "./run-failure-reason.js";
 import { coreProtocolDigest } from "./extension-roster.js";
-import { runAcceptedCommand, runAcceptedCompaction, ToolSetupError, } from "./run-scope.js";
+import { runAcceptedCommand, runAcceptedCompaction, RunRejectedError, ToolSetupError, } from "./run-scope.js";
 import { CompactionCommitError } from "./compaction/session-compaction.js";
 import { BrokenSessionError, isCompactCommand, loadAcceptedRun, readExtensionAdmissionOrigin, recordWorkSettlement, } from "./woodstock/index.js";
 /** Bounded process-loss recovery for every accepted Agent turn. */
@@ -25,6 +25,7 @@ function runtimeFailure(message) {
 function failedDecision(error) {
     const category = `${error.boundary}:${error.cause}`;
     const diagnostic = error instanceof ToolSetupError ||
+        error instanceof RunRejectedError ||
         error instanceof CompactionCommitError ||
         error instanceof BrokenSessionError
         ? error.diagnostic

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

@@ -32,8 +32,13 @@ 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
+     * follow-up that delivers an answer) keeps that work's sender.
+     */
+    continuesWorkId?: string | undefined;
 }>;
 /** Outcome of one door admission. */
 export type AdmitResult = Readonly<{

package/dist/internal/admission-door.js

@@ -1,10 +1,11 @@
+import { messageAuthor } from "@fungi.computer/agar/agents";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 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, 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",
 });
@@ -29,6 +30,24 @@ function decodeReply(request) {
         throw new ShiitakeError("contract", "invalid", "Verified Agent reply does not match its mail");
     return reply;
 }
+/**
+ * The Agent Session whose work this admission is: the sender of delegated
+ * mail that expects a reply, or the sender of the earlier work this one
+ * continues. Replies and every other admission have none.
+ */
+function workSender(owner, request) {
+    const mail = request.mail;
+    if (mail?.from.kind === "agent" && mail.replyTo.length > 0)
+        return {
+            agentId: mail.from.agentId,
+            sessionId: mail.from.sessionId,
+            // The host-authenticated author names the sender; mail.meta is the sender's own claim.
+            name: messageAuthor(request.meta)?.name ?? mail.from.agentId,
+        };
+    return request.continuesWorkId === undefined
+        ? undefined
+        : readWorkSender(owner, request.sessionId, request.continuesWorkId);
+}
 /** Bind the door to one owner, run contract, Watchdog queue and host wake. */
 export function openAdmissionDoor(input) {
     /** The door's one decode, done before any owner operation when possible. */
@@ -41,6 +60,7 @@ export function openAdmissionDoor(input) {
         mail: request.mail,
         reply: decodeReply(request),
         onAccepted: request.onAccepted,
+        continuesWorkId: request.continuesWorkId,
         meta: request.meta === undefined
             ? undefined
             : checkHostMeta(input.hostMeta, request.meta),
@@ -67,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
@@ -75,7 +96,16 @@ export function openAdmissionDoor(input) {
                 input.enqueue(work, request.mail);
             }
             : undefined, targetWorkId, request.reply);
-        request.onAccepted?.(sessionId, accepted.accepted.commandId);
+        if (accepted.delivery === "new" && targetWorkId === undefined) {
+            const sender = workSender(input.owner, request);
+            if (sender !== undefined)
+                recordWorkSender(input.owner, sessionId, accepted.accepted.commandId, sender);
+        }
+        // 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

@@ -3,7 +3,7 @@ import type { SessionTerminal, ShiitakeAgent } from "../client.js";
 import type { GrantsDelivery, GrantsDeliveryResult } from "./woodstock/index.js";
 import type { Json } from "../extensions.js";
 import type { ExtensionRosterV0 } from "../extensions.js";
-import type { Api, AssistantMessage, Model, MuleStreamFunction } from "@fungi.computer/mule/effect";
+import type { Api, AssistantMessage, Model, MuleStreamFunction, ProviderRejection } from "@fungi.computer/mule/effect";
 import type { AccessOptions, CapabilitySource, ExecutionOptions, ModuleRegistration, Sandbox } from "@fungi.computer/mycelium";
 import type { ModelPreference } from "./model-preference.js";
 import type { WatchdogSqliteValue, WatchdogSqliteRow, WatchdogSqliteOwner, WatchdogSqliteCursor } from "@fungi.computer/watchdog";
@@ -47,6 +47,8 @@ export type ModelAcquisition = Readonly<{
      * Unknown messages must return undefined.
      */
     failureReason?: (message: AssistantMessage) => string | undefined;
+    /** Bounded provider facts for this door's exact failure, never SDK prose. */
+    rejection?: (message: AssistantMessage) => ProviderRejection | undefined;
     /** Provider prose for this door's exact failed turn; never a diagnostic. */
     providerError?: (message: AssistantMessage) => string | undefined;
     /** Release the acquired model resources. */
@@ -186,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. */
@@ -253,6 +260,8 @@ export type { HostMetaOptions, StandardHostMetaResult, StandardHostMetaSchema, }
 export type CommandSettlement = Readonly<{
     /** Original Agent sender recorded at acceptance, never the terminal's canceller. */
     acceptedSender: string | null;
+    /** Agent that first sent this Session work and receives its reports, if any. */
+    delegator: string | null;
     /** Durable terminal and the command that ended the work's opaque metadata. */
     terminal: SessionTerminal;
     /** Last completed assistant text; cancelled work returns no answer. */
@@ -261,4 +270,13 @@ export type CommandSettlement = Readonly<{
     usage: readonly Pick<AssistantMessage, "provider" | "model" | "usage">[];
     /** Distinct tool-call intentions belonging to this exact work. */
     toolCalls: number;
+    /**
+     * Open items of the Session that now wait on the Agent that sent this work.
+     * Child-authored data: summaries inform, only the sender's host checks decide.
+     */
+    waitingOnYou: readonly Readonly<{
+        itemId: string;
+        kind: string;
+        summary: string;
+    }>[];
 }>;