gsd-pi 2.65.0 → 2.66.0-dev.e159299

package/src/resources/extensions/gsd/parallel-orchestrator.ts

@@ -550,19 +550,27 @@ export function spawnWorker(
 
   let child: ChildProcess;
   try {
+    const workerEnv: Record<string, string | undefined> = {
+      ...process.env,
+      GSD_MILESTONE_LOCK: milestoneId,
+      // Pass the real project root so workers don't need to re-derive it.
+      // Without this, process.cwd() resolves symlinks and the worktree
+      // path heuristic can match the user-level ~/.gsd instead of the
+      // project .gsd, causing writes to ~ and corrupting user config.
+      GSD_PROJECT_ROOT: basePath,
+      // Prevent workers from spawning their own parallel sessions
+      GSD_PARALLEL_WORKER: "1",
+    };
+
+    // Apply worker model override if configured, so workers use a cheaper
+    // model (e.g. Haiku) rather than inheriting the coordinator's model.
+    if (state.config.worker_model) {
+      workerEnv.GSD_WORKER_MODEL = state.config.worker_model;
+    }
+
     child = spawn(process.execPath, [binPath, "headless", "--json", "auto"], {
       cwd: worker.worktreePath,
-      env: {
-        ...process.env,
-        GSD_MILESTONE_LOCK: milestoneId,
-        // Pass the real project root so workers don't need to re-derive it.
-        // Without this, process.cwd() resolves symlinks and the worktree
-        // path heuristic can match the user-level ~/.gsd instead of the
-        // project .gsd, causing writes to ~ and corrupting user config.
-        GSD_PROJECT_ROOT: basePath,
-        // Prevent workers from spawning their own parallel sessions
-        GSD_PARALLEL_WORKER: "1",
-      },
+      env: workerEnv,
       stdio: ["ignore", "pipe", "pipe"],
       detached: false,
     });

package/src/resources/extensions/gsd/pre-execution-checks.ts

@@ -237,9 +237,11 @@ export async function checkPackageExistence(
  */
 export function normalizeFilePath(filePath: string): string {
   if (!filePath) return filePath;
-  
+
+  let normalized = extractPathFromAnnotation(filePath);
+
   // Normalize path separators to forward slashes
-  let normalized = filePath.replace(/\\/g, "/");
+  normalized = normalized.replace(/\\/g, "/");
   
   // Remove leading ./
   while (normalized.startsWith("./")) {
@@ -257,6 +259,24 @@ export function normalizeFilePath(filePath: string): string {
   return normalized;
 }
 
+function extractPathFromAnnotation(raw: string): string {
+  const trimmed = raw.trim();
+  if (!trimmed) return trimmed;
+
+  const backtickMatch = trimmed.match(/^`([^`]+)`(?:\s+[—–-]\s+.*)?$/);
+  if (backtickMatch) {
+    return backtickMatch[1].trim();
+  }
+
+  const annotatedMatch = trimmed.match(/^(.+?)\s+[—–-]\s+.+$/);
+  if (annotatedMatch) {
+    return annotatedMatch[1].trim();
+  }
+
+  // Fall back to the original behavior for already-plain paths.
+  return trimmed.replace(/`/g, "");
+}
+
 /**
  * Build a set of files that will be created by tasks up to (but not including) taskIndex.
  * All paths are normalized for consistent comparison.
@@ -272,10 +292,13 @@ function getExpectedOutputsUpTo(tasks: TaskRow[], taskIndex: number): Set<string
 }
 
 /**
- * Check that all files referenced in task.files and task.inputs either:
+ * Check that all files referenced in task.inputs either:
  *   1. Exist on disk, OR
  *   2. Are in a prior task's expected_output
- * 
+ *
+ * task.files ("files likely touched") is excluded — it intentionally includes
+ * files the task will create, so they don't need to pre-exist (#3626).
+ *
  * All paths are normalized before comparison to ensure ./src/a.ts matches src/a.ts.
  */
 export function checkFilePathConsistency(
@@ -287,7 +310,7 @@ export function checkFilePathConsistency(
   for (let i = 0; i < tasks.length; i++) {
     const task = tasks[i];
     const priorOutputs = getExpectedOutputsUpTo(tasks, i);
-    const filesToCheck = [...task.files, ...task.inputs];
+    const filesToCheck = [...task.inputs];
 
     for (const file of filesToCheck) {
       // Skip empty strings
@@ -344,10 +367,12 @@ export function checkTaskOrdering(
     }
   }
 
-  // Check each task's inputs against file creators
+  // Check each task's inputs against file creators.
+  // Only check task.inputs — task.files ("files likely touched") intentionally
+  // includes files the task will create, so they don't indicate read-before-create (#3677).
   for (let i = 0; i < tasks.length; i++) {
     const task = tasks[i];
-    const filesToCheck = [...task.files, ...task.inputs];
+    const filesToCheck = [...task.inputs];
 
     for (const file of filesToCheck) {
       const normalizedFile = normalizeFilePath(file);

package/src/resources/extensions/gsd/preferences-types.ts

@@ -110,6 +110,9 @@ export const KNOWN_PREFERENCE_KEYS = new Set<string>([
   "enhanced_verification_pre",
   "enhanced_verification_post",
   "enhanced_verification_strict",
+  "discuss_preparation",
+  "discuss_web_research",
+  "discuss_depth",
 ]);
 
 /** Canonical list of all dispatch unit types. */
@@ -309,6 +312,7 @@ export interface GSDPreferences {
     timeout_scale_cap?: number;
   };
 
+
   // ─── Enhanced Verification ──────────────────────────────────────────────────
   /**
    * Enable enhanced verification (both pre-execution and post-execution checks).
@@ -332,6 +336,27 @@ export interface GSDPreferences {
    * Default: false (warnings only for non-critical failures).
    */
   enhanced_verification_strict?: boolean;
+  /**
+   * Enable the preparation phase before discussion sessions.
+   * Preparation analyzes the codebase, reviews prior context, and optionally researches the ecosystem.
+   * Default: true.
+   */
+  discuss_preparation?: boolean;
+  /**
+   * Enable web research during preparation phase.
+   * When enabled, searches for best practices and known issues for the detected tech stack.
+   * Requires a search API key (TAVILY_API_KEY or BRAVE_API_KEY).
+   * Default: true.
+   */
+  discuss_web_research?: boolean;
+  /**
+   * Depth of preparation analysis.
+   * - "quick": Minimal analysis, fastest (~10s)
+   * - "standard": Balanced analysis (~30s)
+   * - "thorough": Deep analysis with more file sampling (~60s)
+   * Default: "standard".
+   */
+  discuss_depth?: "quick" | "standard" | "thorough";
 }
 
 export interface LoadedGSDPreferences {

package/src/resources/extensions/gsd/preferences-validation.ts

@@ -530,6 +530,14 @@ export function validatePreferences(preferences: GSDPreferences): {
       }
     }
 
+    if (p.worker_model !== undefined) {
+      if (typeof p.worker_model === "string" && p.worker_model.length > 0) {
+        parallel.worker_model = p.worker_model;
+      } else {
+        errors.push("parallel.worker_model must be a non-empty string");
+      }
+    }
+
     if (Object.keys(parallel).length > 0) {
       validated.parallel = parallel as unknown as import("./types.js").ParallelConfig;
     }
@@ -561,7 +569,15 @@ export function validatePreferences(preferences: GSDPreferences): {
         }
       }
 
-      const knownReKeys = new Set(["enabled", "max_parallel", "isolation_mode"]);
+      if (re.subagent_model !== undefined) {
+        if (typeof re.subagent_model === "string" && re.subagent_model.length > 0) {
+          validRe.subagent_model = re.subagent_model;
+        } else {
+          errors.push("reactive_execution.subagent_model must be a non-empty string");
+        }
+      }
+
+      const knownReKeys = new Set(["enabled", "max_parallel", "isolation_mode", "subagent_model"]);
       for (const key of Object.keys(re)) {
         if (!knownReKeys.has(key)) {
           warnings.push(`unknown reactive_execution key "${key}" — ignored`);
@@ -935,5 +951,33 @@ export function validatePreferences(preferences: GSDPreferences): {
     }
   }
 
+  // ─── Discuss Preparation ────────────────────────────────────────────
+  if (preferences.discuss_preparation !== undefined) {
+    if (typeof preferences.discuss_preparation === "boolean") {
+      validated.discuss_preparation = preferences.discuss_preparation;
+    } else {
+      errors.push("discuss_preparation must be a boolean");
+    }
+  }
+
+  // ─── Discuss Web Research ───────────────────────────────────────────
+  if (preferences.discuss_web_research !== undefined) {
+    if (typeof preferences.discuss_web_research === "boolean") {
+      validated.discuss_web_research = preferences.discuss_web_research;
+    } else {
+      errors.push("discuss_web_research must be a boolean");
+    }
+  }
+
+  // ─── Discuss Depth ──────────────────────────────────────────────────
+  if (preferences.discuss_depth !== undefined) {
+    const validDepths = new Set(["quick", "standard", "thorough"]);
+    if (typeof preferences.discuss_depth === "string" && validDepths.has(preferences.discuss_depth)) {
+      validated.discuss_depth = preferences.discuss_depth as GSDPreferences["discuss_depth"];
+    } else {
+      errors.push(`discuss_depth must be one of: quick, standard, thorough`);
+    }
+  }
+
   return { preferences: validated, errors, warnings };
 }

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

@@ -201,9 +201,10 @@ function loadPreferencesFile(path: string, scope: "global" | "project"): LoadedG
 
 let _warnedUnrecognizedFormat = false;
 
-/** @internal Reset the warn-once flag — exported for testing only. */
+/** @internal Reset the warn-once flags — exported for testing only. */
 export function _resetParseWarningFlag(): void {
   _warnedUnrecognizedFormat = false;
+  _warnedFrontmatterParse = false;
 }
 
 /** @internal Exported for testing only */
@@ -235,6 +236,7 @@ export function parsePreferencesMarkdown(content: string): GSDPreferences | null
   return null;
 }
 
+let _warnedFrontmatterParse = false;
 function parseFrontmatterBlock(frontmatter: string): GSDPreferences {
   try {
     const parsed = parseYaml(frontmatter);
@@ -243,7 +245,11 @@ function parseFrontmatterBlock(frontmatter: string): GSDPreferences {
     }
     return parsed as GSDPreferences;
   } catch (e) {
-    logWarning("guided", `YAML parse error in frontmatter block: ${(e as Error).message}`);
+    // Warn at most once per session to avoid flooding TUI (#3376)
+    if (!_warnedFrontmatterParse) {
+      _warnedFrontmatterParse = true;
+      logWarning("guided", `YAML parse error in preferences frontmatter (suppressing further): ${(e as Error).message}`);
+    }
     return {} as GSDPreferences;
   }
 }
@@ -559,5 +565,6 @@ export function resolveParallelConfig(prefs: GSDPreferences | undefined): import
     budget_ceiling: prefs?.parallel?.budget_ceiling,
     merge_strategy: prefs?.parallel?.merge_strategy ?? "per-milestone",
     auto_merge: prefs?.parallel?.auto_merge ?? "confirm",
+    worker_model: prefs?.parallel?.worker_model,
   };
 }