Merge pull request #24 from TimeWarpEngineering/Cramer/2025-12-22/dev

Integrate TimeWarp.Nuru.DevCli shared endpoints

Author: StevenTCramer

.gitignore

@@ -420,3 +420,6 @@ tools/dev-cli/generated/
 
 # Dev CLI AOT binary
 bin/
+
+# VS Code language server cache
+*.lscache

.timewarp/dev.jsonc

@@ -0,0 +1,7 @@
+{
+  // Per-repo configuration for TimeWarp.Terminal dev-cli
+  "checkVersionConfig": {
+    "checkVersionStrategy": "nuget-search",
+    "packages": "TimeWarp.Terminal"
+  }
+}

Directory.Packages.props

@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <!-- MSBuild and NuGet behavior configuration -->
   <PropertyGroup Label="MSBuild/NuGet Configuration">
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup Label="TimeWarp Packages">
-    <PackageVersion Include="TimeWarp.Amuru" Version="1.0.0-beta.21" />
-    <PackageVersion Include="TimeWarp.Builder" Version="1.0.0-beta.1" />
+    <PackageVersion Include="TimeWarp.Amuru" Version="1.0.0-beta.33" />
+    <PackageVersion Include="TimeWarp.Builder" Version="1.0.0-beta.2" />
     <PackageVersion Include="TimeWarp.Jaribu" Version="1.0.0-beta.12" />
-    <PackageVersion Include="TimeWarp.Nuru" Version="3.0.0-beta.63" />
+    <PackageVersion Include="TimeWarp.Nuru" Version="3.0.0-beta.70" />
+    <PackageVersion Include="TimeWarp.Nuru.DevCli" Version="3.0.0-beta.70" />
   </ItemGroup>
   <ItemGroup Label="Testing">
     <PackageVersion Include="Shouldly" Version="4.3.0" />
@@ -17,7 +18,7 @@
     <PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
     <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.15.0" />
     <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.15.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.201" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.300" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.3.0" />
   </ItemGroup>
 </Project>

kanban/in-progress/021-integrate-timewarpnurudevcli-shared-endpoints.md

@@ -0,0 +1,68 @@
+# Integrate TimeWarp.Nuru.DevCli shared endpoints
+
+## Description
+
+Replace custom `clean`, `check-version`, and `self-install` endpoint implementations with shared endpoints from the `TimeWarp.Nuru.DevCli` NuGet package. This reduces code duplication across TimeWarp repositories and ensures consistent behavior.
+
+## Checklist
+
+- [ ] Add `TimeWarp.Nuru.DevCli` package version to `Directory.Packages.props`
+- [ ] Add `<PackageReference Include="TimeWarp.Nuru.DevCli" />` to `tools/dev-cli/Directory.Build.props`
+- [ ] Update `tools/dev-cli/dev.cs` to register Amuru services in `ConfigureServices()`
+- [ ] Delete `tools/dev-cli/endpoints/clean.cs` (replaced by shared)
+- [ ] Delete `tools/dev-cli/endpoints/check-version.cs` (replaced by shared)
+- [ ] Delete `tools/dev-cli/endpoints/self-install.cs` (replaced by shared)
+- [ ] Run `./bin/dev self-install` to rebuild the CLI
+- [ ] Verify `./bin/dev clean` works
+- [ ] Verify `./bin/dev check-version` works
+- [ ] Verify `./bin/dev self-install` works
+
+## Notes
+
+### Service Registration
+
+The shared endpoints require these services from TimeWarp.Amuru:
+- `IRepoCleanService` / `RepoCleanService` - comprehensive cleaning (bin/obj directories)
+- `IRepoCheckVersionService` / `RepoCheckVersionService` - version checking with multiple strategies
+- `IRepoConfigService` / `RepoConfigService` - per-repo config defaults
+
+Register in `dev.cs`:
+```csharp
+NuruApp app = NuruApp.CreateBuilder()
+  .WithDescription("Development CLI for timewarp-terminal")
+  .ConfigureServices(services =>
+  {
+    services.AddSingleton<IRepoCleanService, RepoCleanService>();
+    services.AddSingleton<IRepoCheckVersionService, RepoCheckVersionService>();
+    services.AddSingleton<IRepoConfigService, RepoConfigService>();
+  })
+  .DiscoverEndpoints()
+  .Build();
+```
+
+### Source-Gen DI
+
+Nuru's source-gen DI handles services registered via `ConfigureServices()`. No `UseMicrosoftDependencyInjection()` needed.
+
+### repo.yaml (Optional)
+
+Can create `.timewarp/repo.yaml` for check-version defaults:
+```yaml
+check-version:
+  strategy: nuget-search
+  packages: TimeWarp.Terminal
+```
+
+This is optional - can pass `--strategy nuget-search --package TimeWarp.Terminal` on command line instead.
+
+### Shared vs Custom Endpoints
+
+| Endpoint | Shared Package | Notes |
+|----------|---------------|-------|
+| `clean` | Yes | Uses `IRepoCleanService` |
+| `check-version` | Yes | Uses `IRepoCheckVersionService`, `IRepoConfigService` |
+| `self-install` | Yes | Standalone (no service deps) |
+| `build` | No | Keep custom |
+| `test` | No | Keep custom |
+| `verify-samples` | No | Keep custom |
+| `workflow` | No | Keep custom (orchestrates other commands) |

source/Directory.Build.props

@@ -4,7 +4,7 @@
 
   <!-- Default package metadata (can be overridden in individual projects) -->
   <PropertyGroup Label="Package Metadata">
-    <Version>1.0.0-beta.12</Version>
+    <Version>1.0.0-beta.13</Version>
     <Authors>Steven T. Cramer</Authors>
     <RepositoryUrl>https://github.com/TimeWarpEngineering/timewarp-terminal</RepositoryUrl>
     <PackageLicenseExpression>Unlicense</PackageLicenseExpression>