@firstlovecenter/ai-chat 0.6.1 → 0.8.0

package/dist/server/index.cjs

@@ -25,7 +25,10 @@ async function runAgent(input) {
   const maxOutputTokens = input.maxOutputTokens ?? DEFAULT_MAX_OUTPUT_TOKENS;
   const transcript = [];
   transcript.push({ kind: "user", text: input.question });
-  const messages = [{ role: "user", text: input.question }];
+  const messages = [
+    ...input.priorMessages ?? [],
+    { role: "user", text: input.question }
+  ];
   const system = input.systemBlocks;
   const toolSchemas = Object.values(input.tools).map((t) => t.schema);
   let toolCallCount = 0;
@@ -218,11 +221,28 @@ function toAnthropicMessages(messages) {
   const out = [];
   for (const msg of messages) {
     if (msg.role === "user") {
-      out.push({ role: "user", content: msg.text });
+      if (msg.cached) {
+        out.push({
+          role: "user",
+          content: [
+            {
+              type: "text",
+              text: msg.text,
+              cache_control: { type: "ephemeral" }
+            }
+          ]
+        });
+      } else {
+        out.push({ role: "user", content: msg.text });
+      }
     } else if (msg.role === "assistant") {
       const blocks = [];
       if (msg.text) {
-        blocks.push({ type: "text", text: msg.text });
+        const textBlock = { type: "text", text: msg.text };
+        if (msg.cached && msg.toolCalls.length === 0) {
+          textBlock.cache_control = { type: "ephemeral" };
+        }
+        blocks.push(textBlock);
       }
       for (const tc of msg.toolCalls) {
         blocks.push({
@@ -574,6 +594,87 @@ var toolProviders = [
 function getToolProvider(id) {
   return toolProviders.find((p) => p.id === id);
 }
+
+// src/server/history.ts
+var DEFAULT_MAX_HISTORY_PAIRS = 20;
+var DEFAULT_MAX_TEXT_CHARS = 4e3;
+function historyToNormalizedMessages(rows, opts = {}) {
+  const maxPairs = opts.maxPairs ?? DEFAULT_MAX_HISTORY_PAIRS;
+  const maxTextChars = opts.maxTextChars ?? DEFAULT_MAX_TEXT_CHARS;
+  const pairs = [];
+  let i = 0;
+  while (i < rows.length) {
+    const row = rows[i];
+    if (row.role !== "user" || !row.question) {
+      i += 1;
+      continue;
+    }
+    const next = rows[i + 1];
+    if (next?.role !== "assistant") {
+      i += 1;
+      continue;
+    }
+    const assistantText = truncate(
+      assistantMessageToText(next),
+      maxTextChars
+    );
+    if (assistantText) {
+      pairs.push([
+        { role: "user", text: truncate(row.question, maxTextChars) },
+        { role: "assistant", text: assistantText, toolCalls: [] }
+      ]);
+    }
+    i += 2;
+  }
+  const kept = maxPairs > 0 ? pairs.slice(-maxPairs) : pairs;
+  return kept.flat();
+}
+function truncate(text, max) {
+  if (max <= 0 || text.length <= max) return text;
+  return text.slice(0, max);
+}
+function assistantMessageToText(row) {
+  if (row.errorJson) return "";
+  const proseText = proseToText(row.prose);
+  if (proseText) return proseText;
+  const blockText = blocksToText(row.blocks);
+  return blockText;
+}
+function proseToText(prose) {
+  if (!prose || typeof prose !== "object") return "";
+  const entries = Object.entries(prose).map(([k, v]) => [Number(k), typeof v === "string" ? v : ""]).filter(([k, v]) => Number.isFinite(k) && v.length > 0).sort(([a], [b]) => a - b);
+  return entries.map(([, v]) => v).join("\n\n").trim();
+}
+function blocksToText(blocks) {
+  if (!Array.isArray(blocks)) return "";
+  const parts = [];
+  for (const raw of blocks) {
+    if (!raw || typeof raw !== "object") continue;
+    const b = raw;
+    switch (b.kind) {
+      case "paragraph_brief": {
+        const facts = (b.key_facts ?? []).filter((f) => f && f.trim());
+        if (b.topic) parts.push(b.topic);
+        if (facts.length) parts.push(facts.join("\n"));
+        break;
+      }
+      case "list": {
+        const items = (b.items ?? []).filter((s) => s && s.trim());
+        if (b.title) parts.push(b.title);
+        if (items.length) parts.push(items.map((s) => `- ${s}`).join("\n"));
+        break;
+      }
+      case "chart":
+      case "table":
+        if (b.title) parts.push(`[${b.title}]`);
+        break;
+      case "callout":
+        if (b.text) parts.push(b.text);
+        break;
+    }
+  }
+  return parts.join("\n\n").trim();
+}
 function vertexHost2(location) {
   return location === "global" ? "aiplatform.googleapis.com" : `${location}-aiplatform.googleapis.com`;
 }
@@ -914,13 +1015,25 @@ function createAgentCustomRoutes(ctx) {
       const rawChatSessionId = body?.chatSessionId;
       const incomingChatSessionId = typeof rawChatSessionId === "number" && Number.isInteger(rawChatSessionId) ? rawChatSessionId : null;
       const aiSettings = await persistence.getAiSettings();
+      const effectiveProjectId = aiSettings.gcpProjectId ?? vertex.projectId;
       let chatSessionId;
+      let priorMessages = [];
       if (incomingChatSessionId !== null) {
         const owned = await persistence.getSession(incomingChatSessionId, userId);
         if (!owned) {
           return jsonError(404, "NOT_FOUND", "Chat session not found.");
         }
         chatSessionId = owned.id;
+        const stored = await persistence.listMessagesForSession(chatSessionId, userId);
+        priorMessages = historyToNormalizedMessages(stored);
+        if (priorMessages.length > 0) {
+          const last = priorMessages[priorMessages.length - 1];
+          if (last.role === "assistant" && last.toolCalls.length === 0) {
+            priorMessages[priorMessages.length - 1] = { ...last, cached: true };
+          } else if (last.role === "user") {
+            priorMessages[priorMessages.length - 1] = { ...last, cached: true };
+          }
+        }
       } else {
         const created = await persistence.createSession({
           userId,
@@ -957,7 +1070,7 @@ function createAgentCustomRoutes(ctx) {
       }
       const provider = def.createProvider({
         auth: vertex.auth,
-        projectId: vertex.projectId,
+        projectId: effectiveProjectId,
         defaultLocation: vertex.defaultLocation,
         modelIds: vertex.modelIds,
         location: aiSettings.gcpLocation
@@ -1008,6 +1121,7 @@ data: ${JSON.stringify(data)}
             send("meta", { chatSessionId, scopeLabel });
             const agentResult = await runAgent({
               question,
+              priorMessages,
               ctx: toolContext,
               tools: tools.tools,
               systemBlocks,
@@ -1035,7 +1149,7 @@ data: ${JSON.stringify(data)}
                   }
                   for await (const token of narratorFn({
                     auth: vertex.auth,
-                    projectId: vertex.projectId,
+                    projectId: effectiveProjectId,
                     location: aiSettings.gcpLocation,
                     modelId: narratorModelId,
                     maxTokens: aiSettings.maxOutputTokens,
@@ -1226,7 +1340,17 @@ function createAgentVercelRoutes(ctx) {
         if (short) return short;
       }
       const body = await req.json().catch(() => null);
-      const question = typeof body?.question === "string" ? body.question.trim() : "";
+      let question = typeof body?.question === "string" ? body.question.trim() : "";
+      if (!question && Array.isArray(body?.messages)) {
+        const msgs = body.messages;
+        for (let i = msgs.length - 1; i >= 0; i -= 1) {
+          const m = msgs[i];
+          if (m && m.role === "user" && typeof m.content === "string") {
+            question = m.content.trim();
+            break;
+          }
+        }
+      }
       if (!question) {
         return jsonError2(
           400,
@@ -1239,7 +1363,9 @@ function createAgentVercelRoutes(ctx) {
       const rawModel = body?.model;
       const requestedModel = typeof rawModel === "string" && VALID_MODELS.has(rawModel) ? rawModel : null;
       const aiSettings = await persistence.getAiSettings();
+      const effectiveProjectId = aiSettings.gcpProjectId ?? vertex.projectId;
       let chatSessionId;
+      let priorMessages = [];
       if (incomingChatSessionId !== null) {
         const owned = await persistence.getSession(
           incomingChatSessionId,
@@ -1249,6 +1375,11 @@ function createAgentVercelRoutes(ctx) {
           return jsonError2(404, "NOT_FOUND", "Chat session not found.");
         }
         chatSessionId = owned.id;
+        const stored = await persistence.listMessagesForSession(
+          chatSessionId,
+          userId
+        );
+        priorMessages = historyToNormalizedMessages(stored);
       } else {
         const created = await persistence.createSession({
           userId,
@@ -1310,18 +1441,24 @@ function createAgentVercelRoutes(ctx) {
         });
         const system = systemBlocks.map((b) => b.text).join("\n\n");
         const model = provider === "claude" ? anthropic.createVertexAnthropic({
-          project: vertex.projectId,
+          project: effectiveProjectId,
           location: vertex.defaultLocation,
           googleAuthOptions: {}
         })(vertex.modelIds.claude) : googleVertex.createVertex({
-          project: vertex.projectId,
+          project: effectiveProjectId,
           location: aiSettings.gcpLocation,
           googleAuthOptions: {}
         })(vertex.modelIds.gemini);
+        const priorCoreMessages = priorMessages.filter(
+          (m) => m.role === "user" || m.role === "assistant"
+        ).map((m) => ({ role: m.role, content: m.text }));
         const result = ai.streamText({
           model,
           system,
-          messages: [{ role: "user", content: question }],
+          messages: [
+            ...priorCoreMessages,
+            { role: "user", content: question }
+          ],
           tools: vercelTools,
           maxSteps: 12,
           maxTokens: aiSettings.maxOutputTokens,
@@ -1615,6 +1752,7 @@ function createChatSessionsRoutes(ctx) {
 var VALID_LOCATIONS = ["us-east5", "global"];
 var MIN_MAX_OUTPUT_TOKENS = 256;
 var MAX_MAX_OUTPUT_TOKENS = 64e3;
+var GCP_PROJECT_ID_REGEX = /^[a-z][-a-z0-9]{4,28}[a-z0-9]$/;
 function isStringRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
@@ -1631,6 +1769,7 @@ function toWire(settings) {
     chat_interface: settings.chatInterface,
     max_output_tokens: settings.maxOutputTokens,
     role_prompt: settings.rolePrompt,
+    gcp_project_id: settings.gcpProjectId,
     updated_at: settings.updatedAt ? settings.updatedAt.toISOString() : null,
     updated_by_user_id: settings.updatedByUserId
   };
@@ -1728,11 +1867,28 @@ function createAdminSettingsRoutes(ctx) {
         return jsonResponse({ error: "invalid_role_prompt" }, 400);
       }
     }
-    if (patch.toolProvider === void 0 && patch.gcpLocation === void 0 && patch.chatInterface === void 0 && patch.maxOutputTokens === void 0 && !("rolePrompt" in patch)) {
+    if ("gcp_project_id" in body) {
+      const v = body.gcp_project_id;
+      if (v === null) {
+        patch.gcpProjectId = null;
+      } else if (typeof v === "string") {
+        const trimmed = v.trim();
+        if (trimmed === "") {
+          patch.gcpProjectId = null;
+        } else if (trimmed.length > 64 || !GCP_PROJECT_ID_REGEX.test(trimmed)) {
+          return jsonResponse({ error: "invalid_gcp_project_id" }, 400);
+        } else {
+          patch.gcpProjectId = trimmed;
+        }
+      } else {
+        return jsonResponse({ error: "invalid_gcp_project_id" }, 400);
+      }
+    }
+    if (patch.toolProvider === void 0 && patch.gcpLocation === void 0 && patch.chatInterface === void 0 && patch.maxOutputTokens === void 0 && !("rolePrompt" in patch) && !("gcpProjectId" in patch)) {
       return jsonResponse(
         {
           error: "empty_patch",
-          message: "Body must set at least one of tool_provider, gcp_location, chat_interface, max_output_tokens, role_prompt."
+          message: "Body must set at least one of tool_provider, gcp_location, chat_interface, max_output_tokens, role_prompt, gcp_project_id."
         },
         400
       );
@@ -1793,9 +1949,10 @@ function configureAiChat(opts) {
         `Unknown tool provider '${providerId ?? settings.toolProvider}'. Registered: ${toolProviders2.map((p) => p.id).join(", ")}.`
       );
     }
+    const effectiveProjectId = settings.gcpProjectId ?? opts.vertex.projectId;
     const provider = def.createProvider({
       auth: opts.vertex.auth,
-      projectId: opts.vertex.projectId,
+      projectId: effectiveProjectId,
       defaultLocation: opts.vertex.defaultLocation,
       modelIds: opts.vertex.modelIds,
       location: location ?? settings.gcpLocation