respond to devin comments

Author: carderne

apps/webapp/app/presenters/v3/LogsListPresenter.server.ts

@@ -18,6 +18,7 @@ import { ServiceValidationError } from "~/v3/services/baseService.server";
 import {
   escapeClickHouseLike,
   hasMinimumLogsSearchLength,
+  logsSearchExpansionPeriod,
   LOGS_SEARCH_RETRY_OVERFETCH_FACTOR,
   MIN_LOGS_SEARCH_LENGTH,
   normalizeLogsSearchTerm,
@@ -302,7 +303,7 @@ export class LogsListPresenter extends BasePresenter {
           });
         } else {
           queryBuilder.where(
-            "(lowerUTF8(message) LIKE {searchPattern: String} OR lowerUTF8(attributes_text) LIKE {searchPattern: String})",
+            "(lower(message) LIKE {searchPattern: String} OR lower(attributes_text) LIKE {searchPattern: String})",
             { searchPattern: `%${searchTerm}%` }
           );
         }
@@ -433,6 +434,11 @@ export class LogsListPresenter extends BasePresenter {
       };
     });
 
+    const searchExpansion =
+      searchTerm !== undefined && time.isDefault && transformedLogs.length === 0
+        ? logsSearchExpansionPeriod(effectiveFrom, clampedTo, retentionLimitDays)
+        : undefined;
+
     return {
       logs: transformedLogs,
       pagination: {
@@ -455,10 +461,7 @@ export class LogsListPresenter extends BasePresenter {
       hasFilters,
       hasAnyLogs: transformedLogs.length > 0,
       searchTerm: search,
-      searchExpansion:
-        searchTerm !== undefined && time.isDefault && transformedLogs.length === 0
-          ? { nextPeriod: `${Math.min(retentionLimitDays ?? 7, 7)}d` }
-          : undefined,
+      searchExpansion: searchExpansion ? { nextPeriod: searchExpansion } : undefined,
       retention:
         retentionLimitDays !== undefined
           ? {

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs/route.tsx

@@ -50,6 +50,11 @@ import { MIN_LOGS_SEARCH_LENGTH, normalizeLogsSearchTerm } from "~/utils/logSear
 // Valid log levels for filtering
 const validLevels: LogLevel[] = ["TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
 
+function formatSearchPeriod(period: string): string {
+  const days = Number(period.replace("d", ""));
+  return days === 1 ? "day" : `${days} days`;
+}
+
 function parseLevelsFromUrl(url: URL): LogLevel[] | undefined {
   const levelParams = url.searchParams.getAll("levels").filter((v) => v.length > 0);
   if (levelParams.length === 0) return undefined;
@@ -448,7 +453,7 @@ function LogsList({
           className="m-2 mb-0"
           cta={
             <Button variant="tertiary/small" onClick={expandSearch}>
-              Search last {list.searchExpansion.nextPeriod.replace("d", " days")}
+              Search last {formatSearchPeriod(list.searchExpansion.nextPeriod)}
             </Button>
           }
         >

apps/webapp/app/services/logsSearchProjector.server.ts

@@ -205,7 +205,9 @@ export class LogsSearchProjector {
   }
 
   async pause(): Promise<LogsSearchProjectorStatus> {
-    if (!(await this.stateStore.find())) return uninitializedProjectorStatus();
+    if (!(await this.stateStore.find())) {
+      throw new LogsSearchProjectorConflictError("Logs search projector is not initialized");
+    }
     await this.stateStore.pause();
     return this.readStatus(false);
   }

apps/webapp/app/services/logsSearchProjectorInstance.server.ts

@@ -1,3 +1,4 @@
+import { prisma } from "~/db.server";
 import { env } from "~/env.server";
 import { getLogsSearchProjectorClickhouseClient } from "~/services/clickhouse/clickhouseFactory.server";
 import { LogsSearchProjector } from "~/services/logsSearchProjector.server";
@@ -28,7 +29,7 @@ function initializeLogsSearchProjector() {
       maxBackfillRangeMs: env.LOGS_SEARCH_PROJECTOR_MAX_BACKFILL_RANGE_DAYS * 24 * 60 * 60 * 1000,
       maxBackfillAgeMs: env.LOGS_SEARCH_PROJECTOR_MAX_BACKFILL_AGE_DAYS * 24 * 60 * 60 * 1000,
     },
-    new PrismaLogsSearchProjectorStateStore(),
+    new PrismaLogsSearchProjectorStateStore(prisma),
     async (window) => {
       const [error, result] = await clickhouse.taskEventsSearch.projectV2Window(window, limits);
       if (error) throw error;

apps/webapp/app/services/logsSearchProjectorStateStore.server.ts

@@ -1,13 +1,17 @@
-import { prisma } from "~/db.server";
+import type { PrismaClient } from "@trigger.dev/database";
 import {
   LOGS_SEARCH_PROJECTOR_STATE_ID,
   type LogsSearchProjectorState,
   type LogsSearchProjectorStateStore,
 } from "~/services/logsSearchProjector.server";
 
+type LogsSearchProjectorDatabase = Pick<PrismaClient, "logsSearchProjectorState" | "$executeRaw">;
+
 export class PrismaLogsSearchProjectorStateStore implements LogsSearchProjectorStateStore {
+  constructor(private readonly database: LogsSearchProjectorDatabase) {}
+
   async initialize(boundary: Date): Promise<LogsSearchProjectorState> {
-    return prisma.logsSearchProjectorState.upsert({
+    return this.database.logsSearchProjectorState.upsert({
       where: { id: LOGS_SEARCH_PROJECTOR_STATE_ID },
       create: {
         id: LOGS_SEARCH_PROJECTOR_STATE_ID,
@@ -19,7 +23,7 @@ export class PrismaLogsSearchProjectorStateStore implements LogsSearchProjectorS
   }
 
   async find(): Promise<LogsSearchProjectorState | null> {
-    return prisma.logsSearchProjectorState.findFirst({
+    return this.database.logsSearchProjectorState.findFirst({
       where: { id: LOGS_SEARCH_PROJECTOR_STATE_ID },
     });
   }
@@ -31,7 +35,7 @@ export class PrismaLogsSearchProjectorStateStore implements LogsSearchProjectorS
   }
 
   async acquireLease(token: string, leaseDurationMs: number): Promise<boolean> {
-    const count = await prisma.$executeRaw`
+    const count = await this.database.$executeRaw`
       UPDATE "LogsSearchProjectorState"
       SET
         "leaseToken" = ${token},
@@ -49,7 +53,7 @@ export class PrismaLogsSearchProjectorStateStore implements LogsSearchProjectorS
   }
 
   async renewLease(token: string, leaseDurationMs: number): Promise<boolean> {
-    const count = await prisma.$executeRaw`
+    const count = await this.database.$executeRaw`
       UPDATE "LogsSearchProjectorState"
       SET
         "leaseExpiresAt" = CURRENT_TIMESTAMP + (${leaseDurationMs} * INTERVAL '1 millisecond'),
@@ -62,14 +66,14 @@ export class PrismaLogsSearchProjectorStateStore implements LogsSearchProjectorS
   }
 
   async releaseLease(token: string): Promise<void> {
-    await prisma.logsSearchProjectorState.updateMany({
+    await this.database.logsSearchProjectorState.updateMany({
       where: { id: LOGS_SEARCH_PROJECTOR_STATE_ID, leaseToken: token },
       data: { leaseToken: null, leaseExpiresAt: null },
     });
   }
 
   async advanceLive(token: string, expected: Date, next: Date): Promise<boolean> {
-    const result = await prisma.logsSearchProjectorState.updateMany({
+    const result = await this.database.logsSearchProjectorState.updateMany({
       where: {
         id: LOGS_SEARCH_PROJECTOR_STATE_ID,
         paused: false,
@@ -87,7 +91,7 @@ export class PrismaLogsSearchProjectorStateStore implements LogsSearchProjectorS
     next: Date,
     expectedTarget: Date
   ): Promise<boolean> {
-    const result = await prisma.logsSearchProjectorState.updateMany({
+    const result = await this.database.logsSearchProjectorState.updateMany({
       where: {
         id: LOGS_SEARCH_PROJECTOR_STATE_ID,
         paused: false,
@@ -104,21 +108,21 @@ export class PrismaLogsSearchProjectorStateStore implements LogsSearchProjectorS
   }
 
   async pause(): Promise<void> {
-    await prisma.logsSearchProjectorState.update({
+    await this.database.logsSearchProjectorState.update({
       where: { id: LOGS_SEARCH_PROJECTOR_STATE_ID },
       data: { paused: true },
     });
   }
 
   async resume(): Promise<void> {
-    await prisma.logsSearchProjectorState.update({
+    await this.database.logsSearchProjectorState.update({
       where: { id: LOGS_SEARCH_PROJECTOR_STATE_ID },
       data: { paused: false },
     });
   }
 
   async setBackfillTarget(expectedHistorical: Date, target: Date): Promise<boolean> {
-    const result = await prisma.logsSearchProjectorState.updateMany({
+    const result = await this.database.logsSearchProjectorState.updateMany({
       where: {
         id: LOGS_SEARCH_PROJECTOR_STATE_ID,
         historicalWatermark: expectedHistorical,
@@ -130,7 +134,7 @@ export class PrismaLogsSearchProjectorStateStore implements LogsSearchProjectorS
   }
 
   async cancelBackfill(): Promise<void> {
-    await prisma.logsSearchProjectorState.update({
+    await this.database.logsSearchProjectorState.update({
       where: { id: LOGS_SEARCH_PROJECTOR_STATE_ID },
       data: { backfillTarget: null },
     });

apps/webapp/app/utils/logSearch.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 import {
   escapeClickHouseLike,
   hasMinimumLogsSearchLength,
+  logsSearchExpansionPeriod,
   normalizeLogsSearchTerm,
   prepareLogsSearchPage,
 } from "./logSearch";
@@ -10,7 +11,9 @@ describe("log search normalization", () => {
   it("normalizes punctuation while preserving unicode, paths, and ids", () => {
     expect(
       normalizeLogsSearchTerm("TypeError: Zahlungsübersicht failed, retrying (/api/orders/42)")
-    ).toBe("typeerror: zahlungsübersicht failed retrying /api/orders/42");
+    ).toBe("typeerror:zahlungsübersicht failed retrying /api/orders/42");
+    expect(normalizeLogsSearchTerm('"status_code": 500')).toBe("status_code:500");
+    expect(normalizeLogsSearchTerm("status_code:500")).toBe("status_code:500");
   });
 
   it("escapes LIKE wildcards without escaping path separators", () => {
@@ -24,6 +27,14 @@ describe("log search normalization", () => {
     expect(hasMinimumLogsSearchLength("日本語")).toBe(true);
   });
 
+  it("only offers a strictly wider retained search range", () => {
+    const to = new Date("2026-08-14T12:00:00.000Z");
+
+    expect(logsSearchExpansionPeriod(new Date("2026-08-14T11:00:00.000Z"), to, 1)).toBe("1d");
+    expect(logsSearchExpansionPeriod(new Date("2026-08-13T12:00:00.000Z"), to, 1)).toBeUndefined();
+    expect(logsSearchExpansionPeriod(new Date("2026-08-13T12:00:00.000Z"), to, 7)).toBe("7d");
+  });
+
   it("removes projector retry copies after bounded overfetch", () => {
     const row = (fingerprint: string) => ({
       projection_fingerprint_string: fingerprint,

apps/webapp/app/utils/logSearch.ts

@@ -1,5 +1,23 @@
 export const MIN_LOGS_SEARCH_LENGTH = 3;
 export const LOGS_SEARCH_RETRY_OVERFETCH_FACTOR = 4;
+const DAY_MS = 24 * 60 * 60 * 1000;
+const RANGE_COMPARISON_TOLERANCE_MS = 1000;
+
+export function logsSearchExpansionPeriod(
+  from: Date | undefined,
+  to: Date,
+  retentionLimitDays: number | undefined
+): string | undefined {
+  if (!from) return undefined;
+
+  const candidateDays = Math.min(retentionLimitDays ?? 7, 7);
+  const currentRangeMs = Math.max(0, to.getTime() - from.getTime());
+  if (candidateDays * DAY_MS <= currentRangeMs + RANGE_COMPARISON_TOLERANCE_MS) {
+    return undefined;
+  }
+
+  return `${candidateDays}d`;
+}
 
 type ProjectedLogIdentity = {
   projection_fingerprint_string?: string;
@@ -38,10 +56,11 @@ export function escapeClickHouseLike(value: string): string {
   return value.replace(/\\/g, "\\\\").replace(/%/g, "\\%").replace(/_/g, "\\_");
 }
 
-// Must match the normalization in ClickHouse migration 038.
+// Must match the scheduled ClickHouse projector normalization.
 export function normalizeLogsSearchTerm(value: string): string {
   return value
     .toLocaleLowerCase()
     .replace(/[^\p{L}\p{N}_./:@+-]+/gu, " ")
+    .replace(/\s*:\s*/g, ":")
     .trim();
 }