diff --git a/checkpoint.json b/checkpoint.json
index 30e79e5c8..d46ca2347 100644
--- a/checkpoint.json
+++ b/checkpoint.json
@@ -1,27 +1,30 @@
 {
-  "timestamp": "2026-03-16T05:37:18.282917Z",
-  "current_node": "solve",
+  "timestamp": "2026-03-16T05:37:20.693645Z",
+  "current_node": "extract_patch",
   "completed_nodes": [
     "start",
     "setup",
-    "solve"
+    "solve",
+    "extract_patch"
   ],
   "node_retries": {
-    "setup": 1,
     "solve": 1,
+    "extract_patch": 1,
+    "setup": 1,
     "start": 1
   },
   "context_values": {
     "internal.retry_count.start": 1,
     "failure_class": "",
     "thread.setup.current_node": "solve",
+    "thread.solve.current_node": "extract_patch",
     "internal.fidelity": "compact",
-    "command.output": "fatal: destination path '.' already exists and is not an empty directory.\n",
+    "command.output": "diff --git a/django_repo b/django_repo\n--- a/django_repo\n+++ b/django_repo\n@@ -1 +1 @@\n-Subproject commit 755dbf39fcdc491fe9b588358303e259c7750be4\n+Subproject commit 755dbf39fcdc491fe9b588358303e259c7750be4-dirty\n",
     "internal.retry_count.solve": 1,
-    "current.preamble": "Goal: \n\n## Completed stages\n- **setup**: fail\n  - Script: `git clone https://github.com/django/django.git . && git checkout 755dbf39fcdc491fe9b588358303e259c7750be4 && python -m pip install -e .`\n  - Stdout:\n    ```\n    fatal: destination path '.' already exists and is not an empty directory.\n    ```\n  - Stderr: (empty)\n\n## Context\n- failure_class: deterministic\n- failure_signature: setup|deterministic|script failed with exit code: <n> ## stdout fatal: destination path '.' already exists and is not an empty directory.\n",
-    "internal.thread_id": "setup",
+    "current.preamble": "Goal: \n\n## Completed stages\n- **setup**: fail\n  - Script: `git clone https://github.com/django/django.git . && git checkout 755dbf39fcdc491fe9b588358303e259c7750be4 && python -m pip install -e .`\n  - Stdout:\n    ```\n    fatal: destination path '.' already exists and is not an empty directory.\n    ```\n  - Stderr: (empty)\n- **solve**: success\n  - Model: claude-opus-4-6, 15.3k tokens in / 5.8k out\n  - Files: /home/daytona/workspace/django_repo/django/db/models/sql/query.py\n",
+    "internal.thread_id": "solve",
     "last_stage": "solve",
-    "current_node": "solve",
+    "current_node": "extract_patch",
     "thread.start.current_node": "setup",
     "failure_signature": "",
     "outcome": "success",
@@ -31,14 +34,11 @@
     "graph.rankdir": "LR",
     "internal.run_id": "01KKTJ73BA2R08ES4AMYDD1E7Z",
     "command.stderr": "",
-    "internal.retry_count.setup": 1
+    "internal.retry_count.setup": 1,
+    "internal.retry_count.extract_patch": 1
   },
   "logs": [],
   "node_outcomes": {
-    "start": {
-      "status": "success",
-      "duration_ms": 0
-    },
     "solve": {
       "status": "success",
       "context_updates": {
@@ -61,6 +61,19 @@
       ],
       "duration_ms": 156425
     },
+    "extract_patch": {
+      "status": "success",
+      "context_updates": {
+        "command.stderr": "",
+        "command.output": "diff --git a/django_repo b/django_repo\n--- a/django_repo\n+++ b/django_repo\n@@ -1 +1 @@\n-Subproject commit 755dbf39fcdc491fe9b588358303e259c7750be4\n+Subproject commit 755dbf39fcdc491fe9b588358303e259c7750be4-dirty\n"
+      },
+      "notes": "Script completed: git diff",
+      "duration_ms": 163
+    },
+    "start": {
+      "status": "success",
+      "duration_ms": 0
+    },
     "setup": {
       "status": "fail",
       "context_updates": {
@@ -74,13 +87,14 @@
       "duration_ms": 53
     }
   },
-  "next_node_id": "extract_patch",
+  "next_node_id": "exit",
   "loop_failure_signatures": {
     "setup|deterministic|script failed with exit code: <n> ## stdout fatal: destination path '.' already exists and is not an empty directory.": 1
   },
   "node_visits": {
+    "solve": 1,
     "setup": 1,
     "start": 1,
-    "solve": 1
+    "extract_patch": 1
   }
 }
\ No newline at end of file
diff --git a/nodes/extract_patch/script_invocation.json b/nodes/extract_patch/script_invocation.json
new file mode 100644
index 000000000..6d29afc80
--- /dev/null
+++ b/nodes/extract_patch/script_invocation.json
@@ -0,0 +1,5 @@
+{
+  "command": "git diff",
+  "language": "shell",
+  "timeout_ms": null
+}
\ No newline at end of file
diff --git a/nodes/extract_patch/script_timing.json b/nodes/extract_patch/script_timing.json
new file mode 100644
index 000000000..8a76de1f8
--- /dev/null
+++ b/nodes/extract_patch/script_timing.json
@@ -0,0 +1,5 @@
+{
+  "duration_ms": 160,
+  "exit_code": 0,
+  "timed_out": false
+}
\ No newline at end of file
diff --git a/nodes/extract_patch/status.json b/nodes/extract_patch/status.json
new file mode 100644
index 000000000..95ce2c15f
--- /dev/null
+++ b/nodes/extract_patch/status.json
@@ -0,0 +1,6 @@
+{
+  "status": "success",
+  "notes": "Script completed: git diff",
+  "failure_reason": null,
+  "timestamp": "2026-03-16T05:37:20.692400+00:00"
+}
\ No newline at end of file
diff --git a/nodes/solve/diff.patch b/nodes/solve/diff.patch
new file mode 100644
index 000000000..562a7731b
--- /dev/null
+++ b/nodes/solve/diff.patch
@@ -0,0 +1,7 @@
+diff --git a/django_repo b/django_repo
+new file mode 160000
+index 0000000..755dbf3
+--- /dev/null
++++ b/django_repo
+@@ -0,0 +1 @@
++Subproject commit 755dbf39fcdc491fe9b588358303e259c7750be4