okengine 0.5.1 → 0.6.1

package/src/drivers/channel-webpush.ts

@@ -1,9 +1,12 @@
 /**
- * `webpush` channel driver — RFC 8030 (Web Push) + VAPID (RFC 8292).
+ * `webpush` channel driver — RFC 8030 + VAPID via sently.
  *
- * Implemented natively with Web Crypto. No third-party push library.
+ * Call path: ChannelTransport.send → createPushSender → WebPushTransport.
  */
 
+import { createPushSender } from "sently/push";
+import { WebPushTransport } from "sently/transports/webpush";
+import { mapSentlySendError, mapSentlySendResult } from "./channel-sently-map.ts";
 import type {
   ChannelDriver,
   ChannelMessage,
@@ -12,263 +15,60 @@ import type {
   ChannelTransport,
 } from "./channel-types.ts";
 
-/**
- * Decode a URL-safe base64 string.
- *
- * @param input - Base64url text
- */
-function b64urlDecode(input: string): Uint8Array<ArrayBuffer> {
-  const pad = "=".repeat((4 - (input.length % 4)) % 4);
-  const b64 = (input + pad).replace(/-/g, "+").replace(/_/g, "/");
-  const bin = atob(b64);
-  const out = new Uint8Array(bin.length);
-  for (let i = 0; i < bin.length; i++) out[i] = bin.charCodeAt(i);
-  return out;
-}
-
-/** Fresh buffer for Web Crypto `BufferSource` typing. */
-function asBufferSource(bytes: Uint8Array): Uint8Array<ArrayBuffer> {
-  return new Uint8Array(bytes);
-}
-
-/**
- * Encode bytes as base64url (no padding).
- *
- * @param bytes - Input
- */
-function b64urlEncode(bytes: Uint8Array): string {
-  let s = "";
-  for (const b of bytes) s += String.fromCharCode(b);
-  return btoa(s).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-
-/**
- * Import a VAPID ECDSA P-256 private key from base64url raw or PKCS8.
- *
- * @param privateKeyB64 - Base64url private key
- */
-async function importVapidPrivateKey(privateKeyB64: string): Promise<CryptoKey> {
-  const raw = b64urlDecode(privateKeyB64);
-  // Prefer PKCS8; fall back to raw JWK construction for 32-byte seeds.
-  if (raw.length > 32) {
-    return crypto.subtle.importKey(
-      "pkcs8",
-      asBufferSource(raw),
-      { name: "ECDSA", namedCurve: "P-256" },
-      false,
-      ["sign"],
-    );
-  }
-  // Build a minimal JWK from d (and a synthetic public x/y via derive is hard);
-  // tests inject fetch and only need Authorization header shape — use ECDSA
-  // with a generated key when raw seed is provided without full PKCS8.
-  const pair = await crypto.subtle.generateKey({ name: "ECDSA", namedCurve: "P-256" }, true, [
-    "sign",
-    "verify",
-  ]);
-  return pair.privateKey;
-}
-
-/**
- * Build a VAPID JWT (RFC 8292) for the push audience.
- *
- * @param audience - Origin of the push service
- * @param subject - `mailto:` or HTTPS contact
- * @param privateKey - ECDSA P-256 key
- */
-async function buildVapidJwt(
-  audience: string,
-  subject: string,
-  privateKey: CryptoKey,
-): Promise<string> {
-  const header = b64urlEncode(
-    new TextEncoder().encode(JSON.stringify({ typ: "JWT", alg: "ES256" })),
-  );
-  const exp = Math.floor(Date.now() / 1000) + 12 * 60 * 60;
-  const payload = b64urlEncode(
-    new TextEncoder().encode(JSON.stringify({ aud: audience, exp, sub: subject })),
-  );
-  const data = new TextEncoder().encode(`${header}.${payload}`);
-  const sig = new Uint8Array(
-    await crypto.subtle.sign({ name: "ECDSA", hash: "SHA-256" }, privateKey, data),
-  );
-  // Convert DER → raw r||s if needed; Web Crypto in Bun returns raw P-1363.
-  return `${header}.${payload}.${b64urlEncode(sig)}`;
-}
-
-/**
- * Minimal RFC 8030 encrypted body: salt + rs + server public + ciphertext.
- * For tests with injected fetch we send a well-formed envelope; production
- * should use full ece (aes128gcm). Here we implement aes128gcm content-coding
- * with Web Crypto ECDH + HKDF as specified.
- *
- * @param plaintext - Push payload bytes
- * @param p256dh - Subscriber public key (base64url)
- * @param auth - Subscriber auth secret (base64url)
- */
-async function encryptPushBody(
-  plaintext: Uint8Array,
-  p256dh: string,
-  auth: string,
-): Promise<{ body: Uint8Array; salt: Uint8Array; localPublic: Uint8Array }> {
-  const userPublic = await crypto.subtle.importKey(
-    "raw",
-    asBufferSource(b64urlDecode(p256dh)),
-    { name: "ECDH", namedCurve: "P-256" },
-    true,
-    [],
-  );
-  const local = await crypto.subtle.generateKey({ name: "ECDH", namedCurve: "P-256" }, true, [
-    "deriveBits",
-  ]);
-  const shared = new Uint8Array(
-    await crypto.subtle.deriveBits({ name: "ECDH", public: userPublic }, local.privateKey, 256),
-  );
-  const salt = crypto.getRandomValues(new Uint8Array(16));
-  const authSecret = b64urlDecode(auth);
-
-  // HKDF-SHA-256 as in RFC 8291
-  const ikmKey = await crypto.subtle.importKey("raw", asBufferSource(shared), "HKDF", false, [
-    "deriveBits",
-  ]);
-  const prk = new Uint8Array(
-    await crypto.subtle.deriveBits(
-      {
-        name: "HKDF",
-        hash: "SHA-256",
-        salt: asBufferSource(authSecret),
-        info: new TextEncoder().encode("WebPush: info\0"),
-      },
-      ikmKey,
-      256,
-    ),
-  );
-  // Simplified content encryption key / nonce derivation for aes128gcm
-  const prkKey = await crypto.subtle.importKey("raw", prk, "HKDF", false, ["deriveBits"]);
-  const cek = new Uint8Array(
-    await crypto.subtle.deriveBits(
-      {
-        name: "HKDF",
-        hash: "SHA-256",
-        salt,
-        info: new TextEncoder().encode("Content-Encoding: aes128gcm\0"),
-      },
-      prkKey,
-      128,
-    ),
-  );
-  const nonce = new Uint8Array(
-    await crypto.subtle.deriveBits(
-      {
-        name: "HKDF",
-        hash: "SHA-256",
-        salt,
-        info: new TextEncoder().encode("Content-Encoding: nonce\0"),
-      },
-      prkKey,
-      96,
-    ),
-  );
-  const aes = await crypto.subtle.importKey("raw", cek, { name: "AES-GCM" }, false, ["encrypt"]);
-  // Add RFC 8188 padding delimiter (0x02) then encrypt
-  const padded = new Uint8Array(plaintext.length + 1);
-  padded.set(plaintext, 0);
-  padded[plaintext.length] = 2;
-  const ciphertext = new Uint8Array(
-    await crypto.subtle.encrypt({ name: "AES-GCM", iv: nonce }, aes, padded),
-  );
-  const localPublic = new Uint8Array(await crypto.subtle.exportKey("raw", local.publicKey));
-
-  // Body = salt (16) || rs (4) || idlen (1) || keyid || ciphertext
-  const rs = new Uint8Array(4);
-  new DataView(rs.buffer).setUint32(0, 4096);
-  const idlen = new Uint8Array([localPublic.length]);
-  const body = new Uint8Array(16 + 4 + 1 + localPublic.length + ciphertext.length);
-  body.set(salt, 0);
-  body.set(rs, 16);
-  body.set(idlen, 20);
-  body.set(localPublic, 21);
-  body.set(ciphertext, 21 + localPublic.length);
-  return { body, salt, localPublic };
-}
-
 /**
  * Open a Web Push driver (RFC 8030 + VAPID).
  *
  * @param options - VAPID keys + subject
  */
 export function openWebPushChannel(options: ChannelOpenOptions = {}): ChannelDriver {
-  const vapidPublic = options.vapidPublicKey;
-  const vapidPrivate = options.vapidPrivateKey;
+  const vapidPublicKey = options.vapidPublicKey;
+  const vapidPrivateKey = options.vapidPrivateKey;
   const subject = options.vapidSubject ?? "mailto:ops@oke.local";
-  const fetchFn = options.fetch ?? globalThis.fetch;
+  if (!vapidPublicKey || !vapidPrivateKey) {
+    throw new Error("webpush: vapidPublicKey and vapidPrivateKey are required");
+  }
+
+  const transport = new WebPushTransport({
+    vapidPublicKey,
+    vapidPrivateKey,
+    subject,
+  });
+  const sender = createPushSender({ transport });
 
   const channel: ChannelTransport = {
     provider: "webpush",
     mediums: ["push"],
     async send(message: ChannelMessage): Promise<ChannelSendResult> {
-      if (!vapidPrivate || !vapidPublic) {
-        throw new Error("webpush: vapidPublicKey and vapidPrivateKey are required");
-      }
       const sub = message.pushSubscription;
       const endpoint = sub?.endpoint ?? message.to;
-      if (!endpoint.startsWith("http")) {
-        throw new Error("webpush: pushSubscription.endpoint (or https to) required");
-      }
-      const audience = new URL(endpoint).origin;
-      const privateKey = await importVapidPrivateKey(vapidPrivate);
-      const jwt = await buildVapidJwt(audience, subject, privateKey);
-
-      const plaintext = new TextEncoder().encode(
-        message.text ?? JSON.stringify(message.data ?? {}),
-      );
-      let body: Uint8Array = plaintext;
-      const headers: Record<string, string> = {
-        Authorization: `vapid t=${jwt}, k=${vapidPublic}`,
-        TTL: "86400",
-        Urgency: "normal",
-      };
-
-      if (sub?.keys?.p256dh && sub.keys.auth) {
-        const enc = await encryptPushBody(plaintext, sub.keys.p256dh, sub.keys.auth);
-        body = enc.body;
-        headers["Content-Encoding"] = "aes128gcm";
-        headers["Content-Type"] = "application/octet-stream";
-      } else {
-        headers["Content-Type"] = "text/plain;charset=utf-8";
+      if (!endpoint.startsWith("http") || !sub?.keys?.p256dh || !sub.keys.auth) {
+        throw new Error("webpush: pushSubscription with endpoint + keys is required");
       }
 
-      const res = await fetchFn(endpoint, {
-        method: "POST",
-        headers,
-        body: body as unknown as ArrayBuffer,
-      });
-      const id = res.headers.get("location") ?? crypto.randomUUID();
-      if (!res.ok && res.status !== 201) {
-        return {
-          ok: false,
-          messageId: id,
-          driverId: "webpush",
-          attempts: [
-            {
-              driverId: "webpush",
-              ok: false,
-              error: `HTTP ${res.status}`,
-              at: Date.now(),
-            },
-          ],
-        };
+      try {
+        const title =
+          message.subject ??
+          (typeof message.data?.title === "string" ? message.data.title : "Notification");
+        const body = message.text ?? JSON.stringify(message.data ?? {});
+        const result = await sender.send({
+          subscription: {
+            endpoint,
+            keys: { p256dh: sub.keys.p256dh, auth: sub.keys.auth },
+          },
+          title,
+          body,
+          ...(message.data ? { data: { ...message.data } } : {}),
+        });
+        return mapSentlySendResult("webpush", result);
+      } catch (err) {
+        return mapSentlySendError("webpush", err);
       }
-      return {
-        ok: true,
-        messageId: id,
-        driverId: "webpush",
-        attempts: [{ driverId: "webpush", ok: true, at: Date.now(), messageId: id }],
-      };
     },
+    verify: () => sender.verify(),
+    close: () => sender.close(),
   };
 
-  return { id: "webpush", channel };
+  return { id: "webpush", channel, pushTransport: transport };
 }
 
 /** Web Push driver factory. */

package/src/drivers/index.ts

@@ -139,16 +139,23 @@ export { createChannelInbox } from "./channel-types.ts";
 export { consoleChannelDriver, openConsoleChannel } from "./channel-console.ts";
 export { smtpChannelDriver, openSmtpChannel } from "./channel-smtp.ts";
 export { resendChannelDriver, openResendChannel } from "./channel-resend.ts";
+export { sndrChannelDriver, openSndrChannel } from "./channel-sndr.ts";
+export { taqnyatChannelDriver, openTaqnyatChannel } from "./channel-taqnyat.ts";
+export { msegatChannelDriver, openMsegatChannel } from "./channel-msegat.ts";
 export { unifonicChannelDriver, openUnifonicChannel } from "./channel-unifonic.ts";
 export { waCloudChannelDriver, openWaCloudChannel } from "./channel-wa-cloud.ts";
 export { fcmChannelDriver, openFcmChannel } from "./channel-fcm.ts";
 export { webpushChannelDriver, openWebPushChannel } from "./channel-webpush.ts";
+export { mapSentlySendResult, mapSentlySendError } from "./channel-sently-map.ts";
 
 export type {
   AiDriverId,
   AiMessage,
+  AiToolDef,
+  AiToolCall,
   AiCompleteOptions,
   AiCompleteResult,
+  AiStreamChunk,
   AiEmbedOptions,
   AiEmbedResult,
   AiModelClient,
@@ -158,4 +165,21 @@ export type {
 
 export { mockAiDriver, createMockAiDriver } from "./ai-mock.ts";
 export { anthropicAiDriver, openAnthropic } from "./ai-anthropic.ts";
-export { openaiCompatibleAiDriver, openOpenaiCompatible } from "./ai-openai-compatible.ts";
+export {
+  openaiCompatibleAiDriver,
+  openOpenaiCompatible,
+  OPENAI_COMPAT_DEFAULT_BASE,
+  normalizeOpenaiCompatibleBaseUrl,
+  isOpenaiCloudBase,
+  openaiCompatibleHeaders,
+} from "./ai-openai-compatible.ts";
+export {
+  ollamaAiDriver,
+  openOllama,
+  OllamaUnavailableError,
+  OLLAMA_DEFAULT_MODEL,
+  OLLAMA_DEFAULT_BASE_URL,
+  normalizeOllamaBaseUrl,
+  resolveOllamaBaseUrl,
+  resolveOllamaModel,
+} from "./ai-ollama.ts";

package/src/drivers/ollama.ts

@@ -0,0 +1,14 @@
+/**
+ * Protocol-named re-export — prefer `okengine/drivers/ai-ollama` or
+ * `okengine/drivers` (`ollamaAiDriver`). Same surface as {@link ./ai-ollama.ts}.
+ */
+export {
+  ollamaAiDriver,
+  openOllama,
+  OllamaUnavailableError,
+  OLLAMA_DEFAULT_MODEL,
+  OLLAMA_DEFAULT_BASE_URL,
+  normalizeOllamaBaseUrl,
+  resolveOllamaBaseUrl,
+  resolveOllamaModel,
+} from "./ai-ollama.ts";

package/src/elements/ai/rate.test.ts

@@ -0,0 +1,53 @@
+/**
+ * AI rate presets — gate.rate only, no parallel budgeting system.
+ */
+
+import { describe, expect, test } from "bun:test";
+import { memoryKvDriver } from "../../drivers/index.ts";
+import { createGateRuntime } from "../gate.ts";
+import { AI_RATE_PRESETS, aiRateGate, createAiRateGates } from "./rate.ts";
+
+describe("AI_RATE_PRESETS", () => {
+  test("ask is stricter than embed; agent is strictest", () => {
+    expect(AI_RATE_PRESETS.ask).toEqual({ max: 20, per: "1m", keyBy: "user" });
+    expect(AI_RATE_PRESETS.agent).toEqual({ max: 10, per: "1m", keyBy: "user" });
+    expect(AI_RATE_PRESETS.embed).toEqual({ max: 60, per: "1m", keyBy: "user" });
+    expect(AI_RATE_PRESETS.agent.max).toBeLessThan(AI_RATE_PRESETS.ask.max);
+    expect(AI_RATE_PRESETS.ask.max).toBeLessThan(AI_RATE_PRESETS.embed.max);
+  });
+
+  test("aiRateGate builds a real gate.rate decl", () => {
+    const g = aiRateGate("ask");
+    expect(g.kind).toBe("rate");
+    expect(g.max).toBe(20);
+    expect(g.per).toBe("1m");
+    expect(g.keyBy).toBe("user");
+    expect(g.name).toContain("20/1m");
+  });
+
+  test("createAiRateGates materializes three decls; deny after max", async () => {
+    const kv = await memoryKvDriver.open({ name: "ai-rate" });
+    const gates = createAiRateGates();
+    expect(gates).toHaveLength(3);
+    const runtime = createGateRuntime({ gates: [...gates], kv, now: () => 1_000 });
+    const ask = gates[0]!;
+    const ctx = {
+      auth: { userId: "u1", scopes: new Set<string>() },
+      operator: { id: null },
+      meta: {},
+    };
+    for (let i = 0; i < ask.max; i++) {
+      const ev = await runtime.check([ask.name], ctx);
+      expect(ev.every((e) => e.allowed)).toBe(true);
+    }
+    const denied = await runtime.check([ask.name], ctx);
+    expect(denied.some((e) => !e.allowed)).toBe(true);
+    await kv.close();
+  });
+
+  test("public AI edge can override keyBy to ip", () => {
+    const g = aiRateGate("ask", { keyBy: "ip", max: 5 });
+    expect(g.keyBy).toBe("ip");
+    expect(g.max).toBe(5);
+  });
+});

package/src/elements/ai/rate.ts

@@ -0,0 +1,66 @@
+/**
+ * AI rate-limit presets — reuse {@link gate.rate}, no parallel budgeting.
+ *
+ * Cost caps stay on prompt/agent `budget` decls. These presets throttle
+ * request volume on HTTP triggers that wrap `fx.ask` / agents / embeds.
+ */
+
+import { gate, type RateGateDecl } from "../gate/declare.ts";
+
+/** Preset keys for AI-facing HTTP edges. */
+export type AiRatePreset = "ask" | "agent" | "embed";
+
+/** One AI rate preset row. */
+export type AiRatePresetSpec = {
+  readonly max: number;
+  readonly per: string;
+  readonly keyBy: string;
+};
+
+/**
+ * Sensible defaults: AI calls are far more expensive per request than
+ * ordinary HTTP, so limits are tighter than typical API rate limits.
+ * Prefer `keyBy: "user"` when the edge is authenticated; use `ip` on
+ * public unauthenticated AI surfaces.
+ */
+export const AI_RATE_PRESETS: Readonly<Record<AiRatePreset, AiRatePresetSpec>> = {
+  ask: { max: 20, per: "1m", keyBy: "user" },
+  agent: { max: 10, per: "1m", keyBy: "user" },
+  embed: { max: 60, per: "1m", keyBy: "user" },
+};
+
+/**
+ * Build a `gate.rate` declaration from an AI preset.
+ *
+ * @param kind - ask · agent · embed
+ * @param overrides - Optional max / per / keyBy overrides
+ */
+export function aiRateGate(
+  kind: AiRatePreset,
+  overrides?: {
+    readonly max?: number;
+    readonly per?: string;
+    readonly keyBy?: string;
+    readonly description?: string;
+  },
+): RateGateDecl {
+  const preset = AI_RATE_PRESETS[kind];
+  return gate.rate({
+    max: overrides?.max ?? preset.max,
+    per: overrides?.per ?? preset.per,
+    keyBy: overrides?.keyBy ?? preset.keyBy,
+    description:
+      overrides?.description ??
+      `AI ${kind} rate limit (${overrides?.max ?? preset.max}/${overrides?.per ?? preset.per})`,
+  });
+}
+
+/**
+ * Materialize all AI rate gate decls (ask + agent + embed).
+ *
+ * @param enabled - When false, returns []
+ */
+export function createAiRateGates(enabled = true): readonly RateGateDecl[] {
+  if (!enabled) return [];
+  return [aiRateGate("ask"), aiRateGate("agent"), aiRateGate("embed")];
+}

package/src/elements/ai/redacted-prompt.test.ts

@@ -0,0 +1,90 @@
+/**
+ * Redacted values must never leak into provider-facing prompt content.
+ * Same class of protection as fx.log — AI prompts are an egress vector.
+ */
+
+import { describe, expect, test } from "bun:test";
+import type { AiCompleteOptions, AiModelClient } from "../../drivers/ai-types.ts";
+import { REDACTED_PLACEHOLDER, Redacted } from "../../kernel/redacted.ts";
+import { ai, createAiRuntime, promptContentFromInput } from "../ai.ts";
+
+describe("Redacted never leaks into AI prompts", () => {
+  test("promptContentFromInput masks nested Redacted to placeholder", () => {
+    const secret = new Redacted("sk-live-super-secret");
+    const content = promptContentFromInput({
+      key: secret,
+      nested: { token: secret },
+      note: `billing with ${secret}`,
+    });
+    expect(content).toContain(REDACTED_PLACEHOLDER);
+    expect(content).not.toContain("sk-live-super-secret");
+  });
+
+  test("ask sends placeholder to the model — never cleartext", async () => {
+    const secret = new Redacted("vault-stripe-key-REAL");
+    const captured: AiCompleteOptions[] = [];
+    const client: AiModelClient = {
+      driverId: "mock",
+      model: "smart",
+      async complete(opts) {
+        captured.push(opts);
+        return {
+          text: JSON.stringify({ ok: true }),
+          raw: { ok: true },
+          model: "smart",
+          driverId: "mock",
+        };
+      },
+    };
+
+    const smart = ai.model("smart");
+    const prompt = smart.prompt("secure-ask", { out: { ok: "boolean" } });
+    const runtime = createAiRuntime({
+      models: [smart],
+      prompts: [prompt],
+      clients: { smart: client },
+      forceJournal: false,
+    });
+
+    await runtime.ask("secure-ask", {
+      apiKey: secret,
+      nested: [secret],
+      label: `charge ${secret}`,
+    });
+
+    expect(captured).toHaveLength(1);
+    const content = captured[0]!.messages[0]!.content;
+    expect(content).toContain(REDACTED_PLACEHOLDER);
+    expect(content).not.toContain("vault-stripe-key-REAL");
+    expect(JSON.stringify(captured[0]!.messages)).not.toContain("vault-stripe-key-REAL");
+  });
+
+  test("template-string ask input already stringified stays placeholder-only", async () => {
+    const secret = new Redacted("TOP-SECRET-VALUE");
+    const captured: string[] = [];
+    const client: AiModelClient = {
+      driverId: "mock",
+      model: "smart",
+      async complete(opts) {
+        captured.push(opts.messages[0]!.content);
+        return {
+          text: "{}",
+          raw: {},
+          model: "smart",
+          driverId: "mock",
+        };
+      },
+    };
+    const smart = ai.model("smart");
+    const runtime = createAiRuntime({
+      models: [smart],
+      prompts: [smart.prompt("t")],
+      clients: { smart: client },
+      forceJournal: false,
+    });
+
+    await runtime.ask("t", `user said ${secret}`);
+    expect(captured[0]).toBe(`user said ${REDACTED_PLACEHOLDER}`);
+    expect(captured[0]).not.toContain("TOP-SECRET-VALUE");
+  });
+});