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

package/dist/resources/extensions/gsd/commands/handlers/core.js

@@ -1,6 +1,8 @@
 import { createRequire } from "node:module";
 import { computeProgressScore, formatProgressLine } from "../../progress-score.js";
-import { getGlobalGSDPreferencesPath, getProjectGSDPreferencesPath, modelIdsForProfileResolution, resolveProfileAnchorProvider, resolveDisabledModelProvidersFromPreferences } from "../../preferences.js";
+import { isRepositoryDirty } from "../../git-service.js";
+import { loadEffectiveGSDPreferences, getGlobalGSDPreferencesPath, getProjectGSDPreferencesPath, modelIdsForProfileResolution, resolveProfileAnchorProvider, resolveDisabledModelProvidersFromPreferences } from "../../preferences.js";
+import { createRepositoryRegistryFromPreferences } from "../../repository-registry.js";
 import { ensurePreferencesFile, handlePrefs, handlePrefsMode, handlePrefsWizard, handleLanguage } from "../../commands-prefs-wizard.js";
 import { runEnvironmentChecks } from "../../doctor-environment.js";
 import { deriveState } from "../../state.js";
@@ -206,7 +208,7 @@ export async function handleStatus(ctx) {
         },
     });
     if (result === undefined) {
-        ctx.ui.notify(formatTextStatus(state), "info");
+        ctx.ui.notify(formatTextStatus(state, basePath), "info");
     }
 }
 export async function fireStatusViaCommand(ctx) {
@@ -539,7 +541,8 @@ export async function handleCoreCommand(trimmed, ctx, pi) {
     }
     return false;
 }
-export function formatTextStatus(state) {
+export function formatTextStatus(state, basePath) {
+    const root = basePath ?? projectRoot();
     const lines = ["GSD Status\n"];
     lines.push(formatProgressLine(computeProgressScore()));
     lines.push("");
@@ -582,7 +585,7 @@ export function formatTextStatus(state) {
             lines.push(`  ${icon} ${milestone.id}: ${milestone.title} (${milestone.status})`);
         }
     }
-    const envResults = runEnvironmentChecks(projectRoot());
+    const envResults = runEnvironmentChecks(root);
     const envIssues = envResults.filter((result) => result.status !== "ok");
     if (envIssues.length > 0) {
         lines.push("");
@@ -591,5 +594,38 @@ export function formatTextStatus(state) {
             lines.push(`  ${issue.status === "error" ? "✗" : "⚠"} ${issue.message}`);
         }
     }
+    // Parent-workspace per-repository git health (#818). No-op for single-repo
+    // projects; surfaces which declared child repos have uncommitted changes.
+    const repoBlock = buildWorkspaceRepoStatusBlock(root);
+    if (repoBlock) {
+        lines.push("");
+        lines.push("Repositories:");
+        lines.push(repoBlock);
+    }
     return lines.join("\n");
 }
+/**
+ * Build a per-repository dirty/clean summary for parent-workspace status.
+ * Returns "" for single-repo (project-mode) projects so the status output is
+ * unchanged; otherwise one line per declared child repository.
+ */
+function buildWorkspaceRepoStatusBlock(basePath) {
+    let registry;
+    try {
+        registry = createRepositoryRegistryFromPreferences(basePath, loadEffectiveGSDPreferences(basePath)?.preferences);
+    }
+    catch {
+        return "";
+    }
+    if (registry.mode !== "parent")
+        return "";
+    const childRepos = registry.repositories.filter((repo) => repo.id !== "project");
+    if (childRepos.length === 0)
+        return "";
+    return childRepos
+        .map((repo) => {
+        const dirty = isRepositoryDirty(repo.root);
+        return `  ${dirty ? "✗" : "✓"} ${repo.id}${repo.role ? ` — ${repo.role}` : ""}${dirty ? " (uncommitted changes)" : " (clean)"}`;
+    })
+        .join("\n");
+}

package/dist/resources/extensions/gsd/commands-handlers.js

@@ -16,7 +16,7 @@ import { appendCapture, hasPendingCaptures, loadPendingCaptures } from "./captur
 import { appendOverride, appendKnowledge } from "./files.js";
 import { formatDoctorIssuesForPrompt, formatDoctorReport, formatDoctorReportJson, runGSDDoctor, selectDoctorScope, filterDoctorIssues, } from "./doctor.js";
 import { isAutoActive, checkRemoteAutoSession } from "./auto.js";
-import { getAutoWorktreePath } from "./auto-worktree.js";
+import { getAutoWorktreePath } from "./auto-worktree-path-resolution.js";
 import { currentDirectoryRoot, projectRoot } from "./commands/context.js";
 import { loadPrompt } from "./prompt-loader.js";
 import { buildClaudeRuntimeFloorAdvisory } from "../../shared/claude-runtime-floor.js";

package/dist/resources/extensions/gsd/commands-prefs-wizard.js

@@ -533,6 +533,19 @@ export function buildCategorySummaries(prefs) {
         if (parts.length > 0)
             integrationsSummary = parts.join(", ");
     }
+    // Workspace (parent-workspace multi-repo)
+    const workspace = prefs.workspace;
+    const workspaceRepos = workspace?.repositories;
+    let workspaceSummary = "(single-repo)";
+    {
+        const parts = [];
+        if (workspace?.mode)
+            parts.push(`mode: ${workspace.mode}`);
+        if (workspaceRepos && Object.keys(workspaceRepos).length > 0)
+            parts.push(`${Object.keys(workspaceRepos).length} repo(s)`);
+        if (parts.length > 0)
+            workspaceSummary = parts.join(", ");
+    }
     return {
         mode: modeSummary,
         models: modelsSummary,
@@ -550,6 +563,7 @@ export function buildCategorySummaries(prefs) {
         hooks: hooksSummary,
         uok: uokSummary,
         integrations: integrationsSummary,
+        workspace: workspaceSummary,
     };
 }
 // ─── Category configuration functions ────────────────────────────────────────
@@ -716,7 +730,10 @@ async function configureDynamicRouting(ctx, prefs) {
     const hooks = await promptBoolean(ctx, "Route hook sessions dynamically", dr.hooks, true);
     if (hooks !== undefined)
         dr.hooks = hooks;
-    const flatRate = await promptBoolean(ctx, "Allow dynamic routing for flat-rate providers", dr.allow_flat_rate_providers, false);
+    // Opt-out flag (#1115): routing is allowed for flat-rate providers by
+    // default; only an explicit `false` suppresses it. The default hint reflects
+    // that allow-by-default behavior.
+    const flatRate = await promptBoolean(ctx, "Allow dynamic routing for flat-rate providers", dr.allow_flat_rate_providers, true);
     if (flatRate !== undefined)
         dr.allow_flat_rate_providers = flatRate;
     // tier_models.light / standard / heavy — optional model IDs
@@ -892,6 +909,135 @@ async function configureSkills(ctx, prefs) {
     const staleness = await promptInteger(ctx, "Skill staleness days (0 to disable)", prefs.skill_staleness_days, "60");
     applyNumber(prefs, "skill_staleness_days", staleness);
 }
+async function configureWorkspace(ctx, prefs) {
+    let workspace = (prefs.workspace ?? {});
+    // Mode
+    const mode = await promptEnum(ctx, "Workspace mode", workspace.mode, ["project", "parent"]);
+    if (mode !== undefined)
+        workspace = { ...workspace, mode: mode };
+    if (workspace.mode !== "parent") {
+        // Single-repo mode: drop any declared repositories and persist.
+        if (workspace.repositories && Object.keys(workspace.repositories).length > 0) {
+            const clear = await promptBoolean(ctx, "Clear declared repositories (switch to single-repo)?", false, false);
+            if (clear)
+                workspace = { mode: workspace.mode };
+        }
+        persistWorkspace(prefs, workspace);
+        return;
+    }
+    // Parent mode — edit child repositories via a sub-menu.
+    let repositories = { ...(workspace.repositories ?? {}) };
+    while (true) {
+        const ids = Object.keys(repositories).sort();
+        const summary = ids.length === 0 ? "(no repositories — parent mode requires at least one)" : `${ids.length} repo(s)`;
+        const listLabels = ids.map((id) => {
+            const r = repositories[id];
+            const roleStr = r.role ? ` — ${r.role}` : "";
+            const policyStr = r.commit_policy === "skip" ? " [skip]" : "";
+            return `${id} (${r.path})${roleStr}${policyStr}`;
+        });
+        const choice = await ctx.ui.select(`Declared repositories — ${summary}`, [...listLabels, "Add repository", "Done"]);
+        const pick = typeof choice === "string" ? choice : "";
+        if (!pick || pick === "Done")
+            break;
+        if (pick === "Add repository") {
+            const idInput = await ctx.ui.input("Repository id (letters, digits, . _ -; 'project' is reserved):", "");
+            const id = typeof idInput === "string" ? idInput.trim() : "";
+            if (!id || !/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(id)) {
+                ctx.ui.notify("Invalid repository id — must match ^[A-Za-z0-9][A-Za-z0-9._-]*$ and cannot be 'project'.", "warning");
+                continue;
+            }
+            if (id === "project" || repositories[id]) {
+                ctx.ui.notify(`Repository id "${id}" is reserved or already declared.`, "warning");
+                continue;
+            }
+            const pathInput = await ctx.ui.input("Repository path (relative to project root, e.g. frontend):", "");
+            const path = typeof pathInput === "string" ? pathInput.trim() : "";
+            if (!path) {
+                ctx.ui.notify("Repository path is required.", "warning");
+                continue;
+            }
+            const repo = { path };
+            const roleInput = await ctx.ui.input("Role/label (optional):", "");
+            if (typeof roleInput === "string" && roleInput.trim())
+                repo.role = roleInput.trim();
+            const verifyInput = await ctx.ui.input("Verification commands (comma- or newline-separated, optional):", "");
+            if (typeof verifyInput === "string" && verifyInput.trim()) {
+                const cmds = parseStringList(verifyInput);
+                if (cmds.length > 0)
+                    repo.verification = cmds;
+            }
+            const policy = await promptEnum(ctx, "Commit policy", undefined, ["auto", "skip"]);
+            if (policy === "skip")
+                repo.commit_policy = "skip";
+            repositories[id] = repo;
+        }
+        else {
+            // Edit/delete an existing repo (the first token is the id).
+            const id = pick.split(" ")[0];
+            if (!repositories[id])
+                continue;
+            const editChoice = await ctx.ui.select(`Repository ${id}`, ["Edit path", "Edit role", "Edit verification", "Edit commit policy", "Delete repository", "Cancel"]);
+            const ec = typeof editChoice === "string" ? editChoice : "";
+            if (!ec || ec === "Cancel")
+                continue;
+            if (ec === "Delete repository") {
+                delete repositories[id];
+            }
+            else if (ec === "Edit path") {
+                const v = await ctx.ui.input("Repository path:", repositories[id].path);
+                if (typeof v === "string" && v.trim())
+                    repositories[id] = { ...repositories[id], path: v.trim() };
+            }
+            else if (ec === "Edit role") {
+                const v = await ctx.ui.input("Role/label (blank to clear):", repositories[id].role ?? "");
+                if (typeof v === "string" && v.trim())
+                    repositories[id] = { ...repositories[id], role: v.trim() };
+                else if (typeof v === "string") {
+                    const { role, ...rest } = repositories[id];
+                    void role;
+                    repositories[id] = rest;
+                }
+            }
+            else if (ec === "Edit verification") {
+                const v = await ctx.ui.input("Verification commands (blank to clear):", (repositories[id].verification ?? []).join(", "));
+                if (typeof v === "string" && v.trim()) {
+                    const cmds = parseStringList(v);
+                    if (cmds.length > 0)
+                        repositories[id] = { ...repositories[id], verification: cmds };
+                }
+                else if (typeof v === "string") {
+                    const { verification, ...rest } = repositories[id];
+                    void verification;
+                    repositories[id] = rest;
+                }
+            }
+            else if (ec === "Edit commit policy") {
+                const policy = await promptEnum(ctx, "Commit policy", repositories[id].commit_policy, ["auto", "skip"]);
+                if (policy === "skip")
+                    repositories[id] = { ...repositories[id], commit_policy: "skip" };
+                else {
+                    const { commit_policy, ...rest } = repositories[id];
+                    void commit_policy;
+                    repositories[id] = rest;
+                }
+            }
+        }
+    }
+    if (Object.keys(repositories).length === 0) {
+        ctx.ui.notify("Parent mode requires at least one repository — mode not saved.", "warning");
+        return;
+    }
+    persistWorkspace(prefs, { mode: "parent", repositories });
+}
+/** Persist the workspace config onto prefs, dropping it entirely when empty. */
+function persistWorkspace(prefs, workspace) {
+    if (!workspace.mode && (!workspace.repositories || Object.keys(workspace.repositories).length === 0)) {
+        delete prefs.workspace;
+        return;
+    }
+    prefs.workspace = workspace;
+}
 async function configureSkillRules(ctx, prefs) {
     let rules = Array.isArray(prefs.skill_rules) ? [...prefs.skill_rules] : [];
     while (true) {
@@ -1100,6 +1246,8 @@ async function configureVerification(ctx, prefs) {
         prefs.verification_auto_fix = autoFix;
     const maxRetries = await promptInteger(ctx, "Verification max retries", prefs.verification_max_retries, "2");
     applyNumber(prefs, "verification_max_retries", maxRetries);
+    const perUnitCap = await promptNumber(ctx, "Per-unit cost cap (USD; retry cost ceiling, blank = clear to default)", prefs.per_unit_cost_cap_usd, "5.0");
+    applyNumber(prefs, "per_unit_cost_cap_usd", perUnitCap);
     const ev = await promptBoolean(ctx, "Enhanced verification (master toggle)", prefs.enhanced_verification, true);
     if (ev !== undefined)
         prefs.enhanced_verification = ev;
@@ -1564,6 +1712,7 @@ export async function handlePrefsWizard(ctx, scope, prefill, opts) {
             `Hooks           ${summaries.hooks}`,
             `UoK             ${summaries.uok}`,
             `Integrations    ${summaries.integrations}`,
+            `Workspace       ${summaries.workspace}`,
             `Advanced        ${summaries.advanced}`,
             `── Save & Exit ──`,
         ];
@@ -1601,6 +1750,8 @@ export async function handlePrefsWizard(ctx, scope, prefill, opts) {
             await configureUoK(ctx, prefs);
         else if (choice.startsWith("Integrations"))
             await configureIntegrations(ctx, prefs);
+        else if (choice.startsWith("Workspace"))
+            await configureWorkspace(ctx, prefs);
         else if (choice.startsWith("Advanced"))
             await configureAdvanced(ctx, prefs);
     }
@@ -1727,6 +1878,7 @@ export function serializePreferencesToFrontmatter(prefs) {
         "reactive_execution", "gate_evaluation",
         "auto_visualize", "auto_report",
         "verification_commands", "verification_auto_fix", "verification_max_retries",
+        "per_unit_cost_cap_usd",
         "enhanced_verification", "enhanced_verification_pre",
         "enhanced_verification_post", "enhanced_verification_strict",
         "safety_harness",

package/dist/resources/extensions/gsd/commands-workflow-templates.js

@@ -5,7 +5,7 @@ import { join } from "node:path";
 import { resolveByName, autoDetect, listTemplates, getTemplateInfo, loadWorkflowTemplate, loadRegistry, isLegacyWorkflowMode, } from "./workflow-templates.js";
 import { loadPrompt } from "./prompt-loader.js";
 import { gsdRoot } from "./paths.js";
-import { createGitService, runGit } from "./git-service.js";
+import { createGitService, runGit, taskBranchArgs } from "./git-service.js";
 import { isAutoActive, isAutoPaused } from "./auto.js";
 import { getErrorMessage } from "./error-utils.js";
 import { resolvePlugin } from "./workflow-plugins.js";
@@ -349,7 +349,7 @@ export async function handleStart(args, ctx, pi) {
                     git.autoCommit("workflow-template", templateId, []);
                 }
                 catch { /* nothing to commit */ }
-                runGit(basePath, ["checkout", "-b", branchName]);
+                runGit(basePath, taskBranchArgs(basePath, branchName, current, git.getMainBranch()));
                 branchCreated = true;
             }
         }
@@ -481,7 +481,7 @@ export function dispatchMarkdownPhasePlugin(plugin, description, ctx, pi) {
                     git.autoCommit("workflow-template", templateId, []);
                 }
                 catch { /* nothing to commit */ }
-                runGit(basePath, ["checkout", "-b", branchName]);
+                runGit(basePath, taskBranchArgs(basePath, branchName, current, git.getMainBranch()));
                 branchCreated = true;
             }
         }

package/dist/resources/extensions/gsd/commands-worktree.js

@@ -251,8 +251,17 @@ async function handleRemove(args, ctx) {
         return;
     }
     try {
-        removeWorktree(basePath, name, { deleteBranch: true });
-        ctx.ui.notify(`Removed worktree ${name}.`, "info");
+        const removed = removeWorktree(basePath, name, { deleteBranch: true });
+        if (removed) {
+            ctx.ui.notify(`Removed worktree ${name}.`, "info");
+        }
+        else {
+            ctx.ui.notify([
+                `Worktree removal aborted for "${name}" to preserve uncommitted changes.`,
+                "",
+                "Manual quarantine recovery may be needed before retrying removal.",
+            ].join("\n"), "warning");
+        }
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);

package/dist/resources/extensions/gsd/db/queries.js

@@ -218,7 +218,7 @@ export function getMilestone(id) {
 export function getActiveMilestoneFromDb() {
     if (!getDbOrNull())
         return null;
-    const row = getDbOrNull().prepare("SELECT * FROM milestones WHERE status NOT IN ('complete', 'done', 'skipped', 'closed', 'parked') ORDER BY id LIMIT 1").get();
+    const row = getDbOrNull().prepare(`SELECT * FROM milestones WHERE status NOT IN (${TERMINAL_STATUS_SQL}, 'parked') ORDER BY id LIMIT 1`).get();
     if (!row)
         return null;
     return rowToMilestone(row);
@@ -230,11 +230,11 @@ export function getActiveSliceFromDb(milestoneId) {
     // Uses json_each() to expand the JSON depends array and checks each dep is complete.
     const row = getDbOrNull().prepare(`SELECT s.* FROM slices s
      WHERE s.milestone_id = :mid
-       AND s.status NOT IN ('complete', 'done', 'skipped')
+       AND s.status NOT IN (${TERMINAL_STATUS_SQL})
        AND NOT EXISTS (
          SELECT 1 FROM json_each(s.depends) AS dep
          WHERE dep.value NOT IN (
-           SELECT id FROM slices WHERE milestone_id = :mid AND status IN ('complete', 'done', 'skipped')
+           SELECT id FROM slices WHERE milestone_id = :mid AND status IN (${TERMINAL_STATUS_SQL})
          )
        )
      ORDER BY s.sequence, s.id
@@ -246,7 +246,7 @@ export function getActiveSliceFromDb(milestoneId) {
 export function getActiveTaskFromDb(milestoneId, sliceId) {
     if (!getDbOrNull())
         return null;
-    const row = getDbOrNull().prepare("SELECT * FROM tasks WHERE milestone_id = :mid AND slice_id = :sid AND status NOT IN ('complete', 'done') ORDER BY sequence, id LIMIT 1").get({ ":mid": milestoneId, ":sid": sliceId });
+    const row = getDbOrNull().prepare(`SELECT * FROM tasks WHERE milestone_id = :mid AND slice_id = :sid AND status NOT IN (${TERMINAL_STATUS_SQL}) ORDER BY sequence, id LIMIT 1`).get({ ":mid": milestoneId, ":sid": sliceId });
     if (!row)
         return null;
     return rowToTask(row);
@@ -265,7 +265,7 @@ export function getParallelMonitorSliceProgress(milestoneId) {
        s.id AS id,
        s.status AS status,
        COUNT(t.id) AS total,
-       COALESCE(SUM(CASE WHEN t.status='complete' THEN 1 ELSE 0 END), 0) AS done
+       COALESCE(SUM(CASE WHEN t.status IN (${TERMINAL_STATUS_SQL}) THEN 1 ELSE 0 END), 0) AS done
      FROM slices s
      LEFT JOIN tasks t ON s.milestone_id=t.milestone_id AND s.id=t.slice_id
      WHERE s.milestone_id=:mid
@@ -327,6 +327,45 @@ export function getSlicesByMilestoneIds(milestoneIds) {
     }
     return byMilestone;
 }
+/**
+ * Load tasks for many (milestone, slice) pairs in batched queries. Returns a Map
+ * keyed by `${milestone_id}\0${slice_id}`, preserving `ORDER BY sequence, id`
+ * within each bucket. Mirrors getSlicesByMilestoneIds to avoid an N+1 over tasks
+ * during full projection rebuilds.
+ */
+export function getTasksBySliceIds(slices) {
+    const bySlice = new Map();
+    const db = getDbOrNull();
+    if (!db || slices.length === 0)
+        return bySlice;
+    // SQLite caps bound params (~999); 2 per pair, so chunk well under the limit.
+    const CHUNK = 400;
+    for (let start = 0; start < slices.length; start += CHUNK) {
+        const chunk = slices.slice(start, start + CHUNK);
+        const clauses = [];
+        const params = {};
+        chunk.forEach((s, i) => {
+            clauses.push(`(milestone_id = :m${i} AND slice_id = :s${i})`);
+            params[`:m${i}`] = s.milestoneId;
+            params[`:s${i}`] = s.sliceId;
+        });
+        const rows = db
+            .prepare(`SELECT * FROM tasks WHERE ${clauses.join(" OR ")} ORDER BY milestone_id, slice_id, sequence, id`)
+            .all(params);
+        for (const row of rows) {
+            const task = rowToTask(row);
+            const key = `${task.milestone_id}\0${task.slice_id}`;
+            const bucket = bySlice.get(key);
+            if (bucket) {
+                bucket.push(task);
+            }
+            else {
+                bySlice.set(key, [task]);
+            }
+        }
+    }
+    return bySlice;
+}
 /**
  * Consolidated DB read for dispatch/gate/completion decisions (ADR-017).
  * `done` uses the canonical closed-status predicate (`isClosedStatus`) — the
@@ -378,7 +417,7 @@ export function getSliceScopedArtifacts(milestoneId, sliceId) {
 export function getActiveMilestoneIdFromDb() {
     if (!getDbOrNull())
         return null;
-    const row = getDbOrNull().prepare("SELECT id, status FROM milestones WHERE status NOT IN ('complete', 'done', 'skipped', 'closed', 'parked') ORDER BY id LIMIT 1").get();
+    const row = getDbOrNull().prepare(`SELECT id, status FROM milestones WHERE status NOT IN (${TERMINAL_STATUS_SQL}, 'parked') ORDER BY id LIMIT 1`).get();
     if (!row)
         return null;
     return rowToIdStatusSummary(row);
@@ -393,7 +432,7 @@ export function getSliceStatusSummary(milestoneId) {
 export function getActiveTaskIdFromDb(milestoneId, sliceId) {
     if (!getDbOrNull())
         return null;
-    const row = getDbOrNull().prepare("SELECT id, status, title FROM tasks WHERE milestone_id = :mid AND slice_id = :sid AND status NOT IN ('complete', 'done') ORDER BY sequence, id LIMIT 1").get({ ":mid": milestoneId, ":sid": sliceId });
+    const row = getDbOrNull().prepare(`SELECT id, status, title FROM tasks WHERE milestone_id = :mid AND slice_id = :sid AND status NOT IN (${TERMINAL_STATUS_SQL}) ORDER BY sequence, id LIMIT 1`).get({ ":mid": milestoneId, ":sid": sliceId });
     if (!row)
         return null;
     return rowToActiveTaskSummary(row);
@@ -404,8 +443,8 @@ export function getSliceTaskCounts(milestoneId, sliceId) {
         return emptyTaskStatusCounts();
     const row = getDbOrNull().prepare(`SELECT
        COUNT(*) as total,
-       SUM(CASE WHEN status IN ('complete', 'done') THEN 1 ELSE 0 END) as done,
-       SUM(CASE WHEN status NOT IN ('complete', 'done') THEN 1 ELSE 0 END) as pending
+       SUM(CASE WHEN status IN (${TERMINAL_STATUS_SQL}) THEN 1 ELSE 0 END) as done,
+       SUM(CASE WHEN status NOT IN (${TERMINAL_STATUS_SQL}) THEN 1 ELSE 0 END) as pending
      FROM tasks WHERE milestone_id = :mid AND slice_id = :sid`).get({ ":mid": milestoneId, ":sid": sliceId });
     return rowToTaskStatusCounts(row);
 }

package/dist/resources/extensions/gsd/db/writers/cascades.js

@@ -24,6 +24,17 @@ function requireDb() {
  * completion timestamps cleared, in one commit. Folds the hand-rolled
  * transaction-plus-cascade previously in tools/reopen-slice.ts. Guards run
  * inside the transaction (TOCTOU-safe).
+ *
+ * A closed slice is always reopenable. An open slice is only reopenable when it
+ * carries a completed-task state desync (#1205): a UAT→planning fallback can
+ * leave the slice "pending" while *all* its tasks stay "complete", which
+ * deadlocks every recovery path (plan-slice/replan-slice/complete-task all
+ * reject the still-closed tasks, and slice_reopen historically rejected the
+ * still-open slice). Resetting those tasks to pending gives the planner the
+ * clean slate it needs. An open slice that still has any unfinished
+ * (pending/in-progress) task is a normal in-flight slice, not the desync, and
+ * stays rejected as "slice-not-complete" so a full reset can't wipe its
+ * legitimate progress.
  */
 export function reopenSliceCascade(milestoneId, sliceId) {
     requireDb();
@@ -43,11 +54,18 @@ export function reopenSliceCascade(milestoneId, sliceId) {
             outcome = { ok: false, reason: "slice-not-found" };
             return;
         }
-        if (!isClosedStatus(slice.status)) {
+        const tasks = getSliceTasks(milestoneId, sliceId);
+        // A closed slice is always reopenable. An open slice is only the #1205
+        // desync when EVERY task is already closed (a UAT→planning fallback left the
+        // slice open with all tasks still "complete"). Requiring *all* tasks closed
+        // (not merely one) means a normal in-flight slice — which keeps at least one
+        // pending/in-progress task — is rejected, so a full reset can't wipe its
+        // legitimate progress.
+        const allTasksClosed = tasks.length > 0 && tasks.every((t) => isClosedStatus(t.status));
+        if (!isClosedStatus(slice.status) && !allTasksClosed) {
             outcome = { ok: false, reason: "slice-not-complete", status: slice.status };
             return;
         }
-        const tasks = getSliceTasks(milestoneId, sliceId);
         getDbOrNull().prepare(`UPDATE slices SET status = 'in_progress', completed_at = NULL WHERE milestone_id = :mid AND id = :sid`).run({ ":mid": milestoneId, ":sid": sliceId });
         getDbOrNull().prepare(`UPDATE tasks SET status = 'pending', completed_at = NULL WHERE milestone_id = :mid AND slice_id = :sid`).run({ ":mid": milestoneId, ":sid": sliceId });
         outcome = { ok: true, tasksReset: tasks.length };

package/dist/resources/extensions/gsd/discussion-handoff.js

@@ -53,8 +53,10 @@ function noteDbRowRecoveryMiss(entry) {
     }
 }
 function ensureMilestoneRowForAcceptedHandoff(entry, contextFile) {
-    if (!isDbAvailable())
-        return true;
+    if (!isDbAvailable()) {
+        logWarning("guided", `R3b: milestone ${entry.milestoneId} DB-row recovery skipped because DB is unavailable`);
+        return false;
+    }
     const { basePath, milestoneId } = entry;
     const milestoneRow = getMilestone(milestoneId);
     if (milestoneRow)
@@ -77,12 +79,15 @@ function ensureMilestoneRowForAcceptedHandoff(entry, contextFile) {
     }
     logWarning("guided", `R3b: ${milestoneId} has CONTEXT.md but no DB row — inserting placeholder "queued" row ` +
         `(attempt ${entry.r3bRecoveryCount + 1}/${MAX_DB_ROW_RECOVERIES})`);
+    let inserted = false;
     try {
-        insertMilestone({ id: milestoneId, title: milestoneId, status: "queued" });
+        inserted = insertMilestone({ id: milestoneId, title: milestoneId, status: "queued" });
     }
     catch (e) {
         logWarning("guided", `R3b: insertMilestone failed: ${e.message}`);
     }
+    if (inserted)
+        return true;
     if (getMilestone(milestoneId))
         return true;
     noteDbRowRecoveryMiss(entry);

package/dist/resources/extensions/gsd/docs/preferences-reference.md

@@ -163,7 +163,7 @@ Diagnostics record the file path, scope (global/project), severity (error/warnin
   - **Deprecated:** `merge_to_main` — no longer valid; milestone-level merge is always used. Remove this setting.
 
 - `workspace`: configures multi-repository parent workspaces. Keys:
-  - `mode`: `"project"` (default single-repo behavior) or `"parent"` (one `.gsd` controlling child repos).
+  - `mode`: `"project"` (default single-repo behavior) or `"parent"` (one `.gsd` controlling child repos). In `"parent"` mode at least one child repository must be declared under `repositories`, otherwise the setting is rejected at validation time.
   - `repositories`: object map of repository IDs to config.
     - Repository ID format: `^[A-Za-z0-9][A-Za-z0-9._-]*$`.
     - Reserved ID: `project` is implicit and always maps to the project root; user-defined `workspace.repositories.project` is rejected.
@@ -171,6 +171,8 @@ Diagnostics record the file path, scope (global/project), severity (error/warnin
     - `role`: optional short description of what the repo owns.
     - `verification`: optional array of verification commands for that repo.
     - `commit_policy`: optional `"auto"` or `"skip"` to include or skip commit actions per repo.
+  - Planning tools consume repository IDs through `targetRepositories`: `gsd_plan_slice.targetRepositories` sets a slice-wide default, and `gsd_plan_task.targetRepositories` records the repositories an individual task touches. Values must be declared IDs or the implicit `project`; omit these fields in single-repo projects.
+  - In parent mode with declared child repositories, `/gsd codebase generate` and automatic `.gsd/CODEBASE.md` refreshes enumerate `project` plus each child repository, render repo-labeled sections, and store repository IDs in map metadata.
 
 ## Workspace Example
 
@@ -198,6 +200,8 @@ workspace:
 
 This config sets a parent workspace with two child repositories. The implicit `project` repository is always created for the project root and cannot be user-defined.
 
+In `"parent"` mode, slice/task `targetRepositories` default to the declared child repositories (here `frontend` and `backend`) rather than the root `project` repo. In `"project"` mode (the default), `targetRepositories` defaults to `["project"]`.
+
 - `unique_milestone_ids`: boolean — when `true`, generates milestone IDs in `M{seq}-{rand6}` format (e.g. `M001-eh88as`) instead of plain sequential `M001`. Prevents ID collisions in team workflows where multiple contributors create milestones concurrently. Both formats coexist — existing `M001`-style milestones remain valid. Default: `false`.
 
 - `budget_ceiling`: number — maximum dollar amount to spend on auto-mode. When reached, behavior is controlled by `budget_enforcement`. Default: no limit.
@@ -303,7 +307,9 @@ This config sets a parent workspace with two child repositories. The implicit `p
     - `verification`: string[] (optional) — repository-specific verification commands used when global `verification_commands` is not set.
     - `commit_policy`: `"auto"` | `"skip"` (optional) — per-repository closeout commit behavior.
   - `project` is always an implicit repository target mapped to the project root for backward compatibility.
-  - Plan/task `targetRepositories` defaults to `["project"]` when omitted.
+  - `targetRepositories` on `gsd_plan_slice` sets the slice-wide default. `targetRepositories` on `gsd_plan_task` records or overrides the repository IDs for an individual task.
+  - Values must match declared repository IDs or the implicit `project`; omitted plan/task `targetRepositories` defaults to `["project"]`.
+  - `/gsd codebase` is workspace-aware in parent mode with declared child repositories: generated `.gsd/CODEBASE.md` uses workspace-relative paths, groups files under `## [repo-id]` headings, and refreshes when repository registry metadata changes.
 
 - `verification_commands`: string[] — shell commands to run as verification after task execution (e.g., `["npm test", "npm run lint"]`). Commands run in order; if any fails, the task is marked as needing fixes.