Add file delete tool

Author: courtney-sims

apps/sandbox-container/container/index.ts

@@ -1,11 +1,11 @@
-import { exec } from 'node:child_process'
-import * as fs from 'node:fs/promises'
-import path from 'node:path'
 import { serve } from '@hono/node-server'
 import { zValidator } from '@hono/zod-validator'
 import { Hono } from 'hono'
 import { streamText } from 'hono/streaming'
 import mime from 'mime'
+import { exec } from 'node:child_process'
+import * as fs from 'node:fs/promises'
+import path from 'node:path'
 
 import { ExecParams, FileList, FilesWrite } from '../shared/schema.ts'
 
@@ -114,6 +114,28 @@ app.post('/files/contents', zValidator('json', FilesWrite), async (c) => {
 	}
 })
 
+/**
+ * DELETE /files/contents/{filepath}
+ *
+ * Delete a file or directory
+ */
+app.delete('/files/contents/*', async (c) => {
+	let reqPath = c.req.path.replace('/files/contents', '')
+	reqPath = reqPath.endsWith('/') ? reqPath.substring(0, reqPath.length - 1) : reqPath
+	try {
+		await fs.rm(path.join(process.cwd(), reqPath), {recursive: true})
+		return c.newResponse('ok', 200)
+	} catch (e: any) {
+		if (e.code) {
+			if (e.code === 'ENOENT') {
+				return c.notFound()
+			}
+		}
+
+		throw e
+	}
+})
+
 /**
  * POST /exec
  *

apps/sandbox-container/server/containerMcp.ts

@@ -2,13 +2,13 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { McpAgent } from 'agents/mcp'
 import { z } from 'zod'
 
+import { Env, Props } from '.'
 import { OPEN_CONTAINER_PORT } from '../shared/consts'
-import { ExecParams, FileList, FilesWrite } from '../shared/schema'
+import { ExecParams, FileList, FilePathParam, FilesWrite } from '../shared/schema'
 import { MAX_CONTAINERS, proxyFetch, startAndWaitForPort } from './containerHelpers'
 import { getContainerManager } from './containerManager'
 import { BASE_INSTRUCTIONS } from './prompts'
 import { fileToBase64 } from './utils'
-import { Env, Props } from '.'
 
 export class ContainerMcpAgent extends McpAgent<Env, Props> {
 	server = new McpServer(
@@ -70,7 +70,21 @@ export class ContainerMcpAgent extends McpAgent<Env, Props> {
 				}
 			}
 		)
+		//COURT: At some point we should split the tools into separate files
+		this.server.tool(
+			'container_file_delete',
+			'Delete file and its contents',
+			{ args: FilePathParam},
+			async ({ args }) => {
+				const deleted = await this.container_file_delete(args)
+				return {
+					content: [{ type: 'text', text: `File deleted: ${deleted}.`}]
+				}
+			}
+
+		)
 		this.server.tool(
+			//TODO: make this file to be consistent with others
 			'container_files_write',
 			'Write file contents',
 			{ args: FilesWrite },
@@ -229,11 +243,21 @@ export class ContainerMcpAgent extends McpAgent<Env, Props> {
 		return json
 	}
 
+	//TODO: Abstract these
+	async container_file_delete(filePath: string): Promise<boolean>{
+		const res = await proxyFetch(
+			this.env.ENVIRONMENT,
+			this.ctx.container,
+			new Request(`http://host:${OPEN_CONTAINER_PORT}/files/contents/${filePath}`, {
+				method: 'DELETE'
+			}),
+			OPEN_CONTAINER_PORT
+		)
+		return res.ok
+	}
 	async container_files_read(
 		filePath: string
 	): Promise<{ blob: Blob; mimeType: string | undefined }> {
-		console.log('reading')
-		console.log(filePath)
 		const res = await proxyFetch(
 			this.env.ENVIRONMENT,
 			this.ctx.container,
@@ -269,7 +293,6 @@ export class ContainerMcpAgent extends McpAgent<Env, Props> {
 		if (!res || !res.ok) {
 			throw new Error(`Request to container failed: ${await res.text()}`)
 		}
-		const txt = await res.text()
 		return `Wrote file: ${file.path}`
 	}
 }

apps/sandbox-container/shared/schema.ts

@@ -13,6 +13,9 @@ export const FilesWrite = z.object({
 	text: z.string().describe('Full text content of the file you want to write.'),
 })
 
+export type FilePathParam = z.infer<typeof FilePathParam>
+export const FilePathParam = z.string()
+
 export type FileList = z.infer<typeof FileList>
 export const FileList = z.object({
 	resources: z