Merge branch 'main' into e2e

Author: jahooma

backend/src/find-files/request-files-prompt.ts

@@ -263,22 +263,17 @@ async function getRelevantFiles(
   const start = performance.now()
   let coreMessages = coreMessagesWithSystem(messagesWithPrompt, system)
 
-  if (costMode === 'experimental') {
-    coreMessages = coreMessages
-      .map((msg, i) => {
-        if (msg.role === 'assistant' && i !== coreMessages.length - 1) {
-          return castAssistantMessage(msg)
-        } else {
-          return msg
-        }
-      })
-      .filter((msg) => msg !== null)
-  }
-  // This finetunedModel is used for the promptFlashWithFallbacks call
-  const finetunedModel =
-    costMode === 'experimental'
-      ? finetunedVertexModels.ft_filepicker_010
-      : finetunedVertexModels.ft_filepicker_005
+  // Converts assistant messages to user messages for finetuned model
+  coreMessages = coreMessages
+    .map((msg, i) => {
+      if (msg.role === 'assistant' && i !== coreMessages.length - 1) {
+        return castAssistantMessage(msg)
+      } else {
+        return msg
+      }
+    })
+    .filter((msg) => msg !== null)
+  const finetunedModel = finetunedVertexModels.ft_filepicker_010
 
   let response = await promptFlashWithFallbacks(coreMessages, {
     clientSessionId,

bun.lock

@@ -159,7 +159,7 @@
         "typescript-eslint": "^8.32.0",
       },
       "optionalDependencies": {
-        "@homebridge/node-pty-prebuilt-multiarch": "0.12.0-beta.5",
+        "@homebridge/node-pty-prebuilt-multiarch": "0.12.0",
       },
     },
     "packages/bigquery": {
@@ -662,7 +662,7 @@
 
     "@grpc/proto-loader": ["@grpc/proto-loader@0.7.15", "", { "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", "protobufjs": "^7.2.5", "yargs": "^17.7.2" }, "bin": { "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" } }, "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ=="],
 
-    "@homebridge/node-pty-prebuilt-multiarch": ["@homebridge/node-pty-prebuilt-multiarch@0.12.0-beta.5", "", { "dependencies": { "node-addon-api": "^7.1.0", "prebuild-install": "^7.1.2", "semver": "^7.6.3" } }, "sha512-i6J1ryzzDE0XY6caawiq5tymY6wbqoO6cBag31Hu6omDWSG0d93YapYab6uP2GJyelYvTJyxJcapOUI9MxYnEg=="],
+    "@homebridge/node-pty-prebuilt-multiarch": ["@homebridge/node-pty-prebuilt-multiarch@0.12.0", "", { "dependencies": { "node-addon-api": "^7.1.0", "prebuild-install": "^7.1.2" } }, "sha512-hJCGcfOnMeRh2KUdWPlVN/1egnfqI4yxgpDhqHSkF2DLn5fiJNdjEHHlcM1K2w9+QBmRE2D/wfmM4zUOb8aMyQ=="],
 
     "@hookform/resolvers": ["@hookform/resolvers@3.10.0", "", { "peerDependencies": { "react-hook-form": "^7.0.0" } }, "sha512-79Dv+3mDF7i+2ajj7SkypSKHhl1cbln1OGavqrsF7p6mbUv11xpqpacPsGDCTRvCSjEEIez2ef1NveSVL3b0Ag=="],
 

codebuff-export-agent-mode-planning.md

@@ -15,19 +15,46 @@
   "fileChangeHooks": [
     {
       "name": "backend-unit-tests",
-      "command": "set -o pipefail && bun test $(find src -name *.test.ts ! -name *.integration.test.ts) 2>&1 | grep -Ev $'\\x1b\\[[0-9;]*m' | grep -Ev '^s*[0-9]+s+(pass|skip)|(pass)|(skip)' && bun run typecheck-only",
+      "command": "set -o pipefail && bun test $(find src -name *.test.ts ! -name *.integration.test.ts) 2>&1 | grep -Ev '✓|\\(pass\\)'",
       "cwd": "backend",
       "filePattern": "backend/**/*.ts"
     },
+    {
+      "name": "backend-typecheck",
+      "command": "bun run typecheck-only",
+      "cwd": "backend",
+      "filePattern": "backend/**/*.ts"
+    },
+
     {
       "name": "npm-app-unit-tests",
-      "command": "set -o pipefail && bun test $(find src -name *.test.ts ! -name *.integration.test.ts) 2>&1 | grep -Ev $'\\x1b\\[[0-9;]*m' | grep -Ev '^s*[0-9]+s+(pass|skip)|(pass)|(skip)' && bun run typecheck-only",
+      "command": "set -o pipefail && bun test $(find src -name *.test.ts ! -name *.integration.test.ts) 2>&1 | grep -Ev '✓|\\(pass\\)'",
+      "cwd": "npm-app",
+      "filePattern": "npm-app/**/*.ts"
+    },
+    {
+      "name": "npm-typecheck",
+      "command": "bun run typecheck-only",
       "cwd": "npm-app",
       "filePattern": "npm-app/**/*.ts"
     },
+
+    {
+      "name": "web-typecheck",
+      "command": "bun run typecheck-only",
+      "cwd": "web",
+      "filePattern": "web/**/*.ts"
+    },
+
     {
       "name": "common-unit-tests",
-      "command": "set -o pipefail && bun test $(find src -name *.test.ts ! -name *.integration.test.ts) 2>&1 | grep -Ev $'\\x1b\\[[0-9;]*m' | grep -Ev '^s*[0-9]+s+(pass|skip)|(pass)|(skip)' && bun run typecheck-only",
+      "command": "set -o pipefail && bun test $(find src -name *.test.ts ! -name *.integration.test.ts) 2>&1 | grep -Ev '✓|\\(pass\\)'",
+      "cwd": "common",
+      "filePattern": "common/**/*.ts"
+    },
+    {
+      "name": "common-typecheck",
+      "command": "bun run typecheck-only",
       "cwd": "common",
       "filePattern": "common/**/*.ts"
     }

codebuff.json

@@ -168,13 +168,11 @@ export const geminiModels = {
   gemini2_5_flash: 'gemini-2.5-flash-preview-05-20',
   gemini2_5_flash_thinking: 'gemini-2.5-flash-preview-05-20:thinking',
   gemini2flash: 'gemini-2.0-flash-001',
-  gemini2_5_pro_exp: 'gemini-2.5-pro-exp-03-25',
-  gemini2_5_pro_preview: 'gemini-2.5-pro-preview-05-06',
+  gemini2_5_pro_preview: 'gemini-2.5-pro-preview-06-05',
 } as const
 export type GeminiModel = (typeof geminiModels)[keyof typeof geminiModels]
 
 export const openrouterModels = {
-  openrouter_gemini2_5_pro_exp: 'google/gemini-2.5-pro-exp-03-25:free',
   openrouter_gemini2_5_pro_preview: 'google/gemini-2.5-pro-preview-03-25',
   openrouter_gemini2_5_flash: 'google/gemini-2.5-flash-preview',
   openrouter_gemini2_5_flash_thinking:
@@ -199,6 +197,7 @@ export const finetunedVertexModels = {
   ft_filepicker_topk_002: '1694861989844615168',
   ft_filepicker_010: '3808739064941641728',
   ft_filepicker_010_epoch_2: '6231675664466968576',
+  ft_filepicker_topk_003: '1502192368286171136',
 } as const
 export const finetunedVertexModelNames: Record<string, string> = {
   [finetunedVertexModels.ft_filepicker_003]: 'ft_filepicker_003',
@@ -210,6 +209,7 @@ export const finetunedVertexModelNames: Record<string, string> = {
   [finetunedVertexModels.ft_filepicker_010]: 'ft_filepicker_010',
   [finetunedVertexModels.ft_filepicker_010_epoch_2]:
     'ft_filepicker_010_epoch_2',
+  [finetunedVertexModels.ft_filepicker_topk_003]: 'ft_filepicker_topk_003',
 }
 export type FinetunedVertexModel =
   (typeof finetunedVertexModels)[keyof typeof finetunedVertexModels]
@@ -236,7 +236,6 @@ export const shortModelNames = {
 
 export const providerModelNames = {
   [models.gemini2_5_pro_preview]: 'gemini',
-  [models.gemini2_5_pro_exp]: 'gemini',
   [models.gemini2flash]: 'gemini',
   [models.gemini2_5_flash]: 'gemini',
   [models.gemini2_5_flash_thinking]: 'gemini',

common/src/constants.ts

@@ -268,8 +268,13 @@ export const stripNullChars = (str: string): string => {
   return str.replace(/\u0000/g, '')
 }
 
-const ansiRegex = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g
+const ansiColorsRegex = /\x1B\[[0-9;]*m/g
 export function stripColors(str: string): string {
+  return str.replace(ansiColorsRegex, '')
+}
+
+const ansiRegex = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~]|\][^\x1B]*\x1B\\?)/g
+export function stripAnsi(str: string): string {
   return str.replace(ansiRegex, '')
 }
 
@@ -284,3 +289,29 @@ export function includesMatch(
     return p.test(value)
   })
 }
+
+/**
+ * Finds the longest substring that is **both** a suffix of `source`
+ * **and** a prefix of `next`.
+ * Useful when concatenating strings while avoiding duplicate overlap.
+ *
+ * @example
+ * ```ts
+ * suffixPrefixOverlap('foobar', 'barbaz'); // ➜ 'bar'
+ * suffixPrefixOverlap('abc', 'def');       // ➜ ''
+ * ```
+ *
+ * @param source  The string whose **suffix** is inspected.
+ * @param next    The string whose **prefix** is inspected.
+ * @returns       The longest overlapping edge, or an empty string if none exists.
+ */
+export function suffixPrefixOverlap(source: string, next: string): string {
+  for (let len = next.length; len > 0; len--) {
+    const prefix = next.slice(0, len)
+    if (source.endsWith(prefix)) {
+      return prefix
+    }
+  }
+
+  return ''
+}

common/src/util/string.ts

@@ -1,4 +1,4 @@
-import { sendBasicEmail } from '@codebuff/integrations'
+import { sendBasicEmail } from '../../packages/integrations/src'
 import { FullEvalLog } from './types'
 import { PostEvalAnalysis } from './post-eval-analysis'