Merge pull request #5 from semantic-developer/feature/tweaks

added license, api key usage, shell updates

Author: semantic-developer

LICENSE

@@ -0,0 +1,209 @@
+Copyright 2025 Stainless Designer LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

NOTICE

@@ -0,0 +1,18 @@
+NOTICE
+======
+
+This project integrates with Codex CLI (https://github.com/openai/codex).
+
+Codex CLI is licensed under the MIT License:
+
+Copyright (c) OpenAI
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.

SemanticDeveloper/README.md

@@ -36,6 +36,7 @@ A cross‑platform desktop UI (Avalonia/.NET 8) for driving the Codex CLI using
    - `Command` (default: `codex`)
    - `Additional Arguments` (e.g., `--model=gpt-5-high` or `-c model=gpt-5-high`)
    - Verbose logging (show suppressed output)
+   - Use API Key for Codex CLI (stores and injects `OPENAI_API_KEY` when starting the CLI)
 
 5. The left file tree and right log pane are resizable using the vertical splitter between them.
 

SemanticDeveloper/SemanticDeveloper/MainWindow.axaml.cs

@@ -62,6 +62,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
     public TextDocument BaseFileDocument { get; } = new TextDocument();
     private DiffGutterRenderer? _baseDiffRenderer;
     private DiffGutterRenderer? _currentDiffRenderer;
+    private DiffGutterRenderer? _singleDiffRenderer;
     private TextEditor? _editorBase;
     private TextEditor? _editorCurrent;
     private TextEditor? _editorCurrent2;
@@ -119,6 +120,8 @@ public MainWindow()
         _settings = SettingsService.Load();
         _cli.Command = _settings.Command;
         _cli.AdditionalArgs = _settings.AdditionalArgs;
+        _cli.UseApiKey = _settings.UseApiKey;
+        _cli.ApiKey = string.IsNullOrWhiteSpace(_settings.ApiKey) ? null : _settings.ApiKey;
         AppendCliLog($"System: Loaded CLI settings: '{_cli.Command}' {_cli.AdditionalArgs}");
         _currentModel = TryExtractModelFromArgs(_cli.AdditionalArgs);
         _verboseLogging = _settings.VerboseLoggingEnabled;
@@ -184,6 +187,11 @@ public string? CurrentWorkspacePath
             _shellCwd = _currentWorkspacePath;
             _shellPrevCwd = null;
             OnPropertyChanged(nameof(ShellPromptPath));
+            // If no workspace is selected, reflect disconnected status
+            if (string.IsNullOrWhiteSpace(_currentWorkspacePath) || !Directory.Exists(_currentWorkspacePath))
+            {
+                SessionStatus = "disconnected";
+            }
         }
     }
 
@@ -300,7 +308,7 @@ public string CliInput
         }
     }
 
-    private string _sessionStatus = "idle";
+    private string _sessionStatus = "disconnected";
     public string SessionStatus
     {
         get => _sessionStatus;
@@ -595,6 +603,7 @@ private bool TryRenderProtocolEvent(string line)
                     {
                         try { LoadTree(CurrentWorkspacePath); } catch { }
                     }
+                    try { UpdateSingleDiffGutter(); } catch { }
                     return true;
                 }
             case "turn_diff":
@@ -916,6 +925,7 @@ await Dispatcher.UIThread.InvokeAsync(() =>
                     CurrentFileDocument.Text = text;
                 else
                     Dispatcher.UIThread.Post(() => CurrentFileDocument.Text = text);
+                UpdateSingleDiffGutter();
                 await Dispatcher.UIThread.InvokeAsync(() =>
                 {
                     if (_imageCurrent != null) { _imageCurrent.IsVisible = false; _imageCurrent.Source = null; }
@@ -1119,8 +1129,10 @@ private async void OnSaveCurrentFileClick(object? sender, RoutedEventArgs e)
             }
             AppendCliLog($"System: Saved '{_selectedFilePath}'.");
 
-            // Refresh diff sets and base doc if compare is on
-            await RefreshBaseDocumentAsync();
+        // Refresh diff sets and base doc if compare is on
+        await RefreshBaseDocumentAsync();
+        // Refresh single-view gutter indicators
+        UpdateSingleDiffGutter();
 
             // Update git status for the saved file only (avoid repo-wide status scan)
             try
@@ -1177,6 +1189,11 @@ private void TrySetupEditors()
             if (_editorCurrent is not null)
             {
                 try { var inst = _editorCurrent.InstallTextMate(_editorRegistryOptions); } catch { }
+                if (_singleDiffRenderer == null)
+                {
+                    _singleDiffRenderer = new DiffGutterRenderer { ShowAdded = true };
+                    _editorCurrent.TextArea.TextView.BackgroundRenderers.Add(_singleDiffRenderer);
+                }
             }
 
             EnsureScrollSyncHandlers();
@@ -1380,6 +1397,18 @@ private void TryApplySyntaxHighlightingForPath(string? filePath)
         catch { }
     }
 
+    private void UpdateSingleDiffGutter()
+    {
+        try
+        {
+            if (_singleDiffRenderer == null || string.IsNullOrWhiteSpace(_selectedFilePath)) return;
+            var (ok, baseDeleted, currentAdded, err) = Services.GitHelper.TryGetLineDiffSets(_selectedFilePath!);
+            _singleDiffRenderer.Update(ok ? currentAdded : new System.Collections.Generic.HashSet<int>(), null);
+            try { _editorCurrent?.TextArea?.TextView?.InvalidateLayer(KnownLayer.Background); } catch { }
+        }
+        catch { }
+    }
+
     private async Task RestartCliAsync()
     {
         if (!HasWorkspace || CurrentWorkspacePath is null)
@@ -1467,7 +1496,9 @@ private async void OnOpenCliSettingsClick(object? sender, Avalonia.Interactivity
         {
             Command = _cli.Command,
             AdditionalArgs = _cli.AdditionalArgs,
-            VerboseLoggingEnabled = _verboseLogging
+            VerboseLoggingEnabled = _verboseLogging,
+            UseApiKey = _settings.UseApiKey,
+            ApiKey = _settings.ApiKey
         };
         dialog.DataContext = vm;
         var result = await dialog.ShowDialog<CliSettings?>(this);
@@ -1479,6 +1510,10 @@ private async void OnOpenCliSettingsClick(object? sender, Avalonia.Interactivity
         _settings.Command = _cli.Command;
         _settings.AdditionalArgs = _cli.AdditionalArgs;
         _settings.VerboseLoggingEnabled = result.VerboseLoggingEnabled;
+        _settings.UseApiKey = result.UseApiKey;
+        _settings.ApiKey = result.ApiKey ?? string.Empty;
+        _cli.UseApiKey = _settings.UseApiKey;
+        _cli.ApiKey = string.IsNullOrWhiteSpace(_settings.ApiKey) ? null : _settings.ApiKey;
         SettingsService.Save(_settings);
         _currentModel = TryExtractModelFromArgs(_cli.AdditionalArgs);
         _verboseLogging = result.VerboseLoggingEnabled;

SemanticDeveloper/SemanticDeveloper/Models/AppSettings.cs

@@ -5,4 +5,6 @@ public class AppSettings
     public string Command { get; set; } = "codex";
     public string AdditionalArgs { get; set; } = string.Empty;
     public bool VerboseLoggingEnabled { get; set; } = false;
+    public bool UseApiKey { get; set; } = false;
+    public string ApiKey { get; set; } = string.Empty;
 }

SemanticDeveloper/SemanticDeveloper/Services/CodexCliService.cs

@@ -13,6 +13,8 @@ public class CodexCliService
     public bool UseProto => true;                   // Always use --proto for this app
     public string AdditionalArgs { get; set; } = string.Empty; // Extra CLI args if needed
     public bool IsRunning => _process is { HasExited: false };
+    public bool UseApiKey { get; set; } = false;
+    public string? ApiKey { get; set; }
 
     public event EventHandler<string>? OutputReceived;
     public event EventHandler? Exited;
@@ -40,6 +42,17 @@ public async Task StartAsync(string workspacePath, CancellationToken cancellatio
             CreateNoWindow = true
         };
 
+        // Inject API key env var when enabled
+        try
+        {
+            if (UseApiKey && !string.IsNullOrWhiteSpace(ApiKey))
+            {
+                // ProcessStartInfo.Environment is available on .NET 8
+                psi.Environment["OPENAI_API_KEY"] = ApiKey!;
+            }
+        }
+        catch { }
+
         var p = new Process { StartInfo = psi, EnableRaisingEvents = true };
         p.OutputDataReceived += (_, e) => { if (e.Data != null) OutputReceived?.Invoke(this, e.Data); };
         p.ErrorDataReceived += (_, e) => { if (e.Data != null) OutputReceived?.Invoke(this, e.Data); };