@k2b/cloud 0.48.0 → 0.50.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k2b/cloud",
-  "version": "0.48.0",
+  "version": "0.50.0",
   "description": "Application platform library for independently deployed Hono and SolidJS services behind a dynamic gateway.",
   "license": "AGPL-3.0-or-later",
   "repository": {
@@ -131,7 +131,7 @@
     "@tailwindcss/typography": "0.5.20",
     "@k2b/nessi": "0.18.0",
     "@k2b/ssr": "0.20.2",
-    "@k2b/ui": "0.38.0",
+    "@k2b/ui": "0.39.0",
     "@k2b/stdlib": "0.30.0",
     "@k2b/sync": "7.0.1",
     "@nats-io/jetstream": "3.4.0",
@@ -163,7 +163,7 @@
     "hash-wasm": "4.12.0",
     "@types/sanitize-html": "2.16.1",
     "@types/web-push": "3.6.4",
-    "@k2b/editor": "0.1.1"
+    "@k2b/editor": "0.3.0"
   },
   "devDependencies": {
     "@babel/core": "8.0.6",

package/src/_internal/app-access-resources.ts

@@ -1,8 +1,9 @@
 import { isDeepStrictEqual } from "node:util";
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
 import { waitWithin } from "../api/fanout";
 import type { AppMeta } from "../contracts/app";
 import { type AppAccessDeclaration, type AppAccessRule, AppAccessRuleSchema, type ResourceAppAccessAdapter } from "../contracts/app-access";
+import { sql } from "../runtime/clients";
 import type { RequestAuthority } from "../server/middleware/auth";
 import { coreOrigin } from "../services/identity/core-origin";
 import { invocationAuthorityFromRequest } from "../services/identity/invocation-authority";

package/src/_internal/app-capabilities.ts

@@ -0,0 +1,73 @@
+import { Hono } from "hono";
+import { CAPABILITY_MAX_REQUEST_BYTES } from "../contracts/capabilities";
+import { resolveLocale } from "../server/locale";
+import { getActiveAppKey } from "../services/app-keys";
+import { verifyAppCapabilityInvocation } from "../services/identity/invocation-token";
+import { get } from "../services/settings";
+import { readBoundedJson } from "./bounded-json";
+import { type CompiledCapabilities, invokeCompiledCapability, serializeCapabilityProviderResult } from "./capabilities";
+import { withCapabilityRequestTimeout } from "./capability-timeout";
+
+/** Separate from ordinary auth: application authority never becomes a grant-bearing person. */
+export const createAppCapabilityRoutes = (compiled: CompiledCapabilities) => {
+  const router = new Hono();
+  for (const kind of ["query", "action"] as const) {
+    router.post(`/${kind === "query" ? "queries" : "actions"}/:capabilityId`, (c) =>
+      withCapabilityRequestTimeout(c, kind, async () => {
+        const operation = (kind === "query" ? compiled.queries : compiled.actions).get(c.req.param("capabilityId"));
+        const deny = () => c.json({ code: "FORBIDDEN", message: "A permitted signed app capability invocation is required" }, 403);
+        if (!operation?.manifest.appPermission || operation.manifest.stream) return deny();
+        const body = await readBoundedJson(c.req.raw, CAPABILITY_MAX_REQUEST_BYTES);
+        if (
+          !body.ok ||
+          !body.data ||
+          typeof body.data !== "object" ||
+          Array.isArray(body.data) ||
+          Object.keys(body.data).length !== 1 ||
+          !("input" in body.data)
+        )
+          return c.json({ code: "VALIDATION_FAILED", message: "Expected a bounded input object" }, 400);
+        const token = c.req.header("authorization")?.match(/^Bearer (\S+)$/)?.[1];
+        if (!token) return deny();
+        try {
+          const claims = await verifyAppCapabilityInvocation(token, {
+            appId: compiled.manifest.appId,
+            kind,
+            capabilityId: operation.manifest.localId,
+            schemaHash: operation.manifest.schemaHash,
+            permission: operation.manifest.appPermission,
+            input: body.data.input,
+          });
+          if (!claims) return deny();
+          const locale = resolveLocale(c.req.raw.headers, await get<string>("app.locale"));
+          if (!(await getActiveAppKey({ appId: claims.sub, keyId: claims.key_id }))) return deny();
+          const result = await invokeCompiledCapability({
+            compiled,
+            kind,
+            localId: operation.manifest.localId,
+            input: body.data.input,
+            expectedSchemaHash: claims.schema_hash,
+            context: {
+              actor: { kind: "app", appId: claims.sub, keyId: claims.key_id },
+              accessSubject: { type: "none" },
+              user: null,
+              locale,
+              requestId: claims.request_id,
+              origin: "app",
+              signal: c.req.raw.signal,
+              ...(c.req.header("idempotency-key") ? { idempotencyKey: c.req.header("idempotency-key") } : {}),
+            },
+          });
+          const response = serializeCapabilityProviderResult(result);
+          return new Response(response.body, {
+            status: response.status,
+            headers: { "content-type": "application/json", "cache-control": "no-store" },
+          });
+        } catch {
+          return c.json({ code: "APP_UNAVAILABLE", message: "App invocation verification unavailable" }, 503);
+        }
+      }),
+    );
+  }
+  return router;
+};

package/src/_internal/app-event-catalog.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import type { CapabilityEventCatalogEntry, CapabilityManifest } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 
 export type CatalogSubscription = CapabilityEventCatalogEntry["subscribers"][number] & { eventType: string; version: number };
 

package/src/_internal/app-queries.ts

@@ -1,6 +1,6 @@
-import { sql } from "bun";
 import { Hono } from "hono";
 import { CAPABILITY_MAX_REQUEST_BYTES } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import { resolveLocale } from "../server/locale";
 import { verifyAppQueryInvocation } from "../services/identity/invocation-token";
 import { get } from "../services/settings";

package/src/_internal/application-package.ts

@@ -1,4 +1,5 @@
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
+import { sql } from "../runtime/clients";
 import { ensureSchema } from "../services/postgres";
 import builtInAppIds from "./built-in-app-ids.json";
 

package/src/_internal/capabilities.ts

@@ -133,6 +133,7 @@ const TYPE_FIELDS = {
   access: true,
 } satisfies DefinedFields<CapabilityResourceTypeDefinition>;
 const QUERY_FIELDS = {
+  app: true,
   appOnly: true,
   title: true,
   description: true,
@@ -144,6 +145,7 @@ const QUERY_FIELDS = {
   run: true,
 } satisfies DefinedFields<CapabilityQueryDefinition>;
 const ACTION_FIELDS = {
+  app: true,
   title: true,
   description: true,
   input: true,
@@ -682,6 +684,11 @@ const compileOperationSchemas = (definition: QueryDefinition | CapabilityActionD
   ) {
     throw new Error(`${label} input field "idempotencyKey" is reserved for capability transports`);
   }
+  if (definition.app !== undefined) {
+    assertDefinedFields(definition.app, { permission: true, run: true }, `${label} app`);
+    if (typeof definition.app.run !== "function") throw new Error(`${label} app.run must be a function`);
+    if (definition.stream) throw new Error(`${label} app calls cannot use streams`);
+  }
   const resultZodSchema = capabilityResultSchema(definition.data);
   const dataSchema = projectSchema(definition.data, `${label} data`, "output");
   return {
@@ -691,6 +698,7 @@ const compileOperationSchemas = (definition: QueryDefinition | CapabilityActionD
     schemaHash: capabilityHash({
       inputSchema,
       dataSchema,
+      ...(definition.app ? { appPermission: definition.app.permission } : {}),
       ...("appOnly" in definition && definition.appOnly !== undefined ? { appOnly: definition.appOnly } : {}),
       ...(definition.stream ? { stream: { direction: definition.stream.direction, maxBytes: definition.stream.maxBytes } } : {}),
     }),
@@ -843,6 +851,7 @@ export const compileCapabilities = (
       inputSchema: schemas.inputSchema,
       dataSchema: schemas.dataSchema,
       schemaHash: schemas.schemaHash,
+      ...(definition.app ? { appPermission: definition.app.permission } : {}),
       ...(definition.stream ? { stream: { direction: definition.stream.direction, maxBytes: definition.stream.maxBytes } } : {}),
       openWorld: definition.openWorld,
       universalSearch: normalizeSearchTags(definition, label),
@@ -927,6 +936,7 @@ export const compileCapabilities = (
       inputSchema: schemas.inputSchema,
       dataSchema: schemas.dataSchema,
       schemaHash: schemas.schemaHash,
+      ...(definition.app ? { appPermission: definition.app.permission } : {}),
       ...(definition.stream ? { stream: { direction: definition.stream.direction, maxBytes: definition.stream.maxBytes } } : {}),
       destructive: definition.destructive,
       openWorld: definition.openWorld,
@@ -1280,6 +1290,7 @@ const assertUsableOperation = (operation: CapabilityQueryManifest | CapabilityAc
   const expectedSchemaHash = capabilityHash({
     inputSchema: operation.inputSchema,
     dataSchema: operation.dataSchema,
+    ...(operation.appPermission ? { appPermission: operation.appPermission } : {}),
     ...("appOnly" in operation && operation.appOnly !== undefined ? { appOnly: operation.appOnly } : {}),
     ...(operation.stream ? { stream: operation.stream } : {}),
   });
@@ -1782,9 +1793,13 @@ export const invokeCompiledCapability = async (params: {
     let invoked: CapabilityInvocationResult<unknown>;
     if (isAppCapabilityContext(context)) {
       const definition = operation.definition;
-      if (params.kind !== "query" || !("appOnly" in definition) || definition.appOnly !== true)
+      if (definition.app && context.actor.keyId) {
+        invoked = await definition.app.run(input.data, context);
+      } else if (params.kind === "query" && "appOnly" in definition && definition.appOnly === true) {
+        invoked = await definition.run(input.data, context);
+      } else {
         return { ok: false, error: { code: "FORBIDDEN", message: "App caller is not allowed", status: 403 } };
-      invoked = await definition.run(input.data, context);
+      }
     } else {
       if (operation.definition.appOnly) return { ok: false, error: { code: "FORBIDDEN", message: "App authority required", status: 403 } };
       invoked = await operation.definition.run(input.data, context);

package/src/_internal/define-app.ts

@@ -13,6 +13,7 @@ import { registerPageSwap } from "../ssr/page-swap";
 import { preloadPanelConsent } from "../ssr/panel-consent";
 import { appAccessManagementPath } from "./app-access-path";
 import { bindResourceAppAccess, RESOURCE_ACCESS_PATH } from "./app-access-resources";
+import { createAppCapabilityRoutes } from "./app-capabilities";
 import { createAppQueryRoutes } from "./app-queries";
 import { registerApplicationPackage, resolveApplicationPackage } from "./application-package";
 import { invokeCapabilityStream } from "./capability-streams";
@@ -956,6 +957,7 @@ export const defineApp = <
 
       if (compiledCapabilities) {
         server.route("/api/_internal/capabilities/v1/app-queries", createAppQueryRoutes(compiledCapabilities));
+        server.route("/api/_internal/capabilities/v1/app-capabilities", createAppCapabilityRoutes(compiledCapabilities));
         const invoke = async (c: Context<AuthContext>, kind: "query" | "action" | "review") =>
           withCapabilityRequestTimeout(c, kind, async () => {
             // Framework-owned endpoints run before the app's settings middleware,

package/src/ai/app-skill-store.ts

@@ -1,8 +1,9 @@
-import { type SQL, sql, type TransactionSQL } from "bun";
+import type { SQL, TransactionSQL } from "bun";
 import { z } from "zod";
 import { appAudienceRoles } from "../_internal/app-roles";
 import { APP_REGISTRY_TTL_MS } from "../_internal/registry";
 import type { AppRegistryEntry } from "../contracts/registry";
+import { sql } from "../runtime/clients";
 import { logger } from "../services/logging";
 import { toPgTextArray } from "../services/postgres";
 import { type AppSkillDefinition, parseStoredAppSkill } from "./app-skills";

package/src/ai/app-skills.ts

@@ -1,5 +1,6 @@
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
 import { z } from "zod";
+import { sql } from "../runtime/clients";
 import { logger } from "../services/logging";
 import { AI_SKILL_CATALOG_MAX_CHARS, aiSkillCatalogChars } from "./skill-catalog";
 import { type AiSkillContent, canonicalHash, contentHash, validateSkillContent } from "./skill-content";

package/src/ai/approvals.ts

@@ -1,5 +1,6 @@
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
 import type { AccessSubject } from "../contracts/shared";
+import { sql } from "../runtime/clients";
 import type { RequestActor } from "../server/middleware/auth";
 import { type AuditActor, type AuditRecordParams, audit } from "../services/audit";
 import { toPgTextArray } from "../services/postgres";

package/src/ai/chat-tasks.ts

@@ -1,7 +1,8 @@
 import type { Message } from "@k2b/nessi";
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
 import { getCapability } from "../_internal/registry";
 import { type CapabilityActionPolicy, capabilityActionPolicy } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import { logger } from "../services/logging";
 import {
   createMandate,

package/src/ai/credentials.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { decryptValue, encryptValue } from "../services/settings/crypto";
 
 type SqlClient = typeof sql;

package/src/ai/dictation-runtime.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { lazySync } from "../_internal/process-sync";
+import { sql } from "../runtime/clients";
 import { get as getUser } from "../services/accounts/users";
 import { logger, trace } from "../services/logging";
 import { superviseRuntimeTask } from "../services/runtime-lifecycle";

package/src/ai/dictations.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { z } from "zod";
+import { sql } from "../runtime/clients";
 import { inspectAiAudio } from "./audio-format";
 import { createUniqueAiFileInTransaction } from "./files-store";
 import { AiSaveConversationDraftInputSchema } from "./http";

package/src/ai/files-store.ts

@@ -1,4 +1,5 @@
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
+import { sql } from "../runtime/clients";
 import { stripImageMetadata } from "../services/image-metadata";
 import { AiFileVersionConflict, AiFileWriteError, aiFileContentVersion } from "./file-content-version";
 import { isAiImage } from "./file-media-type";

package/src/ai/inference-calls.ts

@@ -1,4 +1,5 @@
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
+import { sql } from "../runtime/clients";
 import type { AccessSubject } from "../server/services/access";
 import { aiBudgetUnits, aiCostDecimal, aiCostUnits, aiDecimalUnits, hasBillableAiPricing } from "../shared/ai-costs";
 import { AiQuotaError, aiQuotas, quotaWindow } from "./quotas";

package/src/ai/map-store.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { z } from "zod";
+import { sql } from "../runtime/clients";
 import { toPgTextArray } from "../services/postgres";
 import type { AiMap, AiMapCommand } from "./map-contracts";
 import { AiMapSchema, aiMapToolResult } from "./map-contracts";

package/src/ai/map-tool.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import type { CapabilityCaller } from "../capabilities/server";
+import { sql } from "../runtime/clients";
 import { resolveAiCapabilityActor } from "./capability-execution";
 import { AiMapToolInputSchema, AiMapToolResultSchema, aiMapToolResult } from "./map-contracts";
 import { executeStoredAiMap } from "./map-execution";

package/src/ai/memories.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { type CloudResourceRef, CloudResourceRefSchema } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import { logger } from "../services/logging";
 import { withAiShortId } from "./short-id";
 

package/src/ai/memory-learning-runs.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import type { CloudResourceRef } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import type { AiMemoryKind } from "./memories";
 import { withAiShortId } from "./short-id";
 

package/src/ai/memory-learning.ts

@@ -1,7 +1,7 @@
 import { createHash } from "node:crypto";
-import { sql } from "bun";
 import { z } from "zod";
 import { CloudResourceRefSchema } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import { coreSettings } from "../services";
 import { logger } from "../services/logging";
 import { normalizeLocale } from "../shared/locale";

package/src/ai/memory-workflow-evidence.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { type CloudResourceRef, CloudResourceRefSchema } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import { AI_MEMORY_LEARNING_DEFAULT_ENABLED } from "./prefs";
 
 const MAX_RECEIPT_RESOURCES = 20;

package/src/ai/message-queue.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { logger } from "../services/logging";
 import { aiChatAccessSubject, isAssistantChatTurn } from "./assistant-models";
 import { editAiDraftText } from "./draft-content";

package/src/ai/migrate.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { CapabilityActionReviewDataSchema } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import { APPROVAL_MAX_WAIT_MS, approvalAssurance, approvalScopeFromToolName, approvals, migrateApprovals } from "../services/approvals";
 import { migrateChatTaskReasons } from "./chat-task-reasons-migrate";
 import { migrateAiMaps } from "./map-store";

package/src/ai/model-access-migrate.ts

@@ -1,4 +1,4 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
 
 export const migrateAiModelAccess = async (): Promise<void> => {
   await sql.begin(async (tx) => {

package/src/ai/model-access.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import type { AccessEntry, Principal, ServiceAccountKind } from "../contracts/shared";
+import { sql } from "../runtime/clients";
 import { type AccessSubject, buildAccessPrincipalCondition, createAccess } from "../server/services/access";
 import { toPgTextArray } from "../services/postgres";
 import type { AiModelAccessDraft } from "../shared/ai-models";

package/src/ai/model-catalog.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { z } from "zod";
+import { sql } from "../runtime/clients";
 import { ConfigConflict } from "../services/config-conflict";
 import { stripImageDataUrlMetadata } from "../services/image-metadata";
 import {

package/src/ai/model-delete.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { z } from "zod";
+import { sql } from "../runtime/clients";
 import { recursiveGroupIdsSubquery } from "../services/accounts/group-sql";
 import { toPgTextArray } from "../services/postgres";
 import { type AiDeleteModelInput, type AiModel, type AiModelSlot, type AiProvider, aiReplacementProblem } from "../shared/ai-models";

package/src/ai/model-usage.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { toPgTextArray } from "../services/postgres";
 import type { AiModelUsage } from "../shared/ai-models";
 import { aiModelCatalog } from "./model-catalog";

package/src/ai/open-questions.ts

@@ -1,7 +1,7 @@
-import { sql } from "bun";
 import { z } from "zod";
 import { APPROVALS_PAGE_SIZE } from "../contracts/approvals";
 import { CapabilityActionReviewPresentationSchema, CapabilitySemanticLinkSchema } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import { openRequests } from "../services/approvals/content";
 import { logger } from "../services/logging";
 import { reviewShortText, toolActionCard, toolBlockReview } from "./chat/action-card";

package/src/ai/openai-api-slots.ts

@@ -1,4 +1,5 @@
-import { redis } from "bun";
+import { redis } from "../runtime/clients";
+
 import type { AccessSubject } from "../server/services/access";
 import { logger } from "../services/logging";
 

package/src/ai/prefs.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import type { RequestActor } from "../server";
 import { type AiModelRequest, AiModelRequestSchema } from "../shared/ai-models";
 

package/src/ai/projects.ts

@@ -1,6 +1,7 @@
-import { type SQL, type SQLQuery, sql } from "bun";
+import type { SQL, SQLQuery } from "bun";
 import type { CloudResourceRef } from "../contracts/capabilities";
 import { AuthenticatedPrincipalSchema, type ServiceAccountKind } from "../contracts/shared";
+import { sql } from "../runtime/clients";
 import {
   buildAccessPrincipalCondition,
   createAccess,

package/src/ai/provider-connections.ts

@@ -1,5 +1,5 @@
-import { sql } from "bun";
 import { z } from "zod";
+import { sql } from "../runtime/clients";
 import type { AiProvider } from "../shared/ai-models";
 import { getAiCredential } from "./credentials";
 import { getAiRequestHeaders } from "./request-headers";

package/src/ai/quota-limits.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { recursiveGroupIdsSubquery } from "../services/accounts/group-sql";
 import { toPgTextArray } from "../services/postgres";
 import { hasBillableAiPricing } from "../shared/ai-costs";

package/src/ai/quota-provider.ts

@@ -1,6 +1,7 @@
 import { setTimeout as delay } from "node:timers/promises";
 import { estimateTokens, type Provider } from "@k2b/nessi";
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import type { AccessSubject } from "../server/services/access";
 import { logger } from "../services/logging";
 import type { AiResolvedModelRef } from "../shared/ai-models";

package/src/ai/quota-report.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { resolveDisplayNames } from "../server/services/access";
 import { recursiveGroupIdsSubquery } from "../services/accounts/group-sql";
 import { toPgTextArray } from "../services/postgres";

package/src/ai/quotas-migrate.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 export async function migrateAiQuotas() {
   await sql.begin(async (db) => {
     await db`CREATE TABLE IF NOT EXISTS ai.cost_config (

package/src/ai/quotas.ts

@@ -1,4 +1,5 @@
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
+import { sql } from "../runtime/clients";
 import { type AccessSubject, buildAccessPrincipalCondition } from "../server/services/access";
 import { hasBillableAiPricing } from "../shared/ai-costs";
 import { type AiQuotaConfig, AiQuotaConfigSchema, type AiQuotaIdentity, type AiQuotaSnapshot } from "../shared/ai-quotas";

package/src/ai/request-headers.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { decryptValue, encryptValue } from "../services/settings/crypto";
 import { AiRequestHeadersSchema, patchAiRequestHeaders } from "../shared/ai-request-options";
 

package/src/ai/review-content.ts

@@ -1,7 +1,8 @@
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
 import { capabilityRequestHash } from "../capabilities/claims";
 import { parseStoredReviewContent } from "../capabilities/review-storage";
 import { CAPABILITY_MAX_REVIEW_CONTENT_BYTES, type CapabilityActionReviewPresentation } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import type { AiStoredActionReview } from "./action-review";
 
 export type ReviewContentLocation = { conversationId: string; turnId: string; callId: string };

package/src/ai/skill-search.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { toPgTextArray } from "../services/postgres";
 
 const BM25_INDEX = "ai.skills_search_bm25_idx";

package/src/ai/skills.ts

@@ -1,6 +1,7 @@
-import { type SQL, type SQLQuery, sql } from "bun";
+import type { SQL, SQLQuery } from "bun";
 import { listApps } from "../_internal/registry";
 import { AuthenticatedPrincipalSchema, type ServiceAccountKind } from "../contracts/shared";
+import { sql } from "../runtime/clients";
 import type { RequestAuthority } from "../server/middleware/auth";
 import {
   buildAccessPrincipalCondition,

package/src/ai/store.ts

@@ -1,9 +1,10 @@
 import type { DoneReason, InboundEvent, LoopAggregate, Message, SessionStore, StoreEntry } from "@k2b/nessi";
 import type { Usage } from "@k2b/nessi/ai";
-import { type SQL, sql } from "bun";
+import type { SQL } from "bun";
 import { capabilityRequestHash } from "../capabilities/claims";
 import { restoreReviewSnapshot, serializeReviewSnapshot } from "../capabilities/review-storage";
 import { type CapabilityActionReviewPresentation, CapabilityActionReviewPresentationSchema } from "../contracts/capabilities";
+import { sql } from "../runtime/clients";
 import { logger } from "../services/logging";
 import { toPgTextArray } from "../services/postgres";
 import { AI_TOOL_CHECK_STALE_MS, type AiActionCheck, type AiStoredActionReview } from "./action-review";

package/src/ai/structured-runs.ts

@@ -1,5 +1,6 @@
 import type { Usage } from "@k2b/nessi";
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { logger } from "../services/logging";
 
 export type AiUsageAttribution = {

package/src/ai/tool-audit.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import type { ApprovalDecisionChannel } from "../services/approvals";
 
 /**

package/src/ai/turn-timing.ts

@@ -1,5 +1,5 @@
 import type { LoopAggregate, OutboundEvent } from "@k2b/nessi";
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
 
 export type TimingInterval = { start: number; end: number };
 const union = (intervals: TimingInterval[]): TimingInterval[] => {

package/src/ai/usage.ts

@@ -1,4 +1,5 @@
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { type AiUsageQuery, AiUsageQuerySchema } from "../shared/ai-usage";
 import { aiQuotas } from "./quotas";
 

package/src/ai/web-provenance.ts

@@ -1,5 +1,6 @@
 import { domainToUnicode } from "node:url";
-import { sql } from "bun";
+import { sql } from "../runtime/clients";
+
 import { toPgTextArray } from "../services/postgres";
 
 /** The longest address web_extract and fetch_file accept; a longer one can never be read, so it is never recorded. */

package/src/api/admin-ai-quotas.ts

@@ -1,9 +1,9 @@
-import { sql } from "bun";
 import { Hono, type MiddlewareHandler } from "hono";
 import { AiBackgroundCostError, backgroundCostState, releaseBackgroundCostStop } from "../ai/inference-calls";
 import { quotaAdminConfig, quotaReport } from "../ai/quota-report";
 import { AiQuotaError, aiQuotas } from "../ai/quotas";
 import { readAiSettingsState } from "../ai/settings";
+import { sql } from "../runtime/clients";
 import { type AuthContext, auth, v } from "../server";
 import { hasBillableAiPricing } from "../shared/ai-costs";
 import {