From 1ad9256317f83b638e8afc542651a0feb94f7162 Mon Sep 17 00:00:00 2001
From: ag321132 <131104963+ag321132@users.noreply.github.com>
Date: Fri, 5 Jun 2026 22:53:58 -0400
Subject: [PATCH 1/3] Add MIT license

---
 LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e8902f7
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Arseniy Grechenkov
+
+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.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From c63a9ab45e4806143aaffdb8e572f6c88b3285db Mon Sep 17 00:00:00 2001
From: ag321132 <131104963+ag321132@users.noreply.github.com>
Date: Fri, 5 Jun 2026 23:01:26 -0400
Subject: [PATCH 2/3] Fix CI workflow

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d0487f..c0bf668 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
 
       - name: Pytest
         shell: pwsh
-        run: pytest tests -q
+        run: python -m pytest tests -q
 
   ahk:
     name: AutoHotkey syntax check
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install AutoHotkey v2
         shell: pwsh
-        run: choco install autohotkey --version=2.0.11 -y --no-progress
+        run: choco install autohotkey --version=2.0.26 -y --no-progress
       - name: Validate AutoHotkey scripts (brace balance, all .ahk)
         shell: pwsh
         run: |

From ab072d73c3de1083d60ba117ec614ebadc63e7bf Mon Sep 17 00:00:00 2001
From: ag321132 <131104963+ag321132@users.noreply.github.com>
Date: Fri, 5 Jun 2026 23:06:22 -0400
Subject: [PATCH 3/3] Fix Windows CI failures

---
 .github/workflows/ci.yml | 3 ++-
 scripts/paths.py         | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0bf668..1bb2100 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,7 +81,8 @@ jobs:
           if (-not $ahk) { Write-Host "AutoHotkey64.exe not found; skipping parse-check"; exit 0 }
           $stub = Join-Path $env:RUNNER_TEMP "_ci_syntaxcheck.ahk"
           # ExitApp(0) runs before any hotkey binds; #Include pulls the whole tree.
-          Set-Content -LiteralPath $stub -Encoding UTF8 -Value "ExitApp(0)`n#Include grammarFix.ahk`n"
+          $main = (Resolve-Path -LiteralPath "scripts\grammarFix.ahk").Path
+          Set-Content -LiteralPath $stub -Encoding UTF8 -Value "ExitApp(0)`n#Include `"$main`"`n"
           $errFile = Join-Path $env:RUNNER_TEMP "_ci_syntaxcheck.err"
           $p = Start-Process -FilePath $ahk.FullName -ArgumentList @('/ErrorStdOut', "`"$stub`"") -WorkingDirectory "scripts" -RedirectStandardError $errFile -PassThru -Wait
           $e = Get-Content -Raw -LiteralPath $errFile -ErrorAction SilentlyContinue
diff --git a/scripts/paths.py b/scripts/paths.py
index 809e919..88e50ec 100644
--- a/scripts/paths.py
+++ b/scripts/paths.py
@@ -46,6 +46,7 @@
 from __future__ import annotations
 
 import os
+import shutil
 from pathlib import Path
 
 # ---------- Mode detection ---------------------------------------------------
@@ -239,8 +240,11 @@ def migrate_legacy_layout() -> list[str]:
             continue
         try:
             dst.parent.mkdir(parents=True, exist_ok=True)
-            src.replace(dst)
+            try:
+                src.replace(dst)
+            except OSError:
+                shutil.move(str(src), str(dst))
             moved.append(f"{src.name} -> {dst.parent.name}/{dst.name}")
-        except OSError as e:
+        except (OSError, shutil.Error) as e:
             moved.append(f"FAILED to move {src.name}: {e}")
     return moved