@happyvertical/smrt-chat 0.53.3 → 0.53.4

package/AGENTS.md

@@ -142,22 +142,22 @@ always waits. Details: [`docs/assistant-dock.md`](../../docs/assistant-dock.md).
 
 ## AssistantDock (#2904)
 
-`AssistantDock` (`svelte/components/assistant/`, exported from `./svelte`) is a
-shell-mounted, route-aware assistant surface: it discovers currently-mounted
-`DataSurfaceDescriptor`s from a host-supplied `DataSurfaceRegistry`
-(`@happyvertical/smrt-ui/data-surface`) and fails closed to plain chat when
-none are mounted. Action proposals flow through
-`normalizeDataSurfaceActionRequest` → a host-supplied `AssistantActionClient`
-(preview/apply against a server-hosted `DataSurfaceActionAdapter`, not through
-the `data-surface-bridge.ts` live-collaboration command channel) →
-`ToolCallDisplay`'s additive `actionResult` rendering. `AssistantTransport`
-(`assistant-transport.ts`) is a narrower, separate contract from
-`ChatClientBackend` (`client.ts`): `ChatThread`/`ChatMessage` only expose
-generated `list`/`get` REST (`api: { include: ['list', 'get'] }`,
-`models/ChatThread.ts:16`, `models/ChatMessage.ts:26`), so writes need a host-
-supplied `writeEndpoint`. See [`docs/assistant-dock.md`](../../docs/assistant-dock.md)
-for the full design, the anytown `PortalChatTool.svelte` polling/stale-send
-reconnaissance, and open gaps.
+`AssistantDock` (`svelte/components/assistant/`, exported from `./svelte`)
+uses a host `DataSurfaceRegistry`'s mounted descriptors (none: plain chat).
+Actions: `normalizeDataSurfaceActionRequest` → `AssistantActionClient`
+(preview/apply over a server `DataSurfaceActionAdapter`, not the
+`data-surface-bridge.ts` channel). Generated `ChatThread`/`ChatMessage`
+`list`/`get` are tenant- not member-scoped; the dock never calls them.
+
+**Server routes (#3368).** `./sveltekit` `mountAssistantRoutes({ ai, ... })`
+serves the dock from one `[...path]` route; `createAssistantHttpTransport`
+and `createAssistantHttpActionClient` (`./svelte`) are its browser half.
+Principal from `event.locals` (`user.id`, `user.profileId`, `tenantId`) or
+`resolvePrincipal`; threads are served only from the actor's keyed assistant
+session room in that tenant (else 404); `allowedTools` is fail-closed;
+`ai` is injected, never read from env. `sendMessage`'s `clientRequestId`
+makes the row id a UUIDv5 (`clientRequestMessageId`): the PK is the retry
+reservation. Details: [`docs/assistant-dock.md`](../../docs/assistant-dock.md).
 
 ## Gotchas
 

package/README.md

@@ -260,6 +260,21 @@ waiting | done | failed | cancelled`), with `pauseRun` / `continueRun`,
 `matchesToolAllowList` is exported browser-safe. Full guide:
 [`docs/assistant-dock.md`](../../docs/assistant-dock.md).
 
+The server side mounts in one route file. The principal comes from
+`event.locals` (`@happyvertical/smrt-users/sveltekit`); threads are scoped to
+the caller's own assistant session in the active tenant; tools are
+fail-closed (`allowedTools`, absent means none):
+
+```ts
+// src/routes/api/assistant/[...path]/+server.ts
+import { mountAssistantRoutes } from '@happyvertical/smrt-chat/sveltekit';
+export const { GET, POST } = mountAssistantRoutes({ ai: assistantAI });
+```
+
+In the page, `createAssistantHttpTransport({ endpoint: '/api/assistant' })`
+is the dock's `transport`, and `createAssistantHttpActionClient` its
+`actionClient` when the route is given `actions: { adapter }`.
+
 ## API
 
 ### Models

package/dist/assistant-turn.d.ts

@@ -59,6 +59,12 @@ export interface AssistantTurnContinuation {
     tokens?: number;
     /** `Date.now()` when the turn started (for `maxTurnMs`). Absent: `createdAt`. */
     startedAt?: number;
+    /**
+     * The message that started the turn (`AssistantTurnOptions.originMessageId`),
+     * kept server-side so a resume restores it from here, never from the
+     * request.
+     */
+    originMessageId?: string;
 }
 /**
  * Where suspended turns wait. `take` is single-use: it returns the
@@ -69,7 +75,24 @@ export interface AssistantTurnContinuation {
 export interface AssistantContinuationStore {
     save(key: string, continuation: AssistantTurnContinuation): Promise<void>;
     take(key: string, id: string): Promise<AssistantTurnContinuation | null>;
+    /**
+     * Whether `id` is still waiting under `key` (present and unexpired, or
+     * claimed by a resume that is still activating), without consuming it.
+     * Optional; both built-in stores implement it.
+     */
+    has?(key: string, id: string): Promise<boolean>;
+    /**
+     * Forget a continuation `take` returned. The built-in stores' `take`
+     * CLAIMS the entry (no second `take` can return it, and `has` stays true)
+     * instead of deleting it, so a resume is never invisible between taking
+     * its continuation and recording that it runs; the runner calls `release`
+     * once that is recorded. An unreleased claim expires after
+     * {@link CONTINUATION_CLAIM_TTL_MS}. Optional.
+     */
+    release?(key: string, id: string): Promise<void>;
 }
+/** How long a claimed (taken, unreleased) continuation still counts. */
+export declare const CONTINUATION_CLAIM_TTL_MS: number;
 /** In-memory store, for tests and single-process demos. */
 export declare function createMemoryContinuationStore(options?: {
     ttlMs?: number;
@@ -135,6 +158,29 @@ export interface AssistantTurnOptions<M = Record<string, unknown>> {
         continuationId: string;
         results: ClientToolResultInput[];
     };
+    /**
+     * The message that started this turn (e.g. the user's send). Every reply
+     * the turn authors links to it (`replyToMessageId`), and a suspension keeps
+     * it with the continuation. Ignored on resume: the consumed continuation's
+     * value is used instead.
+     */
+    originMessageId?: string;
+    /**
+     * The turn's own lifecycle, reported (and awaited) by the runner at the
+     * moment each fact becomes true, whether or not anyone still reads the
+     * events: `running` when a fresh turn starts or a resume has consumed its
+     * continuation, `suspended` once the continuation is stored (before its
+     * `client_tool_calls` event), and `completed` / `cancelled` / `failed`
+     * when the leg ends (`completed` after the reply is stored). A throw is
+     * logged and never breaks the turn, except for a resume's `running`: when
+     * that report throws or returns `false` (not recorded), the leg stops
+     * before any model or tool call with `resume_not_recorded`, and its
+     * continuation stays claimed (claimable again after
+     * {@link CONTINUATION_CLAIM_TTL_MS}). Not called for a resume whose
+     * continuation is missing, foreign or expired. Resolve `false` (or throw)
+     * for "not recorded"; any other value counts as recorded.
+     */
+    onState?: (state: AssistantTurnState) => unknown;
     tools?: ManifestTool[];
     /** Server tools, narrowed to `principal.allowedTools`. */
     extraTools?: PrincipalTool[];
@@ -188,11 +234,25 @@ export interface AssistantTurnOptions<M = Record<string, unknown>> {
     onError?: AssistantTurnErrorLogger;
     now?: () => number;
 }
+/**
+ * One lifecycle fact of a turn leg, for {@link AssistantTurnOptions.onState}.
+ * `resumedFrom` is the continuation this leg consumed (`null` for the first
+ * leg), so a recorder can refuse a write from a leg that is no longer
+ * current. `continuationId` is set for `suspended`.
+ */
+export interface AssistantTurnState {
+    state: 'running' | 'suspended' | 'completed' | 'cancelled' | 'failed';
+    originMessageId?: string;
+    resumedFrom: string | null;
+    continuationId?: string;
+}
 /** What {@link runAssistantTurn} returns when its generator completes. */
 export interface AssistantTurnResult {
     stoppedReason: AssistantTurnStopReason | 'client_tools' | 'error';
     content: string;
     loop?: ToolLoopResult;
+    /** The turn's origin message (from the continuation on a resume). */
+    originMessageId?: string;
 }
 /** What the browser is told when a turn fails unexpectedly. */
 export declare const ASSISTANT_TURN_GENERIC_ERROR = "The assistant ran into a problem. Please try again.";
@@ -232,5 +292,10 @@ export declare function createAssistantTurnResponse(events: AsyncGenerator<Assis
     headers?: Record<string, string>;
     /** Server-side log for a failure while pulling (default `console.error`). */
     onError?: AssistantTurnErrorLogger;
+    /**
+     * Called synchronously when the reader cancels the body (a client that
+     * went away), before the generator is closed — e.g. to abort the turn.
+     */
+    onCancel?: () => void;
 }): Response;
 //# sourceMappingURL=assistant-turn.d.ts.map

package/dist/assistant-turn.d.ts.map

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

package/dist/chunks/{ChatService-jJi2JJJi.js → ChatService-Dl5tsK_F.js}

@@ -1,7 +1,7 @@
-import { ObjectRegistry, SmrtCollection, SmrtObject, crossPackageRef, field, foreignKey, smrt } from "@happyvertical/smrt-core";
+import { ObjectRegistry, SmrtCollection, SmrtObject, crossPackageRef, field, foreignKey, isPostgresDatabase, smrt } from "@happyvertical/smrt-core";
 import { TenantScoped, tenantId } from "@happyvertical/smrt-tenancy";
-import { ProfileCollection, resolveAgentProfileId } from "@happyvertical/smrt-profiles";
 import { createHash } from "node:crypto";
+import { ProfileCollection, resolveAgentProfileId } from "@happyvertical/smrt-profiles";
 //#region \0rolldown/runtime.js
 var __defProp$7 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -1231,9 +1231,37 @@ var VoiceSessionCollection = class extends SmrtCollection {
 //#endregion
 //#region src/services/ChatService.ts
 var ChatService_exports = /* @__PURE__ */ __exportAll({
+	ChatClientRequestConflictError: () => ChatClientRequestConflictError,
 	ChatService: () => ChatService,
+	clientRequestMessageId: () => clientRequestMessageId,
 	sendAgentReply: () => sendAgentReply
 });
+var CLIENT_REQUEST_NAMESPACE = "b7e2f1c4-5a3d-4e8f-9b6a-2c1d0e9f8a7b";
+function clientRequestMessageId(params) {
+	const namespace = Buffer.from(CLIENT_REQUEST_NAMESPACE.replace(/-/g, ""), "hex");
+	const name = Buffer.from(JSON.stringify([
+		"smrt-chat:client-request",
+		params.tenantId,
+		params.roomId,
+		params.threadId ?? null,
+		params.actorProfileId,
+		params.clientRequestId
+	]), "utf8");
+	const bytes = createHash("sha1").update(namespace).update(name).digest().subarray(0, 16);
+	bytes[6] = bytes[6] & 15 | 80;
+	bytes[8] = bytes[8] & 63 | 128;
+	const hex = bytes.toString("hex");
+	return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+var ChatClientRequestConflictError = class extends Error {
+	constructor(messageId) {
+		super("A message for this client request is already stored.");
+		this.messageId = messageId;
+		this.name = "ChatClientRequestConflictError";
+	}
+	messageId;
+	code = "CHAT_CLIENT_REQUEST_CONFLICT";
+};
 var RUN_AGENT_REPLY = /* @__PURE__ */ Symbol("smrt-chat.runAgentReply");
 var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/iu;
 var ChatService = class ChatService {
@@ -1330,17 +1358,58 @@ var ChatService = class ChatService {
 	* {@link ChatService.writeMessage} path.
 	*/
 	async sendMessage(params) {
-		return this.#writeMessage({
+		const id = params.clientRequestId ? clientRequestMessageId({
 			tenantId: params.tenantId,
 			roomId: params.roomId,
-			senderProfileId: params.actorProfileId,
-			content: params.content,
-			role: "user",
-			messageType: params.messageType ?? "text",
 			threadId: params.threadId ?? null,
-			agentSessionId: params.agentSessionId ?? null,
-			replyToMessageId: params.replyToMessageId ?? null
-		});
+			actorProfileId: params.actorProfileId,
+			clientRequestId: params.clientRequestId
+		}) : void 0;
+		const savepoint = id ? this.#reservationSavepoint() : null;
+		if (savepoint) await savepoint.open();
+		try {
+			const message = await this.#writeMessage({
+				tenantId: params.tenantId,
+				roomId: params.roomId,
+				senderProfileId: params.actorProfileId,
+				content: params.content,
+				role: "user",
+				messageType: params.messageType ?? "text",
+				threadId: params.threadId ?? null,
+				agentSessionId: params.agentSessionId ?? null,
+				replyToMessageId: params.replyToMessageId ?? null,
+				...id ? { id } : {},
+				metadata: params.clientRequestId ? { clientRequestId: params.clientRequestId } : null,
+				attachments: params.attachments?.length ? params.attachments : null
+			});
+			if (savepoint) await savepoint.release();
+			return message;
+		} catch (error) {
+			if (savepoint) await savepoint.rollback();
+			if (id && error?.code === "VALIDATION_UNIQUE_CONSTRAINT") throw new ChatClientRequestConflictError(id);
+			throw error;
+		}
+	}
+	/**
+	* A savepoint around a reserved insert when the messages handle is a
+	* PostgreSQL transaction handle (`@happyvertical/sql` transaction handles
+	* have no `beginTransaction`), else `null`.
+	*/
+	#reservationSavepoint() {
+		const db = this.#messages.db;
+		if (!isPostgresDatabase(db) || typeof db.beginTransaction === "function" || typeof db.query !== "function") return null;
+		const name = `smrt_chat_reserve_${createHash("sha1").update(`${Date.now()}:${Math.random()}`).digest("hex").slice(0, 12)}`;
+		return {
+			open: async () => {
+				await db.query(`SAVEPOINT ${name}`);
+			},
+			release: async () => {
+				await db.query(`RELEASE SAVEPOINT ${name}`);
+			},
+			rollback: async () => {
+				await db.query(`ROLLBACK TO SAVEPOINT ${name}`).catch(() => void 0);
+			}
+		};
 	}
 	/**
 	* INTERNAL persistence path for all message writes. Not exposed publicly: it
@@ -1375,6 +1444,10 @@ var ChatService = class ChatService {
 			})) throw new Error("replyToMessageId does not belong to this room/tenant (authorization denied)");
 		}
 		const message = await this.#messages.create({
+			...write.id ? {
+				id: write.id,
+				_insertOnly: true
+			} : {},
 			tenantId: write.tenantId,
 			roomId: write.roomId,
 			senderProfileId: write.senderProfileId,
@@ -1384,7 +1457,9 @@ var ChatService = class ChatService {
 			threadId: write.threadId ?? null,
 			agentSessionId: write.agentSessionId ?? null,
 			replyToMessageId: write.replyToMessageId ?? null,
-			toolCallData: write.toolCallData ? JSON.stringify(write.toolCallData) : null
+			toolCallData: write.toolCallData ? JSON.stringify(write.toolCallData) : null,
+			...write.metadata ? { metadata: JSON.stringify(write.metadata) } : {},
+			...write.attachments ? { attachments: JSON.stringify(write.attachments) } : {}
 		});
 		const room = await this.#rooms.get({
 			id: write.roomId,
@@ -1754,6 +1829,7 @@ var ChatService = class ChatService {
 			messageType: params.messageType ?? "text",
 			threadId: params.threadId ?? null,
 			agentSessionId: params.agentSessionId,
+			replyToMessageId: params.replyToMessageId ?? null,
 			toolCallData: params.toolCallData ?? null
 		});
 	}
@@ -1963,6 +2039,89 @@ var ChatService = class ChatService {
 		})).reverse();
 	}
 	/**
+	* A stored message and the replies linked to it (`replyToMessageId`),
+	* oldest first (#3368), or `null` when the message is not in the thread.
+	* Tenant- and membership-bound like {@link ChatService.getThreadMessages}.
+	* Replies are found by their link, not by position, so overlapping turns
+	* in one thread never claim each other's replies.
+	*/
+	async getThreadMessageReplies(params) {
+		const thread = await this.#threads.get({
+			id: params.threadId,
+			tenantId: params.tenantId
+		});
+		if (!thread) throw new Error("Thread not found");
+		await this.#requireActiveMembership(thread.roomId, params.actorProfileId, params.tenantId);
+		const message = await this.#messages.get({
+			id: params.messageId,
+			threadId: params.threadId,
+			tenantId: params.tenantId
+		});
+		if (!message || message.isDeleted) return null;
+		return {
+			message,
+			replies: await this.#messages.list({
+				where: {
+					tenantId: params.tenantId,
+					threadId: params.threadId,
+					replyToMessageId: params.messageId,
+					isDeleted: false
+				},
+				orderBy: "created_at ASC",
+				limit: params.limit ?? 100
+			})
+		};
+	}
+	/**
+	* Record where the turn answering a client request stands, on the actor's
+	* own user message (`metadata.turnOutcome`, #3368). Only the message's
+	* author, still a member of its room, can record it.
+	*
+	* Transitions only move forward, per leg, and are compare-and-set on the
+	* row's revision (a concurrent writer re-reads and is re-checked):
+	* `unset → running → suspended(c) → running(resumedFrom c) → … →
+	* completed | cancelled | failed`, plus `unset → suspended | terminal` for
+	* a first leg whose earlier write was lost. A write from a leg that is not
+	* the current one (its `resumedFrom` differs), a `running` that does not
+	* consume the waiting continuation, or anything after a terminal outcome
+	* is refused. Returns whether the write was applied.
+	*/
+	async recordClientRequestOutcome(params) {
+		for (let attempt = 0; attempt < 5; attempt += 1) {
+			const message = await this.#messages.get({
+				id: params.messageId,
+				threadId: params.threadId,
+				tenantId: params.tenantId
+			});
+			if (message?.role !== "user" || message.senderProfileId !== params.actorProfileId) throw new Error("Message not found");
+			await this.#requireActiveMembership(message.roomId, params.actorProfileId, params.tenantId);
+			const metadata = message.getMetadata();
+			if (!ChatService.#outcomeTransitionAllowed(metadata, params.outcome, params.resumedFrom ?? null, params.continuationId ?? null)) return false;
+			message.setMetadata({
+				...metadata,
+				turnOutcome: params.outcome,
+				turnSettledAt: (/* @__PURE__ */ new Date()).toISOString(),
+				turnContinuationId: params.outcome === "suspended" ? params.continuationId ?? null : params.resumedFrom ?? null
+			});
+			try {
+				await message.save();
+				return true;
+			} catch (error) {
+				if (error?.code !== "RUNTIME_REVISION_CONFLICT") throw error;
+			}
+		}
+		return false;
+	}
+	static #outcomeTransitionAllowed(metadata, next, resumedFrom, continuationId) {
+		const current = typeof metadata.turnOutcome === "string" ? metadata.turnOutcome : null;
+		const recordedId = typeof metadata.turnContinuationId === "string" ? metadata.turnContinuationId : null;
+		if (current === "completed" || current === "cancelled" || current === "failed") return false;
+		if (next === "running") return resumedFrom === null ? current === null : current === "suspended" && recordedId === resumedFrom;
+		if (next === "suspended" && !continuationId) return false;
+		if (current === "running") return recordedId === resumedFrom;
+		return current === null && resumedFrom === null;
+	}
+	/**
 	* Update the per-session agent configuration (allowedTools / systemPrompt),
 	* restricted to the session owner — the room owner participant (S5 #1392).
 	*
@@ -2015,6 +2174,6 @@ function sendAgentReply(service, params) {
 	return ChatService[RUN_AGENT_REPLY](service, params);
 }
 //#endregion
-export { VoiceSession as a, ChatReaction as c, AgentSession as d, VoiceSessionCollection as i, ChatParticipant as l, ChatService_exports as n, ChatThread as o, sendAgentReply as r, ChatRoom as s, ChatService as t, ChatMessage as u };
+export { sendAgentReply as a, ChatThread as c, ChatParticipant as d, ChatMessage as f, clientRequestMessageId as i, ChatRoom as l, ChatService as n, VoiceSessionCollection as o, AgentSession as p, ChatService_exports as r, VoiceSession as s, ChatClientRequestConflictError as t, ChatReaction as u };
 
-//# sourceMappingURL=ChatService-jJi2JJJi.js.map
+//# sourceMappingURL=ChatService-Dl5tsK_F.js.map