@nextclaw/server 0.17.0 → 0.17.2

package/dist/index.js

@@ -2895,6 +2895,7 @@ function buildConfigView(config, options) {
 	}
 	return {
 		companion: sanitizePublicConfigValue(config.companion, "companion", uiHints),
+		productAnalytics: { ...config.productAnalytics },
 		agents: sanitizePublicConfigValue(config.agents, "agents", uiHints),
 		providers,
 		search: buildSearchView(config),
@@ -3260,6 +3261,14 @@ function updateSecrets(configPath, patch) {
 		refs: { ...next.secrets.refs }
 	};
 }
+function updateProductAnalytics(configPath, patch) {
+	const config = loadConfigOrDefault(configPath);
+	if (Object.prototype.hasOwnProperty.call(patch, "enabled")) config.productAnalytics.enabled = Boolean(patch.enabled);
+	if (patch.audience === "external" || patch.audience === "internal" || patch.audience === "qa") config.productAnalytics.audience = patch.audience;
+	const next = ConfigSchema.parse(config);
+	saveConfig(next, configPath);
+	return { ...next.productAnalytics };
+}
 //#endregion
 //#region src/features/config/services/provider-connectivity.service.ts
 const PROVIDER_TEST_MAX_TOKENS = 16;
@@ -4228,6 +4237,13 @@ var ConfigRoutesController = class {
 		await this.publishConfigUpdates(["secrets"]);
 		return c.json(ok(result));
 	};
+	updateProductAnalytics = async (c) => {
+		const body = await readJson(c.req.raw);
+		if (!body.ok) return c.json(err("INVALID_BODY", "invalid json body"), 400);
+		const result = updateProductAnalytics(this.options.configPath, body.data);
+		await this.publishConfigUpdates(["productAnalytics"]);
+		return c.json(ok(result));
+	};
 	updateRuntime = async (c) => {
 		const body = await readJson(c.req.raw);
 		if (!body.ok || !body.data || typeof body.data !== "object") return c.json(err("INVALID_BODY", "invalid json body"), 400);
@@ -5433,17 +5449,25 @@ function serializePayload(value) {
 		return String(value);
 	}
 }
-function toolPayloadBytes(message) {
+function serializedBytes(value) {
+	return Buffer.byteLength(serializePayload(value), "utf8");
+}
+function toolPayloadCost(message) {
 	let bytes = 0;
+	let toolCalls = 0;
 	for (const part of message.parts) {
 		if (part.type !== "tool-invocation") continue;
+		toolCalls += 1;
 		bytes += Buffer.byteLength(serializePayload(part.args), "utf8");
 		bytes += Buffer.byteLength(serializePayload(part.result), "utf8");
 	}
-	return bytes;
+	return {
+		bytes,
+		toolCalls
+	};
 }
 function isDeferrableMessage(message) {
-	return message.role === "assistant" && message.status === "final";
+	return message.role === "assistant" && (message.status === "final" || message.status === "error");
 }
 function deferMessageToolPayload(message) {
 	const tools = message.parts.filter((part) => part.type === "tool-invocation");
@@ -5476,14 +5500,16 @@ function deferMessageToolPayload(message) {
 	};
 }
 function buildSessionMessageHistoryPayloadView(params) {
-	const { messageDetailCursors, messages } = params;
-	const messageBudgetBytes = params.messageBudgetBytes ?? 262144;
-	const pageBudgetBytes = params.pageBudgetBytes ?? 2097152;
+	const { messageBudgetBytes: requestedMessageBudgetBytes, messageDetailCursors, messages, messageToolCallBudget: requestedMessageToolCallBudget, pageBudgetBytes: requestedPageBudgetBytes, pageToolCallBudget: requestedPageToolCallBudget } = params;
+	const messageBudgetBytes = requestedMessageBudgetBytes ?? 262144;
+	const pageBudgetBytes = requestedPageBudgetBytes ?? 2097152;
+	const messageToolCallBudget = requestedMessageToolCallBudget ?? 12;
+	const pageToolCallBudget = requestedPageToolCallBudget ?? 80;
 	const candidates = messages.filter((message) => isDeferrableMessage(message) && Boolean(messageDetailCursors[message.id])).map((message) => ({
 		message,
-		bytes: toolPayloadBytes(message)
-	})).filter((candidate) => candidate.bytes > 0);
-	const deferredIds = new Set(candidates.filter((candidate) => candidate.bytes > messageBudgetBytes).map((candidate) => candidate.message.id));
+		...toolPayloadCost(message)
+	})).filter((candidate) => candidate.toolCalls > 0);
+	const deferredIds = new Set(candidates.filter((candidate) => candidate.bytes > messageBudgetBytes || candidate.toolCalls > messageToolCallBudget).map((candidate) => candidate.message.id));
 	let eagerPageBytes = candidates.reduce((total, candidate) => total + (deferredIds.has(candidate.message.id) ? 0 : candidate.bytes), 0);
 	if (eagerPageBytes > pageBudgetBytes) {
 		const remaining = candidates.filter((candidate) => !deferredIds.has(candidate.message.id)).sort((left, right) => right.bytes - left.bytes);
@@ -5493,12 +5519,41 @@ function buildSessionMessageHistoryPayloadView(params) {
 			eagerPageBytes -= candidate.bytes;
 		}
 	}
+	let eagerPageToolCalls = candidates.reduce((total, candidate) => total + (deferredIds.has(candidate.message.id) ? 0 : candidate.toolCalls), 0);
+	if (eagerPageToolCalls > pageToolCallBudget) {
+		const remaining = candidates.filter((candidate) => !deferredIds.has(candidate.message.id)).sort((left, right) => right.toolCalls - left.toolCalls || right.bytes - left.bytes);
+		for (const candidate of remaining) {
+			if (eagerPageToolCalls <= pageToolCallBudget) break;
+			deferredIds.add(candidate.message.id);
+			eagerPageToolCalls -= candidate.toolCalls;
+		}
+	}
 	const deferredToolPayloads = Object.fromEntries([...deferredIds].map((messageId) => [messageId, { cursor: messageDetailCursors[messageId] }]));
 	return {
 		messages: messages.map((message) => deferredIds.has(message.id) ? deferMessageToolPayload(message) : message),
 		deferredToolPayloads
 	};
 }
+function compactSessionMessageHistoryPayloadView(params) {
+	const { view } = params;
+	const budgetBytes = params.budgetBytes ?? 24576;
+	const minimumMessages = Math.max(1, Math.trunc(params.minimumMessages ?? 5));
+	let startIndex = Math.max(0, view.messages.length - minimumMessages);
+	let bytes = view.messages.slice(startIndex).reduce((total, message) => total + serializedBytes(message), 0);
+	while (startIndex > 0) {
+		const previousBytes = serializedBytes(view.messages[startIndex - 1]);
+		if (bytes + previousBytes > budgetBytes) break;
+		startIndex -= 1;
+		bytes += previousBytes;
+	}
+	const messages = view.messages.slice(startIndex);
+	const visibleIds = new Set(messages.map((message) => message.id));
+	return {
+		messages,
+		deferredToolPayloads: Object.fromEntries(Object.entries(view.deferredToolPayloads).filter(([messageId]) => visibleIds.has(messageId))),
+		startIndex
+	};
+}
 //#endregion
 //#region src/features/sessions/controllers/sessions.controller.ts
 const DEFAULT_SESSION_MESSAGE_PAGE_SIZE = 40;
@@ -5601,21 +5656,30 @@ var NcpSessionRoutesController = class {
 			throw error;
 		}
 		if (!page) return c.json(err("NOT_FOUND", `ncp session not found: ${sessionId}`), 404);
-		const historyPayload = c.req.query("toolPayload") === "summary" ? buildSessionMessageHistoryPayloadView({
+		const useSummaryPayload = c.req.query("toolPayload") === "summary";
+		const historyPayload = useSummaryPayload ? buildSessionMessageHistoryPayloadView({
 			messages: page.messages,
 			messageDetailCursors: page.messageDetailCursors
 		}) : {
 			messages: page.messages,
 			deferredToolPayloads: {}
 		};
+		const compactHistoryPayload = useSummaryPayload && !c.req.query("cursor") && c.req.query("initialPayload") === "compact" ? compactSessionMessageHistoryPayloadView({ view: historyPayload }) : {
+			...historyPayload,
+			startIndex: 0
+		};
+		const compactStartCursor = compactHistoryPayload.startIndex > 0 ? page.messageDetailCursors[page.messages[compactHistoryPayload.startIndex - 1]?.id ?? ""] ?? page.pageInfo.startCursor : page.pageInfo.startCursor;
 		const payload = {
 			sessionId,
 			status: this.options.kernel.isSessionRunning(sessionId) ? "running" : "idle",
-			messages: historyPayload.messages,
-			...Object.keys(historyPayload.deferredToolPayloads).length > 0 ? { deferredToolPayloads: historyPayload.deferredToolPayloads } : {},
+			messages: compactHistoryPayload.messages,
+			...Object.keys(compactHistoryPayload.deferredToolPayloads).length > 0 ? { deferredToolPayloads: compactHistoryPayload.deferredToolPayloads } : {},
 			...page.contextWindow ? { contextWindow: page.contextWindow } : {},
 			total: page.total,
-			pageInfo: page.pageInfo
+			pageInfo: {
+				startCursor: compactStartCursor,
+				hasPreviousPage: page.pageInfo.hasPreviousPage || compactHistoryPayload.startIndex > 0
+			}
 		};
 		return c.json(ok(payload));
 	};
@@ -5655,15 +5719,35 @@ var NcpSessionRoutesController = class {
 		if (!await this.options.kernel.sessionManager.getSession(sessionId)) return c.json(err("NOT_FOUND", `ncp session not found: ${sessionId}`), 404);
 		const payload = {
 			sessionId,
-			inputs: [...this.options.kernel.agentRunRequestManager.listQueuedInputs(sessionId)]
+			inputs: [...this.options.kernel.agentRunRequestManager.pendingInputs.listQueuedInputs(sessionId)]
+		};
+		return c.json(ok(payload));
+	};
+	listSessionPendingInputs = async (c) => {
+		const sessionId = decodeURIComponent(c.req.param("sessionId"));
+		if (!await this.options.kernel.sessionManager.getSession(sessionId)) return c.json(err("NOT_FOUND", `ncp session not found: ${sessionId}`), 404);
+		const payload = {
+			sessionId,
+			inputs: [...this.options.kernel.agentRunRequestManager.pendingInputs.listPendingInputs(sessionId)]
 		};
 		return c.json(ok(payload));
 	};
+	steerSessionQueuedInput = async (c) => {
+		const sessionId = decodeURIComponent(c.req.param("sessionId"));
+		const queuedInputId = decodeURIComponent(c.req.param("queuedInputId"));
+		if (!await this.options.kernel.sessionManager.getSession(sessionId)) return c.json(err("NOT_FOUND", `ncp session not found: ${sessionId}`), 404);
+		const result = await this.options.kernel.agentRunRequestManager.pendingInputs.steerQueuedInput(sessionId, queuedInputId);
+		if (!result.ok) {
+			if (result.reason === "not-found") return c.json(err("NOT_FOUND", `queued input not found in session ${sessionId}: ${queuedInputId}`), 404);
+			return c.json(err("STEER_UNAVAILABLE", "The active runtime cannot accept this input at the next safe step."), 409);
+		}
+		return c.json(ok(result.input));
+	};
 	deleteSessionQueuedInput = async (c) => {
 		const sessionId = decodeURIComponent(c.req.param("sessionId"));
 		const queuedInputId = decodeURIComponent(c.req.param("queuedInputId"));
 		if (!await this.options.kernel.sessionManager.getSession(sessionId)) return c.json(err("NOT_FOUND", `ncp session not found: ${sessionId}`), 404);
-		const removed = this.options.kernel.agentRunRequestManager.removeQueuedInput(sessionId, queuedInputId);
+		const removed = this.options.kernel.agentRunRequestManager.pendingInputs.removeQueuedInput(sessionId, queuedInputId);
 		if (!removed) return c.json(err("NOT_FOUND", `queued input not found in session ${sessionId}: ${queuedInputId}`), 404);
 		return c.json(ok(removed));
 	};
@@ -6208,6 +6292,7 @@ function statusForServiceAppError(code) {
 		case "SERVICE_APP_ACTION_NOT_DECLARED": return 403;
 		case "SERVICE_APP_ACTION_NOT_FOUND":
 		case "SERVICE_APP_NOT_FOUND": return 404;
+		case "SERVICE_APP_RUNTIME_FAILED": return 502;
 		default: return 400;
 	}
 }
@@ -6348,7 +6433,7 @@ var ServiceAppsRoutesController = class {
 		if (isServiceAppError(error)) return c.json(err(error.code, error.message), statusForServiceAppError(error.code));
 		if (isPanelAppError(error)) return c.json(err(error.code, error.message), 404);
 		if (error instanceof Error && error.message === "panel app bridge session is required") return c.json(err("PANEL_APP_BRIDGE_SESSION_REQUIRED", error.message), 401);
-		throw error;
+		return c.json(err("SERVICE_APP_REQUEST_FAILED", "The Service App request failed. Please retry."), 500);
 	};
 };
 //#endregion
@@ -6593,6 +6678,16 @@ var UiRouteRegistry = class {
 				"/api/ncp/sessions/:sessionId/queued-inputs/:queuedInputId",
 				ncpSession.deleteSessionQueuedInput
 			],
+			[
+				"post",
+				"/api/ncp/sessions/:sessionId/queued-inputs/:queuedInputId/steer",
+				ncpSession.steerSessionQueuedInput
+			],
+			[
+				"get",
+				"/api/ncp/sessions/:sessionId/pending-inputs",
+				ncpSession.listSessionPendingInputs
+			],
 			[
 				"get",
 				"/api/ncp/sessions/:sessionId/skills",
@@ -7130,6 +7225,11 @@ var UiRouteRegistry = class {
 				"/api/config/secrets",
 				config.updateSecrets
 			],
+			[
+				"put",
+				"/api/config/product-analytics",
+				config.updateProductAnalytics
+			],
 			[
 				"put",
 				"/api/config/runtime",
@@ -7506,6 +7606,6 @@ async function startUiServer(gateway) {
 	};
 }
 //#endregion
-export { AppDataRoutesController, AppPackagesRoutesController, ConfigRoutesController, InboxDeliveriesRoutesController, PanelAppsRoutesController, RuntimeControlRoutesController, ServiceAppsRoutesController, buildConfigMeta, buildConfigSchemaView, buildConfigView, buildProviderTemplatesView, buildProvidersView, createProvider, createUiRouter, deleteProvider, ensureUiBridgeSecret, executeConfigAction, getUiBridgeSecretPath, loadConfigOrDefault, readUiBridgeSecret, startUiServer, updateChannel, updateModel, updateProvider, updateRuntime, updateSearch, updateSecrets };
+export { AppDataRoutesController, AppPackagesRoutesController, ConfigRoutesController, InboxDeliveriesRoutesController, PanelAppsRoutesController, RuntimeControlRoutesController, ServiceAppsRoutesController, buildConfigMeta, buildConfigSchemaView, buildConfigView, buildProviderTemplatesView, buildProvidersView, createProvider, createUiRouter, deleteProvider, ensureUiBridgeSecret, executeConfigAction, getUiBridgeSecretPath, loadConfigOrDefault, readUiBridgeSecret, startUiServer, updateChannel, updateModel, updateProductAnalytics, updateProvider, updateRuntime, updateSearch, updateSecrets };
 
 //# sourceMappingURL=index.js.map