@opengsd/gsd-pi 1.2.0-dev.844675c9 → 1.2.0-dev.b1abb545

package/dist/resources/extensions/gsd/auto.js

@@ -54,6 +54,7 @@ import { getPriorSliceCompletionBlocker } from "./dispatch-guard.js";
 import { createAutoWorktree, teardownAutoWorktree, isInAutoWorktree, getAutoWorktreePath, mergeMilestoneToMain, autoWorktreeBranch, checkResourcesStale, escapeStaleWorktree, } from "./auto-worktree.js";
 import { pruneQueueOrder } from "./queue-order.js";
 import { startCommandPolling as _startCommandPolling, isRemoteConfigured } from "../remote-questions/manager.js";
+import { createMilestoneMergeTransaction } from "./milestone-merge-transaction.js";
 import { debugLog, isDebugEnabled, writeDebugSummary } from "./debug-logger.js";
 import { reconcileMergeState, verifyExpectedArtifact, } from "./auto-recovery.js";
 import { classifyMilestoneSummaryContent } from "./milestone-summary-classifier.js";
@@ -67,6 +68,7 @@ import { MILESTONE_ID_RE } from "./milestone-ids.js";
 import { updateProgressWidget as _updateProgressWidget, setCompletionProgressWidget, setAutoOutcomeWidget, setAutoActiveStatus, updateSliceProgressCache, clearSliceProgressCache, unitVerb, } from "./auto-dashboard.js";
 import { registerSigtermHandler as _registerSigtermHandler, deregisterSigtermHandler as _deregisterSigtermHandler, } from "./auto-supervisor.js";
 import { isDbAvailable, getMilestone, getMilestoneSlices, } from "./gsd-db.js";
+import { closeWorkflowDatabase } from "./db-workspace.js";
 import { markLatestActiveForWorkerCanceled } from "./db/unit-dispatches.js";
 import { writeUnitRuntimeRecord } from "./unit-runtime.js";
 import { countPendingCaptures } from "./captures.js";
@@ -109,7 +111,7 @@ void initTokenCounter().catch((err) => {
     logWarning("engine", `token counter warm-up failed: ${err instanceof Error ? err.message : String(err)}`);
 });
 export { STUB_RECOVERY_THRESHOLD, NEW_SESSION_TIMEOUT_MS, } from "./auto/session.js";
-import { autoSession as s } from "./auto-runtime-state.js";
+import { autoSession as s, getAutoRuntimeSnapshot } from "./auto-runtime-state.js";
 import { gsdHome } from "./gsd-home.js";
 import { createWorkspace, scopeMilestone } from "./workspace.js";
 import { registerAutoWorker, markWorkerStopping, } from "./db/auto-workers.js";
@@ -463,6 +465,7 @@ function stopAutoCommandPolling() {
 }
 export function getAutoDashboardData() {
     const ledger = getLedger();
+    const runtimeSnapshot = getAutoRuntimeSnapshot();
     const totals = ledger ? getProjectTotals(ledger.units) : null;
     const sessionId = s.cmdCtx?.sessionManager?.getSessionId?.() ?? null;
     const rtkSavings = sessionId && s.basePath
@@ -495,6 +498,7 @@ export function getAutoDashboardData() {
         pendingCaptureCount,
         rtkSavings,
         rtkEnabled,
+        toolSurface: runtimeSnapshot.toolSurface,
     };
 }
 // ─── Public API ───────────────────────────────────────────────────────────────
@@ -1003,12 +1007,13 @@ export async function stopAuto(ctx, pi, reason, options = {}) {
     // worktree was active, and whether the current milestone was merged before
     // stopAuto. The unmerged-work warning is only meaningful for real worktrees.
     try {
-        const { emitAutoExit, normalizeAutoExitReason } = await import("./worktree-telemetry.js");
+        const { autoExitReasonForTerminalOutcome, emitAutoExit, normalizeAutoExitReason, } = await import("./worktree-telemetry.js");
         // Normalize the free-form reason to a closed set so the telemetry
         // aggregator buckets stably. Raw detail is preserved in the phases.ts
         // notification and the notify'd error string.
         const rawReason = reason ?? "stop";
-        const normalizedReason = normalizeAutoExitReason(rawReason);
+        const normalizedReason = autoExitReasonForTerminalOutcome(options.terminalOutcome)
+            ?? normalizeAutoExitReason(rawReason);
         const telemetryBase = s.originalBasePath || s.basePath;
         emitAutoExit(telemetryBase, {
             reason: normalizedReason,
@@ -1184,8 +1189,7 @@ export async function stopAuto(ctx, pi, reason, options = {}) {
         // ── Step 6: DB cleanup ──
         if (isDbAvailable()) {
             try {
-                const { closeDatabase } = await import("./gsd-db.js");
-                closeDatabase();
+                closeWorkflowDatabase();
             }
             catch (e) {
                 debugLog("db-close-failed", {
@@ -1622,7 +1626,7 @@ export function buildWorktreeLifecycleDeps() {
     //   C4 (#5627) — GitServiceImpl constructor → gitServiceFactory
     //
     // Final WorktreeLifecycleDeps shape: 3 fields (gitServiceFactory,
-    // worktreeProjection, mergeMilestoneToMain). Down from 18 at slice-7
+    // worktreeProjection, mergeMilestoneToMain transaction runner). Down from 18 at slice-7
     // closure.
     return {
         gitServiceFactory: (basePath) => {
@@ -1630,7 +1634,7 @@ export function buildWorktreeLifecycleDeps() {
             return new GitServiceImpl(basePath, gitConfig);
         },
         worktreeProjection: new WorktreeStateProjection(),
-        mergeMilestoneToMain,
+        mergeMilestoneToMain: createMilestoneMergeTransaction(mergeMilestoneToMain),
     };
 }
 function buildLifecycle() {

package/dist/resources/extensions/gsd/bootstrap/db-tools.js

@@ -10,6 +10,7 @@ import { logError } from "../workflow-logger.js";
 import { getErrorMessage } from "../error-utils.js";
 import { incrementLegacyTelemetry } from "../legacy-telemetry.js";
 import { prepareSaveGateResultArguments } from "../tools/save-gate-result-args.js";
+import { aliasesForWorkflowTool } from "../workflow-tool-surface.js";
 async function loadWorkflowExecutors() {
     return importWorkflowExecutorsModule();
 }
@@ -41,6 +42,13 @@ function registerAlias(pi, toolDef, aliasName, canonicalName) {
         execute,
     });
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- toolDef shape matches ToolDefinition but varies by schema
+function registerWorkflowTool(pi, toolDef) {
+    pi.registerTool(toolDef);
+    for (const alias of aliasesForWorkflowTool(toolDef.name)) {
+        registerAlias(pi, toolDef, alias, toolDef.name);
+    }
+}
 function requirementRootWriteGuard(operation, basePath) {
     const guard = shouldBlockRootArtifactSaveInSnapshot(loadWriteGateSnapshot(basePath), "REQUIREMENTS");
     if (!guard.block)
@@ -155,8 +163,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(decisionSaveTool);
-    registerAlias(pi, decisionSaveTool, "gsd_save_decision", "gsd_decision_save");
+    registerWorkflowTool(pi, decisionSaveTool);
     // ─── gsd_requirement_update (formerly gsd_update_requirement) ───────────
     const requirementUpdateExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -241,8 +248,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(requirementUpdateTool);
-    registerAlias(pi, requirementUpdateTool, "gsd_update_requirement", "gsd_requirement_update");
+    registerWorkflowTool(pi, requirementUpdateTool);
     // ─── gsd_requirement_save ─────────────────────────────────────────────
     const requirementSaveExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -340,8 +346,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(requirementSaveTool);
-    registerAlias(pi, requirementSaveTool, "gsd_save_requirement", "gsd_requirement_save");
+    registerWorkflowTool(pi, requirementSaveTool);
     // ─── gsd_summary_save (formerly gsd_save_summary) ──────────────────────
     const summarySaveExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         try {
@@ -397,8 +402,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(summarySaveTool);
-    registerAlias(pi, summarySaveTool, "gsd_save_summary", "gsd_summary_save");
+    registerWorkflowTool(pi, summarySaveTool);
     // ─── gsd_uat_result_save ─────────────────────────────────────────────────
     const uatResultSaveExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeUatResultSave } = await loadWorkflowExecutors();
@@ -480,7 +484,7 @@ export function registerDbTools(pi) {
             return new Text(theme.fg("success", `UAT ${d?.sliceId ?? ""}: ${d?.verdict ?? "saved"}`), 0, 0);
         },
     };
-    pi.registerTool(uatResultSaveTool);
+    registerWorkflowTool(pi, uatResultSaveTool);
     // ─── gsd_milestone_generate_id (formerly gsd_generate_milestone_id) ────
     const milestoneGenerateIdExecute = async (_toolCallId, _params, _signal, _onUpdate, _ctx) => {
         try {
@@ -566,8 +570,7 @@ export function registerDbTools(pi) {
             return new Text(text, 0, 0);
         },
     };
-    pi.registerTool(milestoneGenerateIdTool);
-    registerAlias(pi, milestoneGenerateIdTool, "gsd_generate_milestone_id", "gsd_milestone_generate_id");
+    registerWorkflowTool(pi, milestoneGenerateIdTool);
     // ─── gsd_plan_milestone (gsd_milestone_plan alias) ─────────────────────
     const planMilestoneExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executePlanMilestone } = await loadWorkflowExecutors();
@@ -633,8 +636,7 @@ export function registerDbTools(pi) {
         }),
         execute: planMilestoneExecute,
     };
-    pi.registerTool(planMilestoneTool);
-    registerAlias(pi, planMilestoneTool, "gsd_milestone_plan", "gsd_plan_milestone");
+    registerWorkflowTool(pi, planMilestoneTool);
     // ─── gsd_plan_slice (gsd_slice_plan alias) ─────────────────────────────
     const planSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executePlanSlice } = await loadWorkflowExecutors();
@@ -678,8 +680,7 @@ export function registerDbTools(pi) {
         }),
         execute: planSliceExecute,
     };
-    pi.registerTool(planSliceTool);
-    registerAlias(pi, planSliceTool, "gsd_slice_plan", "gsd_plan_slice");
+    registerWorkflowTool(pi, planSliceTool);
     // ─── gsd_plan_task (gsd_task_plan alias) ───────────────────────────────
     const planTaskExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -748,8 +749,7 @@ export function registerDbTools(pi) {
         }),
         execute: planTaskExecute,
     };
-    pi.registerTool(planTaskTool);
-    registerAlias(pi, planTaskTool, "gsd_task_plan", "gsd_plan_task");
+    registerWorkflowTool(pi, planTaskTool);
     // ─── gsd_task_complete (gsd_complete_task alias) ────────────────────────
     const taskCompleteExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeTaskComplete } = await loadWorkflowExecutors();
@@ -809,8 +809,7 @@ export function registerDbTools(pi) {
         }),
         execute: taskCompleteExecute,
     };
-    pi.registerTool(taskCompleteTool);
-    registerAlias(pi, taskCompleteTool, "gsd_complete_task", "gsd_task_complete");
+    registerWorkflowTool(pi, taskCompleteTool);
     // ─── gsd_slice_complete (gsd_complete_slice alias) ─────────────────────
     const sliceCompleteExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeSliceComplete } = await loadWorkflowExecutors();
@@ -875,8 +874,7 @@ export function registerDbTools(pi) {
         }),
         execute: sliceCompleteExecute,
     };
-    pi.registerTool(sliceCompleteTool);
-    registerAlias(pi, sliceCompleteTool, "gsd_complete_slice", "gsd_slice_complete");
+    registerWorkflowTool(pi, sliceCompleteTool);
     // ─── gsd_skip_slice (#3477 / #3487) ───────────────────────────────────
     const skipSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -941,7 +939,7 @@ export function registerDbTools(pi) {
             };
         }
     };
-    pi.registerTool({
+    registerWorkflowTool(pi, {
         name: "gsd_skip_slice",
         label: "Skip Slice",
         description: "Mark a slice as skipped so auto-mode advances past it without executing. " +
@@ -1000,8 +998,7 @@ export function registerDbTools(pi) {
         }),
         execute: milestoneCompleteExecute,
     };
-    pi.registerTool(milestoneCompleteTool);
-    registerAlias(pi, milestoneCompleteTool, "gsd_milestone_complete", "gsd_complete_milestone");
+    registerWorkflowTool(pi, milestoneCompleteTool);
     // ─── gsd_validate_milestone (gsd_milestone_validate alias) ─────────────
     const milestoneValidateExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeValidateMilestone } = await loadWorkflowExecutors();
@@ -1035,8 +1032,7 @@ export function registerDbTools(pi) {
         }),
         execute: milestoneValidateExecute,
     };
-    pi.registerTool(milestoneValidateTool);
-    registerAlias(pi, milestoneValidateTool, "gsd_milestone_validate", "gsd_validate_milestone");
+    registerWorkflowTool(pi, milestoneValidateTool);
     // ─── gsd_replan_slice (gsd_slice_replan alias) ─────────────────────────
     const replanSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeReplanSlice } = await loadWorkflowExecutors();
@@ -1078,8 +1074,7 @@ export function registerDbTools(pi) {
         }),
         execute: replanSliceExecute,
     };
-    pi.registerTool(replanSliceTool);
-    registerAlias(pi, replanSliceTool, "gsd_slice_replan", "gsd_replan_slice");
+    registerWorkflowTool(pi, replanSliceTool);
     // ─── gsd_reassess_roadmap (gsd_roadmap_reassess alias) ─────────────────
     const reassessRoadmapExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeReassessRoadmap } = await loadWorkflowExecutors();
@@ -1126,8 +1121,7 @@ export function registerDbTools(pi) {
         }),
         execute: reassessRoadmapExecute,
     };
-    pi.registerTool(reassessRoadmapTool);
-    registerAlias(pi, reassessRoadmapTool, "gsd_roadmap_reassess", "gsd_reassess_roadmap");
+    registerWorkflowTool(pi, reassessRoadmapTool);
     // ─── gsd_task_reopen (gsd_reopen_task alias) ───────────────────────────
     // Single-writer v3, Stream 3: reversibility tools for closed units.
     const reopenTaskExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
@@ -1190,8 +1184,7 @@ export function registerDbTools(pi) {
         }),
         execute: reopenTaskExecute,
     };
-    pi.registerTool(reopenTaskTool);
-    registerAlias(pi, reopenTaskTool, "gsd_reopen_task", "gsd_task_reopen");
+    registerWorkflowTool(pi, reopenTaskTool);
     // ─── gsd_slice_reopen (gsd_reopen_slice alias) ─────────────────────────
     const reopenSliceExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -1253,8 +1246,7 @@ export function registerDbTools(pi) {
         }),
         execute: reopenSliceExecute,
     };
-    pi.registerTool(reopenSliceTool);
-    registerAlias(pi, reopenSliceTool, "gsd_reopen_slice", "gsd_slice_reopen");
+    registerWorkflowTool(pi, reopenSliceTool);
     // ─── gsd_milestone_reopen (gsd_reopen_milestone alias) ─────────────────
     const reopenMilestoneExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const basePath = resolveCtxCwd(_ctx);
@@ -1314,8 +1306,7 @@ export function registerDbTools(pi) {
         }),
         execute: reopenMilestoneExecute,
     };
-    pi.registerTool(reopenMilestoneTool);
-    registerAlias(pi, reopenMilestoneTool, "gsd_reopen_milestone", "gsd_milestone_reopen");
+    registerWorkflowTool(pi, reopenMilestoneTool);
     // ─── gsd_save_gate_result ──────────────────────────────────────────────
     const saveGateResultExecute = async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
         const { executeSaveGateResult } = await loadWorkflowExecutors();
@@ -1378,5 +1369,5 @@ export function registerDbTools(pi) {
             return new Text(theme.fg(color, `${d.gateId}: ${d.verdict}`), 0, 0);
         },
     };
-    pi.registerTool(saveGateResultTool);
+    registerWorkflowTool(pi, saveGateResultTool);
 }

package/dist/resources/extensions/gsd/bootstrap/dynamic-tools.js

@@ -2,11 +2,11 @@
 // File Purpose: Registers workspace-aware dynamic filesystem and shell tools.
 import { existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import { createBashTool, createEditTool, createReadTool, createWriteTool } from "@gsd/pi-coding-agent";
 import { DEFAULT_BASH_TIMEOUT_SECS } from "../constants.js";
-import { setLogBasePath, logWarning } from "../workflow-logger.js";
-import { resolveGsdPathContract } from "../paths.js";
+import { logWarning } from "../workflow-logger.js";
+import { openWorkflowDatabase } from "../db-workspace.js";
 import { getAutoWorktreePath } from "../auto-worktree.js";
 import { resolveWorktreeProjectRoot } from "../worktree-root.js";
 export function safeWorkspaceCwd() {
@@ -58,44 +58,18 @@ export function resolveWorkflowToolBasePath(ctx, scope) {
     }
     return cwd;
 }
-/**
- * Resolve the correct DB path for the current working directory.
- * If `basePath` is inside a `.gsd/worktrees/<MID>/` directory, returns
- * the project root's `.gsd/gsd.db` (shared WAL — R012). Otherwise
- * returns `<basePath>/.gsd/gsd.db`.
- */
-export function resolveProjectRootDbPath(basePath) {
-    return resolveGsdPathContract(basePath).projectDb;
-}
+export { resolveProjectRootDbPath } from "../db-workspace.js";
 export async function ensureDbOpen(basePath = safeWorkspaceCwd()) {
-    try {
-        const db = await import("../gsd-db.js");
-        const contract = resolveGsdPathContract(basePath);
-        const dbPath = contract.projectDb;
-        const gsdDir = contract.projectGsd;
-        const projectRoot = dirname(dirname(dbPath));
-        // Open existing DB file (may be at project root for worktrees)
-        if (existsSync(dbPath)) {
-            const opened = db.openDatabase(dbPath);
-            if (opened)
-                setLogBasePath(projectRoot);
-            return opened;
-        }
-        // No DB file — create an empty authoritative DB. Markdown migration is
-        // explicit-only; runtime startup must not import projections into state.
-        if (existsSync(gsdDir)) {
-            const opened = db.openDatabase(dbPath);
-            if (opened)
-                setLogBasePath(projectRoot);
-            return opened;
-        }
+    const result = openWorkflowDatabase(basePath);
+    if (result.ok)
+        return true;
+    if (result.reason === "missing-gsd-dir") {
         logWarning("bootstrap", "ensureDbOpen failed — no .gsd directory found");
-        return false;
     }
-    catch (err) {
-        logWarning("bootstrap", `ensureDbOpen failed: ${err.message ?? String(err)}`);
-        return false;
+    else {
+        logWarning("bootstrap", `ensureDbOpen failed: ${result.error?.message ?? "open failed"}`);
     }
+    return false;
 }
 export function registerDynamicTools(pi) {
     const fallbackRoot = safeWorkspaceCwd();

package/dist/resources/extensions/gsd/bootstrap/query-tools.js

@@ -3,6 +3,7 @@
 // gsd-pi — Read-only query tools exposing DB state to the LLM via the WAL connection
 import { Type } from "@sinclair/typebox";
 import { ensureDbOpen, resolveCtxCwd } from "./dynamic-tools.js";
+import { checkpointWorkflowDatabase } from "../db-workspace.js";
 export function registerQueryTools(pi) {
     pi.registerTool({
         name: "gsd_milestone_status",
@@ -50,8 +51,7 @@ export function registerQueryTools(pi) {
                     details: { operation: "checkpoint_db", error: "db_unavailable" },
                 };
             }
-            const { checkpointDatabase } = await import("../gsd-db.js");
-            checkpointDatabase();
+            checkpointWorkflowDatabase();
             return {
                 content: [{ type: "text", text: "WAL checkpoint complete. gsd.db is now up to date and safe to stage with git add." }],
                 details: { operation: "checkpoint_db", status: "ok" },