Reorganise by feature, rename to Novelly, add Aspire and a pre-push hook

The layered split into Domain/Application/Infrastructure/Api was forcing organisation by layer: adding one capability meant touching four projects and four folders that each held a slice of it. Those four projects are now one feature-organised Novelly.Api, where each folder — Projects, Characters, Chapters, Beats, Scenes, Tags, Agent — holds its entity, DTOs, service and endpoints together. Common/ holds what genuinely crosses features (the patch semantics, the two exception types, DraftStatus) and Data/ holds the DbContext and migrations. Six .NET projects become five: the three layer projects are gone, and Novelly.AppHost and Novelly.ServiceDefaults are new. - Namespaces move from NovelSoftware.* to Novelly.*, including the entity type names recorded in the EF model snapshots. The migration ids are untouched, so an existing novel.db still migrates cleanly — verified against a fresh file. - Aspire orchestration mirrors the mic-check setup: the AppHost starts the API on :5080 and the Vite dev server on :5173, and the API picks up OpenTelemetry, health checks and service discovery from ServiceDefaults. /health and /alive now answer in development. - A Husky pre-push hook runs scripts/ci/prepush.sh: build, test, then a web build. The scripts are plain bash so CI can run the same steps. - The MCP server's env var is now NOVELLY_API_URL. Verified beyond the build: 44 tests pass, the web client builds, the API was exercised over curl (project/chapter/beat/tag round trip, tag cross-reference, 503 on the agent without a key while conversation listing still returns 200), the MCP server was driven over stdio JSON-RPC (26 tools, errors still surface the API's own message rather than being flattened), and the AppHost was run to confirm both resources come up and Vite proxies /api through to the API. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S56bfZMGe1hnhpWP4CjjNw
2026-08-06 12:11:20 -07:00
parent 30e0c6926e
commit 725758ccd9
120 changed files with 811 additions and 421 deletions
@@ -0,0 +1,47 @@
+using Novelly.Api.Beats;
+using Novelly.Api.Characters;
+using Novelly.Api.Common;
+using Novelly.Api.Projects;
+using Novelly.Api.Scenes;
+using Novelly.Api.Tags;
+
+namespace Novelly.Api.Chapters;
+
+/// <summary>A chapter: an ordered container of scenes plus its own planning fields.</summary>
+public class Chapter
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public Guid ProjectId { get; set; }
+    public Project? Project { get; set; }
+
+    /// <summary>Position in the manuscript, 1-based.</summary>
+    public int Number { get; set; }
+
+    public string Title { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The paragraph that opens the chapter's outline, above the beat table.
+    /// </summary>
+    public string? Summary { get; set; }
+
+    /// <summary>Whose head we are in for this chapter.</summary>
+    public Guid? PovCharacterId { get; set; }
+    public Character? PovCharacter { get; set; }
+
+    public string? Setting { get; set; }
+    public string? Notes { get; set; }
+
+    public DraftStatus Status { get; set; } = DraftStatus.Planned;
+    public int? TargetWordCount { get; set; }
+
+    public DateTimeOffset CreatedAt { get; set; } = DateTimeOffset.UtcNow;
+    public DateTimeOffset UpdatedAt { get; set; } = DateTimeOffset.UtcNow;
+
+    /// <summary>The chapter's outline: an ordered, flat list of beats.</summary>
+    public List<Beat> Beats { get; set; } = [];
+
+    /// <summary>The prose layer. Beats may optionally be grouped under these.</summary>
+    public List<Scene> Scenes { get; set; } = [];
+
+    public List<Tag> Tags { get; set; } = [];
+}
@@ -0,0 +1,87 @@
+using Novelly.Api.Beats;
+using Novelly.Api.Common;
+using Novelly.Api.Scenes;
+using Novelly.Api.Tags;
+
+namespace Novelly.Api.Chapters;
+
+public record ChapterSummaryDto(
+    Guid Id,
+    Guid ProjectId,
+    int Number,
+    string Title,
+    string? Summary,
+    Guid? PovCharacterId,
+    string? PovCharacterName,
+    string? Setting,
+    DraftStatus Status,
+    int? TargetWordCount,
+    int BeatCount,
+    int SceneCount,
+    int WordCount,
+    IReadOnlyList<TagDto> Tags);
+
+/// <summary>
+/// A chapter in full: the outline (a paragraph of summary plus an ordered beat table)
+/// and the prose layer (scenes).
+/// </summary>
+public record ChapterDto(
+    Guid Id,
+    Guid ProjectId,
+    int Number,
+    string Title,
+    string? Summary,
+    Guid? PovCharacterId,
+    string? PovCharacterName,
+    string? Setting,
+    string? Notes,
+    DraftStatus Status,
+    int? TargetWordCount,
+    IReadOnlyList<BeatDto> Beats,
+    IReadOnlyList<SceneDto> Scenes,
+    IReadOnlyList<TagDto> Tags,
+    DateTimeOffset UpdatedAt);
+
+public record CreateChapterRequest(
+    string Title,
+    int? Number = null,
+    string? Summary = null,
+    Guid? PovCharacterId = null,
+    string? Setting = null,
+    string? Notes = null,
+    DraftStatus Status = DraftStatus.Planned,
+    int? TargetWordCount = null,
+    IReadOnlyList<string>? Tags = null);
+
+/// <summary>
+/// Patch-style update. A null field is left alone; an empty string clears it. Passing a
+/// <see cref="Tags"/> list replaces the chapter's tags outright.
+/// </summary>
+public record UpdateChapterRequest(
+    string? Title = null,
+    int? Number = null,
+    string? Summary = null,
+    Guid? PovCharacterId = null,
+    string? Setting = null,
+    string? Notes = null,
+    DraftStatus? Status = null,
+    int? TargetWordCount = null,
+    IReadOnlyList<string>? Tags = null);
+
+public static class ChapterMapping
+{
+    public static ChapterDto ToDto(this Chapter c) => new(
+        c.Id, c.ProjectId, c.Number, c.Title, c.Summary,
+        c.PovCharacterId, c.PovCharacter?.Name, c.Setting, c.Notes,
+        c.Status, c.TargetWordCount,
+        [.. c.Beats.OrderBy(b => b.SortOrder).Select(b => b.ToDto())],
+        [.. c.Scenes.OrderBy(s => s.SortOrder).Select(s => s.ToDto())],
+        [.. c.Tags.OrderBy(t => t.Name).Select(t => t.ToDto())],
+        c.UpdatedAt);
+
+    public static ChapterSummaryDto ToSummaryDto(this Chapter c) => new(
+        c.Id, c.ProjectId, c.Number, c.Title, c.Summary,
+        c.PovCharacterId, c.PovCharacter?.Name, c.Setting, c.Status, c.TargetWordCount,
+        c.Beats.Count, c.Scenes.Count, c.Scenes.Sum(s => s.WordCount),
+        [.. c.Tags.OrderBy(t => t.Name).Select(t => t.ToDto())]);
+}
@@ -0,0 +1,41 @@
+namespace Novelly.Api.Chapters;
+
+public static class ChapterEndpoints
+{
+    public static IEndpointRouteBuilder MapChapterEndpoints(this IEndpointRouteBuilder app)
+    {
+        var projectScoped = app.MapGroup("/api/projects/{projectId:guid}/chapters").WithTags("Chapters");
+
+        projectScoped.MapGet("/", async (Guid projectId, ChapterService service, CancellationToken ct) =>
+                Results.Ok(await service.ListAsync(projectId, ct)))
+            .WithSummary("List a project's chapters in manuscript order.");
+
+        projectScoped.MapPost("/", async (
+                Guid projectId, CreateChapterRequest request, ChapterService service, CancellationToken ct) =>
+            {
+                var created = await service.CreateAsync(projectId, request, ct);
+                return Results.Created($"/api/chapters/{created.Id}", created);
+            })
+            .WithSummary("Add a chapter.");
+
+        var chapters = app.MapGroup("/api/chapters").WithTags("Chapters");
+
+        chapters.MapGet("/{id:guid}", async (Guid id, ChapterService service, CancellationToken ct) =>
+                Results.Ok(await service.GetAsync(id, ct)))
+            .WithSummary("Read a chapter with all of its scenes.");
+
+        chapters.MapPatch("/{id:guid}", async (
+                Guid id, UpdateChapterRequest request, ChapterService service, CancellationToken ct) =>
+                Results.Ok(await service.UpdateAsync(id, request, ct)))
+            .WithSummary("Update a chapter.");
+
+        chapters.MapDelete("/{id:guid}", async (Guid id, ChapterService service, CancellationToken ct) =>
+            {
+                await service.DeleteAsync(id, ct);
+                return Results.NoContent();
+            })
+            .WithSummary("Delete a chapter and its scenes.");
+
+        return app;
+    }
+}
@@ -0,0 +1,107 @@
+using Microsoft.EntityFrameworkCore;
+using Novelly.Api.Common;
+using Novelly.Api.Data;
+using Novelly.Api.Projects;
+using Novelly.Api.Tags;
+
+namespace Novelly.Api.Chapters;
+
+public class ChapterService(INovelDbContext db, TagService tags)
+{
+    public async Task<IReadOnlyList<ChapterSummaryDto>> ListAsync(Guid projectId, CancellationToken ct = default)
+    {
+        var chapters = await db.Chapters
+            .Include(c => c.PovCharacter)
+            .Include(c => c.Beats)
+            .Include(c => c.Scenes)
+            .Include(c => c.Tags)
+            .Where(c => c.ProjectId == projectId)
+            .OrderBy(c => c.Number)
+            .ToListAsync(ct);
+
+        return [.. chapters.Select(c => c.ToSummaryDto())];
+    }
+
+    public async Task<ChapterDto> GetAsync(Guid id, CancellationToken ct = default) =>
+        (await FindAsync(id, ct)).ToDto();
+
+    public async Task<ChapterDto> CreateAsync(Guid projectId, CreateChapterRequest request, CancellationToken ct = default)
+    {
+        if (!await db.Projects.AnyAsync(p => p.Id == projectId, ct))
+        {
+            throw new NotFoundException(nameof(Project), projectId);
+        }
+
+        var chapter = new Chapter
+        {
+            ProjectId = projectId,
+            Title = request.Title,
+            Number = request.Number ?? await NextChapterNumberAsync(projectId, ct),
+            Summary = request.Summary,
+            PovCharacterId = request.PovCharacterId,
+            Setting = request.Setting,
+            Notes = request.Notes,
+            Status = request.Status,
+            TargetWordCount = request.TargetWordCount
+        };
+
+        if (request.Tags is { } names)
+        {
+            chapter.Tags = await tags.ResolveAsync(projectId, names, ct);
+        }
+
+        db.Chapters.Add(chapter);
+        await db.SaveChangesAsync(ct);
+        return (await FindAsync(chapter.Id, ct)).ToDto();
+    }
+
+    public async Task<ChapterDto> UpdateAsync(Guid id, UpdateChapterRequest request, CancellationToken ct = default)
+    {
+        var chapter = await FindAsync(id, ct);
+
+        chapter.Title = Patch.Apply(chapter.Title, request.Title) ?? chapter.Title;
+        chapter.Number = request.Number ?? chapter.Number;
+        chapter.Summary = Patch.Apply(chapter.Summary, request.Summary);
+        chapter.PovCharacterId = request.PovCharacterId ?? chapter.PovCharacterId;
+        chapter.Setting = Patch.Apply(chapter.Setting, request.Setting);
+        chapter.Notes = Patch.Apply(chapter.Notes, request.Notes);
+        chapter.Status = request.Status ?? chapter.Status;
+        chapter.TargetWordCount = request.TargetWordCount ?? chapter.TargetWordCount;
+        chapter.UpdatedAt = DateTimeOffset.UtcNow;
+
+        if (request.Tags is { } names)
+        {
+            chapter.Tags = await tags.ResolveAsync(chapter.ProjectId, names, ct);
+        }
+
+        await db.SaveChangesAsync(ct);
+        return (await FindAsync(id, ct)).ToDto();
+    }
+
+    public async Task DeleteAsync(Guid id, CancellationToken ct = default)
+    {
+        var chapter = await FindAsync(id, ct);
+        db.Chapters.Remove(chapter);
+        await db.SaveChangesAsync(ct);
+    }
+
+    private async Task<int> NextChapterNumberAsync(Guid projectId, CancellationToken ct)
+    {
+        var max = await db.Chapters
+            .Where(c => c.ProjectId == projectId)
+            .MaxAsync(c => (int?)c.Number, ct);
+
+        return (max ?? 0) + 1;
+    }
+
+    private async Task<Chapter> FindAsync(Guid id, CancellationToken ct) =>
+        await db.Chapters
+            .Include(c => c.PovCharacter)
+            .Include(c => c.Beats).ThenInclude(b => b.Character)
+            .Include(c => c.Beats).ThenInclude(b => b.Scene)
+            .Include(c => c.Beats).ThenInclude(b => b.Tags)
+            .Include(c => c.Scenes).ThenInclude(s => s.PovCharacter)
+            .Include(c => c.Tags)
+            .FirstOrDefaultAsync(c => c.Id == id, ct)
+        ?? throw new NotFoundException(nameof(Chapter), id);
+}