@terreno/ai 0.24.0 → 0.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -95,12 +95,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
95
95
  exports.addGptRoutes = void 0;
96
96
  var api_1 = require("@terreno/api");
97
97
  var ai_1 = require("ai");
98
+ var luxon_1 = require("luxon");
98
99
  var langfuseVercelAi_1 = require("../langfuseVercelAi");
99
100
  var aiRequest_1 = require("../models/aiRequest");
100
101
  var gptHistory_1 = require("../models/gptHistory");
101
102
  var project_1 = require("../models/project");
102
103
  var aiService_1 = require("../service/aiService");
103
104
  var prompts_1 = require("../service/prompts");
105
+ var isGeneratedImageFile = function (value) {
106
+ return typeof value === "object" &&
107
+ value !== null &&
108
+ "base64" in value &&
109
+ typeof value.base64 === "string" &&
110
+ "mediaType" in value &&
111
+ typeof value.mediaType === "string" &&
112
+ value.mediaType.startsWith("image/");
113
+ };
104
114
  var DEMO_RESPONSE = "This is demo mode. To use AI features, paste your Gemini API key in Settings.";
105
115
  /** Send a canned SSE demo response when no AI service is available. */
106
116
  var sendDemoResponse = function (res, historyId) {
@@ -201,7 +211,7 @@ var addGptRoutes = function (router, options) {
201
211
  // Use a raw handler instead of asyncHandler so we can control error responses
202
212
  // for both pre-stream (JSON) and mid-stream (SSE) errors.
203
213
  function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
204
- var sseStarted, _a, prompt_1, historyId, systemPrompt, attachments, requestModel, projectId, userId, hasPerRequestKey, hasCreateModelFn, hasConfiguredService, aiService, history_1, effectiveProjectId, effectiveSystemPrompt, project, parts, projectContext, _b, langfuseResult, langfusePrompt, err_1, contentParts, attachments_1, attachments_1_1, attachment, hasAttachments, userPrompt, messages, modelId, supportsTools, allTools, requestTools, mcpTools, _c, fullResponse, generatedImages, startTime, telemetry, result, partCount, stepTextBuffer, stepHasToolCall, _d, _e, _f, part, cleaned, errMsg, mediaType, dataUrl, textChunk, toolResult, _g, _fileData, cleanResult, e_1_1, cleaned, files, files_1, files_1_1, file, dataUrl, fileErr_1, contentParts_1, assistantPrompt, logErr_1, perRequestApiKey, title, error_1, logErr_2, outerError_1, message, status_1, stack;
214
+ var sseStarted, _a, prompt_1, historyId, systemPrompt, attachments, requestModel, projectId, userId, hasPerRequestKey, hasCreateModelFn, hasConfiguredService, aiService, history_1, effectiveProjectId, effectiveSystemPrompt, project, parts, projectContext, _b, langfuseResult, langfusePrompt, err_1, contentParts, attachments_1, attachments_1_1, attachment, hasAttachments, userPrompt, messages, modelId, supportsTools, allTools, requestTools, mcpTools, _c, fullResponse, generatedImages, startTime, telemetry, result, partCount, stepTextBuffer, stepHasToolCall, _d, _e, _f, part, cleaned, errMsg, dataUrl, textChunk, toolResult, _g, _fileData, cleanResult, e_1_1, cleaned, files, files_1, files_1_1, file, dataUrl, fileErr_1, contentParts_1, assistantPrompt, logErr_1, perRequestApiKey, title, error_1, logErr_2, outerError_1, message, status_1, stack;
205
215
  var e_2, _h, e_3, _j;
206
216
  var _k, e_1, _l, _m;
207
217
  var _o, _p, _q, _r, _s, _t;
@@ -377,7 +387,7 @@ var addGptRoutes = function (router, options) {
377
387
  sseStarted = true;
378
388
  fullResponse = "";
379
389
  generatedImages = [];
380
- startTime = Date.now();
390
+ startTime = luxon_1.DateTime.now().toMillis();
381
391
  _u.label = 17;
382
392
  case 17:
383
393
  _u.trys.push([17, 42, , 47]);
@@ -421,7 +431,9 @@ var addGptRoutes = function (router, options) {
421
431
  part = _m;
422
432
  partCount++;
423
433
  if (partCount <= 5 || part.type === "error" || part.type === "file") {
424
- api_1.logger.debug("Stream part", __assign(__assign({ partCount: partCount, type: part.type }, (part.type === "file" ? { mediaType: part.mediaType } : {})), (part.type === "error" ? { error: String((_p = part.error) !== null && _p !== void 0 ? _p : part) } : {})));
434
+ api_1.logger.debug("Stream part", __assign(__assign({ partCount: partCount, type: part.type }, (part.type === "file" && isGeneratedImageFile(part.file)
435
+ ? { mediaType: part.file.mediaType }
436
+ : {})), (part.type === "error" ? { error: String((_p = part.error) !== null && _p !== void 0 ? _p : part) } : {})));
425
437
  }
426
438
  // Track step boundaries to discard reasoning text from tool-call steps
427
439
  if (part.type === "start-step") {
@@ -453,11 +465,12 @@ var addGptRoutes = function (router, options) {
453
465
  return [3 /*break*/, 21];
454
466
  }
455
467
  if (part.type === "file") {
456
- mediaType = part.mediaType;
457
- if (mediaType === null || mediaType === void 0 ? void 0 : mediaType.startsWith("image/")) {
458
- dataUrl = "data:".concat(mediaType, ";base64,").concat(part.base64);
459
- generatedImages.push({ mimeType: mediaType, url: dataUrl });
460
- res.write("data: ".concat(JSON.stringify({ image: { mimeType: mediaType, url: dataUrl } }), "\n\n"));
468
+ if (isGeneratedImageFile(part.file)) {
469
+ dataUrl = "data:".concat(part.file.mediaType, ";base64,").concat(part.file.base64);
470
+ generatedImages.push({ mimeType: part.file.mediaType, url: dataUrl });
471
+ res.write("data: ".concat(JSON.stringify({
472
+ image: { mimeType: part.file.mediaType, url: dataUrl },
473
+ }), "\n\n"));
461
474
  api_1.logger.debug("Sent inline image from stream");
462
475
  }
463
476
  return [3 /*break*/, 21];
@@ -607,7 +620,7 @@ var addGptRoutes = function (router, options) {
607
620
  prompt: prompt_1,
608
621
  requestType: "general",
609
622
  response: fullResponse,
610
- responseTime: Date.now() - startTime,
623
+ responseTime: luxon_1.DateTime.now().toMillis() - startTime,
611
624
  userId: userId !== null && userId !== void 0 ? userId : undefined,
612
625
  })];
613
626
  case 36:
@@ -652,7 +665,7 @@ var addGptRoutes = function (router, options) {
652
665
  error: error_1 instanceof Error ? error_1.message : String(error_1),
653
666
  prompt: prompt_1,
654
667
  requestType: "general",
655
- responseTime: Date.now() - startTime,
668
+ responseTime: luxon_1.DateTime.now().toMillis() - startTime,
656
669
  userId: userId !== null && userId !== void 0 ? userId : undefined,
657
670
  })];
658
671
  case 44:
@@ -81,6 +81,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
81
81
  exports.AIService = exports.TemperaturePresets = void 0;
82
82
  var api_1 = require("@terreno/api");
83
83
  var ai_1 = require("ai");
84
+ var luxon_1 = require("luxon");
84
85
  var aiRequest_1 = require("../models/aiRequest");
85
86
  var parseAiJson_1 = require("./parseAiJson");
86
87
  var prompts_1 = require("./prompts");
@@ -263,7 +264,7 @@ var AIService = /** @class */ (function () {
263
264
  switch (_b.label) {
264
265
  case 0:
265
266
  prompt = options.prompt, systemPrompt = options.systemPrompt, temperature = options.temperature, maxOutputTokens = options.maxOutputTokens, userId = options.userId;
266
- startTime = Date.now();
267
+ startTime = luxon_1.DateTime.now().toMillis();
267
268
  _b.label = 1;
268
269
  case 1:
269
270
  _b.trys.push([1, 4, , 6]);
@@ -277,7 +278,7 @@ var AIService = /** @class */ (function () {
277
278
  })];
278
279
  case 2:
279
280
  result = _b.sent();
280
- responseTime = Date.now() - startTime;
281
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
281
282
  return [4 /*yield*/, this.logRequest({
282
283
  aiModel: getModelId(this.model),
283
284
  prompt: prompt,
@@ -292,7 +293,7 @@ var AIService = /** @class */ (function () {
292
293
  return [2 /*return*/, result.text];
293
294
  case 4:
294
295
  error_1 = _b.sent();
295
- responseTime = Date.now() - startTime;
296
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
296
297
  return [4 /*yield*/, this.logRequest({
297
298
  aiModel: getModelId(this.model),
298
299
  error: error_1 instanceof Error ? error_1.message : String(error_1),
@@ -318,7 +319,7 @@ var AIService = /** @class */ (function () {
318
319
  switch (_b.label) {
319
320
  case 0:
320
321
  maxOutputTokens = options.maxOutputTokens, outputDescription = options.outputDescription, outputName = options.outputName, prompt = options.prompt, systemPrompt = options.systemPrompt, temperature = options.temperature, userId = options.userId;
321
- startTime = Date.now();
322
+ startTime = luxon_1.DateTime.now().toMillis();
322
323
  system = systemPrompt !== null && systemPrompt !== void 0 ? systemPrompt : prompts_1.JSON_VALUE_SYSTEM_PROMPT;
323
324
  _b.label = 1;
324
325
  case 1:
@@ -334,7 +335,7 @@ var AIService = /** @class */ (function () {
334
335
  })];
335
336
  case 2:
336
337
  result = _b.sent();
337
- responseTime = Date.now() - startTime;
338
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
338
339
  return [4 /*yield*/, this.logRequest({
339
340
  aiModel: getModelId(this.model),
340
341
  prompt: prompt,
@@ -349,7 +350,7 @@ var AIService = /** @class */ (function () {
349
350
  return [2 /*return*/, result.output];
350
351
  case 4:
351
352
  error_2 = _b.sent();
352
- responseTime = Date.now() - startTime;
353
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
353
354
  return [4 /*yield*/, this.logStructuredJsonFailure({
354
355
  error: error_2,
355
356
  prompt: prompt,
@@ -375,7 +376,7 @@ var AIService = /** @class */ (function () {
375
376
  switch (_b.label) {
376
377
  case 0:
377
378
  maxOutputTokens = options.maxOutputTokens, prompt = options.prompt, schema = options.schema, schemaDescription = options.schemaDescription, schemaName = options.schemaName, systemPrompt = options.systemPrompt, temperature = options.temperature, userId = options.userId;
378
- startTime = Date.now();
379
+ startTime = luxon_1.DateTime.now().toMillis();
379
380
  system = systemPrompt !== null && systemPrompt !== void 0 ? systemPrompt : prompts_1.JSON_VALUE_SYSTEM_PROMPT;
380
381
  _b.label = 1;
381
382
  case 1:
@@ -395,7 +396,7 @@ var AIService = /** @class */ (function () {
395
396
  })];
396
397
  case 2:
397
398
  result = _b.sent();
398
- responseTime = Date.now() - startTime;
399
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
399
400
  return [4 /*yield*/, this.logRequest({
400
401
  aiModel: getModelId(this.model),
401
402
  prompt: prompt,
@@ -410,7 +411,7 @@ var AIService = /** @class */ (function () {
410
411
  return [2 /*return*/, result.output];
411
412
  case 4:
412
413
  error_3 = _b.sent();
413
- responseTime = Date.now() - startTime;
414
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
414
415
  return [4 /*yield*/, this.logStructuredJsonFailure({
415
416
  error: error_3,
416
417
  prompt: prompt,
@@ -439,7 +440,7 @@ var AIService = /** @class */ (function () {
439
440
  switch (_b.label) {
440
441
  case 0:
441
442
  element = options.element, maxOutputTokens = options.maxOutputTokens, outputDescription = options.outputDescription, outputName = options.outputName, prompt = options.prompt, systemPrompt = options.systemPrompt, temperature = options.temperature, userId = options.userId;
442
- startTime = Date.now();
443
+ startTime = luxon_1.DateTime.now().toMillis();
443
444
  system = systemPrompt !== null && systemPrompt !== void 0 ? systemPrompt : prompts_1.JSON_VALUE_SYSTEM_PROMPT;
444
445
  _b.label = 1;
445
446
  case 1:
@@ -459,7 +460,7 @@ var AIService = /** @class */ (function () {
459
460
  })];
460
461
  case 2:
461
462
  result = _b.sent();
462
- responseTime = Date.now() - startTime;
463
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
463
464
  return [4 /*yield*/, this.logRequest({
464
465
  aiModel: getModelId(this.model),
465
466
  prompt: prompt,
@@ -474,7 +475,7 @@ var AIService = /** @class */ (function () {
474
475
  return [2 /*return*/, result.output];
475
476
  case 4:
476
477
  error_4 = _b.sent();
477
- responseTime = Date.now() - startTime;
478
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
478
479
  return [4 /*yield*/, this.logStructuredJsonFailure({
479
480
  error: error_4,
480
481
  prompt: prompt,
@@ -499,7 +500,7 @@ var AIService = /** @class */ (function () {
499
500
  switch (_g.label) {
500
501
  case 0:
501
502
  prompt = options.prompt, systemPrompt = options.systemPrompt, temperature = options.temperature, maxOutputTokens = options.maxOutputTokens, userId = options.userId;
502
- startTime = Date.now();
503
+ startTime = luxon_1.DateTime.now().toMillis();
503
504
  fullResponse = "";
504
505
  _g.label = 1;
505
506
  case 1:
@@ -550,7 +551,7 @@ var AIService = /** @class */ (function () {
550
551
  return [7 /*endfinally*/];
551
552
  case 14: return [7 /*endfinally*/];
552
553
  case 15:
553
- responseTime = Date.now() - startTime;
554
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
554
555
  return [4 /*yield*/, __await(result.usage)];
555
556
  case 16:
556
557
  usage = _g.sent();
@@ -568,7 +569,7 @@ var AIService = /** @class */ (function () {
568
569
  return [3 /*break*/, 20];
569
570
  case 18:
570
571
  error_5 = _g.sent();
571
- responseTime = Date.now() - startTime;
572
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
572
573
  return [4 /*yield*/, __await(this.logRequest({
573
574
  aiModel: getModelId(this.model),
574
575
  error: error_5 instanceof Error ? error_5.message : String(error_5),
@@ -696,7 +697,7 @@ var AIService = /** @class */ (function () {
696
697
  switch (_g.label) {
697
698
  case 0:
698
699
  messages = options.messages, systemPrompt = options.systemPrompt, tools = options.tools, toolChoice = options.toolChoice, stopWhen = options.stopWhen, userId = options.userId;
699
- startTime = Date.now();
700
+ startTime = luxon_1.DateTime.now().toMillis();
700
701
  fullResponse = "";
701
702
  promptText = messages.map(function (m) { return "".concat(m.role, ": ").concat(m.content); }).join("\n");
702
703
  _g.label = 1;
@@ -750,7 +751,7 @@ var AIService = /** @class */ (function () {
750
751
  return [7 /*endfinally*/];
751
752
  case 14: return [7 /*endfinally*/];
752
753
  case 15:
753
- responseTime = Date.now() - startTime;
754
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
754
755
  return [4 /*yield*/, __await(result.usage)];
755
756
  case 16:
756
757
  usage = _g.sent();
@@ -768,7 +769,7 @@ var AIService = /** @class */ (function () {
768
769
  return [3 /*break*/, 20];
769
770
  case 18:
770
771
  error_6 = _g.sent();
771
- responseTime = Date.now() - startTime;
772
+ responseTime = luxon_1.DateTime.now().toMillis() - startTime;
772
773
  return [4 /*yield*/, __await(this.logRequest({
773
774
  aiModel: getModelId(this.model),
774
775
  error: error_6 instanceof Error ? error_6.message : String(error_6),
package/package.json CHANGED
@@ -18,14 +18,14 @@
18
18
  "description": "AI service layer for Terreno apps - GPT chat, request logging, and admin tools.",
19
19
  "devDependencies": {
20
20
  "@biomejs/biome": "^2.3.6",
21
- "@terreno/test": "0.24.0",
21
+ "@terreno/test": "0.25.0",
22
22
  "@types/bun": "^1.3.8",
23
23
  "@types/express": "^5.0.6",
24
24
  "@types/luxon": "^3.7.1",
25
25
  "@types/multer": "^1.4.12",
26
26
  "@types/passport-local-mongoose": "^6.1.5",
27
27
  "@types/supertest": "^7.2.0",
28
- "@terreno/api": "0.24.0",
28
+ "@terreno/api": "0.25.0",
29
29
  "mongoose": "8.23.0",
30
30
  "passport-local-mongoose": "^9.0.1",
31
31
  "supertest": "^7.2.2",
@@ -72,7 +72,7 @@
72
72
  "access": "public"
73
73
  },
74
74
  "peerDependencies": {
75
- "@terreno/api": "0.24.0",
75
+ "@terreno/api": "0.25.0",
76
76
  "mongoose": "^8.0.0"
77
77
  },
78
78
  "repository": {
@@ -91,5 +91,5 @@
91
91
  "test:coverage": "bun run ../scripts/check-coverage.ts"
92
92
  },
93
93
  "types": "dist/index.d.ts",
94
- "version": "0.24.0"
94
+ "version": "0.25.0"
95
95
  }
@@ -0,0 +1,141 @@
1
+ import {afterAll, beforeAll, describe, expect, it, mock} from "bun:test";
2
+ import {TerrenoApp} from "@terreno/api";
3
+ import type {LanguageModel} from "ai";
4
+ import type express from "express";
5
+
6
+ import {GptHistory} from "../models/gptHistory";
7
+ import {authAsUser, ensureTestUsers, UserModel} from "../tests/helpers";
8
+
9
+ type StreamPart = {type: string; [key: string]: unknown};
10
+
11
+ // The parts emitted by the mocked `streamText` fullStream. Kept module-level so
12
+ // individual tests can tailor the stream before issuing a request.
13
+ let streamParts: StreamPart[] = [];
14
+ let streamFiles: Array<{base64: string; mediaType: string}> = [];
15
+
16
+ // Mock langfuseVercelAi to avoid transitive langfuse SDK imports.
17
+ const realLangfuseVercelAi = await import("../langfuseVercelAi");
18
+ mock.module("../langfuseVercelAi", () => ({
19
+ ...realLangfuseVercelAi,
20
+ createTelemetryConfig: () => ({functionId: "test", isEnabled: false}),
21
+ preparePromptForAI: async () => ({config: {}, prompt: "test", telemetry: {isEnabled: false}}),
22
+ }));
23
+
24
+ // Mock the AI SDK so we control exactly which fullStream parts the GPT prompt
25
+ // handler iterates over. All other exports are preserved so AIService and the
26
+ // route helpers keep working.
27
+ const realAi = await import("ai");
28
+ mock.module("ai", () => ({
29
+ ...realAi,
30
+ streamText: () => ({
31
+ files: Promise.resolve(streamFiles),
32
+ fullStream: (async function* fullStream(): AsyncGenerator<StreamPart> {
33
+ for (const part of streamParts) {
34
+ yield part;
35
+ }
36
+ })(),
37
+ }),
38
+ }));
39
+
40
+ const {addGptRoutes} = await import("../routes/gpt");
41
+ const {AIService} = await import("../service/aiService");
42
+
43
+ const createMockModel = () => ({
44
+ doGenerate: mock(async () => ({
45
+ content: [{text: "Mock Title", type: "text" as const}],
46
+ finishReason: "stop" as const,
47
+ usage: {inputTokens: 1, outputTokens: 1},
48
+ })),
49
+ doStream: mock(async () => ({
50
+ stream: new ReadableStream({
51
+ start(controller) {
52
+ controller.enqueue({
53
+ finishReason: "stop" as const,
54
+ type: "finish" as const,
55
+ usage: {inputTokens: 1, outputTokens: 1},
56
+ });
57
+ controller.close();
58
+ },
59
+ }),
60
+ })),
61
+ modelId: "mock-model",
62
+ provider: "mock-provider",
63
+ specificationVersion: "v2" as const,
64
+ supportedUrls: {},
65
+ });
66
+
67
+ type SseStream = {on: (event: string, handler: (arg: Buffer) => void) => void};
68
+ const sseCollect = (r: SseStream, cb: (err: Error | null, data: string) => void): void => {
69
+ let data = "";
70
+ r.on("data", (chunk: Buffer) => {
71
+ data += chunk.toString();
72
+ });
73
+ r.on("end", () => cb(null, data));
74
+ };
75
+
76
+ describe("GPT prompt streaming edge cases", () => {
77
+ let app: express.Application;
78
+
79
+ beforeAll(async () => {
80
+ await ensureTestUsers();
81
+ await GptHistory.deleteMany({});
82
+ const aiService = new AIService({
83
+ model: createMockModel() as unknown as LanguageModel,
84
+ });
85
+ app = new TerrenoApp({
86
+ configureApp: (router, options) => {
87
+ addGptRoutes(router, {aiService, openApiOptions: options});
88
+ },
89
+ skipListen: true,
90
+ userModel: UserModel,
91
+ }).build();
92
+ });
93
+
94
+ afterAll(async () => {
95
+ await GptHistory.deleteMany({});
96
+ });
97
+
98
+ it("emits an inline image and flushes buffered text with no finish-step", async () => {
99
+ // A text-delta with no start-step/finish-step forces the post-loop flush,
100
+ // and a file part with an image media type exercises the inline image path.
101
+ streamParts = [
102
+ {text: "Hello world", type: "text-delta"},
103
+ {file: {base64: "aGVsbG8=", mediaType: "image/png"}, type: "file"},
104
+ ];
105
+ streamFiles = [];
106
+
107
+ const agent = await authAsUser(app, "notAdmin");
108
+ const res = await agent
109
+ .post("/gpt/prompt")
110
+ .send({prompt: "Draw something"})
111
+ .buffer(true)
112
+ .parse(sseCollect as never);
113
+
114
+ expect(res.status).toBe(200);
115
+ const body = (res as unknown as {body: string}).body;
116
+ expect(body).toContain("Hello world");
117
+ expect(body).toContain("image/png");
118
+ expect(body).toContain("done");
119
+ });
120
+
121
+ it("ignores non-image inline file parts", async () => {
122
+ // A non-image media type should skip the inline image branch entirely.
123
+ streamParts = [
124
+ {text: "Just text", type: "text-delta"},
125
+ {file: {base64: "AAAA", mediaType: "application/pdf"}, type: "file"},
126
+ ];
127
+ streamFiles = [];
128
+
129
+ const agent = await authAsUser(app, "notAdmin");
130
+ const res = await agent
131
+ .post("/gpt/prompt")
132
+ .send({prompt: "No image"})
133
+ .buffer(true)
134
+ .parse(sseCollect as never);
135
+
136
+ expect(res.status).toBe(200);
137
+ const body = (res as unknown as {body: string}).body;
138
+ expect(body).toContain("Just text");
139
+ expect(body).not.toContain("application/pdf");
140
+ });
141
+ });
package/src/routes/gpt.ts CHANGED
@@ -8,6 +8,7 @@ import {
8
8
  import type {Tool} from "ai";
9
9
  import {stepCountIs, streamText} from "ai";
10
10
  import type express from "express";
11
+ import {DateTime} from "luxon";
11
12
  import type mongoose from "mongoose";
12
13
  import {createTelemetryConfig, preparePromptForAI} from "../langfuseVercelAi";
13
14
 
@@ -23,6 +24,20 @@ import type {
23
24
  MessageContentPart,
24
25
  } from "../types";
25
26
 
27
+ interface GeneratedImageFile {
28
+ base64: string;
29
+ mediaType: string;
30
+ }
31
+
32
+ const isGeneratedImageFile = (value: unknown): value is GeneratedImageFile =>
33
+ typeof value === "object" &&
34
+ value !== null &&
35
+ "base64" in value &&
36
+ typeof value.base64 === "string" &&
37
+ "mediaType" in value &&
38
+ typeof value.mediaType === "string" &&
39
+ value.mediaType.startsWith("image/");
40
+
26
41
  const DEMO_RESPONSE =
27
42
  "This is demo mode. To use AI features, paste your Gemini API key in Settings.";
28
43
 
@@ -301,7 +316,7 @@ export const addGptRoutes = (router: express.Router, options: GptRouteOptions):
301
316
 
302
317
  let fullResponse = "";
303
318
  const generatedImages: Array<{mimeType: string; url: string}> = [];
304
- const startTime = Date.now();
319
+ const startTime = DateTime.now().toMillis();
305
320
  try {
306
321
  logger.debug("Starting streamText", {model: modelId, supportsTools});
307
322
  const telemetry = createTelemetryConfig({
@@ -344,7 +359,9 @@ export const addGptRoutes = (router: express.Router, options: GptRouteOptions):
344
359
  logger.debug("Stream part", {
345
360
  partCount,
346
361
  type: part.type,
347
- ...(part.type === "file" ? {mediaType: part.mediaType} : {}),
362
+ ...(part.type === "file" && isGeneratedImageFile(part.file)
363
+ ? {mediaType: part.file.mediaType}
364
+ : {}),
348
365
  ...(part.type === "error" ? {error: String(part.error ?? part)} : {}),
349
366
  });
350
367
  }
@@ -382,12 +399,13 @@ export const addGptRoutes = (router: express.Router, options: GptRouteOptions):
382
399
  continue;
383
400
  }
384
401
  if (part.type === "file") {
385
- const mediaType = part.mediaType as string | undefined;
386
- if (mediaType?.startsWith("image/")) {
387
- const dataUrl = `data:${mediaType};base64,${part.base64}`;
388
- generatedImages.push({mimeType: mediaType, url: dataUrl});
402
+ if (isGeneratedImageFile(part.file)) {
403
+ const dataUrl = `data:${part.file.mediaType};base64,${part.file.base64}`;
404
+ generatedImages.push({mimeType: part.file.mediaType, url: dataUrl});
389
405
  res.write(
390
- `data: ${JSON.stringify({image: {mimeType: mediaType, url: dataUrl}})}\n\n`
406
+ `data: ${JSON.stringify({
407
+ image: {mimeType: part.file.mediaType, url: dataUrl},
408
+ })}\n\n`
391
409
  );
392
410
  logger.debug("Sent inline image from stream");
393
411
  }
@@ -517,7 +535,7 @@ export const addGptRoutes = (router: express.Router, options: GptRouteOptions):
517
535
  prompt,
518
536
  requestType: "general",
519
537
  response: fullResponse,
520
- responseTime: Date.now() - startTime,
538
+ responseTime: DateTime.now().toMillis() - startTime,
521
539
  userId: userId ?? undefined,
522
540
  });
523
541
  } catch (logErr) {
@@ -565,7 +583,7 @@ export const addGptRoutes = (router: express.Router, options: GptRouteOptions):
565
583
  error: error instanceof Error ? error.message : String(error),
566
584
  prompt,
567
585
  requestType: "general",
568
- responseTime: Date.now() - startTime,
586
+ responseTime: DateTime.now().toMillis() - startTime,
569
587
  userId: userId ?? undefined,
570
588
  });
571
589
  } catch (logErr) {
@@ -3,7 +3,7 @@ import {TerrenoApp} from "@terreno/api";
3
3
  import {jsonSchema, type LanguageModel, type Tool, tool} from "ai";
4
4
  import type express from "express";
5
5
  import mongoose from "mongoose";
6
- import supertest from "supertest";
6
+ import type supertest from "supertest";
7
7
 
8
8
  import {AIRequest} from "../models/aiRequest";
9
9
  import {GptHistory} from "../models/gptHistory";
@@ -457,7 +457,9 @@ describe("AI Routes", () => {
457
457
  .parse(sseCollect);
458
458
  expect(res.status).toBe(200);
459
459
  const body = (res as SseResponse).body;
460
- expect(body).toContain("image");
460
+ expect(body).toContain(
461
+ '"image":{"mimeType":"image/png","url":"data:image/png;base64,aGVsbG8="}'
462
+ );
461
463
  });
462
464
 
463
465
  it("writes an SSE error event when the model stream throws", async () => {
@@ -7,6 +7,7 @@ import {
7
7
  stepCountIs,
8
8
  streamText,
9
9
  } from "ai";
10
+ import {DateTime} from "luxon";
10
11
  import type mongoose from "mongoose";
11
12
 
12
13
  import {AIRequest} from "../models/aiRequest";
@@ -220,7 +221,7 @@ export class AIService {
220
221
 
221
222
  async generateText(options: GenerateTextOptions): Promise<string> {
222
223
  const {prompt, systemPrompt, temperature, maxOutputTokens, userId} = options;
223
- const startTime = Date.now();
224
+ const startTime = DateTime.now().toMillis();
224
225
 
225
226
  try {
226
227
  const result = await aiGenerateText({
@@ -232,7 +233,7 @@ export class AIService {
232
233
  temperature: temperature ?? this.defaultTemperature,
233
234
  });
234
235
 
235
- const responseTime = Date.now() - startTime;
236
+ const responseTime = DateTime.now().toMillis() - startTime;
236
237
  await this.logRequest({
237
238
  aiModel: getModelId(this.model),
238
239
  prompt,
@@ -245,7 +246,7 @@ export class AIService {
245
246
 
246
247
  return result.text;
247
248
  } catch (error) {
248
- const responseTime = Date.now() - startTime;
249
+ const responseTime = DateTime.now().toMillis() - startTime;
249
250
  await this.logRequest({
250
251
  aiModel: getModelId(this.model),
251
252
  error: error instanceof Error ? error.message : String(error),
@@ -269,7 +270,7 @@ export class AIService {
269
270
  temperature,
270
271
  userId,
271
272
  } = options;
272
- const startTime = Date.now();
273
+ const startTime = DateTime.now().toMillis();
273
274
  const system = systemPrompt ?? JSON_VALUE_SYSTEM_PROMPT;
274
275
 
275
276
  try {
@@ -283,7 +284,7 @@ export class AIService {
283
284
  temperature: temperature ?? TemperaturePresets.DETERMINISTIC,
284
285
  });
285
286
 
286
- const responseTime = Date.now() - startTime;
287
+ const responseTime = DateTime.now().toMillis() - startTime;
287
288
  await this.logRequest({
288
289
  aiModel: getModelId(this.model),
289
290
  prompt,
@@ -296,7 +297,7 @@ export class AIService {
296
297
 
297
298
  return result.output;
298
299
  } catch (error) {
299
- const responseTime = Date.now() - startTime;
300
+ const responseTime = DateTime.now().toMillis() - startTime;
300
301
  await this.logStructuredJsonFailure({
301
302
  error,
302
303
  prompt,
@@ -321,7 +322,7 @@ export class AIService {
321
322
  temperature,
322
323
  userId,
323
324
  } = options;
324
- const startTime = Date.now();
325
+ const startTime = DateTime.now().toMillis();
325
326
  const system = systemPrompt ?? JSON_VALUE_SYSTEM_PROMPT;
326
327
 
327
328
  try {
@@ -339,7 +340,7 @@ export class AIService {
339
340
  temperature: temperature ?? TemperaturePresets.DETERMINISTIC,
340
341
  });
341
342
 
342
- const responseTime = Date.now() - startTime;
343
+ const responseTime = DateTime.now().toMillis() - startTime;
343
344
  await this.logRequest({
344
345
  aiModel: getModelId(this.model),
345
346
  prompt,
@@ -352,7 +353,7 @@ export class AIService {
352
353
 
353
354
  return result.output;
354
355
  } catch (error) {
355
- const responseTime = Date.now() - startTime;
356
+ const responseTime = DateTime.now().toMillis() - startTime;
356
357
  await this.logStructuredJsonFailure({
357
358
  error,
358
359
  prompt,
@@ -382,7 +383,7 @@ export class AIService {
382
383
  temperature,
383
384
  userId,
384
385
  } = options;
385
- const startTime = Date.now();
386
+ const startTime = DateTime.now().toMillis();
386
387
  const system = systemPrompt ?? JSON_VALUE_SYSTEM_PROMPT;
387
388
 
388
389
  try {
@@ -400,7 +401,7 @@ export class AIService {
400
401
  temperature: temperature ?? TemperaturePresets.DETERMINISTIC,
401
402
  });
402
403
 
403
- const responseTime = Date.now() - startTime;
404
+ const responseTime = DateTime.now().toMillis() - startTime;
404
405
  await this.logRequest({
405
406
  aiModel: getModelId(this.model),
406
407
  prompt,
@@ -413,7 +414,7 @@ export class AIService {
413
414
 
414
415
  return result.output;
415
416
  } catch (error) {
416
- const responseTime = Date.now() - startTime;
417
+ const responseTime = DateTime.now().toMillis() - startTime;
417
418
  await this.logStructuredJsonFailure({
418
419
  error,
419
420
  prompt,
@@ -428,7 +429,7 @@ export class AIService {
428
429
 
429
430
  async *generateTextStream(options: GenerateStreamOptions): AsyncGenerator<string> {
430
431
  const {prompt, systemPrompt, temperature, maxOutputTokens, userId} = options;
431
- const startTime = Date.now();
432
+ const startTime = DateTime.now().toMillis();
432
433
  let fullResponse = "";
433
434
 
434
435
  try {
@@ -446,7 +447,7 @@ export class AIService {
446
447
  yield chunk;
447
448
  }
448
449
 
449
- const responseTime = Date.now() - startTime;
450
+ const responseTime = DateTime.now().toMillis() - startTime;
450
451
  const usage = await result.usage;
451
452
  await this.logRequest({
452
453
  aiModel: getModelId(this.model),
@@ -458,7 +459,7 @@ export class AIService {
458
459
  userId,
459
460
  });
460
461
  } catch (error) {
461
- const responseTime = Date.now() - startTime;
462
+ const responseTime = DateTime.now().toMillis() - startTime;
462
463
  await this.logRequest({
463
464
  aiModel: getModelId(this.model),
464
465
  error: error instanceof Error ? error.message : String(error),
@@ -557,7 +558,7 @@ export class AIService {
557
558
 
558
559
  async *generateChatStream(options: GenerateChatStreamOptions): AsyncGenerator<string> {
559
560
  const {messages, systemPrompt, tools, toolChoice, stopWhen, userId} = options;
560
- const startTime = Date.now();
561
+ const startTime = DateTime.now().toMillis();
561
562
  let fullResponse = "";
562
563
 
563
564
  const promptText = messages.map((m) => `${m.role}: ${m.content}`).join("\n");
@@ -579,7 +580,7 @@ export class AIService {
579
580
  yield chunk;
580
581
  }
581
582
 
582
- const responseTime = Date.now() - startTime;
583
+ const responseTime = DateTime.now().toMillis() - startTime;
583
584
  const usage = await result.usage;
584
585
  await this.logRequest({
585
586
  aiModel: getModelId(this.model),
@@ -591,7 +592,7 @@ export class AIService {
591
592
  userId,
592
593
  });
593
594
  } catch (error) {
594
- const responseTime = Date.now() - startTime;
595
+ const responseTime = DateTime.now().toMillis() - startTime;
595
596
  await this.logRequest({
596
597
  aiModel: getModelId(this.model),
597
598
  error: error instanceof Error ? error.message : String(error),
@@ -217,11 +217,34 @@ describe("parseAiJson", () => {
217
217
  }
218
218
  });
219
219
 
220
+ it("repairs a closing smart quote via the whole-string aggressive replacement", () => {
221
+ // The closing smart quote sits where the conservative outside-strings repair
222
+ // still considers itself inside a string, so only the blind global
223
+ // smart-quote replacement recovers valid JSON.
224
+ const r = parseAiJson<{a: string}>(`{"a": "b\u201D}`);
225
+ expect(r.success).toBe(true);
226
+ if (r.success) {
227
+ expect(r.repaired).toBe(true);
228
+ expect(r.data).toEqual({a: "b"});
229
+ }
230
+ });
231
+
220
232
  it("falls through balanced extraction when neither direct nor repaired parse succeeds", () => {
221
233
  // extractBalancedJson finds {invalid: json broken} but neither parse nor repair can fix it
222
234
  const r = parseAiJson("prefix {invalid: json broken} suffix");
223
235
  expect(r.success).toBe(false);
224
236
  });
237
+
238
+ it("repairs a smart quote used as a delimiter via aggressive whole-string normalization", () => {
239
+ // The unbalanced real quote makes the outside-strings tracker treat the smart
240
+ // quote as string content, so only the blanket smart-quote replacement recovers it.
241
+ const r = parseAiJson<{a: number}>(`{"a\u201D: 1}`);
242
+ expect(r.success).toBe(true);
243
+ if (r.success) {
244
+ expect(r.repaired).toBe(true);
245
+ expect(r.data).toEqual({a: 1});
246
+ }
247
+ });
225
248
  });
226
249
 
227
250
  describe("normalizeLlmJsonTextForStructuredOutput", () => {