Merge remote-tracking branch 'origin/main' into brandon/upgrade-opentui-2025-10-28

# Conflicts:
#	cli/src/chat.tsx

Author: brandonkachen

bun.lock

@@ -393,6 +393,27 @@ export const App = ({
         })
       }
 
+      blocks.push({
+        type: 'html',
+        render: () => (
+          <text style={{ wrapMode: 'word' }}>
+            <span fg={baseTextColorValue}>
+              Codebuff can read and write files in{' '}
+              <TerminalLink
+                text={displayPath}
+                color="#3b82f6"
+                inline={true}
+                underlineOnHover={true}
+                onActivate={() => openFileAtPath(repoRoot)}
+              />
+              , and run terminal commands to help you build.
+            </span>
+          </text>
+        ),
+      })
+
+
+
       blocks.push({
         type: 'html',
         render: () => (

cli/src/chat.tsx

@@ -2,6 +2,7 @@ import { mkdirSync } from 'fs'
 import path from 'path'
 
 import { findGitRoot } from './utils/git'
+import { getConfigDir } from './utils/auth'
 
 let projectRoot: string | undefined
 let currentChatId: string | undefined
@@ -34,10 +35,22 @@ export function startNewChat() {
   return currentChatId
 }
 
+// Get the project-specific data directory
+export function getProjectDataDir(): string {
+  const root = getProjectRoot()
+  if (!root) {
+    throw new Error('Project root not set')
+  }
+
+  const baseName = path.basename(root)
+  const baseDir = path.join(getConfigDir(), 'projects', baseName)
+
+  return baseDir
+}
+
 export function getCurrentChatDir() {
-  const root = getProjectRoot() || process.cwd()
   const chatId = getCurrentChatId()
-  const dir = path.join(root, 'debug', 'chats', chatId)
+  const dir = path.join(getProjectDataDir(), 'chats', chatId)
   ensureChatDirectory(dir)
   return dir
 }

cli/src/project-files.ts

@@ -103,13 +103,7 @@ function sendAnalyticsAndLog(
     const logTarget =
       env.NEXT_PUBLIC_CB_ENVIRONMENT === 'dev'
         ? path.join(projectRoot, 'debug', 'cli.log')
-        : (() => {
-            try {
-              return path.join(getCurrentChatDir(), 'log.jsonl')
-            } catch {
-              return path.join(projectRoot, 'debug', 'cli.log')
-            }
-          })()
+        : path.join(getCurrentChatDir(), 'log.jsonl')
 
     setLogPath(logTarget)
   }

cli/src/utils/logger.ts

@@ -1,6 +1,7 @@
-import { env } from '@codebuff/common/env'
 import { PostHog } from 'posthog-node'
 
+import { env } from '@codebuff/common/env'
+
 import type { AnalyticsEvent } from './constants/analytics-events'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 
@@ -52,11 +53,14 @@ export function trackEvent({
   }
 
   if (!client) {
-    logger.warn(
-      { event, userId },
-      'Analytics client not initialized, skipping event tracking',
-    )
-    return
+    initAnalytics({ logger })
+    if (!client) {
+      logger.warn(
+        { event, userId },
+        'Analytics client not initialized, skipping event tracking',
+      )
+      return
+    }
   }
 
   try {

common/src/analytics.ts

@@ -7,8 +7,8 @@ export const clientEnvSchema = z.object({
   NEXT_PUBLIC_CODEBUFF_APP_URL: z.url().min(1),
   NEXT_PUBLIC_CODEBUFF_BACKEND_URL: z.string().min(1),
   NEXT_PUBLIC_SUPPORT_EMAIL: z.email().min(1),
-  NEXT_PUBLIC_POSTHOG_API_KEY: z.string().optional().default(''),
-  NEXT_PUBLIC_POSTHOG_HOST_URL: z.url().optional(),
+  NEXT_PUBLIC_POSTHOG_API_KEY: z.string().default(''),
+  NEXT_PUBLIC_POSTHOG_HOST_URL: z.url(),
   NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: z.string().min(1),
   NEXT_PUBLIC_STRIPE_CUSTOMER_PORTAL: z.url().min(1),
   NEXT_PUBLIC_LINKEDIN_PARTNER_ID: z.string().optional(),

common/src/env-schema.ts

@@ -10,3 +10,5 @@ export type Logger = {
   warn: LoggerFn
   error: LoggerFn
 }
+
+export type LoggerWithContextFn = (context: Record<string, any>) => Logger

common/src/types/contracts/logger.ts

@@ -3,7 +3,6 @@ import { getErrorObject } from '@codebuff/common/util/error'
 import { cloneDeep } from 'lodash'
 
 import { executeToolCall } from './tools/tool-executor'
-import { SandboxManager } from './util/quickjs-sandbox'
 
 import type { CodebuffToolCall } from '@codebuff/common/tools/list'
 import type {
@@ -17,34 +16,24 @@ import type {
 } from '@codebuff/common/types/contracts/client'
 import type { AddAgentStepFn } from '@codebuff/common/types/contracts/database'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
-import type {
-  ParamsExcluding,
-  ParamsOf,
-} from '@codebuff/common/types/function-params'
+import type { ParamsExcluding } from '@codebuff/common/types/function-params'
 import type {
   ToolResultOutput,
   ToolResultPart,
 } from '@codebuff/common/types/messages/content-part'
 import type { PrintModeEvent } from '@codebuff/common/types/print-mode'
 import type { AgentState } from '@codebuff/common/types/session-state'
 
-// Global sandbox manager for QuickJS contexts
-const sandboxManager = new SandboxManager()
-
 // Maintains generator state for all agents. Generator state can't be serialized, so we store it in memory.
 const runIdToGenerator: Record<string, StepGenerator | undefined> = {}
 export const runIdToStepAll: Set<string> = new Set()
 
 // Function to clear the generator cache for testing purposes
-export function clearAgentGeneratorCache(
-  params: ParamsOf<typeof sandboxManager.dispose>,
-) {
+export function clearAgentGeneratorCache(params: { logger: Logger }) {
   for (const key in runIdToGenerator) {
     delete runIdToGenerator[key]
   }
   runIdToStepAll.clear()
-  // Clean up QuickJS sandboxes
-  sandboxManager.dispose(params)
 }
 
 // Function to handle programmatic agents
@@ -129,10 +118,9 @@ export async function runProgrammaticStep(
 
   // Run with either a generator or a sandbox.
   let generator = runIdToGenerator[agentState.runId]
-  let sandbox = sandboxManager.getSandbox({ runId: agentState.runId })
 
   // Check if we need to initialize a generator
-  if (!generator && !sandbox) {
+  if (!generator) {
     const createLogMethod =
       (level: 'debug' | 'info' | 'warn' | 'error') =>
       (data: any, msg?: string) => {
@@ -153,31 +141,19 @@ export async function runProgrammaticStep(
       error: createLogMethod('error'),
     }
 
-    if (typeof template.handleSteps === 'string') {
-      // Initialize QuickJS sandbox for string-based generator
-      sandbox = await sandboxManager.getOrCreateSandbox({
-        runId: agentState.runId,
-        generatorCode: template.handleSteps,
-        initialInput: {
-          agentState,
-          prompt,
-          params: toolCallParams,
-          logger: streamingLogger,
-        },
-        config: undefined, // config
-        sandboxLogger: streamingLogger, // pass the streaming logger instance for internal use
-        logger,
-      })
-    } else {
-      // Initialize native generator
-      generator = template.handleSteps({
-        agentState,
-        prompt,
-        params,
-        logger: streamingLogger,
-      })
-      runIdToGenerator[agentState.runId] = generator
-    }
+    const generatorFn =
+      typeof template.handleSteps === 'string'
+        ? eval(`(${template.handleSteps})`)
+        : template.handleSteps
+
+    // Initialize native generator
+    generator = generatorFn({
+      agentState,
+      prompt,
+      params: toolCallParams,
+      logger: streamingLogger,
+    })
+    runIdToGenerator[agentState.runId] = generator
   }
 
   // Check if we're in STEP_ALL mode
@@ -239,17 +215,11 @@ export async function runProgrammaticStep(
       creditsBefore = state.agentState.directCreditsUsed
       childrenBefore = state.agentState.childRunIds.length
 
-      const result = sandbox
-        ? await sandbox.executeStep({
-            agentState: getPublicAgentState(state.agentState),
-            toolResult,
-            stepsComplete,
-          })
-        : generator!.next({
-            agentState: getPublicAgentState(state.agentState),
-            toolResult,
-            stepsComplete,
-          })
+      const result = generator!.next({
+        agentState: getPublicAgentState(state.agentState),
+        toolResult,
+        stepsComplete,
+      })
 
       if (result.done) {
         endTurn = true
@@ -263,7 +233,7 @@ export async function runProgrammaticStep(
         break
       }
 
-      if (result.value.type === 'STEP_TEXT') {
+      if ('type' in result.value && result.value.type === 'STEP_TEXT') {
         textOverride = result.value.text
         break
       }
@@ -464,10 +434,6 @@ export async function runProgrammaticStep(
     }
   } finally {
     if (endTurn) {
-      if (sandbox) {
-        // Clean up QuickJS sandbox if execution is complete
-        sandboxManager.removeSandbox({ runId: agentState.runId, logger })
-      }
       delete runIdToGenerator[agentState.runId]
       runIdToStepAll.delete(agentState.runId)
     }

packages/agent-runtime/src/run-programmatic-step.ts

@@ -1,7 +1,6 @@
-import { BACKEND_URL, WEBSITE_URL, WEBSOCKET_URL, IS_DEV, IS_TEST, IS_PROD } from './constants'
+import { BACKEND_URL, WEBSITE_URL } from './constants'
 import { run } from './run'
 import { API_KEY_ENV_VAR } from '../../common/src/old-constants'
-import { env } from '@codebuff/common/env'
 
 import type { RunOptions, CodebuffClientOptions } from './run'
 import type { RunState } from './run-state'
@@ -82,29 +81,4 @@ export class CodebuffClient {
       return false
     }
   }
-
-  /**
-   * [TEST] Get environment information from the SDK
-   *
-   * @returns Object containing SDK environment variables and computed constants
-   */
-  public getEnvironmentInfo() {
-    return {
-      // Raw env vars
-      rawEnv: {
-        NEXT_PUBLIC_CB_ENVIRONMENT: env.NEXT_PUBLIC_CB_ENVIRONMENT,
-        NEXT_PUBLIC_CODEBUFF_APP_URL: env.NEXT_PUBLIC_CODEBUFF_APP_URL,
-        NEXT_PUBLIC_CODEBUFF_BACKEND_URL: env.NEXT_PUBLIC_CODEBUFF_BACKEND_URL,
-      },
-      // Computed constants
-      computed: {
-        WEBSITE_URL,
-        BACKEND_URL,
-        WEBSOCKET_URL,
-        IS_DEV,
-        IS_TEST,
-        IS_PROD,
-      },
-    }
-  }
 }