@xopcai/xopc 0.0.285 → 0.0.291

package/dist/src/gateway/hono/routes/session-input-handler.d.ts

@@ -1,6 +1,6 @@
 import type { Context } from 'hono';
 import type { AuthenticatedRouteDeps } from './deps.js';
-export declare function submitSessionInput(c: Context, deps: AuthenticatedRouteDeps, sessionKey: string): Promise<(Response & import("hono").TypedResponse<{
+export declare function submitSessionInput(c: Context, deps: AuthenticatedRouteDeps, conversationId: string): Promise<(Response & import("hono").TypedResponse<{
     ok: false;
     error: {
         code: string;
@@ -33,19 +33,19 @@ export declare function submitSessionInput(c: Context, deps: AuthenticatedRouteD
 }, 400 | 409, "json">) | (Response & import("hono").TypedResponse<{
     ok: true;
     payload: {
-        sessionKey: string;
+        conversationId: string;
         ok: true;
         effectiveDelivery: import("../../../storage/sqlite/session-input-repository.js").SessionInputDelivery;
         state: {
-            sessionKey: string;
+            conversationId: string;
             revision: number;
             activeRunId?: string;
             activeInputId?: string;
             inputs: {
                 id: string;
-                sessionKey: string;
+                conversationId: string;
                 clientMessageId: string;
-                expectedSessionId?: string;
+                expectedTranscriptId?: string;
                 requestedDelivery: import("../../../storage/sqlite/session-input-repository.js").SessionInputDelivery;
                 effectiveDelivery: import("../../../storage/sqlite/session-input-repository.js").SessionInputDelivery;
                 status: import("../../../storage/sqlite/session-input-repository.js").SessionInputStatus;
@@ -112,7 +112,7 @@ export declare function submitSessionInput(c: Context, deps: AuthenticatedRouteD
         };
     };
 }, 202, "json">)>;
-export declare function replaceLatestSessionTurn(c: Context, deps: AuthenticatedRouteDeps, sessionKey: string, targetTurnId: string): Promise<(Response & import("hono").TypedResponse<{
+export declare function replaceLatestSessionTurn(c: Context, deps: AuthenticatedRouteDeps, conversationId: string, targetTurnId: string): Promise<(Response & import("hono").TypedResponse<{
     ok: false;
     error: {
         code: string;
@@ -139,19 +139,19 @@ export declare function replaceLatestSessionTurn(c: Context, deps: Authenticated
 }, 404 | 400 | 409, "json">) | (Response & import("hono").TypedResponse<{
     ok: true;
     payload: {
-        sessionKey: string;
+        conversationId: string;
         ok: true;
         effectiveDelivery: "next";
         state: {
-            sessionKey: string;
+            conversationId: string;
             revision: number;
             activeRunId?: string;
             activeInputId?: string;
             inputs: {
                 id: string;
-                sessionKey: string;
+                conversationId: string;
                 clientMessageId: string;
-                expectedSessionId?: string;
+                expectedTranscriptId?: string;
                 requestedDelivery: import("../../../storage/sqlite/session-input-repository.js").SessionInputDelivery;
                 effectiveDelivery: import("../../../storage/sqlite/session-input-repository.js").SessionInputDelivery;
                 status: import("../../../storage/sqlite/session-input-repository.js").SessionInputStatus;

package/dist/src/gateway/hono/routes/session-input-handler.js

@@ -1,5 +1,6 @@
 import { browserPageContextsInputSchema } from "../../../../packages/gateway-contract/src/browser-page-context.js";
-import { endpointTurnClaimSchema } from "../../../../packages/endpoint-tools-protocol/src/index.js";
+import { init_src } from "../../../../packages/gateway-contract/src/index.js";
+import { endpointTurnClaimSchema, init_src as init_src$1 } from "../../../../packages/endpoint-tools-protocol/src/index.js";
 import { init_providers, resolveModel } from "../../../providers/index.js";
 import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";
 import { parseTurnContextRefs } from "../../../agent/source-context/types.js";
@@ -7,11 +8,13 @@ import { getModelThinking } from "../../../providers/model-thinking.js";
 import { withModelConfigLock } from "../../../session/model-config-lock.js";
 import { browserPageContextToAgentContext } from "../../../agent/source-context/browser-page.js";
 //#region src/gateway/hono/routes/session-input-handler.ts
+init_src();
+init_src$1();
 init_providers();
 const MAX_TURN_CONTEXTS = 5;
-async function submitSessionInput(c, deps, sessionKey) {
+async function submitSessionInput(c, deps, conversationId) {
 	const body = await c.req.json().catch(() => null);
-	if (!body || !sessionKey) return c.json({
+	if (!body || !conversationId) return c.json({
 		ok: false,
 		error: {
 			code: "BAD_REQUEST",
@@ -82,22 +85,22 @@ async function submitSessionInput(c, deps, sessionKey) {
 			message: "Browser context requires a browser endpoint"
 		}
 	}, 403);
-	if (body.expectedSessionId !== void 0 && (typeof body.expectedSessionId !== "string" || !body.expectedSessionId || body.expectedSessionId.length > 128)) return c.json({
+	if (body.expectedTranscriptId !== void 0 && (typeof body.expectedTranscriptId !== "string" || !body.expectedTranscriptId || body.expectedTranscriptId.length > 128)) return c.json({
 		ok: false,
 		error: {
 			code: "BAD_REQUEST",
 			message: "Invalid session identity"
 		}
 	}, 400);
-	return withModelConfigLock(sessionKey, async () => {
-		if (deps.service.voiceRealtime?.hasConversation(sessionKey)) return c.json({
+	return withModelConfigLock(conversationId, async () => {
+		if (deps.service.voiceRealtime?.hasConversation(conversationId)) return c.json({
 			ok: false,
 			error: {
 				code: "SESSION_BUSY",
 				message: "End the voice call before sending text"
 			}
 		}, 409);
-		const selection = body.configVersion !== void 0 ? await deps.service.sessions.getAgentConfig(sessionKey) : void 0;
+		const selection = body.configVersion !== void 0 ? await deps.service.sessions.getAgentConfig(conversationId) : void 0;
 		if (selection) {
 			if (!Number.isSafeInteger(body.configVersion) || selection.configVersion !== body.configVersion || !selection.fixedModel) return c.json({
 				ok: false,
@@ -125,8 +128,8 @@ async function submitSessionInput(c, deps, sessionKey) {
 			}
 		}
 		const result = await deps.service.submitSessionInput({
-			expectedSessionId: body.expectedSessionId,
-			sessionKey,
+			expectedTranscriptId: body.expectedTranscriptId,
+			conversationId,
 			clientMessageId: typeof body.clientMessageId === "string" ? body.clientMessageId : "",
 			delivery,
 			content,
@@ -150,14 +153,14 @@ async function submitSessionInput(c, deps, sessionKey) {
 			ok: true,
 			payload: {
 				...result,
-				sessionKey
+				conversationId
 			}
 		}, 202);
 	});
 }
-async function replaceLatestSessionTurn(c, deps, sessionKey, targetTurnId) {
+async function replaceLatestSessionTurn(c, deps, conversationId, targetTurnId) {
 	const body = await c.req.json().catch(() => null);
-	if (!body || !sessionKey || !targetTurnId) return c.json({
+	if (!body || !conversationId || !targetTurnId) return c.json({
 		ok: false,
 		error: {
 			code: "BAD_REQUEST",
@@ -205,15 +208,15 @@ async function replaceLatestSessionTurn(c, deps, sessionKey, targetTurnId) {
 			message: "Endpoint connection is not active"
 		}
 	}, 401);
-	return withModelConfigLock(sessionKey, async () => {
-		if (deps.service.voiceRealtime?.hasConversation(sessionKey)) return c.json({
+	return withModelConfigLock(conversationId, async () => {
+		if (deps.service.voiceRealtime?.hasConversation(conversationId)) return c.json({
 			ok: false,
 			error: {
 				code: "SESSION_BUSY",
 				message: "End the voice call before editing a turn"
 			}
 		}, 409);
-		const selection = body.configVersion !== void 0 ? await deps.service.sessions.getAgentConfig(sessionKey) : void 0;
+		const selection = body.configVersion !== void 0 ? await deps.service.sessions.getAgentConfig(conversationId) : void 0;
 		if (selection) {
 			if (!Number.isSafeInteger(body.configVersion) || selection.configVersion !== body.configVersion || !selection.fixedModel) return c.json({
 				ok: false,
@@ -241,7 +244,7 @@ async function replaceLatestSessionTurn(c, deps, sessionKey, targetTurnId) {
 			}
 		}
 		const result = await deps.service.replaceLatestSessionTurn({
-			sessionKey,
+			conversationId,
 			targetTurnId,
 			clientMessageId: typeof body.clientMessageId === "string" ? body.clientMessageId : "",
 			delivery: "next",
@@ -269,7 +272,7 @@ async function replaceLatestSessionTurn(c, deps, sessionKey, targetTurnId) {
 			ok: true,
 			payload: {
 				...result,
-				sessionKey
+				conversationId
 			}
 		}, 202);
 	});

package/dist/src/gateway/hono/routes/sessions.js

@@ -1,6 +1,9 @@
 import { deleteBrowserTabBinding } from "../../../storage/sqlite/browser-tab-binding-repository.js";
+import { conversationIdSchema } from "../../../../packages/gateway-contract/src/conversation-identity.js";
 import { SessionDiscoveryQuerySchema } from "../../../../packages/gateway-contract/src/session-identity.js";
-import { buildSessionKey, init_session_key } from "../../../routing/session-key.js";
+import { init_src } from "../../../../packages/gateway-contract/src/index.js";
+import { deleteSessionRecord, init_session_repository } from "../../../storage/sqlite/session-repository.js";
+import { ConversationAlreadyExistsError, createConversation, init_conversation_repository } from "../../../storage/sqlite/conversation-repository.js";
 import { resolveProjectAgentId } from "../../../projects/project-agent.js";
 import "../../../projects/index.js";
 import { messagesToClientHistory } from "../../../session/client-history.js";
@@ -14,7 +17,9 @@ import { getSessionContextSummary } from "../../session-context-summary.js";
 import { respondStartupUnavailable } from "../lib/startup-unavailable.js";
 import { randomUUID } from "node:crypto";
 //#region src/gateway/hono/routes/sessions.ts
-init_session_key();
+init_src();
+init_conversation_repository();
+init_session_repository();
 const log = createGatewayRouteLogger("Sessions");
 const SESSION_TYPES = new Set([
 	"chat",
@@ -95,14 +100,14 @@ function registerSessionsRoutes(authenticated, deps) {
 		const inboxOffset = parseOffset(c.req.query("inboxOffset"));
 		const staleDays = parsePositiveInt(c.req.query("staleDays"), DEFAULT_SIDEBAR_STALE_DAYS, 3650);
 		const updatedAfter = Date.now() - staleDays * 24 * 60 * 60 * 1e3;
-		const includeSessionKey = c.req.query("includeSessionKey")?.trim() || void 0;
+		const includeConversationId = c.req.query("includeConversationId")?.trim() || void 0;
 		const projects = service.projects.listWithSidebarSessions({
 			status: "active",
 			limit: projectLimit,
 			offset: projectOffset,
 			updatedAfter,
 			includePinned: true,
-			includeSessionKey
+			includeConversationId
 		});
 		const projectItems = await Promise.all(projects.items.map(async (project) => {
 			const sessions = await service.sessions.listSessions({
@@ -111,7 +116,7 @@ function registerSessionsRoutes(authenticated, deps) {
 				offset: 0,
 				updatedAfter,
 				includePinned: true,
-				includeSessionKey,
+				includeConversationId,
 				sortBy: "updatedAt",
 				sortOrder: "desc"
 			});
@@ -128,7 +133,7 @@ function registerSessionsRoutes(authenticated, deps) {
 			offset: inboxOffset,
 			updatedAfter,
 			includePinned: true,
-			includeSessionKey,
+			includeConversationId,
 			sortBy: "updatedAt",
 			sortOrder: "desc"
 		});
@@ -146,6 +151,10 @@ function registerSessionsRoutes(authenticated, deps) {
 	});
 	authenticated.post("/api/sessions", async (c) => {
 		const body = await c.req.json().catch(() => ({}));
+		if (body.conversationId !== void 0 && !conversationIdSchema.safeParse(body.conversationId).success) return c.json({
+			ok: false,
+			error: "conversationId must be a UUID"
+		}, 400);
 		const channel = typeof body.channel === "string" && body.channel.trim() ? body.channel.trim() : "webchat";
 		const projectId = typeof body.projectId === "string" && body.projectId.trim() ? body.projectId.trim() : void 0;
 		const routingCfg = service.currentConfig;
@@ -163,29 +172,54 @@ function registerSessionsRoutes(authenticated, deps) {
 			ok: false,
 			error: "An execution mode requires a project"
 		}, 400);
-		const agentId = resolveProjectAgentId({
-			config: routingCfg,
-			projects: service.projects,
-			explicitAgentId: typeof body.agentId === "string" ? body.agentId : void 0,
-			projectId
-		});
+		let agentId;
+		try {
+			agentId = resolveProjectAgentId({
+				config: routingCfg,
+				projects: service.projects,
+				explicitAgentId: typeof body.agentId === "string" ? body.agentId : void 0,
+				projectId
+			});
+		} catch (error) {
+			return c.json({
+				ok: false,
+				error: error instanceof Error ? error.message : String(error)
+			}, 400);
+		}
 		const chatId = (typeof body.chat_id === "string" && body.chat_id.trim() ? body.chat_id.trim() : void 0) ?? `chat_${randomUUID()}`;
-		const sessionKey = buildSessionKey({
+		const metadata = {
 			agentId,
-			source: channel,
-			accountId: "default",
-			peerKind: "direct",
-			peerId: chatId
-		});
+			...buildDirectSessionMetadata({
+				agentId,
+				source: channel,
+				accountId: "default",
+				peerId: chatId
+			}),
+			...channel === "tui" ? {
+				hiddenFromSessionList: true,
+				customData: { genericNewChatShell: true }
+			} : {}
+		};
+		let conversationId;
+		try {
+			conversationId = createConversation(metadata, "", body.conversationId).key;
+		} catch (error) {
+			if (error instanceof ConversationAlreadyExistsError) return c.json({
+				ok: false,
+				error: error.message
+			}, 409);
+			throw error;
+		}
 		let environment;
 		if (project && (project.workspaceRoot?.trim() || requestedExecutionMode)) try {
 			environment = await environments.attach({
-				sessionKey,
+				conversationId,
 				project,
 				mode: requestedExecutionMode,
 				baseRef: typeof body.baseRef === "string" ? body.baseRef : void 0
 			});
 		} catch (error) {
+			deleteSessionRecord(conversationId);
 			return c.json({
 				ok: false,
 				code: "execution_environment_unavailable",
@@ -193,16 +227,11 @@ function registerSessionsRoutes(authenticated, deps) {
 			}, 409);
 		}
 		try {
-			await service.sessionIndexInstance.saveMessages(sessionKey, [], { metadata: buildDirectSessionMetadata({
-				agentId,
-				source: channel,
-				accountId: "default",
-				peerId: chatId
-			}) });
-			if (projectId) service.projects.attachSession(sessionKey, projectId);
+			await service.sessionIndexInstance.saveMessages(conversationId, [], { metadata });
+			if (projectId) service.projects.attachSession(conversationId, projectId);
 		} catch (error) {
-			await service.sessions.delete(sessionKey).catch(() => void 0);
-			await environments.release(sessionKey).catch(() => void 0);
+			await service.sessions.delete(conversationId).catch(() => void 0);
+			await environments.release(conversationId).catch(() => void 0);
 			throw error;
 		}
 		const rawInitialConfig = body.initialAgentConfig && typeof body.initialAgentConfig === "object" ? body.initialAgentConfig : {};
@@ -214,13 +243,13 @@ function registerSessionsRoutes(authenticated, deps) {
 			...body.temporary === true ? { userContextMode: "temporary" } : {}
 		};
 		if (channel === "webchat" && model) {
-			const result = await service.sessions.initializeChatModel(sessionKey, model, thinkingLevel);
+			const result = await service.sessions.initializeChatModel(conversationId, model, thinkingLevel);
 			if (!result.ok) {
-				await service.sessions.delete(sessionKey).catch(() => void 0);
-				await environments.release(sessionKey).catch((error) => {
+				await service.sessions.delete(conversationId).catch(() => void 0);
+				await environments.release(conversationId).catch((error) => {
 					log.warn({
 						err: error,
-						sessionKey
+						conversationId
 					}, "Invalid new session model and execution environment cleanup failed");
 				});
 				return c.json({
@@ -232,13 +261,13 @@ function registerSessionsRoutes(authenticated, deps) {
 			delete initialAgentConfig.thinkingLevel;
 		}
 		if (Object.keys(initialAgentConfig).length > 0) {
-			const result = await service.sessions.patchAgentConfig(sessionKey, initialAgentConfig);
+			const result = await service.sessions.patchAgentConfig(conversationId, initialAgentConfig);
 			if (!result.ok) {
-				await service.sessions.delete(sessionKey).catch(() => void 0);
-				await environments.release(sessionKey).catch((error) => {
+				await service.sessions.delete(conversationId).catch(() => void 0);
+				await environments.release(conversationId).catch((error) => {
 					log.warn({
 						err: error,
-						sessionKey
+						conversationId
 					}, "Invalid new session config and execution environment cleanup failed");
 				});
 				return c.json({
@@ -247,10 +276,11 @@ function registerSessionsRoutes(authenticated, deps) {
 				}, 400);
 			}
 		}
-		if (body.createdSurface === "browser_extension") await service.sessions.patch(sessionKey, { customData: { createdSurface: "browser_extension" } });
-		const session = await service.sessions.getSession(sessionKey);
-		const agentConfig = channel === "webchat" ? await service.sessions.getFixedAgentConfig(sessionKey) : void 0;
+		if (body.createdSurface === "browser_extension") await service.sessions.patch(conversationId, { customData: { createdSurface: "browser_extension" } });
+		const session = await service.sessions.getSession(conversationId);
+		const agentConfig = channel === "webchat" ? await service.sessions.getFixedAgentConfig(conversationId) : void 0;
 		return c.json({
+			conversationId,
 			session,
 			agentConfig,
 			...environment ? { environment } : {}
@@ -281,7 +311,7 @@ function registerSessionsRoutes(authenticated, deps) {
 			unassigned: query.unassigned === "true",
 			updatedAfter: query.updatedAfter ? parseInt(query.updatedAfter) : void 0,
 			includePinned: query.includePinned === "true",
-			includeSessionKey: query.includeSessionKey,
+			includeConversationId: query.includeConversationId,
 			limit: query.limit ? parseInt(query.limit) : void 0,
 			offset: query.offset ? parseInt(query.offset) : void 0
 		});
@@ -301,8 +331,8 @@ function registerSessionsRoutes(authenticated, deps) {
 	});
 	authenticated.get("/api/sessions/resolve", async (c) => {
 		const result = await service.sessions.resolveSession({
-			sessionId: c.req.query("sessionId"),
-			sessionKey: c.req.query("sessionKey") ?? c.req.query("key")
+			transcriptId: c.req.query("transcriptId"),
+			conversationId: c.req.query("conversationId")
 		});
 		if (!result) return c.json({
 			ok: false,
@@ -316,9 +346,8 @@ function registerSessionsRoutes(authenticated, deps) {
 	authenticated.post("/api/sessions/resolve", async (c) => {
 		const body = await c.req.json().catch(() => ({}));
 		const result = await service.sessions.resolveSession({
-			sessionId: typeof body.sessionId === "string" ? body.sessionId : void 0,
-			sessionKey: typeof body.sessionKey === "string" ? body.sessionKey : void 0,
-			key: typeof body.key === "string" ? body.key : void 0
+			transcriptId: typeof body.transcriptId === "string" ? body.transcriptId : void 0,
+			conversationId: typeof body.conversationId === "string" ? body.conversationId : void 0
 		});
 		if (!result) return c.json({
 			ok: false,
@@ -572,7 +601,7 @@ function registerSessionsRoutes(authenticated, deps) {
 		} catch (err) {
 			logRouteError(log, c, err, "gateway.route.sessions", {
 				operation: "restoreCompactionBoundary",
-				sessionKey: key
+				conversationId: key
 			});
 			const msg = err instanceof Error ? err.message : String(err);
 			if (msg.includes("not found")) return c.json({
@@ -833,8 +862,8 @@ function registerSessionsRoutes(authenticated, deps) {
 		return c.json({
 			ok: true,
 			reset: true,
-			sessionId: result.sessionId,
-			previousSessionId: result.previousSessionId,
+			transcriptId: result.transcriptId,
+			previousTranscriptId: result.previousTranscriptId,
 			session
 		});
 	});
@@ -851,7 +880,7 @@ function registerSessionsRoutes(authenticated, deps) {
 			await environments.release(key).catch((error) => {
 				log.warn({
 					err: error,
-					sessionKey: key
+					conversationId: key
 				}, "Session deleted but execution environment cleanup failed");
 			});
 		}
@@ -893,7 +922,7 @@ function registerSessionsRoutes(authenticated, deps) {
 	});
 	authenticated.get("/api/subagents/:key", async (c) => {
 		const key = c.req.param("key");
-		if (!key.startsWith("subagent:")) return c.json({ error: "Not a subagent session" }, 400);
+		if ((await service.sessions.getSession(key))?.sessionType !== "workflow-subagent") return c.json({ error: "Not a subagent session" }, 400);
 		const includeRaw = c.req.query("include") ?? "";
 		const includeSet = new Set(includeRaw.split(",").map((s) => s.trim()).filter(Boolean));
 		const session = await service.sessions.getSession(key, {