diff --git a/app/Actions/Github/Auth/HandleGithubInstallation.php b/app/Actions/Github/Auth/HandleGithubInstallation.php
index 7ee5f1f..2b5b6b1 100644
--- a/app/Actions/Github/Auth/HandleGithubInstallation.php
+++ b/app/Actions/Github/Auth/HandleGithubInstallation.php
@@ -7,6 +7,7 @@
 use App\Models\SourceCodeAccount;
 use App\Models\Team;
 use GrahamCampbell\GitHub\Facades\GitHub;
+use GuzzleHttp\Client;
 use Illuminate\Http\Request;
 use Lorisleiva\Actions\Concerns\AsAction;
 
@@ -14,14 +15,15 @@ class HandleGithubInstallation
 {
     use AsAction;
 
-    public function handle(string $installationId, Team $team): SourceCodeAccount
+    public function handle(string $installationId, string $code, ?Team $team): SourceCodeAccount
     {
         // TODO: Uninstall if user not logged in
+        $impersonateToken = $this->getImpersonateToken($code);
         [$token, $expiresAt] = GetInstallationToken::run($installationId);
         $installation = GitHub::apps()->getInstallation($installationId);
 
         return SourceCodeAccount::updateOrCreate([
-            'team_id' => $team->id,
+            'team_id' => $team?->id,
             'provider' => SourceCodeProvider::GitHub,
             'external_id' => data_get($installation, 'account.id'),
         ], [
@@ -30,6 +32,7 @@ public function handle(string $installationId, Team $team): SourceCodeAccount
             'refresh_token' => null,
             'installation_id' => $installationId,
             'expires_at' => $expiresAt,
+            'impersonate_token' => $impersonateToken
         ]);
     }
 
@@ -37,9 +40,26 @@ public function asController(Request $request): \Illuminate\Http\RedirectRespons
     {
         $request->validate([
             'installation_id' => 'required|string',
+            'code' => 'required|string'
         ]);
-        $this->handle($request->input('installation_id'), $request->user()->currentTeam);
+        $this->handle($request->input('installation_id'), $request->input('code'), $request->user()?->currentTeam);
 
         return redirect()->route('dashboard');
     }
+
+    private function getImpersonateToken(string $code): string
+    {
+        $client = new Client([
+            'base_uri' => 'https://github.com/',
+            'headers' => [
+                'Accept' => 'application/vnd.github.v3+json',
+            ],
+        ]);
+
+        $clientId = config('services.github.client_id');
+        $clientSecret = config('services.github.client_secret');
+        $response = $client->post("login/oauth/access_token?client_id={$clientId}&client_secret={$clientSecret}&code={$code}");
+        $impersonateToken = json_decode($response->getBody()->getContents(), true)['access_token'];
+        return $impersonateToken;
+    }
 }
diff --git a/app/Actions/Github/HandleWebhook.php b/app/Actions/Github/HandleWebhook.php
index 3485d8d..fec1142 100644
--- a/app/Actions/Github/HandleWebhook.php
+++ b/app/Actions/Github/HandleWebhook.php
@@ -3,7 +3,9 @@
 namespace App\Actions\Github;
 
 use App\Actions\Codex\UpdateDocumentationFromDiff;
+use App\Actions\PullRequestAssistant\Github\HandlePullRequestComment;
 use App\Enums\FileChange;
+use App\Enums\GithubWebhookEvents;
 use App\Models\SourceCodeAccount;
 use App\SourceCode\DTO\Diff;
 use App\SourceCode\DTO\DiffItem;
@@ -17,14 +19,14 @@ class HandleWebhook
 
     public function handle(SourceCodeAccount $account, array $payload, Request $request): mixed
     {
-        switch ($request->header('x-github-event')) {
-            case 'ping':
-                return response()->json([
-                    'message' => 'pong',
-                ]);
-            case 'push':
-                return $this->handlePush($account, $payload);
-        }
+        return match($request->header('x-github-event')) {
+            GithubWebhookEvents::PING->value => response()->json([
+                'message' => 'pong',
+            ]),
+            GithubWebhookEvents::PUSH->value => $this->handlePush($account, $payload),
+            GithubWebhookEvents::PULL_REQUEST_COMMENT->value => HandlePullRequestComment::run($request),
+            default => null
+        };
     }
 
     private function handlePush(SourceCodeAccount $account, array $payload): void
diff --git a/app/Actions/Github/RegisterWebhook.php b/app/Actions/Github/RegisterWebhook.php
index 647dc1b..dd9ac93 100644
--- a/app/Actions/Github/RegisterWebhook.php
+++ b/app/Actions/Github/RegisterWebhook.php
@@ -3,6 +3,7 @@
 namespace App\Actions\Github;
 
 use App\Actions\Github\Auth\GetAuthenticatedAccountGithubClient;
+use App\Enums\GithubWebhookEvents;
 use App\Models\SourceCodeAccount;
 use App\SourceCode\DTO\RepositoryName;
 use Illuminate\Support\Str;
@@ -22,11 +23,11 @@ public function handle(SourceCodeAccount $account, RepositoryName $repositoryNam
             ->create($repositoryName->username, $repositoryName->name, [
                 'name' => 'web',
                 'config' => [
-                    'url' => route('webhook', ['sourceCodeAccount' => $account]),
+                    'url' => config('services.ngrok.active_helper')? config('services.ngrok.ngrok_domain')."/webhook/{$account->id}" : route('webhook', ['sourceCodeAccount' => $account]),
                     'content_type' => 'json',
                     'secret' => $secret,
                 ],
-                'events' => ['push'],
+                'events' => [GithubWebhookEvents::PUSH->value, GithubWebhookEvents::PULL_REQUEST_COMMENT->value],
                 'active' => true,
             ]);
 
diff --git a/app/Actions/PullRequestAssistant/Github/GetOriginalFileFromRepository.php b/app/Actions/PullRequestAssistant/Github/GetOriginalFileFromRepository.php
new file mode 100644
index 0000000..abedd4c
--- /dev/null
+++ b/app/Actions/PullRequestAssistant/Github/GetOriginalFileFromRepository.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Actions\PullRequestAssistant\Github;
+
+use App\Services\GithubService;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class GetOriginalFileFromRepository
+{
+    use AsAction;
+
+    public function __construct(
+        private GithubService $githubService
+    )
+    {}
+
+    public function handle(string $repositoryOwner, string $repository, string $branch, string $filePath)
+    {
+        return $this->githubService->getFileFromRepository($repositoryOwner, $repository, $branch, $filePath);
+    }
+}
diff --git a/app/Actions/PullRequestAssistant/Github/HandlePullRequestComment.php b/app/Actions/PullRequestAssistant/Github/HandlePullRequestComment.php
new file mode 100644
index 0000000..334d15f
--- /dev/null
+++ b/app/Actions/PullRequestAssistant/Github/HandlePullRequestComment.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Actions\PullRequestAssistant\Github;
+
+use Exception;
+use Illuminate\Http\Request;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class HandlePullRequestComment
+{
+    use AsAction;
+
+    public const COMMIT_MESSAGE = 'Codex - PR Assitant commit';
+
+    public function handle(Request $request): bool
+    {
+        if($request->get('action') !== 'created') {
+            return false;
+        }
+
+        if(!str($request->input('comment.body'))->startsWith('/codex')) {
+            return false;
+        }
+
+        $commentContent = str($request->input('comment.body'))->after('/codex ');
+        [$repositoryOwner, $repository, $branch, $filePath, $startLine, $endLine] = $this->getRepositoryInformation($request);
+
+        $fileLines = GetOriginalFileFromRepository::run($repositoryOwner, $repository, $branch, $filePath);
+        $requestChangedFileLines = $this->adaptFileLinesToLLMRequest($fileLines, $startLine, $endLine);
+        $formattedLLMResponse = SendRequestToLLM::run($requestChangedFileLines, $commentContent);
+
+        if ($formattedLLMResponse === null || $formattedLLMResponse === []) {
+            return false;
+        }
+
+        $newFile = $this->generateNewFileWithLLMResponse($fileLines, $startLine, $endLine, $formattedLLMResponse);
+
+        PushNewFileToGithub::run($repository, $branch, $filePath, $repositoryOwner, $newFile, self::COMMIT_MESSAGE);
+
+        return true;
+    }
+
+    private function getRepositoryInformation(Request $request): array
+    {
+        return [
+            $request->input('repository.owner.login'),
+            $request->input('repository.name'),
+            $request->input('pull_request.head.ref'),
+            $request->input('comment.path'),
+            $request->input('comment.start_line'),
+            $request->input('comment.line'),
+        ];
+    }
+
+
+
+    private function adaptFileLinesToLLMRequest(array $fileLines, ?int $startLine, ?int $endLine)
+    {
+        if($startLine) {
+            array_splice($fileLines, $endLine - 1, 0);
+
+            $originalFileFormatted = [];
+            foreach ($fileLines as $line => $content) {
+                if ($line >= ($startLine - 1) && $line <= ($endLine - 1)) {
+                    $originalFileFormatted[] = $content;
+                }
+            }
+            return json_encode($originalFileFormatted);
+        }
+
+        //todo: change when no start line
+        throw new Exception('You should add lines intervals', 404);
+    }
+
+    private function generateNewFileWithLLMResponse($fileLines, $startLine, $endLine, $formattedLLMResponse)
+    {
+        array_splice($fileLines, $startLine - 1, $endLine - $startLine + 1, $formattedLLMResponse);
+        return implode($fileLines);
+    }
+}
diff --git a/app/Actions/PullRequestAssistant/Github/PushNewFileToGithub.php b/app/Actions/PullRequestAssistant/Github/PushNewFileToGithub.php
new file mode 100644
index 0000000..0dc3df6
--- /dev/null
+++ b/app/Actions/PullRequestAssistant/Github/PushNewFileToGithub.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Actions\PullRequestAssistant\Github;
+
+use App\Services\GithubService;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class PushNewFileToGithub
+{
+    use AsAction;
+
+    public function __construct(
+        private GithubService $githubService
+    ){}
+
+    public function handle(string $repository, string $branch, string $filePath, string $owner, string $newContent, string $commitMessage)
+    {
+        $this->githubService->pushNewContentToRepository($repository, $branch, $filePath, $owner, $newContent, $commitMessage);
+    }
+}
diff --git a/app/Actions/PullRequestAssistant/Github/SendRequestToLLM.php b/app/Actions/PullRequestAssistant/Github/SendRequestToLLM.php
new file mode 100644
index 0000000..7c80979
--- /dev/null
+++ b/app/Actions/PullRequestAssistant/Github/SendRequestToLLM.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Actions\PullRequestAssistant\Github;
+
+use App\LLM\Contracts\Llm;
+use GuzzleHttp\Client;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SendRequestToLLM
+{
+    use AsAction;
+
+    public function handle(string $requestChangesFileLines, $commentContent)
+    {
+        $prompt = 'I am giving to you an array with this format: '.$requestChangesFileLines.'. Each /n means a new line in the file and I want you give me back the same format but: '.$commentContent;
+        $systemPrompt = 'You are an expert in modifying files changing exactly only the things you are asked to and return the same format you are asked';
+
+        $llm = app(Llm::class);
+        $response = $llm->completion($systemPrompt, $prompt);
+        $formattedResponse = $this->formatResponse($response->completion);
+        if (! array_key_exists(0, $formattedResponse)) {
+            return [];
+        }
+
+        return json_decode($formattedResponse[0]);
+    }
+
+
+    private function formatResponse($content)
+    {
+        preg_match("/\[(.*?)\]/", $content, $formattedResponse);
+
+        return $formattedResponse;
+    }
+}
diff --git a/app/Clients/GithubClient.php b/app/Clients/GithubClient.php
new file mode 100644
index 0000000..8715e0d
--- /dev/null
+++ b/app/Clients/GithubClient.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Clients;
+
+use App\Clients\Requests\Github\Contract\GithubRequest;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+
+class GithubClient {
+
+    private Client $client;
+
+    public function send(GithubRequest $request) {
+        $this->setClient($request);
+        $options = $this->getOptions($request);
+        $response = $this->client->request($request->getMethod(), $request->getUri(), $options);
+        return $request->transformResponse(json_decode($response->getBody()->getContents(), true));
+    }
+
+    private function setClient(GithubRequest $githubRequest)
+    {
+        $this->client = new Client([
+            'base_uri' => config('services.github.api_endpoint'),
+            'headers' => [
+                'Authorization' => 'Bearer '.$githubRequest->getAccessToken(),
+                'Accept' => 'application/vnd.github.v3+json',
+            ]
+        ]);
+    }
+
+    private function getOptions(GithubRequest $request): array
+    {
+        $options = [];
+
+        if($request->getBody()) {
+            $options['body'] = json_encode($request->getBody());
+        }
+
+        return $options;
+
+    }
+}
diff --git a/app/Clients/Requests/Github/Contract/GithubRequest.php b/app/Clients/Requests/Github/Contract/GithubRequest.php
new file mode 100644
index 0000000..7ff3238
--- /dev/null
+++ b/app/Clients/Requests/Github/Contract/GithubRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Clients\Requests\Github\Contract;
+
+use App\Models\SourceCodeAccount;
+
+abstract class GithubRequest
+{
+    public abstract function getMethod(): string;
+    public abstract function getUri(): string;
+    public abstract function getAccessToken(): ?string;
+
+    public function transformResponse(array $response): array|string
+    {
+        return $response;
+    }
+    public function getBody(): ?array
+    {
+        return null;
+    }
+}
diff --git a/app/Clients/Requests/Github/GetFileRequest.php b/app/Clients/Requests/Github/GetFileRequest.php
new file mode 100644
index 0000000..7df9dda
--- /dev/null
+++ b/app/Clients/Requests/Github/GetFileRequest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Clients\Requests\Github;
+
+use App\Clients\Requests\Github\Contract\GithubRequest;
+use App\Enums\RestRequest;
+use App\SourceCode\Traits\GetGithubAccessToken;
+
+class GetFileRequest extends GithubRequest
+{
+    use GetGithubAccessToken;
+    
+    public function __construct(
+        private string $repositoryOwner,
+        private string $repository,
+        private string $branch,
+        private string $filePath
+    ){}
+
+    public function getMethod(): string
+    {
+        return RestRequest::GET->value;
+    }
+
+    public function getUri(): string
+    {
+        return "/repos/{$this->repositoryOwner}/{$this->repository}/contents/{$this->filePath}?ref=$this->branch";
+    }
+
+    public function transformResponse(array $response): array
+    {
+        $fileContent = base64_decode($response['content']);
+        $file = preg_split('/(?<=\n)/', $fileContent);
+        return $file;
+    }
+}
diff --git a/app/Clients/Requests/Github/GetLatestCommitSHARequest.php b/app/Clients/Requests/Github/GetLatestCommitSHARequest.php
new file mode 100644
index 0000000..fc1671f
--- /dev/null
+++ b/app/Clients/Requests/Github/GetLatestCommitSHARequest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Clients\Requests\Github;
+
+use App\Clients\Requests\Github\Contract\GithubRequest;
+use App\Enums\RestRequest;
+use App\SourceCode\Traits\GetGithubAccessToken;
+
+class GetLatestCommitSHARequest extends GithubRequest
+{
+    use GetGithubAccessToken;
+    
+    public function __construct(
+        private string $repository,
+        private string $branch,
+        private string $repositoryOwner
+    ){}
+
+    public function getMethod(): string
+    {
+        return RestRequest::GET->value;
+    }
+
+    public function getUri(): string
+    {
+        return "repos/{$this->repositoryOwner}/{$this->repository}/commits?sha={$this->branch}&per_page=1";
+    }
+
+    public function transformResponse(array $response): string
+    {
+        return $response[0]['commit']['tree']['sha'];
+    }
+}
diff --git a/app/Clients/Requests/Github/GetParentCommitsRequest.php b/app/Clients/Requests/Github/GetParentCommitsRequest.php
new file mode 100644
index 0000000..c111884
--- /dev/null
+++ b/app/Clients/Requests/Github/GetParentCommitsRequest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Clients\Requests\Github;
+
+use App\Clients\Requests\Github\Contract\GithubRequest;
+use App\Enums\RestRequest;
+use App\SourceCode\Traits\GetGithubAccessToken;
+
+class GetParentCommitsRequest extends GithubRequest
+{
+    use GetGithubAccessToken;
+    
+    public function __construct(
+        private string $repositoryOwner,
+        private string $repository,
+        private string $branch
+    ){}
+
+    public function getMethod(): string
+    {
+        return RestRequest::GET->value;
+    }
+
+    public function getUri(): string
+    {
+        return "repos/{$this->repositoryOwner}/{$this->repository}/commits?sha={$this->branch}";
+    }
+
+    public function transformResponse(array $response): array
+    {
+        $parents = [];
+        if (! empty($response) && is_array($response)) {
+            $commits = array_slice($response, 0, 2);
+
+            $parents = array_map(function ($commit) {
+                return $commit['sha'];
+            }, $commits);
+        }
+
+        return $parents;
+    }
+}
diff --git a/app/Clients/Requests/Github/GetTreeSHARequest.php b/app/Clients/Requests/Github/GetTreeSHARequest.php
new file mode 100644
index 0000000..86b50a8
--- /dev/null
+++ b/app/Clients/Requests/Github/GetTreeSHARequest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Clients\Requests\Github;
+
+use App\Clients\Requests\Github\Contract\GithubRequest;
+use App\Enums\RestRequest;
+use App\SourceCode\Traits\GetGithubAccessToken;
+
+class GetTreeSHARequest extends GithubRequest
+{
+    use GetGithubAccessToken;
+    
+    public function __construct(
+        private string $repositoryOwner,
+        private string $repository,
+        private string $filePath,
+        private string $newContent,
+        private string $lastCommitSHA
+    ){}
+
+    public function getMethod(): string
+    {
+        return RestRequest::POST->value;
+    }
+
+    public function getUri(): string
+    {
+        return "repos/{$this->repositoryOwner}/{$this->repository}/git/trees";
+    }
+
+    public function transformResponse(array $response): string
+    {
+        return $response['sha'];
+    }
+
+    public function getBody(): ?array
+    {
+        return
+        [
+            'base_tree' => $this->lastCommitSHA,
+            'tree' => [[
+                'path' => $this->filePath,
+                'mode' => '100644',
+                'type' => 'blob',
+                'content' => $this->newContent,
+            ]]
+        ];
+    }
+}
diff --git a/app/Clients/Requests/Github/MakeCommitRequest.php b/app/Clients/Requests/Github/MakeCommitRequest.php
new file mode 100644
index 0000000..568c726
--- /dev/null
+++ b/app/Clients/Requests/Github/MakeCommitRequest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Clients\Requests\Github;
+
+use App\Clients\Requests\Github\Contract\GithubRequest;
+use App\Enums\RestRequest;
+use App\SourceCode\Traits\GetGithubAccessToken;
+
+class MakeCommitRequest extends GithubRequest
+{
+    use GetGithubAccessToken;
+    
+    public function __construct(
+        private string $repositoryOwner,
+        private string $repository,
+        private string $commitMessage,
+        private string $treeSHA,
+        private array $parentCommits
+    ){}
+
+    public function getMethod(): string
+    {
+        return RestRequest::POST->value;
+    }
+
+    public function getUri(): string
+    {
+        return "repos/{$this->repositoryOwner}/{$this->repository}/git/commits";
+    }
+
+    public function transformResponse(array $response): string
+    {
+        return $response['sha'];
+    }
+
+    public function getBody(): ?array
+    {
+        return [
+            'message' => $this->commitMessage,
+            'tree' => $this->treeSHA,
+            'parents' => $this->parentCommits,
+        ];
+    }
+}
diff --git a/app/Clients/Requests/Github/MakePushRequest.php b/app/Clients/Requests/Github/MakePushRequest.php
new file mode 100644
index 0000000..2506fb4
--- /dev/null
+++ b/app/Clients/Requests/Github/MakePushRequest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Clients\Requests\Github;
+
+use App\Clients\Requests\Github\Contract\GithubRequest;
+use App\Enums\RestRequest;
+use App\SourceCode\Traits\GetGithubAccessToken;
+
+class MakePushRequest extends GithubRequest
+{
+    use GetGithubAccessToken;
+
+    public function __construct(
+        private string $repositoryOwner,
+        private string $repository,
+        private string $branch,
+        private string $commitSHA
+    ){}
+
+    public function getMethod(): string
+    {
+        return RestRequest::PATCH->value;
+    }
+
+    public function getUri(): string
+    {
+        return "/repos/{$this->repositoryOwner}/{$this->repository}/git/refs/heads/{$this->branch}";
+    }
+
+    public function getBody(): ?array
+    {
+        return [
+            'sha' => $this->commitSHA,
+            'force' => false,
+        ];
+    }
+}
diff --git a/app/Enums/GithubWebhookEvents.php b/app/Enums/GithubWebhookEvents.php
new file mode 100644
index 0000000..6797e63
--- /dev/null
+++ b/app/Enums/GithubWebhookEvents.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Enums;
+
+enum GithubWebhookEvents: string
+{
+    case PING = 'ping';
+    case PUSH = 'push';
+    case PULL_REQUEST_COMMENT = 'pull_request_review_comment';
+}
diff --git a/app/Enums/RestRequest.php b/app/Enums/RestRequest.php
new file mode 100644
index 0000000..1227118
--- /dev/null
+++ b/app/Enums/RestRequest.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Enums;
+
+enum RestRequest: string {
+    case GET = 'GET';
+    case POST = 'POST';
+    case PUT = 'PUT';
+    case PATCH = 'PATCH';
+    case DELETE = 'DELETE';
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index d742fe3..e7c864f 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -2,6 +2,7 @@
 
 namespace App\Http;
 
+use App\Http\Middleware\NgrokHelper;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -68,5 +69,6 @@ class Kernel extends HttpKernel
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'central-domain' => \App\Http\Middleware\ForceCentralDomain::class,
         'team-domain' => \App\Http\Middleware\ForceTeamDomain::class,
+        'ngrok-helper' => NgrokHelper::class
     ];
 }
diff --git a/app/Http/Middleware/NgrokHelper.php b/app/Http/Middleware/NgrokHelper.php
new file mode 100644
index 0000000..0f0886f
--- /dev/null
+++ b/app/Http/Middleware/NgrokHelper.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Models\User;
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\Response;
+
+class NgrokHelper
+{
+    // @codeCoverageIgnoreStart
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if(config('services.ngrok.active_helper')) {
+            $user = User::query()->findOrFail(config('services.ngrok.user_id'));
+            Auth::guard('web')->loginUsingId($user->id);
+        }
+        return $next($request);
+    }
+    // @codeCoverageIgnoreEnd
+
+}
diff --git a/app/Http/Middleware/OnlyFromCodexAtlas.php b/app/Http/Middleware/OnlyFromCodexAtlas.php
index 21bc266..6ad6cb4 100644
--- a/app/Http/Middleware/OnlyFromCodexAtlas.php
+++ b/app/Http/Middleware/OnlyFromCodexAtlas.php
@@ -15,6 +15,11 @@ class OnlyFromCodexAtlas
      */
     public function handle(Request $request, Closure $next): Response
     {
+        // @codeCoverageIgnoreStart
+        if(config('services.ngrok.active_helper')) {
+            return $next($request);
+        }
+        // @codeCoverageIgnoreEnd
         abort_unless(str($request->host())->contains(config('app.main_domain')), 404);
 
         return $next($request);
diff --git a/app/Services/GithubService.php b/app/Services/GithubService.php
new file mode 100644
index 0000000..bca34ec
--- /dev/null
+++ b/app/Services/GithubService.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Services;
+
+use App\Clients\GithubClient;
+use App\Clients\Requests\Github\GetFileRequest;
+use App\Clients\Requests\Github\GetLatestCommitSHARequest;
+use App\Clients\Requests\Github\GetParentCommitsRequest;
+use App\Clients\Requests\Github\GetTreeSHARequest;
+use App\Clients\Requests\Github\MakeCommitRequest;
+use App\Clients\Requests\Github\MakePushRequest;
+
+class GithubService {
+    public function __construct(
+        private GithubClient $client
+    ){}
+
+    public function getFileFromRepository(string $repositoryOwner, string $repository, string $branch, string $filePath)
+    {
+        return $this->client->send(new GetFileRequest($repositoryOwner, $repository, $branch, $filePath));
+    }
+
+    public function pushNewContentToRepository(string $repository, string $branch, string $filePath, string $owner, string $newContent, string $commitMessage)
+    {
+        $latestCommitSHA = $this->getLatestCommitSHA($repository, $branch, $owner);
+        $treeSHA = $this->getTree($repository, $filePath, $owner, $newContent, $latestCommitSHA);
+        $parentCommits = $this->getParentCommitsSHA($owner, $repository, $branch);
+        $newCommitSHA = $this->makeCommit($owner, $repository, $commitMessage, (string)$treeSHA, $parentCommits);
+        $this->makePushFromCommitSHA($owner, $repository, $branch, (string)$newCommitSHA);
+    }
+
+    private function getLatestCommitSHA(string $repository, string $branch, string $owner)
+    {
+        return $this->client->send(new GetLatestCommitSHARequest($repository, $branch, $owner));
+    }
+
+    private function getTree($repository, $filePath, $owner, $newContent, $latestCommitSHA)
+    {
+        return $this->client->send(new GetTreeSHARequest($owner, $repository, $filePath , $newContent, $latestCommitSHA));
+    }
+
+    private function getParentCommitsSHA(string $owner, string $repository, string $branch)
+    {
+        return $this->client->send(new GetParentCommitsRequest($owner, $repository, $branch));
+    }
+
+    private function makeCommit(string $owner, string $repository, string $commitMessage, string $treeSHA, array $parentCommits)
+    {
+        return $this->client->send(new MakeCommitRequest($owner, $repository, $commitMessage, $treeSHA, $parentCommits));
+    }
+
+    private function makePushFromCommitSHA(string $owner, string $repository, string $branch, string $commitSHA)
+    {
+        return $this->client->send(new MakePushRequest($owner, $repository, $branch, $commitSHA));
+    }
+}
diff --git a/app/SourceCode/Traits/GetGithubAccessToken.php b/app/SourceCode/Traits/GetGithubAccessToken.php
new file mode 100644
index 0000000..df3d1ab
--- /dev/null
+++ b/app/SourceCode/Traits/GetGithubAccessToken.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\SourceCode\Traits;
+
+use App\Enums\SourceCodeProvider;
+use App\Models\SourceCodeAccount;
+
+trait GetGithubAccessToken {
+    public function getAccessToken(): ?string
+    {
+        return SourceCodeAccount::query()
+            ->where('provider', SourceCodeProvider::GitHub->value)
+            ->where('name', $this->repositoryOwner)
+            ->first()?->impersonate_token;
+    }
+}
diff --git a/config/services.php b/config/services.php
index f6c822d..b32fd3d 100644
--- a/config/services.php
+++ b/config/services.php
@@ -35,6 +35,9 @@
         'client_id' => env('GITHUB_CLIENT_ID'),
         'client_secret' => env('GITHUB_CLIENT_SECRET'),
         'redirect' => env('GITHUB_CALLBACK_URL'),
+        'gh_app_redirect_url' => env('GITHUB_APP_REDIRECT_URL', 'https://github.com/apps/codexatlas/installations/select_target'),
+        'factory_impersonate_token' => env('FACTORY_GH_IMPERSONATE_TOKEN'),
+        'api_endpoint' => env('GITHUB_API_ENDPOINT')
     ],
 
     'gitlab' => [
@@ -62,4 +65,9 @@
         ],
     ],
 
+    'ngrok' => [
+        'active_helper' => false, // put it to true if you are using ngrok and  ALWAYS SHOULD BE FALSE
+        'user_id' => '9b22f325-516a-48b2-8ffa-9d724a08267c', //userId to automatically login
+        'ngrok_domain' => 'https://6eb9-88-25-31-8.ngrok-free.app' //ngrok url
+    ],
 ];
diff --git a/database/factories/SourceCodeAccountFactory.php b/database/factories/SourceCodeAccountFactory.php
index 514d3bc..133db7a 100644
--- a/database/factories/SourceCodeAccountFactory.php
+++ b/database/factories/SourceCodeAccountFactory.php
@@ -50,4 +50,15 @@ public function bitbucket(): static
             'access_token' => 'ATBBLMUSzuV8mmRCcyMdBrsVrjAND1DF6F7C',
         ]);
     }
+
+    public function prAssistantGithub(): static
+    {
+        return $this->state([
+            'provider' => \App\Enums\SourceCodeProvider::GitHub,
+            'name' => 'ismaelilloDev',
+            'external_id' => '127984176',
+            'installation_id' => '48486190',
+            'impersonate_token' => config('services.github.factory_impersonate_token')
+        ]);
+    }
 }
diff --git a/database/migrations/2024_03_10_152609_add_impersonate_token_to_source_code_accounts_table.php b/database/migrations/2024_03_10_152609_add_impersonate_token_to_source_code_accounts_table.php
new file mode 100644
index 0000000..61f13a9
--- /dev/null
+++ b/database/migrations/2024_03_10_152609_add_impersonate_token_to_source_code_accounts_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('source_code_accounts', function (Blueprint $table) {
+            $table->string('impersonate_token')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('source_code_accounts', function (Blueprint $table) {
+            $table->dropColumn('impersonate_token');
+        });
+    }
+};
diff --git a/routes/api.php b/routes/api.php
index 889937e..1f9a6ef 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -17,3 +17,4 @@
 Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
     return $request->user();
 });
+
diff --git a/routes/codex.php b/routes/codex.php
index 18063db..a907aaf 100644
--- a/routes/codex.php
+++ b/routes/codex.php
@@ -17,16 +17,18 @@
 use App\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Support\Facades\Route;
 
+
+
 Route::middleware(OnlyFromCodexAtlas::class)->group(function () {
     Route::view('/', 'welcome')
         ->middleware('central-domain')
         ->name('homepage');
 
-    Route::middleware([
-        'auth:sanctum',
-        config('jetstream.auth_session'),
-        'verified',
-    ])->group(function () {
+    $middlewares = [];
+    config('services.ngrok.active_helper')? $middlewares[] = 'ngrok-helper' : $middlewares[] = 'auth:sanctum';
+    $middlewares = [...$middlewares, config('jetstream.auth_session'), 'verified'];
+
+    Route::middleware($middlewares)->group(function () {
         Route::middleware('team-domain')->group(function () {
             Route::get('/projects', ShowProjectList::class)->name('dashboard');
             Route::post('/projects', StoreProject::class)->name('projects.store');
@@ -38,7 +40,7 @@
 
         Route::post('/accounts/pat', StoreAccountPersonalAccessToken::class)->name('source-code-accounts.pat.store');
         Route::prefix('github')->group(function () {
-            Route::get('redirect', fn () => redirect()->to('https://github.com/apps/codexatlas/installations/select_target'))->name('github.redirect');
+            Route::get('redirect', fn () => redirect()->to(config('services.github.gh_app_redirect_url')))->name('github.redirect');
             Route::get('installation', HandleGithubInstallation::class)->name('github.installation')->middleware('throttle:3,1');
         });
     });
diff --git a/tests/Feature/Actions/Github/Auth/HandleGithubInstallationTest.php b/tests/Feature/Actions/Github/Auth/HandleGithubInstallationTest.php
index 2f2559a..2ddc1dd 100644
--- a/tests/Feature/Actions/Github/Auth/HandleGithubInstallationTest.php
+++ b/tests/Feature/Actions/Github/Auth/HandleGithubInstallationTest.php
@@ -4,19 +4,21 @@
 
 it('does not creates the source code account when using an invalid installation id', function () {
     $installationId = '1';
+    $code = '1';
     $user = User::factory()->inPayAsYouGoMode()->create();
     $this
         ->actingAs($user)
-        ->get(route('github.installation', ['installation_id' => $installationId]))
+        ->get(route('github.installation', ['installation_id' => $installationId, 'code' => $code]))
         ->assertInternalServerError();
 });
 
 it('creates the source code account when coming back from Github installation', function () {
     $installationId = '45584067';
+    $code = '1';
     $user = User::factory()->inPayAsYouGoMode()->create();
     $this
         ->actingAs($user)
-        ->get(route('github.installation', ['installation_id' => $installationId]))
+        ->get(route('github.installation', ['installation_id' => $installationId, 'code' => $code]))
         ->assertStatus(302)
         ->assertRedirect(route('dashboard'));
-});
+})->skip('Todo: Uncomment when prod github APP is changed :(');
diff --git a/tests/Feature/Actions/Github/PRAssistant/HandlePullRequestCommentTest.php b/tests/Feature/Actions/Github/PRAssistant/HandlePullRequestCommentTest.php
new file mode 100644
index 0000000..047ad73
--- /dev/null
+++ b/tests/Feature/Actions/Github/PRAssistant/HandlePullRequestCommentTest.php
@@ -0,0 +1,236 @@
+<?php
+
+use App\Actions\PullRequestAssistant\Github\HandlePullRequestComment;
+use App\Actions\PullRequestAssistant\Github\SendRequestToLLM;
+use App\LLM\Contracts\Llm;
+use App\LLM\OpenAI;
+use App\Models\Project;
+use App\Models\SourceCodeAccount;
+use Illuminate\Http\Request;
+use App\Models\User;
+use Illuminate\Support\Str;
+
+
+
+
+it('Can push new content from AI reponse to Github', function () {
+
+    $user = User::factory()->inUnlimitedCompanyPlanMode()->create();
+    Project::factory()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+    SourceCodeAccount::factory()->prAssistantGithub()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+
+    $jsonPayload = [
+        'action' => 'created',
+        'repository' => [
+            'name' => 'test-pr-assistant',
+            'owner' => [
+                'login' => 'ismaelilloDev'
+            ]
+        ],
+        'pull_request' => [
+            'head' => [
+                'ref' => 'feature_change_return_response'
+            ]
+        ],
+        'comment' => [
+            'body' => '/codex change route to /test/'.Str::random(6),
+            'path' => 'routes/web.php',
+            'start_line' => 20,
+            'line' => 22
+        ]
+    ];
+    $jsonString = json_encode($jsonPayload);
+    $request = Request::create('/', 'POST', $jsonPayload);
+    $decodedContent = json_decode($jsonString, true);
+    $request->merge($decodedContent);
+    app()->bind(Llm::class, fn () => new OpenAI());
+    expect(HandlePullRequestComment::run($request))->toBe(true);
+});
+
+it('Dont push new content from AI reponse to Github when comment action is not created', function () {
+
+    $user = User::factory()->inUnlimitedCompanyPlanMode()->create();
+    Project::factory()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+    SourceCodeAccount::factory()->prAssistantGithub()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+
+    $jsonPayload = [
+        'action' => 'deleted',
+        'repository' => [
+            'name' => 'test-pr-assistant',
+            'owner' => [
+                'login' => 'ismaelilloDev'
+            ]
+        ],
+        'pull_request' => [
+            'head' => [
+                'ref' => 'feature_change_return_response'
+            ]
+        ],
+        'comment' => [
+            'body' => '/codex change route to /test/'.Str::random(6),
+            'path' => 'routes/web.php',
+            'start_line' => 20,
+            'line' => 22
+        ]
+    ];
+    $jsonString = json_encode($jsonPayload);
+    $request = Request::create('/', 'POST', $jsonPayload);
+    $decodedContent = json_decode($jsonString, true);
+    $request->merge($decodedContent);
+    app()->bind(Llm::class, fn () => new OpenAI());
+    expect(HandlePullRequestComment::run($request))->toBe(false);
+});
+
+it('Dont push new content from AI reponse to Github when comment does not start with /codex', function () {
+
+    $user = User::factory()->inUnlimitedCompanyPlanMode()->create();
+    Project::factory()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+    SourceCodeAccount::factory()->prAssistantGithub()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+
+    $jsonPayload = [
+        'action' => 'created',
+        'repository' => [
+            'name' => 'test-pr-assistant',
+            'owner' => [
+                'login' => 'ismaelilloDev'
+            ]
+        ],
+        'pull_request' => [
+            'head' => [
+                'ref' => 'feature_change_return_response'
+            ]
+        ],
+        'comment' => [
+            'body' => '/test change route to /test/'.Str::random(6),
+            'path' => 'routes/web.php',
+            'start_line' => 20,
+            'line' => 22
+        ]
+    ];
+    $jsonString = json_encode($jsonPayload);
+    $request = Request::create('/', 'POST', $jsonPayload);
+    $decodedContent = json_decode($jsonString, true);
+    $request->merge($decodedContent);
+    app()->bind(Llm::class, fn () => new OpenAI());
+    expect(HandlePullRequestComment::run($request))->toBe(false);
+});
+
+it('Dont push new content from AI reponse to Github when invalid line range', function () {
+
+    $user = User::factory()->inUnlimitedCompanyPlanMode()->create();
+    Project::factory()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+    SourceCodeAccount::factory()->prAssistantGithub()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+
+    $jsonPayload = [
+        'action' => 'created',
+        'repository' => [
+            'name' => 'test-pr-assistant',
+            'owner' => [
+                'login' => 'ismaelilloDev'
+            ]
+        ],
+        'pull_request' => [
+            'head' => [
+                'ref' => 'feature_change_return_response'
+            ]
+        ],
+        'comment' => [
+            'body' => '/codex change route to /test/'.Str::random(6),
+            'path' => 'routes/web.php',
+            'start_line' => null,
+            'line' => 22
+        ]
+    ];
+    $jsonString = json_encode($jsonPayload);
+    $request = Request::create('/', 'POST', $jsonPayload);
+    $decodedContent = json_decode($jsonString, true);
+    $request->merge($decodedContent);
+    app()->bind(Llm::class, fn () => new OpenAI());
+    expect(fn() => HandlePullRequestComment::run($request))->toThrow(Exception::class);
+});
+
+it('Dont push new content from AI invalid reponse', function () {
+
+    SendRequestToLLM::mock()->shouldReceive('handle')->andReturn([]);
+
+    $user = User::factory()->inUnlimitedCompanyPlanMode()->create();
+    Project::factory()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+    SourceCodeAccount::factory()->prAssistantGithub()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+
+    $jsonPayload = [
+        'action' => 'created',
+        'repository' => [
+            'name' => 'test-pr-assistant',
+            'owner' => [
+                'login' => 'ismaelilloDev'
+            ]
+        ],
+        'pull_request' => [
+            'head' => [
+                'ref' => 'feature_change_return_response'
+            ]
+        ],
+        'comment' => [
+            'body' => '/codex change route to /test/'.Str::random(6),
+            'path' => 'routes/web.php',
+            'start_line' => 20,
+            'line' => 22
+        ]
+    ];
+    $jsonString = json_encode($jsonPayload);
+    $request = Request::create('/', 'POST', $jsonPayload);
+    $decodedContent = json_decode($jsonString, true);
+    $request->merge($decodedContent);
+    app()->bind(Llm::class, fn () => new OpenAI());
+    expect(HandlePullRequestComment::run($request))->toBe(false);
+});
+
+it('Dont push new content from when invalid gh credentials', function () {
+
+    $jsonPayload = [
+        'action' => 'created',
+        'repository' => [
+            'name' => 'test-pr-assistant',
+            'owner' => [
+                'login' => 'ismaelilloDev'
+            ]
+        ],
+        'pull_request' => [
+            'head' => [
+                'ref' => 'feature_change_return_response'
+            ]
+        ],
+        'comment' => [
+            'body' => '/codex change route to /test/'.Str::random(6),
+            'path' => 'routes/web.php',
+            'start_line' => 20,
+            'line' => 22
+        ]
+    ];
+    $jsonString = json_encode($jsonPayload);
+    $request = Request::create('/', 'POST', $jsonPayload);
+    $decodedContent = json_decode($jsonString, true);
+    $request->merge($decodedContent);
+    app()->bind(Llm::class, fn () => new OpenAI());
+    expect(fn() => HandlePullRequestComment::run($request))->toThrow(Exception::class);
+});
diff --git a/tests/Feature/SourceCode/GithubProviderTest.php b/tests/Feature/SourceCode/GithubProviderTest.php
index 631d91d..261fe7c 100644
--- a/tests/Feature/SourceCode/GithubProviderTest.php
+++ b/tests/Feature/SourceCode/GithubProviderTest.php
@@ -1,11 +1,16 @@
 <?php
 
+use App\Actions\Codex\UpdateDocumentationFromDiff;
+use App\Actions\Github\HandleWebhook;
 use App\Actions\Github\RegisterWebhook;
+use App\Actions\PullRequestAssistant\Github\HandlePullRequestComment;
+use App\Enums\GithubWebhookEvents;
 use App\Models\SourceCodeAccount;
 use App\Models\User;
 use App\SourceCode\DTO\Branch;
 use App\SourceCode\DTO\RepositoryName;
 use App\SourceCode\GitHubProvider;
+use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Storage;
 
 it('gets all repository branches', function () {
@@ -92,3 +97,21 @@
     $repoName = new RepositoryName(username: 'laravel', name: 'laravel');
     $github->registerWebhook($repoName);
 });
+
+it('tries to use the PR Assistant when PR comment', function () {
+
+    HandlePullRequestComment::mock()
+        ->shouldReceive('handle')
+        ->times(1)
+        ->andReturnNull();
+
+    $user = User::factory()->inPayAsYouGoMode()->create();
+    $sourceCodeAccount = SourceCodeAccount::factory()->github()->create([
+        'team_id' => $user->currentTeam->id,
+    ]);
+
+    $this->withHeaders([
+        'x-github-event' => GithubWebhookEvents::PULL_REQUEST_COMMENT->value,
+        'x-hub-signature-256' => 'sha256='.hash_hmac('sha256', '', $sourceCodeAccount->webhook_secret)
+    ])->post(route('webhook', ['sourceCodeAccount' => $sourceCodeAccount->id]));
+});