@opengsd/gsd-pi 1.5.0 → 1.6.0

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

@@ -10,7 +10,7 @@
  * via prefix matching, so existing projects work without migration.
  */
 import { readdirSync, existsSync, realpathSync, statSync, Dirent } from "node:fs";
-import { join, dirname, normalize, resolve } from "node:path";
+import { join, dirname, normalize, relative, resolve } from "node:path";
 import { homedir } from "node:os";
 import { spawnSync } from "node:child_process";
 import { nativeScanGsdTree } from "./native-parser-bridge.js";
@@ -331,21 +331,26 @@ export function resolveGsdPathContract(workRoot, originalProjectRoot) {
     const resolvedWorkRoot = resolve(workRoot || process.cwd());
     const isWorktree = isGsdWorktreePath(resolvedWorkRoot);
     if (isWorktree && !originalProjectRoot?.trim()) {
-        const projectGsd = resolveExternalStateProjectGsdFromWorktreePath(resolvedWorkRoot);
-        if (projectGsd) {
+        const rawProjectGsd = resolveExternalStateProjectGsdFromWorktreePath(resolvedWorkRoot);
+        if (rawProjectGsd) {
+            // Canonicalize the `.gsd` root so the DB path matches what every other
+            // accessor (gsdRoot/gsdProjectionRoot) returns — otherwise an unresolved
+            // symlink (e.g. `/mnt/c/.../.gsd` → native ext4 on WSL) selects the wrong
+            // journal mode and yields a fragile, move-prone handle. See issue #1239.
+            const projectGsd = normalizeRealPath(rawProjectGsd);
             return {
                 projectRoot: dirname(dirname(projectGsd)),
                 workRoot: resolvedWorkRoot,
                 projectGsd,
-                worktreeGsd: join(resolvedWorkRoot, ".gsd"),
+                worktreeGsd: normalizeRealPath(join(resolvedWorkRoot, ".gsd")),
                 projectDb: join(projectGsd, "gsd.db"),
                 isWorktree,
             };
         }
     }
     const projectRoot = resolve(resolveWorktreeProjectRoot(resolvedWorkRoot, originalProjectRoot));
-    const projectGsd = join(projectRoot, ".gsd");
-    const worktreeGsd = isWorktree ? join(resolvedWorkRoot, ".gsd") : null;
+    const projectGsd = normalizeRealPath(join(projectRoot, ".gsd"));
+    const worktreeGsd = isWorktree ? normalizeRealPath(join(resolvedWorkRoot, ".gsd")) : null;
     return {
         projectRoot,
         workRoot: resolvedWorkRoot,
@@ -669,7 +674,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 +686,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 +709,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
@@ -865,11 +884,22 @@ export function resolveTasksDir(basePath, milestoneId, sliceId) {
  * Resolve a specific task file.
  */
 export function resolveTaskFile(basePath, milestoneId, sliceId, taskId, suffix) {
-    const tDir = resolveTasksDir(basePath, milestoneId, sliceId);
-    if (!tDir)
+    const phaseDir = resolveMilestonePath(basePath, milestoneId);
+    if (!phaseDir)
         return null;
-    const file = resolveFile(tDir, taskId, suffix);
-    return file ? join(tDir, file) : null;
+    const legacyBase = legacyMilestonesDir(basePath);
+    const isLegacy = phaseDir.startsWith(legacyBase + "/") || phaseDir.startsWith(legacyBase + "\\");
+    if (suffix !== "PLAN" && !isLegacy) {
+        const flatPath = join(phaseDir, buildTaskFileName(taskId, suffix));
+        return existsSync(flatPath) ? flatPath : null;
+    }
+    const tDir = resolveTasksDir(basePath, milestoneId, sliceId);
+    if (tDir) {
+        const file = resolveFile(tDir, taskId, suffix);
+        if (file)
+            return join(tDir, file);
+    }
+    return null;
 }
 // ─── Relative Path Builders (for prompts — .gsd/milestones/...) ────────────
 /**
@@ -901,29 +931,30 @@ export function relMilestonePath(basePath, milestoneId, title) {
     return `.gsd/${LAYOUT_SEGMENTS.level1}/${canonicalPhaseDirName(milestoneId, title)}`;
 }
 /**
- * Build relative .gsd/ path to a milestone file.
- * Layout-aware: uses resolveMilestoneFile to find NN-SUFFIX.md (flat-phase)
- * or M001-SUFFIX.md (legacy). Falls back to a layout-appropriate canonical
- * name when the file doesn't exist yet.
- */
-export function relMilestoneFile(basePath, milestoneId, suffix) {
-    const mRel = relMilestonePath(basePath, milestoneId);
-    // resolveMilestoneFile checks NN-SUFFIX.md (flat-phase) and MID-SUFFIX.md (legacy).
-    const absFile = resolveMilestoneFile(basePath, milestoneId, suffix);
-    if (absFile) {
-        const fileName = absFile.split(/[/\\]/).pop();
-        return `${mRel}/${fileName}`;
-    }
-    // File doesn't exist yet — use layout-aware fallback filename.
+ * Build the canonical absolute write target for a milestone file.
+ * Existing compatibility filenames are intentionally ignored; readers that need
+ * to preserve an existing file should call resolveMilestoneFile first.
+ */
+export function targetMilestoneFile(basePath, milestoneId, suffix, title) {
     const mDir = resolveMilestonePath(basePath, milestoneId);
     const legacyBase = legacyMilestonesDir(basePath);
     const isLegacy = mDir
         ? mDir.startsWith(legacyBase + "/") || mDir.startsWith(legacyBase + "\\")
-        : false;
+        : isLegacyMilestonesLayout(basePath);
+    const dir = mDir ?? join(isLegacy ? legacyBase : milestonesDir(basePath), isLegacy ? milestoneId : canonicalPhaseDirName(milestoneId, title));
     const fileName = isLegacy
         ? `${milestoneId}-${suffix}.md`
         : `${String(milestoneIdToPhaseNum(milestoneId)).padStart(2, "0")}-${suffix}.md`;
-    return `${mRel}/${fileName}`;
+    return join(dir, fileName);
+}
+/**
+ * Build relative .gsd/ path to a milestone file.
+ * Preserves an existing compatibility filename when present; otherwise falls
+ * back to the canonical write target.
+ */
+export function relMilestoneFile(basePath, milestoneId, suffix, title) {
+    const rel = relative(gsdProjectionRoot(basePath), resolveMilestoneFile(basePath, milestoneId, suffix) ?? targetMilestoneFile(basePath, milestoneId, suffix, title)).replace(/\\/g, "/");
+    return `.gsd/${rel}`;
 }
 /**
  * Build relative .gsd/ path to a slice directory.
@@ -951,32 +982,36 @@ export function relSlicePath(basePath, milestoneId, sliceId, milestoneTitle) {
     return relMilestonePath(basePath, milestoneId, milestoneTitle);
 }
 /**
- * Build relative .gsd/ path to a slice file.
- * Layout-aware: legacy uses S01-SUFFIX.md; flat-phase uses NN-MM-SUFFIX.md.
- *
- * @param milestoneTitle - Optional milestone title forwarded to relSlicePath /
- *   relMilestonePath for title-aware flat-phase fallback dir naming. Only used
- *   when the phase directory does not yet exist on disk.
+ * Build the canonical absolute write target for a slice file.
+ * Existing compatibility filenames are intentionally ignored; readers that need
+ * to preserve an existing file should call resolveSliceFile first.
  */
-export function relSliceFile(basePath, milestoneId, sliceId, suffix, milestoneTitle) {
-    const sRel = relSlicePath(basePath, milestoneId, sliceId, milestoneTitle);
-    const absPath = resolveSliceFile(basePath, milestoneId, sliceId, suffix);
-    if (absPath) {
-        const fileName = absPath.split(/[/\\]/).pop();
-        return `${sRel}/${fileName}`;
-    }
-    // Fallback when file doesn't exist yet — use layout-aware filename.
+export function targetSliceFile(basePath, milestoneId, sliceId, suffix, milestoneTitle) {
     const mDir = resolveMilestonePath(basePath, milestoneId);
     const legacyBase = legacyMilestonesDir(basePath);
     const isLegacy = mDir
         ? mDir.startsWith(legacyBase + "/") || mDir.startsWith(legacyBase + "\\")
-        : false;
-    if (isLegacy) {
-        return `${sRel}/${sliceId}-${suffix}.md`;
-    }
-    const phaseNum = milestoneIdToPhaseNum(milestoneId);
-    const planNum = sliceIdToPlanNum(sliceId);
-    return `${sRel}/${planFileName(phaseNum, planNum, suffix)}`;
+        : isLegacyMilestonesLayout(basePath);
+    const milestoneDir = mDir
+        ?? dirname(targetMilestoneFile(basePath, milestoneId, "ROADMAP", milestoneTitle));
+    const slicesDir = join(milestoneDir, "slices");
+    const dir = isLegacy
+        ? join(slicesDir, resolveDir(slicesDir, sliceId) ?? sliceId)
+        : milestoneDir;
+    const fileName = isLegacy
+        ? `${sliceId}-${suffix}.md`
+        : planFileName(milestoneIdToPhaseNum(milestoneId), sliceIdToPlanNum(sliceId), suffix);
+    return join(dir, fileName);
+}
+/**
+ * Build relative .gsd/ path to a slice file.
+ * Preserves an existing compatibility filename when present; otherwise falls
+ * back to the canonical write target.
+ */
+export function relSliceFile(basePath, milestoneId, sliceId, suffix, milestoneTitle) {
+    const rel = relative(gsdProjectionRoot(basePath), resolveSliceFile(basePath, milestoneId, sliceId, suffix)
+        ?? targetSliceFile(basePath, milestoneId, sliceId, suffix, milestoneTitle)).replace(/\\/g, "/");
+    return `.gsd/${rel}`;
 }
 /**
  * Build relative .gsd/ path to a task file.
@@ -985,7 +1020,7 @@ export function relSliceFile(basePath, milestoneId, sliceId, suffix, milestoneTi
  * Flat-phase:     PLAN → slice plan path (tasks as checkboxes); other suffixes
  *                 (e.g. SUMMARY) → phase dir / TID-SUFFIX.md
  */
-export function relTaskFile(basePath, milestoneId, sliceId, taskId, suffix) {
+export function relTaskFile(basePath, milestoneId, sliceId, taskId, suffix, milestoneTitle) {
     const sDir = resolveSlicePath(basePath, milestoneId, sliceId);
     const phaseDir = resolveMilestonePath(basePath, milestoneId);
     // Legacy: slice path is a slices/SID/ subdir inside the milestone dir
@@ -997,6 +1032,6 @@ export function relTaskFile(basePath, milestoneId, sliceId, taskId, suffix) {
     if (suffix === "PLAN") {
         return relSliceFile(basePath, milestoneId, sliceId, "PLAN");
     }
-    const relS = relSlicePath(basePath, milestoneId, sliceId);
+    const relS = relSlicePath(basePath, milestoneId, sliceId, milestoneTitle);
     return `${relS}/${buildTaskFileName(taskId, suffix)}`;
 }

package/dist/resources/extensions/gsd/post-unit-hooks.js

@@ -42,6 +42,33 @@ export function persistHookState(basePath) {
 export function restoreHookState(basePath) {
     getOrCreateRegistry().restoreState(basePath);
 }
+/**
+ * Reconcile a restored `activeHook` against the session's sidecar queue.
+ *
+ * The registry persists `activeHook` to disk but the pending hook *dispatch*
+ * lives only on the non-persisted `s.sidecarQueue`. After a pause/resume or
+ * crash-recovery, `restoreHookState` re-hydrates `activeHook` while the dispatch
+ * is gone, so the registry believes a hook is in-flight but nothing will ever
+ * complete it — and the next unrelated unit's close-out is falsely charged
+ * against the stale hook and blocked. Re-enqueue the missing dispatch so the
+ * hook actually runs, restoring the invariant that a persisted `activeHook`
+ * always has a live dispatch (#1246).
+ */
+export function reconcileRestoredHookDispatch(basePath, sidecarQueue) {
+    const dispatch = getOrCreateRegistry().getPendingHookDispatch(basePath);
+    if (!dispatch)
+        return;
+    const alreadyQueued = sidecarQueue.some(item => item.kind === "hook" && item.unitType === dispatch.unitType);
+    if (alreadyQueued)
+        return;
+    sidecarQueue.push({
+        kind: "hook",
+        unitType: dispatch.unitType,
+        unitId: dispatch.unitId,
+        prompt: dispatch.prompt,
+        model: dispatch.model,
+    });
+}
 export function clearPersistedHookState(basePath) {
     getOrCreateRegistry().clearPersistedState(basePath);
 }

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

@@ -66,6 +66,39 @@ function resolveWinningPhase(models, chain) {
     }
     return undefined;
 }
+/**
+ * Normalize a single model field into a {@link ResolvedModelConfig}.
+ *
+ * Accepts either the legacy bare-string form or the extended object form
+ * (`{ model, provider?, fallbacks? }`). This is the shared normalization used
+ * for phase buckets so sibling single-model fields — `post_unit_hooks[].model`,
+ * `auto_supervisor.model`, and `reactive_execution.subagent_model` — honor
+ * `fallbacks[]` identically rather than accepting a bare string only (#1229).
+ *
+ * Returns undefined for an unset, blank, or model-less field.
+ */
+export function normalizeModelFieldConfig(field) {
+    if (!field)
+        return undefined;
+    if (typeof field === "string") {
+        return field.trim() ? { primary: field, fallbacks: [] } : undefined;
+    }
+    if (!field.model)
+        return undefined;
+    // When provider is explicitly set, prepend it to the model ID so the
+    // resolution code in auto.ts can do an explicit provider match.
+    const primary = field.provider && !field.model.includes("/")
+        ? `${field.provider}/${field.model}`
+        : field.model;
+    // Carry the per-field `thinking` sub-field through so the dispatch site can
+    // prefer it over the session/floor level, mirroring phase-inline thinking
+    // (#1269). `undefined` is preserved as absent so behavior is unchanged.
+    return {
+        primary,
+        fallbacks: field.fallbacks ?? [],
+        ...(field.thinking ? { thinking: field.thinking } : {}),
+    };
+}
 /**
  * Resolve model and fallbacks for a given auto-mode unit type.
  * Returns the primary model and ordered fallbacks, or undefined if not configured.
@@ -73,6 +106,15 @@ function resolveWinningPhase(models, chain) {
  * Supports both legacy string format and extended object format:
  * - Legacy: `planning: claude-opus-4-6`
  * - Extended: `planning: { model: claude-opus-4-6, fallbacks: [glm-5, minimax-m2.5] }`
+ *
+ * Hook unit types (`hook/<name>`) resolve against the matching
+ * `post_unit_hooks[]` entry's `model` field so hook sessions honor the same
+ * `fallbacks[]` chain as phase buckets — the recovery path can then switch to
+ * a fallback provider instead of hard-failing (and potentially pausing) the
+ * run on a transient provider trip (#1229).
+ *
+ * The synthetic `supervisor` unit type resolves against `auto_supervisor.model`
+ * for supervisor interventions (wrap-up warnings, timeout recovery).
  */
 export function resolveModelWithFallbacksForUnit(unitType, basePath, availableModelIds, preferredModelId, skipProfileDefaults = false) {
     const loadOpts = {
@@ -81,26 +123,25 @@ export function resolveModelWithFallbacksForUnit(unitType, basePath, availableMo
         ...(skipProfileDefaults ? { skipProfileDefaults: true } : {}),
     };
     const prefs = loadEffectiveGSDPreferences(basePath, loadOpts);
+    // Supervisor interventions resolve against `auto_supervisor.model` (#1229).
+    if (unitType === "supervisor") {
+        return normalizeModelFieldConfig(prefs?.preferences?.auto_supervisor?.model);
+    }
+    // Hook sessions resolve against their own `post_unit_hooks[].model` field,
+    // which now shares the phase-bucket object form (#1229).
+    if (unitType.startsWith("hook/")) {
+        const hookName = unitType.slice("hook/".length);
+        const hooks = prefs?.preferences?.post_unit_hooks;
+        const hook = Array.isArray(hooks) ? hooks.find((h) => h.name === hookName) : undefined;
+        return normalizeModelFieldConfig(hook?.model);
+    }
     const chain = phaseChainForUnit(unitType);
     if (!chain)
         return undefined;
     const winner = resolveWinningPhase(prefs?.preferences?.models, chain);
     if (!winner)
         return undefined;
-    const phaseConfig = winner.config;
-    // Normalize: string -> { model, fallbacks: [] }
-    if (typeof phaseConfig === "string") {
-        return { primary: phaseConfig, fallbacks: [] };
-    }
-    // When provider is explicitly set, prepend it to the model ID so the
-    // resolution code in auto.ts can do an explicit provider match.
-    const primary = phaseConfig.provider && !phaseConfig.model.includes("/")
-        ? `${phaseConfig.provider}/${phaseConfig.model}`
-        : phaseConfig.model;
-    return {
-        primary,
-        fallbacks: phaseConfig.fallbacks ?? [],
-    };
+    return normalizeModelFieldConfig(winner.config);
 }
 /**
  * Resolve the explicitly configured reasoning effort for a unit type (ADR-026).
@@ -125,6 +166,13 @@ export function resolveModelWithFallbacksForUnit(unitType, basePath, availableMo
  * applied here.
  */
 export function resolveThinkingLevelForUnit(unitType, basePath, availableModelIds) {
+    // Single-field configs — `auto_supervisor.model` and `post_unit_hooks[].model`
+    // — carry their own inline `thinking` on the object model form and have no
+    // phase-bucket chain, so the walk below never covers them. Resolve their
+    // per-field level directly (#1269).
+    if (unitType === "supervisor" || unitType.startsWith("hook/")) {
+        return resolveModelWithFallbacksForUnit(unitType, basePath, availableModelIds)?.thinking;
+    }
     const loadOpts = availableModelIds !== undefined ? { availableModelIds } : undefined;
     const prefs = loadEffectiveGSDPreferences(basePath, loadOpts)?.preferences;
     if (!prefs)
@@ -383,12 +431,15 @@ export function resolveDynamicRoutingConfig() {
 export function resolveAutoSupervisorConfig() {
     const prefs = loadEffectiveGSDPreferences();
     const configured = prefs?.preferences.auto_supervisor ?? {};
+    const modelConfig = normalizeModelFieldConfig(configured.model);
     return {
         soft_timeout_minutes: configured.soft_timeout_minutes ?? 20,
         idle_timeout_minutes: configured.idle_timeout_minutes ?? 10,
         hard_timeout_minutes: configured.hard_timeout_minutes ?? 30,
         stalled_tool_timeout_minutes: configured.stalled_tool_timeout_minutes ?? 5,
-        ...(configured.model ? { model: configured.model } : {}),
+        ...(modelConfig
+            ? { model: modelConfig.primary, modelFallbacks: modelConfig.fallbacks }
+            : {}),
     };
 }
 // ─── Token Profile Resolution ─────────────────────────────────────────────

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

@@ -25,6 +25,57 @@ const VALID_UOK_TURN_ACTIONS = new Set([
     "snapshot",
     "status-only",
 ]);
+/**
+ * Sanitize a single model field that accepts either a bare model ID or the
+ * extended `{ model, provider?, fallbacks? }` object form used by phase buckets
+ * (#1229). Returns the sanitized value, or undefined when unset/invalid (in
+ * which case an error describing `label` is pushed onto `errors`).
+ */
+function sanitizeModelField(raw, label, errors, warnings) {
+    if (raw === undefined)
+        return undefined;
+    if (typeof raw === "string") {
+        const trimmed = raw.trim();
+        if (!trimmed) {
+            errors.push(`${label} must not be an empty string`);
+            return undefined;
+        }
+        return trimmed;
+    }
+    if (raw && typeof raw === "object") {
+        const obj = raw;
+        const model = typeof obj.model === "string" ? obj.model.trim() : "";
+        if (!model) {
+            errors.push(`${label} object form requires a non-empty "model"`);
+            return undefined;
+        }
+        const sanitized = { model };
+        if (typeof obj.provider === "string" && obj.provider.trim()) {
+            sanitized.provider = obj.provider.trim();
+        }
+        if (obj.fallbacks !== undefined) {
+            const fallbacks = normalizeStringArray(obj.fallbacks);
+            if (fallbacks.length > 0)
+                sanitized.fallbacks = fallbacks;
+        }
+        // Preserve the object form's `thinking` sub-field so the dispatch site can
+        // pin the hook/supervisor/subagent reasoning level (#1269). An illegal level
+        // is warned-and-stripped, mirroring inline per-phase thinking, so a typo can't
+        // reach the resolver and be treated as explicit configuration.
+        if (obj.thinking !== undefined) {
+            if (VALID_THINKING_LEVELS.has(obj.thinking)) {
+                sanitized.thinking = obj.thinking;
+            }
+            else {
+                warnings?.push(`${label} thinking "${String(obj.thinking)}" is not a valid thinking level ` +
+                    `(off, minimal, low, medium, high, xhigh) — ignored`);
+            }
+        }
+        return sanitized;
+    }
+    errors.push(`${label} must be a string or an object with a "model" field`);
+    return undefined;
+}
 const VALID_POST_UNIT_HOOK_CRITICALITIES = new Set(["advisory", "blocking"]);
 const VALID_POST_UNIT_HOOK_ON_BLOCK_ACTIONS = new Set([
     "retry-unit",
@@ -452,7 +503,15 @@ export function validatePreferences(preferences) {
     // ─── Auto Supervisor ────────────────────────────────────────────────
     if (preferences.auto_supervisor !== undefined) {
         if (preferences.auto_supervisor && typeof preferences.auto_supervisor === "object") {
-            validated.auto_supervisor = preferences.auto_supervisor;
+            // Validate `model` through the shared sanitizer so the
+            // `{ model, provider?, fallbacks? }` object form is rejected on the same
+            // terms as its post_unit_hooks / reactive_execution siblings (#1229).
+            // Other supervisor fields pass through unchanged.
+            const supervisor = { ...preferences.auto_supervisor };
+            if (supervisor.model !== undefined) {
+                supervisor.model = sanitizeModelField(supervisor.model, "auto_supervisor.model", errors, warnings);
+            }
+            validated.auto_supervisor = supervisor;
         }
         else {
             errors.push("auto_supervisor must be an object");
@@ -548,8 +607,9 @@ export function validatePreferences(preferences) {
                 const mc = typeof hook.max_cycles === "number" ? hook.max_cycles : Number(hook.max_cycles);
                 validHook.max_cycles = Number.isFinite(mc) ? Math.max(1, Math.min(10, Math.round(mc))) : 1;
             }
-            if (typeof hook.model === "string" && hook.model.trim()) {
-                validHook.model = hook.model.trim();
+            const hookModel = sanitizeModelField(hook.model, `post_unit_hooks "${name}" model`, errors, warnings);
+            if (hookModel !== undefined) {
+                validHook.model = hookModel;
             }
             if (typeof hook.artifact === "string" && hook.artifact.trim()) {
                 validHook.artifact = hook.artifact.trim();
@@ -801,6 +861,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) {
@@ -968,13 +1110,9 @@ export function validatePreferences(preferences) {
                     errors.push('reactive_execution.isolation_mode must be "same-tree"');
                 }
             }
-            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 subagentModel = sanitizeModelField(re.subagent_model, "reactive_execution.subagent_model", errors, warnings);
+            if (subagentModel !== undefined) {
+                validRe.subagent_model = subagentModel;
             }
             const knownReKeys = new Set(["enabled", "max_parallel", "isolation_mode", "subagent_model"]);
             for (const key of Object.keys(re)) {