@namzu/sdk 43.0.0 → 44.1.0

package/dist/runtime/query/callback-inference.js

@@ -31,11 +31,11 @@ export function createCallbackInference(ctx, model, phase) {
             used = true;
             // No deadline of our own on the request — see the note on
             // `PreparationTextRequest.timeoutMs`. The two bounds that remain are
-            // the ones every other model request in the run has: the run's own
+            // the ones every other model request in the turn has: the turn's own
             // cancellation, and the provider's request timeout. An expired local
             // deadline here would abort a CONTACTED request, and a request that
             // ends without its usage receipt leaves the shared ledger unresolved,
-            // which stops the whole run — so a stage that gave up on its own
+            // which stops the whole turn — so a stage that gave up on its own
             // optional inference would take the operator's turn with it. That is
             // not hypothetical: it is what a 10s deadline did to every turn
             // against a reasoning model slower than 10s per auxiliary answer.
@@ -62,7 +62,7 @@ export function createCallbackInference(ctx, model, phase) {
                     providerRoute: route(),
                     messages: [createSystemMessage(input.system), createUserMessage(input.prompt)],
                     maxTokens: input.maxTokens,
-                    ...(ctx.runConfig.effort ? { effort: ctx.runConfig.effort } : {}),
+                    ...(ctx.turnConfig.effort ? { effort: ctx.turnConfig.effort } : {}),
                     signal,
                 })) {
                     if (chunk.usage)
@@ -87,7 +87,7 @@ export function createCallbackInference(ctx, model, phase) {
             }
             finally {
                 if (usage)
-                    ctx.runMgr.accumulateUsage(usage, route());
+                    ctx.recorder.accumulateUsage(usage, route());
             }
         },
     };

package/dist/runtime/query/callback-inference.js.map

@@ -1 +1 @@
-{"version":3,"file":"callback-inference.js","sourceRoot":"","sources":["../../../src/runtime/query/callback-inference.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"callback-inference.js","sourceRoot":"","sources":["../../../src/runtime/query/callback-inference.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/cancelled-before-start.d.ts

@@ -1,34 +1,34 @@
-import type { RunPersistence } from '../../manager/run/persistence.js';
-import type { FencingToken } from '../../types/run/checkpoint-store.js';
-import type { RunEventCursor, RunEventReplay } from '../../types/run/event-cursor.js';
-import type { Run, RunEvent } from '../../types/run/index.js';
+import type { TurnRecorder } from '../../manager/session/turn-recorder.js';
+import type { SessionEvent, Turn } from '../../types/session/index.js';
+import { type SessionLogCursor, type SessionLogReplay } from '../../types/session/log-cursor.js';
+import { type SessionRecord } from '../../types/session/records.js';
 import type { QueryParams } from './index.js';
-import type { PreparedRun } from './prepare-run.js';
+import type { PreparedTurn } from './prepare-turn.js';
 /**
- * The run that was cancelled before it started.
+ * The turn that was cancelled before it started.
  *
- * Attachment materialization happens before `RunContext` exists, and a
- * cancellation observed there still belongs to a run: it must be recorded,
- * classified and reported like any other, without any of the authority-bearing
- * work — prompt contributions, host callbacks, tools, plugins, sandbox,
- * guardrails, advisors, providers — that a run which is allowed to proceed
- * would do next.
- *
- * An `async function*` rather than a plain async function, and reached with
- * `yield*`, because this path still emits and drains: the events it produces
- * must occupy exactly the positions in the stream they occupied when the code
- * lived inline, and only delegation preserves every yield point.
+ * Attachment materialization happens before the turn's context exists, and
+ * a cancellation observed there still belongs to a turn: it is recorded and
+ * reported like any other, without any of the authority-bearing work —
+ * prompt contributions, host callbacks, tools, plugins, sandbox, guardrails,
+ * advisors, providers — that a turn which is allowed to proceed would do next.
  */
-export declare function settlePreStartCancellation(params: QueryParams, prepared: PreparedRun): AsyncGenerator<RunEvent, Run>;
+export declare function settlePreStartCancellation(params: QueryParams, prepared: PreparedTurn): AsyncGenerator<SessionEvent, Turn>;
 /**
  * Hand a returning consumer what it missed, or tell it why it cannot have it.
  *
  * Yields NOTHING on a refusal. A partial catch-up is the failure this exists to
  * prevent: a consumer that receives some of the gap folds it into its state and
  * cannot tell the state is wrong, where one that receives an explicit
- * `unavailable` re-derives from the transcript and is right. The run continues
+ * `unavailable` re-derives from the log and is right. The turn continues
  * either way — a stale cursor belongs to the client, and must not be able to
  * stop the work.
+ *
+ * What is yielded is the live events the missed records stand for; the
+ * record-only types (messages, checkpoints, decisions) are in the log and not
+ * on the stream.
  */
-export declare function catchUpFromCursor(runMgr: RunPersistence, cursor: RunEventCursor, onEventReplay: ((replay: RunEventReplay) => void) | undefined, generation: FencingToken | undefined, onReplayObserverError: (error: unknown) => void): AsyncGenerator<RunEvent, void>;
+export declare function catchUpFromCursor(recorder: TurnRecorder, cursor: SessionLogCursor, onEventReplay: ((replay: SessionLogReplay) => void) | undefined, onReplayObserverError: (error: unknown) => void): AsyncGenerator<SessionEvent, void>;
+/** The live event a persisted-event record stands for; `undefined` for a record-only type. */
+export declare function liveEventOfRecord(record: SessionRecord): SessionEvent | undefined;
 //# sourceMappingURL=cancelled-before-start.d.ts.map

package/dist/runtime/query/cancelled-before-start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cancelled-before-start.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/cancelled-before-start.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAItE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAErF,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAE7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD;;;;;;;;;;;;;;GAcG;AACH,wBAAuB,0BAA0B,CAChD,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,WAAW,GACnB,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,CAiH/B;AAED;;;;;;;;;GASG;AACH,wBAAuB,iBAAiB,CACvC,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,SAAS,EAC7D,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,qBAAqB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAC7C,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CA0BhC"}
+{"version":3,"file":"cancelled-before-start.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/cancelled-before-start.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAK1E,OAAO,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EACN,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAExF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGrD;;;;;;;;GAQG;AACH,wBAAuB,0BAA0B,CAChD,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,YAAY,GACpB,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,CAgHpC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAuB,iBAAiB,CACvC,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,gBAAgB,EACxB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC,GAAG,SAAS,EAC/D,qBAAqB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAC7C,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,CA0BpC;AAID,8FAA8F;AAC9F,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,YAAY,GAAG,SAAS,CAYjF"}

package/dist/runtime/query/cancelled-before-start.js

@@ -1,29 +1,24 @@
-import { GENAI, NAMZU, agentRunSpanName, parentContext } from '../../telemetry/attributes.js';
+import { GENAI, NAMZU, agentTurnSpanName, parentContext } from '../../telemetry/attributes.js';
 import { getTracer } from '../../telemetry/runtime-accessors.js';
 import { createSystemMessage } from '../../types/message/index.js';
-import { resolveRunEventReplay } from '../../types/run/event-cursor.js';
+import { resolveSessionLogReplay, } from '../../types/session/log-cursor.js';
+import { SESSION_EVENT_TYPES } from '../../types/session/records.js';
 import { toErrorMessage } from '../../utils/error.js';
 import { ResultAssembler } from './result.js';
 /**
- * The run that was cancelled before it started.
+ * The turn that was cancelled before it started.
  *
- * Attachment materialization happens before `RunContext` exists, and a
- * cancellation observed there still belongs to a run: it must be recorded,
- * classified and reported like any other, without any of the authority-bearing
- * work — prompt contributions, host callbacks, tools, plugins, sandbox,
- * guardrails, advisors, providers — that a run which is allowed to proceed
- * would do next.
- *
- * An `async function*` rather than a plain async function, and reached with
- * `yield*`, because this path still emits and drains: the events it produces
- * must occupy exactly the positions in the stream they occupied when the code
- * lived inline, and only delegation preserves every yield point.
+ * Attachment materialization happens before the turn's context exists, and
+ * a cancellation observed there still belongs to a turn: it is recorded and
+ * reported like any other, without any of the authority-bearing work —
+ * prompt contributions, host callbacks, tools, plugins, sandbox, guardrails,
+ * advisors, providers — that a turn which is allowed to proceed would do next.
  */
 export async function* settlePreStartCancellation(params, prepared) {
-    const { ctx, runConfig, eventTranslator, executeUserInterruptHooks, selectedResumeState, queuedForThisRun, initialMessages, } = prepared;
-    // Attachment materialization happens before RunContext exists. Once it
+    const { ctx, turnConfig, eventTranslator, executeUserInterruptHooks, selectedResumeState, queuedForThisRun, initialMessages, historyIds, } = prepared;
+    // Attachment materialization happens before TurnContext exists. Once it
     // observes cancellation, do only the work required to leave an honest
-    // durable run: initialize the record, retain the unresolved references,
+    // durable turn: initialize the record, retain the unresolved references,
     // and settle through the ordinary cancellation classifier. Prompt
     // contributions/cache, host callbacks, tools, plugins, sandbox, guardrails,
     // advisors, and providers are all authority-bearing work and stay out.
@@ -40,7 +35,7 @@ export async function* settlePreStartCancellation(params, prepared) {
     }
     const cancelledPrompt = params.systemPrompt ?? '';
     const cancelledAssembler = new ResultAssembler({
-        runMgr: ctx.runMgr,
+        recorder: ctx.recorder,
         planManager: ctx.planManager,
         activityStore: ctx.activityStore,
         log: ctx.log,
@@ -48,60 +43,65 @@ export async function* settlePreStartCancellation(params, prepared) {
         drainPending: () => eventTranslator.drainPending(),
         signal: ctx.abortController.signal,
     });
-    const rootSpan = getTracer().startSpan(agentRunSpanName(params.agentName), {}, parentContext(params.parentSpan ?? selectedResumeState?.traceContext));
+    const rootSpan = getTracer().startSpan(agentTurnSpanName(params.agentName), {}, parentContext(params.parentSpan ?? selectedResumeState?.traceContext));
     rootSpan.setAttributes({
-        [NAMZU.RUN_ID]: ctx.runMgr.id,
+        [GENAI.CONVERSATION_ID]: ctx.sessionId,
+        [NAMZU.TURN_ID]: ctx.turnId,
+        ...(params.parentSessionId !== undefined && {
+            [NAMZU.SESSION_PARENT_ID]: params.parentSessionId,
+        }),
         [GENAI.AGENT_NAME]: params.agentName,
         [GENAI.AGENT_ID]: params.agentId,
-        [GENAI.REQUEST_MODEL]: runConfig.model,
+        [GENAI.REQUEST_MODEL]: turnConfig.model,
         [GENAI.SYSTEM]: params.provider.id,
     });
+    const push = (message, ids) => {
+        const messageId = ids.get(message);
+        ctx.recorder.pushMessage(message, messageId ? { messageId } : {});
+    };
     try {
-        await ctx.runMgr.init();
         if (selectedResumeState) {
-            ctx.runMgr.restoreUsage(selectedResumeState.tokenUsage, selectedResumeState.costInfo, selectedResumeState.currentIteration);
+            ctx.recorder.restoreUsage(selectedResumeState.tokenUsage, selectedResumeState.costInfo, selectedResumeState.currentIteration);
+            const restoredIds = selectedResumeState.messageIds ?? new Map();
             for (const message of selectedResumeState.messages)
-                ctx.runMgr.pushMessage(message);
-            for (const queued of queuedForThisRun)
-                ctx.runMgr.pushMessage(queued);
+                push(message, restoredIds);
         }
         else if (params.continuationMode) {
             for (const message of initialMessages)
-                ctx.runMgr.pushMessage(message);
+                push(message, historyIds);
         }
         else {
-            ctx.runMgr.pushMessage(createSystemMessage(cancelledPrompt, 'cache'));
+            ctx.recorder.pushMessage(createSystemMessage(cancelledPrompt, 'cache'), { transient: true });
             for (const message of initialMessages)
-                ctx.runMgr.pushMessage(message);
+                push(message, historyIds);
         }
         if (params.eventCursor) {
-            yield* catchUpFromCursor(ctx.runMgr, params.eventCursor, params.onEventReplay, params.claimFence, (error) => {
+            yield* catchUpFromCursor(ctx.recorder, params.eventCursor, params.onEventReplay, (error) => {
                 ctx.log.warn('Replay observer failed after attachment cancellation', {
                     'exception.message': toErrorMessage(error),
                 });
             });
         }
+        ctx.recorder.markRunning();
         if (selectedResumeState) {
-            await eventTranslator.emitEvent({
-                type: 'run_resuming',
-                runId: ctx.runId,
-                fromCheckpointId: selectedResumeState.checkpointId,
+            await eventTranslator.resumeTurn(selectedResumeState.checkpointId);
+            for (const queued of queuedForThisRun)
+                ctx.recorder.pushMessage(queued);
+        }
+        else {
+            await eventTranslator.beginTurn({
+                systemPrompt: cancelledPrompt,
+                ...(params.origin ? { origin: params.origin } : {}),
+                ...(params.abandonInterrupted ? { abandonInterrupted: true } : {}),
             });
-            yield* eventTranslator.drainPending();
         }
-        ctx.runMgr.markRunning();
-        await eventTranslator.emitEvent({
-            type: 'run_started',
-            runId: ctx.runId,
-            systemPrompt: cancelledPrompt,
-        });
         yield* eventTranslator.drainPending();
         ctx.abortController.signal.throwIfAborted();
     }
     catch (error) {
         // Attachment resolution has already observed the caller's abort. A
         // reconnect callback can still throw while replay is being reported,
-        // but it cannot replace that terminal cause or turn a cancelled run
+        // but it cannot replace that terminal cause or turn a cancelled turn
         // into an unpersisted rejection.
         const terminalError = ctx.abortController.signal.aborted
             ? ctx.abortController.signal.reason
@@ -121,22 +121,28 @@ export async function* settlePreStartCancellation(params, prepared) {
  * Yields NOTHING on a refusal. A partial catch-up is the failure this exists to
  * prevent: a consumer that receives some of the gap folds it into its state and
  * cannot tell the state is wrong, where one that receives an explicit
- * `unavailable` re-derives from the transcript and is right. The run continues
+ * `unavailable` re-derives from the log and is right. The turn continues
  * either way — a stale cursor belongs to the client, and must not be able to
  * stop the work.
+ *
+ * What is yielded is the live events the missed records stand for; the
+ * record-only types (messages, checkpoints, decisions) are in the log and not
+ * on the stream.
  */
-export async function* catchUpFromCursor(runMgr, cursor, onEventReplay, generation, onReplayObserverError) {
-    const missed = await runMgr.getRunStore().readEvents({ sinceSeq: cursor.sinceSeq });
-    const replay = resolveRunEventReplay(cursor, {
-        lastSeq: runMgr.lastEventSeq,
-        ...(generation !== undefined ? { generation } : {}),
-    }, missed);
+export async function* catchUpFromCursor(recorder, cursor, onEventReplay, onReplayObserverError) {
+    const head = await recorder.log.head();
+    const missed = [];
+    if (head && cursor.sinceSeq < head.pointer.seq) {
+        for await (const { record } of recorder.log.read()) {
+            if (record.seq > cursor.sinceSeq)
+                missed.push(record);
+        }
+    }
+    const replay = resolveSessionLogReplay(cursor, head, missed);
     if (onEventReplay) {
         try {
-            // A callback typed `void` may still be implemented with `async` in
-            // TypeScript. Observe that runtime Promise so a late rejection cannot
-            // become process-wide, but never await host code here: replay delivery
-            // and an already-cancelled run must not inherit observer liveness.
+            // Observe a Promise an `async` observer may return, without
+            // awaiting host code here.
             const settlement = onEventReplay(replay);
             void Promise.resolve(settlement).catch(onReplayObserverError);
         }
@@ -146,7 +152,18 @@ export async function* catchUpFromCursor(runMgr, cursor, onEventReplay, generati
     }
     if (replay.status !== 'replayed')
         return;
-    for (const event of replay.events)
-        yield event;
+    for (const record of replay.records) {
+        const event = liveEventOfRecord(record);
+        if (event)
+            yield event;
+    }
+}
+const LIVE_TYPES = new Set(SESSION_EVENT_TYPES);
+/** The live event a persisted-event record stands for; `undefined` for a record-only type. */
+export function liveEventOfRecord(record) {
+    if (!LIVE_TYPES.has(record.type))
+        return undefined;
+    const { v: _v, id: _id, ts: _ts, prev: _prev, prevText: _prevText, gen, ...payload } = record;
+    return { ...payload, generation: gen };
 }
 //# sourceMappingURL=cancelled-before-start.js.map

package/dist/runtime/query/cancelled-before-start.js.map

@@ -1 +1 @@
-{"version":3,"file":"cancelled-before-start.js","sourceRoot":"","sources":["../../../src/runtime/query/cancelled-before-start.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cancelled-before-start.js","sourceRoot":"","sources":["../../../src/runtime/query/cancelled-before-start.ts"],"names":[],"mappings":"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"}