sdk: make cwd truly optional

Author: jahooma

sdk/src/run-state.ts

@@ -145,7 +145,7 @@ function deriveKnowledgeFiles(
 }
 
 export async function initialSessionState(
-  cwd: string,
+  cwd: string | undefined,
   options: {
     projectFiles?: Record<string, string>
     knowledgeFiles?: Record<string, string>
@@ -157,28 +157,34 @@ export async function initialSessionState(
   let { projectFiles, agentDefinitions = [] } = options
   let { knowledgeFiles } = options
 
-  // Auto-discover project files if not provided
-  if (projectFiles === undefined) {
+  // Auto-discover project files if not provided and cwd is available
+  if (projectFiles === undefined && cwd) {
     projectFiles = discoverProjectFiles(cwd)
   }
   if (knowledgeFiles === undefined) {
-    knowledgeFiles = deriveKnowledgeFiles(projectFiles)
+    knowledgeFiles = projectFiles ? deriveKnowledgeFiles(projectFiles) : {}
   }
 
   const processedAgentTemplates = processAgentDefinitions(agentDefinitions)
   const processedCustomToolDefinitions = processCustomToolDefinitions(
     options.customToolDefinitions ?? [],
   )
 
-  // Generate file tree and token scores from projectFiles
-  const { fileTree, fileTokenScores, tokenCallers } = await computeProjectIndex(
-    cwd,
-    projectFiles,
-  )
+  // Generate file tree and token scores from projectFiles if available
+  let fileTree: FileTreeNode[] = []
+  let fileTokenScores: Record<string, any> = {}
+  let tokenCallers: Record<string, any> = {}
+
+  if (cwd && projectFiles) {
+    const result = await computeProjectIndex(cwd, projectFiles)
+    fileTree = result.fileTree
+    fileTokenScores = result.fileTokenScores
+    tokenCallers = result.tokenCallers
+  }
 
   const initialState = getInitialSessionState({
-    projectRoot: cwd,
-    cwd,
+    projectRoot: cwd ?? process.cwd(),
+    cwd: cwd ?? process.cwd(),
     fileTree,
     fileTokenScores,
     tokenCallers,
@@ -276,7 +282,7 @@ export function withMessageHistory({
  * even when continuing from a previous run.
  */
 export async function applyOverridesToSessionState(
-  cwd: string,
+  cwd: string | undefined,
   baseSessionState: SessionState,
   overrides: {
     projectFiles?: Record<string, string>
@@ -298,11 +304,18 @@ export async function applyOverridesToSessionState(
 
   // Apply projectFiles override (recomputes file tree and token scores)
   if (overrides.projectFiles !== undefined) {
-    const { fileTree, fileTokenScores, tokenCallers } =
-      await computeProjectIndex(cwd, overrides.projectFiles)
-    sessionState.fileContext.fileTree = fileTree
-    sessionState.fileContext.fileTokenScores = fileTokenScores
-    sessionState.fileContext.tokenCallers = tokenCallers
+    if (cwd) {
+      const { fileTree, fileTokenScores, tokenCallers } =
+        await computeProjectIndex(cwd, overrides.projectFiles)
+      sessionState.fileContext.fileTree = fileTree
+      sessionState.fileContext.fileTokenScores = fileTokenScores
+      sessionState.fileContext.tokenCallers = tokenCallers
+    } else {
+      // If projectFiles are provided but no cwd, reset file context fields
+      sessionState.fileContext.fileTree = []
+      sessionState.fileContext.fileTokenScores = {}
+      sessionState.fileContext.tokenCallers = {}
+    }
 
     // Auto-derive knowledgeFiles if not explicitly provided
     if (overrides.knowledgeFiles === undefined) {

sdk/src/run.ts

@@ -73,7 +73,7 @@ export async function run({
   apiKey,
   fingerprintId,
 
-  cwd = process.cwd(),
+  cwd,
   projectFiles,
   knowledgeFiles,
   agentDefinitions,
@@ -118,7 +118,11 @@ export async function run({
       onError({ message: error.message })
     },
     readFiles: ({ filePaths }) =>
-      readFiles({ filePaths, override: overrideTools?.read_files, cwd }),
+      readFiles({
+        filePaths,
+        override: overrideTools?.read_files,
+        cwd,
+      }),
     handleToolCall: (action) =>
       handleToolCall({
         action,
@@ -207,23 +211,30 @@ export async function run({
   return result
 }
 
+function requireCwd(cwd: string | undefined, toolName: string): string {
+  if (!cwd) {
+    throw new Error(
+      `cwd is required for the ${toolName} tool. Please provide cwd in CodebuffClientOptions or override the ${toolName} tool.`,
+    )
+  }
+  return cwd
+}
+
 async function readFiles({
   filePaths,
   override,
   cwd,
-}: { filePaths: string[] } & (
-  | {
-      override: NonNullable<
-        Required<CodebuffClientOptions>['overrideTools']['read_files']
-      >
-      cwd?: string
-    }
-  | { override: undefined; cwd: string }
-)) {
+}: {
+  filePaths: string[]
+  override?: NonNullable<
+    Required<CodebuffClientOptions>['overrideTools']['read_files']
+  >
+  cwd?: string
+}) {
   if (override) {
     return await override({ filePaths })
   }
-  return getFiles(filePaths, cwd)
+  return getFiles(filePaths, requireCwd(cwd, 'read_files'))
 }
 
 async function handleToolCall({
@@ -235,7 +246,7 @@ async function handleToolCall({
   action: ServerAction<'tool-call-request'>
   overrides: NonNullable<CodebuffClientOptions['overrideTools']>
   customToolDefinitions: Record<string, CustomToolDefinition>
-  cwd: string
+  cwd?: string
 }): ReturnType<WebSocketHandler['handleToolCall']> {
   const toolName = action.toolName
   const input = action.input
@@ -267,15 +278,16 @@ async function handleToolCall({
     } else if (toolName === 'end_turn') {
       result = []
     } else if (toolName === 'write_file' || toolName === 'str_replace') {
-      result = changeFile(input, cwd)
+      result = changeFile(input, requireCwd(cwd, toolName))
     } else if (toolName === 'run_terminal_command') {
+      const resolvedCwd = requireCwd(cwd, 'run_terminal_command')
       result = await runTerminalCommand({
         ...input,
-        cwd: path.resolve(cwd, input.cwd ?? '.'),
+        cwd: path.resolve(resolvedCwd, input.cwd ?? '.'),
       } as Parameters<typeof runTerminalCommand>[0])
     } else if (toolName === 'code_search') {
       result = await codeSearch({
-        projectPath: cwd,
+        projectPath: requireCwd(cwd, 'code_search'),
         ...input,
       } as Parameters<typeof codeSearch>[0])
     } else if (toolName === 'run_file_change_hooks') {