@opengsd/gsd-pi 1.3.0 → 1.4.0

package/src/resources/extensions/gsd/tests/dispatch-rule-coverage.test.ts

@@ -232,7 +232,7 @@ test("dispatch-rule-coverage: planning boundary without planner handoff → rese
   assertMatch(
     match,
     {
-      ruleName: "planning (no research, not S01) → research-slice",
+      ruleName: "planning (no research) → research-slice",
       action: "dispatch",
       unitType: "research-slice",
     },
@@ -240,6 +240,31 @@ test("dispatch-rule-coverage: planning boundary without planner handoff → rese
   );
 });
 
+test("dispatch-rule-coverage: S01 still researches when only milestone research exists", async (t) => {
+  const tmp = mkdtempSync(join(tmpdir(), "gsd-disp-cov-s01-research-"));
+  t.after(() => rmSync(tmp, { recursive: true, force: true }));
+
+  writeMilestoneFile(tmp, "M001", "CONTEXT", "# Context\n");
+  writeMilestoneFile(tmp, "M001", "ROADMAP", "# Roadmap\n");
+  writeMilestoneFile(tmp, "M001", "RESEARCH", "# Milestone Research\n");
+
+  const state = makeState({
+    phase: "planning",
+    activeSlice: { id: "S01", title: "First Slice" },
+    nextAction: "Plan slice S01 (First Slice).",
+  });
+  const match = await findFirstMatch(makeCtx(tmp, state));
+  assertMatch(
+    match,
+    {
+      ruleName: "planning (no research) → research-slice",
+      action: "dispatch",
+      unitType: "research-slice",
+    },
+    "S01 missing slice research despite milestone research",
+  );
+});
+
 test("dispatch-rule-coverage: executing with task plan present → execute-task", async (t) => {
   const tmp = mkdtempSync(join(tmpdir(), "gsd-disp-cov-exec-"));
   t.after(() => rmSync(tmp, { recursive: true, force: true }));

package/src/resources/extensions/gsd/tests/dist-redirect.mjs

@@ -44,6 +44,11 @@ export function resolve(specifier, context, nextResolve) {
   } else if (specifier.startsWith("@earendil-works/pi-agent-core/") || specifier.startsWith("@gsd/pi-agent-core/")) {
     const subpath = specifier.replace(/^@[^/]+\/pi-agent-core\//, "").replace(/\.js$/, ".ts");
     specifier = new URL(`packages/pi-agent-core/src/${subpath}`, ROOT).href;
+  } else if (specifier === "@gsd/agent-core") {
+    specifier = new URL("packages/gsd-agent-core/src/index.ts", ROOT).href;
+  } else if (specifier.startsWith("@gsd/agent-core/")) {
+    const subpath = specifier.replace(/^@gsd\/agent-core\//, "").replace(/\.js$/, ".ts");
+    specifier = new URL(`packages/gsd-agent-core/src/${subpath}`, ROOT).href;
   } else if (specifier === "@gsd/native") {
     specifier = new URL("packages/native/src/index.ts", ROOT).href;
   } else if (specifier.startsWith("@gsd/native/")) {
@@ -115,6 +120,8 @@ export function load(url, context, nextLoad) {
     url = url.replace('/dist/index.js', '/src/index.ts');
   } else if (url.includes('/packages/pi-agent-core/dist/index.js')) {
     url = url.replace('/dist/index.js', '/src/index.ts');
+  } else if (url.includes('/packages/gsd-agent-core/dist/')) {
+    url = url.replace('/dist/', '/src/').replace(/\.js$/, '.ts');
   } else if (url.includes('/packages/pi-tui/dist/index.js')) {
     url = url.replace('/dist/index.js', '/src/index.ts');
   }

package/src/resources/extensions/gsd/tests/doctor-forensics-db-open-regression.test.ts

@@ -1,10 +1,18 @@
 import test from "node:test";
 import assert from "node:assert/strict";
-import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 
-import { closeDatabase } from "../gsd-db.ts";
+import {
+  _getAdapter,
+  closeDatabase,
+  getHierarchyCompletionCounts,
+  insertMilestone,
+  insertSlice,
+  insertTask,
+  openDatabase,
+} from "../gsd-db.ts";
 import { buildForensicReport } from "../forensics.ts";
 import { handleDoctor } from "../commands-handlers.ts";
 import { withCommandCwd } from "../commands/context.ts";
@@ -23,6 +31,66 @@ test("#5194 forensics opens DB before computing completion counts", async (t) =>
   assert.equal(report.dbCompletionCounts?.tasksTotal, 0);
 });
 
+test("#968 completion counts use fixed aggregate queries and canonical closed statuses", (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-forensics-counts-"));
+  const dbPath = join(base, "gsd.db");
+  t.after(() => {
+    closeDatabase();
+    rmSync(base, { recursive: true, force: true });
+  });
+
+  openDatabase(dbPath);
+
+  insertMilestone({ id: "M001", status: "complete" });
+  insertMilestone({ id: "M002", status: "active" });
+  insertMilestone({ id: "M003", status: "closed" });
+
+  insertSlice({ milestoneId: "M001", id: "S01", status: "done" });
+  insertSlice({ milestoneId: "M001", id: "S02", status: "pending" });
+  insertSlice({ milestoneId: "M002", id: "S01", status: "skipped" });
+  insertSlice({ milestoneId: "M003", id: "S01", status: "active" });
+
+  insertTask({ milestoneId: "M001", sliceId: "S01", id: "T01", status: "complete" });
+  insertTask({ milestoneId: "M001", sliceId: "S01", id: "T02", status: "done" });
+  insertTask({ milestoneId: "M001", sliceId: "S02", id: "T01", status: "skipped" });
+  insertTask({ milestoneId: "M002", sliceId: "S01", id: "T01", status: "closed" });
+  insertTask({ milestoneId: "M002", sliceId: "S01", id: "T02", status: "pending" });
+  insertTask({ milestoneId: "M003", sliceId: "S01", id: "T01", status: "active" });
+
+  const adapter = _getAdapter()!;
+  const originalPrepare = adapter.prepare.bind(adapter);
+  const preparedSql: string[] = [];
+  adapter.prepare = (sql) => {
+    preparedSql.push(sql);
+    return originalPrepare(sql);
+  };
+
+  assert.deepEqual(getHierarchyCompletionCounts(), {
+    milestones: 2,
+    milestonesTotal: 3,
+    slices: 2,
+    slicesTotal: 4,
+    tasks: 4,
+    tasksTotal: 6,
+  });
+
+  assert.equal(preparedSql.length, 3);
+  assert.ok(preparedSql.every((sql) => /COUNT\(\*\)/i.test(sql)));
+  assert.doesNotMatch(preparedSql.join("\n"), /SELECT\s+\*/i);
+});
+
+test("#968 forensics completion counts do not re-query slices and tasks", () => {
+  const source = readFileSync(join(process.cwd(), "src/resources/extensions/gsd/forensics.ts"), "utf-8");
+  const start = source.indexOf("function getDbCompletionCounts()");
+  const end = source.indexOf("// ─── Anomaly Detectors", start);
+  assert.notEqual(start, -1);
+  assert.notEqual(end, -1);
+  const body = source.slice(start, end);
+
+  assert.match(body, /getHierarchyCompletionCounts\(\)/);
+  assert.doesNotMatch(body, /getAllMilestones|getMilestoneSlices|getSliceTasks/);
+});
+
 test("#5194 doctor command does not emit false db_unavailable when gsd.db exists", async (t) => {
   const base = mkdtempSync(join(tmpdir(), "gsd-doctor-db-open-"));
   t.after(() => rmSync(base, { recursive: true, force: true }));

package/src/resources/extensions/gsd/tests/doctor-git-checks-autoresolve.test.ts

@@ -0,0 +1,149 @@
+// Project/App: gsd-pi
+// File Purpose: Doctor attempts safe conflict auto-resolution before hard-blocking auto-mode (#849).
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync, existsSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { runGSDDoctor } from "../doctor.ts";
+import { closeDatabase } from "../gsd-db.js";
+
+function runGit(args: string[], cwd: string): void {
+  execFileSync("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
+}
+
+function tryGit(args: string[], cwd: string): void {
+  try {
+    runGit(args, cwd);
+  } catch {
+    // Expected to fail for conflicting merges — the conflict state is what we want.
+  }
+}
+
+function makeRepoWithConflict(): string {
+  const base = mkdtempSync(join(tmpdir(), "gsd-doctor-autoresolve-"));
+  runGit(["init", "-b", "main"], base);
+  runGit(["config", "user.name", "Test User"], base);
+  runGit(["config", "user.email", "test@example.com"], base);
+
+  mkdirSync(join(base, ".gsd"), { recursive: true });
+  mkdirSync(join(base, "src"), { recursive: true });
+  writeFileSync(join(base, ".gsd", "STATE.md"), "base state\n", "utf-8");
+  writeFileSync(join(base, "src", "app.js"), "base app\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "chore: init"], base);
+
+  runGit(["checkout", "-b", "feature"], base);
+  writeFileSync(join(base, ".gsd", "STATE.md"), "feature state\n", "utf-8");
+  writeFileSync(join(base, "src", "app.js"), "feature app\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "feat: feature edits"], base);
+
+  runGit(["checkout", "main"], base);
+  writeFileSync(join(base, ".gsd", "STATE.md"), "main state\n", "utf-8");
+  writeFileSync(join(base, "src", "app.js"), "main app\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "feat: main edits"], base);
+
+  // Conflicting merge — leaves unmerged paths + MERGE_HEAD.
+  tryGit(["merge", "feature"], base);
+  return base;
+}
+
+test.after(() => {
+  closeDatabase();
+});
+
+test("doctor auto-resolves safe .gsd/ conflicts and only blocks on manual paths", async (t) => {
+  const base = makeRepoWithConflict();
+  t.after(() => rmSync(base, { recursive: true, force: true }));
+
+  const report = await runGSDDoctor(base, { isolationMode: "none" });
+
+  const conflictIssue = report.issues.find((issue) => issue.code === "unresolved_git_conflicts");
+  assert.ok(conflictIssue, "manual conflict should still be reported");
+  assert.match(conflictIssue!.message, /src\/app\.js/, "manual path should be listed");
+  assert.doesNotMatch(
+    conflictIssue!.message,
+    /\.gsd\/STATE\.md/,
+    "safe .gsd/ path should have been auto-resolved out of the conflict list",
+  );
+});
+
+test("doctor clears conflicts entirely when all unmerged paths are safe", async (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-doctor-autoresolve-safe-"));
+  t.after(() => rmSync(base, { recursive: true, force: true }));
+
+  runGit(["init", "-b", "main"], base);
+  runGit(["config", "user.name", "Test User"], base);
+  runGit(["config", "user.email", "test@example.com"], base);
+  mkdirSync(join(base, ".gsd"), { recursive: true });
+  writeFileSync(join(base, ".gsd", "STATE.md"), "base\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "chore: init"], base);
+
+  runGit(["checkout", "-b", "feature"], base);
+  writeFileSync(join(base, ".gsd", "STATE.md"), "feature\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "feat: edit"], base);
+
+  runGit(["checkout", "main"], base);
+  writeFileSync(join(base, ".gsd", "STATE.md"), "main\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "feat: edit"], base);
+
+  tryGit(["merge", "feature"], base);
+
+  const report = await runGSDDoctor(base, { isolationMode: "none" });
+
+  assert.ok(
+    !report.issues.some((issue) => issue.code === "unresolved_git_conflicts"),
+    "no manual conflicts should remain after safe auto-resolve",
+  );
+  assert.ok(
+    !existsSync(join(base, ".git", "MERGE_HEAD")),
+    "merge-state markers should be cleared in the same pass",
+  );
+});
+
+test("doctor --dry-run does not mutate git state when safe conflicts are present", async (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-doctor-autoresolve-dryrun-"));
+  t.after(() => rmSync(base, { recursive: true, force: true }));
+
+  runGit(["init", "-b", "main"], base);
+  runGit(["config", "user.name", "Test User"], base);
+  runGit(["config", "user.email", "test@example.com"], base);
+  mkdirSync(join(base, ".gsd"), { recursive: true });
+  writeFileSync(join(base, ".gsd", "STATE.md"), "base\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "chore: init"], base);
+
+  runGit(["checkout", "-b", "feature"], base);
+  writeFileSync(join(base, ".gsd", "STATE.md"), "feature\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "feat: edit"], base);
+
+  runGit(["checkout", "main"], base);
+  writeFileSync(join(base, ".gsd", "STATE.md"), "main\n", "utf-8");
+  runGit(["add", "."], base);
+  runGit(["commit", "-m", "feat: edit"], base);
+
+  tryGit(["merge", "feature"], base);
+
+  // dry-run must not mutate git state even when all conflicts are safe
+  const report = await runGSDDoctor(base, { dryRun: true, isolationMode: "none" });
+
+  // MERGE_HEAD must still exist — dry-run is read-only
+  assert.ok(
+    existsSync(join(base, ".git", "MERGE_HEAD")),
+    "dry-run must not clear merge-state markers",
+  );
+  // The conflict should still be reported (unresolved paths are reported as-is)
+  assert.ok(
+    report.issues.some((issue) => issue.code === "unresolved_git_conflicts"),
+    "dry-run should still report the conflict without resolving it",
+  );
+});

package/src/resources/extensions/gsd/tests/doctor-providers.test.ts

@@ -20,6 +20,7 @@ import { tmpdir } from "node:os";
 
 import {
   runProviderChecks,
+  runProviderChecksAsync,
   formatProviderReport,
   summariseProviderIssues,
   type ProviderCheckResult,
@@ -47,6 +48,26 @@ function withEnv(vars: Record<string, string | undefined>, fn: () => void): void
   }
 }
 
+async function withEnvAsync(vars: Record<string, string | undefined>, fn: () => Promise<void>): Promise<void> {
+  const saved: Record<string, string | undefined> = {};
+  for (const [k, v] of Object.entries(vars)) {
+    saved[k] = process.env[k];
+    if (v === undefined) {
+      delete process.env[k];
+    } else {
+      process.env[k] = v;
+    }
+  }
+  try {
+    await fn();
+  } finally {
+    for (const [k, v] of Object.entries(saved)) {
+      if (v === undefined) delete process.env[k];
+      else process.env[k] = v;
+    }
+  }
+}
+
 function withCwd(nextCwd: string, fn: () => void): void {
   const saved = process.cwd();
   process.chdir(nextCwd);
@@ -57,6 +78,22 @@ function withCwd(nextCwd: string, fn: () => void): void {
   }
 }
 
+async function withCwdAsync(nextCwd: string, fn: () => Promise<void>): Promise<void> {
+  const saved = process.cwd();
+  process.chdir(nextCwd);
+  try {
+    await fn();
+  } finally {
+    process.chdir(saved);
+  }
+}
+
+function normalizeProviderResults(results: ProviderCheckResult[]): string[] {
+  return results
+    .map(r => `${r.name}|${r.label}|${r.category}|${r.status}|${r.message}|${r.detail ?? ""}|${r.required}`)
+    .sort();
+}
+
 const PRESENT_TEST_VALUE = "configured";
 
 // ─── formatProviderReport ─────────────────────────────────────────────────────
@@ -377,6 +414,76 @@ test("runProviderChecks detects custom provider keys from models.json", () => {
   rmSync(tmpHome, { recursive: true, force: true });
 });
 
+test("runProviderChecksAsync matches sync for models.json keys and PATH CLI checks", async () => {
+  const tmpHome = realpathSync(mkdtempSync(join(tmpdir(), "gsd-providers-async-home-")));
+  const repo = realpathSync(mkdtempSync(join(tmpdir(), "gsd-providers-async-repo-")));
+  const agentDir = join(tmpHome, ".gsd", "agent");
+  const binDir = join(tmpHome, "bin");
+  mkdirSync(agentDir, { recursive: true });
+  mkdirSync(binDir, { recursive: true });
+  mkdirSync(join(repo, ".gsd"), { recursive: true });
+
+  writeFileSync(
+    join(repo, ".gsd", "PREFERENCES.md"),
+    [
+      "---",
+      "models:",
+      "  execution:",
+      "    model: custom-model",
+      "    provider: custom-provider",
+      "  validation:",
+      "    model: gemini-2.5-pro",
+      "    provider: google-gemini-cli",
+      "---",
+      "",
+    ].join("\n"),
+  );
+  writeFileSync(join(agentDir, "models.json"), JSON.stringify({
+    providers: {
+      "custom-provider": {
+        api: "openai-completions",
+        apiKey: "x",
+        baseUrl: "https://example.invalid/v1",
+        models: [{ id: "custom-model", name: "Custom Model" }],
+      },
+    },
+  }));
+
+  const fakeGemini = join(binDir, "gemini");
+  writeFileSync(fakeGemini, "#!/bin/sh\necho mock\n");
+  chmodSync(fakeGemini, 0o755);
+
+  try {
+    await withEnvAsync({
+      HOME: tmpHome,
+      CUSTOM_PROVIDER_API_KEY: undefined,
+      GEMINI_API_KEY: undefined,
+      GOOGLE_API_KEY: undefined,
+      PATH: binDir,
+    }, async () => {
+      await withCwdAsync(repo, async () => {
+        const syncResults = runProviderChecks();
+        const asyncResults = await runProviderChecksAsync();
+
+        assert.deepEqual(normalizeProviderResults(asyncResults), normalizeProviderResults(syncResults));
+        assert.equal(
+          asyncResults.find(r => r.name === "custom-provider")?.status,
+          "ok",
+          "models.json apiKey should satisfy custom provider auth",
+        );
+        assert.equal(
+          asyncResults.find(r => r.name === "google-gemini-cli")?.status,
+          "ok",
+          "gemini CLI binary should satisfy explicit CLI provider",
+        );
+      });
+    });
+  } finally {
+    rmSync(repo, { recursive: true, force: true });
+    rmSync(tmpHome, { recursive: true, force: true });
+  }
+});
+
 test("runProviderChecks reports missing custom provider key without models.json apiKey", () => {
   const tmpHome = realpathSync(mkdtempSync(join(tmpdir(), "gsd-providers-custom-missing-home-")));
   const repo = realpathSync(mkdtempSync(join(tmpdir(), "gsd-providers-custom-missing-repo-")));