Validate repo status responses against their public schema

Author: GlitterKill

script.ps1

@@ -0,0 +1,7 @@
+
+$sdlScriptSucceeded = $?
+$sdlNativeExitCode = Get-Variable -Name LASTEXITCODE -ValueOnly -ErrorAction SilentlyContinue
+if (-not $sdlScriptSucceeded) {
+  if ($null -ne $sdlNativeExitCode -and $sdlNativeExitCode -ne 0) { exit $sdlNativeExitCode }
+  exit 1
+}

src/mcp/tools/repo.ts

@@ -8,6 +8,7 @@ import {
   RepoUnregisterResponse,
   type RepoStatusRequest,
   RepoStatusResponse,
+  RepoStatusResponseSchema,
   type IndexRefreshRequest,
   IndexRefreshResponse,
   type RepoOverviewRequest,
@@ -912,7 +913,7 @@ export async function handleRepoStatus(
       }
     }
 
-    return {
+    return RepoStatusResponseSchema.parse({
       repoId,
       ...(includeTelemetry ? { rootPath: repo.rootPath } : {}),
       rootAvailability,
@@ -983,7 +984,7 @@ export async function handleRepoStatus(
         : {}),
       ...(memories !== undefined ? { memories } : {}),
       derivedState: statusDerivedState,
-    };
+    });
   };
 
   if (isTracingEnabled()) {

tests/unit/repo-status-health.test.ts

@@ -14,6 +14,7 @@ import { after, before, describe, it } from "node:test";
 import {
   RepoStatusRequestSchema,
   RepoStatusResponseSchema,
+  withProjectionSuccessOutputSchema,
 } from "../../dist/mcp/tools.js";
 
 describe("repo status health fields", () => {
@@ -554,6 +555,35 @@ describe("repo status root availability", { concurrency: 1 }, () => {
     }
   });
 
+  it("keeps active watcher internals out of full public status", async () => {
+    const { handleRepoStatus } = await import("../../dist/mcp/tools/repo.js");
+    const watcher = await import("../../dist/indexer/watcher.js");
+    watcher._setWatcherHealthForTesting("available", {
+      provider: "watchman",
+      filesWatched: 7,
+      watchmanWatchRoot: availableRoot,
+    });
+
+    try {
+      const status = await handleRepoStatus({
+        repoId: "available",
+        detail: "full",
+      });
+
+      assert.ok(status.watcherHealth);
+      assert.equal("filesWatched" in status.watcherHealth, false);
+      assert.equal("watchmanWatchRoot" in status.watcherHealth, false);
+      assert.doesNotThrow(() =>
+        withProjectionSuccessOutputSchema(
+          "repo.status",
+          RepoStatusResponseSchema,
+        ).parse(status),
+      );
+    } finally {
+      watcher._clearWatcherHealthForTesting("available");
+    }
+  });
+
   it("keeps semantic-only staleness non-blocking", async () => {
     const { handleRepoStatus } = await import("../../dist/mcp/tools/repo.js");
     const status = await handleRepoStatus({