gsd-pi 2.77.0-dev.58d3d4d6c → 2.77.0-dev.cfd69e714

package/dist/resources/extensions/gsd/unit-context-manifest.js

@@ -0,0 +1,370 @@
+// GSD-2 — UnitContextManifest (#4782 phase 1).
+//
+// Declarative description of what context each auto-mode unit type needs
+// in its system prompt. Establishes the contract that later phases will
+// use to drive a single composeSystemPromptForUnit() — replacing the
+// per-unit-type branching currently spread across `auto-prompts.ts`.
+//
+// **Phase 1 ships the type + the data + a CI coverage guard.** It adds
+// zero wiring — no caller reads a manifest yet. Every unit type gets a
+// manifest that describes today's behavior as faithfully as possible, so
+// when the composer lands in phase 2 the migration can proceed manifest-
+// by-manifest without behavior change.
+//
+// Phased rollout tracking:
+//   - Phase 1 (this PR): schema + manifests + coverage test.
+//   - Phase 2: add composeSystemPromptForUnit(); migrate one low-risk
+//     unit type (e.g. reassess-roadmap) as the pilot.
+//   - Phase 3: migrate remaining unit types, tighten manifests per
+//     empirical usage, introduce skipWhen predicates absorbing the
+//     reassess opt-in gate from #4778.
+//   - Phase 4: introduce pipeline variants as declared sequences,
+//     absorbing the scope-classifier gates from #4781.
+//
+// Naming:
+//   - Artifact keys are STABLE strings (not paths). Path resolution is
+//     the composer's job; manifests describe intent, not disk layout.
+//   - Char budgets are nominal — blown budgets log a telemetry event,
+//     they do not truncate or error (the composer decides fallback).
+// ─── Artifact registry ────────────────────────────────────────────────────
+/**
+ * Stable identifiers for every artifact class a unit might inline, excerpt,
+ * or reference on-demand. Adding a new artifact class requires (a) a key
+ * here, (b) path/body resolution in the composer, and (c) updates to any
+ * manifest that should surface it.
+ */
+export const ARTIFACT_KEYS = [
+    // Milestone-scoped
+    "roadmap",
+    "milestone-context",
+    "milestone-summary",
+    "milestone-validation",
+    "milestone-research",
+    "milestone-plan",
+    // Slice-scoped
+    "slice-context",
+    "slice-research",
+    "slice-plan",
+    "slice-summary",
+    "slice-uat",
+    "slice-assessment",
+    // Task-scoped
+    "task-plan",
+    "task-summary",
+    "prior-task-summaries",
+    "dependency-summaries",
+    // Project-scoped
+    "requirements",
+    "decisions",
+    "project",
+    "templates",
+];
+// ─── Manifests ────────────────────────────────────────────────────────────
+// Phase 1 policy: every manifest encodes today's behavior. Skills = "all"
+// unless the unit type was already narrowed via the existing skill-manifest
+// resolver (#4779). Memory/knowledge policies reflect the defaults in
+// `bootstrap/system-context.ts`. Artifact classifications follow what
+// `auto-prompts.ts` inlines today for each unit type.
+const COMMON_BUDGET_LARGE = 1_500_000; // ~400K tokens
+const COMMON_BUDGET_MEDIUM = 750_000; // ~200K tokens
+const COMMON_BUDGET_SMALL = 250_000; // ~65K tokens
+// ─── Tool policy constants (#4934) ────────────────────────────────────────
+// Reused across manifests so per-unit assignment stays declarative and the
+// allowed-path set for the docs policy lives in one reviewable place.
+const TOOLS_ALL = { mode: "all" };
+const TOOLS_PLANNING = { mode: "planning" };
+const TOOLS_DOCS = {
+    mode: "docs",
+    // Globs are resolved relative to project basePath. The set is intentionally
+    // narrow: top-level docs/, README, CHANGELOG, and any markdown at the
+    // project root. Projects with non-standard layouts (e.g. mintlify-docs/)
+    // will need this list extended in a follow-up; landed conservative now,
+    // expand on demand.
+    allowedPathGlobs: [
+        "docs/**",
+        "README.md",
+        "README.*.md",
+        "CHANGELOG.md",
+        "*.md",
+    ],
+};
+/**
+ * Canonical unit types handled by auto-mode dispatch. The coverage test
+ * enumerates these against `UNIT_MANIFESTS` to catch manifest drift when
+ * a new unit type lands.
+ */
+export const KNOWN_UNIT_TYPES = [
+    "research-milestone",
+    "plan-milestone",
+    "discuss-milestone",
+    "validate-milestone",
+    "complete-milestone",
+    "research-slice",
+    "plan-slice",
+    "refine-slice",
+    "replan-slice",
+    "complete-slice",
+    "reassess-roadmap",
+    "execute-task",
+    "reactive-execute",
+    "run-uat",
+    "gate-evaluate",
+    "rewrite-docs",
+];
+export const UNIT_MANIFESTS = {
+    // ─── Milestone-scoped ────────────────────────────────────────────────
+    "research-milestone": {
+        skills: { mode: "all" },
+        knowledge: "full",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            // Phase 3 migration (#4782): matches today's actual
+            // buildResearchMilestonePrompt inlining order.
+            inline: ["milestone-context", "project", "requirements", "decisions", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
+    },
+    "plan-milestone": {
+        skills: { mode: "all" },
+        knowledge: "full",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            inline: ["project", "requirements", "decisions", "milestone-research", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_LARGE,
+    },
+    "discuss-milestone": {
+        skills: { mode: "all" },
+        knowledge: "full",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            inline: ["project", "requirements", "decisions", "milestone-context", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
+    },
+    "validate-milestone": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "prompt-relevant",
+        codebaseMap: false,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            inline: ["roadmap", "slice-summary", "slice-uat", "requirements", "decisions", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_LARGE,
+    },
+    "complete-milestone": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "prompt-relevant",
+        codebaseMap: false,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            // #4780 landed slice-summary as excerpt for this unit; phase 2 of
+            // the architecture will read this manifest as the source of truth
+            // and retire the special-case wiring in auto-prompts.ts.
+            inline: ["roadmap", "milestone-context", "requirements", "decisions", "project", "templates"],
+            excerpt: ["slice-summary"],
+            onDemand: ["slice-summary"],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
+    },
+    // ─── Slice-scoped ────────────────────────────────────────────────────
+    "research-slice": {
+        skills: { mode: "all" },
+        knowledge: "full",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            inline: ["roadmap", "milestone-research", "dependency-summaries", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
+    },
+    "plan-slice": {
+        skills: { mode: "all" },
+        knowledge: "full",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            inline: ["roadmap", "slice-research", "dependency-summaries", "requirements", "decisions", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_LARGE,
+    },
+    "refine-slice": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            inline: ["slice-plan", "slice-research", "dependency-summaries", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
+    },
+    "replan-slice": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            inline: ["slice-plan", "slice-research", "dependency-summaries", "prior-task-summaries", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
+    },
+    "complete-slice": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "prompt-relevant",
+        codebaseMap: false,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            // Phase 3 migration (#4782): matches today's actual
+            // buildCompleteSlicePrompt inlining order. Overrides prepend +
+            // knowledge splice stay in the builder imperatively (see RFC
+            // #4924 — computed/prepend blocks are phase-4 composer work).
+            inline: ["roadmap", "slice-context", "slice-plan", "requirements", "prior-task-summaries", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_LARGE,
+    },
+    "reassess-roadmap": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "critical-only",
+        codebaseMap: false,
+        preferences: "none",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            // Phase 2 pilot (#4782): manifest now matches today's actual
+            // buildReassessRoadmapPrompt behavior for equivalence. Phase 3
+            // will tighten this list once the composer reports real telemetry.
+            inline: ["roadmap", "slice-context", "slice-summary", "project", "requirements", "decisions"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
+    },
+    // ─── Task-scoped ─────────────────────────────────────────────────────
+    "execute-task": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_ALL,
+        artifacts: {
+            inline: ["task-plan", "slice-plan", "prior-task-summaries", "templates"],
+            excerpt: [],
+            onDemand: ["slice-research"],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_LARGE,
+    },
+    "reactive-execute": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_ALL,
+        artifacts: {
+            inline: ["slice-plan", "prior-task-summaries", "templates"],
+            excerpt: [],
+            onDemand: ["slice-research"],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_LARGE,
+    },
+    // ─── Ancillary units ─────────────────────────────────────────────────
+    "run-uat": {
+        skills: { mode: "all" },
+        knowledge: "critical-only",
+        memory: "critical-only",
+        codebaseMap: false,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            // Phase 3 migration (#4782): manifest matches today's actual
+            // buildRunUatPrompt inlining. Prior phase-1 entry listed
+            // `slice-plan` aspirationally — the real builder inlines the UAT
+            // file, the slice SUMMARY (optional), and the project row.
+            inline: ["slice-uat", "slice-summary", "project"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_SMALL,
+    },
+    "gate-evaluate": {
+        skills: { mode: "all" },
+        knowledge: "critical-only",
+        memory: "critical-only",
+        codebaseMap: false,
+        preferences: "active-only",
+        tools: TOOLS_PLANNING,
+        artifacts: {
+            inline: ["slice-plan", "prior-task-summaries"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_SMALL,
+    },
+    "rewrite-docs": {
+        skills: { mode: "all" },
+        knowledge: "scoped",
+        memory: "prompt-relevant",
+        codebaseMap: true,
+        preferences: "active-only",
+        tools: TOOLS_DOCS,
+        artifacts: {
+            inline: ["project", "requirements", "decisions", "templates"],
+            excerpt: [],
+            onDemand: [],
+        },
+        maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
+    },
+};
+// ─── Lookup helper ────────────────────────────────────────────────────────
+/**
+ * Return the manifest for a unit type, or null when the type is unknown.
+ *
+ * Callers MUST treat null as "fall through to today's default behavior"
+ * rather than erroring — unknown unit types may be experimental and
+ * should not crash the composer.
+ */
+export function resolveManifest(unitType) {
+    return UNIT_MANIFESTS[unitType] ?? null;
+}

package/dist/resources/extensions/gsd/uok/gate-runner.js

@@ -24,7 +24,8 @@ export class UokGateRunner {
     async run(id, ctx) {
         const gate = this.registry.get(id);
         if (!gate) {
-            return {
+            const now = new Date().toISOString();
+            const unknownResult = {
                 gateId: id,
                 gateType: "unknown",
                 outcome: "manual-attention",
@@ -33,16 +34,63 @@ export class UokGateRunner {
                 attempt: 1,
                 maxAttempts: 1,
                 retryable: false,
-                evaluatedAt: new Date().toISOString(),
+                evaluatedAt: now,
             };
+            insertGateRun({
+                traceId: ctx.traceId,
+                turnId: ctx.turnId,
+                gateId: unknownResult.gateId,
+                gateType: unknownResult.gateType,
+                unitType: ctx.unitType,
+                unitId: ctx.unitId,
+                milestoneId: ctx.milestoneId,
+                sliceId: ctx.sliceId,
+                taskId: ctx.taskId,
+                outcome: unknownResult.outcome,
+                failureClass: unknownResult.failureClass,
+                rationale: unknownResult.rationale,
+                findings: unknownResult.findings,
+                attempt: unknownResult.attempt,
+                maxAttempts: unknownResult.maxAttempts,
+                retryable: unknownResult.retryable,
+                evaluatedAt: unknownResult.evaluatedAt,
+            });
+            emitUokAuditEvent(ctx.basePath, buildAuditEnvelope({
+                traceId: ctx.traceId,
+                turnId: ctx.turnId,
+                category: "gate",
+                type: "gate-run",
+                payload: {
+                    gateId: unknownResult.gateId,
+                    gateType: unknownResult.gateType,
+                    outcome: unknownResult.outcome,
+                    failureClass: unknownResult.failureClass,
+                    attempt: unknownResult.attempt,
+                    maxAttempts: unknownResult.maxAttempts,
+                    retryable: unknownResult.retryable,
+                },
+            }));
+            return unknownResult;
         }
         let attempt = 0;
         let final = null;
         const maxAttemptsByFailureClass = RETRY_MATRIX;
-        while (attempt < 3) {
+        const maxAttemptsCeiling = Math.max(...Object.values(RETRY_MATRIX)) + 1;
+        while (attempt < maxAttemptsCeiling) {
             attempt += 1;
             const now = new Date().toISOString();
-            const result = await gate.execute(ctx, attempt);
+            let result;
+            try {
+                result = await gate.execute(ctx, attempt);
+            }
+            catch (err) {
+                const message = err instanceof Error ? err.message : String(err);
+                result = {
+                    outcome: "fail",
+                    failureClass: "unknown",
+                    rationale: message,
+                };
+            }
             const failureClass = result.failureClass ?? (result.outcome === "pass" ? "none" : "unknown");
             const retryBudget = maxAttemptsByFailureClass[failureClass] ?? 0;
             const retryable = result.outcome !== "pass" && attempt <= retryBudget;
@@ -54,7 +102,7 @@ export class UokGateRunner {
                 rationale: result.rationale,
                 findings: result.findings,
                 attempt,
-                maxAttempts: Math.max(1, retryBudget),
+                maxAttempts: retryBudget + 1,
                 retryable,
                 evaluatedAt: now,
             };

package/dist/resources/extensions/gsd/workflow-mcp.js

@@ -15,6 +15,7 @@ const MCP_WORKFLOW_TOOL_SURFACE = new Set([
     "gsd_journal_query",
     "gsd_milestone_complete",
     "gsd_milestone_generate_id",
+    "gsd_milestone_reopen",
     "gsd_checkpoint_db",
     "gsd_milestone_status",
     "gsd_milestone_validate",
@@ -23,6 +24,9 @@ const MCP_WORKFLOW_TOOL_SURFACE = new Set([
     "gsd_plan_slice",
     "gsd_replan_slice",
     "gsd_reassess_roadmap",
+    "gsd_reopen_milestone",
+    "gsd_reopen_slice",
+    "gsd_reopen_task",
     "gsd_requirement_save",
     "gsd_requirement_update",
     "gsd_roadmap_reassess",
@@ -32,9 +36,11 @@ const MCP_WORKFLOW_TOOL_SURFACE = new Set([
     "gsd_skip_slice",
     "gsd_slice_replan",
     "gsd_slice_complete",
+    "gsd_slice_reopen",
     "gsd_summary_save",
     "gsd_task_plan",
     "gsd_task_complete",
+    "gsd_task_reopen",
     "gsd_update_requirement",
     "gsd_validate_milestone",
 ]);

package/dist/resources/extensions/gsd/worktree-manager.js

@@ -19,7 +19,7 @@ import { execFileSync } from "node:child_process";
 import { join, resolve, sep } from "node:path";
 import { GSDError, GSD_PARSE_ERROR, GSD_STALE_STATE, GSD_LOCK_HELD, GSD_GIT_ERROR, GSD_MERGE_CONFLICT } from "./errors.js";
 import { logWarning } from "./workflow-logger.js";
-import { nativeBranchDelete, nativeBranchExists, nativeBranchForceReset, nativeCommit, nativeDetectMainBranch, nativeDiffContent, nativeDiffNameStatus, nativeDiffNumstat, nativeGetCurrentBranch, nativeLogOneline, nativeMergeSquash, nativeWorktreeAdd, nativeWorktreeList, nativeWorktreePrune, nativeWorktreeRemove, } from "./native-git-bridge.js";
+import { nativeBranchDelete, nativeBranchExists, nativeBranchForceReset, nativeCommit, nativeDetectMainBranch, nativeDiffContent, nativeDiffNameStatus, nativeDiffNumstat, nativeGetCurrentBranch, nativeIsAncestor, nativeLogOneline, nativeMergeSquash, nativeWorktreeAdd, nativeWorktreeList, nativeWorktreePrune, nativeWorktreeRemove, } from "./native-git-bridge.js";
 import { emitCanonicalRootRedirect } from "./worktree-telemetry.js";
 // ─── Path Helpers ──────────────────────────────────────────────────────────
 function normalizePathForComparison(path) {
@@ -171,6 +171,13 @@ export function createWorktree(basePath, name, opts = {}) {
     // Use the explicit start point (e.g. integration branch) if provided,
     // otherwise fall back to the repo's detected main branch.
     const startPoint = opts.startPoint ?? nativeDetectMainBranch(basePath);
+    // Reject early if startPoint resolves to an empty/invalid ref. On an
+    // unborn branch (zero-commit repo) nativeDetectMainBranch returns "",
+    // which would flow into `git worktree add ... ""` and crash with
+    // `fatal: not a valid object name`. (Issue #4980 HIGH-9)
+    if (!startPoint || startPoint.length === 0) {
+        throw new GSDError(GSD_GIT_ERROR, "Repository has no commits yet (unborn branch). Make an initial commit before creating worktrees.");
+    }
     // Check if the branch already exists (leftover from a previous worktree)
     const branchAlreadyExists = nativeBranchExists(basePath, branch);
     if (branchAlreadyExists) {
@@ -188,6 +195,18 @@ export function createWorktree(basePath, name, opts = {}) {
             nativeWorktreeAdd(basePath, wtPath, branch);
         }
         else {
+            // Ancestry guard: refuse to force-reset a branch that has commits not
+            // reachable from startPoint. A crash-then-resume cycle that didn't
+            // write the resume file would silently orphan prior-session commits
+            // (recoverable from reflog for 90d, then gone — branch is also
+            // deleted at teardown). (Issue #4980 HIGH-3)
+            const branchIsAncestor = nativeIsAncestor(basePath, branch, startPoint);
+            if (!branchIsAncestor) {
+                throw new GSDError(GSD_GIT_ERROR, `Branch "${branch}" already exists with commits not reachable from "${startPoint}". ` +
+                    `Refusing to force-reset — would orphan prior work. ` +
+                    `If you intend to keep those commits, retry with reuseExistingBranch=true. ` +
+                    `If you intend to discard, run \`git branch -D ${branch}\` manually first.`);
+            }
             // Reset the stale branch to the start point, then attach worktree to it
             nativeBranchForceReset(basePath, branch, startPoint);
             nativeWorktreeAdd(basePath, wtPath, branch);
@@ -419,15 +438,22 @@ export function removeWorktree(basePath, name, opts = {}) {
             // Lines starting with '+' indicate uncommitted submodule changes
             hasSubmoduleChanges = submoduleStatus.split("\n").some((line) => line.startsWith("+") || line.startsWith("-"));
             if (hasSubmoduleChanges) {
-                // Stash submodule changes so they are not lost during force removal.
-                // The stash is created in the worktree before it's torn down.
+                // Save submodule changes to a labeled rescue branch instead of the
+                // shared stash list. Stash is per-repo (not per-worktree), so an
+                // entry created here would appear in the user's main-tree stash
+                // list and reference paths that disappear after worktree removal.
+                // A branch persists in the shared .git refs after worktree removal
+                // and is discoverable via `git branch --list 'gsd/submodule-rescue/*'`.
+                // (Issue #4980 HIGH-11)
+                const rescueBranch = `gsd/submodule-rescue/${name}-${Date.now()}`;
                 try {
-                    execFileSync("git", ["stash", "push", "-m", "gsd: auto-stash submodule changes before worktree teardown"], { cwd: resolvedWtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
-                    logWarning("reconcile", `Stashed uncommitted submodule changes before worktree teardown`, { worktree: name, path: resolvedWtPath });
+                    execFileSync("git", ["add", "-A"], { cwd: resolvedWtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
+                    execFileSync("git", ["commit", "-m", `gsd: rescue submodule changes from worktree ${name}`, "--allow-empty"], { cwd: resolvedWtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
+                    execFileSync("git", ["branch", rescueBranch, "HEAD"], { cwd: resolvedWtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
+                    logWarning("reconcile", `Saved uncommitted submodule changes to rescue branch ${rescueBranch}`, { worktree: name, path: resolvedWtPath, rescueBranch });
                 }
-                catch {
-                    // Stash failed — warn the user that submodule changes may be lost
-                    logWarning("reconcile", `Submodule changes detected — stash failed, changes may be lost during force removal`, { worktree: name, path: resolvedWtPath });
+                catch (err) {
+                    logWarning("reconcile", `Submodule rescue branch creation failed — changes may be lost during force removal: ${err instanceof Error ? err.message : String(err)}`, { worktree: name, path: resolvedWtPath });
                 }
             }
         }

package/dist/resources/extensions/mcp-client/index.js

@@ -145,7 +145,9 @@ async function assertTrustedStdioServer(config, ctx, signal) {
     }
     return trustKey;
 }
-function getServerConfig(name) {
+// Exported for tests (see tests/server-name-spaces.test.ts).
+// Production call sites treat this as module-private.
+export function getServerConfig(name) {
     const trimmed = name.trim();
     return readConfigs().find((s) => s.name === trimmed ||
         s.name.toLowerCase() === trimmed.toLowerCase());

package/dist/resources/extensions/ollama/index.js

@@ -38,8 +38,12 @@ let providerRegistered = false;
 /**
  * Probe Ollama and register discovered models.
  * Safe to call multiple times — re-discovers and re-registers.
+ *
+ * Exported for tests (see ollama-auth-mode.test.ts, ollama-status-indicator.test.ts)
+ * so a fake HTTP endpoint can drive the registration/unregistration paths.
+ * Production callers always go through the session_start handler below.
  */
-async function probeAndRegister(pi) {
+export async function probeAndRegister(pi) {
     const running = await client.isRunning();
     if (!running) {
         if (providerRegistered) {

package/dist/resources/extensions/remote-questions/manager.js

@@ -16,21 +16,27 @@ const COMMAND_POLLING_INTERVAL_MS = 5000;
  *
  * @param basePath - Project root, forwarded to command handlers (e.g. /status).
  * @param intervalMs - Polling interval in milliseconds (default 5 s).
+ * @param deps - Test-only overrides. Omit in production.
  * @returns A cleanup function that stops the polling interval.
  */
-export function startCommandPolling(basePath, intervalMs = COMMAND_POLLING_INTERVAL_MS) {
-    const config = resolveRemoteConfig();
+export function startCommandPolling(basePath, intervalMs = COMMAND_POLLING_INTERVAL_MS, deps = {}) {
+    const resolveConfig = deps.resolveConfig ?? resolveRemoteConfig;
+    const createAdapter = deps.createAdapter ??
+        ((c, b) => new TelegramAdapter(c.token, c.channelId, b));
+    const setIntervalFn = deps.setIntervalFn ?? setInterval;
+    const clearIntervalFn = deps.clearIntervalFn ?? clearInterval;
+    const config = resolveConfig();
     if (!config || config.channel !== "telegram") {
         // Non-Telegram channels have no command polling support — return a no-op cleanup.
         return () => { };
     }
-    const adapter = new TelegramAdapter(config.token, config.channelId, basePath);
-    const timer = setInterval(() => {
+    const adapter = createAdapter(config, basePath);
+    const timer = setIntervalFn(() => {
         void adapter.pollAndHandleCommands(basePath).catch(() => {
             // Non-fatal: network hiccup or rate-limit — best-effort polling
         });
     }, intervalMs);
-    return () => clearInterval(timer);
+    return () => clearIntervalFn(timer);
 }
 /**
  * Check whether a remote channel is configured without triggering any