gsd-pi 2.75.0 → 2.76.0-dev.82e249f7b

package/dist/resources/extensions/gsd/native-git-bridge.js

@@ -5,6 +5,8 @@
 // Both READ and WRITE operations are native — push operations remain as
 // execSync calls because git2 credential handling is too complex.
 import { execFileSync } from "node:child_process";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
 import { GSDError, GSD_GIT_ERROR } from "./errors.js";
 import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
 import { getErrorMessage } from "./error-utils.js";
@@ -534,6 +536,136 @@ export function nativeAddAll(basePath) {
 export function nativeAddTracked(basePath) {
     gitFileExec(basePath, ["add", "-u"]);
 }
+function isDotGsdIgnored(basePath) {
+    for (const path of [".gsd", ".gsd/"]) {
+        try {
+            execFileSync("git", ["check-ignore", "-q", path], {
+                cwd: basePath,
+                stdio: "pipe",
+                env: GIT_NO_PROMPT_ENV,
+            });
+            return true;
+        }
+        catch {
+            // exit 1 means this form is not ignored; try the next variant
+        }
+    }
+    return false;
+}
+/**
+ * Determine whether the project opts out of GSD-managed `.gitignore` via
+ * `git.manage_gitignore: false` in `.gsd/PREFERENCES.md`. Uses a minimal
+ * inline parser to avoid importing the full preferences module (which would
+ * introduce a circular dependency back into this low-level bridge).
+ *
+ * Returns true when management is disabled. Any parse failure or missing
+ * file returns false (default: GSD may manage `.gitignore`).
+ */
+function isGitignoreManagementDisabled(basePath) {
+    const prefsPath = join(basePath, ".gsd", "PREFERENCES.md");
+    if (!existsSync(prefsPath))
+        return false;
+    try {
+        const content = readFileSync(prefsPath, "utf-8");
+        // Look for `manage_gitignore: false` under a `git:` block. The preference
+        // is indented; a loose regex is sufficient since we only care about the
+        // explicit opt-out case.
+        return /^\s*manage_gitignore\s*:\s*false\s*$/m.test(content);
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Self-heal path for the symlinked-`.gsd` staging failure: append `.gsd` to
+ * `.gitignore` so subsequent `git add -A` calls succeed without the symlink
+ * pathspec error. Honors the `git.manage_gitignore: false` opt-out.
+ *
+ * Returns true when `.gitignore` now contains an entry covering `.gsd`
+ * (either pre-existing or newly appended). Returns false when the opt-out
+ * is set or the write fails.
+ */
+function trySelfHealGsdGitignore(basePath) {
+    if (isGitignoreManagementDisabled(basePath))
+        return false;
+    const gitignorePath = join(basePath, ".gitignore");
+    try {
+        const existing = existsSync(gitignorePath) ? readFileSync(gitignorePath, "utf-8") : "";
+        const lines = new Set(existing.split("\n").map(l => l.trim()).filter(l => l && !l.startsWith("#")));
+        if (lines.has(".gsd") || lines.has(".gsd/"))
+            return true;
+        const prefix = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
+        const block = `${prefix}\n# ── GSD self-heal: .gsd is a symlink to external state ──\n.gsd\n`;
+        writeFileSync(gitignorePath, existing + block, "utf-8");
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Stage untracked files individually while skipping anything under `.gsd`.
+ * Used as a last-resort when `.gsd` is a symlink, not gitignored, and
+ * `git.manage_gitignore: false` forbids the self-heal path. Protects user
+ * work by never silently dropping new real files.
+ */
+function stageUntrackedExcludingDotGsd(basePath) {
+    // Stage tracked modifications first. `git add -u` never fails on pathspec
+    // issues because it doesn't walk untracked trees.
+    gitFileExec(basePath, ["add", "-u"]);
+    // Enumerate untracked paths via porcelain output. `?? ` prefix marks
+    // untracked files (status respects `.gitignore`).
+    const status = gitFileExec(basePath, ["status", "--porcelain=v1", "-z"], true);
+    if (!status)
+        return;
+    const untracked = [];
+    for (const entry of status.split("\0")) {
+        if (!entry)
+            continue;
+        // Porcelain format: "XY path" where XY is the 2-char status code.
+        if (entry.length < 4)
+            continue;
+        const code = entry.slice(0, 2);
+        const path = entry.slice(3);
+        if (code !== "??")
+            continue;
+        // Skip GSD runtime artifacts. Under `manage_gitignore: false` the user
+        // may not have these in `.gitignore`, so we filter explicitly to avoid
+        // committing transient state (.gsd external link, migration lock,
+        // background shell scratch dir).
+        if (path === ".gsd" || path.startsWith(".gsd/"))
+            continue;
+        if (path === ".gsd-id" || path === ".gsd.migrating")
+            continue;
+        if (path === ".bg-shell" || path.startsWith(".bg-shell/"))
+            continue;
+        untracked.push(path);
+    }
+    if (untracked.length === 0)
+        return;
+    // Stage in chunks to avoid exceeding ARG_MAX on large change sets.
+    const CHUNK = 200;
+    for (let i = 0; i < untracked.length; i += CHUNK) {
+        gitFileExec(basePath, ["add", "--", ...untracked.slice(i, i + CHUNK)]);
+    }
+}
+/**
+ * Handle `nativeAddAllWithExclusions` failing with "beyond a symbolic link"
+ * when `.gsd` is a symlink. Self-heals by adding `.gsd` to `.gitignore`, or
+ * falls back to explicit per-file staging so user work is never dropped.
+ */
+function fallbackStageWithSymlinkedDotGsd(basePath) {
+    if (isDotGsdIgnored(basePath)) {
+        gitFileExec(basePath, ["add", "-A"]);
+        return;
+    }
+    if (trySelfHealGsdGitignore(basePath)) {
+        gitFileExec(basePath, ["add", "-A"]);
+        return;
+    }
+    // `manage_gitignore: false` — protect work by staging files explicitly.
+    stageUntrackedExcludingDotGsd(basePath);
+}
 /**
  * Stage all files with pathspec exclusions (git add -A -- ':!pattern' ...).
  * Excluded paths are never hashed by git, preventing hangs on large
@@ -569,12 +701,12 @@ export function nativeAddAllWithExclusions(basePath, exclusions) {
             return;
         }
         // When .gsd is a symlink, git rejects `:!.gsd/...` pathspecs with
-        // "beyond a symbolic link". Fall back to `git add -u` which only
-        // stages changes to already-tracked files — O(tracked) not O(filesystem).
-        // Using `git add -A` here would traverse the entire working tree,
-        // hanging indefinitely on repos with large untracked data dirs. (#1977)
+        // "beyond a symbolic link". Hand off to the self-heal fallback which
+        // either adds `.gsd` to `.gitignore` and retries `git add -A`, or stages
+        // real files explicitly when `git.manage_gitignore: false` forbids the
+        // self-heal path. Either way, user work is protected from silent drops.
         if (stderr.includes("beyond a symbolic link")) {
-            gitFileExec(basePath, ["add", "-u"]);
+            fallbackStageWithSymlinkedDotGsd(basePath);
             return;
         }
         throw new GSDError(GSD_GIT_ERROR, `git add -A with exclusions failed in ${basePath}: ${getErrorMessage(err)}`);

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

@@ -1,7 +1,7 @@
 // GSD Extension — Notification History Overlay
 // Scrollable panel showing all persisted notifications with severity filtering.
 // Toggled with Ctrl+Alt+N (⌃⌥N on macOS), Ctrl+Shift+N fallback, or /gsd notifications.
-import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
+import { truncateToWidth, visibleWidth, wrapTextWithAnsi, matchesKey, Key } from "@gsd/pi-tui";
 import { readNotifications, markAllRead, clearNotifications, onNotificationStoreChange, } from "./notification-store.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
 import { padRight, joinColumns } from "../shared/mod.js";
@@ -15,29 +15,14 @@ function severityIcon(severity) {
         default: return "●";
     }
 }
-/** Word-wrap plain text to fit within maxWidth columns. */
+/** Column-aware word wrap using pi-tui's native wrapper (handles unicode/ANSI). */
 function wrapText(text, maxWidth) {
-    if (text.length <= maxWidth)
+    if (maxWidth <= 0)
         return [text];
-    const words = text.split(/\s+/);
-    const lines = [];
-    let current = "";
-    for (const word of words) {
-        if (current.length === 0) {
-            current = word;
-        }
-        else if (current.length + 1 + word.length <= maxWidth) {
-            current += " " + word;
-        }
-        else {
-            lines.push(current);
-            current = word;
-        }
-    }
-    if (current.length > 0)
-        lines.push(current);
-    // If a single word exceeds maxWidth, truncate it
-    return lines.map((l) => l.length > maxWidth ? l.slice(0, maxWidth - 1) + "…" : l);
+    const lines = wrapTextWithAnsi(text, maxWidth);
+    // Safety clamp: if any line still exceeds maxWidth (e.g. unbreakable long token),
+    // truncate it with an ellipsis so it cannot bleed past the box border.
+    return lines.map((l) => visibleWidth(l) > maxWidth ? truncateToWidth(l, maxWidth, "…") : l);
 }
 function formatTimestamp(ts) {
     try {

package/dist/resources/extensions/gsd/notification-widget.js

@@ -1,49 +1,34 @@
-// GSD Extension — Notification Widget
-// Always-on ambient widget rendered belowEditor showing unread count and
-// the most recent notification message. Refreshes every 30 seconds.
-// Widget key: "gsd-notifications", placement: "belowEditor"
+// GSD Extension — Notification Status
+// Always-on ambient notification chip surfaced as an extension status on the
+// footer pwd row. Refreshes on store change + on a 30s timer. Hidden when
+// unread=0. Key sorts late so the chip renders to the right of other
+// extension statuses.
 import { getUnreadCount, onNotificationStoreChange } from "./notification-store.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
-// ─── Pure rendering ──���────────────────────────���─────────────────────────
-export function buildNotificationWidgetLines() {
+// Key chosen to sort after alphabetic extension keys so the chip lands on the
+// far right of the extension-status block.
+const STATUS_KEY = "zz-notifications";
+export function buildNotificationChip() {
     const unread = getUnreadCount();
     if (unread === 0)
-        return [];
-    return [`  🔔 Notifications: ${unread} unread  (${formattedShortcutPair("notifications")})`];
+        return "";
+    return `🔔 ${unread} unread (${formattedShortcutPair("notifications")})`;
+}
+// Retained for backwards compatibility with tests and the RPC fallback path
+// that still expected a line-array widget. Returns empty when no unread.
+export function buildNotificationWidgetLines() {
+    const chip = buildNotificationChip();
+    return chip ? [`  ${chip}`] : [];
 }
-// ─── Widget init ────────────────────────────────────────────────────────
 const REFRESH_INTERVAL_MS = 30_000;
-/**
- * Initialize the always-on notification widget (belowEditor).
- * Call once from session_start after the notification store is initialized.
- */
 export function initNotificationWidget(ctx) {
     if (!ctx.hasUI)
         return;
-    // String-array fallback for RPC mode
-    ctx.ui.setWidget("gsd-notifications", buildNotificationWidgetLines(), { placement: "belowEditor" });
-    // Factory-based widget for TUI mode
-    ctx.ui.setWidget("gsd-notifications", (_tui, _theme) => {
-        let cachedLines;
-        const refresh = () => {
-            cachedLines = undefined;
-            _tui.requestRender();
-        };
-        const unsubscribe = onNotificationStoreChange(refresh);
-        const refreshTimer = setInterval(refresh, REFRESH_INTERVAL_MS);
-        return {
-            render(_width) {
-                if (!cachedLines)
-                    cachedLines = buildNotificationWidgetLines();
-                return cachedLines;
-            },
-            invalidate() {
-                cachedLines = undefined;
-            },
-            dispose() {
-                unsubscribe();
-                clearInterval(refreshTimer);
-            },
-        };
-    }, { placement: "belowEditor" });
+    const push = () => {
+        const chip = buildNotificationChip();
+        ctx.ui.setStatus(STATUS_KEY, chip.length > 0 ? chip : undefined);
+    };
+    push();
+    onNotificationStoreChange(push);
+    setInterval(push, REFRESH_INTERVAL_MS).unref?.();
 }

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

@@ -3,6 +3,7 @@
 import { execFileSync } from "node:child_process";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { CmuxClient, emitOsc777Notification, resolveCmuxConfig } from "../cmux/index.js";
+import { sendRemoteNotification } from "../remote-questions/notify.js";
 /**
  * Send a native desktop notification. Non-blocking, non-fatal.
  * macOS: osascript, Linux: notify-send, Windows: skipped.
@@ -14,6 +15,9 @@ export function sendDesktopNotification(title, message, level = "info", kind = "
         title = formatNotificationTitle(projectName);
     }
     const loaded = loadEffectiveGSDPreferences()?.preferences;
+    // Remote notifications fire independently of desktop preferences.
+    // sendRemoteNotification handles "not configured" gracefully (early return).
+    void sendRemoteNotification(title, message).catch(() => { });
     if (!shouldSendDesktopNotification(kind, loaded?.notifications))
         return;
     const cmux = resolveCmuxConfig(loaded);

package/dist/resources/extensions/gsd/onboarding-state.js

@@ -0,0 +1,133 @@
+// GSD — Onboarding completion record (~/.gsd/agent/onboarding.json)
+//
+// First-class state for the onboarding wizard so re-entry, resume, and the
+// web boot probe all read the same source of truth. Replaces the implicit
+// "settings.defaultProvider exists" heuristic.
+import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { logWarning } from "./workflow-logger.js";
+/**
+ * Bump `FLOW_VERSION` whenever a new required step is added to ONBOARDING_STEPS.
+ * Records with an older flowVersion are treated as "needs partial re-onboarding"
+ * by isOnboardingComplete().
+ */
+export const FLOW_VERSION = 1;
+const RECORD_VERSION = 1;
+// Inline agentDir computation (mirrors src/app-paths.ts) — keep this module
+// rootDir-clean for the resources tsconfig; importing from src/ pulls files
+// outside src/resources and breaks the build.
+const AGENT_DIR = process.env.GSD_CODING_AGENT_DIR ||
+    join(process.env.GSD_HOME || join(homedir(), ".gsd"), "agent");
+const FILE = join(AGENT_DIR, "onboarding.json");
+const DEFAULT = {
+    version: RECORD_VERSION,
+    flowVersion: FLOW_VERSION,
+    completedAt: null,
+    completedSteps: [],
+    skippedSteps: [],
+    lastResumePoint: null,
+};
+export function readOnboardingRecord() {
+    if (!existsSync(FILE))
+        return { ...DEFAULT };
+    try {
+        const raw = JSON.parse(readFileSync(FILE, "utf-8"));
+        return {
+            version: typeof raw.version === "number" ? raw.version : RECORD_VERSION,
+            flowVersion: typeof raw.flowVersion === "number" ? raw.flowVersion : 0,
+            completedAt: typeof raw.completedAt === "string" ? raw.completedAt : null,
+            completedSteps: Array.isArray(raw.completedSteps) ? raw.completedSteps.filter(s => typeof s === "string") : [],
+            skippedSteps: Array.isArray(raw.skippedSteps) ? raw.skippedSteps.filter(s => typeof s === "string") : [],
+            lastResumePoint: typeof raw.lastResumePoint === "string" ? raw.lastResumePoint : null,
+        };
+    }
+    catch {
+        // Corrupt/unreadable — fall back to defaults rather than crashing onboarding flow
+        return { ...DEFAULT };
+    }
+}
+function atomicWrite(record) {
+    mkdirSync(dirname(FILE), { recursive: true });
+    const tmp = `${FILE}.tmp.${process.pid}.${Date.now()}`;
+    try {
+        writeFileSync(tmp, JSON.stringify(record, null, 2), "utf-8");
+        renameSync(tmp, FILE);
+    }
+    catch (err) {
+        // Best-effort: drop the tmp file if the rename failed (don't leak stale tmps)
+        try {
+            if (existsSync(tmp))
+                unlinkSync(tmp);
+        }
+        catch { /* swallow secondary error */ }
+        throw err;
+    }
+}
+export function writeOnboardingRecord(patch) {
+    const current = readOnboardingRecord();
+    const next = {
+        ...current,
+        ...patch,
+        version: RECORD_VERSION,
+        // flowVersion is sticky on writes unless explicitly patched
+        flowVersion: typeof patch.flowVersion === "number" ? patch.flowVersion : current.flowVersion,
+    };
+    try {
+        atomicWrite(next);
+    }
+    catch (err) {
+        // Non-fatal for the wizard, but make the failure diagnosable. The next boot
+        // will re-prompt for onboarding because the record didn't persist; the
+        // logWarning entry tells the user why.
+        logWarning("state", `Failed to persist onboarding record: ${err instanceof Error ? err.message : String(err)}`, {
+            file: FILE,
+        });
+    }
+    return next;
+}
+/**
+ * Onboarding is "complete" when there's a completedAt timestamp AND the
+ * flowVersion matches the current FLOW_VERSION. A flowVersion bump means
+ * a new required step exists and the user should re-enter to configure it.
+ */
+export function isOnboardingComplete() {
+    const r = readOnboardingRecord();
+    return r.completedAt !== null && r.flowVersion === FLOW_VERSION;
+}
+export function markStepCompleted(stepId) {
+    const r = readOnboardingRecord();
+    if (r.completedSteps.includes(stepId)) {
+        writeOnboardingRecord({ lastResumePoint: stepId });
+        return;
+    }
+    writeOnboardingRecord({
+        completedSteps: [...r.completedSteps, stepId],
+        skippedSteps: r.skippedSteps.filter(s => s !== stepId),
+        lastResumePoint: stepId,
+    });
+}
+export function markStepSkipped(stepId) {
+    const r = readOnboardingRecord();
+    if (r.skippedSteps.includes(stepId) || r.completedSteps.includes(stepId))
+        return;
+    writeOnboardingRecord({
+        skippedSteps: [...r.skippedSteps, stepId],
+        lastResumePoint: stepId,
+    });
+}
+export function markOnboardingComplete(completedSteps) {
+    writeOnboardingRecord({
+        completedAt: new Date().toISOString(),
+        flowVersion: FLOW_VERSION,
+        completedSteps,
+    });
+}
+export function resetOnboarding() {
+    writeOnboardingRecord({
+        completedAt: null,
+        completedSteps: [],
+        skippedSteps: [],
+        lastResumePoint: null,
+    });
+}

package/dist/resources/extensions/gsd/post-execution-checks.js

@@ -75,12 +75,36 @@ export function extractRelativeImports(source) {
 }
 /**
  * Check if a relative import resolves to an existing file.
- * Handles .ts, .tsx, .js, .jsx extensions and index files.
- * Also handles TypeScript ESM convention where imports use .js but resolve to .ts.
+ * Resolution order:
+ *   1. Imports carrying an explicit extension are checked as-is (handles assets
+ *      like .css/.scss/images/fonts and .json, not just code extensions).
+ *   2. TypeScript ESM convention where .js imports resolve to .ts files.
+ *   3. Extensionless imports resolved against .ts/.tsx/.js/.jsx/.mjs/.cjs.
+ *   4. Directory imports resolved against index.{ts,tsx,js,jsx,mjs,cjs}.
  */
 export function resolveImportPath(importPath, sourceFile, basePath) {
     const sourceDir = dirname(resolve(basePath, sourceFile));
     const extensions = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
+    // If the import already has an explicit extension, check it as-is first.
+    // This correctly resolves asset imports like .css, .scss, images, fonts
+    // without requiring each extension to be enumerated (issue #4411). We only
+    // do this when the import carries an extension so that extensionless module
+    // imports still flow through the TS ESM convention and index-file resolvers.
+    const explicitExt = extname(importPath);
+    if (explicitExt !== "") {
+        const directPath = resolve(sourceDir, importPath);
+        if (existsSync(directPath)) {
+            return { exists: true, resolvedPath: directPath };
+        }
+        // Only .js/.jsx/.mjs/.cjs imports legitimately fall through for the TS
+        // ESM convention (.js → .ts). Any other explicit extension (.css, .json,
+        // .svg, images, fonts, .ts, .tsx, …) must stay unresolved when the direct
+        // path is missing — otherwise a stray `./missing.css.ts` could shadow a
+        // genuinely missing `./missing.css` import.
+        if (![".js", ".jsx", ".mjs", ".cjs"].includes(explicitExt)) {
+            return { exists: false, resolvedPath: null };
+        }
+    }
     // Handle TypeScript ESM convention: .js imports resolve to .ts files
     // e.g., import './types.js' -> ./types.ts
     let normalizedPath = importPath;
@@ -96,7 +120,7 @@ export function resolveImportPath(importPath, sourceFile, basePath) {
     else if (importPath.endsWith(".cjs")) {
         normalizedPath = importPath.slice(0, -4);
     }
-    // Try the normalized path with common extensions first
+    // Try the normalized path with common extensions
     for (const ext of extensions) {
         const fullPath = resolve(sourceDir, normalizedPath + ext);
         if (existsSync(fullPath)) {
@@ -110,14 +134,6 @@ export function resolveImportPath(importPath, sourceFile, basePath) {
             return { exists: true, resolvedPath: indexPath };
         }
     }
-    // Check if path already has extension (for .json, etc.)
-    const hasExt = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".json"].some((ext) => importPath.endsWith(ext));
-    if (hasExt) {
-        const fullPath = resolve(sourceDir, importPath);
-        if (existsSync(fullPath)) {
-            return { exists: true, resolvedPath: fullPath };
-        }
-    }
     return { exists: false, resolvedPath: null };
 }
 /**