diff --git a/Cargo.lock b/Cargo.lock
index f0afc0227e..6e3c70d13a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -496,6 +496,7 @@ dependencies = [
  "comrak",
  "console-subscriber",
  "criterion",
+ "diffy",
  "directories",
  "either",
  "erased-serde",
@@ -1511,6 +1512,15 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
+[[package]]
+name = "diffy"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e616e59155c92257e84970156f506287853355f58cd4a6eb167385722c32b790"
+dependencies = [
+ "nu-ansi-term",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
diff --git a/client/src/components/Breadcrumbs/index.tsx b/client/src/components/Breadcrumbs/index.tsx
index 0036bc165b..f7e49f4cee 100644
--- a/client/src/components/Breadcrumbs/index.tsx
+++ b/client/src/components/Breadcrumbs/index.tsx
@@ -56,6 +56,7 @@ const Breadcrumbs = ({
 
   useEffect(() => {
     if (!containerRef.current || allowOverflow) {
+      setFormattedPathParts(pathParts);
       return;
     }
     const parentWidth = containerRef.current.parentElement!.clientWidth;
diff --git a/client/src/components/BreadcrumbsPath/index.tsx b/client/src/components/BreadcrumbsPath/index.tsx
index 85dab694a3..d76677b8a7 100644
--- a/client/src/components/BreadcrumbsPath/index.tsx
+++ b/client/src/components/BreadcrumbsPath/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useMemo } from 'react';
 import Breadcrumbs, { PathParts } from '../Breadcrumbs';
 import {
   breadcrumbsItemPath,
@@ -30,7 +30,7 @@ const BreadcrumbsPath = ({
   ...rest
 }: Props) => {
   const { navigateRepoPath, navigateFullResult } = useAppNavigation();
-  const mapPath = useCallback(() => {
+  const pathParts: PathParts[] = useMemo(() => {
     return splitPathForBreadcrumbs(path, (e, item, index, pParts) => {
       if (onClick) {
         e.stopPropagation();
@@ -53,13 +53,7 @@ const BreadcrumbsPath = ({
         navigateFullResult(path);
       }
     });
-  }, [path, shouldGoToFile]);
-
-  const [pathParts, setPathParts] = useState<PathParts[]>(mapPath());
-
-  useEffect(() => {
-    setPathParts(mapPath());
-  }, [path]);
+  }, [path, shouldGoToFile, onClick, repo]);
 
   return (
     <div
diff --git a/client/src/components/CodeBlock/Code/CodeContainer.tsx b/client/src/components/CodeBlock/Code/CodeContainer.tsx
index 7b8bbc8538..a935d3aa6e 100644
--- a/client/src/components/CodeBlock/Code/CodeContainer.tsx
+++ b/client/src/components/CodeBlock/Code/CodeContainer.tsx
@@ -34,6 +34,34 @@ const CodeContainer = ({
   highlightLines,
   canWrap,
 }: Props) => {
+  const lineNumbersAdd = useMemo(() => {
+    let curr = lineStart;
+    return tokensMap.map((line, i) => {
+      if (
+        line.tokens[0]?.token?.content === '-' ||
+        line.tokens[1]?.token?.content === '-'
+      ) {
+        return null;
+      } else {
+        curr++;
+        return curr;
+      }
+    });
+  }, [tokensMap, lineStart]);
+  const lineNumbersRemove = useMemo(() => {
+    let curr = lineStart;
+    return tokensMap.map((line, i) => {
+      if (
+        line.tokens[0]?.token?.content === '+' ||
+        line.tokens[1]?.token?.content === '+'
+      ) {
+        return null;
+      } else {
+        curr++;
+        return curr;
+      }
+    });
+  }, [tokensMap, lineStart]);
   const getSymbols = (lineNumber: number) => {
     if (symbols?.length) {
       return symbols
@@ -50,6 +78,11 @@ const CodeContainer = ({
           key={lineNumber}
           lineNumber={lineStart + lineNumber}
           lineNumberToShow={line.lineNumber}
+          lineNumbersDiff={
+            isDiff
+              ? [lineNumbersRemove[lineNumber], lineNumbersAdd[lineNumber]]
+              : null
+          }
           showLineNumbers={showLines}
           symbols={getSymbols(lineStart + lineNumber)}
           lineHidden={
@@ -107,7 +140,7 @@ const CodeContainer = ({
           canWrap && codeLines.length < 2 ? '!whitespace-pre-wrap' : ''
         }`}
       >
-        <div>{codeLines}</div>
+        <div className="flex flex-col">{codeLines}</div>
       </pre>
     </div>
   );
diff --git a/client/src/components/CodeBlock/Code/CodeLine.tsx b/client/src/components/CodeBlock/Code/CodeLine.tsx
index 3c968f7f3f..5a96ccaf10 100644
--- a/client/src/components/CodeBlock/Code/CodeLine.tsx
+++ b/client/src/components/CodeBlock/Code/CodeLine.tsx
@@ -17,6 +17,7 @@ import { markNode, unmark } from '../../../utils/textSearch';
 type Props = {
   lineNumber: number;
   lineNumberToShow?: number | null;
+  lineNumbersDiff?: [number | null, number | null] | null;
   children: ReactNode;
   showLineNumbers?: boolean;
   lineFoldable?: boolean;
@@ -64,6 +65,7 @@ const CodeLine = ({
   leftHighlight,
   removePaddings,
   hoveredBackground,
+  lineNumbersDiff,
 }: Props) => {
   const codeRef = useRef<HTMLTableCellElement>(null);
 
@@ -162,11 +164,13 @@ const CodeLine = ({
 
   return (
     <div
-      className={`flex transition-all duration-150 ease-in-bounce group ${
+      className={`flex w-full flex-1 transition-all duration-150 ease-in-bounce group ${
         lineHidden ? 'opacity-0' : ''
       } ${
         blameLine?.start && lineNumber !== 0 ? ' border-t border-bg-border' : ''
-      } ${hoveredBackground ? 'bg-bg-base' : ''}`}
+      } ${hoveredBackground ? 'bg-bg-base' : ''} ${
+        isNewLine ? 'bg-bg-success/30' : isRemovedLine ? 'bg-bg-danger/30' : ''
+      }`}
       data-line-number={lineNumber}
       style={style}
       onMouseDown={(e) => {
@@ -210,38 +214,44 @@ const CodeLine = ({
             )}
           </span>
         </div>
-      ) : (
-        <div
-          className={`${
-            showLineNumbers && !removePaddings ? 'px-1' : ''
-          } text-center ${lineHidden ? 'p-0' : ''} ${
-            isRemovedLine
-              ? 'bg-bg-danger/30'
-              : isNewLine
-              ? 'bg-bg-success/30'
-              : ''
-          }`}
-        />
-      )}
-      {showLineNumbers && (
-        <div
-          data-line={lineNumberToShow}
-          className={`min-w-[27px] text-right select-none pr-0 leading-5 ${blameStyle} ${
-            lineHidden ? 'p-0' : ''
-          } ${hoverEffect ? 'group-hover:text-label-base' : ''}
+      ) : null}
+      {showLineNumbers &&
+        (lineNumbersDiff ? (
+          lineNumbersDiff.map((ln, i) => (
+            <div
+              key={i}
+              data-line={ln}
+              className={`min-w-[27px] text-right select-none pr-0 leading-5 ${blameStyle} ${
+                lineHidden ? 'p-0' : ''
+              } ${hoverEffect ? 'group-hover:text-label-base' : ''}
+           ${lineHidden ? '' : 'before:content-[attr(data-line)]'} ${
+             isRemovedLine
+               ? 'text-label-base'
+               : isNewLine
+               ? 'text-label-base'
+               : 'text-label-muted'
+           }`}
+            />
+          ))
+        ) : (
+          <div
+            data-line={lineNumberToShow}
+            className={`min-w-[27px] text-right select-none pr-0 leading-5 ${blameStyle} ${
+              lineHidden ? 'p-0' : ''
+            } ${hoverEffect ? 'group-hover:text-label-base' : ''}
            ${
              lineHidden || !lineNumberToShow
                ? ''
                : 'before:content-[attr(data-line)]'
            } ${
              isRemovedLine
-               ? 'bg-bg-danger/30 text-label-base'
+               ? 'text-label-base'
                : isNewLine
-               ? 'bg-bg-success/30 text-label-base'
+               ? 'text-label-base'
                : 'text-label-muted'
            }`}
-        />
-      )}
+          />
+        ))}
       <div
         className={`text-label-muted ${lineHidden ? 'p-0' : ''} ${blameStyle}`}
       >
@@ -258,15 +268,8 @@ const CodeLine = ({
       <div
         className={`${showLineNumbers ? 'pl-2' : ''} ${
           lineHidden ? 'p-0' : ''
-        }`}
+        } flex-1`}
         ref={codeRef}
-        style={
-          isNewLine
-            ? { backgroundColor: 'rgba(var(--bg-success), 0.3)' }
-            : isRemovedLine
-            ? { backgroundColor: 'rgba(var(--bg-danger), 0.3)' }
-            : {}
-        }
       >
         {children}
       </div>
diff --git a/client/src/components/CodeBlock/CodeDiff/index.tsx b/client/src/components/CodeBlock/CodeDiff/index.tsx
new file mode 100644
index 0000000000..9e32a1fac0
--- /dev/null
+++ b/client/src/components/CodeBlock/CodeDiff/index.tsx
@@ -0,0 +1,191 @@
+import React, { ChangeEvent, useCallback, useEffect, useState } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+import FileIcon from '../../FileIcon';
+import { getFileExtensionForLang, getPrettyLangName } from '../../../utils';
+import BreadcrumbsPath from '../../BreadcrumbsPath';
+import CopyButton from '../../MarkdownWithCode/CopyButton';
+import Code from '../Code';
+import { DiffChunkType } from '../../../types/general';
+import Button from '../../Button';
+import { Pen, TrashCanFilled } from '../../../icons';
+
+type Props = DiffChunkType & {
+  onClick: (d: DiffChunkType) => void;
+  language: string;
+  filePath: string;
+  onDiffRemoved: (i: number) => void;
+  onDiffChanged: (i: number, p: string) => void;
+  i: number;
+};
+
+const CodeDiff = ({
+  hunks,
+  language,
+  filePath,
+  onClick,
+  file,
+  repo,
+  branch,
+  raw_patch,
+  lang,
+  i,
+  onDiffChanged,
+  onDiffRemoved,
+}: Props) => {
+  const [isEditMode, setIsEditMode] = useState(false);
+  const [editedValue, setEditedValue] = useState(
+    raw_patch.split('\n').slice(2, -1).join('\n'),
+  );
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    setEditedValue(raw_patch.split('\n').slice(2, -1).join('\n'));
+  }, [raw_patch]);
+
+  const handleClick = useCallback(() => {
+    onClick({ hunks, repo, branch, file, lang, raw_patch });
+  }, [hunks, repo, branch, file, lang, raw_patch]);
+
+  const onEditClick = useCallback((e: React.MouseEvent) => {
+    e.stopPropagation();
+    setIsEditMode(true);
+  }, []);
+
+  const onCancelEdit = useCallback((e: React.MouseEvent) => {
+    e.stopPropagation();
+    setIsEditMode(false);
+  }, []);
+
+  const handleChange = useCallback((e: ChangeEvent<HTMLTextAreaElement>) => {
+    setEditedValue(e.target.value);
+  }, []);
+
+  const onSaveEdit = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      onDiffChanged(
+        i,
+        `--- ${filePath}
++++ ${filePath}
+${editedValue}
+`,
+      );
+      setIsEditMode(false);
+    },
+    [i, editedValue, onDiffChanged],
+  );
+
+  const onRemove = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      onDiffRemoved(i);
+    },
+    [i, onDiffRemoved],
+  );
+
+  return (
+    <div
+      onClick={handleClick}
+      className={`my-4 block bg-bg-sub text-xs border-bg-border border rounded-md relative group-code cursor-pointer`}
+    >
+      <div
+        className={`bg-bg-shade border-bg-border border-b rounded-t-md p-2 flex items-center justify-between gap-2`}
+      >
+        <div className="flex items-center gap-2 overflow-hidden flex-1">
+          <FileIcon
+            filename={filePath || getFileExtensionForLang(language, true)}
+            noMargin
+          />
+          {filePath ? (
+            <BreadcrumbsPath path={filePath} repo={''} nonInteractive />
+          ) : (
+            <span className="caption-strong">
+              {getPrettyLangName(language) || language}
+            </span>
+          )}
+        </div>
+        <div className="flex items-center gap-2">
+          {!repo.startsWith('local//') ? (
+            <CopyButton isInHeader code={raw_patch} />
+          ) : isEditMode ? (
+            <>
+              <Button size="tiny" variant="secondary" onClick={onCancelEdit}>
+                <Trans>Cancel</Trans>
+              </Button>
+              <Button size="tiny" onClick={onSaveEdit}>
+                <Trans>Save</Trans>
+              </Button>
+            </>
+          ) : (
+            <>
+              <Button
+                variant="secondary"
+                size="tiny"
+                onlyIcon
+                title={t('Edit')}
+                onClick={onEditClick}
+              >
+                <Pen
+                  raw
+                  sizeClassName="w-3.5 h-3.5"
+                  className="text-label-muted"
+                />
+              </Button>
+              <Button
+                variant="secondary"
+                size="tiny"
+                onlyIcon
+                title={t('Remove')}
+                onClick={onRemove}
+              >
+                <TrashCanFilled
+                  raw
+                  sizeClassName="w-3.5 h-3.5"
+                  className="text-label-muted"
+                />
+              </Button>
+            </>
+          )}
+        </div>
+      </div>
+      <div className={`overflow-auto py-2`}>
+        {isEditMode ? (
+          <textarea
+            className={`px-2 w-full bg-transparent outline-none focus:outline-0 resize-none body-s placeholder:text-label-base`}
+            value={editedValue}
+            onChange={handleChange}
+            rows={Math.min(10, raw_patch.split('\n').length)}
+          />
+        ) : (
+          hunks.map((h, index) => (
+            <>
+              <Code
+                key={h.line_start}
+                showLines
+                code={h.patch.slice(0, -1)}
+                language={language}
+                isDiff
+                lineStart={h.line_start - 1}
+              />
+              {index !== hunks.length - 1 ? (
+                <pre className={`bg-bg-sub my-0 px-2`}>
+                  <table>
+                    <tbody>
+                      <tr className="token-line">
+                        <td className="text-label-muted min-w-6 text-right text-l select-none">
+                          ..
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </pre>
+              ) : null}
+            </>
+          ))
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default CodeDiff;
diff --git a/client/src/components/CodeBlock/CodeFull/CodeContainer.tsx b/client/src/components/CodeBlock/CodeFull/CodeContainer.tsx
index 7296cde78d..033c299f8f 100644
--- a/client/src/components/CodeBlock/CodeFull/CodeContainer.tsx
+++ b/client/src/components/CodeBlock/CodeFull/CodeContainer.tsx
@@ -23,7 +23,7 @@ import { Metadata, BlameLine } from './index';
 
 type Props = {
   language: string;
-  metadata: Metadata;
+  metadata?: Metadata;
   relativePath: string;
   repoPath: string;
   repoName: string;
@@ -49,6 +49,7 @@ type Props = {
   ) => void;
   width: number;
   height: number;
+  isDiff?: boolean;
 };
 
 const CodeContainer = ({
diff --git a/client/src/components/CodeBlock/CodeFull/CodeContainerFull.tsx b/client/src/components/CodeBlock/CodeFull/CodeContainerFull.tsx
index 348ab4ac5a..62058303c8 100644
--- a/client/src/components/CodeBlock/CodeFull/CodeContainerFull.tsx
+++ b/client/src/components/CodeBlock/CodeFull/CodeContainerFull.tsx
@@ -1,4 +1,4 @@
-import React, { memo, useEffect, useRef, useState } from 'react';
+import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
 import CodeLine from '../Code/CodeLine';
 import { Token as TokenType } from '../../../types/prism';
 import { Range, TokenInfoType, TokenInfoWrapped } from '../../../types/results';
@@ -10,7 +10,7 @@ import { Metadata, BlameLine } from './index';
 
 type Props = {
   language: string;
-  metadata: Metadata;
+  metadata?: Metadata;
   repoName: string;
   tokens: TokenType[][];
   foldableRanges: Record<number, number>;
@@ -38,6 +38,7 @@ type Props = {
     | undefined
   )[];
   hoveredLines: [number, number] | null;
+  isDiff?: boolean;
 };
 
 const CodeContainerFull = ({
@@ -61,6 +62,7 @@ const CodeContainerFull = ({
   relativePath,
   highlights,
   hoveredLines,
+  isDiff,
 }: Props) => {
   const ref = useRef<HTMLDivElement>(null);
   const popupRef = useRef<HTMLDivElement>(null);
@@ -134,6 +136,29 @@ const CodeContainerFull = ({
     }
   }, []);
 
+  const lineNumbersAdd = useMemo(() => {
+    let curr = 0;
+    return tokens.map((line, i) => {
+      if (line[0]?.content === '-' || line[1]?.content === '-') {
+        return null;
+      } else {
+        curr++;
+        return curr;
+      }
+    });
+  }, [tokens]);
+  const lineNumbersRemove = useMemo(() => {
+    let curr = 0;
+    return tokens.map((line, i) => {
+      if (line[0]?.content === '+' || line[1]?.content === '+') {
+        return null;
+      } else {
+        curr++;
+        return curr;
+      }
+    });
+  }, [tokens]);
+
   return (
     <div ref={ref} className="relative pb-14">
       {tokens.map((line, index) => {
@@ -158,7 +183,7 @@ const CodeContainerFull = ({
             showLineNumbers={true}
             lineHidden={!!foldedLines[index]}
             blameLine={blameLines[index]}
-            blame={!!metadata.blame?.length}
+            blame={!!metadata?.blame?.length}
             hoverEffect
             onMouseSelectStart={onMouseSelectStart}
             onMouseSelectEnd={onMouseSelectEnd}
@@ -179,11 +204,20 @@ const CodeContainerFull = ({
               index <= hoveredLines[1]
             }
             searchTerm={searchTerm}
+            isNewLine={
+              isDiff && (line[0]?.content === '+' || line[1]?.content === '+')
+            }
+            isRemovedLine={
+              isDiff && (line[0]?.content === '-' || line[1]?.content === '-')
+            }
+            lineNumbersDiff={
+              isDiff ? [lineNumbersRemove[index], lineNumbersAdd[index]] : null
+            }
           >
             {line.map((token, i) => (
               <Token
                 key={`cell-${index}-${i}`}
-                lineHoverRanges={metadata.hoverableRanges[index]}
+                lineHoverRanges={metadata?.hoverableRanges[index] || []}
                 token={token}
                 getHoverableContent={getHoverableContent}
               />
diff --git a/client/src/components/CodeBlock/CodeFull/CodeContainerVirtualized.tsx b/client/src/components/CodeBlock/CodeFull/CodeContainerVirtualized.tsx
index a26b31dae3..9adabbe5e1 100644
--- a/client/src/components/CodeBlock/CodeFull/CodeContainerVirtualized.tsx
+++ b/client/src/components/CodeBlock/CodeFull/CodeContainerVirtualized.tsx
@@ -12,7 +12,7 @@ import { Metadata, BlameLine } from './index';
 
 type Props = {
   language: string;
-  metadata: Metadata;
+  metadata?: Metadata;
   repoName: string;
   tokens: TokenType[][];
   foldableRanges: Record<number, number>;
@@ -159,7 +159,7 @@ const CodeContainerVirtualized = ({
             showLineNumbers={true}
             lineHidden={!!foldedLines[index]}
             blameLine={blameLines[index]}
-            blame={!!metadata.blame?.length}
+            blame={!!metadata?.blame?.length}
             hoverEffect
             onMouseSelectStart={onMouseSelectStart}
             onMouseSelectEnd={onMouseSelectEnd}
@@ -185,7 +185,7 @@ const CodeContainerVirtualized = ({
             {tokens[index].map((token, i) => (
               <Token
                 key={`cell-${index}-${i}`}
-                lineHoverRanges={metadata.hoverableRanges[index]}
+                lineHoverRanges={metadata?.hoverableRanges[index] || []}
                 token={token}
                 getHoverableContent={(hr, tr) =>
                   getHoverableContent(hr, tr, index)
diff --git a/client/src/components/CodeBlock/CodeFull/index.tsx b/client/src/components/CodeBlock/CodeFull/index.tsx
index d6dc43109e..0ce3e2bfea 100644
--- a/client/src/components/CodeBlock/CodeFull/index.tsx
+++ b/client/src/components/CodeBlock/CodeFull/index.tsx
@@ -42,13 +42,14 @@ export interface Metadata {
 type Props = {
   code: string;
   language: string;
-  metadata: Metadata;
+  metadata?: Metadata;
   relativePath: string;
   repoPath: string;
   repoName: string;
   containerWidth: number;
   containerHeight: number;
   closePopup?: () => void;
+  isDiff?: boolean;
 };
 
 const CodeFull = ({
@@ -61,6 +62,7 @@ const CodeFull = ({
   containerWidth,
   containerHeight,
   closePopup,
+  isDiff,
 }: Props) => {
   const [foldableRanges, setFoldableRanges] = useState<Record<number, number>>(
     {},
@@ -150,7 +152,7 @@ const CodeFull = ({
 
   useEffect(() => {
     setFoldableRanges(
-      metadata.lexicalBlocks?.reduce(
+      metadata?.lexicalBlocks?.reduce(
         (acc, cur) => ({
           ...acc,
           [cur.start]: cur.end,
@@ -158,11 +160,11 @@ const CodeFull = ({
         {},
       ) || {},
     );
-  }, [metadata.lexicalBlocks]);
+  }, [metadata?.lexicalBlocks]);
 
   useEffect(() => {
     const bb: Record<number, BlameLine> = {};
-    metadata.blame?.forEach((item) => {
+    metadata?.blame?.forEach((item) => {
       bb[item.lineRange.start] = {
         start: true,
         commit: item.commit,
@@ -173,7 +175,7 @@ const CodeFull = ({
     });
 
     setBlameLines(bb);
-  }, [metadata.blame]);
+  }, [metadata?.blame]);
 
   const toggleBlock = useCallback(
     (fold: boolean, start: number) => {
@@ -395,6 +397,7 @@ const CodeFull = ({
             onRefDefClick={onRefDefClick}
             scrollToIndex={scrollToIndex}
             highlightColor={highlightColor}
+            isDiff={isDiff}
           />
           <ExplainButton
             currentSelection={currentSelection}
diff --git a/client/src/components/MarkdownWithCode/CopyButton.tsx b/client/src/components/MarkdownWithCode/CopyButton.tsx
index de2a8edab8..57d2779263 100644
--- a/client/src/components/MarkdownWithCode/CopyButton.tsx
+++ b/client/src/components/MarkdownWithCode/CopyButton.tsx
@@ -1,4 +1,5 @@
-import { memo, useCallback, useState } from 'react';
+import React, { memo, useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import Button from '../Button';
 import { copyToClipboard } from '../../utils';
 import { CheckIcon, Clipboard, CopyMD } from '../../icons';
@@ -10,13 +11,18 @@ type Props = {
 };
 
 const CopyButton = ({ isInHeader, code, className }: Props) => {
+  const { t } = useTranslation();
   const [codeCopied, setCodeCopied] = useState(false);
 
-  const onClick = useCallback(() => {
-    copyToClipboard(code);
-    setCodeCopied(true);
-    setTimeout(() => setCodeCopied(false), 2000);
-  }, [code]);
+  const onClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      copyToClipboard(code);
+      setCodeCopied(true);
+      setTimeout(() => setCodeCopied(false), 2000);
+    },
+    [code],
+  );
 
   return (
     <div
@@ -40,7 +46,7 @@ const CopyButton = ({ isInHeader, code, className }: Props) => {
         ) : (
           <Clipboard />
         )}
-        {codeCopied ? 'Copied' : 'Copy'}
+        {codeCopied ? t('Copied') : t('Copy')}
       </Button>
     </div>
   );
diff --git a/client/src/icons/BranchMerged.tsx b/client/src/icons/BranchMerged.tsx
new file mode 100644
index 0000000000..7430655497
--- /dev/null
+++ b/client/src/icons/BranchMerged.tsx
@@ -0,0 +1,31 @@
+import IconWrapper from './Wrapper';
+
+const RawIcon = (
+  <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M5.41667 3.33334C4.72631 3.33334 4.16667 3.89298 4.16667 4.58334C4.16667 5.27369 4.72631 5.83334 5.41667 5.83334C6.10702 5.83334 6.66667 5.27369 6.66667 4.58334C6.66667 3.89298 6.10702 3.33334 5.41667 3.33334ZM2.5 4.58334C2.5 2.97251 3.80584 1.66667 5.41667 1.66667C7.0275 1.66667 8.33333 2.97251 8.33333 4.58334C8.33333 5.9046 7.45479 7.02066 6.25 7.37922V12.6208C7.45479 12.9794 8.33333 14.0954 8.33333 15.4167C8.33333 17.0275 7.0275 18.3333 5.41667 18.3333C3.80584 18.3333 2.5 17.0275 2.5 15.4167C2.5 14.0954 3.37855 12.9794 4.58333 12.6208V7.37922C3.37855 7.02066 2.5 5.9046 2.5 4.58334ZM12.6726 1.91075C12.998 2.23619 12.998 2.76382 12.6726 3.08926L12.0118 3.75001H12.9167C14.2974 3.75001 15.4167 4.86929 15.4167 6.25001V12.6208C16.6215 12.9794 17.5 14.0954 17.5 15.4167C17.5 17.0275 16.1942 18.3333 14.5833 18.3333C12.9725 18.3333 11.6667 17.0275 11.6667 15.4167C11.6667 14.0954 12.5452 12.9794 13.75 12.6208V6.25001C13.75 5.78977 13.3769 5.41667 12.9167 5.41667H12.0118L12.6726 6.07742C12.998 6.40285 12.998 6.93049 12.6726 7.25593C12.3472 7.58136 11.8195 7.58136 11.4941 7.25593L9.41074 5.17259C9.08531 4.84716 9.08531 4.31952 9.41074 3.99408L11.4941 1.91075C11.8195 1.58531 12.3472 1.58531 12.6726 1.91075ZM5.41667 14.1667C4.72631 14.1667 4.16667 14.7263 4.16667 15.4167C4.16667 16.107 4.72631 16.6667 5.41667 16.6667C6.10702 16.6667 6.66667 16.107 6.66667 15.4167C6.66667 14.7263 6.10702 14.1667 5.41667 14.1667ZM14.5833 14.1667C13.893 14.1667 13.3333 14.7263 13.3333 15.4167C13.3333 16.107 13.893 16.6667 14.5833 16.6667C15.2737 16.6667 15.8333 16.107 15.8333 15.4167C15.8333 14.7263 15.2737 14.1667 14.5833 14.1667Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
+const BoxedIcon = (
+  <svg
+    width="20"
+    height="20"
+    viewBox="0 0 20 20"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M5.41667 3.33334C4.72631 3.33334 4.16667 3.89298 4.16667 4.58334C4.16667 5.27369 4.72631 5.83334 5.41667 5.83334C6.10702 5.83334 6.66667 5.27369 6.66667 4.58334C6.66667 3.89298 6.10702 3.33334 5.41667 3.33334ZM2.5 4.58334C2.5 2.97251 3.80584 1.66667 5.41667 1.66667C7.0275 1.66667 8.33333 2.97251 8.33333 4.58334C8.33333 5.9046 7.45479 7.02066 6.25 7.37922V12.6208C7.45479 12.9794 8.33333 14.0954 8.33333 15.4167C8.33333 17.0275 7.0275 18.3333 5.41667 18.3333C3.80584 18.3333 2.5 17.0275 2.5 15.4167C2.5 14.0954 3.37855 12.9794 4.58333 12.6208V7.37922C3.37855 7.02066 2.5 5.9046 2.5 4.58334ZM12.6726 1.91075C12.998 2.23619 12.998 2.76382 12.6726 3.08926L12.0118 3.75001H12.9167C14.2974 3.75001 15.4167 4.86929 15.4167 6.25001V12.6208C16.6215 12.9794 17.5 14.0954 17.5 15.4167C17.5 17.0275 16.1942 18.3333 14.5833 18.3333C12.9725 18.3333 11.6667 17.0275 11.6667 15.4167C11.6667 14.0954 12.5452 12.9794 13.75 12.6208V6.25001C13.75 5.78977 13.3769 5.41667 12.9167 5.41667H12.0118L12.6726 6.07742C12.998 6.40285 12.998 6.93049 12.6726 7.25593C12.3472 7.58136 11.8195 7.58136 11.4941 7.25593L9.41074 5.17259C9.08531 4.84716 9.08531 4.31952 9.41074 3.99408L11.4941 1.91075C11.8195 1.58531 12.3472 1.58531 12.6726 1.91075ZM5.41667 14.1667C4.72631 14.1667 4.16667 14.7263 4.16667 15.4167C4.16667 16.107 4.72631 16.6667 5.41667 16.6667C6.10702 16.6667 6.66667 16.107 6.66667 15.4167C6.66667 14.7263 6.10702 14.1667 5.41667 14.1667ZM14.5833 14.1667C13.893 14.1667 13.3333 14.7263 13.3333 15.4167C13.3333 16.107 13.893 16.6667 14.5833 16.6667C15.2737 16.6667 15.8333 16.107 15.8333 15.4167C15.8333 14.7263 15.2737 14.1667 14.5833 14.1667Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
+export default IconWrapper(RawIcon, BoxedIcon);
diff --git a/client/src/icons/index.ts b/client/src/icons/index.ts
index 12c30a2a6c..240d0086d0 100644
--- a/client/src/icons/index.ts
+++ b/client/src/icons/index.ts
@@ -134,3 +134,4 @@ export { default as Walk } from './Walk';
 export { default as Run } from './Run';
 export { default as AIAnswerLong } from './AIAnswerLong';
 export { default as DocsSection } from './DocsSection';
+export { default as BranchMerged } from './BranchMerged';
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 1bf2d00608..0ad90aa556 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -418,5 +418,14 @@
 	"Hold <1></1> to add multiple files": "Hold <1></1> to add multiple files",
 	"Clear section": "Clear section",
 	"Let’s get you started with bloop!": "Let’s get you started with bloop!",
-	"Indexing": "Indexing"
-}
\ No newline at end of file
+	"Apply changes": "Apply changes",
+	"Indexing": "Indexing",
+	"Generated diffs to be applied": "Generated diffs to be applied",
+	"The following changes can be applied to your repository. Make sure the generated diffs are valid before you apply the changes.": "The following changes can be applied to your repository. Make sure the generated diffs are valid before you apply the changes.",
+	"The diff has been applied locally.": "The diff has been applied locally.",
+	"Generating diff...": "Generating diff...",
+	"Diff generation failed": "Diff generation failed",
+	"Failed to apply the diff": "Failed to apply the diff",
+	"Cancel diff generation": "Cancel diff generation",
+	"The following changes represent the git diff for the remote repository. Please note that these changes cannot be applied directly to a remote repository. Use the \"Copy\" button to copy the changes and apply them locally.": "The following changes represent the git diff for the remote repository. Please note that these changes cannot be applied directly to a remote repository. Use the \"Copy\" button to copy the changes and apply them locally."
+}
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index 9e03b82223..cc9781cc47 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -419,5 +419,14 @@
 	"Hold <1></1> to add multiple files": "Mantenga presionada <1> </1> para agregar múltiples archivos",
 	"Clear section": "Borrar sección",
 	"Let’s get you started with bloop!": "¡Vamos a comenzar con Bloop!",
-	"Indexing": "Indexación"
-}
\ No newline at end of file
+	"Apply changes": "Aplicar cambios",
+	"Indexing": "Indexación",
+	"Generated diffs to be applied": "Diferencias generadas a aplicar",
+	"The following changes can be applied to your repository. Make sure the generated diffs are valid before you apply the changes.": "Los siguientes cambios se pueden aplicar a su repositorio. Asegúrese de que las diferencias generadas sean válidas antes de aplicar los cambios.",
+	"The diff has been applied locally.": "La diferencia se ha aplicado localmente.",
+	"Generating diff...": "Generando diff ...",
+	"Diff generation failed": "Falló la generación de diff",
+	"Failed to apply the diff": "No se pudo aplicar la diferencia",
+	"Cancel diff generation": "Cancelar la generación de diff",
+	"The following changes represent the git diff for the remote repository. Please note that these changes cannot be applied directly to a remote repository. Use the \"Copy\" button to copy the changes and apply them locally.": "Los siguientes cambios representan el Diff Git para el repositorio remoto. Tenga en cuenta que estos cambios no se pueden aplicar directamente a un repositorio remoto. Use el botón \"Copiar\" para copiar los cambios y aplicarlos localmente."
+}
diff --git a/client/src/locales/it.json b/client/src/locales/it.json
index 66d241a152..ad432a41a5 100644
--- a/client/src/locales/it.json
+++ b/client/src/locales/it.json
@@ -397,5 +397,15 @@
 	"<0></0><1></1> to navigate.": "<0></0><1></1> per navigare.",
 	"Below are a few questions you can ask me to get started:": "Di seguito alcune domande che puoi pormi per iniziare:",
 	"Check context files for any errors": "Controlla eventuali errori nei file di contesto",
-	"Indexing": "Indicizzazione"
-}
\ No newline at end of file
+	"Please log into your GitHub account to complete setup": "Accedi al tuo account GitHub per completare la configurazione",
+	"Apply changes": "Applica i cambiamenti",
+	"Indexing": "Indicizzazione",
+	"Generated diffs to be applied": "Difficate generate da applicare",
+	"The following changes can be applied to your repository. Make sure the generated diffs are valid before you apply the changes.": "Le seguenti modifiche possono essere applicate al repository. Assicurarsi che le differenze generate siano valide prima di applicare le modifiche.",
+	"The diff has been applied locally.": "Il diff è stato applicato localmente.",
+	"Generating diff...": "Generare diff ...",
+	"Diff generation failed": "Diff generazione non riuscita",
+	"Failed to apply the diff": "Impossibile applicare il diff",
+	"Cancel diff generation": "Annulla la generazione diff",
+	"The following changes represent the git diff for the remote repository. Please note that these changes cannot be applied directly to a remote repository. Use the \"Copy\" button to copy the changes and apply them locally.": "Le seguenti modifiche rappresentano il differenziale GIT per il repository remoto. Si prega di notare che queste modifiche non possono essere applicate direttamente a un repository remoto. Utilizzare il pulsante \"Copia\" per copiare le modifiche e applicarle localmente."
+}
diff --git a/client/src/locales/ja.json b/client/src/locales/ja.json
index 8096283fc4..aa013a297c 100644
--- a/client/src/locales/ja.json
+++ b/client/src/locales/ja.json
@@ -416,5 +416,14 @@
 	"Hold <1></1> to add multiple files": "<1> </1>を保持して複数のファイルを追加する",
 	"Clear section": "クリアセクション",
 	"Let’s get you started with bloop!": "Bloopを始めましょう！",
-	"Indexing": "インデックス付け"
-}
\ No newline at end of file
+	"Apply changes": "変更を適用します",
+	"Indexing": "インデックス付け",
+	"Generated diffs to be applied": "適用する生成されたdiff",
+	"The following changes can be applied to your repository. Make sure the generated diffs are valid before you apply the changes.": "次の変更をリポジトリに適用できます。 変更を適用する前に、生成されたdiffが有効であることを確認してください。",
+	"The diff has been applied locally.": "DIFFはローカルで適用されています。",
+	"Generating diff...": "diffを生成します...",
+	"Diff generation failed": "DIFF生成は失敗しました",
+	"Failed to apply the diff": "DIFFを適用できませんでした",
+	"Cancel diff generation": "DIFF生成をキャンセルします",
+	"The following changes represent the git diff for the remote repository. Please note that these changes cannot be applied directly to a remote repository. Use the \"Copy\" button to copy the changes and apply them locally.": "次の変更は、リモートリポジトリのGit Diffを表しています。 これらの変更は、リモートリポジトリに直接適用できないことに注意してください。 「コピー」ボタンを使用して、変更をコピーしてローカルに適用します。"
+}
diff --git a/client/src/locales/zh-CN.json b/client/src/locales/zh-CN.json
index a06031d003..8f2ba09479 100644
--- a/client/src/locales/zh-CN.json
+++ b/client/src/locales/zh-CN.json
@@ -425,5 +425,14 @@
 	"Hold <1></1> to add multiple files": "保持<1> </1>添加多个文件",
 	"Clear section": "清除部分",
 	"Let’s get you started with bloop!": "让我们开始开始Bloop！",
-	"Indexing": "索引"
-}
\ No newline at end of file
+	"Apply changes": "应用更改",
+	"Indexing": "索引",
+	"Generated diffs to be applied": "生成的差异要应用",
+	"The following changes can be applied to your repository. Make sure the generated diffs are valid before you apply the changes.": "以下更改可以应用于您的存储库。 应用更改之前，请确保生成的差异有效。",
+	"The diff has been applied locally.": "差异已在本地应用。",
+	"Generating diff...": "生成差异...",
+	"Diff generation failed": "差异生成失败",
+	"Failed to apply the diff": "未能应用差异",
+	"Cancel diff generation": "取消差异生成",
+	"The following changes represent the git diff for the remote repository. Please note that these changes cannot be applied directly to a remote repository. Use the \"Copy\" button to copy the changes and apply them locally.": "以下更改代表远程存储库的git差异。 请注意，这些更改不能直接应用于远程存储库。 使用“复制”按钮复制更改并在本地应用它们。"
+}
diff --git a/client/src/pages/StudioTab/Content.tsx b/client/src/pages/StudioTab/Content.tsx
index 5a1bed9319..0e60f3a63a 100644
--- a/client/src/pages/StudioTab/Content.tsx
+++ b/client/src/pages/StudioTab/Content.tsx
@@ -37,6 +37,7 @@ import RightPanel from './RightPanel';
 import FilePanel from './FilePanel';
 import AddDocsModal from './AddDocsModal';
 import DocPanel from './DocPanel';
+import DiffPanel from './DiffPanel';
 
 type Props = {
   tab: StudioTabType;
@@ -488,6 +489,8 @@ const ContentContainer = ({
                   onSectionsChanged={onDocSectionsChanged}
                   setIsChangeUnsaved={setIsChangeUnsaved}
                 />
+              ) : leftPanel.type === StudioLeftPanelType.DIFF ? (
+                <DiffPanel {...leftPanel.data} setLeftPanel={setLeftPanel} />
               ) : null}
               <AddContextModal
                 isVisible={isAddContextOpen}
diff --git a/client/src/pages/StudioTab/DiffPanel/index.tsx b/client/src/pages/StudioTab/DiffPanel/index.tsx
new file mode 100644
index 0000000000..d498dd26eb
--- /dev/null
+++ b/client/src/pages/StudioTab/DiffPanel/index.tsx
@@ -0,0 +1,179 @@
+import React, {
+  Dispatch,
+  memo,
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+import {
+  DiffHunkType,
+  DiffPanelType,
+  StudioLeftPanelDataType,
+  StudioLeftPanelType,
+} from '../../../types/general';
+import { File } from '../../../types/api';
+import { search } from '../../../services/api';
+import { buildRepoQuery, getFileExtensionForLang } from '../../../utils';
+import { findElementInCurrentTab } from '../../../utils/domUtils';
+import FileIcon from '../../../components/FileIcon';
+import Button from '../../../components/Button';
+import OverflowTracker from '../../../components/OverflowTracker';
+import BreadcrumbsPath from '../../../components/BreadcrumbsPath';
+import { Branch } from '../../../icons';
+import CodeFull from '../../../components/CodeBlock/CodeFull';
+
+type Props = DiffPanelType['data'] & {
+  setLeftPanel: Dispatch<SetStateAction<StudioLeftPanelDataType>>;
+};
+
+const HEADER_HEIGHT = 32;
+const SUBHEADER_HEIGHT = 46;
+const FOOTER_HEIGHT = 64;
+const VERTICAL_PADDINGS = 32;
+const HORIZONTAL_PADDINGS = 32;
+const BREADCRUMBS_HEIGHT = 41;
+
+const DiffPanel = ({ hunks, setLeftPanel, branch, filePath, repo }: Props) => {
+  useTranslation();
+  const [file, setFile] = useState<File | null>(null);
+
+  useEffect(() => {
+    search(
+      buildRepoQuery(
+        repo.ref.startsWith('github.com/') ? repo.ref : repo.name,
+        filePath,
+        branch,
+      ),
+    ).then((resp) => {
+      if (resp?.data?.[0]?.kind === 'file') {
+        setFile(resp?.data?.[0]?.data);
+      }
+    });
+  }, [filePath, branch, repo]);
+
+  const onBack = useCallback(() => {
+    setLeftPanel({ type: StudioLeftPanelType.CONTEXT });
+  }, [setLeftPanel]);
+
+  const code = useMemo(() => {
+    if (file?.contents && hunks) {
+      const result: string[] = [];
+      const fileLines = file?.contents.split('\n');
+
+      let prevStart: number;
+      (JSON.parse(JSON.stringify(hunks)) as DiffHunkType[])
+        .sort((a, b) => b.line_start - a.line_start)
+        .forEach((h, i, arr) => {
+          const patchLines = h.patch.replace(/\n$/, '').split('\n');
+          let patchOffset = 0;
+          patchLines.forEach((l) => {
+            if (l.startsWith('+')) {
+              patchOffset++;
+            } else if (l.startsWith('-')) {
+              patchOffset--;
+            }
+          });
+          const firstLineAfterLastDiff =
+            h.line_start - 1 + Math.max(0, patchLines.length - 1 - patchOffset);
+          if (firstLineAfterLastDiff < fileLines.length) {
+            result.push(
+              ...fileLines.slice(firstLineAfterLastDiff, prevStart).reverse(),
+            );
+          }
+          result.push(...patchLines.reverse());
+          prevStart = h.line_start - 1;
+          if (i === arr.length - 1 && h.line_start > 0) {
+            result.push(...fileLines.slice(0, h.line_start - 1).reverse());
+          }
+        });
+
+      return result.reverse().join('\n');
+    }
+  }, [file?.contents, hunks]);
+
+  useEffect(() => {
+    if (code && hunks) {
+      setTimeout(() => {
+        const firstLine = (
+          JSON.parse(JSON.stringify(hunks)) as DiffHunkType[]
+        ).sort((a, b) => a.line_start - b.line_start)[0].line_start;
+        if (firstLine) {
+          const line = findElementInCurrentTab(
+            `[data-line-number="${firstLine}"]`,
+          );
+          line?.scrollIntoView({
+            behavior: 'auto',
+            block: 'start',
+          });
+        }
+      }, 500);
+    }
+  }, [hunks, code]);
+
+  return (
+    <div className="flex flex-col w-full flex-1 overflow-auto relative">
+      <div className="flex gap-1 px-8 justify-between items-center border-b border-bg-border bg-bg-shade shadow-low h-11.5 flex-shrink-0">
+        <div className="flex items-center gap-3 overflow-auto">
+          <div className="flex items-center p-1 rounded border border-bg-border bg-bg-base">
+            <FileIcon filename={filePath || ''} noMargin />
+          </div>
+          <p className="body-s-strong text-label-title">
+            {filePath.split('/').pop()}
+          </p>
+        </div>
+        <div className="flex items-center gap-3 flex-shrink-0">
+          <Button size="small" variant="secondary" onClick={onBack}>
+            <Trans>Back</Trans>
+          </Button>
+        </div>
+      </div>
+      <div className="flex px-8 py-2 items-center gap-2 border-b border-bg-border bg-bg-sub text-label-base overflow-x-auto flex-shrink-0">
+        <div className="flex items-center gap-1.5 overflow-x-auto overflow-y-hidden">
+          <FileIcon filename={getFileExtensionForLang(repo.most_common_lang)} />
+          <OverflowTracker className="auto-fade-horizontal">
+            <BreadcrumbsPath
+              path={`${repo.name.replace(/^github\.com\//, '')}/${filePath}`}
+              repo={repo.ref}
+              nonInteractive
+              allowOverflow
+            />
+          </OverflowTracker>
+          {!!branch && (
+            <>
+              <Branch sizeClassName="w-4 h-4" />
+              <span className="caption ellipsis">
+                {branch.replace(/^origin\//, '')}
+              </span>
+            </>
+          )}
+        </div>
+      </div>
+      <div className={`py-4 px-4 overflow-auto flex flex-col`}>
+        {!!code && file && (
+          <CodeFull
+            isDiff
+            code={code}
+            language={file.lang}
+            relativePath={filePath}
+            repoPath={repo.ref}
+            repoName={repo.name}
+            containerHeight={
+              window.innerHeight -
+              HEADER_HEIGHT -
+              SUBHEADER_HEIGHT -
+              FOOTER_HEIGHT -
+              VERTICAL_PADDINGS -
+              BREADCRUMBS_HEIGHT
+            }
+            containerWidth={window.innerWidth / 2 - HORIZONTAL_PADDINGS}
+          />
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default memo(DiffPanel);
diff --git a/client/src/pages/StudioTab/RightPanel/Conversation/GeneratedDiff.tsx b/client/src/pages/StudioTab/RightPanel/Conversation/GeneratedDiff.tsx
new file mode 100644
index 0000000000..d9c647b9b9
--- /dev/null
+++ b/client/src/pages/StudioTab/RightPanel/Conversation/GeneratedDiff.tsx
@@ -0,0 +1,104 @@
+import { Dispatch, memo, SetStateAction, useCallback, useContext } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+import { BranchMerged, WarningSign } from '../../../../icons';
+import CodeDiff from '../../../../components/CodeBlock/CodeDiff';
+import { GeneratedCodeDiff } from '../../../../types/api';
+import {
+  DiffChunkType,
+  StudioLeftPanelDataType,
+  StudioLeftPanelType,
+} from '../../../../types/general';
+import { RepositoriesContext } from '../../../../context/repositoriesContext';
+
+type Props = {
+  diff: GeneratedCodeDiff;
+  setLeftPanel: Dispatch<SetStateAction<StudioLeftPanelDataType>>;
+  onDiffRemoved: (i: number) => void;
+  onDiffChanged: (i: number, p: string) => void;
+  applyError?: boolean;
+};
+
+const GeneratedDiff = ({
+  diff,
+  setLeftPanel,
+  onDiffRemoved,
+  onDiffChanged,
+  applyError,
+}: Props) => {
+  useTranslation();
+  const { repositories } = useContext(RepositoriesContext);
+
+  const onDiffClick = useCallback(
+    (chunk: DiffChunkType) => {
+      const repoFull = repositories?.find((r) => r.ref === chunk.repo);
+      if (repoFull) {
+        setLeftPanel({
+          type: StudioLeftPanelType.DIFF,
+          data: {
+            filePath: chunk.file,
+            repo: repoFull,
+            branch: chunk.branch,
+            hunks: chunk.hunks,
+          },
+        });
+      }
+    },
+    [repositories],
+  );
+
+  return (
+    <div className="flex flex-col rounded-6 overflow-hidden border border-transparent hover:shadow-medium hover:border-bg-border-hover focus-within:border-bg-main bg-bg-base hover:focus-within:border-bg-main focus-within:shadow-medium transition-all duration-150 ease-in-out">
+      <div className="w-full bg-bg-shade">
+        <div
+          className={`w-full flex items-center justify-center gap-1 py-2 ${
+            applyError
+              ? 'bg-bg-danger/12 text-bg-danger'
+              : ' bg-bg-main/15 text-label-link'
+          } caption`}
+        >
+          {applyError ? (
+            <WarningSign raw sizeClassName="w-3.5 h-3.5" />
+          ) : (
+            <BranchMerged raw sizeClassName="w-3.5 h-3.5" />
+          )}
+          <Trans>
+            {applyError
+              ? 'Failed to apply the diff'
+              : 'Generated diffs to be applied'}
+          </Trans>
+        </div>
+      </div>
+      <div className=" p-4">
+        <p className="body-s text-label-title">
+          {diff.chunks.find((c) => c.repo.startsWith('local//')) ? (
+            <Trans>
+              The following changes can be applied to your repository. Make sure
+              the generated diffs are valid before you apply the changes.
+            </Trans>
+          ) : (
+            <Trans>
+              The following changes represent the git diff for the remote
+              repository. Please note that these changes cannot be applied
+              directly to a remote repository. Use the &quot;Copy&quot; button
+              to copy the changes and apply them locally.
+            </Trans>
+          )}
+        </p>
+        {diff.chunks.map((d, i) => (
+          <CodeDiff
+            key={d.file}
+            filePath={d.file}
+            language={d.lang || 'diff'}
+            {...d}
+            i={i}
+            onClick={onDiffClick}
+            onDiffChanged={onDiffChanged}
+            onDiffRemoved={onDiffRemoved}
+          />
+        ))}
+      </div>
+    </div>
+  );
+};
+
+export default memo(GeneratedDiff);
diff --git a/client/src/pages/StudioTab/RightPanel/Conversation/Input.tsx b/client/src/pages/StudioTab/RightPanel/Conversation/Input.tsx
index a0429c3e34..4c223d09d5 100644
--- a/client/src/pages/StudioTab/RightPanel/Conversation/Input.tsx
+++ b/client/src/pages/StudioTab/RightPanel/Conversation/Input.tsx
@@ -222,7 +222,7 @@ const ConversationInput = ({
         )}
       </div>
       <div
-        className={`code-studio-md body-s relative ${
+        className={`code-studio-md break-words body-s relative ${
           isFocused || i === undefined ? 'flex flex-col' : ''
         }`}
       >
diff --git a/client/src/pages/StudioTab/RightPanel/Conversation/index.tsx b/client/src/pages/StudioTab/RightPanel/Conversation/index.tsx
index 3441786e74..2e5a2416e0 100644
--- a/client/src/pages/StudioTab/RightPanel/Conversation/index.tsx
+++ b/client/src/pages/StudioTab/RightPanel/Conversation/index.tsx
@@ -5,29 +5,46 @@ import React, {
   useCallback,
   useContext,
   useEffect,
+  useMemo,
   useRef,
   useState,
 } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import throttle from 'lodash.throttle';
 import {
+  DiffHunkType,
   StudioConversationMessage,
   StudioConversationMessageAuthor,
   StudioLeftPanelDataType,
   StudioLeftPanelType,
 } from '../../../../types/general';
 import Button from '../../../../components/Button';
-import { ArrowRefresh, TrashCanFilled } from '../../../../icons';
+import {
+  ArrowRefresh,
+  BranchMerged,
+  TrashCanFilled,
+  WarningSign,
+} from '../../../../icons';
 import KeyboardChip from '../../KeyboardChip';
-import { CodeStudioMessageType, CodeStudioType } from '../../../../types/api';
-import { patchCodeStudio } from '../../../../services/api';
+import {
+  CodeStudioMessageType,
+  CodeStudioType,
+  GeneratedCodeDiff,
+} from '../../../../types/api';
+import {
+  confirmStudioDiff,
+  generateStudioDiff,
+  patchCodeStudio,
+} from '../../../../services/api';
 import useKeyboardNavigation from '../../../../hooks/useKeyboardNavigation';
 import { DeviceContext } from '../../../../context/deviceContext';
 import useScrollToBottom from '../../../../hooks/useScrollToBottom';
 import { StudioContext } from '../../../../context/studioContext';
 import { PersonalQuotaContext } from '../../../../context/personalQuotaContext';
 import { UIContext } from '../../../../context/uiContext';
+import LiteLoaderContainer from '../../../../components/Loaders/LiteLoader';
 import ConversationInput from './Input';
+import GeneratedDiff from './GeneratedDiff';
 
 type Props = {
   setLeftPanel: Dispatch<SetStateAction<StudioLeftPanelDataType>>;
@@ -43,8 +60,6 @@ type Props = {
   handleRestore: () => void;
 };
 
-let eventSource: EventSource;
-
 const throttledPatch = throttle(
   (studioId, data) => {
     return patchCodeStudio(studioId, data);
@@ -87,7 +102,14 @@ const Conversation = ({
   const [inputAuthor, setInputAuthor] = useState(
     StudioConversationMessageAuthor.USER,
   );
+  const [waitingForDiff, setWaitingForDiff] = useState(false);
+  const [isDiffApplied, setDiffApplied] = useState(false);
+  const [isDiffApplyError, setDiffApplyError] = useState(false);
+  const [isDiffGenFailed, setDiffGenFailed] = useState(false);
+  const [diff, setDiff] = useState<GeneratedCodeDiff | null>(null);
   const inputRef = useRef<HTMLTextAreaElement | null>(null);
+  const abortController = useRef<AbortController | null>(null);
+  const eventSource = useRef<EventSource | null>(null);
 
   const setInput = useCallback((value: StudioConversationMessage) => {
     setInputValue(value.message);
@@ -166,7 +188,7 @@ const Conversation = ({
   );
 
   const handleCancel = useCallback(() => {
-    eventSource?.close();
+    eventSource.current?.close();
     setIsLoading(false);
     refetchQuota();
     if (
@@ -193,6 +215,10 @@ const Conversation = ({
       setUpgradePopupOpen(true);
       return;
     }
+    setDiffApplied(false);
+    setDiffApplyError(false);
+    setDiff(null);
+    setDiffGenFailed(false);
     setConversation((prev) => [
       ...prev,
       { message: inputValue, author: inputAuthor },
@@ -203,11 +229,11 @@ const Conversation = ({
     });
     setIsLoading(true);
 
-    eventSource?.close();
-    eventSource = new EventSource(
+    eventSource.current?.close();
+    eventSource.current = new EventSource(
       `${apiUrl.replace('https:', '')}/studio/${studioId}/generate`,
     );
-    eventSource.onerror = (err) => {
+    eventSource.current.onerror = (err) => {
       console.log('SSE error', err);
       refetchQuota();
       setConversation((prev) => {
@@ -225,12 +251,12 @@ const Conversation = ({
         return newConv;
       });
       setIsLoading(false);
-      eventSource.close();
+      eventSource.current?.close();
     };
     let i = 0;
-    eventSource.onmessage = (ev) => {
+    eventSource.current.onmessage = (ev) => {
       if (ev.data === '[DONE]') {
-        eventSource.close();
+        eventSource.current?.close();
         setIsLoading(false);
         refetchCodeStudio();
         return;
@@ -300,6 +326,11 @@ const Conversation = ({
         // Set input to the message being removed
         setInput(conversation[i]);
       }
+      setWaitingForDiff(false);
+      setDiffGenFailed(false);
+      setDiff(null);
+      setDiffApplied(false);
+      setDiffApplyError(false);
       if (
         i === conversation.length - 1 &&
         conversation[i].author === StudioConversationMessageAuthor.ASSISTANT &&
@@ -335,6 +366,11 @@ const Conversation = ({
     await patchCodeStudio(studioId, {
       messages: [],
     });
+    setDiff(null);
+    setWaitingForDiff(false);
+    setDiffApplied(false);
+    setDiffApplyError(false);
+    setDiffGenFailed(false);
     setInput({
       author: StudioConversationMessageAuthor.USER,
       message: '',
@@ -342,6 +378,93 @@ const Conversation = ({
     setConversation([]);
   }, [studioId]);
 
+  const hasCodeBlock = useMemo(() => {
+    return conversation.some(
+      (m) =>
+        m.author === StudioConversationMessageAuthor.ASSISTANT &&
+        m.message.includes('```'),
+    );
+  }, [conversation]);
+
+  const handleApplyChanges = useCallback(async () => {
+    setWaitingForDiff(true);
+    setDiffGenFailed(false);
+    try {
+      abortController.current = new AbortController();
+      const resp = await generateStudioDiff(
+        studioId,
+        abortController.current?.signal,
+      );
+      setDiff(resp);
+    } catch (err) {
+      console.log(err);
+      setDiffGenFailed(true);
+    } finally {
+      setWaitingForDiff(false);
+    }
+  }, [studioId]);
+
+  const handleCancelDiff = useCallback(() => {
+    abortController.current?.abort();
+    setWaitingForDiff(false);
+  }, []);
+
+  const handleConfirmDiff = useCallback(
+    async (e: React.MouseEvent) => {
+      e.preventDefault();
+      if (!diff) {
+        return;
+      }
+      const result = diff.chunks.map((c) => c.raw_patch).join('');
+      try {
+        await confirmStudioDiff(studioId, result);
+        setDiff(null);
+        setDiffApplied(true);
+      } catch (err: unknown) {
+        console.log(err);
+        // @ts-ignore
+        if (err.code !== 'ERR_CANCELED') {
+          setDiffApplyError(true);
+        }
+      }
+    },
+    [studioId, diff],
+  );
+
+  const onDiffChanged = useCallback((i: number, v: string) => {
+    setDiff((prev) => {
+      const newValue: GeneratedCodeDiff = JSON.parse(JSON.stringify(prev));
+      newValue.chunks[i].raw_patch = v;
+      const newHunks: DiffHunkType[] = v
+        .split(/\n(?=@@ -)/)
+        .slice(1)
+        .map((h) => {
+          const startLine = h.match(/@@ -(\d+)/)?.[1];
+          return {
+            line_start: Number(startLine),
+            patch: h.split('\n').slice(1).join('\n'),
+          };
+        });
+      newValue.chunks[i].hunks = newHunks;
+      return newValue;
+    });
+  }, []);
+
+  const onDiffRemoved = useCallback((i: number) => {
+    setDiff((prev) => {
+      const newValue: GeneratedCodeDiff = JSON.parse(JSON.stringify(prev));
+      newValue.chunks.splice(i, 1);
+      if (!newValue.chunks.length) {
+        return null;
+      }
+      return newValue;
+    });
+  }, []);
+
+  const isDiffForLocalRepo = useMemo(() => {
+    return diff?.chunks.find((c) => c.repo.startsWith('local//'));
+  }, [diff]);
+
   const handleKeyEvent = useCallback(
     (e: KeyboardEvent) => {
       if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') {
@@ -392,8 +515,43 @@ const Conversation = ({
               isLast={i === conversation.length - 1}
             />
           ))}
+          {!!diff && (
+            <GeneratedDiff
+              diff={diff}
+              setLeftPanel={setLeftPanel}
+              onDiffRemoved={onDiffRemoved}
+              onDiffChanged={onDiffChanged}
+              applyError={isDiffApplyError}
+            />
+          )}
+          {(isDiffApplied || waitingForDiff || isDiffGenFailed) && (
+            <div
+              className={`w-full flex items-center rounded-6 justify-center gap-1 py-2 ${
+                isDiffGenFailed
+                  ? 'bg-bg-danger/12 text-bg-danger'
+                  : 'bg-bg-main/12 text-label-link'
+              } caption`}
+            >
+              {isDiffGenFailed ? (
+                <WarningSign raw sizeClassName="w-3.5 h-3.5" />
+              ) : waitingForDiff ? (
+                <LiteLoaderContainer sizeClassName="w-3.5 h-3.5" />
+              ) : (
+                <BranchMerged raw sizeClassName="w-3.5 h-3.5" />
+              )}
+              <Trans>
+                {isDiffGenFailed
+                  ? 'Diff generation failed'
+                  : waitingForDiff
+                  ? 'Generating diff...'
+                  : 'The diff has been applied locally.'}
+              </Trans>
+            </div>
+          )}
           {!isLoading &&
             !isPreviewing &&
+            !waitingForDiff &&
+            !diff &&
             !(
               conversation[conversation.length - 1]?.author ===
               StudioConversationMessageAuthor.USER
@@ -412,7 +570,7 @@ const Conversation = ({
             )}
         </div>
       </div>
-      <div className="px-4 flex flex-col gap-8 pb-8 mt-auto">
+      <div className="px-1 flex flex-col gap-8 pb-8 mt-auto">
         <hr className="border-bg-border" />
         {isPreviewing ? (
           <div className="flex items-center justify-end">
@@ -451,51 +609,88 @@ const Conversation = ({
                   <KeyboardChip type="Esc" variant="danger" />
                 </Button>
               ) : (
-                <Button
-                  size="small"
-                  disabled={
-                    !inputValue ||
-                    isTokenLimitExceeded ||
-                    isChangeUnsaved ||
-                    hasContextError
-                  }
-                  title={
-                    isChangeUnsaved
-                      ? t('Save context changes before answer generation')
-                      : isTokenLimitExceeded
-                      ? t('Token limit exceeded')
-                      : hasContextError
-                      ? t('Check context files for any errors')
-                      : undefined
-                  }
-                  onClick={onSubmit}
-                >
-                  <Trans>Generate</Trans>
-                  <div className="flex items-center gap-1 flex-shrink-0">
-                    <KeyboardChip
-                      type="cmd"
-                      variant={
+                <>
+                  {(hasCodeBlock || diff) &&
+                    (isDiffApplied ? null : !diff ? (
+                      <Button
+                        size="small"
+                        variant={waitingForDiff ? 'danger' : 'secondary'}
+                        onClick={
+                          waitingForDiff ? handleCancelDiff : handleApplyChanges
+                        }
+                      >
+                        <Trans>
+                          {waitingForDiff
+                            ? 'Cancel diff generation'
+                            : 'Apply changes'}
+                        </Trans>
+                      </Button>
+                    ) : (
+                      <>
+                        <Button
+                          variant="secondary"
+                          size="small"
+                          onClick={() => setDiff(null)}
+                        >
+                          <Trans>
+                            {isDiffForLocalRepo ? 'Cancel' : 'Close'}
+                          </Trans>
+                        </Button>
+                        {isDiffForLocalRepo && (
+                          <Button size="small" onClick={handleConfirmDiff}>
+                            <Trans>Confirm</Trans>
+                          </Button>
+                        )}
+                      </>
+                    ))}
+                  {!diff && (
+                    <Button
+                      size="small"
+                      disabled={
                         !inputValue ||
                         isTokenLimitExceeded ||
                         isChangeUnsaved ||
                         hasContextError
-                          ? 'secondary'
-                          : 'primary'
                       }
-                    />
-                    <KeyboardChip
-                      type="entr"
-                      variant={
-                        !inputValue ||
-                        isTokenLimitExceeded ||
-                        isChangeUnsaved ||
-                        hasContextError
-                          ? 'secondary'
-                          : 'primary'
+                      title={
+                        isChangeUnsaved
+                          ? t('Save context changes before answer generation')
+                          : isTokenLimitExceeded
+                          ? t('Token limit exceeded')
+                          : hasContextError
+                          ? t('Check context files for any errors')
+                          : undefined
                       }
-                    />
-                  </div>
-                </Button>
+                      onClick={onSubmit}
+                    >
+                      <Trans>Generate</Trans>
+                      <div className="flex items-center gap-1 flex-shrink-0">
+                        <KeyboardChip
+                          type="cmd"
+                          variant={
+                            !inputValue ||
+                            isTokenLimitExceeded ||
+                            isChangeUnsaved ||
+                            hasContextError
+                              ? 'secondary'
+                              : 'primary'
+                          }
+                        />
+                        <KeyboardChip
+                          type="entr"
+                          variant={
+                            !inputValue ||
+                            isTokenLimitExceeded ||
+                            isChangeUnsaved ||
+                            hasContextError
+                              ? 'secondary'
+                              : 'primary'
+                          }
+                        />
+                      </div>
+                    </Button>
+                  )}
+                </>
               )}
             </div>
           </div>
diff --git a/client/src/services/api.ts b/client/src/services/api.ts
index 3960c4da5a..c664782995 100644
--- a/client/src/services/api.ts
+++ b/client/src/services/api.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosInstance } from 'axios';
+import axios, { AxiosInstance, GenericAbortSignal } from 'axios';
 import {
   AllConversationsResponse,
   CodeStudioType,
@@ -7,6 +7,7 @@ import {
   DocSectionType,
   DocShortType,
   FileResponse,
+  GeneratedCodeDiff,
   HistoryConversationTurn,
   HoverablesResponse,
   NLSearchResponse,
@@ -323,6 +324,20 @@ export const importCodeStudio = (thread_id: string, studio_id?: string) =>
   http
     .post('/studio/import', {}, { params: { thread_id, studio_id } })
     .then((r) => r.data);
+export const generateStudioDiff = (
+  id: string,
+  abortSignal?: GenericAbortSignal,
+): Promise<GeneratedCodeDiff> =>
+  http(`/studio/${id}/diff`, {
+    timeout: 10 * 60 * 1000,
+    signal: abortSignal,
+  }).then((r) => r.data);
+export const confirmStudioDiff = (id: string, diff: string): Promise<void> =>
+  http
+    .post(`/studio/${id}/diff/apply`, diff, {
+      headers: { 'Content-Type': 'text/plain' },
+    })
+    .then((r) => r.data);
 
 export const getFileTokenCount = (
   path: string,
diff --git a/client/src/types/api.ts b/client/src/types/api.ts
index 9e562a79f7..25d742acc6 100644
--- a/client/src/types/api.ts
+++ b/client/src/types/api.ts
@@ -1,5 +1,10 @@
 import { SymbolType, Range, TokenInfoType } from './results';
-import { StudioContextDoc, StudioContextFile } from './general';
+import {
+  DiffChunkType,
+  DiffHunkType,
+  StudioContextDoc,
+  StudioContextFile,
+} from './general';
 
 export interface RangeLine {
   byte: number;
@@ -346,3 +351,7 @@ export type DocSectionType = {
   section_range: { start: number; end: number };
   text: string;
 };
+
+export type GeneratedCodeDiff = {
+  chunks: DiffChunkType[];
+};
diff --git a/client/src/types/general.ts b/client/src/types/general.ts
index 664f03371a..0e9c9b1abf 100644
--- a/client/src/types/general.ts
+++ b/client/src/types/general.ts
@@ -358,10 +358,25 @@ export type StudioConversationMessage = {
   error?: string;
 };
 
+export type DiffChunkType = {
+  file: string;
+  lang: string;
+  repo: string;
+  branch: string | null;
+  hunks: DiffHunkType[];
+  raw_patch: string;
+};
+
+export type DiffHunkType = {
+  line_start: number;
+  patch: string;
+};
+
 export enum StudioLeftPanelType {
   CONTEXT = 'context',
   TEMPLATES = 'templates',
   FILE = 'file',
+  DIFF = 'diff',
   DOCS = 'docs',
 }
 
@@ -393,13 +408,24 @@ export type DocsStudioPanelType = {
   };
 };
 
+export type DiffPanelType = {
+  type: StudioLeftPanelType.DIFF;
+  data: {
+    repo: RepoType;
+    branch: string | null;
+    filePath: string;
+    hunks: DiffHunkType[];
+  };
+};
+
 export type StudioLeftPanelDataType =
   | {
       type: StudioLeftPanelType.CONTEXT | StudioLeftPanelType.TEMPLATES;
       data?: null;
     }
   | FileStudioPanelType
-  | DocsStudioPanelType;
+  | DocsStudioPanelType
+  | DiffPanelType;
 
 export type StudioRightPanelDataType = {
   type: StudioRightPanelType.CONVERSATION;
diff --git a/client/src/utils/prism.ts b/client/src/utils/prism.ts
index 7edb059a78..84d81e2735 100644
--- a/client/src/utils/prism.ts
+++ b/client/src/utils/prism.ts
@@ -36,6 +36,7 @@ import 'prismjs/components/prism-less.min';
 import 'prismjs/components/prism-scala.min';
 import 'prismjs/components/prism-julia.min';
 import 'prismjs/components/prism-docker.min';
+import 'prismjs/components/prism-diff.min';
 import type { Token } from '../types/prism';
 
 const newlineRe = /\r\n|\r|\n/;
diff --git a/client/tailwind.config.cjs b/client/tailwind.config.cjs
index b2e682b244..4dda9dd35f 100644
--- a/client/tailwind.config.cjs
+++ b/client/tailwind.config.cjs
@@ -16,6 +16,7 @@ module.exports = {
         "bg-border-hover": "rgb(var(--bg-border-hover))",
         "bg-main": "rgb(var(--bg-main))",
         "bg-main/8": "rgba(var(--bg-main), 0.08)",
+        "bg-main/12": "rgba(var(--bg-main), 0.12)",
         "bg-main/15": "rgba(var(--bg-main), 0.15)",
         "bg-main/30": "rgba(var(--bg-main), 0.3)",
         "bg-main-hover": "rgb(var(--bg-main-hover))",
diff --git a/server/bleep/Cargo.toml b/server/bleep/Cargo.toml
index 274bd06d2d..177af3de24 100644
--- a/server/bleep/Cargo.toml
+++ b/server/bleep/Cargo.toml
@@ -157,6 +157,7 @@ relative-path = "1.9.0"
 semver = { version = "1", features = ["serde"] }
 scc = { version= "1.9.1", features = ["serde"] }
 thread-priority = "0.13.1"
+diffy = "0.3.0"
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["async_tokio"] }
diff --git a/server/bleep/sqlx-data.json b/server/bleep/sqlx-data.json
index fe1555a378..ab2885957b 100644
--- a/server/bleep/sqlx-data.json
+++ b/server/bleep/sqlx-data.json
@@ -572,6 +572,30 @@
     },
     "query": "DELETE FROM studio_snapshots\n        WHERE id IN (\n            SELECT ss.id\n            FROM studio_snapshots ss\n            JOIN studios s ON s.id = ss.studio_id AND s.user_id = ?\n            WHERE ss.id = ? AND ss.studio_id = ?\n        )\n        RETURNING id"
   },
+  "671df14b7c9077b95e586690f8c6d3f2eeb0a3942d0b800f272b010fcd2ca97b": {
+    "describe": {
+      "columns": [
+        {
+          "name": "messages",
+          "ordinal": 0,
+          "type_info": "Text"
+        },
+        {
+          "name": "context",
+          "ordinal": 1,
+          "type_info": "Text"
+        }
+      ],
+      "nullable": [
+        false,
+        false
+      ],
+      "parameters": {
+        "Right": 1
+      }
+    },
+    "query": "SELECT messages, context FROM studio_snapshots WHERE id = ?"
+  },
   "69c8b59ce4be3fc6edb58563bf69f55ea5dca4646b0ba05820e5d1b2b07c3c82": {
     "describe": {
       "columns": [
diff --git a/server/bleep/src/agent/prompts.rs b/server/bleep/src/agent/prompts.rs
index 5d3a9d8199..ddc8dd1fed 100644
--- a/server/bleep/src/agent/prompts.rs
+++ b/server/bleep/src/agent/prompts.rs
@@ -298,6 +298,94 @@ And here is the serialized conversation:
     )
 }
 
+pub fn studio_diff_prompt(context_formatted: &str) -> String {
+    format!(
+        r#"Below are files from a codebase. Your job is to write a Unified Format patch to complete a provided task. To write a unified format patch, surround it in a code block: ```diff
+
+Follow these rules strictly:
+- You MUST only return a single diff block, no additional commentary.
+- Keep hunks concise only include a short context for each hunk. 
+- ALWAYS respect input whitespace, to ensure diffs can be applied cleanly!
+- Only generate diffs that can be applied by `patch`! NO extra information like `git` commands
+- To add a new file, set the input file as /dev/null
+- To remove an existing file, set the output file to /dev/null
+
+# Example outputs
+
+```diff
+--- src/index.js
++++ src/index.js
+@@ -10,5 +10,5 @@
+ const maybeHello = () => {{
+     if (Math.random() > 0.5) {{
+-        console.log("hello world!")
++        console.log("hello?")
+     }}
+ }}
+```
+
+```diff
+--- README.md
++++ README.md
+@@ -1,3 +1,3 @@
+ # Bloop AI
+ 
+-bloop is ChatGPT for your code. Ask questions in natural language, search for code and generate patches using your existing codebase as context.
++bloop is ChatGPT for your code. Ask questions in natural language, search for code and generate patches using your existing code base as context.
+```
+
+```diff
+--- client/src/locales/en.json
++++ client/src/locales/en.json
+@@ -21,5 +21,5 @@
+ 	"Report a bug": "Report a bug",
+ 	"Sign In": "Sign In",
+-	"Sign in with GitHub": "Sign in with GitHub",
++	"Sign in via GitHub": "Sign in via GitHub",
+ 	"Status": "Status",
+ 	"Submit bug report": "Submit bug report",
+```
+
+Adding a new file:
+
+```diff
+--- /dev/null
++++ src/sum.rs
+@@ -0,0 +1,3 @@
++fn sum(a: f32, b: f32) -> f32 {{
++    a + b
++}}
+```
+
+Removing an existing file:
+
+```diff
+--- src/div.rs
++++ /dev/null
+@@ -1,3 +0,0 @@
+-fn div(a: f32, b: f32) -> f32 {{
+-    a / b
+-}}
+```
+
+#####
+
+{context_formatted}"#
+    )
+}
+
+pub fn studio_diff_regen_hunk_prompt(context_formatted: &str) -> String {
+    format!(
+        r#"The provided diff contains no context lines. Output a new hunk with the correct 3 context lines.
+
+Here is the full context for reference:
+
+#####
+
+{context_formatted}"#
+    )
+}
+
 pub fn hypothetical_document_prompt(query: &str) -> String {
     format!(
         r#"Write a code snippet that could hypothetically be returned by a code search engine as the answer to the query: {query}
diff --git a/server/bleep/src/webserver.rs b/server/bleep/src/webserver.rs
index dc6f470668..3d331895d6 100644
--- a/server/bleep/src/webserver.rs
+++ b/server/bleep/src/webserver.rs
@@ -104,6 +104,8 @@ pub async fn start(app: Application) -> anyhow::Result<()> {
         )
         .route("/studio/import", post(studio::import))
         .route("/studio/:studio_id/generate", get(studio::generate))
+        .route("/studio/:studio_id/diff", get(studio::diff))
+        .route("/studio/:studio_id/diff/apply", post(studio::diff_apply))
         .route("/studio/:studio_id/snapshots", get(studio::list_snapshots))
         .route(
             "/studio/:studio_id/snapshots/:snapshot_id",
diff --git a/server/bleep/src/webserver/repos.rs b/server/bleep/src/webserver/repos.rs
index 771502d6b4..b24e0a844f 100644
--- a/server/bleep/src/webserver/repos.rs
+++ b/server/bleep/src/webserver/repos.rs
@@ -320,7 +320,7 @@ pub(super) async fn delete_by_id(
 /// Synchronize a repo by its id
 pub(super) async fn sync(
     Query(RepoParams { repo }): Query<RepoParams>,
-    State(app): State<Application>,
+    Extension(app): Extension<Application>,
     Extension(user): Extension<User>,
 ) -> Result<impl IntoResponse> {
     // TODO: We can refactor `repo_pool` to also hold queued repos, instead of doing a calculation
diff --git a/server/bleep/src/webserver/studio.rs b/server/bleep/src/webserver/studio.rs
index 8352764af9..e20465482d 100644
--- a/server/bleep/src/webserver/studio.rs
+++ b/server/bleep/src/webserver/studio.rs
@@ -16,9 +16,11 @@ use chrono::NaiveDateTime;
 use futures::{pin_mut, stream, StreamExt, TryStreamExt};
 use rayon::prelude::*;
 use reqwest::StatusCode;
-use tracing::{debug, error};
+use tracing::{debug, error, warn};
 use uuid::Uuid;
 
+use self::diff::{DiffChunk, DiffHunk};
+
 use super::{middleware::User, Error};
 use crate::{
     agent::{exchange::Exchange, prompts},
@@ -28,6 +30,8 @@ use crate::{
     webserver, Application,
 };
 
+mod diff;
+
 const LLM_GATEWAY_MODEL: &str = "gpt-4-0613";
 
 fn no_user_id() -> Error {
@@ -866,6 +870,477 @@ async fn generate_llm_context(
     Ok(s)
 }
 
+/// A set of structured diff definitions consumed by the front-end.
+mod structured_diff {
+    use std::fmt;
+
+    use crate::repo::RepoRef;
+
+    #[derive(serde::Serialize, serde::Deserialize)]
+    pub struct Diff {
+        pub chunks: Vec<Chunk>,
+    }
+
+    impl fmt::Display for Diff {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            use std::fmt::Write;
+
+            let mut s = String::new();
+
+            for c in &self.chunks {
+                writeln!(s, "--- {}\n+++ {}", c.file, c.file)?;
+
+                for h in &c.hunks {
+                    writeln!(s, "@@ -{},0 +{},0 @@", h.line_start, h.line_start)?;
+                    write!(s, "{}", h.patch)?;
+                }
+            }
+
+            for c in super::diff::relaxed_parse(&s) {
+                write!(f, "{}", c)?;
+            }
+
+            Ok(())
+        }
+    }
+
+    #[derive(serde::Serialize, serde::Deserialize)]
+    pub struct Chunk {
+        pub file: String,
+        pub repo: RepoRef,
+        pub branch: Option<String>,
+        pub lang: Option<String>,
+        pub hunks: Vec<Hunk>,
+
+        /// This field is additionally included for simplicity on the front-end.
+        pub raw_patch: String,
+    }
+
+    #[derive(serde::Serialize, serde::Deserialize)]
+    pub struct Hunk {
+        pub line_start: usize,
+        pub patch: String,
+    }
+}
+
+pub async fn diff(
+    app: Extension<Application>,
+    user: Extension<User>,
+    Path(studio_id): Path<i64>,
+) -> webserver::Result<Json<structured_diff::Diff>> {
+    let user_id = user.username().ok_or_else(no_user_id)?.to_string();
+
+    let snapshot_id = latest_snapshot_id(studio_id, &*app.sql, &user_id).await?;
+
+    let llm_gateway = user
+        .llm_gateway(&app)
+        .await
+        .map_err(|e| Error::user(e).with_status(StatusCode::UNAUTHORIZED))?
+        .quota_gated(!app.env.is_cloud_instance())
+        .model(LLM_GATEWAY_MODEL)
+        .temperature(0.0);
+
+    let (messages_json, context_json) = sqlx::query!(
+        "SELECT messages, context FROM studio_snapshots WHERE id = ?",
+        snapshot_id,
+    )
+    .fetch_optional(&*app.sql)
+    .await?
+    .map(|row| (row.messages, row.context))
+    .ok_or_else(studio_not_found)?;
+
+    let messages = serde_json::from_str::<Vec<Message>>(&messages_json).map_err(Error::internal)?;
+
+    let context =
+        serde_json::from_str::<Vec<ContextFile>>(&context_json).map_err(Error::internal)?;
+
+    let user_message = messages
+        .iter()
+        .rev()
+        .find_map(|msg| match msg {
+            Message::User(m) => Some(m),
+            Message::Assistant(..) => None,
+        })
+        .context("studio did not contain a user message")?;
+
+    let assistant_message = messages
+        .iter()
+        .rev()
+        .find_map(|msg| match msg {
+            Message::User(..) => None,
+            Message::Assistant(m) => Some(m),
+        })
+        .context("studio did not contain an assistant message")?;
+
+    app.track_studio(
+        &user,
+        StudioEvent::new(studio_id, "diff")
+            .with_payload("context", &context)
+            .with_payload("user_message", &user_message)
+            .with_payload("assistant_message", &assistant_message),
+    );
+
+    let llm_context = generate_llm_context((*app).clone(), &context, &[]).await?;
+
+    let system_prompt = prompts::studio_diff_prompt(&llm_context);
+    let user_message = format!("Create a patch for the task \"{user_message}\".\n\n\nHere is the solution:\n\n{assistant_message}");
+
+    let messages = vec![
+        llm_gateway::api::Message::system(&system_prompt),
+        llm_gateway::api::Message::user(&user_message),
+    ];
+
+    let response = llm_gateway.chat(&messages, None).await?;
+    let diff_chunks = diff::extract(&response)?.collect::<Vec<_>>();
+
+    let (repo, branch) = context
+        .first()
+        .map(|cf| (cf.repo.clone(), cf.branch.clone()))
+        // We make a hard assumption in the design of diffs that a studio can only contain files
+        // from one repository. This allows us to determine which repository to create new files
+        // or delete files in, without having to prefix file paths with repository names.
+        //
+        // If we can't find *any* files in the context to detect the current repository,
+        // creating/deleting a file like `index.js` is ambiguous, so we just return an error.
+        .context("could not determine studio repository, studio didn't contain any files")?;
+
+    let valid_chunks = futures::stream::iter(diff_chunks)
+        .map(|mut chunk| {
+            let (repo, branch) = (repo.clone(), branch.clone());
+            let app = (*app).clone();
+            let llm_context = llm_context.clone();
+            let llm_gateway = llm_gateway.clone();
+
+            async move {
+                match (&chunk.src, &chunk.dst) {
+                    (Some(src), Some(dst)) => {
+                        if src != dst {
+                            error!(
+                                "patch source and destination file were different: \
+                                got `{src}` and `{dst}`"
+                            );
+
+                            return Ok(None);
+                        }
+
+                        chunk.hunks = rectify_hunks(
+                            &app,
+                            &llm_context,
+                            &llm_gateway,
+                            chunk.hunks.iter(),
+                            src,
+                            &repo,
+                            branch.as_deref(),
+                        )
+                        .await?;
+
+                        Ok(Some(chunk))
+                    }
+
+                    (Some(src), None) => {
+                        if validate_delete_file(&app, src, &repo, branch.as_deref()).await? {
+                            Ok(Some(chunk))
+                        } else {
+                            Ok(None)
+                        }
+                    }
+
+                    (None, Some(dst)) => {
+                        if validate_add_file(&app, &chunk, dst, &repo, branch.as_deref()).await? {
+                            Ok(Some(chunk))
+                        } else {
+                            Ok(None)
+                        }
+                    }
+
+                    (None, None) => {
+                        error!("patch chunk had no file source or destination");
+                        Ok(None)
+                    }
+                }
+            }
+        })
+        .buffered(10)
+        .try_filter_map(|c: Option<_>| async move { Ok::<_, anyhow::Error>(c) })
+        .try_collect::<Vec<_>>()
+        .await
+        .context("failed to interpret diff chunks")?;
+
+    let mut file_langs = HashMap::<String, String>::new();
+    let mut out = structured_diff::Diff { chunks: vec![] };
+
+    for chunk in valid_chunks {
+        let path = chunk.src.as_deref().or(chunk.dst.as_deref()).unwrap();
+        let lang = if let Some(l) = file_langs.get(path) {
+            Some(l.clone())
+        } else {
+            let detected_lang = if let Some(src) = &chunk.src {
+                let doc = app
+                    .indexes
+                    .file
+                    .by_path(&repo, src, branch.as_deref())
+                    .await?
+                    .context("path did not exist in the index")?;
+
+                doc.lang
+            } else {
+                hyperpolyglot::detect(std::path::Path::new(&chunk.dst.as_deref().unwrap()))
+                    .ok()
+                    .flatten()
+                    .map(|detection| detection.language().to_owned())
+            };
+
+            if let Some(l) = detected_lang.clone() {
+                file_langs.insert(path.to_owned(), l);
+            }
+
+            detected_lang
+        };
+
+        out.chunks.push(structured_diff::Chunk {
+            raw_patch: chunk.to_string(),
+
+            lang: lang.clone(),
+            repo: repo.clone(),
+            branch: branch.clone(),
+            file: path.to_owned(),
+            hunks: chunk
+                .hunks
+                .into_iter()
+                .map(|hunk| structured_diff::Hunk {
+                    line_start: hunk.src_line,
+                    patch: hunk
+                        .lines
+                        .into_iter()
+                        .map(|line| line.to_string())
+                        .collect::<String>(),
+                })
+                .collect(),
+        });
+    }
+
+    Ok(Json(out))
+}
+
+fn context_repo_branch(context: &[ContextFile]) -> Result<(RepoRef, Option<String>)> {
+    let (repo, branch) = context
+        .first()
+        .map(|cf| (cf.repo.clone(), cf.branch.clone()))
+        // We make a hard assumption in the design of diffs that a studio can only contain files
+        // from one repository. This allows us to determine which repository to create new files
+        // or delete files in, without having to prefix file paths with repository names.
+        //
+        // If we can't find *any* files in the context to detect the current repository,
+        // creating/deleting a file like `index.js` is ambiguous, so we just return an error.
+        .context("could not determine studio repository, studio didn't contain any files")?;
+
+    Ok((repo, branch))
+}
+
+async fn rectify_hunks(
+    app: &Application,
+    llm_context: &str,
+    llm_gateway: &llm_gateway::Client,
+    hunks: impl Iterator<Item = &DiffHunk>,
+    path: &str,
+    repo: &RepoRef,
+    branch: Option<&str>,
+) -> Result<Vec<DiffHunk>> {
+    let file = app
+        .indexes
+        .file
+        .by_path(repo, path, branch)
+        .await?
+        .context("path did not exist in the index")?;
+
+    let mut file_content = file.content;
+
+    let mut out = Vec::new();
+
+    for (i, hunk) in hunks.enumerate() {
+        let mut singular_chunk = DiffChunk {
+            src: Some(path.to_owned()),
+            dst: Some(path.to_owned()),
+            hunks: vec![hunk.clone()],
+        };
+
+        let diff = singular_chunk.to_string();
+        let patch = diffy::Patch::from_str(&diff).context("invalid patch")?;
+
+        if let Ok(t) = diffy::apply(&file_content, &patch) {
+            file_content = t;
+            out.extend(singular_chunk.hunks);
+        } else {
+            debug!("fixing up patch:\n\n{hunk:?}\n\n{diff}");
+
+            singular_chunk.hunks[0].lines.retain(|line| match line {
+                diff::Line::AddLine(..) | diff::Line::DelLine(..) => true,
+                diff::Line::Context(..) => false,
+            });
+            singular_chunk.fixup_hunks();
+
+            let diff = if singular_chunk.hunks[0]
+                .lines
+                .iter()
+                .all(|l| matches!(l, diff::Line::AddLine(..)))
+            {
+                let system_prompt = prompts::studio_diff_regen_hunk_prompt(llm_context);
+                let messages = vec![
+                    llm_gateway::api::Message::system(&system_prompt),
+                    llm_gateway::api::Message::user(&singular_chunk.to_string()),
+                ];
+                llm_gateway.chat(&messages, None).await?
+            } else {
+                singular_chunk.to_string()
+            };
+
+            let patch = diffy::Patch::from_str(&diff).context("redacted patch was invalid")?;
+
+            if let Ok(t) = diffy::apply(&file_content, &patch) {
+                file_content = t;
+                out.extend(singular_chunk.hunks);
+            } else {
+                warn!("hunk {path}#{i} failed: {diff}");
+            }
+        }
+    }
+
+    Ok(out)
+}
+
+async fn validate_delete_file(
+    app: &Application,
+    path: &str,
+    repo: &RepoRef,
+    branch: Option<&str>,
+) -> Result<bool> {
+    if app
+        .indexes
+        .file
+        .by_path(repo, path, branch)
+        .await?
+        .is_none()
+    {
+        error!("diff tried to delete a file that doesn't exist: {path}");
+        Ok(false)
+    } else {
+        Ok(true)
+    }
+}
+
+async fn validate_add_file(
+    app: &Application,
+    chunk: &DiffChunk,
+    path: &str,
+    repo: &RepoRef,
+    branch: Option<&str>,
+) -> Result<bool> {
+    if app
+        .indexes
+        .file
+        .by_path(repo, path, branch)
+        .await?
+        .is_some()
+    {
+        error!("diff tried to create a file that already exists: {path}");
+        return Ok(false);
+    };
+
+    if chunk.hunks.iter().any(|h| {
+        h.lines
+            .iter()
+            .any(|l| !matches!(l, diff::Line::AddLine(..)))
+    }) {
+        error!("diff to create a new file had non-addition lines");
+        Ok(false)
+    } else {
+        Ok(true)
+    }
+}
+
+pub async fn diff_apply(
+    app: Extension<Application>,
+    user: Extension<User>,
+    Path(studio_id): Path<i64>,
+    diff: String,
+) -> webserver::Result<()> {
+    let user_id = user.username().ok_or_else(no_user_id)?.to_string();
+
+    let snapshot_id = latest_snapshot_id(studio_id, &*app.sql, &user_id).await?;
+
+    let context_json = sqlx::query!(
+        "SELECT context FROM studio_snapshots WHERE id = ?",
+        snapshot_id,
+    )
+    .fetch_optional(&*app.sql)
+    .await?
+    .map(|row| row.context)
+    .ok_or_else(studio_not_found)?;
+
+    let context =
+        serde_json::from_str::<Vec<ContextFile>>(&context_json).map_err(Error::internal)?;
+
+    let diff_chunks = diff::relaxed_parse(&diff);
+
+    let (repo, branch) = context_repo_branch(&context)?;
+
+    for (i, chunk) in diff_chunks.enumerate() {
+        let mut file_content = if let Some(src) = &chunk.src {
+            app.indexes
+                .file
+                .by_path(&repo, src, branch.as_deref())
+                .await?
+                .context("path did not exist in the index")?
+                .content
+        } else {
+            String::new()
+        };
+
+        for (j, hunk) in chunk.hunks.iter().enumerate() {
+            let mut singular_chunk = chunk.clone();
+            singular_chunk.hunks = vec![hunk.clone()];
+
+            let diff = singular_chunk.to_string();
+            let patch = diffy::Patch::from_str(&diff).context("invalid patch")?;
+
+            match diffy::apply(&file_content, &patch) {
+                Ok(t) => file_content = t,
+                Err(e) => {
+                    return Err(
+                        Error::user(format!("chunk {i}, hunk {j} failed to apply: {e}"))
+                            .with_status(StatusCode::BAD_REQUEST),
+                    )
+                }
+            }
+        }
+
+        let Some(repo_path) = repo.local_path() else {
+            error!("cannot apply patch to remote repo");
+            continue;
+        };
+
+        if let Some(dst) = &chunk.dst {
+            let file_path = repo_path.join(dst);
+            std::fs::write(file_path, file_content).context("failed to patch file on disk")?;
+        } else {
+            if !file_content.trim().is_empty() {
+                return Err(Error::user(
+                    "diff deletes a file but not all contents were removed",
+                ));
+            }
+
+            let file_path = repo_path.join(chunk.src.clone().unwrap());
+            std::fs::remove_file(file_path).context("failed to delete file on disk")?;
+        }
+    }
+
+    // Force a re-sync.
+    let _ = crate::webserver::repos::sync(Query(webserver::repos::RepoParams { repo }), app, user)
+        .await?;
+
+    Ok(())
+}
+
 /// If a given studio's name is `NULL`, try to auto-generate a name.
 ///
 /// If the requested studio already has a name, this is a no-op.
@@ -1107,9 +1582,9 @@ fn canonicalize_context(
     context: impl Iterator<Item = ContextFile>,
 ) -> impl Iterator<Item = ContextFile> {
     context
-        .fold(HashMap::new(), |mut map, file| {
+        .fold(HashMap::<_, Vec<_>>::new(), |mut map, file| {
             let key = (file.path.clone(), file.branch.clone());
-            map.entry(key).or_insert_with(Vec::new).push(file);
+            map.entry(key).or_default().push(file);
             map
         })
         .into_values()
diff --git a/server/bleep/src/webserver/studio/diff.rs b/server/bleep/src/webserver/studio/diff.rs
new file mode 100644
index 0000000000..6789393ef6
--- /dev/null
+++ b/server/bleep/src/webserver/studio/diff.rs
@@ -0,0 +1,733 @@
+use std::fmt;
+
+use anyhow::{bail, Result};
+use lazy_regex::regex;
+
+pub fn extract(chat_response: &str) -> Result<impl Iterator<Item = DiffChunk>> {
+    Ok(relaxed_parse(&extract_diff(chat_response)?)
+        // We eagerly collect the iterator, and re-create it, as our input string is created in and
+        // can't escape this function. This also allows us to catch parse errors earlier.
+        .collect::<Vec<_>>()
+        .into_iter())
+}
+
+fn extract_diff(chat_response: &str) -> Result<String> {
+    let fragments = regex!(r#"^```diff.*?^(.*?)^```.*?($|\z)"#sm)
+        .captures_iter(chat_response)
+        .map(|c| c.get(1).unwrap().as_str())
+        .collect::<String>();
+
+    if fragments.is_empty() {
+        bail!("chat response didn't contain any diff blocks");
+    } else {
+        Ok(fragments)
+    }
+}
+
+/// Parse a diff, allowing for some formatting errors.
+pub fn relaxed_parse(diff: &str) -> impl Iterator<Item = DiffChunk> + '_ {
+    split_chunks(diff).map(|mut chunk| {
+        chunk.fixup_hunks();
+        chunk
+    })
+}
+
+fn split_chunks(diff: &str) -> impl Iterator<Item = DiffChunk> + '_ {
+    let chunk_regex = regex!(r#"(?: (.*)$\n^\+\+\+ (.*)$)\n((?:^$\n?|^[-+@ ].*\n?)+)"#m);
+
+    regex!("^---"m).split(diff).filter_map(|chunk| {
+        let caps = chunk_regex.captures(chunk)?;
+        Some(DiffChunk {
+            src: match caps.get(1).unwrap().as_str() {
+                "/dev/null" => None,
+                s => Some(s.to_owned()),
+            },
+            dst: match caps.get(2).unwrap().as_str() {
+                "/dev/null" => None,
+                s => Some(s.to_owned()),
+            },
+            hunks: split_hunks(caps.get(3).unwrap().as_str()).collect(),
+        })
+    })
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct DiffChunk {
+    pub src: Option<String>,
+    pub dst: Option<String>,
+    pub hunks: Vec<DiffHunk>,
+}
+
+impl DiffChunk {
+    pub fn fixup_hunks(&mut self) {
+        self.hunks.retain_mut(|h| {
+            if !h.fixup() {
+                false
+            } else {
+                h.lines.iter().any(|l| !matches!(l, Line::Context(_)))
+            }
+        });
+    }
+}
+
+impl fmt::Display for DiffChunk {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let hunks_str = self.hunks.iter().map(|h| h.to_string()).collect::<String>();
+
+        let src = if let Some(s) = self.src.as_deref() {
+            s
+        } else {
+            "/dev/null"
+        };
+
+        let dst = if let Some(s) = self.dst.as_deref() {
+            s
+        } else {
+            "/dev/null"
+        };
+
+        write!(f, "--- {src}\n+++ {dst}\n{hunks_str}")
+    }
+}
+
+fn split_hunks(hunks: &str) -> impl Iterator<Item = DiffHunk> + '_ {
+    let hunk_regex =
+        regex!(r#"@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@.*\n((?:^\n|^[-+ ].*\n?)*)"#m);
+
+    hunk_regex.captures_iter(hunks).map(|caps| DiffHunk {
+        src_line: caps.get(1).unwrap().as_str().parse().unwrap(),
+        src_count: caps
+            .get(2)
+            .and_then(|m| m.as_str().parse().ok())
+            .unwrap_or(0),
+        dst_line: caps.get(3).unwrap().as_str().parse().unwrap(),
+        dst_count: caps
+            .get(4)
+            .and_then(|m| m.as_str().parse().ok())
+            .unwrap_or(0),
+        lines: {
+            caps.get(5)
+                .unwrap()
+                .as_str()
+                .lines()
+                .map(|l| {
+                    if !l.is_empty() {
+                        l.split_at(1)
+                    } else {
+                        (" ", "")
+                    }
+                })
+                .map(|(type_, line)| match type_ {
+                    " " => Line::Context(line.into()),
+                    "+" => Line::AddLine(line.into()),
+                    "-" => Line::DelLine(line.into()),
+                    _ => unreachable!("unknown character slipped through regex"),
+                })
+                .collect()
+        },
+    })
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct DiffHunk {
+    pub src_line: usize,
+    pub dst_line: usize,
+    pub src_count: usize,
+    pub dst_count: usize,
+
+    pub lines: Vec<Line>,
+}
+
+impl DiffHunk {
+    fn fixup(&mut self) -> bool {
+        let src = self
+            .lines
+            .iter()
+            .filter_map(|line| match line {
+                Line::Context(l) => Some(format!("{l}\n")),
+                Line::AddLine(_) => None,
+                Line::DelLine(l) => Some(format!("{l}\n")),
+            })
+            .collect::<String>();
+
+        let dst = self
+            .lines
+            .iter()
+            .filter_map(|line| match line {
+                Line::Context(l) => Some(format!("{l}\n")),
+                Line::AddLine(l) => Some(format!("{l}\n")),
+                Line::DelLine(_) => None,
+            })
+            .collect::<String>();
+
+        let patch = diffy::DiffOptions::default()
+            .set_context_len(usize::MAX)
+            .create_patch(&src, &dst);
+        let patch = patch.to_string();
+
+        let mut new_hunks = split_hunks(&patch).collect::<Vec<_>>();
+
+        if new_hunks.is_empty() {
+            return false;
+        }
+
+        assert_eq!(
+            new_hunks.len(),
+            1,
+            "regenerated hunk's patch was malformed:\n\n{patch}"
+        );
+        self.lines = new_hunks.pop().unwrap().lines.into_iter().collect();
+
+        self.src_count = self
+            .lines
+            .iter()
+            .map(|l| match l {
+                Line::Context(_) | Line::DelLine(_) => 1,
+                Line::AddLine(_) => 0,
+            })
+            .sum();
+
+        self.dst_count = self
+            .lines
+            .iter()
+            .map(|l| match l {
+                Line::Context(_) | Line::AddLine(_) => 1,
+                Line::DelLine(_) => 0,
+            })
+            .sum();
+
+        true
+    }
+}
+
+impl fmt::Display for DiffHunk {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(
+            f,
+            "@@ -{},{} +{},{} @@",
+            self.src_line, self.src_count, self.dst_line, self.dst_count
+        )?;
+
+        for line in &self.lines {
+            <Line as fmt::Display>::fmt(line, f)?;
+        }
+
+        Ok(())
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum Line {
+    Context(String),
+    AddLine(String),
+    DelLine(String),
+}
+
+impl fmt::Display for Line {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Line::Context(line) => writeln!(f, " {line}"),
+            Line::AddLine(line) => writeln!(f, "+{line}"),
+            Line::DelLine(line) => writeln!(f, "-{line}"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    fn test_extract_diff() {
+        let s = "```diff
+foo bar
+```";
+
+        assert_eq!(extract_diff(s).unwrap(), "foo bar\n");
+    }
+
+    #[test]
+    fn test_extract_diff_complex() {
+        let s = "```diff
+x
+
+    ```diff
+foo bar
+ ```
+```";
+
+        assert_eq!(
+            extract_diff(s).unwrap(),
+            "x\n\n    ```diff\nfoo bar\n ```\n"
+        );
+    }
+
+    #[test]
+    fn test_relaxed_parse() {
+        let s = "\
+--- foo.rs
++++ foo.rs
+@@ -1,1 +1,1 @@
+-foo
++bar
+@@ -10,1 +10,1 @@
+ quux
+ quux2
++quux3
+ quux4
+--- bar.rs
++++ bar.rs
+@@ -10 +10 @@
+-bar
++fred
+@@ -100,1 +100,1 @@
+ baz
+-bar
++thud
+ baz
++thud
+ baz";
+
+        let expected = "\
+--- foo.rs
++++ foo.rs
+@@ -1,1 +1,1 @@
+-foo
++bar
+@@ -10,3 +10,4 @@
+ quux
+ quux2
++quux3
+ quux4
+--- bar.rs
++++ bar.rs
+@@ -10,1 +10,1 @@
+-bar
++fred
+@@ -100,4 +100,5 @@
+ baz
+-bar
++thud
+ baz
++thud
+ baz
+";
+        let output = relaxed_parse(s)
+            .map(|chunk| chunk.to_string())
+            .collect::<String>();
+        assert_eq!(expected, output);
+    }
+
+    #[test]
+    fn test_split_hunks() {
+        let hunks = "@@ -1,1 +1,1 @@
+ context
+ the line right below this one is intentionally empty
+
+-foo
++bar
+@@ -10,1 +10,2 @@
+-bar
++quux
++quux2";
+
+        let expected = vec![
+            DiffHunk {
+                src_line: 1,
+                src_count: 1,
+                dst_line: 1,
+                dst_count: 1,
+                lines: vec![
+                    Line::Context("context".to_owned()),
+                    Line::Context(
+                        "the line right below this one is intentionally empty".to_owned(),
+                    ),
+                    Line::Context("".to_owned()),
+                    Line::DelLine("foo".to_owned()),
+                    Line::AddLine("bar".to_owned()),
+                ],
+            },
+            DiffHunk {
+                src_line: 10,
+                src_count: 1,
+                dst_line: 10,
+                dst_count: 2,
+                lines: vec![
+                    Line::DelLine("bar".to_owned()),
+                    Line::AddLine("quux".to_owned()),
+                    Line::AddLine("quux2".to_owned()),
+                ],
+            },
+        ];
+
+        let output = split_hunks(hunks).collect::<Vec<_>>();
+
+        assert_eq!(expected, output);
+    }
+
+    #[test]
+    fn test_split_chunks() {
+        let diff = "    A simple diff description.
+
+--- foo.rs
++++ foo.rs
+@@ -1,1 +1,1 @@
+ context
+ the line right below this one is intentionally empty
+
+-foo
++bar
+--- bar.rs
++++ bar.rs
+@@ -10,1 +10,2 @@
+-bar
++quux
++quux2";
+
+        let expected = vec![
+            DiffChunk {
+                src: Some("foo.rs".to_owned()),
+                dst: Some("foo.rs".to_owned()),
+                hunks: vec![DiffHunk {
+                    src_line: 1,
+                    src_count: 1,
+                    dst_line: 1,
+                    dst_count: 1,
+                    lines: vec![
+                        Line::Context("context".to_owned()),
+                        Line::Context(
+                            "the line right below this one is intentionally empty".to_owned(),
+                        ),
+                        Line::Context("".to_owned()),
+                        Line::DelLine("foo".to_owned()),
+                        Line::AddLine("bar".to_owned()),
+                    ],
+                }],
+            },
+            DiffChunk {
+                src: Some("bar.rs".to_owned()),
+                dst: Some("bar.rs".to_owned()),
+                hunks: vec![DiffHunk {
+                    src_line: 10,
+                    src_count: 1,
+                    dst_line: 10,
+                    dst_count: 2,
+                    lines: vec![
+                        Line::DelLine("bar".to_owned()),
+                        Line::AddLine("quux".to_owned()),
+                        Line::AddLine("quux2".to_owned()),
+                    ],
+                }],
+            },
+        ];
+
+        let output = split_chunks(diff).collect::<Vec<_>>();
+
+        assert_eq!(expected, output);
+    }
+
+    #[test]
+    fn test_bug_split() {
+        let chat_response = r#"```diff
+--- server/bleep/src/analytics.rs
++++ server/bleep/src/analytics.rs
+@@ -215,6 +215,22 @@ impl RudderHub {
+             }));
+         }
+     }
++    
++    pub fn track_index_repo(&self, user: &crate::webserver::middleware::User, repo_ref: RepoRef) {
++        if let Some(options) = &self.options {
++            self.send(Message::Track(Track {
++                user_id: Some(self.tracking_id(user.username())),
++                event: "index repo".to_owned(),
++                properties: Some(json!({
++                    "device_id": self.device_id(),
++                    "repo_ref": repo_ref.to_string(),
++                    "package_metadata": options.package_metadata,
++                })),
++                ..Default::default()
++            }));
++        }
++    }
+ }
+ 
+ impl From<Option<String>> for DeviceId {
+
+--- server/bleep/src/indexes.rs
++++ server/bleep/src/indexes.rs
+@@ -61,7 +61,9 @@ impl<'a> GlobalWriteHandle<'a> {
+     }
+ 
+     pub(crate) async fn index(
+-        &self,
++        &self,
++        analytics: &RudderHub,  // Pass in the RudderHub instance
++        user: &crate::webserver::middleware::User,  // Pass in the current user
+         sync_handle: &SyncHandle,
+         repo: &Repository,
+     ) -> Result<Arc<RepoMetadata>, RepoError> {
+@@ -70,6 +72,9 @@ impl<'a> GlobalWriteHandle<'a> {
+ 
+         for h in &self.handles {
+             h.index(sync_handle, repo, &metadata).await?;
++            
++            // Track the repo indexing event
++            analytics.track_index_repo(user, repo.repo_ref.clone());
+         }
+ 
+         Ok(metadata)
+```"#;
+        let expected = vec![
+            DiffChunk {
+                src: Some("server/bleep/src/analytics.rs".to_owned()),
+                dst: Some("server/bleep/src/analytics.rs".to_owned()),
+                hunks: vec![DiffHunk {
+                    src_line: 215,
+                    src_count: 7,
+                    dst_line: 215,
+                    dst_count: 22,
+                    lines: vec![
+                        Line::Context("            }));".to_owned()),
+                        Line::Context("        }".to_owned()),
+                        Line::Context("    }".to_owned()),
+                        Line::AddLine("    ".to_owned()),
+                        Line::AddLine("    pub fn track_index_repo(&self, user: &crate::webserver::middleware::User, repo_ref: RepoRef) {".to_owned()),
+                        Line::AddLine(r#"        if let Some(options) = &self.options {"#.to_owned()),
+                        Line::AddLine(r#"            self.send(Message::Track(Track {"#.to_owned()),
+                        Line::AddLine(r#"                user_id: Some(self.tracking_id(user.username())),"#.to_owned()),
+                        Line::AddLine(r#"                event: "index repo".to_owned(),"#.to_owned()),
+                        Line::AddLine(r#"                properties: Some(json!({"#.to_owned()),
+                        Line::AddLine(r#"                    "device_id": self.device_id(),"#.to_owned()),
+                        Line::AddLine(r#"                    "repo_ref": repo_ref.to_string(),"#.to_owned()),
+                        Line::AddLine(r#"                    "package_metadata": options.package_metadata,"#.to_owned()),
+                        Line::AddLine(r#"                })),"#.to_owned()),
+                        Line::AddLine(r#"                ..Default::default()"#.to_owned()),
+                        Line::AddLine(r#"            }));"#.to_owned()),
+                        Line::AddLine(r#"        }"#.to_owned()),
+                        Line::AddLine(r#"    }"#.to_owned()),
+                        Line::Context("}".to_owned()),
+                        Line::Context("".to_owned()),
+                        Line::Context("impl From<Option<String>> for DeviceId {".to_owned()),
+                        Line::Context("".to_owned()),
+                    ],
+                }],
+            },
+            DiffChunk {
+                src: Some("server/bleep/src/indexes.rs".to_owned()),
+                dst: Some("server/bleep/src/indexes.rs".to_owned()),
+                hunks: vec![
+                    DiffHunk {
+                        src_line: 61,
+                        src_count: 7,
+                        dst_line: 61,
+                        dst_count: 9,
+                        lines: vec![
+                            Line::Context(r#"    }"#.to_owned()),
+                            Line::Context(r#""#.to_owned()),
+                            Line::Context(r#"    pub(crate) async fn index("#.to_owned()),
+                            Line::Context(r#"        &self,"#.to_owned()),
+                            Line::AddLine(r#"        analytics: &RudderHub,  // Pass in the RudderHub instance"#.to_owned()),
+                            Line::AddLine(r#"        user: &crate::webserver::middleware::User,  // Pass in the current user"#.to_owned()),
+                            Line::Context(r#"        sync_handle: &SyncHandle,"#.to_owned()),
+                            Line::Context(r#"        repo: &Repository,"#.to_owned()),
+                            Line::Context(r#"    ) -> Result<Arc<RepoMetadata>, RepoError> {"#.to_owned()),
+                        ],
+                    },
+                    DiffHunk {
+                        src_line: 70,
+                        src_count: 6,
+                        dst_line: 72,
+                        dst_count: 9,
+                        lines: vec![
+                            Line::Context(r#""#.to_owned()),
+                            Line::Context(r#"        for h in &self.handles {"#.to_owned()),
+                            Line::Context(r#"            h.index(sync_handle, repo, &metadata).await?;"#.to_owned()),
+                            Line::AddLine(r#"            "#.to_owned()),
+                            Line::AddLine(r#"            // Track the repo indexing event"#.to_owned()),
+                            Line::AddLine(r#"            analytics.track_index_repo(user, repo.repo_ref.clone());"#.to_owned()),
+                            Line::Context(r#"        }"#.to_owned()),
+                            Line::Context(r#""#.to_owned()),
+                            Line::Context(r#"        Ok(metadata)"#.to_owned()),
+                        ],
+                    },
+                ],
+            },
+        ];
+
+        let output = extract(chat_response).unwrap().collect::<Vec<_>>();
+
+        assert_eq!(expected, output);
+    }
+
+    #[test]
+    fn test_split_chunks_no_count() {}
+
+    #[test]
+    fn test_fixup_remove_redundancy() {
+        let mut hunk = DiffHunk {
+            src_line: 10,
+            src_count: 5,
+            dst_line: 10,
+            dst_count: 5,
+            lines: vec![
+                Line::DelLine("fn main() {".to_owned()),
+                Line::AddLine("fn main() {".to_owned()),
+                Line::Context("    let a = 123;".to_owned()),
+                Line::DelLine("    println!(\"the value of `a` is {a:?}\");".to_owned()),
+                Line::AddLine("    dbg!(&a);".to_owned()),
+                Line::Context("    drop(a);".to_owned()),
+                Line::Context("}".to_owned()),
+            ],
+        };
+
+        hunk.fixup();
+
+        let expected = DiffHunk {
+            src_line: 10,
+            src_count: 5,
+            dst_line: 10,
+            dst_count: 5,
+            lines: vec![
+                Line::Context("fn main() {".to_owned()),
+                Line::Context("    let a = 123;".to_owned()),
+                Line::DelLine("    println!(\"the value of `a` is {a:?}\");".to_owned()),
+                Line::AddLine("    dbg!(&a);".to_owned()),
+                Line::Context("    drop(a);".to_owned()),
+                Line::Context("}".to_owned()),
+            ],
+        };
+
+        assert_eq!(expected, hunk);
+    }
+
+    #[test]
+    fn test_extract_redundant() {
+        let chat_response = "```diff
+--- server/bleep/src/query/parser.rs
++++ server/bleep/src/query/parser.rs
+@@ -64,7 +64,7 @@
+     }
+ 
+     pub fn from_str(query: String, repo_ref: String) -> Self {
+-        Self {
++        Self {
+             target: Some(Literal::Plain(Cow::Owned(query))),
+             repos: [Literal::Plain(Cow::Owned(repo_ref))].into(),
+             ..Default::default()
+```";
+
+        for _ in extract(&chat_response).unwrap() {}
+    }
+
+    #[test]
+    fn test_multiple_diff_blocks() {
+        let chat_response = r#"```diff
+--- server/bleep/src/analytics.rs
++++ server/bleep/src/analytics.rs
+@@ -215,6 +215,22 @@ impl RudderHub {
+             }));
+         }
+     }
++    
++    pub fn track_index_repo(&self, user: &crate::webserver::middleware::User, repo_ref: RepoRef) {
++        if let Some(options) = &self.options {
++            self.send(Message::Track(Track {
++                user_id: Some(self.tracking_id(user.username())),
++                event: "index repo".to_owned(),
++                properties: Some(json!({
++                    "device_id": self.device_id(),
++                    "repo_ref": repo_ref.to_string(),
++                    "package_metadata": options.package_metadata,
++                })),
++                ..Default::default()
++            }));
++        }
++    }
+ }
+ 
+ impl From<Option<String>> for DeviceId {
+```
+
+```diff
+--- server/bleep/src/indexes.rs
++++ server/bleep/src/indexes.rs
+@@ -61,7 +61,9 @@ impl<'a> GlobalWriteHandle<'a> {
+     }
+ 
+     pub(crate) async fn index(
+-        &self,
++        &self,
++        analytics: &RudderHub,  // Pass in the RudderHub instance
++        user: &crate::webserver::middleware::User,  // Pass in the current user
+         sync_handle: &SyncHandle,
+         repo: &Repository,
+     ) -> Result<Arc<RepoMetadata>, RepoError> {
+@@ -70,6 +72,9 @@ impl<'a> GlobalWriteHandle<'a> {
+ 
+         for h in &self.handles {
+             h.index(sync_handle, repo, &metadata).await?;
++            
++            // Track the repo indexing event
++            analytics.track_index_repo(user, repo.repo_ref.clone());
+         }
+ 
+         Ok(metadata)
+```"#;
+
+        let expected = r#"--- server/bleep/src/analytics.rs
++++ server/bleep/src/analytics.rs
+@@ -215,6 +215,22 @@ impl RudderHub {
+             }));
+         }
+     }
++    
++    pub fn track_index_repo(&self, user: &crate::webserver::middleware::User, repo_ref: RepoRef) {
++        if let Some(options) = &self.options {
++            self.send(Message::Track(Track {
++                user_id: Some(self.tracking_id(user.username())),
++                event: "index repo".to_owned(),
++                properties: Some(json!({
++                    "device_id": self.device_id(),
++                    "repo_ref": repo_ref.to_string(),
++                    "package_metadata": options.package_metadata,
++                })),
++                ..Default::default()
++            }));
++        }
++    }
+ }
+ 
+ impl From<Option<String>> for DeviceId {
+--- server/bleep/src/indexes.rs
++++ server/bleep/src/indexes.rs
+@@ -61,7 +61,9 @@ impl<'a> GlobalWriteHandle<'a> {
+     }
+ 
+     pub(crate) async fn index(
+-        &self,
++        &self,
++        analytics: &RudderHub,  // Pass in the RudderHub instance
++        user: &crate::webserver::middleware::User,  // Pass in the current user
+         sync_handle: &SyncHandle,
+         repo: &Repository,
+     ) -> Result<Arc<RepoMetadata>, RepoError> {
+@@ -70,6 +72,9 @@ impl<'a> GlobalWriteHandle<'a> {
+ 
+         for h in &self.handles {
+             h.index(sync_handle, repo, &metadata).await?;
++            
++            // Track the repo indexing event
++            analytics.track_index_repo(user, repo.repo_ref.clone());
+         }
+ 
+         Ok(metadata)
+"#;
+
+        let output = extract_diff(chat_response).unwrap();
+
+        assert_eq!(expected, output);
+    }
+}