sd-8

Author: johnabbott72

SemanticDeveloper/SemanticDeveloper/MainWindow.axaml

@@ -32,6 +32,7 @@
                             <MenuItem Header="Commit…" Click="OnGitCommitClick"/>
                             <MenuItem Header="New Branch…" Click="OnGitNewBranchClick"/>
                             <MenuItem Header="Switch Branch…" Click="OnGitSwitchBranchClick"/>
+                            <MenuItem Header="Get Latest" Click="OnGitGetLatestClick"/>
                             <MenuItem Header="Refresh" Click="OnGitRefreshClick"/>
                         </MenuFlyout>
                     </Button.Flyout>

SemanticDeveloper/SemanticDeveloper/MainWindow.axaml.cs

@@ -1095,6 +1095,8 @@ private async Task SelectWorkspaceAsync()
         LoadTree(selected);
         // do not persist workspace; every session should be fresh
 
+        _ = CheckCodexVersionAsync();
+
         // Git check
         if (!GitHelper.IsGitRepository(selected))
         {
@@ -1131,6 +1133,27 @@ private async Task SelectWorkspaceAsync()
         await RestartCliAsync();
     }
 
+    private async Task CheckCodexVersionAsync()
+    {
+        try
+        {
+            var latest = CodexVersionService.TryReadLatestVersion();
+            if (!latest.Ok || string.IsNullOrWhiteSpace(latest.Version)) return;
+
+            var installed = await CodexVersionService.TryGetInstalledVersionAsync(_cli.Command, CurrentWorkspacePath ?? Directory.GetCurrentDirectory());
+            if (!installed.Ok || string.IsNullOrWhiteSpace(installed.Version)) return;
+
+            if (CodexVersionService.IsNewer(latest.Version, installed.Version))
+            {
+                AppendCliLog($"System: Codex {latest.Version} is available (installed {installed.Version}). Run 'codex update' to upgrade.");
+            }
+        }
+        catch
+        {
+            // best-effort; ignore failures
+        }
+    }
+
     private void LoadTree(string rootPath)
     {
         void DoLoad()
@@ -1686,7 +1709,7 @@ private void TryApplySyntaxHighlightingForPath(string? filePath)
                 ".js" => "source.js",
                 ".ts" => "source.ts",
                 ".json" => "source.json",
-                ".xml" => "text.xml",
+                ".xml" or ".xaml" or ".axaml" or ".csproj" => "text.xml",
                 ".yml" or ".yaml" => "source.yaml",
                 ".py" => "source.python",
                 ".rb" => "source.ruby",
@@ -1700,7 +1723,7 @@ private void TryApplySyntaxHighlightingForPath(string? filePath)
                 ".ps1" => "source.powershell",
                 ".sql" => "source.sql",
                 ".toml" => "source.toml",
-                ".ini" => "source.ini",
+                ".ini" or ".sln" => "source.ini",
                 _ => "text.plain"
             };
 
@@ -2152,7 +2175,8 @@ void HandleLine(string? line)
                                 var dlg = new Views.InputDialog { Title = "Enter Verification Code" };
                                 dlg.Prompt = "Paste the verification code from the browser:";
                                 dlg.Input = string.Empty;
-                                var code = await dlg.ShowDialog<string?>(this);
+                                var result = await dlg.ShowDialog<Views.InputDialogResult?>(this);
+                                var code = result?.Text;
                                 if (!string.IsNullOrWhiteSpace(code))
                                 {
                                     try { await p.StandardInput.WriteLineAsync(code); } catch { }
@@ -3409,20 +3433,58 @@ private async void OnGitCommitClick(object? sender, Avalonia.Interactivity.Route
         };
         dlg.Prompt = "Commit message:";
         dlg.Input = string.Empty;
-        var message = await dlg.ShowDialog<string?>(this);
-        if (message is null) return;
+        dlg.ShowCreatePullRequestOption = true;
+        var result = await dlg.ShowDialog<Views.InputDialogResult?>(this);
+        if (result is null) return;
+
+        var message = result.Text;
         var (ok, output, error) = GitHelper.TryCommitAll(CurrentWorkspacePath, message);
         if (ok)
         {
             AppendCliLog(output ?? "Committed.");
             LoadTree(CurrentWorkspacePath);
+
+            var (pushOk, pushOutput, pushError) = GitHelper.TryPushCurrentBranch(CurrentWorkspacePath);
+            if (pushOk)
+            {
+                if (!string.IsNullOrWhiteSpace(pushOutput)) AppendCliLog(pushOutput);
+                else AppendCliLog("Pushed changes to remote.");
+
+                if (result.CreatePullRequest)
+                {
+                    TryLaunchCreatePullRequest();
+                }
+            }
+            else
+            {
+                AppendCliLog("Git push failed: " + (pushError ?? "unknown error"));
+                if (result.CreatePullRequest)
+                {
+                    AppendCliLog("System: Skipping pull request shortcut because push did not succeed.");
+                }
+            }
         }
         else
         {
             AppendCliLog("Git commit failed: " + (error ?? "unknown error"));
         }
     }
 
+    private void TryLaunchCreatePullRequest()
+    {
+        if (!HasWorkspace || CurrentWorkspacePath is null) return;
+        var (ok, url, error) = GitHelper.TryBuildPullRequestUrl(CurrentWorkspacePath);
+        if (ok && !string.IsNullOrWhiteSpace(url))
+        {
+            AppendCliLog("System: Opening browser to create pull request…");
+            TryOpenUrl(url!);
+        }
+        else
+        {
+            AppendCliLog("System: Unable to prepare pull request: " + (error ?? "unknown error"));
+        }
+    }
+
     private async void OnGitNewBranchClick(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
     {
         if (!HasWorkspace || CurrentWorkspacePath is null || !IsGitRepo) return;
@@ -3432,7 +3494,8 @@ private async void OnGitNewBranchClick(object? sender, Avalonia.Interactivity.Ro
         };
         dlg.Prompt = "Branch name:";
         dlg.Input = string.Empty;
-        var name = await dlg.ShowDialog<string?>(this);
+        var result = await dlg.ShowDialog<Views.InputDialogResult?>(this);
+        var name = result?.Text;
         if (name is null) return;
         // Create branch based on default branch (main/master) and fetch origin first
         var (ok, output, error) = GitHelper.TryCreateAndCheckoutBranch(CurrentWorkspacePath, name, baseOnDefaultBranch: true, fetchOriginFirst: true);
@@ -3448,6 +3511,23 @@ private async void OnGitNewBranchClick(object? sender, Avalonia.Interactivity.Ro
         }
     }
 
+    private async void OnGitGetLatestClick(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        if (!HasWorkspace || CurrentWorkspacePath is null || !IsGitRepo) return;
+        AppendCliLog("System: Fetching latest changes…");
+        var (ok, output, error) = await Task.Run(() => GitHelper.TryFetchAndFastForward(CurrentWorkspacePath));
+        if (ok)
+        {
+            AppendCliLog(output ?? "Already up to date.");
+            RefreshGitUi();
+            LoadTree(CurrentWorkspacePath);
+        }
+        else
+        {
+            AppendCliLog("Git update failed: " + (error ?? "unknown error"));
+        }
+    }
+
     private void OnGitRefreshClick(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
     {
         RefreshGitUi();
@@ -3461,7 +3541,8 @@ private async void OnGitSwitchBranchClick(object? sender, Avalonia.Interactivity
         var dlg = new Views.InputDialog { Title = "Switch Branch" };
         dlg.Prompt = "Branch name:";
         dlg.Input = CurrentBranch;
-        var name = await dlg.ShowDialog<string?>(this);
+        var result = await dlg.ShowDialog<Views.InputDialogResult?>(this);
+        var name = result?.Text;
         if (string.IsNullOrWhiteSpace(name)) return;
         var (ok, output, error) = GitHelper.TryCheckoutBranch(CurrentWorkspacePath, name);
         if (ok)

SemanticDeveloper/SemanticDeveloper/README.md

@@ -105,6 +105,8 @@ The app integrates basic Git operations directly in the header. All actions use
     - Stages all changes (`*`) and creates a commit with the provided message.
     - Uses your Git config for name/email if available; otherwise falls back to a local signature like `<user>@local`.
     - If there are no changes, you’ll get a friendly “No changes to commit.” notice.
+    - Automatically pushes the current branch to its tracked remote (defaults to `origin`).
+    - Optional: tick **Create Pull Request** to open your browser to a GitHub compare page after a successful push.
   - New Branch…
     - Creates and checks out a new branch based on the default branch when available.
     - Behavior details:
@@ -113,20 +115,31 @@ The app integrates basic Git operations directly in the header. All actions use
       - Example log: `Created and checked out 'feature-x' (based on origin/main).`
   - Switch Branch…
     - Checks out an existing branch by name (no automatic fetch/merge).
+  - Get Latest
+    - Fetches from the tracked remote (defaults to `origin`) and fast-forwards the current branch when possible.
+    - Requires the branch to track a remote counterpart; otherwise a helpful log message is shown.
+    - Stops early if a merge or rebase would be required (fast-forward only).
   - Rollback Changes…
     - Hard‑resets the working directory to `HEAD` and deletes untracked files.
     - Prompts for confirmation since this discards local changes.
   - Refresh
     - Refreshes the branch label and the file tree’s Git status coloring.
 
+Example workflow
+1. Switch to an existing base branch (e.g., `main` or `master`).
+2. Choose **Git ▾ → Get Latest** to fast-forward your local branch.
+3. Use **Git ▾ → New Branch…** with your preferred naming convention (e.g., `feature/login-form`).
+4. After making changes, select **Commit…**, enter a message, let the app push the branch for you, and optionally enable **Create Pull Request** to jump straight to GitHub once the push completes.
+
 - Initialize Git…
   - When the workspace is not a Git repo, an “Initialize Git…” button appears in the header.
   - Initializes a repository in the selected folder, stages files, and attempts an initial commit (best‑effort).
   - This is the same capability offered right after selecting a non‑repo folder.
 
 Notes
-- Operations are local and safe: no network is used except the optional `fetch` for “New Branch…”.
-- Pull/push are not exposed in the UI. If desired, they can be added later.
+- Operations are local unless a remote call is required (the optional `fetch` during “New Branch…”, the fast-forward fetch performed by “Get Latest”, and the push that runs after each commit).
+- Open your workspace at the root of the Git repository (the folder containing `.git/`) so the app can detect and enable Git features; selecting a subdirectory skips the Git UI.
+- Pull support is limited to fast-forwarding via **Get Latest**; pushing is still not exposed in the UI.
 - On some Linux distros, libgit2 may require additional native dependencies. If the Git library can’t load, the UI will hide Git actions and log a helpful message.
 
 ## Conversation & Protocol Behavior

SemanticDeveloper/SemanticDeveloper/SemanticDeveloper.csproj

@@ -44,6 +44,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
   <!-- MCP mux removed; servers are loaded directly by Codex via config flags. -->
 </Project>