@opengsd/gsd-pi 1.4.0-dev.c18009cd → 1.5.0-dev.4fb2d460

package/dist/resources/extensions/gsd/md-importer.js

@@ -4,14 +4,14 @@
 //
 // Exports: parseDecisionsTable, parseRequirementsSections, migrateFromMarkdown
 import { readFileSync, readdirSync, existsSync, statSync } from 'node:fs';
-import { join, basename } from 'node:path';
+import { join, basename, dirname } from 'node:path';
 import { upsertDecision, upsertRequirement, insertArtifact, insertMilestone, insertSlice, insertTask, transaction, updateMilestoneStatus, updateSliceStatus, _getAdapter, } from './gsd-db.js';
 import { openWorkflowDatabasePath } from './db-workspace.js';
-import { resolveGsdRootFile, resolveMilestoneFile, resolveSliceFile, resolveTasksDir, legacyMilestonesDir, gsdRoot, resolveTaskFiles, resolveMilestonePath, } from './paths.js';
+import { resolveGsdRootFile, resolveMilestoneFile, resolveSliceFile, resolveSlicePath, resolveTasksDir, legacyMilestonesDir, gsdRoot, resolveTaskFiles, resolveMilestonePath, } from './paths.js';
 import { findMilestoneIds } from './guided-flow.js';
 import { milestoneIdToPhaseNum } from './layout-policy.js';
 import { parseRoadmap, parsePlan } from './parsers-legacy.js';
-import { parseContextDependsOn } from './files.js';
+import { parseContextDependsOn, parseSummary } from './files.js';
 import { logWarning } from './workflow-logger.js';
 // ─── DECISIONS.md Parser ───────────────────────────────────────────────────
 const VALID_MADE_BY = new Set(['human', 'agent', 'collaborative']);
@@ -662,21 +662,63 @@ export function migrateHierarchyToDb(basePath) {
             for (const taskEntry of plan.tasks) {
                 // Per K002: use 'complete' not 'done'
                 let taskStatus = taskEntry.done ? 'complete' : 'pending';
-                // Pre-migration consistency (legacy layout only): if a task is marked
-                // done but has no per-task SUMMARY.md, import it as pending so it gets
-                // re-executed rather than silently entering the DB as complete.
-                // Flat-phase has no per-task summary files by design — the checkbox
-                // state is the authoritative completion signal and is imported as-is.
-                if (taskStatus === 'complete') {
-                    const tDir = resolveTasksDir(basePath, milestoneId, sliceEntry.id);
-                    if (tDir) {
-                        const summaryFile = join(tDir, `${taskEntry.id}-SUMMARY.md`);
-                        if (!existsSync(summaryFile)) {
-                            taskStatus = 'pending';
-                            process.stderr.write(`gsd-migrate: ${milestoneId}/${sliceEntry.id}/${taskEntry.id} marked done but missing summary — importing as pending\n`);
-                        }
+                // Resolve the per-task SUMMARY.md. Legacy layout keeps summaries under
+                // a tasks/ subdir; flat-phase writes TID-SUMMARY.md directly in the
+                // phase dir (execute-task's gsd_task_complete writes it there). A tasks/
+                // subdir may still exist in flat-phase for auxiliary artifacts — its
+                // mere existence must NOT redirect summary resolution into tasks/ (#1208).
+                const slicePath = resolveSlicePath(basePath, milestoneId, sliceEntry.id);
+                let taskSummaryFile = null;
+                let isLegacySlice = false;
+                // Legacy layout keeps per-task summaries under a tasks/ subdir. Its
+                // presence — not merely "is this a legacy slice" — is what makes a
+                // missing summary a downgrade signal. resolveTasksDir returns null when
+                // no such dir exists, so a legacy slice whose checkbox is the only
+                // completion signal (no tasks/ dir at all) is left complete on import.
+                let legacyTasksDir = null;
+                if (slicePath) {
+                    isLegacySlice = basename(dirname(slicePath)) === 'slices';
+                    legacyTasksDir = isLegacySlice
+                        ? resolveTasksDir(basePath, milestoneId, sliceEntry.id)
+                        : null;
+                    const summaryDir = legacyTasksDir ?? slicePath;
+                    taskSummaryFile = join(summaryDir, `${taskEntry.id}-SUMMARY.md`);
+                }
+                const hasTaskSummary = taskSummaryFile !== null && existsSync(taskSummaryFile);
+                // Pre-migration consistency (legacy tasks/ layout only): if a task is
+                // marked done but its tasks/ dir has no per-task SUMMARY.md, import it
+                // as pending so it gets re-executed rather than silently entering the DB
+                // as complete. A legacy slice with no tasks/ dir (checkbox-only
+                // completion) and flat-phase layout are both left as-is here.
+                if (taskStatus === 'complete' && legacyTasksDir !== null && !hasTaskSummary) {
+                    taskStatus = 'pending';
+                    process.stderr.write(`gsd-migrate: ${milestoneId}/${sliceEntry.id}/${taskEntry.id} marked done but missing summary — importing as pending\n`);
+                }
+                // Lost-update guard (#1222): a per-task SUMMARY.md is the durable
+                // completion attestation written by gsd_task_complete. When the plan
+                // checkbox is stale-unchecked but the SUMMARY exists on disk, a
+                // re-import must NOT downgrade the completed task back to pending — that
+                // silent revert is the lost-update that hard-stopped auto-mode after the
+                // first execute-task. The surviving SUMMARY wins over a stale checkbox.
+                // reopen-task removes the SUMMARY, so this never re-completes an
+                // intentionally reopened task.
+                // Flat-phase summaries are phase-scoped (T01-SUMMARY.md); when a milestone
+                // has multiple slices, require the summary parent frontmatter to match so
+                // one slice's completion does not attest a sibling's same-named task.
+                let summaryAttestsCompletion = hasTaskSummary;
+                if (summaryAttestsCompletion && !isLegacySlice && roadmap.slices.length > 1 && taskSummaryFile) {
+                    try {
+                        const summaryContent = readFileSync(taskSummaryFile, 'utf-8');
+                        summaryAttestsCompletion = parseSummary(summaryContent).frontmatter.parent === sliceEntry.id;
+                    }
+                    catch {
+                        summaryAttestsCompletion = false;
                     }
                 }
+                if (taskStatus === 'pending' && summaryAttestsCompletion) {
+                    taskStatus = 'complete';
+                    process.stderr.write(`gsd-migrate: ${milestoneId}/${sliceEntry.id}/${taskEntry.id} unchecked in plan but SUMMARY.md present — importing as complete (#1222)\n`);
+                }
                 insertTask({
                     id: taskEntry.id,
                     sliceId: sliceEntry.id,
@@ -687,6 +729,12 @@ export function migrateHierarchyToDb(basePath) {
                         files: taskEntry.files ?? [],
                         verify: taskEntry.verify ?? '',
                     },
+                    // #1222 (metadata half): re-import derives status from the plan/summary
+                    // but has none of the execution prose gsd_task_complete wrote to the DB.
+                    // Preserve the existing row's execution columns and completed_at so a
+                    // re-import cannot blank a completed task's summary metadata or refresh
+                    // its completion timestamp — the DB row is strictly richer than the plan.
+                    preserveCompletionMetadata: true,
                 });
                 counts.tasks++;
             }
@@ -699,14 +747,32 @@ export function migrateHierarchyToDb(basePath) {
             if (!sliceEntry.done) {
                 const sliceSummaryPath = resolveSliceFile(basePath, milestoneId, sliceEntry.id, 'SUMMARY');
                 const hasSliceSummary = sliceSummaryPath !== null && existsSync(sliceSummaryPath);
+                const slicePathForTasks = resolveSlicePath(basePath, milestoneId, sliceEntry.id);
+                const isLegacySliceLayout = slicePathForTasks !== null
+                    && basename(dirname(slicePathForTasks)) === 'slices';
+                const taskSummaryDir = slicePathForTasks
+                    ? (isLegacySliceLayout
+                        ? (resolveTasksDir(basePath, milestoneId, sliceEntry.id) ?? slicePathForTasks)
+                        : slicePathForTasks)
+                    : null;
                 const allTasksDone = plan.tasks.length > 0 && plan.tasks.every(t => {
-                    if (!t.done)
-                        return false;
-                    const tDir = resolveTasksDir(basePath, milestoneId, sliceEntry.id);
-                    // Flat-phase has no per-task summary files — checkbox state is authoritative.
-                    if (!tDir)
-                        return true;
-                    return existsSync(join(tDir, `${t.id}-SUMMARY.md`));
+                    const taskSummaryFile = taskSummaryDir !== null
+                        ? join(taskSummaryDir, `${t.id}-SUMMARY.md`)
+                        : null;
+                    const hasTaskSummary = taskSummaryFile !== null && existsSync(taskSummaryFile);
+                    let summaryAttestsCompletion = hasTaskSummary;
+                    if (summaryAttestsCompletion && !isLegacySliceLayout && roadmap.slices.length > 1 && taskSummaryFile) {
+                        try {
+                            const summaryContent = readFileSync(taskSummaryFile, 'utf-8');
+                            summaryAttestsCompletion = parseSummary(summaryContent).frontmatter.parent === sliceEntry.id;
+                        }
+                        catch {
+                            summaryAttestsCompletion = false;
+                        }
+                    }
+                    // Match per-task import rules above: SUMMARY attestation wins over a stale
+                    // checkbox (#1222); flat-phase checkboxes are authoritative without summary.
+                    return summaryAttestsCompletion || (t.done && !isLegacySliceLayout);
                 });
                 if (allTasksDone && hasSliceSummary) {
                     if (_getAdapter()) {

package/dist/resources/extensions/gsd/migration-auto-check.js

@@ -56,14 +56,40 @@ function replaceSetPrefix(values, from, to) {
         values.add(`${to}${value.slice(from.length)}`);
     }
 }
+/**
+ * Rewrite one milestone identity across EVERY markdown identity set. The
+ * roadmapless subset is a view of `milestones`, so it must speak the same
+ * aligned vocabulary; otherwise the discussion-phase exclusion below keys off
+ * the stale bare id, fails its `dbScan.milestones.has(...)` membership check,
+ * and decrements the milestone count even though the aligned identity remains
+ * in the set, reporting false drift for a milestone that is actually in sync.
+ * Centralising the set list here keeps every alignment path from silently
+ * missing a set (the defect that regressed the suffixed roadmapless case).
+ */
+function realignMilestonePrefix(markdownScan, from, to) {
+    replaceSetPrefix(markdownScan.milestones, from, to);
+    replaceSetPrefix(markdownScan.slices, from, to);
+    replaceSetPrefix(markdownScan.tasks, from, to);
+    replaceSetPrefix(markdownScan.milestonesWithoutRoadmap, from, to);
+}
 function alignNumericMarkdownIdsWithDb(markdownScan, dbScan) {
     for (const dbId of dbScan.milestones) {
         const paddedId = paddedMilestoneId(dbId);
         if (!paddedId || dbScan.milestones.has(paddedId) || !markdownScan.milestones.has(paddedId))
             continue;
-        replaceSetPrefix(markdownScan.milestones, paddedId, dbId);
-        replaceSetPrefix(markdownScan.slices, paddedId, dbId);
-        replaceSetPrefix(markdownScan.tasks, paddedId, dbId);
+        realignMilestonePrefix(markdownScan, paddedId, dbId);
+    }
+}
+function bareMilestoneId(id) {
+    const match = id.match(/^(M\d{3})-[a-z0-9]{6}$/);
+    return match?.[1] ?? null;
+}
+function alignBareMarkdownIdsWithSuffixedDb(markdownScan, dbScan) {
+    for (const dbId of dbScan.milestones) {
+        const bareId = bareMilestoneId(dbId);
+        if (!bareId || dbScan.milestones.has(bareId) || !markdownScan.milestones.has(bareId))
+            continue;
+        realignMilestonePrefix(markdownScan, bareId, dbId);
     }
 }
 /**
@@ -148,6 +174,7 @@ export async function checkMarkdownHierarchyAgainstDb(basePath) {
     const dbScan = scanDbHierarchy();
     const beforeDb = dbScan.counts;
     alignNumericMarkdownIdsWithDb(markdownScan, dbScan);
+    alignBareMarkdownIdsWithSuffixedDb(markdownScan, dbScan);
     // Discussion-phase scratch: a milestone dir with no ROADMAP and no DB row is
     // a pre-registration discussion artifact (CONTEXT/CONTEXT-DRAFT only — the
     // queued DB row is inserted only at discussion handoff). Treating it as

package/dist/resources/extensions/gsd/milestone-merge-transaction.js

@@ -1,5 +1,6 @@
 // Project/App: gsd-pi
 // File Purpose: Process-level transaction wrapper for milestone merge closeout.
+import { mergeMilestoneToMain } from "./auto-worktree-merge.js";
 export function runMilestoneMergeTransaction(deps, input) {
     return deps.mergeMilestone(input.basePath, input.milestoneId, input.roadmapContent);
 }
@@ -8,3 +9,13 @@ export function createMilestoneMergeTransaction(mergeMilestone) {
         return runMilestoneMergeTransaction({ mergeMilestone }, { basePath, milestoneId, roadmapContent });
     };
 }
+/**
+ * Production merge transaction adapter.
+ *
+ * This is the only production construction point that knows the legacy
+ * `auto-worktree.ts` merge primitive. Lifecycle callers depend on the
+ * transaction runner interface, not the legacy implementation module.
+ */
+export function createDefaultMilestoneMergeTransaction(mergeMilestone = mergeMilestoneToMain) {
+    return createMilestoneMergeTransaction(mergeMilestone);
+}

package/dist/resources/extensions/gsd/milestone-settlement.js

@@ -1,6 +1,6 @@
 // Project/App: gsd-pi
 // File Purpose: Milestone closeout settlement state across DB proof, artifacts, merge, and cleanup.
-import { isInAutoWorktree } from "./auto-worktree.js";
+import { isInAutoWorktree } from "./auto-worktree-entry.js";
 import { formatCloseoutProofBlock, proveMilestoneCloseout, } from "./milestone-closeout-proof.js";
 import { resolveCloseoutArtifactProjection } from "./artifact-projection.js";
 function isActiveUnmergedWorktree(input) {

package/dist/resources/extensions/gsd/parallel-merge.js

@@ -8,7 +8,7 @@ import { existsSync, readdirSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { resolveGsdPathContract } from "./paths.js";
 import { worktreePathFor, worktreesDirs } from "./worktree-placement.js";
-import { getAutoWorktreePath } from "./auto-worktree.js";
+import { getAutoWorktreePath } from "./auto-worktree-path-resolution.js";
 import { buildWorktreeLifecycleDeps } from "./auto.js";
 import { mergeMilestoneStandalone, } from "./worktree-lifecycle.js";
 import { MergeConflictError } from "./git-service.js";

package/dist/resources/extensions/gsd/parallel-orchestrator.js

@@ -12,7 +12,9 @@ import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { gsdRoot } from "./paths.js";
 import { createWorktree, worktreePath } from "./worktree-manager.js";
-import { autoWorktreeBranch, fastForwardReusedMilestoneBranchIfSafe, runWorktreePostCreateHook, syncGsdStateToWorktreeByScope } from "./auto-worktree.js";
+import { autoWorktreeBranch, fastForwardReusedMilestoneBranchIfSafe } from "./auto-worktree-branch-lifecycle.js";
+import { syncGsdStateToWorktreeByScope } from "./auto-worktree-sync.js";
+import { runWorktreePostCreateHook } from "./worktree-post-create-hook.js";
 import { nativeBranchExists } from "./native-git-bridge.js";
 import { readIntegrationBranch } from "./git-service.js";
 import { createWorkspace, scopeMilestone } from "./workspace.js";

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

@@ -669,7 +669,10 @@ function pickPreferredPhaseDir(phasesDir, matches) {
     }
     return best;
 }
-function phaseDirMatchesMilestoneId(dirName, milestoneId, phaseNum) {
+function slugLooksLikeTeamSuffixProjection(slugPart) {
+    return /^[a-z0-9]{6}(-|$)/.test(slugPart);
+}
+function phaseDirMatchesMilestoneId(dirName, milestoneId, phaseNum, allowTeamSuffixSlugs = false) {
     const numMatch = dirName.match(/^(\d+)-(.*)$/);
     if (!numMatch || parseInt(numMatch[1], 10) !== phaseNum)
         return false;
@@ -678,8 +681,9 @@ function phaseDirMatchesMilestoneId(dirName, milestoneId, phaseNum) {
     if (suffix) {
         return slugPart === suffix || slugPart.startsWith(`${suffix}-`);
     }
-    // Plain sequential IDs must not resolve to unique-suffix phase dirs.
-    return !/^[a-z0-9]{6}(-|$)/.test(slugPart);
+    if (slugLooksLikeTeamSuffixProjection(slugPart) && !allowTeamSuffixSlugs)
+        return false;
+    return true;
 }
 function resolvePhaseDir(basePath, milestoneId) {
     // Try flat-phase layout first: phases/NN-slug/ (always scan phases/, even when
@@ -700,6 +704,16 @@ function resolvePhaseDir(basePath, milestoneId) {
                     matches.push(entry.name);
                 }
             }
+            // Bare milestone ids may only have a suffixed team-mode projection on disk.
+            if (matches.length === 0 && !milestoneIdUniqueSuffix(milestoneId)) {
+                for (const entry of readdirSync(phasesDir, { withFileTypes: true })) {
+                    if (!entry.isDirectory())
+                        continue;
+                    if (phaseDirMatchesMilestoneId(entry.name, milestoneId, phaseNum, true)) {
+                        matches.push(entry.name);
+                    }
+                }
+            }
         }
         catch {
             // unreadable — fall through

package/dist/resources/extensions/gsd/preferences-skills.js

@@ -4,35 +4,29 @@
  * Contains all logic for resolving skill references from preferences
  * to absolute filesystem paths, plus skill discovery and staleness config.
  */
-import { existsSync, readdirSync } from "node:fs";
+import { existsSync, readdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join } from "node:path";
+import { getSkillDirectories } from "@gsd/pi-coding-agent";
 import { gsdHome } from "./gsd-home.js";
-import { statSync } from "node:fs";
 import { validatePreferences } from "./preferences-validation.js";
 /**
  * Known skill directories for **preference reference resolution** (bare skill names).
  *
- * Search order (first match wins):
- * 1. ~/.gsd/agent/skills/ (GSD bundled)
- * 2. ~/.agents/skills/ (ecosystem global)
- * 3. .agents/skills/ (project ecosystem)
- * 4. ~/.claude/skills/ and .claude/skills/ (Claude Code compatibility)
+ * Sourced from the shared taxonomy (`@gsd/pi-coding-agent` `getSkillDirectories`)
+ * so preference resolution, mid-session discovery, and the PackageManager
+ * catalog all agree on which directories exist. The `method` is derived from
+ * each entry's scope.
  *
  * Note: the ResourceLoader catalog uses PackageManager precedence instead —
  * project `.gsd/skills` and `.agents/skills` can override bundled GSD skills
  * on name collision. See docs/dev/what-is-pi/09-the-customization-stack.md.
  */
 export function getSkillSearchDirs(cwd) {
-    const dirs = [
-        { dir: join(gsdHome(), "agent", "skills"), method: "user-skill" },
-        { dir: join(homedir(), ".agents", "skills"), method: "user-skill" },
-        { dir: join(cwd, ".agents", "skills"), method: "project-skill" },
-        // Claude Code official skill directories
-        { dir: join(homedir(), ".claude", "skills"), method: "user-skill" },
-        { dir: join(cwd, ".claude", "skills"), method: "project-skill" },
-    ];
-    return dirs;
+    return getSkillDirectories({ cwd, gsdHome: gsdHome() }).map((entry) => ({
+        dir: entry.path,
+        method: entry.scope === "project" ? "project-skill" : "user-skill",
+    }));
 }
 /**
  * Resolve a single skill reference to an absolute path.

package/dist/resources/extensions/gsd/preferences-types.js

@@ -86,6 +86,7 @@ export const KNOWN_PREFERENCE_KEYS = new Set([
     "min_request_interval_ms",
     "stale_commit_threshold_minutes",
     "context_management",
+    "tool_call_loop_guard",
     "experimental",
     "codebase",
     "slice_parallel",

package/dist/resources/extensions/gsd/preferences-validation.js

@@ -801,6 +801,88 @@ export function validatePreferences(preferences) {
             errors.push("context_management must be an object");
         }
     }
+    // ─── Tool-call loop guard (#1198) ────────────────────────────────────────
+    if (preferences.tool_call_loop_guard !== undefined) {
+        if (typeof preferences.tool_call_loop_guard === "object" && preferences.tool_call_loop_guard !== null) {
+            const g = preferences.tool_call_loop_guard;
+            const validGuard = {};
+            if (g.enabled !== undefined) {
+                if (typeof g.enabled === "boolean")
+                    validGuard.enabled = g.enabled;
+                else
+                    errors.push("tool_call_loop_guard.enabled must be a boolean");
+            }
+            if (g.identical_args !== undefined) {
+                if (typeof g.identical_args === "object" && g.identical_args !== null) {
+                    const ia = g.identical_args;
+                    const validIa = {};
+                    if (ia.enabled !== undefined) {
+                        if (typeof ia.enabled === "boolean")
+                            validIa.enabled = ia.enabled;
+                        else
+                            errors.push("tool_call_loop_guard.identical_args.enabled must be a boolean");
+                    }
+                    if (ia.max_consecutive_calls !== undefined) {
+                        const n = ia.max_consecutive_calls;
+                        if (typeof n === "number" && Number.isInteger(n) && n >= 1)
+                            validIa.max_consecutive_calls = n;
+                        else
+                            errors.push("tool_call_loop_guard.identical_args.max_consecutive_calls must be an integer >= 1");
+                    }
+                    if (Object.keys(validIa).length > 0)
+                        validGuard.identical_args = validIa;
+                }
+                else {
+                    errors.push("tool_call_loop_guard.identical_args must be an object");
+                }
+            }
+            if (g.repeated_tool !== undefined) {
+                if (typeof g.repeated_tool === "object" && g.repeated_tool !== null) {
+                    const rt = g.repeated_tool;
+                    const validRt = {};
+                    if (rt.enabled !== undefined) {
+                        if (typeof rt.enabled === "boolean")
+                            validRt.enabled = rt.enabled;
+                        else
+                            errors.push("tool_call_loop_guard.repeated_tool.enabled must be a boolean");
+                    }
+                    if (rt.default_cap !== undefined) {
+                        const n = rt.default_cap;
+                        if (typeof n === "number" && Number.isInteger(n) && n >= 1)
+                            validRt.default_cap = n;
+                        else
+                            errors.push("tool_call_loop_guard.repeated_tool.default_cap must be an integer >= 1");
+                    }
+                    if (rt.repeatable_cap !== undefined) {
+                        const n = rt.repeatable_cap;
+                        if (typeof n === "number" && Number.isInteger(n) && n >= 1)
+                            validRt.repeatable_cap = n;
+                        else
+                            errors.push("tool_call_loop_guard.repeated_tool.repeatable_cap must be an integer >= 1");
+                    }
+                    if (rt.exempt_tools !== undefined) {
+                        if (Array.isArray(rt.exempt_tools) && rt.exempt_tools.every((t) => typeof t === "string")) {
+                            validRt.exempt_tools = rt.exempt_tools;
+                        }
+                        else {
+                            errors.push("tool_call_loop_guard.repeated_tool.exempt_tools must be an array of strings");
+                        }
+                    }
+                    if (Object.keys(validRt).length > 0)
+                        validGuard.repeated_tool = validRt;
+                }
+                else {
+                    errors.push("tool_call_loop_guard.repeated_tool must be an object");
+                }
+            }
+            if (Object.keys(validGuard).length > 0) {
+                validated.tool_call_loop_guard = validGuard;
+            }
+        }
+        else {
+            errors.push("tool_call_loop_guard must be an object");
+        }
+    }
     // ─── Context Mode (gsd_exec sandbox) ────────────────────────────────────
     if (preferences.context_mode !== undefined) {
         if (typeof preferences.context_mode === "object" && preferences.context_mode !== null) {

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

@@ -822,6 +822,26 @@ export function renderPreferencesForSystemPrompt(preferences, resolutions, optio
     }
     return lines.join("\n");
 }
+/**
+ * Render a compact response-language directive for injection into dispatched
+ * prompt *content* (discuss/QA and auto-execution unit prompts).
+ *
+ * The main session's system prompt already carries the full GSD Skill
+ * Preferences block (including language) via `before_agent_start`, but
+ * discuss/QA turns and auto-execution units are dispatched as separate
+ * turns/sessions whose prompts are assembled here — without that block — so the
+ * configured language never reaches them (#1210). Injecting this directive into
+ * the dispatched prompt content makes the `language` preference effective across
+ * both guided and auto workflows.
+ *
+ * Returns "" when no language is configured.
+ */
+export function renderLanguageDirectiveForPrompt(preferences) {
+    if (!preferences?.language)
+        return "";
+    const safeLang = preferences.language.replace(/[\r\n]/g, " ").slice(0, 50);
+    return `## Response Language\n\nAlways respond in ${safeLang} — questions, explanations, and summaries.`;
+}
 // ─── Hook Resolution ──────────────────────────────────────────────────────────
 /**
  * Resolve enabled post-unit hooks from effective preferences.

package/dist/resources/extensions/gsd/prompts/system.md

@@ -38,7 +38,7 @@ If a `GSD Skill Preferences` block appears below, treat it as durable guidance f
 
 ### Naming Convention
 
-Directories use bare IDs. Files use ID-SUFFIX format. Milestones: `M001/` or `M{seq}-{rand6}/` when `unique_milestone_ids: true`; files like `M001-CONTEXT.md`, `M001-ROADMAP.md`, `M001-RESEARCH.md`. Slices: `S01/` with `S01-PLAN.md`, `S01-RESEARCH.md`, `S01-SUMMARY.md`, `S01-UAT.md`. Tasks: `T01-PLAN.md`, `T01-SUMMARY.md`. Titles live inside content, not names.
+GSD projects use a flat-phase layout. Phase directories are `{MM}-{slug}` where `{MM}` is the zero-padded phase number and `{slug}` is derived from the phase title (e.g. `47-real-time-runtime-hardening`). Phase-level files are `{MM}-SUFFIX.md` (e.g. `47-CONTEXT.md`, `47-RESEARCH.md`, `47-ROADMAP.md`, `47-VALIDATION.md`, `47-SUMMARY.md`). Slice/plan files live directly in the phase directory as `{MM}-{SS}-SUFFIX.md` (e.g. `47-01-PLAN.md`, `47-01-SUMMARY.md`, `47-01-UAT.md`). Task plan content lives inside the slice plan file (`{MM}-{SS}-PLAN.md`) as checkboxes; there is no `tasks/` subdirectory and no `tasks/T##-PLAN.md`. Titles live inside content, not names. Prefer GSD-provided layout-aware paths/resolvers over hardcoding artifact paths, since phase slugs are title-derived.
 
 ### Directory Structure
 
@@ -46,13 +46,13 @@ Directories use bare IDs. Files use ID-SUFFIX format. Milestones: `M001/` or `M{
 .gsd/
   PROJECT.md, REQUIREMENTS.md, DECISIONS.md, KNOWLEDGE.md, CODEBASE.md, OVERRIDES.md, QUEUE.md, STATE.md
   runtime/, activity/, worktrees/
-  milestones/M001/
-    M001-CONTEXT.md, M001-RESEARCH.md, M001-ROADMAP.md, M001-SUMMARY.md
-    slices/S01/
-      S01-CONTEXT.md, S01-RESEARCH.md, S01-PLAN.md, S01-SUMMARY.md, S01-UAT.md
-      tasks/T01-PLAN.md, tasks/T01-SUMMARY.md
+  phases/{MM}-{slug}/
+    {MM}-CONTEXT.md, {MM}-RESEARCH.md, {MM}-ROADMAP.md, {MM}-VALIDATION.md, {MM}-SUMMARY.md
+    {MM}-{SS}-PLAN.md, {MM}-{SS}-SUMMARY.md, {MM}-{SS}-UAT.md
 ```
 
+Task plan content is embedded in `{MM}-{SS}-PLAN.md`; do not expect `tasks/T##-PLAN.md`.
+
 `runtime/`, `activity/`, `worktrees/`, and `STATE.md` are system-managed. `PROJECT.md` is current state; `REQUIREMENTS.md` is the active capability contract; `DECISIONS.md` and `KNOWLEDGE.md` are append-only; `CODEBASE.md` is an auto-refreshed codebase map.
 
 ### Isolation Model

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

@@ -13,7 +13,7 @@ import { isAbsolute, join, relative, resolve } from "node:path";
 import { QUICK_BRANCH_RE } from "./branch-patterns.js";
 import { loadPrompt } from "./prompt-loader.js";
 import { gsdRoot } from "./paths.js";
-import { GitServiceImpl, runGit } from "./git-service.js";
+import { GitServiceImpl, runGit, taskBranchArgs } from "./git-service.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { nativeBranchExists, nativeDetectMainBranch, nativeDiffNumstat } from "./native-git-bridge.js";
 import { nativeHasStagedChanges } from "./native-git-bridge.js";
@@ -317,6 +317,7 @@ export async function handleQuick(args, ctx, pi) {
     const git = new GitServiceImpl(basePath, gitPrefs);
     const branchName = `gsd/quick/${taskNum}-${slug}`;
     let originalBranch = git.getCurrentBranch();
+    let returnBranch = originalBranch;
     const { getIsolationMode } = await import("./preferences.js");
     const usesBranch = getIsolationMode() !== "none" && isGitOpsEnabled();
     let branchCreated = false;
@@ -331,7 +332,15 @@ export async function handleQuick(args, ctx, pi) {
                     }
                 }
                 catch { /* nothing to commit — fine */ }
-                runGit(basePath, ["checkout", "-b", branchName]);
+                const branchArgs = taskBranchArgs(basePath, branchName, current, git.getMainBranch());
+                const startPoint = branchArgs[3];
+                // When the quick branch is redirected off a stale task branch, the
+                // squash-merge on closeout must return to the same base — merging a
+                // base-branch-rooted quick branch back into the stale task branch
+                // would drag the base's newer history into it.
+                if (startPoint)
+                    returnBranch = startPoint;
+                runGit(basePath, branchArgs);
                 branchCreated = true;
             }
         }
@@ -345,7 +354,7 @@ export async function handleQuick(args, ctx, pi) {
     if (actualBranch === branchName && originalBranch !== branchName) {
         persistPendingReturn({
             basePath,
-            originalBranch,
+            originalBranch: returnBranch,
             quickBranch: branchName,
             taskNum,
             slug,