unify errorToObject and getErrorObject

Author: charleslien

backend/src/llm-apis/vercel-ai-sdk/ai-sdk.ts

@@ -5,8 +5,8 @@ import {
   openaiModels,
 } from '@codebuff/common/old-constants'
 import { buildArray } from '@codebuff/common/util/array'
+import { getErrorObject } from '@codebuff/common/util/error'
 import { convertCbToModelMessages } from '@codebuff/common/util/messages'
-import { errorToObject } from '@codebuff/common/util/object'
 import { withTimeout } from '@codebuff/common/util/promise'
 import { StopSequenceHandler } from '@codebuff/common/util/stop-sequence'
 import { generateCompactId } from '@codebuff/common/util/string'
@@ -121,7 +121,7 @@ export const promptAiSdkStream = async function* (
       logger.error(
         {
           chunk: { ...chunk, error: undefined },
-          error: errorToObject(chunk.error),
+          error: getErrorObject(chunk.error),
           model: options.model,
         },
         'Error from AI SDK',

backend/src/util/messages.ts

@@ -1,7 +1,7 @@
 import { AssertionError } from 'assert'
 
 import { buildArray } from '@codebuff/common/util/array'
-import { errorToObject } from '@codebuff/common/util/object'
+import { getErrorObject } from '@codebuff/common/util/error'
 import { closeXml } from '@codebuff/common/util/xml'
 import { cloneDeep, isEqual } from 'lodash'
 
@@ -283,7 +283,7 @@ export function getEditedFiles(messages: Message[]): string[] {
           return fileInfo.file
         } catch (error) {
           logger.error(
-            { error: errorToObject(error), m },
+            { error: getErrorObject(error), m },
             'Error parsing file info',
           )
           return null
@@ -314,7 +314,7 @@ export function getPreviouslyReadFiles(messages: Message[]): {
         )
       } catch (error) {
         logger.error(
-          { error: errorToObject(error), message },
+          { error: getErrorObject(error), message },
           'Error parsing read_files output from message',
         )
       }
@@ -337,7 +337,7 @@ export function getPreviouslyReadFiles(messages: Message[]): {
         )
       } catch (error) {
         logger.error(
-          { error: errorToObject(error), message },
+          { error: getErrorObject(error), message },
           'Error parsing find_files output from message',
         )
       }

backend/src/util/simplify-tool-results.ts

@@ -1,4 +1,4 @@
-import { errorToObject } from '@codebuff/common/util/object'
+import { getErrorObject } from '@codebuff/common/util/error'
 import { cloneDeep } from 'lodash'
 
 import { logger } from './logger'
@@ -44,7 +44,7 @@ export function simplifyTerminalCommandResults(
     ]
   } catch (error) {
     logger.error(
-      { error: errorToObject(error), messageContent },
+      { error: getErrorObject(error), messageContent },
       'Error simplifying terminal command results',
     )
     return [

common/src/util/error.ts

@@ -1,7 +1,48 @@
-export function getErrorObject(error: any) {
+export type ErrorOr<T, E extends ErrorObject = ErrorObject> =
+  | Success<T>
+  | Failure<E>
+
+export type Success<T> = {
+  success: true
+  value: T
+}
+
+export type Failure<E extends ErrorObject = ErrorObject> = {
+  success: false
+  error: E
+}
+
+export type ErrorObject = {
+  name: string
+  message: string
+  stack?: string
+}
+
+export function success<T>(value: T): Success<T> {
   return {
-    message: error.message,
-    stack: error.stack,
-    name: error.name,
+    success: true,
+    value,
   }
-}
+}
+
+export function failure(error: any): Failure<ErrorObject> {
+  return {
+    success: false,
+    error: getErrorObject(error),
+  }
+}
+
+export function getErrorObject(error: any): ErrorObject {
+  if (error instanceof Error) {
+    return {
+      name: error.name,
+      message: error.message,
+      stack: error.stack,
+    }
+  }
+
+  return {
+    name: 'Error',
+    message: `${error}`,
+  }
+}

common/src/util/object.ts

@@ -1,8 +1,10 @@
 import { isEqual, mapValues, union } from 'lodash'
 
 export const removeUndefinedProps = <T extends object>(
-  obj: T
-): { [K in keyof T as T[K] extends undefined ? never : K]: Exclude<T[K], undefined> } => {
+  obj: T,
+): {
+  [K in keyof T as T[K] extends undefined ? never : K]: Exclude<T[K], undefined>
+} => {
   const newObj: any = {}
 
   for (const key of Object.keys(obj)) {
@@ -117,17 +119,3 @@ export function assert(condition: boolean, message: string): asserts condition {
     throw new Error(`Assertion failed: ${message}`)
   }
 }
-
-export function errorToObject(value: any) {
-  if (value instanceof Error) {
-    // Copy *all* own props, including non-enumerables
-    return Object.getOwnPropertyNames(value).reduce<Record<string, unknown>>(
-      (acc, key) => {
-        acc[key] = (value as any)[key]
-        return acc
-      },
-      {},
-    )
-  }
-  return value
-}

evals/git-evals/run-git-evals.ts

@@ -4,7 +4,7 @@ import path from 'path'
 
 import { disableLiveUserInputCheck } from '@codebuff/backend/live-user-inputs'
 import { promptAiSdkStructured } from '@codebuff/backend/llm-apis/vercel-ai-sdk/ai-sdk'
-import { errorToObject } from '@codebuff/common/util/object'
+import { getErrorObject } from '@codebuff/common/util/error'
 import { withTimeout } from '@codebuff/common/util/promise'
 import { generateCompactId } from '@codebuff/common/util/string'
 import { cloneDeep } from 'lodash'
@@ -250,7 +250,7 @@ Explain your reasoning in detail. Do not ask Codebuff to git commit changes.`,
       judging_results: {
         analysis: `Judging failed due to error:\n${JSON.stringify(
           judgingError instanceof Error
-            ? errorToObject(judgingError)
+            ? getErrorObject(judgingError)
             : judgingError,
         )}`,
         strengths: [],

npm-app/src/utils/changes.ts

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 
 import { isFileIgnored } from '@codebuff/common/project-file-tree'
-import { errorToObject } from '@codebuff/common/util/object'
+import { getErrorObject } from '@codebuff/common/util/error'
 import { applyPatch } from 'diff'
 
 import type { FileChanges } from '@codebuff/common/actions'
@@ -54,7 +54,7 @@ export function applyChanges(projectRoot: string, changes: FileChanges) {
     } catch (error) {
       console.error(
         `Failed to apply patch to ${filePath}:`,
-        errorToObject(error),
+        getErrorObject(error),
         content,
       )
       invalid.push(filePath)