@konneal/engine 0.2.52 → 0.2.53

package/dist/{ask-27TMC7PV.js → ask-5KXW7WIA.js}

@@ -1,6 +1,6 @@
 import {
   handleAsk
-} from "./chunk-SU4FO7TN.js";
+} from "./chunk-PH7W6HMN.js";
 import "./chunk-TPV5GPY2.js";
 import "./chunk-SPKPH54J.js";
 import "./chunk-A3QHHUN5.js";

package/dist/{chunk-SU4FO7TN.js → chunk-PH7W6HMN.js}

@@ -2181,13 +2181,31 @@ async function handleAsk(env, ctx, req, tier, key) {
   if (body?.image != null && !userImage) {
     return err(400, "invalid_image", "image must be a data URL (data:image/png|jpeg|webp|gif;base64,\u2026) up to 6 MB");
   }
+  let storedImage = null;
+  const attachIds = Array.isArray(body?.attachment_ids) ? body.attachment_ids.filter((x) => typeof x === "string" && /^[0-9a-f-]{36}$/i.test(x)).slice(0, 2) : [];
+  if (attachIds.length && env.DB && member) {
+    for (const aid of attachIds) {
+      const row = await env.DB.prepare("SELECT mime, r2_key FROM attachments WHERE id = ?1 AND sub = ?2").bind(aid, member.sub).first();
+      if (!row) continue;
+      try {
+        const obj = await env.CHAT_UPLOADS.get(row.r2_key);
+        if (!obj) continue;
+        const b64 = btoa(String.fromCharCode(...new Uint8Array(await obj.arrayBuffer())));
+        storedImage = `data:${row.mime};base64,${b64}`;
+        break;
+      } catch {
+      }
+    }
+  }
+  const effectiveImage = userImage ?? storedImage;
   const budget = num(env, "INPUT_TOKEN_BUDGET", LIMITS.inputTokenBudget);
   const { kept: keptHistory, overflow } = splitHistory(history, budget);
   const summary = overflow.length >= 2 ? await summarizeHistory(env, MODELS.understand, overflow) ?? void 0 : void 0;
   let retrieved;
   const fresh = freshRequested(body);
   const gen = await corpusGen(env.CACHE);
-  const cached = fresh || contextual || declaredCtx || draftAct || apiCallIntent || userImage ? null : await cacheGet(env, gen, ns, q.query, q.lang, salt);
+  const withImage = effectiveImage || storedImage;
+  const cached = fresh || contextual || declaredCtx || draftAct || apiCallIntent || withImage ? null : await cacheGet(env, gen, ns, q.query, q.lang, salt);
   const wantsStream = body?.stream === true || tier === "anon" && body?.stream !== false;
   if (cached) {
     telemetry(env, ctx, tier, "ask", null, true, (cached.value.answer ?? "").length, cached.value.query_hash, q.lang, "exact", telemetryMeta());
@@ -2204,6 +2222,21 @@ async function handleAsk(env, ctx, req, tier, key) {
   const warmQuery = retrievalQuery(q.query, prev);
   const warmEmbed = embedWarm(env, warmQuery);
   const conversationId = typeof body?.conversation_id === "string" && /^[A-Za-z0-9_-]{8,64}$/.test(body.conversation_id) ? body.conversation_id : null;
+  if (!effectiveImage && !attachIds.length && conversationId && env.DB && member) {
+    const prior = await env.DB.prepare(
+      "SELECT m.attachment_id AS aid, a.mime, a.r2_key FROM messages m JOIN attachments a ON a.id = m.attachment_id WHERE m.conversation_id = ?1 AND m.role = 'user' AND m.attachment_id IS NOT NULL ORDER BY m.created_at DESC LIMIT 1"
+    ).bind(conversationId, member.sub).first();
+    if (prior) {
+      try {
+        const obj = await env.CHAT_UPLOADS.get(prior.r2_key);
+        if (obj) {
+          const b64 = btoa(String.fromCharCode(...new Uint8Array(await obj.arrayBuffer())));
+          storedImage = `data:${prior.mime};base64,${b64}`;
+        }
+      } catch {
+      }
+    }
+  }
   let convEntities = [];
   if (conversationId) {
     try {
@@ -2651,18 +2684,18 @@ Answer account questions from these records ONLY: name the record when you use i
     budget
   );
   await attachFigureImages(env, messages, usedHits, q.query);
-  if (userImage) {
+  if (withImage) {
     const wantsMarkings = /\b(mark(ing|ings)?|nameplate|label|inscription|engrav|sticker|plate)\b|certificat/i.test(q.query);
     const last = messages[messages.length - 1];
     const note = wantsMarkings ? "\n\n(The user attached a photo with this question. First transcribe every inscription you can actually read in the image \u2014 names, model references, accuracy classes, numeric values with their units, certificate or approval numbers \u2014 quoting them verbatim. Then answer the question from the numbered passages, citing the requirement each interpretation rests on. If an inscription is unreadable, say so; never invent a marking.)" : "\n\n(The user attached an image with this question; interpret it directly when answering.)";
     if (Array.isArray(last.content)) {
       const textPart = last.content.find((p) => p.type === "text");
       if (textPart) textPart.text += note;
-      last.content = [...last.content, { type: "image_url", image_url: { url: userImage } }];
+      last.content = [...last.content, { type: "image_url", image_url: { url: withImage } }];
     } else {
       last.content = [
         { type: "text", text: last.content + note },
-        { type: "image_url", image_url: { url: userImage } }
+        { type: "image_url", image_url: { url: withImage } }
       ];
     }
     console.log("user image attached to generation");

package/dist/worker_public/src/index.js

@@ -10,7 +10,7 @@ import {
   scoreFaithfulness,
   scoreJudge,
   standardForDocNumber
-} from "../../chunk-SU4FO7TN.js";
+} from "../../chunk-PH7W6HMN.js";
 import {
   buildMessages,
   cfBlobs,
@@ -103,11 +103,11 @@ async function handleConversations(env, sub, req, route) {
     let msgs;
     try {
       msgs = await env.DB.prepare(
-        "SELECT id, role, content, citations, model, context_applied, created_at FROM messages WHERE conversation_id = ?1 ORDER BY created_at ASC"
+        "SELECT id, role, content, citations, model, context_applied, attachment_id, created_at FROM messages WHERE conversation_id = ?1 ORDER BY created_at ASC"
       ).bind(id).all();
     } catch {
       msgs = await env.DB.prepare(
-        "SELECT id, role, content, citations, model, created_at FROM messages WHERE conversation_id = ?1 ORDER BY created_at ASC"
+        "SELECT id, role, content, citations, model, attachment_id, created_at FROM messages WHERE conversation_id = ?1 ORDER BY created_at ASC"
       ).bind(id).all();
     }
     return json({
@@ -151,6 +151,12 @@ async function handleAppendMessage(env, sub, req, convId) {
   if (role !== "user" && role !== "assistant" || !content.trim() || content.length > LIMITS.maxOutputTokens * 4) {
     return err(400, "invalid_input", "role (user|assistant) and content are required");
   }
+  let attachmentId = null;
+  if (typeof body?.attachment_id === "string" && body.attachment_id) {
+    const owned = await env.DB.prepare("SELECT id FROM attachments WHERE id = ?1 AND sub = ?2").bind(body.attachment_id, sub).first();
+    if (!owned) return err(404, "not_found", "No such attachment");
+    attachmentId = body.attachment_id;
+  }
   let citations2 = null;
   if (body?.citations != null) {
     if (!Array.isArray(body.citations) || body.citations.length > 16) {
@@ -166,8 +172,8 @@ async function handleAppendMessage(env, sub, req, convId) {
   try {
     await env.DB.batch([
       env.DB.prepare(
-        "INSERT INTO messages (id, conversation_id, role, content, citations, model, context_applied, created_at) VALUES (?1,?2,?3,?4,?5,?6,?7,?8)"
-      ).bind(mid, convId, role, content, citations2, typeof body?.model === "string" ? body.model.slice(0, 80) : null, applied ? JSON.stringify(applied) : null, now),
+        "INSERT INTO messages (id, conversation_id, role, content, citations, model, context_applied, attachment_id, created_at) VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9)"
+      ).bind(mid, convId, role, content, citations2, typeof body?.model === "string" ? body.model.slice(0, 80) : null, applied ? JSON.stringify(applied) : null, attachmentId, now),
       env.DB.prepare("UPDATE conversations SET updated_at = ?1 WHERE id = ?2 AND sub = ?3").bind(now, convId, sub)
     ]);
   } catch (e) {
@@ -954,7 +960,7 @@ async function handleMcp(env, ctx, req, tier, key) {
       // stream:false forces the JSON lane (anon defaults to SSE)
       body: JSON.stringify({ ...args, stream: false })
     });
-    const res = name === "ask" ? await (await import("../../ask-27TMC7PV.js")).handleAsk(env, ctx, inner, tier, key) : await (await import("../../search-PBOODCMQ.js")).handleSearch(env, ctx, inner, tier, key);
+    const res = name === "ask" ? await (await import("../../ask-5KXW7WIA.js")).handleAsk(env, ctx, inner, tier, key) : await (await import("../../search-PBOODCMQ.js")).handleSearch(env, ctx, inner, tier, key);
     return res.json().catch(() => ({ error: { message: "tool transport failed", status: res.status } }));
   });
   if (out.ok && "accepted" in out) return new Response(null, { status: 202 });

package/package.json

@@ -27,7 +27,7 @@
     "playwright": "^1.62.1",
     "yaml": "^2.9.1"
   },
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "The Konneal engine: the publisher-agnostic build pipeline and API plane for standards intelligence (retrieval, answer contract, verdicts, evaluation).",
   "license": "BSD-3-Clause",
   "type": "module",

package/workers/worker_public/migrations/0018_messages_attachment.sql

@@ -0,0 +1,4 @@
+-- Tier-2 image reuse (TODO.new-era/8): a stored attachment rides its user
+-- message, so follow-up turns can re-attach it server-side within the
+-- conversation's ownership
+ALTER TABLE messages ADD COLUMN attachment_id TEXT;

package/workers/worker_public/schema.sql

@@ -258,3 +258,6 @@ CREATE TABLE IF NOT EXISTS attachments (
     created_at TEXT NOT NULL DEFAULT (datetime('now'))
 );
 CREATE INDEX IF NOT EXISTS idx_attachments_sub ON attachments (sub);
+
+-- Tier-2 image reuse: the user message's stored attachment
+ALTER TABLE messages ADD COLUMN attachment_id TEXT;

package/workers/worker_public/src/ask.ts

@@ -379,6 +379,31 @@ async function handleAsk(
   if (body?.image != null && !userImage) {
     return err(400, "invalid_image", "image must be a data URL (data:image/png|jpeg|webp|gif;base64,…) up to 6 MB");
   }
+  // Tier-2 image reuse (TODO.new-era/8): stored attachments materialize
+  // as the question's image. Explicit attachment_ids win (member-gated,
+  // ownership-checked, at most one — the multimodal shape rule); with
+  // none given, the conversation's most recent image re-attaches itself,
+  // so "identify this" works turns after the upload.
+  let storedImage: string | null = null;
+  const attachIds: string[] = Array.isArray(body?.attachment_ids)
+    ? body.attachment_ids.filter((x: unknown) => typeof x === "string" && /^[0-9a-f-]{36}$/i.test(x)).slice(0, 2)
+    : [];
+  if (attachIds.length && env.DB && member) {
+    for (const aid of attachIds) {
+      const row = await env.DB.prepare("SELECT mime, r2_key FROM attachments WHERE id = ?1 AND sub = ?2").bind(aid, member.sub).first<{ mime: string; r2_key: string }>();
+      if (!row) continue;
+      try {
+        const obj = await (env as any).CHAT_UPLOADS.get(row.r2_key);
+        if (!obj) continue;
+        const b64 = btoa(String.fromCharCode(...new Uint8Array(await obj.arrayBuffer())));
+        storedImage = `data:${row.mime};base64,${b64}`;
+        break; // the multimodal shape rule: one image per question
+      } catch {
+        /* the object's gone — ask without it */
+      }
+    }
+  }
+  const effectiveImage = userImage ?? storedImage;
   // history compaction: turns beyond the budget slice are summarized into a
   // continuity block (below) instead of silently dropped
   const budget = num(env as any, "INPUT_TOKEN_BUDGET", LIMITS.inputTokenBudget);
@@ -395,7 +420,8 @@ async function handleAsk(
   // answer caches; corpus surgery bumps it (scripts/invalidate_answer_
   // cache.py) and old-generation entries miss (oimlsmart/rag#72)
   const gen = await corpusGen(env.CACHE);
-  const cached = fresh || contextual || declaredCtx || draftAct || apiCallIntent || userImage ? null : await cacheGet(env, gen, ns, q.query, q.lang, salt);
+  const withImage = effectiveImage || storedImage;
+  const cached = fresh || contextual || declaredCtx || draftAct || apiCallIntent || withImage ? null : await cacheGet(env, gen, ns, q.query, q.lang, salt);
   const wantsStream = body?.stream === true || (tier === "anon" && body?.stream !== false);
 
   if (cached) {
@@ -424,6 +450,25 @@ async function handleAsk(
   // (present when the client passes conversation_id) make pronoun
   // follow-ups O(1) — "it / the 2017 one" resolve against the map
   const conversationId = typeof body?.conversation_id === "string" && /^[A-Za-z0-9_-]{8,64}$/.test(body.conversation_id) ? body.conversation_id : null;
+
+  // Tier-2 continuation: no new image, but the conversation carries one —
+  // its most recent stored image re-attaches to this question
+  if (!effectiveImage && !attachIds.length && conversationId && env.DB && member) {
+    const prior = await env.DB.prepare(
+      "SELECT m.attachment_id AS aid, a.mime, a.r2_key FROM messages m JOIN attachments a ON a.id = m.attachment_id WHERE m.conversation_id = ?1 AND m.role = 'user' AND m.attachment_id IS NOT NULL ORDER BY m.created_at DESC LIMIT 1",
+    ).bind(conversationId, member.sub).first<{ aid: string; mime: string; r2_key: string }>();
+    if (prior) {
+      try {
+        const obj = await (env as any).CHAT_UPLOADS.get(prior.r2_key);
+        if (obj) {
+          const b64 = btoa(String.fromCharCode(...new Uint8Array(await obj.arrayBuffer())));
+          storedImage = `data:${prior.mime};base64,${b64}`;
+        }
+      } catch {
+        /* the object's gone */
+      }
+    }
+  }
   let convEntities: Array<{ entity: string; kind: string }> = [];
   if (conversationId) {
     try {
@@ -1081,7 +1126,7 @@ async function handleAsk(
     budget,
   );
   await attachFigureImages(env, messages, usedHits, q.query);
-  if (userImage) {
+  if (withImage) {
     // the user's own image rides on the question message — retrieval stays
     // text-driven; the answer model reads the image as question context.
     // A markings/nameplate/certificate photo gets a TRANSCRIPTION note:
@@ -1096,11 +1141,11 @@ async function handleAsk(
     if (Array.isArray(last.content)) {
       const textPart = last.content.find((p: any) => p.type === "text");
       if (textPart) textPart.text += note;
-      last.content = [...last.content, { type: "image_url", image_url: { url: userImage } }] as unknown as string;
+      last.content = [...last.content, { type: "image_url", image_url: { url: withImage } }] as unknown as string;
     } else {
       last.content = [
         { type: "text", text: last.content + note },
-        { type: "image_url", image_url: { url: userImage } },
+        { type: "image_url", image_url: { url: withImage } },
       ] as unknown as string;
     }
     console.log("user image attached to generation");

package/workers/worker_public/src/conversations.ts

@@ -66,13 +66,13 @@ export async function handleConversations(
     let msgs: any;
     try {
       msgs = await env.DB.prepare(
-        "SELECT id, role, content, citations, model, context_applied, created_at FROM messages WHERE conversation_id = ?1 ORDER BY created_at ASC",
+        "SELECT id, role, content, citations, model, context_applied, attachment_id, created_at FROM messages WHERE conversation_id = ?1 ORDER BY created_at ASC",
       )
         .bind(id)
         .all();
     } catch {
       msgs = await env.DB.prepare(
-        "SELECT id, role, content, citations, model, created_at FROM messages WHERE conversation_id = ?1 ORDER BY created_at ASC",
+        "SELECT id, role, content, citations, model, attachment_id, created_at FROM messages WHERE conversation_id = ?1 ORDER BY created_at ASC",
       )
         .bind(id)
         .all();
@@ -124,6 +124,14 @@ export async function handleAppendMessage(env: any, sub: string, req: Request, c
   if ((role !== "user" && role !== "assistant") || !content.trim() || content.length > LIMITS.maxOutputTokens * 4) {
     return err(400, "invalid_input", "role (user|assistant) and content are required");
   }
+  // Tier-2 image reuse: the message may carry a stored attachment id —
+  // the member's own, validated against the attachments table
+  let attachmentId: string | null = null;
+  if (typeof body?.attachment_id === "string" && body.attachment_id) {
+    const owned = await env.DB.prepare("SELECT id FROM attachments WHERE id = ?1 AND sub = ?2").bind(body.attachment_id, sub).first();
+    if (!owned) return err(404, "not_found", "No such attachment");
+    attachmentId = body.attachment_id;
+  }
   let citations: string | null = null;
   if (body?.citations != null) {
     if (!Array.isArray(body.citations) || body.citations.length > 16) {
@@ -142,8 +150,8 @@ export async function handleAppendMessage(env: any, sub: string, req: Request, c
   try {
     await env.DB.batch([
       env.DB.prepare(
-        "INSERT INTO messages (id, conversation_id, role, content, citations, model, context_applied, created_at) VALUES (?1,?2,?3,?4,?5,?6,?7,?8)",
-      ).bind(mid, convId, role, content, citations, typeof body?.model === "string" ? body.model.slice(0, 80) : null, applied ? JSON.stringify(applied) : null, now),
+        "INSERT INTO messages (id, conversation_id, role, content, citations, model, context_applied, attachment_id, created_at) VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9)",
+      ).bind(mid, convId, role, content, citations, typeof body?.model === "string" ? body.model.slice(0, 80) : null, applied ? JSON.stringify(applied) : null, attachmentId, now),
       env.DB.prepare("UPDATE conversations SET updated_at = ?1 WHERE id = ?2 AND sub = ?3").bind(now, convId, sub),
     ]);
   } catch (e) {