Add git context access for agent

- Create WorkspaceCommitDto and WorkspaceGitInfoDto
- Extend GitAdapterInterface with getCurrentBranch, getRecentCommits, getBranches
- Implement new methods in GitCliAdapter using NUL-separated format
- Update SimulatedGitAdapter to delegate to real adapter
- Add getGitInfo to WorkspaceGitService
- Add getGitInfo to WorkspaceMgmtFacade and interface
- Extend AgentExecutionContext to store git info
- Add getGitContextInfo to WorkspaceToolingServiceInterface
- Inject git context into ContentEditorAgent system prompt
- Set git context in RunEditSessionHandler before agent runs

This allows the agent to see recent commits, current branch, and available branches at session start.

Co-authored-by: Manuel Kießling <manuel@kiessling.net>

Author: cursoragent

src/ChatBasedContentEditor/Infrastructure/Handler/RunEditSessionHandler.php

@@ -101,6 +101,18 @@ public function __invoke(RunEditSessionMessage $message): void
                 $project->remoteContentAssetsManifestUrls
             );
 
+            // Set git context info for the agent
+            try {
+                $gitInfo = $this->workspaceMgmtFacade->getGitInfo($conversation->getWorkspaceId());
+                $this->executionContext->setGitInfo($gitInfo);
+            } catch (Throwable $e) {
+                // Log but don't fail the session - git info is nice-to-have
+                $this->logger->debug('Failed to get git info for agent', [
+                    'workspaceId' => $conversation->getWorkspaceId(),
+                    'error'       => $e->getMessage(),
+                ]);
+            }
+
             // Build agent configuration from project settings (#79).
             $agentConfig = new AgentConfigDto(
                 $project->agentBackgroundInstructions,

src/LlmContentEditor/Domain/Agent/ContentEditorAgent.php

@@ -70,6 +70,11 @@ public function instructions(): string
             $base .= "\n\nWORKING FOLDER (use for all path-based tools): " . $this->agentConfig->workingFolderPath;
         }
 
+        $gitContextInfo = $this->sitebuilderFacade->getGitContextInfo();
+        if ($gitContextInfo !== '') {
+            $base .= "\n\n" . $gitContextInfo;
+        }
+
         $history = $this->resolveChatHistory();
         if ($history instanceof TurnActivityProviderInterface) {
             $summary = $history->getTurnActivitySummary();

src/WorkspaceMgmt/Domain/Service/WorkspaceGitService.php

@@ -6,9 +6,12 @@
 
 use App\ProjectMgmt\Facade\ProjectMgmtFacadeInterface;
 use App\WorkspaceMgmt\Domain\Entity\Workspace;
+use App\WorkspaceMgmt\Facade\Dto\WorkspaceCommitDto;
+use App\WorkspaceMgmt\Facade\Dto\WorkspaceGitInfoDto;
 use App\WorkspaceMgmt\Infrastructure\Adapter\GitAdapterInterface;
 use App\WorkspaceMgmt\Infrastructure\Adapter\GitHubAdapterInterface;
 use App\WorkspaceMgmt\Infrastructure\Service\GitHubUrlServiceInterface;
+use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
@@ -270,4 +273,28 @@ private function buildPrBody(
 
         return implode("\n", $lines);
     }
+
+    /**
+     * Get git context information for a workspace.
+     */
+    public function getGitInfo(Workspace $workspace, int $commitLimit = 10): WorkspaceGitInfoDto
+    {
+        $workspacePath = $this->getWorkspacePath($workspace);
+
+        $currentBranch = $this->gitAdapter->getCurrentBranch($workspacePath);
+        $rawCommits    = $this->gitAdapter->getRecentCommits($workspacePath, $commitLimit);
+        $branches      = $this->gitAdapter->getBranches($workspacePath);
+
+        $commits = array_map(
+            static fn (array $raw): WorkspaceCommitDto => new WorkspaceCommitDto(
+                $raw['hash'],
+                $raw['subject'],
+                $raw['body'],
+                new DateTimeImmutable($raw['timestamp'])
+            ),
+            $rawCommits
+        );
+
+        return new WorkspaceGitInfoDto($currentBranch, $commits, $branches);
+    }
 }

src/WorkspaceMgmt/Facade/Dto/WorkspaceCommitDto.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\WorkspaceMgmt\Facade\Dto;
+
+use DateTimeImmutable;
+
+/**
+ * DTO representing a git commit.
+ */
+final readonly class WorkspaceCommitDto
+{
+    public function __construct(
+        public string            $hash,
+        public string            $message,
+        public string            $body,
+        public DateTimeImmutable $committedAt,
+    ) {
+    }
+}

src/WorkspaceMgmt/Facade/Dto/WorkspaceGitInfoDto.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\WorkspaceMgmt\Facade\Dto;
+
+/**
+ * DTO representing git context information for a workspace.
+ */
+final readonly class WorkspaceGitInfoDto
+{
+    /**
+     * @param list<WorkspaceCommitDto> $recentCommits
+     * @param list<string>             $localBranches
+     */
+    public function __construct(
+        public string $currentBranch,
+        public array  $recentCommits,
+        public array  $localBranches,
+    ) {
+    }
+}

src/WorkspaceMgmt/Facade/WorkspaceMgmtFacade.php

@@ -9,6 +9,7 @@
 use App\WorkspaceMgmt\Domain\Service\WorkspaceGitService;
 use App\WorkspaceMgmt\Domain\Service\WorkspaceService;
 use App\WorkspaceMgmt\Domain\Service\WorkspaceStatusGuard;
+use App\WorkspaceMgmt\Facade\Dto\WorkspaceGitInfoDto;
 use App\WorkspaceMgmt\Facade\Dto\WorkspaceInfoDto;
 use App\WorkspaceMgmt\Facade\Enum\WorkspaceStatus;
 use App\WorkspaceMgmt\Infrastructure\Adapter\FilesystemAdapterInterface;
@@ -257,6 +258,13 @@ public function runBuild(string $workspaceId): string
         return $process->getOutput();
     }
 
+    public function getGitInfo(string $workspaceId, int $commitLimit = 10): WorkspaceGitInfoDto
+    {
+        $workspace = $this->getWorkspaceOrFail($workspaceId);
+
+        return $this->gitService->getGitInfo($workspace, $commitLimit);
+    }
+
     /**
      * Resolve a relative path to an absolute path and validate it's within the workspace.
      */

src/WorkspaceMgmt/Facade/WorkspaceMgmtFacadeInterface.php

@@ -4,6 +4,7 @@
 
 namespace App\WorkspaceMgmt\Facade;
 
+use App\WorkspaceMgmt\Facade\Dto\WorkspaceGitInfoDto;
 use App\WorkspaceMgmt\Facade\Dto\WorkspaceInfoDto;
 
 /**
@@ -137,4 +138,15 @@ public function writeWorkspaceFile(string $workspaceId, string $relativePath, st
      * @throws \Symfony\Component\Process\Exception\ProcessFailedException if the build fails
      */
     public function runBuild(string $workspaceId): string;
+
+    /**
+     * Get git context information for a workspace.
+     *
+     * Returns the current branch name, recent commits (with hash, message, body, timestamp),
+     * and all local branches.
+     *
+     * @param string $workspaceId the workspace ID
+     * @param int    $commitLimit the maximum number of recent commits to return
+     */
+    public function getGitInfo(string $workspaceId, int $commitLimit = 10): WorkspaceGitInfoDto;
 }

src/WorkspaceMgmt/Infrastructure/Adapter/GitAdapterInterface.php

@@ -70,4 +70,32 @@ public function push(string $workspacePath, string $branchName, string $token):
      * @return bool true if the branch has commits that differ from the base branch, false otherwise
      */
     public function hasBranchDifferences(string $workspacePath, string $branchName, string $baseBranch = 'main'): bool;
+
+    /**
+     * Get the name of the currently checked-out branch.
+     *
+     * @param string $workspacePath the workspace directory
+     *
+     * @return string the current branch name
+     */
+    public function getCurrentBranch(string $workspacePath): string;
+
+    /**
+     * Get the N most recent commits on the current branch.
+     *
+     * @param string $workspacePath the workspace directory
+     * @param int    $limit         the maximum number of commits to return
+     *
+     * @return list<array{hash: string, subject: string, body: string, timestamp: string}>
+     */
+    public function getRecentCommits(string $workspacePath, int $limit = 10): array;
+
+    /**
+     * Get all local branch names.
+     *
+     * @param string $workspacePath the workspace directory
+     *
+     * @return list<string>
+     */
+    public function getBranches(string $workspacePath): array;
 }

src/WorkspaceMgmt/Infrastructure/Adapter/GitCliAdapter.php

@@ -218,6 +218,81 @@ private function ensureCleanRemoteUrl(string $workspacePath): void
         }
     }
 
+    public function getCurrentBranch(string $workspacePath): string
+    {
+        $process = new Process(['git', 'rev-parse', '--abbrev-ref', 'HEAD']);
+        $process->setWorkingDirectory($workspacePath);
+        $process->setTimeout(self::TIMEOUT_SECONDS);
+
+        $this->runProcess($process, 'Failed to get current branch');
+
+        return trim($process->getOutput());
+    }
+
+    public function getRecentCommits(string $workspacePath, int $limit = 10): array
+    {
+        // Use NUL byte (\x00) as field separator to safely handle multiline bodies
+        // Format: hash\x00subject\x00body\x00timestamp\x00
+        $process = new Process([
+            'git',
+            'log',
+            '-n', (string) $limit,
+            '--pretty=format:%H%x00%s%x00%b%x00%aI%x00',
+        ]);
+        $process->setWorkingDirectory($workspacePath);
+        $process->setTimeout(self::TIMEOUT_SECONDS);
+
+        $this->runProcess($process, 'Failed to get recent commits');
+
+        $output = $process->getOutput();
+        if (trim($output) === '') {
+            return [];
+        }
+
+        // Split by double NUL (end of each commit record)
+        $records = explode("\x00\x00", rtrim($output, "\x00"));
+        $commits = [];
+
+        foreach ($records as $record) {
+            $fields = explode("\x00", $record);
+            if (count($fields) < 4) {
+                continue;
+            }
+
+            [$hash, $subject, $body, $timestamp] = $fields;
+
+            $commits[] = [
+                'hash'      => trim($hash),
+                'subject'   => trim($subject),
+                'body'      => trim($body),
+                'timestamp' => trim($timestamp),
+            ];
+        }
+
+        return $commits;
+    }
+
+    public function getBranches(string $workspacePath): array
+    {
+        $process = new Process(['git', 'branch', '--format=%(refname:short)']);
+        $process->setWorkingDirectory($workspacePath);
+        $process->setTimeout(self::TIMEOUT_SECONDS);
+
+        $this->runProcess($process, 'Failed to get branches');
+
+        $output = trim($process->getOutput());
+        if ($output === '') {
+            return [];
+        }
+
+        $branches = array_filter(
+            explode("\n", $output),
+            static fn (string $branch): bool => trim($branch) !== ''
+        );
+
+        return array_values(array_map('trim', $branches));
+    }
+
     private function runProcess(Process $process, string $errorMessage): void
     {
         $process->run();

src/WorkspaceMgmt/TestHarness/SimulatedGitAdapter.php

@@ -74,6 +74,21 @@ public function hasBranchDifferences(string $workspacePath, string $branchName,
         return $this->realGitAdapter->hasBranchDifferences($workspacePath, $branchName, $baseBranch);
     }
 
+    public function getCurrentBranch(string $workspacePath): string
+    {
+        return $this->realGitAdapter->getCurrentBranch($workspacePath);
+    }
+
+    public function getRecentCommits(string $workspacePath, int $limit = 10): array
+    {
+        return $this->realGitAdapter->getRecentCommits($workspacePath, $limit);
+    }
+
+    public function getBranches(string $workspacePath): array
+    {
+        return $this->realGitAdapter->getBranches($workspacePath);
+    }
+
     private function copyDirectory(string $source, string $target): void
     {
         if (!is_dir($source)) {