effect-agent 0.1.0-beta.156 → 0.1.0-beta.158

package/dist/{Digest-CaJ2RIsF.d.mts → Digest-CNHImGy0.d.mts}

@@ -1,4 +1,4 @@
-import { _ as Digest, h as DefinitionDigests, m as DefinitionDigestInput, s as CanonicalBatch } from "./Records-BrEpibum.mjs";
+import { _ as Digest, h as DefinitionDigests, m as DefinitionDigestInput, s as CanonicalBatch } from "./Records-BxGWRs-t.mjs";
 import { Crypto, Effect, Schema } from "effect";
 declare namespace Digest_d_exports {
   export { DigestError, EMPTY_TAIL_DIGEST, digestCanonicalBatch, digestDefinition, digestDefinitions, digestJson };
@@ -19,4 +19,4 @@ declare const digestDefinitions: (definitions: DefinitionDigestInput) => Effect.
 declare const EMPTY_TAIL_DIGEST: string & import("effect/Brand").Brand<"@effect-agent/thread/Digest">;
 //#endregion
 export { digestDefinition as a, digestCanonicalBatch as i, Digest_d_exports as n, digestDefinitions as o, EMPTY_TAIL_DIGEST as r, digestJson as s, DigestError as t };
-//# sourceMappingURL=Digest-CaJ2RIsF.d.mts.map
+//# sourceMappingURL=Digest-CNHImGy0.d.mts.map

package/dist/{DurableAgentRuntime-BQzYkFVy.mjs → DurableAgentRuntime-eImXoGqD.mjs}

@@ -15,7 +15,7 @@ import { a as PeerMessageCapacity, d as MessageAdmission, f as MessagingError, i
 import { SubagentHost } from "./engine/SubagentHost.mjs";
 import { ThreadHistory } from "./engine/ThreadHistory.mjs";
 import { n as RunToolVisibility } from "./ToolExposure-9uF_Yo0T.mjs";
-import { f as renderInputPrompt, n as AgentChildPending, y as streamWithUsageAccountingUnknown } from "./AgentRuntime-IF_1GoUf.mjs";
+import { f as renderInputPrompt, n as AgentChildPending, y as streamWithUsageAccountingUnknown } from "./AgentRuntime-D4eoBpIW.mjs";
 import { ContextRolloverTool } from "./engine/ContextWindow.mjs";
 import { getToolExecutionClass } from "./engine/DurableStep.mjs";
 import { CompactionError, ContextCompactor } from "./engine/ContextCompactor.mjs";
@@ -26,7 +26,7 @@ import { AbortCommand, AbortIntentRequest, AdmissionPolicyError, AdmissionReques
 import { DeclaredPendingBatchEvidence, OpenDelegationCallEvidence, OpenToolCallEvidence, PendingApprovalEvidence, RecoveryDecision, RecoveryEvidence, classifyRecovery } from "./durable/Recovery.mjs";
 import { ExplainedEvidence, ExplainedSubmission, ExplainedUnknownCall, IntegrityCheck, IntegrityReport, ObligationEntry, ObligationReport, RecoveryExplanation, RetryRefused, obligationSeverityOf, predictRecoveryDisposition, recoveryDecisionMeaning } from "./durable/Admin.mjs";
 import { digestJson } from "./durable/Digest.mjs";
-import { a as compileRegistrations, c as resolveDefinitionBinding, l as resolveWorkerBinding, n as CurrentBindingSelection, o as definitionDigestsEqual, s as makeLegacyWorkerBinding, t as BindingUnavailable, u as toolReplayContracts } from "./agent-registration-U3kmV7nW.mjs";
+import { a as compileRegistrations, c as resolveDefinitionBinding, l as resolveWorkerBinding, n as CurrentBindingSelection, o as definitionDigestsEqual, s as makeLegacyWorkerBinding, t as BindingUnavailable, u as toolReplayContracts } from "./agent-registration-BIOzAej4.mjs";
 import { $ as workerOriginRecordId, A as subagentRequestedRecordId, B as toolCallUnknownRecordId, C as runStartedBatchId, D as subagentLineageBatchId, E as subagentJoinedRecordId, F as toolCallPreparedRecordId, G as turnCanonicalBatch, H as toolStepSettledRecordId, I as toolCallResolutionBatchId, J as turnResponseBatch, K as turnIdForRun, L as toolCallResolvedRecordId, M as subagentStartedRecordId, N as toolApprovalDecisionRecordId, O as subagentLineageRecordId, P as toolApprovalRequestRecordId, Q as workerInputRecordId, R as toolCallResultBatchId, S as runIdForSubmission, T as subagentJoinBatchId, U as turnApprovalsBatchId, V as toolStepSettledBatchId, X as turnResultsBatch, a as childIdempotencyKeyFor, b as runDurationBatchId, c as compactionRecordId, d as modelResponseInterruptedBatchId, et as workerReportRecordId, f as modelResponseInterruptedRecordId, g as projectRunJournalStream, i as approvalDecisionBatchId, j as subagentStartedBatchId, k as subagentRequestedBatchId, l as firstWorkerInputRecordId, m as peerMessageRecordId, o as childThreadIdFor, p as modelResponseRecordId, q as turnPreparedBatchId, r as agentUpdateRecordId, s as compactionBatchId, t as RunJournalError, tt as makeJournalMetadata, u as markUnknownBatchId, v as runCompletedRecordId, w as runStartedRecordId, x as runDurationRecordId, y as runCompletionDigest, z as toolCallSettledRecordId } from "./RunJournal-ixFRCyW3.mjs";
 import { FencedAppendRequest, LoadCheckpointRequest, MAX_THREAD_EXPORT_RECORDS, SaveRecoveryCheckpointRequest, ThreadCheckpoint, ThreadExportRequest, ThreadIdentityRequest, ThreadMaterialization, ThreadObservation, ThreadRead, ThreadStore, ThreadStoreDiagnostic, ThreadStoreError, ThreadTailRequest, getRecord, getRunInput, readWorkerState } from "./durable/ThreadStore.mjs";
 import { DurableRuntimeFailpoint } from "./durable/DurableFailpoint.mjs";
@@ -36,7 +36,7 @@ import { PreparedInput } from "./durable/Subscription.mjs";
 import { MessageDeliveryDriver, MessageDeliveryFailpoint, MessageDeliveryRecord, MessageDeliveryStore, messageDeliveryCapacity, messageDeliveryUsesCapacity, prepareMessageDelivery } from "./durable/MessageDelivery.mjs";
 import { WakeScheduler } from "./durable/WakeScheduler.mjs";
 import { n as safeUnknownString, t as inspectForeignDiagnostic } from "./foreign-diagnostic-DBQ1XHKh.mjs";
-import { c as threadCreatedBatchId, l as threadCreatedRecordId, n as WorkerAdmissionPort, o as ensureThreadCreated, r as WorkerAdmissionRequest, s as ensureWorkerOrigin } from "./WorkerAdmission-CNbm4o_x.mjs";
+import { c as threadCreatedBatchId, l as threadCreatedRecordId, n as WorkerAdmissionPort, o as ensureThreadCreated, r as WorkerAdmissionRequest, s as ensureWorkerOrigin } from "./WorkerAdmission-N9hZV85Q.mjs";
 import { WorkerBudgetAuthorizer, WorkerConcurrencyLimit, WorkerConcurrencyResolver, WorkerHostAuthorizer, WorkerHostConfig, WorkerPolicyResolver } from "./durable/WorkerHost.mjs";
 import { OperationAuthorizationRequest, OperationAuthorizer, OperationDenied } from "./durable/OperationAuthorizer.mjs";
 import { PendingSubmission, SettledSubmission } from "./durable/SubmissionStatus.mjs";
@@ -2374,6 +2374,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	const ledger = yield* SubmissionLedger;
 	const submissionScheduling = yield* SubmissionScheduling;
 	const store = yield* ThreadStore;
+	const deliveries = yield* Effect.serviceOption(MessageDeliveryStore);
 	let projectedJournal;
 	const wake = yield* WakeScheduler;
 	const failpoint = yield* DurableRuntimeFailpoint;
@@ -3337,7 +3338,45 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	* notification for single-store parent re-suspension races; `ResumeWaitingParent` remains the
 	* repair for older data and any already-recorded canonical settlement.
 	*/
-	const notifyParentOfChildSettlement = Effect.fn("DurableAgentRuntime.notifyParentOfChildSettlement")(function* (submission) {
+	const notifyParentOfChildSettlement = Effect.fn("DurableAgentRuntime.notifyParentOfChildSettlement")(function* (submission, record) {
+		const admission = submission.messageAdmission;
+		const worker = submission.workerAdmission;
+		const key = admission === void 0 ? worker === void 0 ? void 0 : {
+			ownerThreadId: worker.origin.source.threadId,
+			messageId: worker.messageId
+		} : Schema.is(MessageAdmission)(admission) ? admission.message : {
+			ownerThreadId: admission._tag === "WorkerCompletion" ? admission.report.worker.threadId : admission.worker.threadId,
+			messageId: submission.idempotencyKey
+		};
+		if (key !== void 0 && Option.isSome(deliveries)) {
+			const settled = yield* settlementPayloadFromRecord(record, submission.submissionId);
+			yield* deliveries.value.change(key, {
+				_tag: "Complete",
+				nowMillis: yield* Clock.currentTimeMillis,
+				admissionKey: submission.idempotencyKey,
+				inputDigest: submission.inputDigest,
+				receipt: Receipt.make({
+					threadId: submission.threadId,
+					submissionId: submission.submissionId,
+					receiptId: submission.receiptId,
+					queueSequence: submission.queueSequence
+				}),
+				settlement: Settlement.make({
+					submissionId: settled.submissionId,
+					receiptId: settled.receiptId,
+					settlementId: settled.settlementId,
+					outcome: settled.outcome,
+					settledAt: record.createdAt,
+					...settled.outcome === "failed" ? { failure: settled.result } : {},
+					...settled.usageSummary === void 0 ? {} : { usageSummary: settled.usageSummary },
+					...settled.runDisposition === void 0 ? {} : { runDisposition: settled.runDisposition }
+				})
+			}).pipe(Effect.catchCause((cause) => Effect.failCause(Cause.map(cause, (error) => LedgerError.make({
+				operation: "delivery-completion",
+				message: "Destination acknowledgement remains pending",
+				cause: error
+			})))));
+		}
 		if (submission.workerAdmission?.origin.reporting?.mode === "standard") yield* updateRuntime.repair(submission.threadId).pipe(Effect.mapError(() => LedgerError.make({
 			operation: "update-delivery",
 			message: "Update delivery remains pending"
@@ -3396,13 +3435,13 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			records: [record]
 		})).pipe(Effect.catchTag("AppendConflict", () => Effect.void), Effect.asVoid);
 		yield* hit("terminalize:after-canonical-append");
-		yield* notifyParentOfChildSettlement(submission);
+		yield* notifyParentOfChildSettlement(submission, record);
 		const settlement = yield* ledger.finalizeSettlement(SettlementFinalization.make({
 			submissionId,
 			settlementId
 		}));
 		yield* wake.notify(submission.threadId);
-		yield* notifyParentOfChildSettlement(submission);
+		yield* notifyParentOfChildSettlement(submission, record);
 		return settlement;
 	});
 	/**
@@ -3465,14 +3504,14 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			records: [reserved.record]
 		})).pipe(Effect.catchTag("AppendConflict", () => Effect.void), Effect.asVoid);
 		yield* hit("terminalize:after-canonical-append");
-		yield* notifyParentOfChildSettlement(submission);
+		yield* notifyParentOfChildSettlement(submission, reserved.record);
 		const settlement = yield* ledger.finalizeSettlement(SettlementFinalization.make({
 			submissionId,
 			settlementId
 		}));
 		const canonicalSettlement = yield* settlementPayloadFromRecord(reserved.record, submissionId);
 		yield* wake.notify(submission.threadId);
-		yield* notifyParentOfChildSettlement(submission);
+		yield* notifyParentOfChildSettlement(submission, reserved.record);
 		yield* settleJoinedSubmissions(ctx, canonicalSettlement);
 		return materializeSettlement(settlement, reserved.record);
 	});
@@ -3486,28 +3525,28 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			})).pipe(Effect.catchTag("AppendConflict", () => Effect.void), Effect.asVoid);
 			yield* hit("terminalize:after-canonical-append");
 		}
-		yield* notifyParentOfChildSettlement(submission);
+		yield* notifyParentOfChildSettlement(submission, reservation.record);
 		const settlement = yield* ledger.finalizeSettlement(SettlementFinalization.make({
 			submissionId: submission.submissionId,
 			settlementId: reservation.settlementId
 		}));
 		const canonicalSettlement = yield* settlementPayloadFromRecord(reservation.record, submission.submissionId);
 		yield* wake.notify(submission.threadId);
-		yield* notifyParentOfChildSettlement(submission);
+		yield* notifyParentOfChildSettlement(submission, reservation.record);
 		yield* settleJoinedSubmissions(ctx, canonicalSettlement);
 		return materializeSettlement(settlement, reservation.record);
 	});
 	/** Canonical settlement exists: rebuild the ledger from history, never the reverse (DUR-015). */
 	const finalizeFromHistory = Effect.fn("DurableAgentRuntime.finalizeFromHistory")(function* (submission, record) {
 		const canonicalSettlement = yield* settlementPayloadFromRecord(record, submission.submissionId);
-		yield* notifyParentOfChildSettlement(submission);
+		yield* notifyParentOfChildSettlement(submission, record);
 		const settlement = yield* ledger.finalizeSettlement(SettlementFinalization.make({
 			submissionId: submission.submissionId,
 			settlementId: canonicalSettlement.settlementId
 		}));
 		const snapshot = yield* ledger.loadRecoverySnapshot(RecoverySnapshotRequest.make({ submissionId: submission.submissionId }));
 		yield* wake.notify(submission.threadId);
-		yield* notifyParentOfChildSettlement(submission);
+		yield* notifyParentOfChildSettlement(submission, record);
 		return materializeSettlement(settlement, snapshot.reservation?.record);
 	});
 	/**
@@ -4107,7 +4146,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	* journal ends mid-batch,
 	* `RunOptions.resume` replays the declared batch without re-invoking the model (§2.4).
 	*/
-	const runModel = (agent, ctx, submission, tokenRef, records, canonical, canonicalThrough, journalSeed, journalMetadata, lineage, approvalDecisions, currentContracts, runTiming, yieldAfter) => Effect.gen(function* () {
+	const runModel = (agent, ctx, submission, tokenRef, renewAtRef, records, canonical, canonicalThrough, journalSeed, journalMetadata, lineage, approvalDecisions, currentContracts, runTiming, yieldAfter) => Effect.gen(function* () {
 		const submissionId = submission.submissionId;
 		const runId = runIdForSubmission(submissionId);
 		const boundaries = [];
@@ -4384,6 +4423,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			const uncached = yield* addUsageTotal("inputTokens.uncached", detailed.inputTokens.uncached, legacyInput);
 			const text = yield* addUsageTotal("outputTokens.text", detailed.outputTokens.text, legacyOutput);
 			return RunUsageSummary.make({
+				...legacyCalls === 0 && detailed.webSearchCalls !== void 0 ? { webSearchCalls: detailed.webSearchCalls } : {},
 				modelCalls,
 				inputTokens: InputTokenUsage.make({
 					total: inputTokens,
@@ -5612,14 +5652,22 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 				return { _tag: "aborted" };
 			}
 		}));
-		const renewal = halt(Effect.repeat(Effect.gen(function* () {
-			const ownershipToken = yield* Ref.get(tokenRef);
-			const renewal = yield* ledger.renewOwnership(RenewOwnershipRequest.make({
-				submissionId,
-				ownershipToken
-			}));
-			yield* Ref.set(tokenRef, renewal.ownershipToken);
-		}).pipe(Effect.uninterruptible), { schedule: Schedule.spaced(config.leaseRenewalInterval) }).pipe(Effect.andThen(Effect.never)));
+		const renewal = halt(Effect.gen(function* () {
+			const renewAt = yield* Ref.get(renewAtRef);
+			const now = yield* Clock.currentTimeMillis;
+			yield* Effect.sleep(Math.max(0, renewAt - now));
+			yield* Effect.repeat(Effect.gen(function* () {
+				const ownershipToken = yield* Ref.get(tokenRef);
+				const renewingAt = yield* Clock.currentTimeMillis;
+				const renewal = yield* ledger.renewOwnership(RenewOwnershipRequest.make({
+					submissionId,
+					ownershipToken
+				}));
+				yield* Ref.set(tokenRef, renewal.ownershipToken);
+				yield* Ref.set(renewAtRef, renewingAt + Duration.toMillis(config.leaseRenewalInterval));
+			}).pipe(Effect.uninterruptible), { schedule: Schedule.spaced(config.leaseRenewalInterval) });
+			return yield* Effect.never;
+		}));
 		const execution = Effect.raceFirst(consume, Effect.raceFirst(abortWatcher, renewal));
 		const result = yield* (yieldAfter === void 0 && submissionScheduling.yieldTo === void 0 ? execution : Effect.raceFirst(execution, Deferred.await(yieldSignal).pipe(Effect.map((nextSubmissionId) => ({
 			_tag: "yielded",
@@ -5703,7 +5751,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 	* (Unknown Outcomes, or a durable approval suspension) — no settlement occurs and the
 	* obligation stays owed.
 	*/
-	const runAttempt = (registeredAgent, threadId, claim, tokenRef, resumeAfterRetention, onHandoff, yieldAfter) => Effect.gen(function* () {
+	const runAttempt = (registeredAgent, threadId, claim, tokenRef, renewAtRef, resumeAfterRetention, onHandoff, yieldAfter) => Effect.gen(function* () {
 		const submissionId = claim.submissionId;
 		const supersededEpoch = yield* store.inspectTail(ThreadTailRequest.make({ threadId })).pipe(Effect.map((tail) => tail.producerEpoch), Effect.catchTag("ThreadNotMaterialized", () => Effect.succeed(ZERO_EPOCH)));
 		yield* store.materialize(ThreadMaterialization.make({
@@ -5886,7 +5934,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 			const tail = yield* store.inspectTail(ThreadTailRequest.make({ threadId }));
 			const canonical = Stream.concat(initialView.canonical, canonicalRange(threadId, tail.tailSequence, initialThrough));
 			const currentRecords = yield* refreshControl(tail.tailSequence);
-			const outcome = yield* runModel(agent, ctx, submission, tokenRef, currentRecords, canonical, tail.tailSequence, initialView.seed, journalMetadata?.snapshot(), lineage, approvalDecisionIntents, currentContracts, runTiming, yieldAfter);
+			const outcome = yield* runModel(agent, ctx, submission, tokenRef, renewAtRef, currentRecords, canonical, tail.tailSequence, initialView.seed, journalMetadata?.snapshot(), lineage, approvalDecisionIntents, currentContracts, runTiming, yieldAfter);
 			if (outcome._tag === "yielded") {
 				if (outcome.nextSubmissionId !== void 0) onHandoff(outcome.nextSubmissionId);
 				return Option.none();
@@ -5972,6 +6020,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		}
 	}).pipe(Effect.scoped);
 	const acquireClaim = Effect.fn("DurableAgentRuntime.acquireClaim")(function* (threadId, handoff) {
+		const acquiringAt = yield* Clock.currentTimeMillis;
 		const claimed = yield* ledger.claim(ClaimRequest.make({
 			threadId,
 			producerId: config.producerId,
@@ -5980,6 +6029,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		if (Option.isNone(claimed)) return Option.none();
 		const claim = claimed.value;
 		const tokenRef = yield* Ref.make(claim.ownershipToken);
+		const renewAtRef = yield* Ref.make(acquiringAt + Duration.toMillis(config.leaseRenewalInterval));
 		yield* Effect.addFinalizer(() => Ref.get(tokenRef).pipe(Effect.flatMap((ownershipToken) => ledger.releaseOwnership(ReleaseOwnershipRequest.make({
 			submissionId: claim.submissionId,
 			ownershipToken
@@ -5990,7 +6040,8 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		});
 		return Option.some({
 			claim,
-			tokenRef
+			tokenRef,
+			renewAtRef
 		});
 	}, Effect.uninterruptible);
 	const processThreadHead = (resolve, threadId, options) => Effect.gen(function* () {
@@ -6000,7 +6051,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 		const attempt = Effect.scoped(Effect.gen(function* () {
 			const claimed = yield* acquireClaim(threadId, handoff);
 			if (Option.isNone(claimed)) return Option.none();
-			const { claim, tokenRef } = claimed.value;
+			const { claim, tokenRef, renewAtRef } = claimed.value;
 			const attributes = {
 				threadId,
 				submissionId: claim.submissionId,
@@ -6034,7 +6085,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (bindings) {
 				failure
 			}) }));
 			if (resolution._tag === "refused") return yield* resolution.failure;
-			return yield* resolution.binding.attempt((agent, attemptThreadId, attemptClaim) => runAttempt(agent, attemptThreadId, attemptClaim, tokenRef, () => {
+			return yield* resolution.binding.attempt((agent, attemptThreadId, attemptClaim) => runAttempt(agent, attemptThreadId, attemptClaim, tokenRef, renewAtRef, () => {
 				resumeAfterRetention = true;
 			}, (nextSubmissionId) => {
 				nextHandoff = ClaimHandoff.make({
@@ -7301,4 +7352,4 @@ var DurableAgentRuntime = class DurableAgentRuntime extends Context.Service()("@
 //#endregion
 export { DurableApprovalSuspension as a, RecoveryFailure as c, childReservationIdFor as d, isolateRecovery as f, DurableApprovalResolver as i, RecoveryReport as l, recoveryRepairRecordId as m, DurableAgentRuntime as n, DurableRuntimeConfig as o, recoveryRepairBatchId as p, DurableAgentRuntime_exports as r, RecoveryBlocked as s, ApprovalSuspensionError as t, RecoverySweepResult as u };
 
-//# sourceMappingURL=DurableAgentRuntime-BQzYkFVy.mjs.map
+//# sourceMappingURL=DurableAgentRuntime-eImXoGqD.mjs.map