Make apply patch more exactly the same as openai's tool

Author: jahooma

.agents/types/tools.ts

@@ -70,11 +70,18 @@ export interface AddMessageParams {
 }
 
 /**
- * Apply edits using a Codex-style patch envelope.
+ * Apply a file operation (create, update, or delete) using Codex-style apply_patch format.
  */
 export interface ApplyPatchParams {
-  /** Patch text in Codex apply_patch format. */
-  patch: string
+  /** The file operation to perform. */
+  operation: {
+    /** Operation type: create_file, update_file, or delete_file */
+    type: 'create_file' | 'update_file' | 'delete_file'
+    /** File path relative to project root */
+    path: string
+    /** Diff content. Required for create_file and update_file. Lines prefixed with + for creates, unified diff with @@ hunks for updates. */
+    diff?: string
+  }
 }
 
 /**

agents/types/tools.ts

@@ -72,11 +72,18 @@ export interface AddMessageParams {
 }
 
 /**
- * Apply edits using a Codex-style patch envelope.
+ * Apply a file operation (create, update, or delete) using Codex-style apply_patch format.
  */
 export interface ApplyPatchParams {
-  /** Patch text in Codex apply_patch format. */
-  patch: string
+  /** The file operation to perform. */
+  operation: {
+    /** Operation type: create_file, update_file, or delete_file */
+    type: 'create_file' | 'update_file' | 'delete_file'
+    /** File path relative to project root */
+    path: string
+    /** Diff content. Required for create_file and update_file. Lines prefixed with + for creates, unified diff with @@ hunks for updates. */
+    diff?: string
+  }
 }
 
 /**

cli/src/components/tools/apply-patch.tsx

@@ -7,71 +7,26 @@ import { useTheme } from '../../hooks/use-theme'
 import type { ToolRenderConfig } from './types'
 
 type PatchOperation =
-  | { type: 'add'; path: string }
-  | { type: 'delete'; path: string }
-  | { type: 'update'; path: string; moveTo?: string; hunks: string }
-
-function parsePatchOperations(rawPatch: string): PatchOperation[] {
-  const normalized = rawPatch.replace(/\r\n/g, '\n')
-  const lines = normalized.split('\n')
-  if (lines.length < 2) return []
-  if (lines[0] !== '*** Begin Patch') return []
-
-  const ops: PatchOperation[] = []
-  let i = 1
-  const endIndex = lines.length - 1
-
-  while (i < endIndex) {
-    const line = lines[i]
-    if (!line) {
-      i++
-      continue
-    }
-
-    if (line.startsWith('*** Add File: ')) {
-      const filePath = line.slice('*** Add File: '.length)
-      i++
-      while (i < endIndex && !lines[i].startsWith('*** ')) {
-        i++
-      }
-      ops.push({ type: 'add', path: filePath })
-      continue
-    }
-
-    if (line.startsWith('*** Delete File: ')) {
-      const filePath = line.slice('*** Delete File: '.length)
-      ops.push({ type: 'delete', path: filePath })
-      i++
-      continue
-    }
-
-    if (line.startsWith('*** Update File: ')) {
-      const filePath = line.slice('*** Update File: '.length)
-      i++
-
-      let moveTo: string | undefined
-      if (i < endIndex && lines[i].startsWith('*** Move to: ')) {
-        moveTo = lines[i].slice('*** Move to: '.length)
-        i++
-      }
-
-      const hunkLines: string[] = []
-      while (i < endIndex && !lines[i].startsWith('*** ')) {
-        if (lines[i] !== '*** End of File') {
-          hunkLines.push(lines[i])
-        }
-        i++
-      }
-
-      const hunks = hunkLines.join('\n').trim()
-      ops.push({ type: 'update', path: filePath, moveTo, hunks })
-      continue
-    }
-
-    i++
+  | { type: 'create_file'; path: string; diff: string }
+  | { type: 'update_file'; path: string; diff: string }
+  | { type: 'delete_file'; path: string }
+
+function parseOperation(input: unknown): PatchOperation | null {
+  if (!input || typeof input !== 'object') return null
+  const op = (input as { operation?: unknown }).operation
+  if (!op || typeof op !== 'object') return null
+  const { type, path, diff } = op as Record<string, unknown>
+  if (typeof type !== 'string' || typeof path !== 'string') return null
+  if (type === 'create_file' && typeof diff === 'string') {
+    return { type: 'create_file', path, diff }
   }
-
-  return ops
+  if (type === 'update_file' && typeof diff === 'string') {
+    return { type: 'update_file', path, diff }
+  }
+  if (type === 'delete_file') {
+    return { type: 'delete_file', path }
+  }
+  return null
 }
 
 interface EditHeaderProps {
@@ -101,24 +56,19 @@ interface PatchOperationItemProps {
 }
 
 const PatchOperationItem = ({ operation }: PatchOperationItemProps) => {
-  if (operation.type === 'add') {
+  if (operation.type === 'create_file') {
     return <EditHeader name="Create" filePath={operation.path} />
   }
 
-  if (operation.type === 'delete') {
+  if (operation.type === 'delete_file') {
     return <EditHeader name="Delete" filePath={operation.path} />
   }
 
-  const destination =
-    operation.moveTo && operation.moveTo !== operation.path
-      ? `${operation.path} → ${operation.moveTo}`
-      : operation.path
-
   return (
     <box style={{ flexDirection: 'column', width: '100%' }}>
-      <EditHeader name="Edit" filePath={destination} />
+      <EditHeader name="Edit" filePath={operation.path} />
       <box style={{ paddingLeft: 2, width: '100%' }}>
-        <DiffViewer diffText={operation.hunks} />
+        <DiffViewer diffText={operation.diff} />
       </box>
     </box>
   )
@@ -128,31 +78,18 @@ export const ApplyPatchComponent = defineToolComponent({
   toolName: 'apply_patch',
 
   render(toolBlock): ToolRenderConfig {
-    const patch =
-      toolBlock.input &&
-      typeof toolBlock.input === 'object' &&
-      'patch' in toolBlock.input &&
-      typeof (toolBlock.input as { patch?: unknown }).patch === 'string'
-        ? (toolBlock.input as { patch: string }).patch
-        : ''
-
-    const operations = patch ? parsePatchOperations(patch) : []
+    const operation = parseOperation(toolBlock.input)
 
-    if (operations.length === 0) {
+    if (!operation) {
       return { content: null }
     }
 
     return {
       content: (
         <box style={{ flexDirection: 'column', gap: 0, width: '100%' }}>
-          {operations.map((operation, index) => (
-            <PatchOperationItem
-              key={`${operation.type}-${operation.path}-${index}`}
-              operation={operation}
-            />
-          ))}
+          <PatchOperationItem operation={operation} />
         </box>
       ),
     }
   },
-})
+})

common/src/templates/initial-agents-dir/types/tools.ts

@@ -72,11 +72,18 @@ export interface AddMessageParams {
 }
 
 /**
- * Apply edits using a Codex-style patch envelope.
+ * Apply a file operation (create, update, or delete) using Codex-style apply_patch format.
  */
 export interface ApplyPatchParams {
-  /** Patch text in Codex apply_patch format. */
-  patch: string
+  /** The file operation to perform. */
+  operation: {
+    /** Operation type: create_file, update_file, or delete_file */
+    type: 'create_file' | 'update_file' | 'delete_file'
+    /** File path relative to project root */
+    path: string
+    /** Diff content. Required for create_file and update_file. Lines prefixed with + for creates, unified diff with @@ hunks for updates. */
+    diff?: string
+  }
 }
 
 /**

common/src/tools/params/tool/apply-patch.ts

@@ -10,7 +10,7 @@ export const applyPatchResultSchema = z.union([
     applied: z.array(
       z.object({
         file: z.string(),
-        action: z.enum(['add', 'update', 'delete', 'move']),
+        action: z.enum(['add', 'update', 'delete']),
       }),
     ),
   }),
@@ -21,30 +21,81 @@ export const applyPatchResultSchema = z.union([
 
 const toolName = 'apply_patch'
 const endsAgentStep = false
+
+const operationSchema = z.discriminatedUnion('type', [
+  z.object({
+    type: z.literal('create_file'),
+    path: z.string().min(1, 'Path cannot be empty'),
+    diff: z.string().min(1, 'Diff cannot be empty'),
+  }),
+  z.object({
+    type: z.literal('update_file'),
+    path: z.string().min(1, 'Path cannot be empty'),
+    diff: z.string().min(1, 'Diff cannot be empty'),
+  }),
+  z.object({
+    type: z.literal('delete_file'),
+    path: z.string().min(1, 'Path cannot be empty'),
+  }),
+])
+
+export type ApplyPatchOperation = z.infer<typeof operationSchema>
+
 const inputSchema = z
   .object({
-    patch: z
-      .string()
-      .min(1, 'Patch cannot be empty')
-      .describe('Patch text in Codex apply_patch format.'),
+    operation: operationSchema.describe(
+      'The file operation to perform. type is one of create_file, update_file, or delete_file.',
+    ),
   })
-  .describe('Apply a unified-diff style multi-file patch.')
+  .describe('Apply a file operation (create, update, or delete).')
 
 const description = `
-Use this tool to edit files using Codex-style patch format.
+Use this tool to apply file operations using Codex-style apply_patch format.
+
+Each call performs a single operation on one file.
+
+Operation types:
+- create_file: Create a new file. Requires path and diff (lines prefixed with +).
+- update_file: Update an existing file. Requires path and diff (unified diff with @@ hunks).
+- delete_file: Delete a file. Requires only path.
+
+Example (create):
+${$getNativeToolCallExampleString({
+  toolName,
+  inputSchema,
+  input: {
+    operation: {
+      type: 'create_file',
+      path: 'hello.txt',
+      diff: '@@\n+Hello world\n',
+    },
+  },
+  endsAgentStep,
+})}
 
-Patch format:
-- Start with *** Begin Patch
-- End with *** End Patch
-- Use file ops: *** Add File, *** Update File, *** Delete File
-- Use @@ hunks inside update operations
+Example (update):
+${$getNativeToolCallExampleString({
+  toolName,
+  inputSchema,
+  input: {
+    operation: {
+      type: 'update_file',
+      path: 'lib/fib.py',
+      diff: '@@\n-def fib(n):\n+def fibonacci(n):\n     if n <= 1:\n         return n\n-    return fib(n-1) + fib(n-2)\n+    return fibonacci(n-1) + fibonacci(n-2)\n',
+    },
+  },
+  endsAgentStep,
+})}
 
-Example:
+Example (delete):
 ${$getNativeToolCallExampleString({
   toolName,
   inputSchema,
   input: {
-    patch: `*** Begin Patch\n*** Add File: hello.txt\n+Hello world\n*** End Patch`,
+    operation: {
+      type: 'delete_file',
+      path: 'old-file.txt',
+    },
   },
   endsAgentStep,
 })}

sdk/e2e/utils/e2e-mocks.ts

@@ -204,11 +204,11 @@ function buildMockToolCall(params: {
     return {
       toolName: 'apply_patch',
       input: {
-        patch:
-          '*** Begin Patch\n' +
-          '*** Add File: hello-from-apply-patch.txt\n' +
-          '+hello from apply_patch\n' +
-          '*** End Patch',
+        operation: {
+          type: 'create_file' as const,
+          path: 'hello-from-apply-patch.txt',
+          diff: '@@\n+hello from apply_patch\n',
+        },
       },
     }
   }