fix: allow empty reads (#2961)

Kitenite · web-flow · commit 3dda687f985b · 2025-10-06T00:42:16.000-07:00
diff --git a/apps/web/client/src/app/projects/import/local/_context/index.tsx b/apps/web/client/src/app/projects/import/local/_context/index.tsx
@@ -184,8 +184,8 @@ export const ProjectCreationProvider = ({ children, totalSteps }: ProjectCreatio
             (f) => f.path.endsWith('package.json') && f.type === ProcessedFileType.TEXT,
         );
 
-        if (!packageJsonFile?.content || typeof packageJsonFile.content !== 'string') {
-            return { isValid: false, error: 'No package.json found' };
+        if (typeof packageJsonFile?.content !== 'string') {
+            return { isValid: false, error: 'Package.json is not a text file' };
         }
 
         try {
diff --git a/apps/web/client/src/components/store/editor/chat/context.ts b/apps/web/client/src/components/store/editor/chat/context.ts
@@ -90,8 +90,8 @@ export class ChatContext {
                     }
 
                     const fileContent = await branchData.codeEditor.readFile(c.path);
-                    if (fileContent === null || fileContent instanceof Uint8Array) {
-                        console.error('No file content found or file is binary', c.path);
+                    if (fileContent instanceof Uint8Array) {
+                        console.error('File is binary', c.path);
                         return c;
                     }
                     return { ...c, content: fileContent } satisfies FileMessageContext;
@@ -138,7 +138,8 @@ export class ChatContext {
             }
 
             const content = await branchData.codeEditor.readFile(filePath);
-            if (content === null || content instanceof Uint8Array) {
+            if (content instanceof Uint8Array) {
+                console.error('File is binary', filePath);
                 continue;
             }
             fileContext.push({
@@ -248,10 +249,7 @@ export class ChatContext {
                         return null;
                     }
                     const fileContent = await this.editorEngine.activeSandbox.readFile(filePath);
-                    if (fileContent === null) {
-                        return null;
-                    }
-                    if (fileContent instanceof Uint8Array) {
+                    if (fileContent === null || fileContent instanceof Uint8Array) {
                         return null;
                     }
                     if (fileContent.trim().length === 0) {
diff --git a/apps/web/client/src/components/store/editor/font/font-config-manager.ts b/apps/web/client/src/components/store/editor/font/font-config-manager.ts
@@ -43,8 +43,8 @@ export const scanExistingFonts = async (layoutPath: string, editorEngine: Editor
 
     try {
         const file = await sandbox.readFile(normalizedLayoutPath);
-        if (!file || typeof file !== 'string') {
-            console.log(`Layout file is empty or doesn't exist: ${layoutPath}`);
+        if (typeof file !== 'string') {
+            console.log(`Layout file is not text: ${layoutPath}`);
             return [];
         }
 
@@ -188,13 +188,13 @@ export const readFontConfigFile = async (fontConfigPath: string, editorEngine: E
     | undefined
 > => {
     const codeEditor = editorEngine.fileSystem;
-    
+
     // Ensure the font config file exists, create it if it doesn't
     await ensureFontConfigFileExists(fontConfigPath, editorEngine);
 
     const file = await codeEditor.readFile(fontConfigPath);
-    if (!file || typeof file !== 'string') {
-        console.error("Font config file is empty or doesn't exist");
+    if (typeof file !== 'string') {
+        console.error("Font config file is not text");
         return;
     }
     const content = file;
diff --git a/apps/web/client/src/components/store/editor/font/layout-manager.ts b/apps/web/client/src/components/store/editor/font/layout-manager.ts
@@ -231,7 +231,7 @@ export const traverseClassName = async (
 
     try {
         const file = await sandbox.readFile(filePath);
-        if (!file || typeof file !== 'string') {
+        if (typeof file !== 'string') {
             console.error(`Failed to read file: ${filePath}`);
             return null;
         }
@@ -299,8 +299,8 @@ export const getLayoutContext = async (
     }
 
     const file = await editorEngine.activeSandbox.readFile(layoutPath);
-    if (!file || typeof file !== 'string') {
-        console.error(`Failed to read file: ${layoutPath}`);
+    if (typeof file !== 'string') {
+        console.error(`Layout file is not text: ${layoutPath}`);
         return;
     }
 
diff --git a/apps/web/client/src/components/store/editor/font/tailwind-config.ts b/apps/web/client/src/components/store/editor/font/tailwind-config.ts
@@ -16,7 +16,7 @@ export const removeFontFromTailwindConfig = async (
     try {
         const file = await sandbox.readFile(tailwindConfigPath);
         if (typeof file !== 'string') {
-            console.error("Tailwind config file is empty or doesn't exist");
+            console.error("Tailwind config file is not text");
             return false;
         }
 
@@ -43,8 +43,8 @@ export const addFontToTailwindConfig = async (
 ): Promise<boolean> => {
     try {
         const file = await sandbox.readFile(tailwindConfigPath);
-        if (!file || typeof file !== 'string') {
-            console.error("Tailwind config file is empty or doesn't exist");
+        if (typeof file !== 'string') {
+            console.error("Tailwind config file is not text");
             return false;
         }
 
diff --git a/apps/web/client/src/components/store/editor/pages/helper.ts b/apps/web/client/src/components/store/editor/pages/helper.ts
@@ -356,8 +356,8 @@ const scanPagesDirectory = async (
             let metadata: PageMetadata | undefined;
             try {
                 const fileContent = await sandboxManager.readFile(`${dir}/${entry.name}`);
-                if (!fileContent || typeof fileContent !== 'string') {
-                    throw new Error(`File ${dir}/${entry.name} not found or is not a text file`);
+                if (typeof fileContent !== 'string') {
+                    throw new Error(`File ${dir}/${entry.name} is not a text file`);
                 }
                 metadata = await extractMetadata(fileContent);
             } catch (error) {
@@ -763,8 +763,8 @@ export const updatePageMetadataInSandbox = async (
     }
 
     const file = await sandboxManager.readFile(pageFilePath);
-    if (!file || typeof file !== 'string') {
-        throw new Error('Page file not found or is not a text file');
+    if (typeof file !== 'string') {
+        throw new Error('Page file is not a text file');
     }
     const pageContent = file;
     const hasUseClient =
@@ -795,8 +795,8 @@ async function updateMetadataInFile(
 ) {
     // Read the current file content
     const file = await sandboxManager.readFile(filePath);
-    if (!file || typeof file !== 'string') {
-        throw new Error('File not found or is not a text file');
+    if (typeof file !== 'string') {
+        throw new Error('File is not a text file');
     }
     const content = file;
 
@@ -1010,8 +1010,8 @@ export const addSetupTask = async (sandboxManager: SandboxManager) => {
 
 export const updatePackageJson = async (sandboxManager: SandboxManager) => {
     const file = await sandboxManager.readFile('./package.json');
-    if (!file || typeof file !== 'string') {
-        throw new Error('Package.json not found or is not a text file');
+    if (typeof file !== 'string') {
+        throw new Error('Package.json is not a text file');
     }
     const pkgJson = JSON.parse(file);
 
diff --git a/apps/web/client/src/components/store/editor/sandbox/preload-script.ts b/apps/web/client/src/components/store/editor/sandbox/preload-script.ts
@@ -45,8 +45,8 @@ export async function injectPreloadScriptIntoLayout(provider: Provider, routerCo
     const layoutPath = `${routerConfig.basePath}/${layoutFile.name}`;
 
     const layoutResponse = await provider.readFile({ args: { path: layoutPath } });
-    if (!layoutResponse.file.content || typeof layoutResponse.file.content !== 'string') {
-        throw new Error(`Layout file ${layoutPath} has no content`);
+    if (typeof layoutResponse.file.content !== 'string') {
+        throw new Error(`Layout file ${layoutPath} is not a text file`);
     }
 
     const content = layoutResponse.file.content;
diff --git a/apps/web/client/src/components/store/editor/theme/index.ts b/apps/web/client/src/components/store/editor/theme/index.ts
@@ -1151,7 +1151,8 @@ export class ThemeManager {
         await Promise.all(
             filesToUpdate.map(async (file) => {
                 const fileContent = await this.editorEngine.activeSandbox.readFile(file.path);
-                if (!fileContent || typeof fileContent !== 'string') {
+                if (typeof fileContent !== 'string') {
+                    console.error(`File ${file.path} is not a text file`);
                     return;
                 }
 
diff --git a/packages/ai/src/tools/classes/fuzzy-edit-file.ts b/packages/ai/src/tools/classes/fuzzy-edit-file.ts
@@ -33,10 +33,6 @@ Make sure there's enough context for the other model to understand where the cha
         const fileSystem = await getFileSystem(args.branchId, editorEngine);
         const originalFile = await fileSystem.readFile(args.file_path);
 
-        if (!originalFile) {
-            throw new Error('Error reading file');
-        }
-
         if (typeof originalFile !== 'string') {
             throw new Error('Binary files are not supported for editing');
         }
diff --git a/packages/ai/src/tools/classes/search-replace-edit.ts b/packages/ai/src/tools/classes/search-replace-edit.ts
@@ -22,8 +22,8 @@ export class SearchReplaceEditTool extends ClientTool {
 
             const fileSystem = await getFileSystem(args.branchId, editorEngine);
             const file = await fileSystem.readFile(args.file_path);
-            if (!file || typeof file !== 'string') {
-                throw new Error(`Cannot read file ${args.file_path}: file not found or not text`);
+            if (typeof file !== 'string') {
+                throw new Error(`Cannot read file ${args.file_path}: file is not text`);
             }
 
             let newContent: string;
diff --git a/packages/ai/src/tools/classes/search-replace-multi-edit.ts b/packages/ai/src/tools/classes/search-replace-multi-edit.ts
@@ -31,8 +31,8 @@ export class SearchReplaceMultiEditFileTool extends ClientTool {
         try {
             const fileSystem = await getFileSystem(args.branchId, editorEngine);
             const file = await fileSystem.readFile(args.file_path);
-            if (!file || typeof file !== 'string') {
-                throw new Error(`Cannot read file ${args.file_path}: file not found or not text`);
+            if (typeof file !== 'string') {
+                throw new Error(`Cannot read file ${args.file_path}: file is not text`);
             }
 
             const originalContent = file;
diff --git a/packages/ai/src/tools/shared/helpers/files.ts b/packages/ai/src/tools/shared/helpers/files.ts
@@ -88,9 +88,7 @@ export async function resolvePath(inputPath: string, sandbox: SandboxManager): P
             // Fallback: try to read the file directly to check existence
             try {
                 const file = await sandbox.readFile(inputPath);
-                if (file) {
-                    return { path: inputPath, wasFuzzy: false };
-                }
+                return { path: inputPath, wasFuzzy: false };
             } catch {
                 // Continue to fuzzy matching
             }
@@ -109,9 +107,7 @@ export async function resolvePath(inputPath: string, sandbox: SandboxManager): P
             // Fallback: try the relative path as-is first
             try {
                 const file = await sandbox.readFile(inputPath);
-                if (file) {
-                    return { path: inputPath, wasFuzzy: false };
-                }
+                return { path: inputPath, wasFuzzy: false };
             } catch {
                 // Continue to fuzzy matching
             }

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,8 @@ export const ProjectCreationProvider = ({ children, totalSteps }: ProjectCreatio`
`184`	`184`	`(f) => f.path.endsWith('package.json') && f.type === ProcessedFileType.TEXT,`
`185`	`185`	`);`
`186`	`186`
`187`		`- if (!packageJsonFile?.content \|\| typeof packageJsonFile.content !== 'string') {`
`188`		`- return { isValid: false, error: 'No package.json found' };`
	`187`	`+ if (typeof packageJsonFile?.content !== 'string') {`
	`188`	`+ return { isValid: false, error: 'Package.json is not a text file' };`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ export class ChatContext {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`const fileContent = await branchData.codeEditor.readFile(c.path);`
`93`		`- if (fileContent === null \|\| fileContent instanceof Uint8Array) {`
`94`		`- console.error('No file content found or file is binary', c.path);`
	`93`	`+ if (fileContent instanceof Uint8Array) {`
	`94`	`+ console.error('File is binary', c.path);`
`95`	`95`	`return c;`
`96`	`96`	`}`
`97`	`97`	`return { ...c, content: fileContent } satisfies FileMessageContext;`
`@@ -138,7 +138,8 @@ export class ChatContext {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`const content = await branchData.codeEditor.readFile(filePath);`
`141`		`- if (content === null \|\| content instanceof Uint8Array) {`
	`141`	`+ if (content instanceof Uint8Array) {`
	`142`	`+ console.error('File is binary', filePath);`
`142`	`143`	`continue;`
`143`	`144`	`}`
`144`	`145`	`fileContext.push({`
`@@ -248,10 +249,7 @@ export class ChatContext {`
`248`	`249`	`return null;`
`249`	`250`	`}`
`250`	`251`	`const fileContent = await this.editorEngine.activeSandbox.readFile(filePath);`
`251`		`- if (fileContent === null) {`
`252`		`- return null;`
`253`		`- }`
`254`		`- if (fileContent instanceof Uint8Array) {`
	`252`	`+ if (fileContent === null \|\| fileContent instanceof Uint8Array) {`
`255`	`253`	`return null;`
`256`	`254`	`}`
`257`	`255`	`if (fileContent.trim().length === 0) {`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ export const traverseClassName = async (`
`231`	`231`
`232`	`232`	`try {`
`233`	`233`	`const file = await sandbox.readFile(filePath);`
`234`		`- if (!file \|\| typeof file !== 'string') {`
	`234`	`+ if (typeof file !== 'string') {`
`235`	`235`	console.error(`Failed to read file: ${filePath}`);
`236`	`236`	`return null;`
`237`	`237`	`}`
`@@ -299,8 +299,8 @@ export const getLayoutContext = async (`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`const file = await editorEngine.activeSandbox.readFile(layoutPath);`
`302`		`- if (!file \|\| typeof file !== 'string') {`
`303`		- console.error(`Failed to read file: ${layoutPath}`);
	`302`	`+ if (typeof file !== 'string') {`
	`303`	+ console.error(`Layout file is not text: ${layoutPath}`);
`304`	`304`	`return;`
`305`	`305`	`}`
`306`	`306`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ export async function injectPreloadScriptIntoLayout(provider: Provider, routerCo`
`45`	`45`	const layoutPath = `${routerConfig.basePath}/${layoutFile.name}`;
`46`	`46`
`47`	`47`	`const layoutResponse = await provider.readFile({ args: { path: layoutPath } });`
`48`		`- if (!layoutResponse.file.content \|\| typeof layoutResponse.file.content !== 'string') {`
`49`		- throw new Error(`Layout file ${layoutPath} has no content`);
	`48`	`+ if (typeof layoutResponse.file.content !== 'string') {`
	`49`	+ throw new Error(`Layout file ${layoutPath} is not a text file`);
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`const content = layoutResponse.file.content;`
Original file line number	Diff line number	Diff line change
`@@ -1151,7 +1151,8 @@ export class ThemeManager {`
`1151`	`1151`	`await Promise.all(`
`1152`	`1152`	`filesToUpdate.map(async (file) => {`
`1153`	`1153`	`const fileContent = await this.editorEngine.activeSandbox.readFile(file.path);`
`1154`		`- if (!fileContent \|\| typeof fileContent !== 'string') {`
	`1154`	`+ if (typeof fileContent !== 'string') {`
	`1155`	+ console.error(`File ${file.path} is not a text file`);
`1155`	`1156`	`return;`
`1156`	`1157`	`}`
`1157`	`1158`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ export class SearchReplaceEditTool extends ClientTool {`
`22`	`22`
`23`	`23`	`const fileSystem = await getFileSystem(args.branchId, editorEngine);`
`24`	`24`	`const file = await fileSystem.readFile(args.file_path);`
`25`		`- if (!file \|\| typeof file !== 'string') {`
`26`		- throw new Error(`Cannot read file ${args.file_path}: file not found or not text`);
	`25`	`+ if (typeof file !== 'string') {`
	`26`	+ throw new Error(`Cannot read file ${args.file_path}: file is not text`);
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`let newContent: string;`