@atlashub/smartstack-cli 3.31.0 → 3.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlashub/smartstack-cli",
-  "version": "3.31.0",
+  "version": "3.32.0",
   "description": "SmartStack Claude Code automation toolkit - GitFlow, EF Core migrations, prompts and more",
   "author": {
     "name": "SmartStack",

package/scripts/health-check.sh

@@ -107,7 +107,8 @@ if command -v claude &> /dev/null; then
     fi
 else
     log_error "Claude Code CLI not found"
-    log_info "  Install: npm install -g @anthropic-ai/claude-code"
+    log_info "  Install: curl -fsSL https://claude.ai/install.sh | bash"
+    log_info "  More info: https://code.claude.com/docs/en/setup"
 fi
 
 echo ""

package/templates/mcp-scaffolding/controller.cs.hbs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using SmartStack.Api.Authorization;
+using SmartStack.Application.Common.Models;
 
 namespace {{namespace}}.Controllers;
 
@@ -34,24 +35,26 @@ public class {{name}}Controller : ControllerBase
     }
 
     /// <summary>
-    /// Get all {{namePlural}}
+    /// Get all {{namePlural}} with pagination
     /// </summary>
-    /// <param name="cancellationToken">Cancellation token</param>
-    /// <returns>List of {{namePlural}}</returns>
     [HttpGet]
 {{#if navRoute}}
     [RequirePermission("{{navRoute}}.read")]
 {{/if}}
-    [ProducesResponseType(typeof(IEnumerable<{{name}}Dto>), 200)]
-    public async Task<ActionResult<IEnumerable<{{name}}Dto>>> GetAll(CancellationToken cancellationToken = default)
+    [ProducesResponseType(typeof(PaginatedResult<{{name}}Dto>), 200)]
+    public async Task<ActionResult<PaginatedResult<{{name}}Dto>>> GetAll(
+        [FromQuery] string? search = null,
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 20,
+        CancellationToken cancellationToken = default)
     {
         _logger.LogInformation("Getting all {{namePlural}}");
 
         // TODO: Implement using service
-        // var result = await _{{nameCamel}}Service.GetAllAsync(cancellationToken);
+        // var result = await _{{nameCamel}}Service.GetAllAsync(search, page, pageSize, cancellationToken);
         // return Ok(result);
 
-        return Ok(Array.Empty<{{name}}Dto>());
+        return Ok(PaginatedResult<{{name}}Dto>.Empty(page, pageSize));
     }
 
     /// <summary>

package/templates/mcp-scaffolding/entity-extension.cs.hbs

@@ -1,20 +1,64 @@
 using System;
-using System.ComponentModel.DataAnnotations;
 using SmartStack.Domain.Common;
-using SmartStack.Domain.Common.Interfaces;
 
 namespace {{namespace}};
 
 /// <summary>
 /// {{name}} entity{{#if baseEntity}} extending {{baseEntity}}{{/if}}
+{{#if isStrict}}
+/// Tenant-scoped: data is isolated per tenant (ITenantEntity)
+{{else if isOptional}}
+/// Cross-tenant: data can be shared across tenants or tenant-specific (IOptionalTenantEntity)
+{{else if isScoped}}
+/// Scoped: data visibility controlled by EntityScope (IScopedTenantEntity)
+{{else}}
+/// Platform-level entity: no tenant isolation
+{{/if}}
 /// </summary>
-{{#if isSystemEntity}}
-public class {{name}} : SystemEntity
+{{#if isStrict}}
+public class {{name}} : BaseEntity, ITenantEntity, IAuditableEntity
+{{else if isOptional}}
+public class {{name}} : BaseEntity, IOptionalTenantEntity, IAuditableEntity
+{{else if isScoped}}
+public class {{name}} : BaseEntity, IScopedTenantEntity, IAuditableEntity
 {{else}}
-public class {{name}} : BaseEntity
+public class {{name}} : BaseEntity, IAuditableEntity
 {{/if}}
 {
+{{#if hasTenantId}}
+    // === MULTI-TENANT ===
+
+{{#if isNullableTenant}}
+    /// <summary>
+    /// Tenant identifier — null means shared across all tenants
+    /// </summary>
+    public Guid? TenantId { get; private set; }
+{{else}}
+    /// <summary>
+    /// Tenant identifier for multi-tenant isolation (required)
+    /// </summary>
+    public Guid TenantId { get; private set; }
+{{/if}}
+
+{{/if}}
+{{#if hasScope}}
+    /// <summary>
+    /// Visibility scope: Tenant (tenant-specific), Shared (all tenants), Platform (admin only)
+    /// </summary>
+    public EntityScope Scope { get; private set; }
+
+{{/if}}
+    // === AUDIT ===
+
+    /// <summary>User who created this entity</summary>
+    public string? CreatedBy { get; set; }
+
+    /// <summary>User who last updated this entity</summary>
+    public string? UpdatedBy { get; set; }
+
 {{#if baseEntity}}
+    // === RELATIONSHIPS ===
+
     /// <summary>
     /// Foreign key to {{baseEntity}}
     /// </summary>
@@ -23,7 +67,7 @@ public class {{name}} : BaseEntity
     /// <summary>
     /// Navigation property to {{baseEntity}}
     /// </summary>
-    public virtual {{baseEntity}}? {{baseEntity}} { get; private set; }
+    public {{baseEntity}}? {{baseEntity}} { get; private set; }
 
 {{/if}}
     // === BUSINESS PROPERTIES ===
@@ -37,130 +81,95 @@ public class {{name}} : BaseEntity
     /// <summary>
     /// Factory method to create a new {{name}}
     /// </summary>
-{{#if isSystemEntity}}
+{{#if isStrict}}
+    /// <param name="tenantId">Required tenant identifier</param>
     public static {{name}} Create(
-        string code,
+        Guid tenantId,
         string? createdBy = null)
     {
+        if (tenantId == Guid.Empty)
+            throw new ArgumentException("TenantId is required", nameof(tenantId));
+
         return new {{name}}
         {
             Id = Guid.NewGuid(),
-            Code = code.ToLowerInvariant(),
+            TenantId = tenantId,
             CreatedAt = DateTime.UtcNow,
             CreatedBy = createdBy
         };
     }
-{{else}}
+{{else if isOptional}}
+    /// <param name="tenantId">Tenant identifier — null for shared (cross-tenant) data</param>
     public static {{name}} Create(
-        Guid tenantId,
-        string code,
+        Guid? tenantId = null,
         string? createdBy = null)
     {
         return new {{name}}
         {
             Id = Guid.NewGuid(),
             TenantId = tenantId,
-            Code = code.ToLowerInvariant(),
             CreatedAt = DateTime.UtcNow,
             CreatedBy = createdBy
         };
     }
-{{/if}}
-
-    /// <summary>
-    /// Update the entity
-    /// </summary>
-    public void Update(string? updatedBy = null)
+{{else if isScoped}}
+    /// <param name="tenantId">Tenant identifier — null for shared/platform data</param>
+    /// <param name="scope">Visibility scope (default: Tenant)</param>
+    public static {{name}} Create(
+        Guid? tenantId = null,
+        EntityScope scope = EntityScope.Tenant,
+        string? createdBy = null)
     {
-        UpdatedAt = DateTime.UtcNow;
-        UpdatedBy = updatedBy;
-    }
+        if (scope == EntityScope.Tenant && tenantId == null)
+            throw new ArgumentException("TenantId is required when scope is Tenant", nameof(tenantId));
 
-    /// <summary>
-    /// Soft delete the entity
-    /// </summary>
-    public void SoftDelete(string? deletedBy = null)
+        return new {{name}}
+        {
+            Id = Guid.NewGuid(),
+            TenantId = tenantId,
+            Scope = scope,
+            CreatedAt = DateTime.UtcNow,
+            CreatedBy = createdBy
+        };
+    }
+{{else}}
+    public static {{name}} Create(
+        string? createdBy = null)
     {
-        IsDeleted = true;
-        DeletedAt = DateTime.UtcNow;
-        DeletedBy = deletedBy;
+        return new {{name}}
+        {
+            Id = Guid.NewGuid(),
+            CreatedAt = DateTime.UtcNow,
+            CreatedBy = createdBy
+        };
     }
+{{/if}}
 
     /// <summary>
-    /// Restore a soft-deleted entity
+    /// Update the entity
     /// </summary>
-    public void Restore(string? restoredBy = null)
+    public void Update(string? updatedBy = null)
     {
-        IsDeleted = false;
-        DeletedAt = null;
-        DeletedBy = null;
         UpdatedAt = DateTime.UtcNow;
-        UpdatedBy = restoredBy;
+        UpdatedBy = updatedBy;
     }
 }
 
 // ============================================================================
-// Base Entity Classes (SmartStack.Domain.Common)
+// Base Entity Classes (SmartStack.Domain.Common) — Reference Only
 // ============================================================================
 /*
-/// <summary>
-/// Base entity for tenant-scoped entities (default)
-/// </summary>
-public abstract class BaseEntity : ITenantEntity, IHasCode, ISoftDeletable, IVersioned
-{
-    public Guid Id { get; set; } = Guid.NewGuid();
-    public Guid TenantId { get; set; }
-
-    private string _code = string.Empty;
-    public string Code
-    {
-        get => _code;
-        set => _code = value?.ToLowerInvariant() ?? string.Empty;
-    }
-
-    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
-    public DateTime? UpdatedAt { get; set; }
-    public string? CreatedBy { get; set; }
-    public string? UpdatedBy { get; set; }
-
-    public bool IsDeleted { get; set; }
-    public DateTime? DeletedAt { get; set; }
-    public string? DeletedBy { get; set; }
-
-    public byte[] RowVersion { get; set; } = Array.Empty<byte>();
-}
-
-/// <summary>
-/// Base entity for system-wide entities (no tenant isolation)
-/// </summary>
-public abstract class SystemEntity : ISystemEntity, IHasCode, ISoftDeletable, IVersioned
-{
-    public Guid Id { get; set; } = Guid.NewGuid();
-
-    private string _code = string.Empty;
-    public string Code
-    {
-        get => _code;
-        set => _code = value?.ToLowerInvariant() ?? string.Empty;
-    }
-
-    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
-    public DateTime? UpdatedAt { get; set; }
-    public string? CreatedBy { get; set; }
-    public string? UpdatedBy { get; set; }
-
-    public bool IsDeleted { get; set; }
-    public DateTime? DeletedAt { get; set; }
-    public string? DeletedBy { get; set; }
-
-    public byte[] RowVersion { get; set; } = Array.Empty<byte>();
-}
+BaseEntity:   Id (Guid), CreatedAt (DateTime), UpdatedAt (DateTime?)
+ITenantEntity:        TenantId (Guid)           — strict tenant isolation
+IOptionalTenantEntity: TenantId (Guid?)          — cross-tenant shared data (null = shared)
+IScopedTenantEntity:  TenantId (Guid?) + Scope  — with EntityScope (Tenant/Shared/Platform)
+IAuditableEntity:     CreatedBy (string?), UpdatedBy (string?)
 */
 
 // ============================================================================
 // EF Core Configuration
 // ============================================================================
-namespace {{infrastructureNamespace}}.Persistence.Configurations;
+namespace {{infrastructureNamespace}}.Persistence.Configurations{{#if configNamespaceSuffix}}.{{configNamespaceSuffix}}{{/if}};
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -170,62 +179,61 @@ public class {{name}}Configuration : IEntityTypeConfiguration<{{name}}>
 {
     public void Configure(EntityTypeBuilder<{{name}}> builder)
     {
-        // Table name with schema and domain prefix
         builder.ToTable("{{tablePrefix}}{{name}}s", "{{schema}}");
 
-        // Primary key
         builder.HasKey(e => e.Id);
 
-{{#unless isSystemEntity}}
-        // Multi-tenant
+{{#if isStrict}}
+        // Multi-tenant (strict: TenantId required)
         builder.Property(e => e.TenantId).IsRequired();
-        builder.HasIndex(e => e.TenantId);
-
-        // Code: lowercase, unique per tenant (filtered for soft delete)
-        builder.Property(e => e.Code).HasMaxLength(100).IsRequired();
-        builder.HasIndex(e => new { e.TenantId, e.Code })
-            .IsUnique()
-            .HasFilter("[IsDeleted] = 0")
-            .HasDatabaseName("IX_{{tablePrefix}}{{name}}s_Tenant_Code_Unique");
-{{else}}
-        // Code: lowercase, unique (filtered for soft delete)
-        builder.Property(e => e.Code).HasMaxLength(100).IsRequired();
-        builder.HasIndex(e => e.Code)
-            .IsUnique()
-            .HasFilter("[IsDeleted] = 0")
-            .HasDatabaseName("IX_{{tablePrefix}}{{name}}s_Code_Unique");
-{{/unless}}
-
-        // Concurrency token
-        builder.Property(e => e.RowVersion).IsRowVersion();
-
-        // Audit fields
+        builder.HasIndex(e => e.TenantId)
+            .HasDatabaseName("IX_{{tablePrefix}}{{name}}s_TenantId");
+
+{{else if isOptional}}
+        // Multi-tenant (optional: TenantId nullable — null = shared across tenants)
+        builder.Property(e => e.TenantId).IsRequired(false);
+        builder.HasIndex(e => e.TenantId)
+            .HasDatabaseName("IX_{{tablePrefix}}{{name}}s_TenantId");
+
+{{else if isScoped}}
+        // Multi-tenant (scoped: TenantId nullable + EntityScope)
+        builder.Property(e => e.TenantId).IsRequired(false);
+        builder.HasIndex(e => e.TenantId)
+            .HasDatabaseName("IX_{{tablePrefix}}{{name}}s_TenantId");
+
+        builder.Property(e => e.Scope)
+            .IsRequired()
+            .HasConversion<string>()
+            .HasMaxLength(20);
+        builder.HasIndex(e => new { e.TenantId, e.Scope })
+            .HasDatabaseName("IX_{{tablePrefix}}{{name}}s_TenantId_Scope");
+
+{{/if}}
+        // Audit fields (from IAuditableEntity)
         builder.Property(e => e.CreatedBy).HasMaxLength(256);
         builder.Property(e => e.UpdatedBy).HasMaxLength(256);
-        builder.Property(e => e.DeletedBy).HasMaxLength(256);
 
 {{#if baseEntity}}
-        // Relationship to {{baseEntity}} (1:1)
+        // Relationship to {{baseEntity}}
         builder.HasOne(e => e.{{baseEntity}})
-               .WithOne()
-               .HasForeignKey<{{name}}>(e => e.{{baseEntity}}Id)
-               .OnDelete(DeleteBehavior.Cascade);
+               .WithMany()
+               .HasForeignKey(e => e.{{baseEntity}}Id)
+               .OnDelete(DeleteBehavior.Restrict);
 
-        // Index on foreign key
         builder.HasIndex(e => e.{{baseEntity}}Id)
-               .IsUnique();
+               .HasDatabaseName("IX_{{tablePrefix}}{{name}}s_{{baseEntity}}Id");
 {{/if}}
 
-        // TODO: Add additional configuration
+        // TODO: Add business property configurations (HasMaxLength, IsRequired, indexes)
     }
 }
 
 // ============================================================================
-// DbContext Update (add to ApplicationDbContext.cs)
+// DbContext Update (add to your DbContext interface + implementation)
 // ============================================================================
 // public DbSet<{{name}}> {{name}}s => Set<{{name}}>();
 
 // ============================================================================
 // Migration Command
 // ============================================================================
-// dotnet ef migrations add core_vX.X.X_XXX_Add{{name}} --context ApplicationDbContext
+// dotnet ef migrations add core_vX.X.X_XXX_Add{{name}} --context CoreDbContext

package/templates/mcp-scaffolding/frontend/api-client.ts.hbs

@@ -16,8 +16,8 @@ import type {
   {{name}}CreateRequest,
   {{name}}UpdateRequest,
   {{name}}ListResponse,
-  PaginatedRequest,
-  PaginatedResponse
+  PaginationParams,
+  PaginatedResult
 } from '../types/{{nameLower}}';
 
 const ROUTE = getRoute('{{navRoute}}');
@@ -27,7 +27,7 @@ export const {{nameLower}}Api = {
   /**
    * Get all {{name}}s with pagination
    */
-  async getAll(params?: PaginatedRequest): Promise<PaginatedResponse<{{name}}>> {
+  async getAll(params?: PaginationParams): Promise<PaginatedResult<{{name}}>> {
     const response = await apiClient.get<{{name}}ListResponse>(ROUTE.api, { params });
     return response.data;
   },
@@ -76,7 +76,7 @@ export const {{nameLower}}Api = {
   /**
    * Search {{name}}s
    */
-  async search(query: string, params?: PaginatedRequest): Promise<PaginatedResponse<{{name}}>> {
+  async search(query: string, params?: PaginationParams): Promise<PaginatedResult<{{name}}>> {
     const response = await apiClient.get<{{name}}ListResponse>(`${ROUTE.api}/search`, {
       params: { q: query, ...params }
     });

package/templates/mcp-scaffolding/tests/controller.test.cs.hbs

@@ -53,12 +53,18 @@ public class {{name}}ControllerTests : IClassFixture<WebApplicationFactory<Progr
     public async Task GetAll_WhenCalled_ShouldReturn200WithList()
     {
         // Arrange
-        var items = new List<{{name}}Response>
+        var items = new PaginatedResult<{{name}}Response>
         {
-            new() { Id = Guid.NewGuid(), Code = "TEST-001" },
-            new() { Id = Guid.NewGuid(), Code = "TEST-002" }
+            Items = new List<{{name}}Response>
+            {
+                new() { Id = Guid.NewGuid(), Code = "TEST-001" },
+                new() { Id = Guid.NewGuid(), Code = "TEST-002" }
+            },
+            Total = 2,
+            Page = 1,
+            PageSize = 10
         };
-        _mockService.Setup(x => x.GetAllAsync(It.IsAny<CancellationToken>()))
+        _mockService.Setup(x => x.GetAllAsync(It.IsAny<PaginationParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(items);
 
         // Act
@@ -66,8 +72,9 @@ public class {{name}}ControllerTests : IClassFixture<WebApplicationFactory<Progr
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
-        var result = await response.Content.ReadFromJsonAsync<List<{{name}}Response>>();
-        result.Should().HaveCount(2);
+        var result = await response.Content.ReadFromJsonAsync<PaginatedResult<{{name}}Response>>();
+        result.Should().NotBeNull();
+        result!.Items.Should().HaveCount(2);
     }
 
     [Fact]
@@ -297,11 +304,17 @@ public class {{name}}ControllerTests : IClassFixture<WebApplicationFactory<Progr
     {
         // Arrange
         var tenantAId = Guid.NewGuid();
-        var tenantAItems = new List<{{name}}Response>
+        var tenantAItems = new PaginatedResult<{{name}}Response>
         {
-            new() { Id = Guid.NewGuid(), TenantId = tenantAId, Code = "A-001" }
+            Items = new List<{{name}}Response>
+            {
+                new() { Id = Guid.NewGuid(), TenantId = tenantAId, Code = "A-001" }
+            },
+            Total = 1,
+            Page = 1,
+            PageSize = 10
         };
-        _mockService.Setup(x => x.GetAllAsync(It.IsAny<CancellationToken>()))
+        _mockService.Setup(x => x.GetAllAsync(It.IsAny<PaginationParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(tenantAItems);
 
         // Act
@@ -309,8 +322,9 @@ public class {{name}}ControllerTests : IClassFixture<WebApplicationFactory<Progr
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
-        var result = await response.Content.ReadFromJsonAsync<List<{{name}}Response>>();
-        result.Should().OnlyContain(x => x.TenantId == tenantAId);
+        var result = await response.Content.ReadFromJsonAsync<PaginatedResult<{{name}}Response>>();
+        result.Should().NotBeNull();
+        result!.Items.Should().OnlyContain(x => x.TenantId == tenantAId);
     }
 
     [Fact]
@@ -377,16 +391,25 @@ public class {{name}}ControllerTests : IClassFixture<WebApplicationFactory<Progr
         var items = Enumerable.Range(1, 100)
             .Select(i => new {{name}}Response { Id = Guid.NewGuid(), Code = $"TEST-{i:D3}" })
             .ToList();
-        _mockService.Setup(x => x.GetAllAsync(It.IsAny<CancellationToken>()))
-            .ReturnsAsync(items.Take(10).ToList());
+        var paginatedResult = new PaginatedResult<{{name}}Response>
+        {
+            Items = items.Take(10).ToList(),
+            Total = 100,
+            Page = 1,
+            PageSize = 10
+        };
+        _mockService.Setup(x => x.GetAllAsync(It.IsAny<PaginationParams>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(paginatedResult);
 
         // Act
         var response = await _client.GetAsync("/api/{{lowerName}}?page=1&pageSize=10");
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
-        var result = await response.Content.ReadFromJsonAsync<List<{{name}}Response>>();
-        result.Should().HaveCount(10);
+        var result = await response.Content.ReadFromJsonAsync<PaginatedResult<{{name}}Response>>();
+        result.Should().NotBeNull();
+        result!.Items.Should().HaveCount(10);
+        result.Total.Should().Be(100);
     }
 
     #endregion

package/templates/mcp-scaffolding/tests/service.test.cs.hbs

@@ -87,28 +87,40 @@ public class {{name}}ServiceTests
             CreateValid{{name}}(),
             CreateValid{{name}}()
         };
-        _mockRepository.Setup(x => x.GetAllAsync(It.IsAny<CancellationToken>()))
-            .ReturnsAsync(entities);
+        _mockRepository.Setup(x => x.GetAllAsync(It.IsAny<PaginationParams>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new PaginatedResult<{{name}}>
+            {
+                Items = entities,
+                Total = 2,
+                Page = 1,
+                PageSize = 10
+            });
 
         // Act
-        var result = await _sut.GetAllAsync();
+        var result = await _sut.GetAllAsync(new PaginationParams { Page = 1, PageSize = 10 });
 
         // Assert
-        result.Should().HaveCount(2);
+        result.Items.Should().HaveCount(2);
     }
 
     [Fact]
     public async Task GetAllAsync_WhenNoEntities_ShouldReturnEmptyList()
     {
         // Arrange
-        _mockRepository.Setup(x => x.GetAllAsync(It.IsAny<CancellationToken>()))
-            .ReturnsAsync(new List<{{name}}>());
+        _mockRepository.Setup(x => x.GetAllAsync(It.IsAny<PaginationParams>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new PaginatedResult<{{name}}>
+            {
+                Items = new List<{{name}}>(),
+                Total = 0,
+                Page = 1,
+                PageSize = 10
+            });
 
         // Act
-        var result = await _sut.GetAllAsync();
+        var result = await _sut.GetAllAsync(new PaginationParams { Page = 1, PageSize = 10 });
 
         // Assert
-        result.Should().BeEmpty();
+        result.Items.Should().BeEmpty();
     }
 
     #endregion

package/templates/skills/apex/SKILL.md

@@ -7,7 +7,7 @@ description: |
   - Developing feature by feature without /business-analyse
   - Fixing or extending code generated by /ralph-loop
   - Any incremental SmartStack development task
-argument-hint: "[-a] [-x] [-s] [-t] [-e] [-r] [-pr] <task description>"
+argument-hint: "[-a] [-x] [-s] [-e] [-r] [-pr] <task description>"
 ---
 
 <objective>
@@ -21,7 +21,7 @@ Execute incremental SmartStack development using the APEX methodology. This skil
 ```bash
 /apex add absence management to HR module           # Add section to module
 /apex -a fix the leave request controller            # Auto fix
-/apex -a -x -s -t -pr add PDF export to Orders      # Full workflow
+/apex -a -x -s -pr add PDF export to Orders           # Full workflow
 /apex -e add status field to Project entity          # Economy (no agents)
 /apex -r                                             # Resume previous
 ```
@@ -35,7 +35,6 @@ Execute incremental SmartStack development using the APEX methodology. This skil
 | `-a` | Auto mode: skip confirmations |
 | `-x` | Deep review: adversarial code review (beyond step-04 automated checks) |
 | `-s` | Save mode: output to `.claude/output/apex/` |
-| `-t` | Test mode: scaffold + run tests via MCP |
 | `-e` | Economy mode: no subagents |
 | `-r` | Resume: continue from previous state |
 | `-pr` | PR mode: create pull request at end |
@@ -51,7 +50,6 @@ Execute incremental SmartStack development using the APEX methodology. This skil
 | `{auto_mode}` | boolean | Skip confirmations |
 | `{examine_mode}` | boolean | Adversarial review |
 | `{save_mode}` | boolean | Save outputs to `.claude/output/apex/{task-id}/` |
-| `{test_mode}` | boolean | Include test steps (07-08) |
 | `{economy_mode}` | boolean | No subagents |
 | `{pr_mode}` | boolean | Create PR at end |
 | `{context_code}` | string | "business", "platform", "personal" |
@@ -88,8 +86,8 @@ Execute incremental SmartStack development using the APEX methodology. This skil
 | 04 | `steps/step-04-examine.md` | Opus | eXamine: MCP validation, build, 21 POST-CHECKs, acceptance criteria |
 | 05 | `steps/step-05-deep-review.md` | Opus | Deep Review: adversarial code review (if -x) |
 | 06 | `steps/step-06-resolve.md` | Opus | Fix BLOCKING findings (if any) |
-| 07 | `steps/step-07-tests.md` | Opus | Scaffold tests via MCP (if -t) |
-| 08 | `steps/step-08-run-tests.md` | Opus | Run tests until 100% pass (if -t) |
+| 07 | `steps/step-07-tests.md` | Opus | Scaffold tests via MCP |
+| 08 | `steps/step-08-run-tests.md` | Opus | Run tests until 100% pass |
 </step_files>
 
 <apex_phases>
@@ -101,10 +99,10 @@ Execute incremental SmartStack development using the APEX methodology. This skil
 | **A** — Analyze | 01 | Yes | Explore existing code |
 | **P** — Plan | 02 | Yes | File-by-file plan with skill/MCP mapping |
 | **E** — Execute | 03 | Yes | Orchestrate creation via skills and MCP |
-| **X** — eXamine | 04 | Yes | 21 POST-CHECKs, MCP validation, build, acceptance criteria |
+| **X** — eXamine | 04 | Yes | 30 POST-CHECKs, MCP validation, build, acceptance criteria |
 | *Deep Review* | 05 (if -x) | No | Adversarial code review beyond automated checks |
 | *Resolve* | 06 (if BLOCKING) | No | Fix BLOCKING findings |
-| *Tests* | 07-08 (if -t) | No | Scaffold and run tests |
+| *Tests* | 07-08 | **Yes** | Scaffold and run tests |
 </apex_phases>
 
 <reference_files>
@@ -157,6 +155,6 @@ Execute incremental SmartStack development using the APEX methodology. This skil
 - MCP validate_conventions: 0 errors
 - Build: dotnet build PASS + npm run typecheck PASS (if frontend)
 - Seed data complete (navigation, permissions, roles, provider) if required
-- Tests: 100% pass, >= 80% coverage (if -t)
+- Tests: 100% pass, >= 80% coverage
 - Commits atomic per layer
 </success_criteria>