broapp 0.4.4 → 0.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "broapp",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "type": "module",
   "description": "Build tooling and runtime for local applications made of a Bun host, a browser UI, and a Brobridge connection between them",
   "license": "MIT",

package/src/ai/host/create-ai.ts

@@ -39,6 +39,8 @@ export interface RunEndDetail {
   /** Tool round trips the turn made. */
   readonly steps: number;
   readonly ms: number;
+  /** The model the turn was sent to; absent when the turn ended before one was resolved. */
+  readonly modelId?: string;
 }
 
 /**
@@ -165,6 +167,13 @@ export interface CreateAiOptions {
    * reason to fail it.
    */
   readonly onContext?: (runId: string, delivered: DeliveredContext) => void;
+  /**
+   * Called after each completed model step of a turn, with the tokens its
+   * completed steps have used so far: what a running turn has cost, before
+   * `onRunEnd` says what it cost in all. A hook that throws is logged and
+   * ignored, like the others.
+   */
+  readonly onUsageSoFar?: (runId: string, soFar: { inputTokens: number; outputTokens: number }) => void;
 }
 
 /**
@@ -334,6 +343,7 @@ export function createAi(options: CreateAiOptions): Ai {
     approvals,
     ...(options.onRunEnd === undefined ? {} : { onRunEnd: options.onRunEnd }),
     ...(options.onContext === undefined ? {} : { onContext: options.onContext }),
+    ...(options.onUsageSoFar === undefined ? {} : { onUsageSoFar: options.onUsageSoFar }),
     transcripts: {
       save: (runId, messages) => {
         threadStore().saveTranscript(runId, messages);

package/src/ai/host/run.ts

@@ -75,6 +75,13 @@ export interface RunDeps {
   ) => void;
   /** Called once per turn with what the model is about to be given. */
   readonly onContext?: (runId: string, delivered: DeliveredContext) => void;
+  /**
+   * Called after each model step completes, with what the turn's completed
+   * steps have used so far. Not the SDK's `onStepEnd`, which this layer
+   * already hands to `streamText`: this is the turn's running subtotal, for
+   * somebody who wants to say what a turn has cost before it ends.
+   */
+  readonly onUsageSoFar?: (runId: string, soFar: { inputTokens: number; outputTokens: number }) => void;
   /**
    * The turn transcripts. Absent, every history turn is text and nothing is
    * written, which is exactly the layer before transcripts existed.
@@ -95,6 +102,8 @@ interface TurnTally {
   stepsEnded: number;
   stepInput: number;
   stepOutput: number;
+  /** The model the turn was sent to, once it is resolved. */
+  modelId?: string;
 }
 
 /**
@@ -798,6 +807,7 @@ export async function runChat(
       steps: tally.steps,
       ms: Date.now() - started,
       ...(tally.usage === undefined ? {} : { usage: tally.usage }),
+      ...(tally.modelId === undefined ? {} : { modelId: tally.modelId }),
     };
     safely(deps.logger, 'onRunEnd', () =>
       onRunEnd(params.runId, status, params.message.slice(0, SUMMARY_CHARS), detail),
@@ -860,6 +870,9 @@ async function runTurn(
   // after the provider and key checks, so the vision check below and the model
   // instance built later both follow it without a second code path.
   const resolved = await deps.registry.resolve({ modelId: params.modelId });
+  // Known here and nowhere later: a listener writing down what the turn used
+  // is told which model used it, not left to guess from settings since changed.
+  tally.modelId = resolved.modelId;
 
   // Both checks come before anything is emitted, so a turn that cannot carry
   // its images fails as a whole rather than half-answering.
@@ -930,6 +943,11 @@ async function runTurn(
       tally.stepsEnded += 1;
       tally.stepInput += step.usage.inputTokens ?? 0;
       tally.stepOutput += step.usage.outputTokens ?? 0;
+      const onUsageSoFar = deps.onUsageSoFar;
+      if (onUsageSoFar !== undefined) {
+        const soFar = { inputTokens: tally.stepInput, outputTokens: tally.stepOutput };
+        safely(deps.logger, 'onUsageSoFar', () => onUsageSoFar(params.runId, soFar));
+      }
     },
   });