gsd-pi 2.80.0-dev.710c06e97 → 2.80.0-dev.7582bf37a

package/dist/resources/extensions/gsd/crash-recovery.js

@@ -29,6 +29,7 @@ import { _getAdapter, isDbAvailable } from "./gsd-db.js";
 import { gsdRoot, normalizeRealPath } from "./paths.js";
 import { atomicWriteSync } from "./atomic-write.js";
 import { effectiveLockFile } from "./session-lock.js";
+import { isInFlightRuntimePhase, listUnitRuntimeRecords } from "./unit-runtime.js";
 const SESSION_FILE_KV_KEY = "session_file";
 function lockPath(basePath) {
     return join(gsdRoot(basePath), effectiveLockFile());
@@ -72,9 +73,37 @@ function getLatestDispatchForWorker(workerId) {
      LIMIT 1`).get({ ":worker_id": workerId });
     return row ?? null;
 }
-function workerToLockData(worker) {
+function latestInFlightRuntimeRecord(basePath) {
+    const records = listUnitRuntimeRecords(basePath).filter((record) => isInFlightRuntimePhase(record.phase));
+    if (records.length === 0)
+        return null;
+    return records.sort((a, b) => {
+        const bTime = b.updatedAt || b.startedAt || 0;
+        const aTime = a.updatedAt || a.startedAt || 0;
+        return bTime - aTime;
+    })[0] ?? null;
+}
+function runtimeRecordToLockData(worker, record, sessionFile) {
+    const startedAt = Number.isFinite(record.startedAt)
+        ? new Date(record.startedAt).toISOString()
+        : worker.started_at;
+    return {
+        pid: worker.pid,
+        startedAt: worker.started_at,
+        unitType: record.unitType,
+        unitId: record.unitId,
+        unitStartedAt: startedAt,
+        sessionFile,
+    };
+}
+function workerToLockData(basePath, worker) {
     const dispatch = getLatestDispatchForWorker(worker.worker_id);
     const sessionFile = getRuntimeKv("worker", worker.worker_id, SESSION_FILE_KV_KEY) ?? undefined;
+    if (!dispatch) {
+        const runtimeRecord = latestInFlightRuntimeRecord(basePath);
+        if (runtimeRecord)
+            return runtimeRecordToLockData(worker, runtimeRecord, sessionFile);
+    }
     return {
         pid: worker.pid,
         startedAt: worker.started_at,
@@ -172,7 +201,7 @@ export function readCrashLock(basePath) {
             const projectRoot = normalizeRealPath(basePath);
             const stale = findStaleWorkerForProject(projectRoot);
             if (stale)
-                return workerToLockData(stale);
+                return workerToLockData(basePath, stale);
         }
         catch {
             // Fall through to the legacy lock-file compatibility path.
@@ -232,18 +261,32 @@ export function formatCrashInfo(lock) {
 export function emitCrashRecoveredUnitEnd(basePath, lock) {
     if (!lock.unitType || !lock.unitId || lock.unitType === "starting")
         return;
+    emitOpenUnitEndForUnit(basePath, lock.unitType, lock.unitId, "crash-recovered");
+}
+export function emitOpenUnitEndForUnit(basePath, unitType, unitId, status, errorContext) {
     try {
         const all = queryJournal(basePath);
-        const starts = all.filter((e) => e.eventType === "unit-start" && e.data?.unitId === lock.unitId);
+        const starts = all.filter((e) => e.eventType === "unit-start" &&
+            e.data?.unitType === unitType &&
+            e.data?.unitId === unitId);
         if (starts.length === 0)
-            return;
-        const lastStart = starts[starts.length - 1];
+            return false;
+        const lastStart = [...starts].reverse().find((start) => {
+            return !all.some((e) => e.eventType === "unit-end" &&
+                e.data?.unitType === unitType &&
+                e.data?.unitId === unitId &&
+                e.causedBy?.flowId === start.flowId &&
+                e.causedBy?.seq === start.seq);
+        });
+        if (!lastStart)
+            return false;
         const alreadyClosed = all.some((e) => e.eventType === "unit-end" &&
-            e.data?.unitId === lock.unitId &&
+            e.data?.unitType === unitType &&
+            e.data?.unitId === unitId &&
             e.causedBy?.flowId === lastStart.flowId &&
             e.causedBy?.seq === lastStart.seq);
         if (alreadyClosed)
-            return;
+            return false;
         const maxSeq = all
             .filter((e) => e.flowId === lastStart.flowId)
             .reduce((max, e) => Math.max(max, e.seq), lastStart.seq);
@@ -253,16 +296,19 @@ export function emitCrashRecoveredUnitEnd(basePath, lock) {
             seq: maxSeq + 1,
             eventType: "unit-end",
             data: {
-                unitType: lock.unitType,
-                unitId: lock.unitId,
-                status: "crash-recovered",
+                unitType,
+                unitId,
+                status,
                 artifactVerified: false,
+                ...(errorContext ? { errorContext } : {}),
             },
             causedBy: { flowId: lastStart.flowId, seq: lastStart.seq },
         });
+        return true;
     }
     catch {
         // Never throw from crash recovery path.
+        return false;
     }
 }
 /**

package/dist/resources/extensions/gsd/dashboard-overlay.js

@@ -21,7 +21,7 @@ import { estimateTimeRemaining } from "./auto-dashboard.js";
 import { computeProgressScore } from "./progress-score.js";
 import { runEnvironmentChecks } from "./doctor-environment.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
-function unitLabel(type) {
+export function unitLabel(type) {
     switch (type) {
         case "discuss-milestone":
         case "discuss-slice": return "Discuss";

package/dist/resources/extensions/gsd/db/unit-dispatches.js

@@ -26,6 +26,58 @@ function isAlreadyActiveConstraintError(err) {
     }
     return /\bUNIQUE\b|\bconstraint failed\b/i.test(msg);
 }
+function settleStaleActiveDispatchForUnit(input, now) {
+    const db = _getAdapter();
+    const active = db.prepare(`SELECT id, status, worker_id, milestone_lease_token
+     FROM unit_dispatches
+     WHERE unit_id = :unit_id
+       AND status IN ('claimed','running')
+     ORDER BY id DESC
+     LIMIT 1`).get({ ":unit_id": input.unitId });
+    if (!active)
+        return;
+    if (active.worker_id === input.workerId &&
+        active.milestone_lease_token === input.milestoneLeaseToken) {
+        return;
+    }
+    const reason = "stale-dispatch-lease-takeover";
+    const result = db.prepare(`UPDATE unit_dispatches
+     SET status = 'canceled',
+         ended_at = :ended_at,
+         exit_reason = :reason
+     WHERE id = :id
+       AND status IN ('claimed','running')
+       AND (worker_id != :worker_id OR milestone_lease_token != :token)`).run({
+        ":id": active.id,
+        ":ended_at": now,
+        ":reason": reason,
+        ":worker_id": input.workerId,
+        ":token": input.milestoneLeaseToken,
+    });
+    const changes = typeof result.changes === "number"
+        ? result.changes
+        : 0;
+    if (changes < 1)
+        return;
+    insertAuditEvent({
+        eventId: randomUUID(),
+        traceId: input.traceId,
+        turnId: input.turnId ?? undefined,
+        category: "orchestration",
+        type: "dispatch-stale-canceled",
+        ts: now,
+        payload: {
+            dispatchId: active.id,
+            unitId: input.unitId,
+            priorStatus: active.status,
+            priorWorkerId: active.worker_id,
+            priorMilestoneLeaseToken: active.milestone_lease_token,
+            takeoverWorkerId: input.workerId,
+            takeoverMilestoneLeaseToken: input.milestoneLeaseToken,
+            reason,
+        },
+    });
+}
 /**
  * Insert a new dispatch row in `claimed` state. Atomic guard against
  * double-claim (B2): the partial unique index
@@ -58,6 +110,7 @@ export function recordDispatchClaim(input) {
                 milestoneLeaseToken: input.milestoneLeaseToken,
             };
         }
+        settleStaleActiveDispatchForUnit(input, now);
         try {
             const result = db.prepare(`INSERT INTO unit_dispatches (
           trace_id, turn_id, worker_id, milestone_lease_token,
@@ -253,6 +306,45 @@ export function markCanceled(dispatchId, reason) {
      SET status = 'canceled', ended_at = :ended_at, exit_reason = :reason
      WHERE id = :id AND status IN ('pending','claimed','running')`).run({ ":id": dispatchId, ":ended_at": now, ":reason": reason });
 }
+/**
+ * Best-effort signal/crash cleanup: cancel the latest active dispatch owned by
+ * a worker when the process is exiting before the normal loop can settle it.
+ */
+export function markLatestActiveForWorkerCanceled(workerId, reason) {
+    if (!isDbAvailable())
+        return false;
+    const now = new Date().toISOString();
+    const db = _getAdapter();
+    const result = transaction(() => {
+        return db.prepare(`UPDATE unit_dispatches
+       SET status = 'canceled', ended_at = :ended_at, exit_reason = :reason
+       WHERE id = (
+         SELECT id FROM unit_dispatches
+         WHERE worker_id = :worker_id
+           AND status IN ('pending','claimed','running')
+         ORDER BY id DESC
+         LIMIT 1
+       )`).run({
+            ":ended_at": now,
+            ":reason": reason,
+            ":worker_id": workerId,
+        });
+    });
+    const changes = typeof result.changes === "number"
+        ? result.changes
+        : 0;
+    if (changes <= 0)
+        return false;
+    insertAuditEvent({
+        eventId: randomUUID(),
+        traceId: workerId,
+        category: "orchestration",
+        type: "dispatch-canceled",
+        ts: now,
+        payload: { workerId, reason },
+    });
+    return true;
+}
 /**
  * Fetch the most recent N dispatches for a unit. Used by recordDispatchClaim
  * callers to compute attempt_n and by detect-stuck.ts (B3) to consult

package/dist/resources/extensions/gsd/db-base-schema.js

@@ -46,7 +46,8 @@ export function createBaseSchemaObjects(db, hooks) {
       slice_id TEXT DEFAULT NULL,
       task_id TEXT DEFAULT NULL,
       full_content TEXT NOT NULL DEFAULT '',
-      imported_at TEXT NOT NULL DEFAULT ''
+      imported_at TEXT NOT NULL DEFAULT '',
+      content_hash TEXT DEFAULT NULL
     )
   `);
     db.exec(`
@@ -64,7 +65,8 @@ export function createBaseSchemaObjects(db, hooks) {
       hit_count INTEGER NOT NULL DEFAULT 0,
       scope TEXT NOT NULL DEFAULT 'project',
       tags TEXT NOT NULL DEFAULT '[]',
-      structured_fields TEXT DEFAULT NULL
+      structured_fields TEXT DEFAULT NULL,
+      last_hit_at TEXT DEFAULT NULL
     )
   `);
     db.exec(`
@@ -294,6 +296,19 @@ export function createBaseSchemaObjects(db, hooks) {
       updated_at TEXT NOT NULL DEFAULT '',
       PRIMARY KEY (trace_id, turn_id, stage)
     )
+  `);
+    db.exec(`
+    CREATE TABLE IF NOT EXISTS milestone_commit_attributions (
+      commit_sha TEXT NOT NULL,
+      milestone_id TEXT NOT NULL,
+      slice_id TEXT DEFAULT NULL,
+      task_id TEXT DEFAULT NULL,
+      source TEXT NOT NULL DEFAULT 'recorded',
+      confidence REAL NOT NULL DEFAULT 1.0,
+      files_json TEXT NOT NULL DEFAULT '[]',
+      created_at TEXT NOT NULL DEFAULT '',
+      PRIMARY KEY (commit_sha, milestone_id)
+    )
   `);
     db.exec(`
     CREATE TABLE IF NOT EXISTS audit_events (
@@ -329,6 +344,7 @@ export function createBaseSchemaObjects(db, hooks) {
     db.exec("CREATE INDEX IF NOT EXISTS idx_gate_runs_turn ON gate_runs(trace_id, turn_id)");
     db.exec("CREATE INDEX IF NOT EXISTS idx_gate_runs_lookup ON gate_runs(milestone_id, slice_id, task_id, gate_id)");
     db.exec("CREATE INDEX IF NOT EXISTS idx_turn_git_tx_turn ON turn_git_transactions(trace_id, turn_id)");
+    db.exec("CREATE INDEX IF NOT EXISTS idx_milestone_commit_attr_milestone ON milestone_commit_attributions(milestone_id)");
     db.exec("CREATE INDEX IF NOT EXISTS idx_audit_events_trace ON audit_events(trace_id, ts)");
     db.exec("CREATE INDEX IF NOT EXISTS idx_audit_events_turn ON audit_events(trace_id, turn_id, ts)");
     db.exec("CREATE VIEW IF NOT EXISTS active_decisions AS SELECT * FROM decisions WHERE superseded_by IS NULL");

package/dist/resources/extensions/gsd/db-migration-steps.js

@@ -363,6 +363,28 @@ export function applyMigrationV21StructuredMemories(db) {
 export function applyMigrationV23MilestoneQueue(db) {
     ensureColumn(db, "milestones", "sequence", "ALTER TABLE milestones ADD COLUMN sequence INTEGER DEFAULT 0");
 }
+export function applyMigrationV26MilestoneCommitAttributions(db) {
+    db.exec(`
+    CREATE TABLE IF NOT EXISTS milestone_commit_attributions (
+      commit_sha TEXT NOT NULL,
+      milestone_id TEXT NOT NULL,
+      slice_id TEXT DEFAULT NULL,
+      task_id TEXT DEFAULT NULL,
+      source TEXT NOT NULL DEFAULT 'recorded',
+      confidence REAL NOT NULL DEFAULT 1.0,
+      files_json TEXT NOT NULL DEFAULT '[]',
+      created_at TEXT NOT NULL DEFAULT '',
+      PRIMARY KEY (commit_sha, milestone_id)
+    )
+  `);
+    db.exec("CREATE INDEX IF NOT EXISTS idx_milestone_commit_attr_milestone ON milestone_commit_attributions(milestone_id)");
+}
+export function applyMigrationV27ArtifactHash(db) {
+    ensureColumn(db, "artifacts", "content_hash", "ALTER TABLE artifacts ADD COLUMN content_hash TEXT DEFAULT NULL");
+}
+export function applyMigrationV28MemoryLastHitAt(db) {
+    ensureColumn(db, "memories", "last_hit_at", "ALTER TABLE memories ADD COLUMN last_hit_at TEXT DEFAULT NULL");
+}
 export function applyMigrationV22QualityGateRepair(db, hooks) {
     const qgInfo = db.prepare("PRAGMA table_info(quality_gates)").all();
     const taskIdCol = qgInfo.find((r) => r["name"] === "task_id");

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

@@ -5,6 +5,7 @@
  * Used by init-wizard.ts and guided-flow.ts to determine what onboarding
  * flow to show when entering a project directory.
  */
+import { execFileSync } from "node:child_process";
 import { existsSync, openSync, readSync, closeSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { dirname, join, parse as parsePath } from "node:path";
 import { homedir } from "node:os";
@@ -171,6 +172,7 @@ const TEST_MARKERS = [
 const RECURSIVE_SCAN_IGNORED_DIRS = new Set([
     ".git",
     ".gsd",
+    ".bg-shell",
     ".planning",
     ".plans",
     ".claude",
@@ -194,6 +196,7 @@ const RECURSIVE_SCAN_IGNORED_DIRS = new Set([
     "DerivedData",
     "out",
 ]);
+const PROJECT_CONTENT_EXCLUDE_DIRS = RECURSIVE_SCAN_IGNORED_DIRS;
 /** Project file markers safe to detect recursively via suffix matching. */
 const ROOT_ONLY_PROJECT_FILES = new Set([
     ".github/workflows",
@@ -429,6 +432,109 @@ export function detectProjectSignals(basePath) {
         verificationCommands,
     };
 }
+function normalizeGitPath(file) {
+    return file.replaceAll("\\", "/").replace(/^\.\//, "");
+}
+function isProjectContentFile(file) {
+    const normalized = normalizeGitPath(file);
+    if (!normalized || normalized.endsWith("/"))
+        return false;
+    if (normalized === ".gitignore" || normalized === ".gitattributes")
+        return false;
+    const parts = normalized.split("/");
+    if (parts.some((part) => PROJECT_CONTENT_EXCLUDE_DIRS.has(part)))
+        return false;
+    if (normalized.endsWith(".DS_Store"))
+        return false;
+    return true;
+}
+function runGitLines(basePath, args) {
+    try {
+        const output = execFileSync("git", args, {
+            cwd: basePath,
+            stdio: ["ignore", "pipe", "ignore"],
+            encoding: "utf-8",
+        }).trim();
+        return output ? output.split("\n").map((line) => line.trim()).filter(Boolean) : [];
+    }
+    catch {
+        return [];
+    }
+}
+function listTrackedProjectFiles(basePath) {
+    return runGitLines(basePath, ["ls-files"])
+        .map(normalizeGitPath)
+        .filter(isProjectContentFile);
+}
+function listUntrackedProjectFiles(basePath) {
+    return runGitLines(basePath, ["ls-files", "--others", "--exclude-standard"])
+        .map(normalizeGitPath)
+        .filter(isProjectContentFile);
+}
+function hasKnownProjectMarkers(basePath, signals) {
+    if (signals.detectedFiles.length > 0)
+        return true;
+    if (signals.xcodePlatforms.length > 0)
+        return true;
+    return false;
+}
+/**
+ * Classify repo presence separately from ecosystem/tooling markers.
+ *
+ * Known project files identify tooling. Git-tracked/non-ignored content
+ * identifies whether this is an existing project at all. This keeps small
+ * static or documentation repos from being mislabeled as greenfield.
+ */
+export function classifyProject(basePath) {
+    const signals = detectProjectSignals(basePath);
+    const markers = [...signals.detectedFiles];
+    if (!signals.isGitRepo) {
+        return {
+            kind: "invalid-repo",
+            signals,
+            trackedFiles: [],
+            untrackedFiles: [],
+            contentFiles: [],
+            markers,
+            reason: "missing .git",
+        };
+    }
+    const trackedFiles = listTrackedProjectFiles(basePath);
+    const untrackedFiles = listUntrackedProjectFiles(basePath);
+    const contentFiles = [...new Set([...trackedFiles, ...untrackedFiles])];
+    const hasMarkers = hasKnownProjectMarkers(basePath, signals);
+    if (hasMarkers) {
+        return {
+            kind: "typed-existing",
+            signals,
+            trackedFiles,
+            untrackedFiles,
+            contentFiles,
+            markers,
+            reason: markers.length > 0 ? `detected markers: ${markers.join(", ")}` : "detected project structure",
+        };
+    }
+    if (contentFiles.length > 0) {
+        return {
+            kind: "untyped-existing",
+            signals,
+            trackedFiles,
+            untrackedFiles,
+            contentFiles,
+            markers,
+            reason: "project content exists but no recognized tooling markers were found",
+        };
+    }
+    return {
+        kind: "greenfield",
+        signals,
+        trackedFiles,
+        untrackedFiles,
+        contentFiles,
+        markers,
+        reason: "no tracked or non-ignored project content",
+    };
+}
 // ─── Xcode Platform Detection ───────────────────────────────────────────────────
 /** Known SDKROOT values → canonical platform names. */
 const SDKROOT_MAP = {

package/dist/resources/extensions/gsd/ecosystem/gsd-extension-api.js

@@ -127,6 +127,8 @@ export function createGSDExtensionAPI(pi, sharedHandlers) {
         getActiveTools: () => pi.getActiveTools(),
         getAllTools: () => pi.getAllTools(),
         setActiveTools: (...args) => pi.setActiveTools(...args),
+        getVisibleSkills: () => pi.getVisibleSkills(),
+        setVisibleSkills: (...args) => pi.setVisibleSkills(...args),
         getCommands: () => pi.getCommands(),
         // ── Model & thinking ───────────────────────────────────────────────
         setModel: (...args) => pi.setModel(...args),

package/dist/resources/extensions/gsd/git-service.js

@@ -1,3 +1,5 @@
+// Project/App: GSD-2
+// File Purpose: Git operations, commit-message formatting, and turn git actions.
 /**
  * GSD Git Service
  *
@@ -13,6 +15,7 @@ import { isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
 import { gsdRoot } from "./paths.js";
 import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
+import { logWarning } from "./workflow-logger.js";
 import { detectWorktreeName, } from "./worktree.js";
 import { SLICE_BRANCH_RE, QUICK_BRANCH_RE, WORKFLOW_BRANCH_RE } from "./branch-patterns.js";
 import { nativeGetCurrentBranch, nativeDetectMainBranch, nativeBranchExists, nativeHasChanges, nativeAddAllWithExclusions, nativeHasStagedChanges, nativeCommit, nativeRmCached, nativeUpdateRef, nativeAddPaths, nativeResetSoft, nativeCommitSubject, _resetHasChangesCache, } from "./native-git-bridge.js";
@@ -48,6 +51,10 @@ export function buildTaskCommitMessage(ctx) {
             .join("\n");
         bodyParts.push(fileLines);
     }
+    const contextLines = buildTaskCommitContextLines(ctx);
+    if (contextLines.length > 0) {
+        bodyParts.push(`GSD context:\n${contextLines.join("\n")}`);
+    }
     // Trailers: GSD-Task first, then Resolves
     bodyParts.push(`GSD-Task: ${ctx.taskId}`);
     if (ctx.issueNumber) {
@@ -55,6 +62,31 @@ export function buildTaskCommitMessage(ctx) {
     }
     return `${subject}\n\n${bodyParts.join("\n\n")}`;
 }
+function buildTaskCommitContextLines(ctx) {
+    const lines = [];
+    const milestone = formatNamedContext(ctx.milestoneId, ctx.milestoneTitle);
+    const slice = formatNamedContext(ctx.sliceId, ctx.sliceTitle);
+    const taskId = ctx.taskDisplayId ?? ctx.taskId.split("/").pop();
+    const task = formatNamedContext(taskId, ctx.taskTitle);
+    if (milestone)
+        lines.push(`- Milestone: ${milestone}`);
+    if (slice)
+        lines.push(`- Slice: ${slice}`);
+    if (task)
+        lines.push(`- Task: ${task}`);
+    return lines;
+}
+function formatNamedContext(id, title) {
+    const cleanId = id?.trim();
+    const cleanTitle = title?.trim();
+    if (!cleanId && !cleanTitle)
+        return null;
+    if (!cleanId)
+        return cleanTitle ?? null;
+    if (!cleanTitle || cleanTitle === cleanId)
+        return cleanId;
+    return `${cleanId} - ${cleanTitle}`;
+}
 function sanitizeCommitSubjectDescription(value) {
     const cleaned = value
         .replace(/[\x00-\x1F\x7F]+/g, " ")
@@ -535,14 +567,45 @@ export class GitServiceImpl {
         if (keyFiles.length === 0)
             return false;
         const allExclusions = [...RUNTIME_EXCLUSION_PATHS, ...extraExclusions];
-        const paths = Array.from(new Set(keyFiles
+        const normalized = keyFiles
             .map(file => normalizeRepoRelativePath(this.basePath, file))
             .filter((file) => file !== null)
-            .filter(file => !isExcludedScopedPath(file, allExclusions))));
+            .filter(file => !isExcludedScopedPath(file, allExclusions));
+        // Drop entries that don't exist on disk. The LLM occasionally lists files
+        // it intended to write but didn't (or names them with wrong casing/path).
+        // Pre-`b304f738b` `git add -A` swallowed these silently; the scoped
+        // pathspec form passes each path explicitly, so a single bad entry made
+        // the whole commit fail (see #5500). Filter so valid paths still commit.
+        const missing = [];
+        const existing = [];
+        for (const path of normalized) {
+            if (existsSync(join(this.basePath, path))) {
+                existing.push(path);
+            }
+            else {
+                missing.push(path);
+            }
+        }
+        if (missing.length > 0) {
+            logWarning("engine", `scoped stage: dropping ${missing.length} non-existent keyFile(s) from task commit: ${missing.join(", ")}`, { file: "git-service.ts" });
+        }
+        const paths = Array.from(new Set(existing));
         if (paths.length === 0)
             return false;
-        nativeAddPaths(this.basePath, paths);
-        return true;
+        try {
+            nativeAddPaths(this.basePath, paths);
+            return true;
+        }
+        catch (err) {
+            // Defense-in-depth: even after existence filtering, libgit2/git can
+            // still reject paths (gitignore matches, case-only differences on
+            // case-insensitive FS, submodule boundaries). Returning false lets
+            // autoCommit fall through to smartStage so the commit still goes out
+            // — restoring the resilience the unscoped path used to provide.
+            const msg = err instanceof Error ? err.message : String(err);
+            logWarning("engine", `scoped stage failed (${msg}); falling back to smartStage`, { file: "git-service.ts" });
+            return false;
+        }
     }
     /** Tracks whether runtime file cleanup has run this session. */
     _runtimeFilesCleanedUp = false;
@@ -823,7 +886,12 @@ export function createDraftPR(basePath, milestoneId, title, body, opts) {
             args.push("--head", opts.head);
         if (opts?.base)
             args.push("--base", opts.base);
-        const result = execFileSync("gh", args, { cwd: basePath, encoding: "utf8", timeout: 30000, env: GIT_NO_PROMPT_ENV });
+        const result = execFileSync("gh", args, {
+            cwd: basePath,
+            encoding: "utf8",
+            timeout: 30000,
+            env: opts?.env ?? GIT_NO_PROMPT_ENV,
+        });
         return result.trim();
     }
     catch {