gsd-pi 2.77.0-dev.538325aea → 2.77.0-dev.58d3d4d6c

package/dist/resources/extensions/gsd/bootstrap/system-context.js

@@ -16,7 +16,6 @@ import { getActiveWorktreeName, getWorktreeOriginalCwd } from "../worktree-comma
 import { deriveState } from "../state.js";
 import { formatOverridesSection, formatShortcut, loadActiveOverrides, loadFile, parseContinue, parseSummary } from "../files.js";
 import { toPosixPath } from "../../shared/mod.js";
-import { markCmuxPromptShown, shouldPromptToEnableCmux } from "../../cmux/index.js";
 import { autoEnableCmuxPreferences } from "../commands-cmux.js";
 const gsdHome = process.env.GSD_HOME || join(homedir(), ".gsd");
 /**
@@ -87,13 +86,19 @@ export async function buildBeforeAgentStartResult(event, ctx) {
         shortcutShell: formatShortcut("Ctrl+Alt+B"),
     });
     let loadedPreferences = loadEffectiveGSDPreferences();
-    if (shouldPromptToEnableCmux(loadedPreferences?.preferences)) {
-        markCmuxPromptShown();
-        if (autoEnableCmuxPreferences()) {
-            loadedPreferences = loadEffectiveGSDPreferences();
-            ctx.ui.notify("cmux detected — auto-enabled. Run /gsd cmux off to disable.", "info");
+    try {
+        const { markCmuxPromptShown, shouldPromptToEnableCmux } = await import("../../cmux/index.js");
+        if (shouldPromptToEnableCmux(loadedPreferences?.preferences)) {
+            markCmuxPromptShown();
+            if (autoEnableCmuxPreferences()) {
+                loadedPreferences = loadEffectiveGSDPreferences();
+                ctx.ui.notify("cmux detected — auto-enabled. Run /gsd cmux off to disable.", "info");
+            }
         }
     }
+    catch (e) {
+        logWarning("bootstrap", `cmux prompt setup skipped: ${e.message}`);
+    }
     let preferenceBlock = "";
     if (loadedPreferences) {
         const cwd = process.cwd();

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

@@ -17,6 +17,22 @@ import { validateDefinition } from "../../definition-loader.js";
 import { formatPluginInfo, listPluginsFormatted, resolvePlugin, } from "../../workflow-plugins.js";
 import { dispatchOneshot } from "../../workflow-dispatch.js";
 import { fetchWorkflowSource, globalInstallDir, inferPluginName, installPlugin, previewContent, projectInstallDir, resolveSourceUrl, uninstallPlugin, validateFetchedContent, } from "../../workflow-install.js";
+/**
+ * Refuses interactive commands that mutate durable .gsd/ planning state while
+ * auto-mode holds the worktree. Returns true if the command was blocked and
+ * the caller should return immediately; false if it is safe to proceed.
+ *
+ * Auto-mode's squash merge performs a pre-merge dirty-tree check; concurrent
+ * writes by interactive commands between that check and the merge itself
+ * cause __dirty_working_tree__ failures (#4704).
+ */
+function requireNotAutoActive(commandName, ctx) {
+    if (!isAutoActive())
+        return false;
+    ctx.ui.notify(`${commandName} cannot run while auto-mode is active.\n` +
+        `Stop auto-mode first with /gsd stop, then run ${commandName}.`, "error");
+    return true;
+}
 // ─── Custom Workflow Subcommands ─────────────────────────────────────────
 const RESERVED_SUBCOMMANDS = new Set([
     "new", "run", "list", "validate", "pause", "resume",
@@ -394,12 +410,16 @@ async function handleCustomWorkflow(sub, ctx, pi) {
 export async function handleWorkflowCommand(trimmed, ctx, pi) {
     // ── /gsd do — natural language routing (must be early to route to other commands) ──
     if (trimmed === "do" || trimmed.startsWith("do ")) {
+        if (requireNotAutoActive("/gsd do", ctx))
+            return true;
         const { handleDo } = await import("../../commands-do.js");
         await handleDo(trimmed.replace(/^do\s*/, "").trim(), ctx, pi);
         return true;
     }
     // ── Backlog management ──
     if (trimmed === "backlog" || trimmed.startsWith("backlog ")) {
+        if (requireNotAutoActive("/gsd backlog", ctx))
+            return true;
         const { handleBacklog } = await import("../../commands-backlog.js");
         await handleBacklog(trimmed.replace(/^backlog\s*/, "").trim(), ctx, pi);
         return true;
@@ -410,23 +430,26 @@ export async function handleWorkflowCommand(trimmed, ctx, pi) {
         return handleCustomWorkflow(sub, ctx, pi);
     }
     if (trimmed === "queue") {
+        if (requireNotAutoActive("/gsd queue", ctx))
+            return true;
         await showQueue(ctx, pi, projectRoot());
         return true;
     }
     if (trimmed === "discuss") {
+        if (requireNotAutoActive("/gsd discuss", ctx))
+            return true;
         await showDiscuss(ctx, pi, projectRoot());
         return true;
     }
     if (trimmed === "quick" || trimmed.startsWith("quick ")) {
-        if (isAutoActive()) {
-            ctx.ui.notify("/gsd quick cannot run while auto-mode is active.\n" +
-                "Stop auto-mode first with /gsd stop, then run /gsd quick.", "error");
+        if (requireNotAutoActive("/gsd quick", ctx))
             return true;
-        }
         await handleQuick(trimmed.replace(/^quick\s*/, "").trim(), ctx, pi);
         return true;
     }
     if (trimmed === "new-milestone") {
+        if (requireNotAutoActive("/gsd new-milestone", ctx))
+            return true;
         const basePath = projectRoot();
         const headlessContextPath = join(gsdRoot(basePath), "runtime", "headless-context.md");
         if (existsSync(headlessContextPath)) {
@@ -452,6 +475,8 @@ export async function handleWorkflowCommand(trimmed, ctx, pi) {
         return true;
     }
     if (trimmed === "park" || trimmed.startsWith("park ")) {
+        if (requireNotAutoActive("/gsd park", ctx))
+            return true;
         const basePath = projectRoot();
         const arg = trimmed.replace(/^park\s*/, "").trim();
         let targetId = arg;
@@ -474,6 +499,8 @@ export async function handleWorkflowCommand(trimmed, ctx, pi) {
         return true;
     }
     if (trimmed === "unpark" || trimmed.startsWith("unpark ")) {
+        if (requireNotAutoActive("/gsd unpark", ctx))
+            return true;
         const basePath = projectRoot();
         const arg = trimmed.replace(/^unpark\s*/, "").trim();
         let targetId = arg;

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

@@ -1,5 +1,4 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { clearCmuxSidebar, CmuxClient, detectCmuxEnvironment, resolveCmuxConfig } from "../cmux/index.js";
 import { saveFile } from "./files.js";
 import { getProjectGSDPreferencesPath, loadEffectiveGSDPreferences, loadProjectGSDPreferences, } from "./preferences.js";
 import { ensurePreferencesFile, serializePreferencesToFrontmatter } from "./commands-prefs-wizard.js";
@@ -63,7 +62,8 @@ async function writeProjectCmuxPreferences(ctx, updater) {
 function resolveProjectPreferencesWritePath() {
     return loadProjectGSDPreferences()?.path ?? getProjectGSDPreferencesPath();
 }
-function formatCmuxStatus() {
+async function formatCmuxStatus() {
+    const { CmuxClient, detectCmuxEnvironment, resolveCmuxConfig } = await import("../cmux/index.js");
     const loaded = loadEffectiveGSDPreferences();
     const detected = detectCmuxEnvironment();
     const resolved = resolveCmuxConfig(loaded?.preferences);
@@ -87,7 +87,8 @@ function formatCmuxStatus() {
         `Capabilities: access=${accessMode}, methods=${methods}`,
     ].join("\n");
 }
-function ensureCmuxAvailableForEnable(ctx) {
+async function ensureCmuxAvailableForEnable(ctx) {
+    const { detectCmuxEnvironment } = await import("../cmux/index.js");
     const detected = detectCmuxEnvironment();
     if (detected.available)
         return true;
@@ -97,11 +98,11 @@ function ensureCmuxAvailableForEnable(ctx) {
 export async function handleCmux(args, ctx) {
     const trimmed = args.trim();
     if (!trimmed || trimmed === "status") {
-        ctx.ui.notify(formatCmuxStatus(), "info");
+        ctx.ui.notify(await formatCmuxStatus(), "info");
         return;
     }
     if (trimmed === "on") {
-        if (!ensureCmuxAvailableForEnable(ctx))
+        if (!await ensureCmuxAvailableForEnable(ctx))
             return;
         await writeProjectCmuxPreferences(ctx, (prefs) => {
             prefs.cmux = {
@@ -122,6 +123,7 @@ export async function handleCmux(args, ctx) {
         await writeProjectCmuxPreferences(ctx, (prefs) => {
             prefs.cmux = { ...(prefs.cmux ?? {}), enabled: false };
         });
+        const { clearCmuxSidebar } = await import("../cmux/index.js");
         clearCmuxSidebar(effective);
         ctx.ui.notify("cmux integration disabled in project preferences.", "info");
         return;
@@ -130,7 +132,7 @@ export async function handleCmux(args, ctx) {
     if (parts.length === 2 && ["notifications", "sidebar", "splits", "browser"].includes(parts[0]) && ["on", "off"].includes(parts[1])) {
         const feature = parts[0];
         const enabled = parts[1] === "on";
-        if (enabled && !ensureCmuxAvailableForEnable(ctx))
+        if (enabled && !await ensureCmuxAvailableForEnable(ctx))
             return;
         await writeProjectCmuxPreferences(ctx, (prefs) => {
             const next = { ...(prefs.cmux ?? {}) };
@@ -140,6 +142,7 @@ export async function handleCmux(args, ctx) {
             prefs.cmux = next;
         });
         if (!enabled && feature === "sidebar") {
+            const { clearCmuxSidebar } = await import("../cmux/index.js");
             clearCmuxSidebar(loadEffectiveGSDPreferences()?.preferences);
         }
         const note = feature === "browser" && enabled