@opengsd/gsd-pi 1.2.0 → 1.3.0-dev.65546769

package/dist/resource-loader.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import { homedir } from 'node:os';
 import { chmodSync, copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync, readdirSync, rmSync, symlinkSync, unlinkSync, writeFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
 import { basename, dirname, join, relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { compareSemver } from './update-check.js';
@@ -24,6 +25,10 @@ const resourcesDir = resolveBundledResourcesDirFromPackageRoot(packageRoot);
 const bundledExtensionsDir = join(resourcesDir, 'extensions');
 const resourceVersionManifestName = 'managed-resources.json';
 const resourceFingerprintFileName = '.managed-resources-content-hash';
+const gsdBrowserSkillName = 'gsd-browser';
+const requireFromResourceLoader = createRequire(import.meta.url);
+const gsdBrowserSkillReferenceDirs = ['docs', 'scripts', 'gsd-browser-skill'];
+let gsdBrowserPackageSkillPathForTests;
 export { discoverExtensionEntryPaths } from './extension-discovery.js';
 export function getExtensionKey(entryPath, extensionsDir) {
     const relPath = relative(extensionsDir, entryPath);
@@ -153,6 +158,111 @@ function getCurrentResourceFingerprint() {
     }
     return computeResourceFingerprint();
 }
+function resolveGsdBrowserPackageSkillPath() {
+    if (gsdBrowserPackageSkillPathForTests !== undefined) {
+        return gsdBrowserPackageSkillPathForTests;
+    }
+    try {
+        return requireFromResourceLoader.resolve('@opengsd/gsd-browser/SKILL.md');
+    }
+    catch {
+        return null;
+    }
+}
+export function setGsdBrowserPackageSkillPathForTests(skillPath) {
+    gsdBrowserPackageSkillPathForTests = skillPath;
+}
+export function collectGsdBrowserPackageSkillReferences(content) {
+    const refs = new Set();
+    const referencePattern = /`((?:\.\/)?(?:docs|scripts|gsd-browser-skill)\/[^`\s]+)`/g;
+    for (const match of content.matchAll(referencePattern)) {
+        const ref = normalizeGsdBrowserPackageSkillReference(match[1]);
+        if (ref)
+            refs.add(ref);
+    }
+    return [...refs].sort();
+}
+function normalizeGsdBrowserPackageSkillReference(ref) {
+    if (!ref)
+        return null;
+    const normalized = ref
+        .replace(/^\.\//, '')
+        .replace(/[),.;:]+$/, '');
+    if (normalized.includes('..') || normalized.startsWith('/'))
+        return null;
+    if (!gsdBrowserSkillReferenceDirs.some(dir => normalized === dir || normalized.startsWith(`${dir}/`))) {
+        return null;
+    }
+    return normalized;
+}
+function readGsdBrowserPackageSkillBundle(sourceSkillPath) {
+    const skillContent = readFileSync(sourceSkillPath);
+    const files = new Map([['SKILL.md', skillContent]]);
+    const supportRefs = collectGsdBrowserPackageSkillReferences(skillContent.toString('utf-8'));
+    const sourceDir = dirname(sourceSkillPath);
+    for (const relPath of supportRefs) {
+        const sourcePath = join(sourceDir, relPath);
+        if (existsSync(sourcePath)) {
+            files.set(relPath, readFileSync(sourcePath));
+        }
+    }
+    return files;
+}
+export function hasStaleGsdBrowserPackageSkill(skillsDir) {
+    const targetDir = join(skillsDir, gsdBrowserSkillName);
+    const sourceSkillPath = resolveGsdBrowserPackageSkillPath();
+    // Package unresolvable. syncGsdBrowserPackageSkill is a no-op in this case
+    // (it preserves any existing managed skill), so reporting "stale" here
+    // would drive a full resource resync on every launch that the sync cannot
+    // actually satisfy. Keep the existing managed skill in place until the
+    // package becomes resolvable again or the manifest fingerprint changes.
+    if (!sourceSkillPath)
+        return false;
+    try {
+        const sourceDir = dirname(sourceSkillPath);
+        const skillContent = readFileSync(sourceSkillPath, 'utf-8');
+        for (const [relPath, content] of readGsdBrowserPackageSkillBundle(sourceSkillPath)) {
+            const targetPath = join(targetDir, relPath);
+            if (!existsSync(targetPath) || !readFileSync(targetPath).equals(content)) {
+                return true;
+            }
+        }
+        // Only flag SKILL.md references when sync can actually correct them.
+        // The bundle loop above already covers "source has it, target missing".
+        // A reference the package itself does not ship (source missing) is only
+        // worth a resync if the target still has a stale copy that sync should
+        // clean up; missing on both sides is the steady state when upstream
+        // omits files referenced from SKILL.md and is not actionable here.
+        for (const relPath of collectGsdBrowserPackageSkillReferences(skillContent)) {
+            const sourcePath = join(sourceDir, relPath);
+            const targetPath = join(targetDir, relPath);
+            if (!existsSync(sourcePath) && existsSync(targetPath)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    catch {
+        return true;
+    }
+}
+function syncGsdBrowserPackageSkill(skillsDir) {
+    const targetDir = join(skillsDir, gsdBrowserSkillName);
+    const sourceSkillPath = resolveGsdBrowserPackageSkillPath();
+    if (!sourceSkillPath)
+        return;
+    makeTreeWritable(targetDir);
+    rmSync(targetDir, { recursive: true, force: true });
+    for (const [relPath, content] of readGsdBrowserPackageSkillBundle(sourceSkillPath)) {
+        const targetPath = join(targetDir, relPath);
+        mkdirSync(dirname(targetPath), { recursive: true });
+        writeFileSync(targetPath, content);
+        if (relPath.startsWith('scripts/') && relPath.endsWith('.sh')) {
+            chmodSync(targetPath, 0o755);
+        }
+    }
+    makeTreeWritable(targetDir);
+}
 function collectFileEntries(dir, root, out) {
     if (!existsSync(dir))
         return;
@@ -557,18 +667,20 @@ function pruneRemovedBundledExtensions(manifest, agentDir) {
     removeFileIfStale('env-utils.js');
 }
 /**
- * Syncs all bundled resources to agentDir (~/.gsd/agent/) on every launch.
+ * Initializes managed resources under agentDir (~/.gsd/agent/).
  *
  * - extensions/ → ~/.gsd/agent/extensions/   (overwrite when version changes)
  * - shared/     → ~/.gsd/agent/shared/       (overwrite when version changes)
  * - agents/     → ~/.gsd/agent/agents/        (overwrite when version changes)
  * - skills/     → ~/.gsd/agent/skills/        (overwrite when version changes)
+ * - gsd-browser skill → ~/.gsd/agent/skills/gsd-browser/ from @opengsd/gsd-browser
  * - GSD-WORKFLOW.md → ~/.gsd/agent/GSD-WORKFLOW.md (fallback for env var miss)
  *
- * Skips the copy when the managed-resources.json version matches the current
- * GSD version, avoiding ~128ms of synchronous cpSync on every startup.
- * After `npm update -g @glittercowboy/gsd`, versions will differ and the
- * copy runs once to land the new resources.
+ * Skips the full copy when the managed-resources.json version and content
+ * fingerprint match the current install, avoiding ~128ms of synchronous cpSync
+ * on steady-state startup.
+ * After `npm update -g @opengsd/gsd-pi`, versions will differ and the copy
+ * runs once to land the new resources.
  *
  * Inspectable: `ls ~/.gsd/agent/extensions/`
  */
@@ -600,14 +712,7 @@ export function initResources(agentDir, skillsDir = join(agentDir, 'skills')) {
     if (manifest && isCurrentPackageManifest(manifest) && manifest.gsdVersion === currentVersion) {
         // Version matches — check content fingerprint for same-version staleness.
         const currentHash = getCurrentResourceFingerprint();
-        const hasStaleExtensionFiles = hasStaleCompiledExtensionSiblings(extensionsDir, bundledExtensionsDir);
-        const hasMissingSharedFiles = hasMissingBundledResourceFiles(join(agentDir, 'shared'), join(resourcesDir, 'shared'));
-        const hasMissingSkillFiles = hasMissingBundledResourceFiles(skillsDir, join(resourcesDir, 'skills'));
-        if (manifest.contentHash &&
-            manifest.contentHash === currentHash &&
-            !hasStaleExtensionFiles &&
-            !hasMissingSharedFiles &&
-            !hasMissingSkillFiles) {
+        if (manifest.contentHash && manifest.contentHash === currentHash) {
             return;
         }
     }
@@ -616,6 +721,7 @@ export function initResources(agentDir, skillsDir = join(agentDir, 'skills')) {
     syncResourceDir(join(resourcesDir, 'shared'), join(agentDir, 'shared'));
     syncResourceDir(join(resourcesDir, 'agents'), join(agentDir, 'agents'));
     syncResourceDir(join(resourcesDir, 'skills'), skillsDir);
+    syncGsdBrowserPackageSkill(skillsDir);
     // Sync GSD-WORKFLOW.md to agentDir as a fallback for when GSD_WORKFLOW_PATH
     // env var is not set (e.g. fork/dev builds, alternative entry points).
     const workflowSrc = join(resourcesDir, 'GSD-WORKFLOW.md');
@@ -701,9 +807,8 @@ function collectRelativeFiles(rootDir) {
     return files;
 }
 /**
- * Constructs a DefaultResourceLoader that loads extensions from both
- * ~/.gsd/agent/extensions/ (GSD's default) and ~/.pi/agent/extensions/ (pi's default).
- * This allows users to use extensions from either location.
+ * Constructs a DefaultResourceLoader that loads extensions from
+ * ~/.gsd/agent/extensions/ (GSD's default) only.
  */
 // Cache bundled extension keys at module load — avoids re-scanning the extensions
 // directory in buildResourceLoader() (already scanned by loader.ts for env var).
@@ -718,19 +823,8 @@ export async function buildResourceLoader(agentDir, options = {}) {
     const { DefaultResourceLoader } = await loadPiCodingAgentModule();
     const { sortExtensionPaths } = await import('./extension-sort.js');
     const registry = loadRegistry();
-    const piAgentDir = join(homedir(), '.pi', 'agent');
-    const piExtensionsDir = join(piAgentDir, 'extensions');
     const bundledKeys = getBundledExtensionKeys();
-    const piExtensionPaths = discoverExtensionEntryPaths(piExtensionsDir)
-        .filter((entryPath) => !bundledKeys.has(getExtensionKey(entryPath, piExtensionsDir)))
-        .filter((entryPath) => {
-        const manifest = readManifestFromEntryPath(entryPath);
-        if (!manifest)
-            return true;
-        return isExtensionEnabled(registry, manifest.id);
-    });
     const additionalExtensionPaths = [
-        ...piExtensionPaths,
         ...(options.additionalExtensionPaths ?? []),
     ];
     return new DefaultResourceLoader({

package/dist/resources/.managed-resources-content-hash

@@ -1 +1 @@
-e556831e22b85907
+0b507856bc29955a

package/dist/resources/GSD-WORKFLOW.md

@@ -5,7 +5,7 @@
 > **When to read this:** At the start of any session working on GSD-managed work, or when loaded by `/gsd`.
 >
 > **After reading this, always read `.gsd/STATE.md` to find out what's next.**
-> If the milestone has a `M###-CONTEXT.md`, read that too. If the active slice has an `S##-CONTEXT.md`, read that as well — these files contain project-specific decisions, reference paths, and implementation guidance that this generic methodology doc does not.
+> If the milestone has a `CONTEXT.md`, read that too. If the active slice has an `S##-CONTEXT.md`, read that as well — these files contain project-specific decisions, reference paths, and implementation guidance that this generic methodology doc does not.
 
 ---
 
@@ -14,8 +14,8 @@
 Read these files in order and act on what they say:
 
 1. **`.gsd/STATE.md`** — Where are we? What's the next action?
-2. **`.gsd/milestones/<active>/M###-ROADMAP.md`** — What's the plan? Which slices are done? (`STATE.md` tells you which milestone is active)
-3. **`.gsd/milestones/<active>/M###-CONTEXT.md`** — Milestone-level project decisions, reference paths, constraints. Read this before doing implementation work.
+2. **`.gsd/phases/<active>/ROADMAP.md`** — What's the plan? Which slices are done? (`STATE.md` tells you which milestone is active)
+3. **`.gsd/phases/<active>/CONTEXT.md`** — Milestone-level project decisions, reference paths, constraints. Read this before doing implementation work.
 4. If a slice is active and has one, read **`S##-CONTEXT.md`** — Slice-specific decisions and constraints.
 5. If a slice is active, read its **`S##-PLAN.md`** — Which tasks exist? Which are done?
 6. If `.gsd/CODEBASE.md` exists, skim it for fast structural orientation before broad code exploration.
@@ -46,7 +46,7 @@ All artifacts live in `.gsd/` at the project root:
   STATE.md                                  # Dashboard — always read first (derived cache; runtime, gitignored)
   DECISIONS.md                              # Append-only decisions register
   CODEBASE.md                               # Generated codebase map cache (auto-refreshed by GSD)
-  milestones/
+  phases/
     M001/
       M001-ROADMAP.md                       # Milestone plan (checkboxes = state)
       M001-CONTEXT.md                       # Optional: user decisions from discuss phase
@@ -69,7 +69,7 @@ All artifacts live in `.gsd/` at the project root:
 
 ## File Format Reference
 
-### `M###-ROADMAP.md`
+### `ROADMAP.md`
 
 ```markdown
 # M001: Title of the Milestone
@@ -96,7 +96,7 @@ All artifacts live in `.gsd/` at the project root:
 
 **Parsing rules:** `- [x]` = done, `- [ ]` = not done. The `risk:` and `depends:[]` tags are inline metadata parsed from the line. `depends:[]` lists slice IDs this slice requires to be complete first.
 
-**Boundary Map** (required section in M###-ROADMAP.md):
+**Boundary Map** (required section in ROADMAP.md):
 
 After the slices section, include a `## Boundary Map` that shows what each slice produces and consumes:
 
@@ -212,7 +212,7 @@ Critical wiring between artifacts:
 Exact next thing to do.
 ```
 
-### `M###-CONTEXT.md` / `S##-CONTEXT.md` (from discuss phase)
+### `CONTEXT.md` / `S##-CONTEXT.md` (from discuss phase)
 
 ```markdown
 # M001: Milestone or Slice Title — Context
@@ -268,7 +268,7 @@ Work flows through these phases. Each phase produces a file.
 ### Phase 1: Discuss (Optional)
 
 **Purpose:** Capture user decisions on gray areas before planning.
-**Produces:** `M###-CONTEXT.md` for milestone-level discussion or `S##-CONTEXT.md` for slice-level discussion.
+**Produces:** `CONTEXT.md` for milestone-level discussion or `S##-CONTEXT.md` for slice-level discussion.
 **When to use:** When the scope has ambiguities the user should weigh in on.
 **When to skip:** When the user already knows exactly what they want, or told you to just go.
 
@@ -276,7 +276,7 @@ Work flows through these phases. Each phase produces a file.
 1. Read the roadmap to understand the scope.
 2. Identify 3-5 gray areas — implementation decisions the user cares about.
 3. Use `ask_user_questions` to discuss each area, one round at a time. Never fabricate user input; wait for the user's actual response before the next round.
-4. Write decisions to the appropriate context file (`M###-CONTEXT.md` or `S##-CONTEXT.md`).
+4. Write decisions to the appropriate context file (`CONTEXT.md` or `S##-CONTEXT.md`).
 5. Do NOT discuss how to implement — only what the user wants.
 
 ### Phase 2: Research (Optional)
@@ -287,7 +287,7 @@ Work flows through these phases. Each phase produces a file.
 **When to skip:** When the codebase is familiar and the work is straightforward.
 
 **How to do it manually:**
-1. Read `M###-CONTEXT.md` and/or `S##-CONTEXT.md` if they exist — know what decisions are locked.
+1. Read `CONTEXT.md` and/or `S##-CONTEXT.md` if they exist — know what decisions are locked.
 2. Scout relevant code: `rg`, `find`, read key files.
 3. Use `resolve_library` / `get_library_docs` if needed.
 4. Write findings to `research.md` with these sections:
@@ -330,15 +330,15 @@ The **Don't Hand-Roll** and **Common Pitfalls** sections prevent the most expens
 **Produces:** `S##-PLAN.md` + individual `T01-PLAN.md` files.
 
 **For a milestone (roadmap):**
-1. Read `M###-CONTEXT.md`, `M###-RESEARCH.md`, and `.gsd/DECISIONS.md` if they exist.
+1. Read `CONTEXT.md`, `M###-RESEARCH.md`, and `.gsd/DECISIONS.md` if they exist.
 2. Decompose the vision into 1-10 demoable vertical slices. Prefer one slice for tiny, single-file, or static work unless the request clearly spans independent capabilities.
 3. Order by risk (high-risk first to validate feasibility early).
-4. Write `M###-ROADMAP.md` with checkboxes, risk levels, dependencies, demo sentences.
+4. Write `ROADMAP.md` with checkboxes, risk levels, dependencies, demo sentences.
 5. **Write the boundary map** — for each slice, specify what it produces (functions, types, interfaces, endpoints) and what it consumes from upstream slices. This forces interface thinking before implementation and enables deterministic verification that slices actually connect.
 
 **For a slice (task decomposition):**
-1. Read the slice's entry in `M###-ROADMAP.md` **and its boundary map section** — know what interfaces this slice must produce and consume.
-2. Read `M###-CONTEXT.md`, `S##-CONTEXT.md`, `M###-RESEARCH.md`, `S##-RESEARCH.md`, and `.gsd/DECISIONS.md` if they exist for this slice.
+1. Read the slice's entry in `ROADMAP.md` **and its boundary map section** — know what interfaces this slice must produce and consume.
+2. Read `CONTEXT.md`, `S##-CONTEXT.md`, `M###-RESEARCH.md`, `S##-RESEARCH.md`, and `.gsd/DECISIONS.md` if they exist for this slice.
 3. Read summaries from dependency slices (check `depends:[]` in roadmap).
 4. Verify that upstream slices' actual outputs match what the boundary map says this slice consumes. If they diverge, update the boundary map.
 5. Decompose into 1-7 tasks, each fitting one context window.
@@ -424,7 +424,7 @@ key_decisions:
 patterns_established:
   - "Pattern name and where it lives"
 drill_down_paths:
-  - .gsd/milestones/M001/slices/S01/tasks/T01-PLAN.md
+  - .gsd/phases/M001/slices/S01/tasks/T01-PLAN.md
 duration: 15min
 verification_result: pass
 completed_at: 2026-03-07T16:00:00Z
@@ -466,17 +466,17 @@ key_decisions: []
 **After a task completes:**
 1. Mark the task done in `S##-PLAN.md` (checkbox).
 2. Check if there's a next task in the slice → execute it.
-3. If slice is complete → write slice summary, mark slice done in `M###-ROADMAP.md`.
+3. If slice is complete → write slice summary, mark slice done in `ROADMAP.md`.
 
 **After a slice completes:**
 1. Write slice `S##-SUMMARY.md` (compresses all task summaries).
-2. Write slice `S##-UAT.md` — a non-blocking human test script derived from the slice's must-haves and demo sentence. The agent does NOT wait for UAT results.
-3. Mark the slice checkbox in `M###-ROADMAP.md` as `[x]`.
+2. Write slice `S##-UAT.md` — a human test script derived from the slice's must-haves and demo sentence.
+3. Mark the slice checkbox in `ROADMAP.md` as `[x]`.
 4. Update `STATE.md` with new position.
 5. Update milestone `M###-SUMMARY.md` with the completed slice's contributions.
-6. Continue to next slice immediately. The user tests the UAT whenever convenient.
-7. If the user reports UAT failures later, create fix tasks in the current or a new slice.
-8. If all slices done → milestone complete.
+6. Continue to next slice immediately. UAT can run after slice completion; automatic milestone closure requires each slice assessment to record `PASS`.
+7. If UAT is missing or non-PASS at milestone closeout, run `/gsd dispatch uat`, request a slice-specific UAT rerun when needed, or create remediation work with `/gsd dispatch reassess`.
+8. If all slices are done and UAT plus milestone validation pass → milestone complete.
 
 ---
 
@@ -528,7 +528,7 @@ The EXACT first thing to do when resuming. Not vague. Specific.
 It is NOT the source of truth. It's a convenience dashboard.
 
 **Sources of truth:**
-- `M###-ROADMAP.md` → which slices exist and which are done
+- `ROADMAP.md` → which slices exist and which are done
 - `S##-PLAN.md` → which tasks exist within a slice
 - `T##-SUMMARY.md` → what happened during a task
 - `S##-SUMMARY.md` and `M###-SUMMARY.md` → compressed slice and milestone outcomes
@@ -605,6 +605,7 @@ Commit types: `feat`, `fix`, `test`, `refactor`, `docs`, `perf`, `chore`
 |---------|-----|
 | Bad task | Revert the task commit on the active branch |
 | Bad milestone squash | Revert the squash commit on the integration branch |
+| UAT missing or non-PASS at closeout | Run `/gsd dispatch uat`, request a slice-specific UAT rerun when needed, or create remediation work with `/gsd dispatch reassess` |
 | UAT failure after merge | Create follow-up fix tasks in the current or next milestone |
 
 ---
@@ -613,7 +614,7 @@ Commit types: `feat`, `fix`, `test`, `refactor`, `docs`, `perf`, `chore`
 
 When planning or executing a task, load relevant prior context:
 
-1. Check the current slice's `depends:[]` in `M###-ROADMAP.md`.
+1. Check the current slice's `depends:[]` in `ROADMAP.md`.
 2. Load summaries from those dependency slices.
 3. Start with the **highest available level** — milestone `M###-SUMMARY.md` first.
 4. Only drill down to slice/task summaries if you need specific detail.
@@ -634,10 +635,10 @@ These are soft caps — exceed them when genuinely needed, but don't let summari
 
 This methodology doc is generic. Project-specific guidance belongs in the milestone and slice context files:
 
-- **`.gsd/milestones/<active>/M###-CONTEXT.md`** — milestone-level architecture decisions, reference file paths, and implementation constraints
-- **`.gsd/milestones/<active>/slices/S##/S##-CONTEXT.md`** — slice-level decisions, edge cases, and narrow implementation guidance when present
+- **`.gsd/phases/<active>/CONTEXT.md`** — milestone-level architecture decisions, reference file paths, and implementation constraints
+- **`.gsd/phases/<active>/slices/S##/S##-CONTEXT.md`** — slice-level decisions, edge cases, and narrow implementation guidance when present
 
-**Always read the active milestone's `M###-CONTEXT.md` before starting implementation work.** If the active slice also has `S##-CONTEXT.md`, read that too. These files tell you what decisions are locked, what files to reference, and how to verify your work in this specific project.
+**Always read the active milestone's `CONTEXT.md` before starting implementation work.** If the active slice also has `S##-CONTEXT.md`, read that too. These files tell you what decisions are locked, what files to reference, and how to verify your work in this specific project.
 
 ---
 

package/dist/resources/extensions/ask-user-questions.js

@@ -114,6 +114,61 @@ function errorResult(message, questions = [], options) {
         details: { questions, response: null, cancelled: true, interrupted: options?.interrupted === true },
     };
 }
+/** Parse the LLM-facing JSON payload back into a RoundResult for TUI rendering. */
+function parseLlmAnswersContent(text) {
+    try {
+        const parsed = JSON.parse(text);
+        if (!parsed?.answers || typeof parsed.answers !== "object")
+            return null;
+        const answers = {};
+        for (const [id, entry] of Object.entries(parsed.answers)) {
+            const list = Array.isArray(entry?.answers) ? [...entry.answers] : [];
+            let notes = "";
+            const noteIdx = list.findIndex((item) => typeof item === "string" && item.startsWith("user_note:"));
+            if (noteIdx >= 0) {
+                notes = list.splice(noteIdx, 1)[0].replace(/^user_note:\s*/, "");
+            }
+            if (list.length === 0)
+                continue;
+            answers[id] = {
+                selected: list.length === 1 ? list[0] : list,
+                notes,
+            };
+        }
+        if (Object.keys(answers).length === 0)
+            return null;
+        return { endInterview: false, answers };
+    }
+    catch {
+        return null;
+    }
+}
+function isCancelledResultContent(text) {
+    return /\bwas cancelled before receiving a response\b/i.test(text)
+        || /\bwas interrupted before receiving a response\b/i.test(text);
+}
+function renderAnswerLines(questions, response, theme) {
+    const lines = [];
+    for (const q of questions) {
+        const answer = response.answers[q.id];
+        if (!answer) {
+            lines.push(`${theme.fg("accent", q.header)}: ${theme.fg("dim", "(no answer)")}`);
+            continue;
+        }
+        const selected = answer.selected;
+        const notes = answer.notes;
+        const multiSel = !!q.allowMultiple;
+        const answerText = multiSel && Array.isArray(selected)
+            ? selected.join(", ")
+            : (Array.isArray(selected) ? selected[0] : selected) ?? "(no answer)";
+        let line = `${theme.fg("success", "✓ ")}${theme.fg("accent", q.header)}: ${answerText}`;
+        if (notes) {
+            line += ` ${theme.fg("muted", `[note: ${notes}]`)}`;
+        }
+        lines.push(line);
+    }
+    return new Text(lines.join("\n"), 0, 0);
+}
 /** Convert the shared RoundResult into the JSON the LLM expects. */
 function formatForLLM(result) {
     const answers = {};
@@ -132,10 +187,11 @@ function formatForLLM(result) {
     }
     return JSON.stringify({ answers });
 }
-async function playQuestionBell() {
+/** @internal Exported for testing only. */
+export async function playQuestionBell(preferences, stream) {
     try {
         const { playNotificationBell } = await import("./gsd/notifications.js");
-        playNotificationBell("question");
+        playNotificationBell("question", preferences, stream);
     }
     catch {
         // Best-effort: question rendering must never depend on alert delivery.
@@ -318,11 +374,17 @@ export default function AskUserQuestions(pi) {
             }
             return new Text(text, 0, 0);
         },
-        renderResult(result, _options, theme) {
+        renderResult(result, _options, theme, context) {
             const details = result.details;
+            const contentText = result.content[0]?.type === "text" ? result.content[0].text : "";
+            const questionsFromArgs = context?.args?.questions;
+            const parsedResponse = contentText ? parseLlmAnswersContent(contentText) : null;
             if (!details) {
-                const text = result.content[0];
-                return new Text(text?.type === "text" ? text.text : "", 0, 0);
+                const questions = questionsFromArgs;
+                if (questions?.length && parsedResponse) {
+                    return renderAnswerLines(questions, parsedResponse, theme);
+                }
+                return new Text(contentText, 0, 0);
             }
             // Remote channel result (discriminated on details.remote === true)
             if (details.remote) {
@@ -352,30 +414,24 @@ export default function AskUserQuestions(pi) {
                 }
                 return new Text(lines.join("\n"), 0, 0);
             }
-            if (details.cancelled || !details.response) {
+            const questions = details.questions ?? questionsFromArgs;
+            const response = details.response ?? parsedResponse;
+            const explicitCancel = details.cancelled === true || isCancelledResultContent(contentText);
+            if (explicitCancel && !response) {
                 const interrupted = "interrupted" in details && details.interrupted === true;
                 return new Text(theme.fg("warning", interrupted ? "Interrupted" : "Cancelled"), 0, 0);
             }
-            const lines = [];
-            for (const q of details.questions) {
-                const answer = details.response.answers[q.id];
-                if (!answer) {
-                    lines.push(`${theme.fg("accent", q.header)}: ${theme.fg("dim", "(no answer)")}`);
-                    continue;
-                }
-                const selected = answer.selected;
-                const notes = answer.notes;
-                const multiSel = !!q.allowMultiple;
-                const answerText = multiSel && Array.isArray(selected)
-                    ? selected.join(", ")
-                    : (Array.isArray(selected) ? selected[0] : selected) ?? "(no answer)";
-                let line = `${theme.fg("success", "✓ ")}${theme.fg("accent", q.header)}: ${answerText}`;
-                if (notes) {
-                    line += ` ${theme.fg("muted", `[note: ${notes}]`)}`;
-                }
-                lines.push(line);
+            if (questions?.length && response) {
+                return renderAnswerLines(questions, response, theme);
+            }
+            if (contentText) {
+                return new Text(contentText, 0, 0);
+            }
+            if (details.cancelled || !details.response) {
+                const interrupted = "interrupted" in details && details.interrupted === true;
+                return new Text(theme.fg("warning", interrupted ? "Interrupted" : "Cancelled"), 0, 0);
             }
-            return new Text(lines.join("\n"), 0, 0);
+            return new Text("", 0, 0);
         },
     });
 }