experimental-ash 0.2.0-alpha.2 → 0.2.0-alpha.21

package/dist/src/execution/workflow-steps.js

@@ -1,33 +1,40 @@
 import { getWritable } from "workflow";
-import { BundleKey, ChannelEmitterKey, ModeKey } from "../context/keys.js";
-import { runStep } from "../context/run-step.js";
-import { deserializeContext } from "../context/serialize.js";
+import { BundleKey, ModeKey } from "../context/keys.js";
+import { isStepDone } from "../harness/types.js";
 import { encodeMessageStreamEvent } from "../protocol/message.js";
 import { getCompiledRuntimeAgentBundle } from "../runtime/sessions/compiled-agent-cache.js";
 import { createExecutionNodeStep } from "./node-step.js";
 import { createSession, refreshSessionFromTurnAgent } from "./session.js";
+import { prepareStepContext, runStepWithChannelGuard } from "./step-context.js";
 import { createWorkflowRuntime } from "./workflow-runtime.js";
 /**
  * Runs one atomic harness step inside a durable `"use step"` boundary.
  *
  * Receives a serialized context (plain JSON) and deserializes it at the
- * top of the step so all seed keys (channel emitter, bundle, etc.) are
- * live instances. The deserialized bundle is already resolved to the
- * correct node (root or subagent) via the BundleKey codec.
+ * top of the step so all seed keys (channel, bundle, etc.) are live
+ * instances. The deserialized bundle is already resolved to the correct
+ * node (root or subagent) via the BundleKey codec.
+ *
+ * When `input` is defined, the delivery goes through the channel's
+ * {@link Channel.onDeliver} and the runtime's pending-input resolution
+ * before the harness sees it. Deliver-time auth from the
+ * {@link HookPayload} is applied to the context before the step runs.
  */
 export async function durableRunStep(serializedContext, session, input) {
     "use step";
-    const ctx = await deserializeContext(serializedContext);
-    const emitter = ctx.get(ChannelEmitterKey);
+    const prepared = await prepareStepContext({
+        delivery: input,
+        serializedRuntimeContext: serializedContext,
+        session,
+    });
+    const { channel, ctx, input: resolved } = prepared;
     const writable = getWritable();
     const writer = writable.getWriter();
-    const rawEmit = async (event) => {
-        await writer.write(encodeMessageStreamEvent(event));
-    };
     const emit = async (event) => {
-        await emitter.onEvent(event, rawEmit);
+        const toEmit = await channel.onEvent(event);
+        await writer.write(encodeMessageStreamEvent(toEmit));
     };
-    const stepResult = await runStep(ctx, session, async (enrichedSession) => {
+    const stepResult = await runStepWithChannelGuard(prepared, session, async (enrichedSession) => {
         const bundle = ctx.get(BundleKey);
         const mode = ctx.get(ModeKey);
         const refreshedSession = refreshSessionFromTurnAgent({
@@ -38,18 +45,15 @@ export async function durableRunStep(serializedContext, session, input) {
             turnAgent: bundle.turnAgent,
         });
         const step = createExecutionNodeStep({
-            channelEmitter: emitter,
             compiledArtifactsSource: bundle.compiledArtifactsSource,
             createRuntime: createWorkflowRuntime,
             emit,
             mode,
             node: bundle.graph.root,
         });
-        return await step(refreshedSession, input);
+        return await step(refreshedSession, resolved);
     });
-    if (stepResult.next !== null &&
-        typeof stepResult.next === "object" &&
-        "done" in stepResult.next) {
+    if (isStepDone(stepResult.next)) {
         await writer.close();
         return { action: "done", output: stepResult.next.output, session: stepResult.session };
     }
@@ -61,7 +65,7 @@ export async function durableRunStep(serializedContext, session, input) {
     return { action: "continue", session: stepResult.session };
 }
 /**
- * Creates the durable session state inside a step boundary before the
+ * Creates the durable harness session inside a step boundary before the
  * workflow enters its long-lived turn loop.
  *
  * The optional `nodeSelector` targets a specific node in the compiled
@@ -79,6 +83,7 @@ export async function createSessionStep(input) {
             thresholdPercent: bundle.resolvedAgent.config.compaction?.thresholdPercent,
         },
         continuationToken: input.continuationToken,
+        sessionId: input.sessionId,
         turnAgent: bundle.turnAgent,
     });
 }

package/dist/src/execution/workflow-steps.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-steps.js","sourceRoot":"","sources":["../../../src/execution/workflow-steps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,wBAAwB,EAAiC,MAAM,wBAAwB,CAAC;AAEjG,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAE1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,iBAA0C,EAC1C,OAAuB,EACvB,KAA4B;IAE5B,UAAU,CAAC;IAEX,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAE3C,MAAM,QAAQ,GAAG,WAAW,EAAc,CAAC;IAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,KAAK,EAAE,KAA+B,EAAiB,EAAE;QACvE,MAAM,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,KAAK,EAAE,KAA+B,EAAiB,EAAE;QACpE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE;QACvE,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,gBAAgB,GAAG,2BAA2B,CAAC;YACnD,mBAAmB,EAAE;gBACnB,gBAAgB,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB;aAC3E;YACD,OAAO,EAAE,eAAe;YACxB,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,uBAAuB,CAAC;YACnC,cAAc,EAAE,OAAO;YACvB,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;YACvD,aAAa,EAAE,qBAAqB;YACpC,IAAI;YACJ,IAAI;YACJ,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;SACxB,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IACE,UAAU,CAAC,IAAI,KAAK,IAAI;QACxB,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ;QACnC,MAAM,IAAI,UAAU,CAAC,IAAI,EACzB,CAAC;QACD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;IACzF,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QAC7B,MAAM,CAAC,WAAW,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;IACzD,CAAC;IAED,MAAM,CAAC,WAAW,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;AAC7D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAIvC;IACC,UAAU,CAAC;IAEX,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;QACjD,uBAAuB,EAAE,KAAK,CAAC,uBAAuB;QACtD,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC;QACnB,mBAAmB,EAAE;YACnB,gBAAgB,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB;SAC3E;QACD,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,SAAS,EAAE,MAAM,CAAC,SAAS;KAC5B,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"workflow-steps.js","sourceRoot":"","sources":["../../../src/execution/workflow-steps.ts"],"names":[],"mappings":"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"}

package/dist/src/harness/emission.d.ts

@@ -1,16 +1,18 @@
-import type { LanguageModelUsage } from "ai";
+import type { TextStreamPart, ToolSet } from "ai";
 import type { AssistantStepFinishReason, RuntimeIdentity } from "../protocol/message.js";
 import type { RunMode } from "../run-mode.js";
+import type { JsonObject } from "../runtime/json.js";
 import type { HarnessEmitFn, HarnessSession, StepInput } from "./types.js";
 /**
  * Tracks emission lifecycle state across harness step invocations.
  *
- * Persisted on `session.state` so the state survives when the durable
+ * Persisted on `session.internal` so the state survives when the durable
  * workflow runtime recreates the harness at each `"use step"` boundary.
  */
 export interface HarnessEmissionState {
-    readonly runStarted: boolean;
+    readonly sessionStarted: boolean;
     readonly sequence: number;
+    readonly stepIndex: number;
     readonly turnId: string;
 }
 /**
@@ -22,37 +24,44 @@ export declare function getHarnessEmissionState(session: HarnessSession): Harnes
  */
 export declare function setHarnessEmissionState(session: HarnessSession, state: HarnessEmissionState): HarnessSession;
 /**
- * Emits `run.started` (once), `turn.started`, and `message.received` at the
+ * Emits `session.started` (once), `turn.started`, and `message.received` at the
  * beginning of a new turn. Returns updated emission state.
  */
 export declare function emitTurnPreamble(emitFn: HarnessEmitFn, input: StepInput, state: HarnessEmissionState, runtimeIdentity?: RuntimeIdentity): Promise<HarnessEmissionState>;
 /**
- * Emits `thinking.completed` and `message.completed` for one step output.
+ * Emits `step.started` for one model call.
  */
-export declare function emitCompletedStepOutput(emitFn: HarnessEmitFn, state: HarnessEmissionState, input: {
-    readonly finishReason: AssistantStepFinishReason;
-    readonly message: string | null;
-    readonly reasoning: string | undefined;
+export declare function emitStepStarted(emitFn: HarnessEmitFn, state: HarnessEmissionState): Promise<void>;
+/**
+ * Emits the failure cascade for one model-call error.
+ */
+export declare function emitFailedStep(emitFn: HarnessEmitFn, state: HarnessEmissionState, input: {
+    readonly code: string;
+    readonly details?: JsonObject;
+    readonly message: string;
+    readonly sessionId: string;
 }): Promise<void>;
 /**
- * Emits `turn.completed` and either `session.waiting` or `run.completed`.
+ * Returns updated emission state for the next step in the current turn.
+ */
+export declare function advanceStep(state: HarnessEmissionState): HarnessEmissionState;
+/**
+ * Emits `turn.completed` and either `session.waiting` or `session.completed`.
  * Returns updated emission state with an incremented sequence.
  */
-export declare function emitTurnEpilogue(emitFn: HarnessEmitFn, state: HarnessEmissionState, mode: RunMode, usage?: LanguageModelUsage): Promise<HarnessEmissionState>;
-/**
- * Emits `actions.requested` followed by matching `action.result` events for
- * tool calls that were executed by the runtime.
- */
-export declare function emitToolCallActionsAndResults(emitFn: HarnessEmitFn, state: HarnessEmissionState, input: {
-    readonly toolCalls: ReadonlyArray<{
-        readonly input: unknown;
-        readonly toolCallId: string;
-        readonly toolName: string;
-    }>;
-    readonly toolResults: ReadonlyArray<{
-        readonly output: unknown;
-        readonly toolCallId: string;
-        readonly toolName: string;
-    }>;
-}): Promise<void>;
+export declare function emitTurnEpilogue(emitFn: HarnessEmitFn, state: HarnessEmissionState, mode: RunMode): Promise<HarnessEmissionState>;
+/**
+ * Maps an AI SDK finish reason string to the Ash-owned
+ * {@link AssistantStepFinishReason} union. Unknown values become `"other"`.
+ */
+export declare function normalizeAssistantStepFinishReason(value: string | undefined): AssistantStepFinishReason;
+/**
+ * Consumes the AI SDK `fullStream` and emits only real-time text and
+ * reasoning events.
+ *
+ * Tool-call, tool-result, and tool-approval-request events are intentionally
+ * ignored — they are emitted by `emitStepActions` from the `onStepFinish`
+ * callback instead, ensuring a stable batch order.
+ */
+export declare function emitStreamContent(emitFn: HarnessEmitFn, state: HarnessEmissionState, fullStream: AsyncIterable<TextStreamPart<ToolSet>>): Promise<void>;
 //# sourceMappingURL=emission.d.ts.map

package/dist/src/harness/emission.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emission.d.ts","sourceRoot":"","sources":["../../../src/harness/emission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAE7C,OAAO,KAAK,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAazF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE3E;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAUD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc,GAAG,oBAAoB,CAKrF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,oBAAoB,GAC1B,cAAc,CAQhB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,oBAAoB,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,oBAAoB,CAAC,CAwB/B;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE;IACL,QAAQ,CAAC,YAAY,EAAE,yBAAyB,CAAC;IACjD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC,GACA,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,OAAO,EACb,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,oBAAoB,CAAC,CAqB/B;AAgDD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE;IACL,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;QAChC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;KAC3B,CAAC,CAAC;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;QAClC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;KAC3B,CAAC,CAAC;CACJ,GACA,OAAO,CAAC,IAAI,CAAC,CAqCf"}
+{"version":3,"file":"emission.d.ts","sourceRoot":"","sources":["../../../src/harness/emission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAElD,OAAO,KAAK,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAezF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAM3E;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAWD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc,GAAG,oBAAoB,CAKrF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,oBAAoB,GAC1B,cAAc,CAQhB;AAMD;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,oBAAoB,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,oBAAoB,CAAC,CAyB/B;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE;IACL,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,GACA,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,oBAAoB,CAK7E;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,oBAAoB,CAAC,CAoB/B;AAMD;;;GAGG;AACH,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,yBAAyB,CAW3B;AAMD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,UAAU,EAAE,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC,CA2Df"}

package/dist/src/harness/emission.js

@@ -1,15 +1,16 @@
-import { createActionResultEvent, createActionsRequestedEvent, createMessageCompletedEvent, createMessageReceivedEvent, createRunCompletedEvent, createRunStartedEvent, createSessionWaitingEvent, createThinkingCompletedEvent, createTurnCompletedEvent, createTurnStartedEvent, } from "../protocol/message.js";
+import { createMessageCompletedEvent, createMessageReceivedEvent, createReasoningCompletedEvent, createSessionCompletedEvent, createSessionFailedEvent, createSessionStartedEvent, createSessionWaitingEvent, createStepFailedEvent, createStepStartedEvent, createTurnCompletedEvent, createTurnFailedEvent, createTurnStartedEvent, } from "../protocol/message.js";
 const HARNESS_EMISSION_STATE_KEY = "ash.harness.emission";
 const DEFAULT_EMISSION_STATE = {
-    runStarted: false,
+    sessionStarted: false,
     sequence: 0,
+    stepIndex: 0,
     turnId: "",
 };
 /**
  * Reads the emission state from the session, returning defaults when absent.
  */
 export function getHarnessEmissionState(session) {
-    const emissionState = session.state?.[HARNESS_EMISSION_STATE_KEY];
+    const emissionState = session.internal?.[HARNESS_EMISSION_STATE_KEY];
     return emissionState ?? DEFAULT_EMISSION_STATE;
 }
 /**
@@ -18,20 +19,23 @@ export function getHarnessEmissionState(session) {
 export function setHarnessEmissionState(session, state) {
     return {
         ...session,
-        state: {
-            ...session.state,
+        internal: {
+            ...session.internal,
             [HARNESS_EMISSION_STATE_KEY]: state,
         },
     };
 }
+// ---------------------------------------------------------------------------
+// Turn lifecycle helpers
+// ---------------------------------------------------------------------------
 /**
- * Emits `run.started` (once), `turn.started`, and `message.received` at the
+ * Emits `session.started` (once), `turn.started`, and `message.received` at the
  * beginning of a new turn. Returns updated emission state.
  */
 export async function emitTurnPreamble(emitFn, input, state, runtimeIdentity) {
     const turnId = `turn_${state.sequence}`;
-    if (!state.runStarted) {
-        await emitFn(createRunStartedEvent({ runtime: runtimeIdentity }));
+    if (!state.sessionStarted) {
+        await emitFn(createSessionStartedEvent({ runtime: runtimeIdentity }));
     }
     await emitFn(createTurnStartedEvent({ sequence: state.sequence, turnId }));
     if (input.message !== undefined) {
@@ -42,114 +46,156 @@ export async function emitTurnPreamble(emitFn, input, state, runtimeIdentity) {
         }));
     }
     return {
-        runStarted: true,
+        sessionStarted: true,
         sequence: state.sequence,
+        stepIndex: 0,
         turnId,
     };
 }
 /**
- * Emits `thinking.completed` and `message.completed` for one step output.
+ * Emits `step.started` for one model call.
  */
-export async function emitCompletedStepOutput(emitFn, state, input) {
-    if (input.reasoning !== undefined && input.reasoning.trim().length > 0) {
-        await emitFn(createThinkingCompletedEvent({
-            sequence: state.sequence,
-            text: input.reasoning,
-            turnId: state.turnId,
-        }));
-    }
-    if (input.message !== null) {
-        await emitFn(createMessageCompletedEvent({
-            finishReason: input.finishReason,
-            message: input.message,
-            sequence: state.sequence,
-            turnId: state.turnId,
-        }));
-    }
+export async function emitStepStarted(emitFn, state) {
+    await emitFn(createStepStartedEvent({
+        sequence: state.sequence,
+        stepIndex: state.stepIndex,
+        turnId: state.turnId,
+    }));
+}
+/**
+ * Emits the failure cascade for one model-call error.
+ */
+export async function emitFailedStep(emitFn, state, input) {
+    await emitFn(createStepFailedEvent({
+        code: input.code,
+        details: input.details,
+        message: input.message,
+        sequence: state.sequence,
+        stepIndex: state.stepIndex,
+        turnId: state.turnId,
+    }));
+    await emitFn(createTurnFailedEvent({
+        code: input.code,
+        details: input.details,
+        message: input.message,
+        sequence: state.sequence,
+        turnId: state.turnId,
+    }));
+    await emitFn(createSessionFailedEvent({
+        code: input.code,
+        details: input.details,
+        message: input.message,
+        sessionId: input.sessionId,
+    }));
+}
+/**
+ * Returns updated emission state for the next step in the current turn.
+ */
+export function advanceStep(state) {
+    return {
+        ...state,
+        stepIndex: state.stepIndex + 1,
+    };
 }
 /**
- * Emits `turn.completed` and either `session.waiting` or `run.completed`.
+ * Emits `turn.completed` and either `session.waiting` or `session.completed`.
  * Returns updated emission state with an incremented sequence.
  */
-export async function emitTurnEpilogue(emitFn, state, mode, usage) {
+export async function emitTurnEpilogue(emitFn, state, mode) {
     await emitFn(createTurnCompletedEvent({
         sequence: state.sequence,
-        status: "completed",
         turnId: state.turnId,
-        usage: extractTurnCompletedUsage(usage),
     }));
     if (mode === "conversation") {
         await emitFn(createSessionWaitingEvent());
     }
     else {
-        await emitFn(createRunCompletedEvent());
+        await emitFn(createSessionCompletedEvent());
     }
     return {
-        runStarted: state.runStarted,
+        sessionStarted: state.sessionStarted,
         sequence: state.sequence + 1,
+        stepIndex: 0,
         turnId: "",
     };
 }
+// ---------------------------------------------------------------------------
+// Shared helpers
+// ---------------------------------------------------------------------------
 /**
- * Projects the AI SDK's `LanguageModelUsage` into the flat `turn.completed`
- * event usage shape, carrying input/output totals plus cache-read/write
- * breakdowns. Returns `undefined` when the SDK reports no usage at all.
+ * Maps an AI SDK finish reason string to the Ash-owned
+ * {@link AssistantStepFinishReason} union. Unknown values become `"other"`.
  */
-function extractTurnCompletedUsage(usage) {
-    if (usage === undefined) {
-        return undefined;
-    }
-    const inputTokens = usage.inputTokens;
-    const outputTokens = usage.outputTokens;
-    const cacheReadTokens = usage.inputTokenDetails?.cacheReadTokens;
-    const cacheWriteTokens = usage.inputTokenDetails?.cacheWriteTokens;
-    if (inputTokens === undefined &&
-        outputTokens === undefined &&
-        cacheReadTokens === undefined &&
-        cacheWriteTokens === undefined) {
-        return undefined;
+export function normalizeAssistantStepFinishReason(value) {
+    switch (value) {
+        case "content-filter":
+        case "error":
+        case "length":
+        case "stop":
+        case "tool-calls":
+            return value;
+        default:
+            return "other";
     }
-    const result = {};
-    if (inputTokens !== undefined)
-        result.inputTokens = inputTokens;
-    if (outputTokens !== undefined)
-        result.outputTokens = outputTokens;
-    if (cacheReadTokens !== undefined)
-        result.cacheReadTokens = cacheReadTokens;
-    if (cacheWriteTokens !== undefined)
-        result.cacheWriteTokens = cacheWriteTokens;
-    return result;
 }
+// ---------------------------------------------------------------------------
+// Stream content emission
+// ---------------------------------------------------------------------------
 /**
- * Emits `actions.requested` followed by matching `action.result` events for
- * tool calls that were executed by the runtime.
+ * Consumes the AI SDK `fullStream` and emits only real-time text and
+ * reasoning events.
+ *
+ * Tool-call, tool-result, and tool-approval-request events are intentionally
+ * ignored — they are emitted by `emitStepActions` from the `onStepFinish`
+ * callback instead, ensuring a stable batch order.
  */
-export async function emitToolCallActionsAndResults(emitFn, state, input) {
-    const toolCallIds = new Set(input.toolCalls.map((call) => call.toolCallId));
-    await emitFn(createActionsRequestedEvent({
-        actions: input.toolCalls.map((call) => ({
-            callId: call.toolCallId,
-            input: call.input,
-            kind: "tool-call",
-            toolName: call.toolName,
-        })),
-        sequence: state.sequence,
-        turnId: state.turnId,
-    }));
-    for (const toolResult of input.toolResults) {
-        if (!toolCallIds.has(toolResult.toolCallId)) {
-            continue;
+export async function emitStreamContent(emitFn, state, fullStream) {
+    let currentReasoning = "";
+    let currentMessage = "";
+    let finishReason = "stop";
+    for await (const part of fullStream) {
+        switch (part.type) {
+            case "reasoning-delta":
+                currentReasoning += part.text;
+                break;
+            case "text-delta":
+                // Flush accumulated reasoning before text begins.
+                if (currentReasoning.trim().length > 0) {
+                    await emitFn(createReasoningCompletedEvent({
+                        reasoning: currentReasoning,
+                        sequence: state.sequence,
+                        stepIndex: state.stepIndex,
+                        turnId: state.turnId,
+                    }));
+                    currentReasoning = "";
+                }
+                currentMessage += part.text;
+                break;
+            case "finish-step":
+                finishReason = normalizeAssistantStepFinishReason(part.finishReason);
+                break;
+            case "error":
+                throw part.error instanceof Error ? part.error : new Error(String(part.error));
+            default:
+                break;
         }
-        await emitFn(createActionResultEvent({
-            result: {
-                callId: toolResult.toolCallId,
-                kind: "tool-result",
-                output: typeof toolResult.output === "string"
-                    ? toolResult.output
-                    : JSON.stringify(toolResult.output),
-                toolName: toolResult.toolName,
-            },
+    }
+    // Flush remaining reasoning.
+    if (currentReasoning.trim().length > 0) {
+        await emitFn(createReasoningCompletedEvent({
+            reasoning: currentReasoning,
+            sequence: state.sequence,
+            stepIndex: state.stepIndex,
+            turnId: state.turnId,
+        }));
+    }
+    // Flush remaining text.
+    if (currentMessage.length > 0) {
+        await emitFn(createMessageCompletedEvent({
+            finishReason,
+            message: currentMessage,
             sequence: state.sequence,
+            stepIndex: state.stepIndex,
             turnId: state.turnId,
         }));
     }

package/dist/src/harness/emission.js.map

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

package/dist/src/harness/execute-tool.d.ts

@@ -0,0 +1,52 @@
+import type { NeedsApprovalContext } from "../public/definitions/tool.js";
+import { type JsonValue } from "../runtime/json.js";
+import type { StandardSchemaValidator } from "../runtime/standard-schema.js";
+/**
+ * Unified harness-owned tool definition.
+ *
+ * Carries everything the harness needs per tool: metadata for the model
+ * (name, description, schema), an optional execute function, input
+ * validation, and approval gates. The execution layer resolves one of
+ * these from each registry entry and hands the full set to the harness
+ * in one shot.
+ *
+ * Session lifecycle hooks (e.g. compaction) are split off by the
+ * execution layer and passed to the harness separately.
+ *
+ * Tools without `execute` are client-side or provider-managed — the
+ * harness surfaces them to the model but does not execute them locally.
+ */
+export interface HarnessToolDefinition {
+    readonly description: string;
+    readonly execute?: (input: unknown) => Promise<unknown> | unknown;
+    readonly inputSchema: JsonValue;
+    readonly inputValidator?: StandardSchemaValidator;
+    readonly name: string;
+    readonly needsApproval?: (ctx: NeedsApprovalContext) => boolean;
+}
+/**
+ * Result of executing one authored tool through the harness.
+ */
+export type ToolExecutionResult = {
+    readonly ok: false;
+    readonly code: string;
+    readonly message: string;
+} | {
+    readonly ok: true;
+    readonly output: JsonValue;
+};
+/**
+ * Executes one authored tool call through the harness-owned pipeline.
+ *
+ * Validates input (when an {@link HarnessToolDefinition.inputValidator} is
+ * present), invokes the authored `execute` function, and validates that the
+ * returned value is JSON-serializable.
+ *
+ * The unified Ash context is already active when this function is called
+ * (the caller runs inside the execution layer's ALS scope), so authored code
+ * can access `getSession()`, `getSandbox()`, etc. directly.
+ */
+export declare function executeAuthoredTool(definition: HarnessToolDefinition & {
+    readonly execute: NonNullable<HarnessToolDefinition["execute"]>;
+}, input: unknown): Promise<ToolExecutionResult>;
+//# sourceMappingURL=execute-tool.d.ts.map

package/dist/src/harness/execute-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"execute-tool.d.ts","sourceRoot":"","sources":["../../../src/harness/execute-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAM7E;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAClE,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,OAAO,CAAC;CACjE;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAC3B;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACvE;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAA;CAAE,CAAC;AAEtD;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,qBAAqB,GAAG;IAClC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;CACjE,EACD,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,mBAAmB,CAAC,CA8C9B"}