fix: Windows compatibility for setup-claude and MSBuild detection

- Change slash command files from cg:*.md to cg/*.md subdirectory
  (Windows doesn't allow colons in filenames)
- Fix Microsoft.Build.Locator packaging with ExcludeAssets to include
  runtime assembly while excluding problematic build targets
- Add PATH-based MSBuild detection fallback when standard locator fails
- Update README and CLAUDE.md snippet with new /cg/ command format
- Bump version to 0.2.0

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: Krystian Mikrut

AiCodeGraph.Cli/AiCodeGraph.Cli.csproj

@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.11.2" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.11.2" ExcludeAssets="build;buildTransitive" />
     <PackageReference Include="System.CommandLine" Version="2.0.2" />
   </ItemGroup>
 
@@ -17,7 +17,7 @@
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>ai-code-graph</ToolCommandName>
     <PackageOutputPath>./nupkg</PackageOutputPath>
-    <Version>0.1.1</Version>
+    <Version>0.2.0</Version>
     <PackageId>AiCodeGraph.Cli</PackageId>
     <Description>Roslyn-based static analysis tool that builds semantic code graphs, detects duplicates, computes complexity, and exposes an MCP server for AI-assisted development.</Description>
     <Authors>AiCodeGraph Contributors</Authors>

AiCodeGraph.Cli/Program.cs

@@ -1760,12 +1760,12 @@
     var dbPath = parseResult.GetValue(setupDbOption) ?? "./ai-code-graph/graph.db";
     var created = new List<string>();
 
-    // 1. Create .claude/commands/ directory
-    var commandsDir = Path.Combine(Directory.GetCurrentDirectory(), ".claude", "commands");
+    // 1. Create .claude/commands/cg/ directory
+    var commandsDir = Path.Combine(Directory.GetCurrentDirectory(), ".claude", "commands", "cg");
     Directory.CreateDirectory(commandsDir);
 
     // 2. Write slash command files
-    var contextCmd = Path.Combine(commandsDir, "cg:context.md");
+    var contextCmd = Path.Combine(commandsDir, "context.md");
     if (!File.Exists(contextCmd))
     {
         File.WriteAllText(contextCmd, $@"Get method context before editing: $ARGUMENTS
@@ -1782,7 +1782,7 @@ 4. If complexity (CC) is high (>10), warn about the method's complexity before m
         created.Add(contextCmd);
     }
 
-    var hotspotsCmd = Path.Combine(commandsDir, "cg:hotspots.md");
+    var hotspotsCmd = Path.Combine(commandsDir, "hotspots.md");
     if (!File.Exists(hotspotsCmd))
     {
         File.WriteAllText(hotspotsCmd, $@"Show complexity hotspots in the codebase.
@@ -1796,7 +1796,7 @@ 1. Run `ai-code-graph hotspots --top 15 --db {dbPath}`
         created.Add(hotspotsCmd);
     }
 
-    var duplicatesCmd = Path.Combine(commandsDir, "cg:duplicates.md");
+    var duplicatesCmd = Path.Combine(commandsDir, "duplicates.md");
     if (!File.Exists(duplicatesCmd))
     {
         File.WriteAllText(duplicatesCmd, $@"Show detected code duplicates in the codebase.
@@ -1811,7 +1811,7 @@ 3. Group the results by clone type (Type1 = exact, Type2 = renamed, Semantic = s
         created.Add(duplicatesCmd);
     }
 
-    var driftCmd = Path.Combine(commandsDir, "cg:drift.md");
+    var driftCmd = Path.Combine(commandsDir, "drift.md");
     if (!File.Exists(driftCmd))
     {
         File.WriteAllText(driftCmd, $@"Run drift detection against the baseline.
@@ -1830,7 +1830,7 @@ 3. Group the results by clone type (Type1 = exact, Type2 = renamed, Semantic = s
         created.Add(driftCmd);
     }
 
-    var callgraphCmd = Path.Combine(commandsDir, "cg:callgraph.md");
+    var callgraphCmd = Path.Combine(commandsDir, "callgraph.md");
     if (!File.Exists(callgraphCmd))
     {
         File.WriteAllText(callgraphCmd, $@"Explore method call graph: $ARGUMENTS
@@ -1845,7 +1845,7 @@ 4. Highlight any deep call chains or circular dependencies
         created.Add(callgraphCmd);
     }
 
-    var treeCmd = Path.Combine(commandsDir, "cg:tree.md");
+    var treeCmd = Path.Combine(commandsDir, "tree.md");
     if (!File.Exists(treeCmd))
     {
         File.WriteAllText(treeCmd, $@"Display code structure tree.
@@ -1859,7 +1859,7 @@ 4. Use the structure to understand codebase organization
         created.Add(treeCmd);
     }
 
-    var similarCmd = Path.Combine(commandsDir, "cg:similar.md");
+    var similarCmd = Path.Combine(commandsDir, "similar.md");
     if (!File.Exists(similarCmd))
     {
         File.WriteAllText(similarCmd, $@"Find methods similar to: $ARGUMENTS
@@ -1873,7 +1873,7 @@ 3. Present ranked list of similar methods with similarity scores
         created.Add(similarCmd);
     }
 
-    var clustersCmd = Path.Combine(commandsDir, "cg:clusters.md");
+    var clustersCmd = Path.Combine(commandsDir, "clusters.md");
     if (!File.Exists(clustersCmd))
     {
         File.WriteAllText(clustersCmd, $@"Show intent clusters in the codebase.
@@ -1887,7 +1887,7 @@ 4. Highlight clusters with low cohesion (<0.5) as refactoring candidates
         created.Add(clustersCmd);
     }
 
-    var searchCmd = Path.Combine(commandsDir, "cg:token-search.md");
+    var searchCmd = Path.Combine(commandsDir, "token-search.md");
     if (!File.Exists(searchCmd))
     {
         File.WriteAllText(searchCmd, $@"Search code by token overlap: $ARGUMENTS
@@ -1901,7 +1901,7 @@ 4. Suggest which methods are most relevant to the query
         created.Add(searchCmd);
     }
 
-    var exportCmd = Path.Combine(commandsDir, "cg:export.md");
+    var exportCmd = Path.Combine(commandsDir, "export.md");
     if (!File.Exists(exportCmd))
     {
         File.WriteAllText(exportCmd, $@"Export code graph data.
@@ -1914,7 +1914,7 @@ 3. Present a summary of the exported data
         created.Add(exportCmd);
     }
 
-    var analyzeCmd = Path.Combine(commandsDir, "cg:analyze.md");
+    var analyzeCmd = Path.Combine(commandsDir, "analyze.md");
     if (!File.Exists(analyzeCmd))
     {
         File.WriteAllText(analyzeCmd, @"Analyze solution and build code graph.
@@ -1928,7 +1928,7 @@ 4. Inform the user that all slash commands are now available
         created.Add(analyzeCmd);
     }
 
-    var churnCmd = Path.Combine(commandsDir, "cg:churn.md");
+    var churnCmd = Path.Combine(commandsDir, "churn.md");
     if (!File.Exists(churnCmd))
     {
         File.WriteAllText(churnCmd, $@"Show methods with high change-frequency x complexity (churn hotspots): $ARGUMENTS
@@ -1978,7 +1978,7 @@ 5. Suggest which methods would benefit most from refactoring to reduce complexit
 - Apply the same fix to duplicates when fixing bugs
 - Understand which intent cluster a method belongs to before refactoring
 
-Available slash commands (all prefixed with `cg:`):
+Available slash commands:
 - `/cg:analyze [solution]` - Analyze solution and build the graph
 - `/cg:context <method>` - Full method context before editing
 - `/cg:hotspots` - Top complexity hotspots

AiCodeGraph.Core/AiCodeGraph.Core.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.11.2" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.11.2" ExcludeAssets="build;buildTransitive" />
     <PackageReference Include="Microsoft.Build.Framework" Version="17.11.31" ExcludeAssets="runtime" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />

AiCodeGraph.Core/WorkspaceLoader.cs

@@ -17,7 +17,59 @@ private static void EnsureMSBuildRegistered()
         lock (_registrationLock)
         {
             if (_msBuildRegistered) return;
-            MSBuildLocator.RegisterDefaults();
+
+            // Query all discovery types
+            var instances = MSBuildLocator.QueryVisualStudioInstances(
+                new VisualStudioInstanceQueryOptions
+                {
+                    DiscoveryTypes = DiscoveryType.DeveloperConsole
+                        | DiscoveryType.DotNetSdk
+                        | DiscoveryType.VisualStudioSetup
+                }).ToList();
+
+            if (instances.Count == 0)
+            {
+                // Try default query without options as fallback
+                instances = MSBuildLocator.QueryVisualStudioInstances().ToList();
+            }
+
+            if (instances.Count == 0)
+            {
+                // Try to detect MSBuild from MSBUILD_EXE_PATH or PATH
+                var msbuildPath = Environment.GetEnvironmentVariable("MSBUILD_EXE_PATH");
+                if (string.IsNullOrEmpty(msbuildPath))
+                {
+                    // Try to find MSBuild in PATH
+                    var pathEnv = Environment.GetEnvironmentVariable("PATH") ?? "";
+                    var paths = pathEnv.Split(Path.PathSeparator);
+                    foreach (var p in paths)
+                    {
+                        var candidate = Path.Combine(p, "MSBuild.exe");
+                        if (File.Exists(candidate))
+                        {
+                            msbuildPath = candidate;
+                            break;
+                        }
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(msbuildPath) && File.Exists(msbuildPath))
+                {
+                    var msbuildDir = Path.GetDirectoryName(msbuildPath)!;
+                    MSBuildLocator.RegisterMSBuildPath(msbuildDir);
+                    _msBuildRegistered = true;
+                    return;
+                }
+
+                throw new InvalidOperationException(
+                    "No instances of MSBuild could be detected. " +
+                    "Ensure Visual Studio, VS Build Tools, or the .NET SDK is installed. " +
+                    "If using .NET SDK only, ensure the SDK includes MSBuild (run 'dotnet --list-sdks' to verify).");
+            }
+
+            // Prefer the latest version
+            var instance = instances.OrderByDescending(i => i.Version).First();
+            MSBuildLocator.RegisterInstance(instance);
             _msBuildRegistered = true;
         }
     }

CLAUDE.md

@@ -59,17 +59,18 @@ This returns complexity, callers, callees, cluster membership, and duplicates in
 - Understand which intent cluster a method belongs to before refactoring
 
 Available slash commands:
-- `/cg/analyze [solution]` - Analyze solution and build the graph
-- `/cg/context <method>` - Full method context before editing
-- `/cg/hotspots` - Top complexity hotspots
-- `/cg/callgraph <method>` - Explore call relationships
-- `/cg/similar <method>` - Find methods with similar intent
-- `/cg/token-search <query>` - Token-based code search
-- `/cg/duplicates` - Detected code clones
-- `/cg/clusters` - Intent clusters
-- `/cg/tree` - Code structure tree
-- `/cg/export` - Export graph data
-- `/cg/drift` - Architectural drift from baseline
+- `/cg:analyze [solution]` - Analyze solution and build the graph
+- `/cg:context <method>` - Full method context before editing
+- `/cg:hotspots` - Top complexity hotspots
+- `/cg:callgraph <method>` - Explore call relationships
+- `/cg:similar <method>` - Find methods with similar intent
+- `/cg:token-search <query>` - Token-based code search
+- `/cg:duplicates` - Detected code clones
+- `/cg:clusters` - Intent clusters
+- `/cg:tree` - Code structure tree
+- `/cg:export` - Export graph data
+- `/cg:drift` - Architectural drift from baseline
+- `/cg:churn` - Change-frequency x complexity hotspots
 
 To rebuild the graph after significant changes: `ai-code-graph analyze AiCodeGraph.sln`
 

README.md

@@ -138,18 +138,19 @@ ai-code-graph/
 │   ├── WorkspaceLoader.cs     # Roslyn MSBuild workspace loader
 │   └── CodeModelExtractor.cs  # Syntax/semantic model extraction
 ├── AiCodeGraph.Tests/         # Unit and integration tests
-├── .claude/commands/           # Claude Code slash commands (11 commands)
-│   ├── cg:analyze.md          # /cg:analyze - build code graph
-│   ├── cg:context.md          # /cg:context - method context
-│   ├── cg:hotspots.md         # /cg:hotspots - complexity hotspots
-│   ├── cg:callgraph.md        # /cg:callgraph - call relationships
-│   ├── cg:similar.md          # /cg:similar - find similar methods
-│   ├── cg:search.md           # /cg:search - natural language search
-│   ├── cg:duplicates.md       # /cg:duplicates - code clones
-│   ├── cg:clusters.md         # /cg:clusters - intent clusters
-│   ├── cg:tree.md             # /cg:tree - code structure
-│   ├── cg:export.md           # /cg:export - export graph data
-│   └── cg:drift.md            # /cg:drift - architectural drift
+├── .claude/commands/cg/        # Claude Code slash commands (12 commands)
+│   ├── analyze.md             # /cg:analyze - build code graph
+│   ├── context.md             # /cg:context - method context
+│   ├── hotspots.md            # /cg:hotspots - complexity hotspots
+│   ├── callgraph.md           # /cg:callgraph - call relationships
+│   ├── similar.md             # /cg:similar - find similar methods
+│   ├── token-search.md        # /cg:token-search - token-based search
+│   ├── duplicates.md          # /cg:duplicates - code clones
+│   ├── clusters.md            # /cg:clusters - intent clusters
+│   ├── tree.md                # /cg:tree - code structure
+│   ├── export.md              # /cg:export - export graph data
+│   ├── drift.md               # /cg:drift - architectural drift
+│   └── churn.md               # /cg:churn - churn hotspots
 ├── tests/fixtures/            # Test fixture solutions
 └── .github/workflows/         # CI pipeline
 ```
@@ -209,7 +210,7 @@ ai-code-graph analyze YourSolution.sln
 ```
 
 This creates:
-- `.claude/commands/*.md` - All 11 slash commands (analyze, context, hotspots, callgraph, similar, search, duplicates, clusters, tree, export, drift)
+- `.claude/commands/cg/*.md` - All 12 slash commands (analyze, context, hotspots, callgraph, similar, token-search, duplicates, clusters, tree, export, drift, churn)
 - `.mcp.json` - MCP server configuration exposing all 11 tools for IDE integration
 - `CLAUDE.md` snippet - Auto-context instructions for the agent
 
@@ -222,12 +223,13 @@ This creates:
 | `/cg:hotspots` | Show top complexity hotspots as refactoring candidates |
 | `/cg:callgraph <method>` | Explore method call relationships (callers and callees) |
 | `/cg:similar <method>` | Find methods with similar semantic intent |
-| `/cg:search <query>` | Natural language code search via embeddings |
+| `/cg:token-search <query>` | Token-based code search |
 | `/cg:duplicates` | Show detected code clones grouped by type |
 | `/cg:clusters` | Show intent clusters (groups of related methods) |
 | `/cg:tree` | Display code structure (projects, namespaces, types) |
 | `/cg:export` | Export full code graph data as JSON |
 | `/cg:drift` | Run drift detection against a saved baseline |
+| `/cg:churn` | Show change-frequency x complexity hotspots |
 
 **Auto-context:** The `CLAUDE.md` snippet instructs Claude Code to automatically run `ai-code-graph context` before modifying methods when the graph database exists. This gives the agent architectural awareness without manual intervention.