@alexkroman1/aai 1.4.5 → 1.5.1

package/host/session-core.ts

@@ -0,0 +1,262 @@
+// Copyright 2026 the AAI authors. MIT license.
+// Unified session — owns reply lifecycle, conversation history, idle timeout,
+// and tool-step enforcement. Replaces session.ts + pipeline-session.ts.
+
+import type { AgentConfig, ExecuteTool } from "../sdk/_internal-types.ts";
+import { DEFAULT_IDLE_TIMEOUT_MS, DEFAULT_MAX_HISTORY } from "../sdk/constants.ts";
+import type { ClientEvent, ClientSink, SessionErrorCode } from "../sdk/protocol.ts";
+import type { Message } from "../sdk/types.ts";
+import type { Logger } from "./runtime-config.ts";
+import { consoleLogger } from "./runtime-config.ts";
+import type { Transport } from "./transports/types.ts";
+
+const REPLY_DONE_SLOW_THRESHOLD_MS = 50;
+
+type PendingTool = { callId: string; result: string };
+
+type ReplyState = {
+  currentReplyId: string | null;
+  pendingTools: PendingTool[];
+  toolCallCount: number;
+};
+
+export type SessionCoreOptions = {
+  id: string;
+  agent: string;
+  client: ClientSink;
+  agentConfig: AgentConfig;
+  executeTool: ExecuteTool;
+  transport: Transport;
+  logger?: Logger;
+  maxHistory?: number;
+};
+
+export type SessionCore = {
+  readonly id: string;
+  start(): Promise<void>;
+  stop(): Promise<void>;
+  // Inbound from client (decoded by ws-handler)
+  onAudio(bytes: Uint8Array): void;
+  onAudioReady(): void;
+  onCancel(): void;
+  onReset(): void;
+  onHistory(messages: readonly Message[]): void;
+  // Inbound from transport (spec §4.2)
+  onReplyStarted(replyId: string): void;
+  onReplyDone(): void;
+  onCancelled(): void;
+  onAudioChunk(bytes: Uint8Array): void;
+  onAudioDone(): void;
+  onUserTranscript(text: string): void;
+  onAgentTranscript(text: string, interrupted: boolean): void;
+  onToolCall(callId: string, name: string, args: Record<string, unknown>): void;
+  onError(code: SessionErrorCode, message: string): void;
+  onSpeechStarted(): void;
+  onSpeechStopped(): void;
+};
+
+export function createSessionCore(opts: SessionCoreOptions): SessionCore {
+  const log = opts.logger ?? consoleLogger;
+  const maxHistory = opts.maxHistory ?? DEFAULT_MAX_HISTORY;
+  const idleMs = (() => {
+    const raw = opts.agentConfig.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS;
+    return raw === 0 || !Number.isFinite(raw) ? 0 : raw;
+  })();
+
+  let reply: ReplyState = { currentReplyId: null, pendingTools: [], toolCallCount: 0 };
+  let history: Message[] = [];
+  let turnPromise: Promise<void> | null = null;
+  let idleTimer: NodeJS.Timeout | null = null;
+  let stopped = false;
+
+  function emit(event: ClientEvent): void {
+    opts.client.event(event);
+  }
+
+  function resetIdle(): void {
+    if (stopped || idleMs <= 0) return;
+    if (idleTimer) clearTimeout(idleTimer);
+    idleTimer = setTimeout(() => {
+      log.info("session idle timeout", { sid: opts.id });
+      emit({ type: "idle_timeout" });
+    }, idleMs);
+  }
+
+  function pushMessages(...msgs: Message[]): void {
+    history.push(...msgs);
+    if (maxHistory > 0 && history.length > maxHistory) {
+      history.splice(0, history.length - maxHistory);
+    }
+  }
+
+  function beginReply(replyId: string): void {
+    reply = { currentReplyId: replyId, pendingTools: [], toolCallCount: 0 };
+    turnPromise = null;
+  }
+
+  function cancelReply(): void {
+    reply = { currentReplyId: null, pendingTools: [], toolCallCount: 0 };
+  }
+
+  function flushReply(startMs: number, hadTurnPromise: boolean): void {
+    const stepsUsed = reply.toolCallCount;
+    if (stepsUsed > 0) log.info("Turn complete", { steps: stepsUsed, agent: opts.agent });
+    opts.client.playAudioDone();
+    emit({ type: "reply_done" });
+    reply.currentReplyId = null;
+    const durationMs = Date.now() - startMs;
+    if (durationMs >= REPLY_DONE_SLOW_THRESHOLD_MS) {
+      log.warn("slow reply_done dispatch", {
+        sid: opts.id,
+        agent: opts.agent,
+        durationMs,
+        hadTurnPromise,
+      });
+    }
+  }
+
+  return {
+    id: opts.id,
+
+    async start() {
+      resetIdle();
+      await opts.transport.start();
+    },
+
+    async stop() {
+      if (stopped) return;
+      stopped = true;
+      if (idleTimer) {
+        clearTimeout(idleTimer);
+        idleTimer = null;
+      }
+      if (turnPromise !== null) await turnPromise;
+      await opts.transport.stop();
+    },
+
+    // ─── Inbound from client ──────────────────────────────────────────────
+    onAudio(bytes) {
+      resetIdle();
+      opts.transport.sendUserAudio(bytes);
+    },
+    onAudioReady() {
+      // S2S greeting is automatic; pipeline transports may override via callbacks.
+    },
+    onCancel() {
+      opts.transport.cancelReply();
+      emit({ type: "cancelled" });
+    },
+    onReset() {
+      cancelReply();
+      history = [];
+      emit({ type: "reset" });
+    },
+    onHistory(messages) {
+      pushMessages(...messages);
+    },
+
+    // ─── Inbound from transport ───────────────────────────────────────────
+    onReplyStarted(replyId) {
+      beginReply(replyId);
+    },
+
+    onReplyDone() {
+      const startMs = Date.now();
+      const doneReplyId = reply.currentReplyId;
+      // Dedup duplicate reply.done events — once the reply is fully dispatched
+      // (or was never started) currentReplyId is null.
+      if (doneReplyId === null) {
+        log.debug("Dropping duplicate reply.done (no active reply)");
+        return;
+      }
+      const hadTurnPromise = turnPromise !== null;
+      const sendPending = () => {
+        if (reply.currentReplyId !== doneReplyId) {
+          reply.pendingTools = [];
+          return;
+        }
+        if (reply.pendingTools.length > 0) {
+          for (const tool of reply.pendingTools)
+            opts.transport.sendToolResult(tool.callId, tool.result);
+          reply.pendingTools = [];
+        } else {
+          flushReply(startMs, hadTurnPromise);
+        }
+      };
+      if (hadTurnPromise) void turnPromise?.then(sendPending);
+      else sendPending();
+    },
+
+    onCancelled() {
+      cancelReply();
+      emit({ type: "cancelled" });
+    },
+
+    onAudioChunk(bytes) {
+      opts.client.playAudioChunk(bytes);
+    },
+    onAudioDone() {
+      opts.client.playAudioDone();
+    },
+
+    onUserTranscript(text) {
+      emit({ type: "user_transcript", text });
+      pushMessages({ role: "user", content: text });
+    },
+    onAgentTranscript(text, interrupted) {
+      emit({ type: "agent_transcript", text });
+      if (!interrupted) pushMessages({ role: "assistant", content: text });
+    },
+
+    onToolCall(callId, name, args) {
+      emit({
+        type: "tool_call",
+        toolCallId: callId,
+        toolName: name,
+        args: args as Record<string, unknown>,
+      });
+      if (reply.currentReplyId === null) {
+        log.warn("tool_call with no active reply", { sid: opts.id, name });
+        return;
+      }
+      reply.toolCallCount++;
+      const maxSteps = opts.agentConfig.maxSteps;
+      if (maxSteps !== undefined && reply.toolCallCount > maxSteps) {
+        log.info("maxSteps exceeded; refusing tool call", {
+          toolCallCount: reply.toolCallCount,
+          maxSteps,
+        });
+        reply.pendingTools.push({
+          callId,
+          result: JSON.stringify({
+            error: "Maximum tool steps reached. Please respond to the user now.",
+          }),
+        });
+        emit({ type: "tool_call_done", toolCallId: callId, result: "{}" });
+        return;
+      }
+      const p = (async () => {
+        try {
+          const result = await opts.executeTool(name, args, opts.id, history);
+          reply.pendingTools.push({ callId, result });
+          emit({ type: "tool_call_done", toolCallId: callId, result });
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          reply.pendingTools.push({ callId, result: JSON.stringify({ error: message }) });
+          emit({ type: "tool_call_done", toolCallId: callId, result: message });
+        }
+      })();
+      turnPromise = (turnPromise ?? Promise.resolve()).then(() => p);
+    },
+
+    onError(code, message) {
+      emit({ type: "error", code, message });
+    },
+    onSpeechStarted() {
+      emit({ type: "speech_started" });
+    },
+    onSpeechStopped() {
+      emit({ type: "speech_stopped" });
+    },
+  };
+}

package/host/to-vercel-tools.test.ts

@@ -6,6 +6,7 @@ import { toVercelTools } from "./to-vercel-tools.ts";
 
 const schemas: ToolSchema[] = [
   {
+    type: "function",
     name: "get_weather",
     description: "Look up the weather.",
     parameters: {
@@ -166,7 +167,14 @@ describe("toVercelTools — message snapshot isolation", () => {
     };
 
     const tools = toVercelTools(
-      [{ name: "t", description: "", parameters: { type: "object", properties: {} } }],
+      [
+        {
+          type: "function",
+          name: "t",
+          description: "",
+          parameters: { type: "object", properties: {} },
+        },
+      ],
       {
         executeTool,
         sessionId: "s",