@xopcai/xopc 0.0.207 → 0.0.210

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

@@ -8,7 +8,7 @@ import { resolveComposioApiKey } from "../../../connectors/composio-sessions.js"
 import { getConnectorLearningPlan } from "../../../connectors/learning-recipes.js";
 import { listComposioConnectorCatalog } from "../../../connectors/composio-catalog.js";
 import { createConnectorSetupSecretRequest, submitConnectorSetupSecret } from "../../../connectors/setup-secrets.js";
-import { configureComposioApiKey, executeComposioTool, getComposioInstallationPolicy, getComposioToolkitScope, inspectComposioConnectorHealth, listComposioConnections, listComposioTools, refreshComposioConnection, revokeComposioConnection, setComposioToolkitScope, updateComposioConnection, updateComposioInstallationPolicy } from "../../../connectors/composio.js";
+import { configureComposioApiKey, executeComposioTool, getComposioInstallationPolicy, getComposioToolkitAuthState, getComposioToolkitScope, inspectComposioConnectorHealth, listComposioConnections, listComposioTools, refreshComposioConnection, revokeComposioConnection, setComposioToolkitScope, updateComposioConnection, updateComposioInstallationPolicy } from "../../../connectors/composio.js";
 import { listConnectorProviders } from "../../../connectors/providers.js";
 import { getConnectorDefinition, listConnectorCatalog } from "../../../connectors/catalog.js";
 import { listUnderstandingSourceGrants, revokeUnderstandingSourceGrant } from "../../../user-context/sources/repository.js";
@@ -314,6 +314,19 @@ function registerConnectorRoutes(authenticated, deps) {
 			}, 400);
 		}
 	});
+	authenticated.get("/api/connectors/composio/:toolkit/auth-configs", async (c) => {
+		try {
+			return c.json({
+				ok: true,
+				payload: { auth: await getComposioToolkitAuthState(c.req.param("toolkit")) }
+			});
+		} catch (error) {
+			return c.json({
+				ok: false,
+				error: errorMessage(error)
+			}, 400);
+		}
+	});
 	authenticated.get("/api/connectors/composio/:toolkit/scope", async (c) => {
 		const toolkit = c.req.param("toolkit");
 		return c.json({
@@ -566,7 +579,7 @@ function registerConnectorRoutes(authenticated, deps) {
 			error: `Unknown connector: ${connectorId}`
 		}, 404);
 		try {
-			const authorization = await startConnectorAuthorization(connector);
+			const authorization = await startConnectorAuthorization(connector, service.currentConfig);
 			return c.json({
 				ok: true,
 				payload: { authorization }

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

@@ -60,3 +60,63 @@ 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<{
+    ok: false;
+    error: {
+        code: string;
+        message: string;
+    };
+}, 400, "json">) | (Response & import("hono").TypedResponse<{
+    ok: false;
+    error: {
+        code: string;
+        message: string;
+    };
+}, 401, "json">) | (Response & import("hono").TypedResponse<{
+    ok: false;
+    error: {
+        code: "TARGET_NOT_FOUND" | "NOT_LATEST" | "SESSION_BUSY" | "BAD_REQUEST";
+        message: string;
+    };
+}, 400 | 404 | 409, "json">) | (Response & import("hono").TypedResponse<{
+    ok: true;
+    payload: {
+        sessionKey: string;
+        ok: true;
+        effectiveDelivery: "next";
+        state: {
+            sessionKey: string;
+            revision: number;
+            activeRunId?: string;
+            activeInputId?: string;
+            inputs: {
+                id: string;
+                sessionKey: string;
+                clientMessageId: 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;
+                content: string;
+                attachments?: import("hono/dist/types/utils/types.js").JSONValue[];
+                thinking?: string;
+                origin: {
+                    type: "endpoint";
+                    endpointId: string;
+                } | {
+                    type: "channel";
+                    channel: string;
+                } | {
+                    type: "system";
+                    source: "cli" | "workflow" | "automation" | "heartbeat" | "internal";
+                };
+                position: number;
+                targetRunId?: string;
+                runId?: string;
+                version: number;
+                error?: string;
+                createdAtMs: number;
+                updatedAtMs: number;
+            }[];
+        };
+    };
+}, 202, "json">)>;

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

@@ -78,5 +78,79 @@ async function submitSessionInput(c, deps, sessionKey) {
 		}
 	}, 202);
 }
+async function replaceLatestSessionTurn(c, deps, sessionKey, targetTurnId) {
+	const body = await c.req.json().catch(() => null);
+	if (!body || !sessionKey || !targetTurnId) return c.json({
+		ok: false,
+		error: {
+			code: "BAD_REQUEST",
+			message: "Invalid request"
+		}
+	}, 400);
+	const attachments = Array.isArray(body.attachments) ? body.attachments : void 0;
+	const content = typeof body.content === "string" ? body.content : "";
+	const contentError = validateWebchatContent(content);
+	if (contentError) return c.json({
+		ok: false,
+		error: {
+			code: "BAD_REQUEST",
+			message: contentError
+		}
+	}, 400);
+	const attachmentError = validateWebchatAttachments(attachments);
+	if (attachmentError) return c.json({
+		ok: false,
+		error: {
+			code: "BAD_REQUEST",
+			message: attachmentError
+		}
+	}, 400);
+	const origin = endpointTurnClaimSchema.safeParse(body.origin);
+	if (!origin.success) return c.json({
+		ok: false,
+		error: {
+			code: "BAD_REQUEST",
+			message: "Invalid endpoint origin"
+		}
+	}, 400);
+	if (!deps.service.endpointTools.registry.verifyTurnClaim(origin.data.endpointId, origin.data.token)) return c.json({
+		ok: false,
+		error: {
+			code: "INVALID_ENDPOINT",
+			message: "Endpoint connection is not active"
+		}
+	}, 401);
+	const result = await deps.service.replaceLatestSessionTurn({
+		sessionKey,
+		targetTurnId,
+		clientMessageId: typeof body.clientMessageId === "string" ? body.clientMessageId : "",
+		delivery: "next",
+		content,
+		attachments,
+		thinking: typeof body.thinking === "string" ? body.thinking : void 0,
+		origin: {
+			type: "endpoint",
+			endpointId: origin.data.endpointId
+		}
+	});
+	if (result.ok === false) {
+		const status = result.code === "TARGET_NOT_FOUND" ? 404 : result.code === "BAD_REQUEST" ? 400 : 409;
+		const message = result.code === "NOT_LATEST" ? "Only the latest user turn can be replaced" : result.code === "SESSION_BUSY" ? "Session has pending input" : result.code === "TARGET_NOT_FOUND" ? "User turn was not found" : "Replacement input was not accepted";
+		return c.json({
+			ok: false,
+			error: {
+				code: result.code,
+				message
+			}
+		}, status);
+	}
+	return c.json({
+		ok: true,
+		payload: {
+			...result,
+			sessionKey
+		}
+	}, 202);
+}
 //#endregion
-export { submitSessionInput };
+export { replaceLatestSessionTurn, submitSessionInput };

package/dist/src/gateway/service/agent-runner.d.ts

@@ -27,7 +27,7 @@ import type { SessionIndex } from '../../session/index.js';
 import type { ClarifyStreamEvent } from '../clarify-bridge.js';
 import { ClarifyBridge, type ClarifyBridgeRequest } from '../clarify-bridge.js';
 import type { UserTurnAttachment, UserTurnInput } from '../user-turn-input.js';
-import { SessionInputCoordinator, type SubmitSessionInput } from './session-input-coordinator.js';
+import { SessionInputCoordinator, type ReplaceLatestTurnInput, type SubmitSessionInput } from './session-input-coordinator.js';
 export interface GatewayAgentRunnerOptions {
     bus: MessageBus;
     sessionIndex: SessionIndex;
@@ -79,6 +79,14 @@ export declare class GatewayAgentRunner {
         ok: false;
         code: "BAD_REQUEST" | "QUEUE_FULL";
     }>;
+    replaceLatestSessionTurn(input: ReplaceLatestTurnInput): Promise<{
+        ok: true;
+        effectiveDelivery: "next";
+        state: import("../../storage/sqlite/session-input-repository.js").SessionInputState;
+    } | {
+        ok: false;
+        code: "BAD_REQUEST" | "TARGET_NOT_FOUND" | "NOT_LATEST" | "SESSION_BUSY";
+    }>;
     getSessionInputState(sessionKey: string): import("../../storage/sqlite/session-input-repository.js").SessionInputState;
     updateSessionInput(sessionKey: string, id: string, body: {
         version: number;

package/dist/src/gateway/service/agent-runner.js

@@ -115,6 +115,15 @@ var GatewayAgentRunner = class {
 	submitSessionInput(input) {
 		return this.inputs.submit(input);
 	}
+	replaceLatestSessionTurn(input) {
+		return this.inputs.replaceLatestTurn(input, async () => {
+			const activeRunId = this.activeWebchatRunBySession.get(input.sessionKey) ?? this.inputs.snapshot(input.sessionKey).activeRunId;
+			if (activeRunId) await this.abortAgentRun(activeRunId);
+			const { evictEmbeddedSessionRunner } = await import("../../agent/embedded/session-runner.js");
+			evictEmbeddedSessionRunner(input.sessionKey, "gateway_user_turn_replaced");
+			this.opts.getAgentService().evictSessionAgent(input.sessionKey);
+		});
+	}
 	getSessionInputState(sessionKey) {
 		return this.inputs.snapshot(sessionKey);
 	}

package/dist/src/gateway/service/session-input-coordinator.d.ts

@@ -10,6 +10,9 @@ export type SubmitSessionInput = {
     thinking?: string;
     origin: TurnOrigin;
 };
+export type ReplaceLatestTurnInput = SubmitSessionInput & {
+    targetTurnId: string;
+};
 export declare class SessionInputCoordinator {
     private readonly deps;
     private readonly draining;
@@ -33,6 +36,7 @@ export declare class SessionInputCoordinator {
     });
     snapshot(sessionKey: string): SessionInputState;
     private publish;
+    private runSubmissionExclusive;
     submit(input: SubmitSessionInput): Promise<{
         ok: true;
         effectiveDelivery: SessionInputDelivery;
@@ -41,6 +45,14 @@ export declare class SessionInputCoordinator {
         ok: false;
         code: 'BAD_REQUEST' | 'QUEUE_FULL';
     }>;
+    replaceLatestTurn(input: ReplaceLatestTurnInput, beforeReplace: () => Promise<void>): Promise<{
+        ok: true;
+        effectiveDelivery: 'next';
+        state: SessionInputState;
+    } | {
+        ok: false;
+        code: 'BAD_REQUEST' | 'TARGET_NOT_FOUND' | 'NOT_LATEST' | 'SESSION_BUSY';
+    }>;
     private submitLocked;
     drain(sessionKey: string): Promise<void>;
     update(sessionKey: string, id: string, body: {

package/dist/src/gateway/service/session-input-coordinator.js

@@ -1,7 +1,9 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { cancelQueuedSessionInput, claimNextSessionInput, findSessionInput, finishSessionInputRun, getSessionInputState, insertSessionInput, mutateQueuedSessionInput, recoverSessionInputState, setSessionInputStatus } from "../../storage/sqlite/session-input-repository.js";
+import { replaceLatestSessionTurnAndQueueInput, validateLatestSessionTurnTarget } from "../../storage/sqlite/session-turn-replace-repository.js";
 import "../../storage/sqlite/index.js";
+import { deleteMediaUrisNoLongerReferenced } from "../../media/session-references.js";
 import crypto from "node:crypto";
 //#region src/gateway/service/session-input-coordinator.ts
 init_logger();
@@ -21,8 +23,7 @@ var SessionInputCoordinator = class {
 		this.deps.emit("session.input-state", state);
 		return state;
 	}
-	async submit(input) {
-		const sessionKey = input.sessionKey.trim();
+	async runSubmissionExclusive(sessionKey, operation) {
 		const previous = this.submissionTails.get(sessionKey) ?? Promise.resolve();
 		let release = () => {};
 		const current = new Promise((resolve) => {
@@ -32,15 +33,72 @@ var SessionInputCoordinator = class {
 		this.submissionTails.set(sessionKey, tail);
 		await previous;
 		try {
-			return await this.submitLocked({
-				...input,
-				sessionKey
-			});
+			return await operation();
 		} finally {
 			release();
 			if (this.submissionTails.get(sessionKey) === tail) this.submissionTails.delete(sessionKey);
 		}
 	}
+	async submit(input) {
+		const sessionKey = input.sessionKey.trim();
+		return this.runSubmissionExclusive(sessionKey, () => this.submitLocked({
+			...input,
+			sessionKey
+		}));
+	}
+	async replaceLatestTurn(input, beforeReplace) {
+		const sessionKey = input.sessionKey.trim();
+		return this.runSubmissionExclusive(sessionKey, async () => {
+			const clientMessageId = input.clientMessageId.trim();
+			const content = input.content.trim();
+			const targetTurnId = input.targetTurnId.trim();
+			if (!sessionKey || !clientMessageId || !targetTurnId || !content && !input.attachments?.length) return {
+				ok: false,
+				code: "BAD_REQUEST"
+			};
+			if (!await this.deps.sessionExists(sessionKey)) return {
+				ok: false,
+				code: "BAD_REQUEST"
+			};
+			if (findSessionInput(sessionKey, clientMessageId)) return {
+				ok: true,
+				effectiveDelivery: "next",
+				state: this.snapshot(sessionKey)
+			};
+			const target = validateLatestSessionTurnTarget(sessionKey, targetTurnId);
+			if (target.ok === false) return target;
+			await beforeReplace();
+			const attachments = await this.deps.prepareAttachments(sessionKey, input.attachments);
+			const result = replaceLatestSessionTurnAndQueueInput({
+				sessionKey,
+				targetTurnId,
+				clientMessageId,
+				content,
+				attachments,
+				thinking: input.thinking,
+				origin: input.origin
+			});
+			if (result.ok === false) return result;
+			if (!result.idempotent) {
+				const replacement = {
+					role: "user",
+					content,
+					media: attachments
+				};
+				await deleteMediaUrisNoLongerReferenced({
+					removed: result.removedMessages,
+					remaining: [...result.remainingMessages, replacement]
+				});
+			}
+			const state = this.publish(sessionKey);
+			this.drain(sessionKey);
+			return {
+				ok: true,
+				effectiveDelivery: "next",
+				state
+			};
+		});
+	}
 	async submitLocked(input) {
 		const sessionKey = input.sessionKey;
 		const clientMessageId = input.clientMessageId.trim();

package/dist/src/gateway/service.d.ts

@@ -140,6 +140,14 @@ export declare class GatewayService {
         ok: false;
         code: "BAD_REQUEST" | "QUEUE_FULL";
     }>;
+    replaceLatestSessionTurn(...args: Parameters<GatewayAgentRunner['replaceLatestSessionTurn']>): Promise<{
+        ok: true;
+        effectiveDelivery: "next";
+        state: import("../storage/sqlite/session-input-repository.js").SessionInputState;
+    } | {
+        ok: false;
+        code: "BAD_REQUEST" | "TARGET_NOT_FOUND" | "NOT_LATEST" | "SESSION_BUSY";
+    }>;
     getSessionInputState(...args: Parameters<GatewayAgentRunner['getSessionInputState']>): import("../storage/sqlite/session-input-repository.js").SessionInputState;
     updateSessionInput(...args: Parameters<GatewayAgentRunner['updateSessionInput']>): Promise<{
         ok: boolean;

package/dist/src/gateway/service.js

@@ -55,11 +55,6 @@ import { registerClarifyBridge } from "./clarify-runtime.js";
 import { ChannelManager } from "../channels/manager.js";
 import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import "../config/index.js";
-import { startConnectedKnowledgeCoordinator } from "../knowledge/coordinator.js";
-import "../knowledge/index.js";
-import { startConnectorLearningCoordinator } from "../connectors/learning-coordinator.js";
-import { ConnectedSourceChangePublisher } from "../connectors/source-change-publisher.js";
-import { startConnectorSupervisor } from "../connectors/supervisor.js";
 import { DiscussionService } from "../discussions/service.js";
 import { DiscussionOrganizer } from "../discussions/organizer.js";
 import { DiscussionLiveWorker } from "../discussions/live-worker.js";
@@ -68,6 +63,11 @@ import { DiscussionSealer } from "../discussions/sealer.js";
 import "../discussions/index.js";
 import { EndpointToolRuntime } from "../endpoint-tools/runtime.js";
 import "../endpoint-tools/index.js";
+import { startConnectedKnowledgeCoordinator } from "../knowledge/coordinator.js";
+import "../knowledge/index.js";
+import { startConnectorLearningCoordinator } from "../connectors/learning-coordinator.js";
+import { ConnectedSourceChangePublisher } from "../connectors/source-change-publisher.js";
+import { startConnectorSupervisor } from "../connectors/supervisor.js";
 import { assertGatewayAuthConfigured, extractToken, resolveGatewayAuth, validateToken } from "./auth.js";
 import { prepareAutomationAgentSession } from "./automation-agent-session.js";
 import { reconcileDreamingAutomations } from "./dreaming-automation-reconciler.js";
@@ -641,6 +641,9 @@ var GatewayService = class {
 	submitSessionInput(...args) {
 		return this.agentRunner.submitSessionInput(...args);
 	}
+	replaceLatestSessionTurn(...args) {
+		return this.agentRunner.replaceLatestSessionTurn(...args);
+	}
 	getSessionInputState(...args) {
 		return this.agentRunner.getSessionInputState(...args);
 	}

package/dist/src/retrieval/audit.d.ts

@@ -0,0 +1 @@
+export declare function retrievalQueryAuditValue(query: string): string;

package/dist/src/retrieval/audit.js

@@ -0,0 +1,8 @@
+import { createHash } from "node:crypto";
+//#region src/retrieval/audit.ts
+function retrievalQueryAuditValue(query) {
+	const normalized = query.normalize("NFKC").trim();
+	return `sha256:${createHash("sha256").update(normalized).digest("hex").slice(0, 24)};length=${[...normalized].length}`;
+}
+//#endregion
+export { retrievalQueryAuditValue };

package/dist/src/retrieval/candidateFusion.d.ts

@@ -0,0 +1,5 @@
+export interface RankedCandidateChannel {
+    weight: number;
+    ids: string[];
+}
+export declare function fuseRankedCandidates(channels: RankedCandidateChannel[], rankConstant?: number): Map<string, number>;

package/dist/src/retrieval/candidateFusion.js

@@ -0,0 +1,20 @@
+//#region src/retrieval/candidateFusion.ts
+function fuseRankedCandidates(channels, rankConstant = 60) {
+	const activeChannels = channels.filter((channel) => channel.weight > 0 && channel.ids.length > 0);
+	if (!activeChannels.length) return /* @__PURE__ */ new Map();
+	const maximum = activeChannels.reduce((sum, channel) => sum + channel.weight / (rankConstant + 1), 0);
+	const scores = /* @__PURE__ */ new Map();
+	for (const channel of activeChannels) {
+		const seen = /* @__PURE__ */ new Set();
+		channel.ids.forEach((id, index) => {
+			if (!id || seen.has(id)) return;
+			seen.add(id);
+			const contribution = channel.weight / (rankConstant + index + 1);
+			scores.set(id, (scores.get(id) ?? 0) + contribution);
+		});
+	}
+	for (const [id, score] of scores) scores.set(id, score / maximum);
+	return scores;
+}
+//#endregion
+export { fuseRankedCandidates };

package/dist/src/retrieval/queryProfile.d.ts

@@ -0,0 +1,16 @@
+export type RetrievalTimeHint = 'current' | 'recent' | 'historical' | 'future';
+export interface RetrievalScope {
+    sessionKey?: string;
+    workspaceId?: string;
+    projectId?: string;
+}
+export interface RetrievalQueryProfile {
+    normalized: string;
+    terms: string[];
+    cjkBigrams: string[];
+    identifiers: string[];
+    intentKinds: string[];
+    timeHints: RetrievalTimeHint[];
+    scope: RetrievalScope;
+}
+export declare function buildRetrievalQueryProfile(query: string, scope?: RetrievalScope): RetrievalQueryProfile;

package/dist/src/retrieval/queryProfile.js

@@ -0,0 +1,66 @@
+import { extractCjkBigrams, extractLexicalTerms, extractRetrievalIdentifiers, normalizeRetrievalText } from "./textFeatures.js";
+//#region src/retrieval/queryProfile.ts
+const INTENT_RULES = [
+	{
+		kinds: ["boundary"],
+		pattern: /\b(?:avoid|never|permission|confirm|approval)\b|不要|禁止|避免|确认|授权|边界/i
+	},
+	{
+		kinds: ["preference", "tool_preference"],
+		pattern: /\b(?:prefer|preference|format|language|style)\b|喜欢|偏好|格式|语言|风格|简洁|详细/i
+	},
+	{
+		kinds: [
+			"project_context",
+			"workspace_fact",
+			"task_lesson"
+		],
+		pattern: /\b(?:project|repository|repo|workspace|codebase|deploy|release)\b|项目|仓库|代码库|工作区|发布|部署/i
+	},
+	{
+		kinds: ["long_term_goal", "commitment"],
+		pattern: /\b(?:goal|plan|deadline|commitment)\b|目标|计划|截止|承诺/i
+	},
+	{
+		kinds: ["routine"],
+		pattern: /\b(?:routine|usually|weekly|daily|every time)\b|习惯|通常|每周|每天|每次/i
+	},
+	{
+		kinds: ["relationship"],
+		pattern: /\b(?:person|people|colleague|collaborator|relationship)\b|同事|合作伙伴|关系|联系人/i
+	}
+];
+const TIME_RULES = [
+	{
+		hint: "current",
+		pattern: /\b(?:now|current|today)\b|现在|当前|今天/i
+	},
+	{
+		hint: "recent",
+		pattern: /\b(?:recent|recently|latest)\b|最近|近期|最新/i
+	},
+	{
+		hint: "historical",
+		pattern: /\b(?:previous|before|history|last time)\b|之前|以前|历史|上次/i
+	},
+	{
+		hint: "future",
+		pattern: /\b(?:future|next|later|upcoming)\b|未来|下次|之后|即将/i
+	}
+];
+function buildRetrievalQueryProfile(query, scope = {}) {
+	const normalized = normalizeRetrievalText(query);
+	const intentKinds = INTENT_RULES.filter((rule) => rule.pattern.test(normalized)).flatMap((rule) => rule.kinds);
+	const timeHints = TIME_RULES.filter((rule) => rule.pattern.test(normalized)).map((rule) => rule.hint);
+	return {
+		normalized,
+		terms: extractLexicalTerms(normalized),
+		cjkBigrams: extractCjkBigrams(normalized),
+		identifiers: extractRetrievalIdentifiers(normalized),
+		intentKinds: [...new Set(intentKinds)],
+		timeHints: [...new Set(timeHints)],
+		scope: { ...scope }
+	};
+}
+//#endregion
+export { buildRetrievalQueryProfile };

package/dist/src/retrieval/textFeatures.d.ts

@@ -0,0 +1,5 @@
+export declare function normalizeRetrievalText(value: string): string;
+export declare function extractLexicalTerms(value: string): string[];
+export declare function extractCjkBigrams(value: string): string[];
+export declare function extractRetrievalIdentifiers(value: string): string[];
+export declare function retrievalLexicalSimilarity(left: string, right: string): number;

package/dist/src/retrieval/textFeatures.js

@@ -0,0 +1,71 @@
+//#region src/retrieval/textFeatures.ts
+const ENGLISH_STOP_WORDS = new Set([
+	"a",
+	"an",
+	"and",
+	"are",
+	"can",
+	"did",
+	"do",
+	"does",
+	"for",
+	"how",
+	"i",
+	"in",
+	"is",
+	"it",
+	"me",
+	"my",
+	"of",
+	"on",
+	"or",
+	"the",
+	"to",
+	"was",
+	"what",
+	"when",
+	"where",
+	"which",
+	"who",
+	"why",
+	"with",
+	"you",
+	"your"
+]);
+function normalizeRetrievalText(value) {
+	return value.normalize("NFKC").toLowerCase().replace(/\s+/g, " ").trim();
+}
+function extractLexicalTerms(value) {
+	const terms = normalizeRetrievalText(value).match(/[\p{L}\p{N}_]+/gu)?.filter((term) => term.length > 1 && !ENGLISH_STOP_WORDS.has(term)) ?? [];
+	return [...new Set(terms)];
+}
+function extractCjkBigrams(value) {
+	const features = [];
+	for (const sequence of normalizeRetrievalText(value).match(/\p{Script=Han}+/gu) ?? []) {
+		const characters = [...sequence];
+		for (let index = 0; index < characters.length - 1; index += 1) features.push(`${characters[index]}${characters[index + 1]}`);
+	}
+	return [...new Set(features)];
+}
+function extractRetrievalIdentifiers(value) {
+	const normalized = normalizeRetrievalText(value);
+	const identifiers = [
+		...normalized.match(/@[a-z0-9_.-]+\/[a-z0-9_.-]+/g) ?? [],
+		...normalized.match(/(?:[a-z0-9_.-]+\/)+[a-z0-9_.-]+/g) ?? [],
+		...normalized.match(/\b[a-z0-9_-]+\.[a-z0-9]{1,12}\b/g) ?? [],
+		...normalized.match(/#[0-9]+\b/g) ?? [],
+		...normalized.match(/\b[a-z]+-[a-z0-9-]*[0-9][a-z0-9-]*\b/g) ?? []
+	];
+	const unique = [...new Set(identifiers)];
+	return unique.filter((identifier) => !unique.includes(`@${identifier}`));
+}
+function retrievalLexicalSimilarity(left, right) {
+	const leftFeatures = new Set([...extractLexicalTerms(left).map((term) => `term:${term}`), ...extractCjkBigrams(left).map((term) => `han:${term}`)]);
+	const rightFeatures = new Set([...extractLexicalTerms(right).map((term) => `term:${term}`), ...extractCjkBigrams(right).map((term) => `han:${term}`)]);
+	if (leftFeatures.size === 0 || rightFeatures.size === 0) return 0;
+	let shared = 0;
+	for (const feature of leftFeatures) if (rightFeatures.has(feature)) shared += 1;
+	return 2 * shared / (leftFeatures.size + rightFeatures.size);
+}
+//#endregion
+export { extractCjkBigrams, extractLexicalTerms, extractRetrievalIdentifiers, normalizeRetrievalText, retrievalLexicalSimilarity };

package/dist/src/session/client-history.d.ts

@@ -3,6 +3,7 @@ import type { TranscriptStoredRow } from './session-context-for-llm.js';
 /** Transcript row for TUI and HTTP clients (flattened from persisted session messages). */
 export interface ClientHistoryMessage {
     id?: string;
+    turnId?: string;
     role: 'user' | 'assistant' | 'system';
     content: string;
     displayIndex?: number;

package/dist/src/session/client-history.js

@@ -110,6 +110,7 @@ function messagesToClientHistory(messages, opts) {
 			const text = flattenMessageContent(m.content);
 			out.push({
 				role: m.role,
+				...typeof m.turnId === "string" ? { turnId: m.turnId } : {},
 				content: text,
 				...m.media?.length ? { media: m.media } : {},
 				timestamp: parseTimestamp(m.timestamp)
@@ -121,6 +122,7 @@ function messagesToClientHistory(messages, opts) {
 			const toolCalls = toolCallsWithResults(collectMessageToolCalls(m.content, m.tool_calls), results);
 			out.push({
 				role: "assistant",
+				...typeof m.turnId === "string" ? { turnId: m.turnId } : {},
 				content: text,
 				timestamp: parseTimestamp(m.timestamp),
 				toolCalls
@@ -408,6 +410,7 @@ function transcriptRowsToClientHistory(rows, opts) {
 		if (messageRow.role === "user" || messageRow.role === "system") {
 			out.push({
 				id,
+				...messageRow.turnId ? { turnId: messageRow.turnId } : {},
 				role: messageRow.role,
 				kind: "message",
 				content: flattenMessageContent(messageRow.content ?? ""),
@@ -420,6 +423,7 @@ function transcriptRowsToClientHistory(rows, opts) {
 		const rawContent = rawAssistantContent(messageRow.content);
 		out.push({
 			id,
+			...messageRow.turnId ? { turnId: messageRow.turnId } : {},
 			role: "assistant",
 			kind: "message",
 			content: flattenMessageContent(messageRow.content ?? ""),

package/dist/src/session/index.js

@@ -1,5 +1,5 @@
-import { SessionStatus } from "./types.js";
 import { buildSessionContextForLlm, isTranscriptContextEntry, mergeLlmMessagesPreservingContextRows, transcriptRowsFromJsonArray } from "./session-context-for-llm.js";
+import { SessionStatus } from "./types.js";
 import { effectiveWorkspacePathForSession, normalizeWorkingDirectoryInput, projectWorkspacePath } from "./session-workspace.js";
 import { emitSessionTranscriptUpdate, onSessionTranscriptUpdate } from "./transcript-events.js";
 import { fallbackTitleFromMessages, generateSessionTitleFromMessages, getSessionTitleSource, isWebchatSessionKey, maybeRefineSessionTitleWithLlm, maybeSetProvisionalSessionTitle, provisionalTitleFromUserText, sanitizeGeneratedSessionTitle, sanitizeSessionTitle, shouldAutoTitleSessionKey, shouldRefineSessionTitleWithLlm } from "./session-title.js";