gsd-pi 2.78.1-dev.84a383f51 → 2.78.1

package/src/resources/extensions/gsd/auto/session.ts

@@ -193,8 +193,6 @@ export class AutoSession {
   lastPromptCharCount: number | undefined;
   lastBaselineCharCount: number | undefined;
   pendingQuickTasks: CaptureEntry[] = [];
-  /** Timestamp of the last LLM request dispatch (ms since epoch). Used for proactive rate limiting. */
-  lastRequestTimestamp = 0;
 
   // ── Safety harness ───────────────────────────────────────────────────────
   /** SHA of the pre-unit git checkpoint ref. Cleared on success or rollback. */
@@ -296,7 +294,6 @@ export class AutoSession {
     this.lastPromptCharCount = undefined;
     this.lastBaselineCharCount = undefined;
     this.pendingQuickTasks = [];
-    this.lastRequestTimestamp = 0;
     this.sidecarQueue = [];
     this.rewriteAttemptCount = 0;
     this.consecutiveCompleteBootstraps = 0;

package/src/resources/extensions/gsd/auto/types.ts

@@ -66,7 +66,6 @@ export interface UnitResult {
   status: "completed" | "cancelled" | "error";
   event?: AgentEndEvent;
   errorContext?: ErrorContext;
-  requestDispatchedAt?: number;
 }
 
 // ─── Phase pipeline types ────────────────────────────────────────────────────

package/src/resources/extensions/gsd/auto-recovery.ts

@@ -9,7 +9,6 @@
 
 import type { ExtensionContext } from "@gsd/pi-coding-agent";
 import { parseUnitId } from "./unit-id.js";
-import { MILESTONE_ID_RE } from "./milestone-ids.js";
 import { appendEvent } from "./workflow-events.js";
 import { atomicWriteSync } from "./atomic-write.js";
 import { clearParseCache } from "./files.js";
@@ -214,40 +213,13 @@ function getChangedFilesSinceBranch(basePath: string, targetBranch: string): { o
 function getChangedFilesFromMilestoneTaggedCommits(
   basePath: string,
   milestoneId: string,
-): { ok: boolean; matched: boolean; files: string[] } {
-  // Primary: path-scoped log against .gsd/milestones/<id>. Fast and unbounded
-  // by depth when .gsd/ is tracked in git.
-  const scoped = scanGsdTaggedCommits(basePath, milestoneId, [
-    "log", "--format=%H%x1f%B%x1e", "HEAD", "--", `.gsd/milestones/${milestoneId}`,
-  ]);
-  if (!scoped.ok) return scoped;
-  if (scoped.matched) return scoped;
-
-  // Fallback (#5033): when .gsd/ is gitignored / external / untracked, the
-  // path-scoped scan matches no commits even though GSD-tagged commits
-  // referencing the milestone exist on the integration branch. Re-scan all
-  // of HEAD's history and rely on commitMatchesMilestone to bind by
-  // explicit milestone mention in the message body.
-  //
-  // Intentionally unbounded — symmetric with the primary scan, and avoids
-  // reintroducing the rolling-depth failure class removed in #4699 where
-  // milestone evidence aged out behind unrelated activity.
-  return scanGsdTaggedCommits(basePath, milestoneId, [
-    "log", "--format=%H%x1f%B%x1e", "HEAD",
-  ]);
-}
-
-function scanGsdTaggedCommits(
-  basePath: string,
-  milestoneId: string,
-  gitArgs: readonly string[],
 ): { ok: boolean; matched: boolean; files: string[] } {
   try {
-    const logOutput = execFileSync("git", [...gitArgs], {
-      cwd: basePath,
-      stdio: ["ignore", "pipe", "pipe"],
-      encoding: "utf-8",
-    });
+    const logOutput = execFileSync(
+      "git",
+      ["log", "--format=%H%x1f%B%x1e", "HEAD", "--", `.gsd/milestones/${milestoneId}`],
+      { cwd: basePath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" },
+    );
     const records = logOutput
       .split("\x1e")
       .map((record) => record.trim())
@@ -298,25 +270,15 @@ function commitMatchesMilestone(message: string, milestoneId: string, files: rea
   if (commitTrailerStartsWithMilestone(message, milestoneId)) return true;
 
   // Meaningful execute-task commits currently store task scope as Sxx/Tyy
-  // rather than Mxx/Sxx/Tyy. Bind those commits back to the milestone when
-  // either the commit touched this milestone's artifacts, or — for projects
-  // where .gsd/ is gitignored/external (#5033) — the message explicitly
-  // names the milestone.
+  // rather than Mxx/Sxx/Tyy. Bind those commits back to the milestone only
+  // when the commit also touched this milestone's artifacts.
   if (/^GSD-Task:\s*S[^/\s]+\/T\S+/m.test(message)) {
-    if (files.some((file) => isMilestoneArtifactPath(file, milestoneId))) return true;
-    if (commitMessageMentionsMilestone(message, milestoneId)) return true;
+    return files.some((file) => isMilestoneArtifactPath(file, milestoneId));
   }
 
   return false;
 }
 
-function commitMessageMentionsMilestone(message: string, milestoneId: string): boolean {
-  if (!MILESTONE_ID_RE.test(milestoneId)) return false;
-
-  const escapedMilestone = milestoneId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`\\b${escapedMilestone}\\b`).test(message);
-}
-
 function commitTrailerStartsWithMilestone(message: string, milestoneId: string): boolean {
   const escapedMilestone = milestoneId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const trailerPattern = new RegExp(

package/src/resources/extensions/gsd/auto-start.ts

@@ -315,7 +315,7 @@ export function auditOrphanedMilestoneBranches(
       // Branch is NOT merged — preserve for safety, warn the user
       warnings.push(
         `Branch ${branch} exists for completed milestone ${milestoneId} but is NOT merged into ${mainBranch}. ` +
-        `This may contain unmerged work. Merge manually or run \`/gsd doctor fix\` to resolve.`,
+        `This may contain unmerged work. Merge manually or run \`/gsd health --fix\` to resolve.`,
       );
 
       // #4764 telemetry

package/src/resources/extensions/gsd/auto-tool-tracking.ts

@@ -151,6 +151,8 @@ export const DETERMINISTIC_POLICY_ERROR_STRINGS = [
  */
 export function isDeterministicPolicyError(errorMsg: string): boolean {
   if (!errorMsg) return false;
-  return DETERMINISTIC_POLICY_ERROR_RE.test(errorMsg)
-    || DETERMINISTIC_POLICY_ERROR_STRINGS.some(s => errorMsg.includes(s));
+  return (
+    DETERMINISTIC_POLICY_ERROR_RE.test(errorMsg) ||
+    DETERMINISTIC_POLICY_ERROR_STRINGS.some(s => errorMsg.includes(s))
+  );
 }

package/src/resources/extensions/gsd/auto-worktree.ts

@@ -990,12 +990,6 @@ export function autoWorktreeBranch(milestoneId: string): string {
   return `milestone/${milestoneId}`;
 }
 
-function normalizeLocalBranchRef(branch: string): string {
-  return branch.startsWith("refs/heads/")
-    ? branch.slice("refs/heads/".length)
-    : branch;
-}
-
 // ─── Branch-mode Entry ─────────────────────────────────────────────────────
 
 /**
@@ -1202,16 +1196,6 @@ export function createAutoWorktree(
   basePath: string,
   milestoneId: string,
 ): string {
-  // Check if repo has commits — git worktree requires a valid HEAD
-  try {
-    execFileSync("git", ["rev-parse", "--verify", "HEAD"], { cwd: basePath, stdio: "pipe" });
-  } catch {
-    throw new GSDError(
-      GSD_GIT_ERROR,
-      `Cannot create worktree: repository has no commits yet. Worktree isolation requires at least one commit.`,
-    );
-  }
-
   const branch = autoWorktreeBranch(milestoneId);
 
   // Check if the milestone branch already exists — it survives auto-mode
@@ -1652,10 +1636,6 @@ export function mergeMilestoneToMain(
   }
 
   // 3. chdir to original base
-  // Note: previousCwd captures the cwd at this point — i.e. the worktree cwd
-  // entering the function. Subsequent throws restore to previousCwd, leaving
-  // the caller in worktree-cwd; callers (worktree-resolver) are responsible
-  // for any further cwd movement on the error path.
   const previousCwd = process.cwd();
   process.chdir(originalBasePath_);
 
@@ -1676,24 +1656,6 @@ export function mergeMilestoneToMain(
   const mainBranch =
     integrationBranch ?? validatedPrefBranch ?? nativeDetectMainBranch(originalBasePath_);
 
-  // Fail closed when the resolved integration branch is the milestone branch
-  // itself (#5024). Stale or corrupt metadata (e.g. integrationBranch recorded
-  // as "milestone/<MID>") would otherwise let the squash merge resolve to a
-  // self-merge: nothing-to-commit + empty self-diff in the post-merge safety
-  // check (#1792) collapse to a false success, and the worktree-resolver
-  // emits worktree-merged for work that never landed on a distinct
-  // integration branch.
-  if (normalizeLocalBranchRef(mainBranch) === milestoneBranch) {
-    process.chdir(previousCwd);
-    throw new GSDError(
-      GSD_GIT_ERROR,
-      `Resolved integration branch "${mainBranch}" is the same ref as milestone branch ` +
-      `"${milestoneBranch}" — refusing to self-merge. Integration branch metadata is invalid; ` +
-      `set a distinct main_branch in GSD preferences or repair the milestone integration record ` +
-      `before retrying milestone completion.`,
-    );
-  }
-
   // Remove transient project-root state files before any branch or merge
   // operation. Untracked milestone metadata can otherwise block squash merges.
   clearProjectRootStateFiles(originalBasePath_, milestoneId);

package/src/resources/extensions/gsd/auto.ts

@@ -232,6 +232,7 @@ import { reorderForCaching } from "./prompt-ordering.js";
 // ─── Session State ─────────────────────────────────────────────────────────
 
 import {
+  AutoSession,
   STUB_RECOVERY_THRESHOLD,
   NEW_SESSION_TIMEOUT_MS,
 } from "./auto/session.js";
@@ -249,12 +250,11 @@ export type {
   UnitRouting,
   StartModel,
 } from "./auto/session.js";
-import { autoSession as s } from "./auto-runtime-state.js";
 
 // ── ENCAPSULATION INVARIANT ─────────────────────────────────────────────────
 // ALL mutable auto-mode state lives in the AutoSession class (auto/session.ts).
 // This file must NOT declare module-level `let` or `var` variables for state.
-// The single shared `s` instance below is the only mutable AutoSession binding.
+// The single `s` instance below is the only mutable module-level binding.
 //
 // When adding features or fixing bugs:
 //   - New mutable state → add a property to AutoSession, not a module-level variable
@@ -263,6 +263,7 @@ import { autoSession as s } from "./auto-runtime-state.js";
 //
 // Tests in auto-session-encapsulation.test.ts enforce this invariant.
 // ─────────────────────────────────────────────────────────────────────────────
+const s = new AutoSession();
 
 /** Throttle STATE.md rebuilds — at most once per 30 seconds */
 const STATE_REBUILD_MIN_INTERVAL_MS = 30_000;
@@ -1811,7 +1812,7 @@ const widgetStateAccessors: WidgetStateAccessors = {
  * Ensure directories, branches, and other prerequisites exist before
  * dispatching a unit. The LLM should never need to mkdir or git checkout.
  */
-export function ensurePreconditions(
+function ensurePreconditions(
   unitType: string,
   unitId: string,
   base: string,
@@ -1821,17 +1822,6 @@ export function ensurePreconditions(
 
   const mDir = resolveMilestonePath(base, mid);
   if (!mDir) {
-    // Fix #4996: When dispatching a slice unit against an unrecognised milestone,
-    // only create the directory if the milestone has a DB row.
-    // Without this guard, forward-referenced unit IDs (e.g. from REQUIREMENTS.md)
-    // silently scaffold empty stub directories that later skew nextMilestoneId.
-    if (sid !== undefined) {
-      const hasDbRow = isDbAvailable() && getMilestone(mid) != null;
-      if (!hasDbRow) {
-        logWarning("engine", `ensurePreconditions: skipping mkdir for unrecognised milestone ${mid} referenced by slice unit ${unitId} — no DB row exists`, { file: "auto.ts" });
-        return;
-      }
-    }
     const newDir = join(milestonesDir(base), mid);
     mkdirSync(join(newDir, "slices"), { recursive: true });
   }

package/src/resources/extensions/gsd/bootstrap/db-tools.ts

@@ -2,15 +2,24 @@ import { Type } from "@sinclair/typebox";
 import type { ExtensionAPI } from "@gsd/pi-coding-agent";
 import { Text } from "@gsd/pi-tui";
 
+import { findMilestoneIds, nextMilestoneId, claimReservedId, getReservedMilestoneIds } from "../guided-flow.js";
 import { loadEffectiveGSDPreferences } from "../preferences.js";
 import { ensureDbOpen } from "./dynamic-tools.js";
 import { StringEnum } from "@gsd/pi-ai";
 import { logError } from "../workflow-logger.js";
 import { getErrorMessage } from "../error-utils.js";
-
-async function loadWorkflowExecutors(): Promise<typeof import("../tools/workflow-tool-executors.js")> {
-  return import("../tools/workflow-tool-executors.js");
-}
+import {
+  executeCompleteMilestone,
+  executePlanMilestone,
+  executePlanSlice,
+  executeReplanSlice,
+  executeReassessRoadmap,
+  executeSaveGateResult,
+  executeSliceComplete,
+  executeSummarySave,
+  executeTaskComplete,
+  executeValidateMilestone,
+} from "../tools/workflow-tool-executors.js";
 
 /**
  * Register an alias tool that shares the same execute function as its canonical counterpart.
@@ -293,7 +302,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_summary_save (formerly gsd_save_summary) ──────────────────────
 
   const summarySaveExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executeSummarySave } = await loadWorkflowExecutors();
     return executeSummarySave(params, process.cwd());
   };
 
@@ -346,7 +354,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
     try {
       // Claim a reserved ID if the guided-flow already previewed one to the user.
       // This guarantees the ID shown in the UI matches the one materialised on disk.
-      const { claimReservedId, findMilestoneIds, getReservedMilestoneIds, nextMilestoneId } = await import("../guided-flow.js");
       const reserved = claimReservedId();
       if (reserved) {
         await ensureMilestoneDbRow(reserved);
@@ -428,7 +435,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_plan_milestone (gsd_milestone_plan alias) ─────────────────────
 
   const planMilestoneExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executePlanMilestone } = await loadWorkflowExecutors();
     return executePlanMilestone(params, process.cwd());
   };
 
@@ -498,7 +504,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_plan_slice (gsd_slice_plan alias) ─────────────────────────────
 
   const planSliceExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executePlanSlice } = await loadWorkflowExecutors();
     return executePlanSlice(params, process.cwd());
   };
 
@@ -621,7 +626,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_task_complete (gsd_complete_task alias) ────────────────────────
 
   const taskCompleteExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executeTaskComplete } = await loadWorkflowExecutors();
     return executeTaskComplete(params, process.cwd());
   };
 
@@ -692,7 +696,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_slice_complete (gsd_complete_slice alias) ─────────────────────
 
   const sliceCompleteExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executeSliceComplete } = await loadWorkflowExecutors();
     return executeSliceComplete(params, process.cwd());
   };
 
@@ -885,7 +888,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_complete_milestone ────────────────────────────────────────────
 
   const milestoneCompleteExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executeCompleteMilestone } = await loadWorkflowExecutors();
     return executeCompleteMilestone(params, process.cwd());
   };
 
@@ -931,7 +933,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_validate_milestone (gsd_milestone_validate alias) ─────────────
 
   const milestoneValidateExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executeValidateMilestone } = await loadWorkflowExecutors();
     return executeValidateMilestone(params, process.cwd());
   };
 
@@ -969,7 +970,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_replan_slice (gsd_slice_replan alias) ─────────────────────────
 
   const replanSliceExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executeReplanSlice } = await loadWorkflowExecutors();
     return executeReplanSlice(params, process.cwd());
   };
 
@@ -1020,7 +1020,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_reassess_roadmap (gsd_roadmap_reassess alias) ─────────────────
 
   const reassessRoadmapExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executeReassessRoadmap } = await loadWorkflowExecutors();
     return executeReassessRoadmap(params, process.cwd());
   };
 
@@ -1276,7 +1275,6 @@ export function registerDbTools(pi: ExtensionAPI): void {
   // ─── gsd_save_gate_result ──────────────────────────────────────────────
 
   const saveGateResultExecute = async (_toolCallId: string, params: any, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: unknown) => {
-    const { executeSaveGateResult } = await loadWorkflowExecutors();
     return executeSaveGateResult(params, process.cwd());
   };
 

package/src/resources/extensions/gsd/bootstrap/exec-tools.ts

@@ -6,6 +6,12 @@
 import { Type } from "@sinclair/typebox";
 import type { ExtensionAPI } from "@gsd/pi-coding-agent";
 
+import { executeGsdExec } from "../tools/exec-tool.js";
+import { executeExecSearch } from "../tools/exec-search-tool.js";
+import { executeResume } from "../tools/resume-tool.js";
+import { loadEffectiveGSDPreferences } from "../preferences.js";
+import { logWarning } from "../workflow-logger.js";
+
 export function registerExecTools(pi: ExtensionAPI): void {
   pi.registerTool({
     name: "gsd_exec",
@@ -40,12 +46,7 @@ export function registerExecTools(pi: ExtensionAPI): void {
       ),
     }),
     async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-      const [{ executeGsdExec }, { loadEffectiveGSDPreferences }, { logWarning }] = await Promise.all([
-        import("../tools/exec-tool.js"),
-        import("../preferences.js"),
-        import("../workflow-logger.js"),
-      ]);
-      let prefs: ReturnType<typeof loadEffectiveGSDPreferences> | null = null;
+      let prefs: Awaited<ReturnType<typeof loadEffectiveGSDPreferences>> | null = null;
       try {
         prefs = loadEffectiveGSDPreferences();
       } catch (err) {
@@ -80,7 +81,6 @@ export function registerExecTools(pi: ExtensionAPI): void {
       limit: Type.Optional(Type.Number({ description: "Max results (default 20, cap 200)", minimum: 1, maximum: 200 })),
     }),
     async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-      const { executeExecSearch } = await import("../tools/exec-search-tool.js");
       return executeExecSearch(params as Parameters<typeof executeExecSearch>[0], {
         baseDir: process.cwd(),
       });
@@ -101,7 +101,6 @@ export function registerExecTools(pi: ExtensionAPI): void {
     ],
     parameters: Type.Object({}),
     async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-      const { executeResume } = await import("../tools/resume-tool.js");
       return executeResume(params as Parameters<typeof executeResume>[0], {
         baseDir: process.cwd(),
       });

package/src/resources/extensions/gsd/bootstrap/query-tools.ts

@@ -3,6 +3,8 @@
 import { Type } from "@sinclair/typebox";
 import type { ExtensionAPI } from "@gsd/pi-coding-agent";
 import { ensureDbOpen } from "./dynamic-tools.js";
+import { executeMilestoneStatus } from "../tools/workflow-tool-executors.js";
+import { checkpointDatabase } from "../gsd-db.js";
 
 export function registerQueryTools(pi: ExtensionAPI): void {
   pi.registerTool({
@@ -27,7 +29,6 @@ export function registerQueryTools(pi: ExtensionAPI): void {
           details: { operation: "milestone_status", error: "db_unavailable" },
         };
       }
-      const { executeMilestoneStatus } = await import("../tools/workflow-tool-executors.js");
       return executeMilestoneStatus(params);
     },
   });
@@ -54,7 +55,6 @@ export function registerQueryTools(pi: ExtensionAPI): void {
           details: { operation: "checkpoint_db", error: "db_unavailable" },
         };
       }
-      const { checkpointDatabase } = await import("../gsd-db.js");
       checkpointDatabase();
       return {
         content: [{ type: "text", text: "WAL checkpoint complete. gsd.db is now up to date and safe to stage with git add." }],

package/src/resources/extensions/gsd/bootstrap/register-extension.ts

@@ -3,8 +3,9 @@
 import type { ExtensionAPI, ExtensionCommandContext } from "@gsd/pi-coding-agent";
 
 import { registerExitCommand } from "../exit-command.js";
-import { registerLazyWorktreeCommands } from "../worktree-command-bootstrap.js";
+import { registerWorktreeCommand } from "../worktree-command.js";
 import type { GSDEcosystemBeforeAgentStartHandler } from "../ecosystem/gsd-extension-api.js";
+import { loadEcosystemExtensions } from "../ecosystem/loader.js";
 import { registerDbTools } from "./db-tools.js";
 import { registerDynamicTools } from "./dynamic-tools.js";
 import { registerExecTools } from "./exec-tools.js";
@@ -70,7 +71,7 @@ function installEpipeGuard(): void {
 export function registerGsdExtension(pi: ExtensionAPI): void {
   // Note: registerGSDCommand is called by index.ts before this function,
   // so we intentionally skip it here to avoid double-registration.
-  registerLazyWorktreeCommands(pi);
+  registerWorktreeCommand(pi);
   registerExitCommand(pi);
 
   // Wire the Layer 2 event emitter bridge so deeply-nested GSD code can emit
@@ -115,14 +116,12 @@ export function registerGsdExtension(pi: ExtensionAPI): void {
     ["cmux-events", () => initCmuxEventListeners(pi.events)],
     ["hooks", () => registerHooks(pi, ecosystemHandlers)],
     ["ecosystem", () => {
-      void import("../ecosystem/loader.js")
-        .then(({ loadEcosystemExtensions }) => loadEcosystemExtensions(pi, ecosystemHandlers))
-        .catch((err) => {
-          logWarning(
-            "ecosystem",
-            `loader failed: ${err instanceof Error ? err.message : String(err)}`,
-          );
-        });
+      void loadEcosystemExtensions(pi, ecosystemHandlers).catch((err) => {
+        logWarning(
+          "ecosystem",
+          `loader failed: ${err instanceof Error ? err.message : String(err)}`,
+        );
+      });
     }],
   ];