@opengsd/gsd-pi 1.0.2-dev.235ebf3 → 1.0.2-dev.2c204d3

package/scripts/install/npm-global.js

@@ -1,14 +1,61 @@
 import { execFileSync, spawn } from 'child_process'
-import { join } from 'path'
+import { homedir } from 'os'
+import { join, resolve as resolvePath, sep } from 'path'
 
-function getNpm() {
-  return process.platform === 'win32' ? 'npm.cmd' : 'npm'
+const PACKAGE_MANAGERS = new Set(['npm', 'pnpm'])
+
+function normalizePackageManager(value) {
+  return PACKAGE_MANAGERS.has(value) ? value : 'npm'
+}
+
+function hasPnpmPath(value = '') {
+  const normalized = value.replace(/\\/g, '/').toLowerCase()
+  return (
+    normalized.includes('/.pnpm/') ||
+    normalized.endsWith('/pnpm') ||
+    normalized.endsWith('/pnpm.cjs') ||
+    normalized.endsWith('/pnpm.js')
+  )
+}
+
+function pathStartsWith(pathValue = '', dir) {
+  if (!pathValue) return false
+  const resolvedPath = resolvePath(pathValue)
+  const resolvedDir = resolvePath(dir)
+  return resolvedPath === resolvedDir || resolvedPath.startsWith(resolvedDir + sep)
+}
+
+function hasPnpmBinPath(env, argv1) {
+  const pnpmBinDirs = []
+  if (env.PNPM_HOME) pnpmBinDirs.push(env.PNPM_HOME)
+  pnpmBinDirs.push(join(homedir(), 'Library', 'pnpm'))
+  pnpmBinDirs.push(join(homedir(), '.local', 'share', 'pnpm'))
+
+  return pnpmBinDirs.some((dir) => pathStartsWith(argv1, dir) || pathStartsWith(env.npm_execpath, dir))
+}
+
+export function detectPackageManager(env = process.env, argv1 = process.argv[1]) {
+  const userAgent = env.npm_config_user_agent || ''
+  if (userAgent.startsWith('pnpm/')) return 'pnpm'
+  // Installer runs under npm during npm install; keep that context authoritative.
+  if (userAgent.startsWith('npm/')) return 'npm'
+
+  if (hasPnpmPath(env.npm_execpath || '')) return 'pnpm'
+  if (hasPnpmPath(argv1 || '')) return 'pnpm'
+  if (hasPnpmBinPath(env, argv1)) return 'pnpm'
+
+  return 'npm'
+}
+
+function getPackageManagerBin(packageManager) {
+  const bin = normalizePackageManager(packageManager)
+  return process.platform === 'win32' ? `${bin}.cmd` : bin
 }
 
-const NPM_OUTPUT_LIMIT = 64 * 1024
+const PM_OUTPUT_LIMIT = 64 * 1024
 
-function runNpm(args) {
-  return execFileSync(getNpm(), args, {
+function runPackageManager(packageManager, args) {
+  return execFileSync(getPackageManagerBin(packageManager), args, {
     encoding: 'utf-8',
     stdio: ['ignore', 'pipe', 'pipe'],
     timeout: 120_000,
@@ -16,30 +63,30 @@ function runNpm(args) {
   }).trim()
 }
 
-function formatNpmFailure(result) {
+function formatPackageManagerFailure(packageManager, result) {
   const output = `${result.stderr}\n${result.stdout}`.trim()
   const meaningful = output
     .split('\n')
-    .filter((line) => !line.includes('npm warn') && !line.includes('npm WARN') && line.trim())
+    .filter((line) => line.trim() && !/^(?:npm\s+warn|warn)\b/i.test(line.trim()))
     .slice(-3)
     .join('; ')
-  return meaningful || result.error?.message || 'npm install failed'
+  return meaningful || result.error?.message || `${packageManager} install failed`
 }
 
 function appendLimited(value, chunk) {
-  if (value.length >= NPM_OUTPUT_LIMIT) return value
-  return value + chunk.slice(0, NPM_OUTPUT_LIMIT - value.length)
+  if (value.length >= PM_OUTPUT_LIMIT) return value
+  return value + chunk.slice(0, PM_OUTPUT_LIMIT - value.length)
 }
 
-function runNpmAsync(args, {
+function runPackageManagerAsync(packageManager, args, {
   captureStdout = false,
   cwd,
   timeout = 300_000,
 } = {}) {
-  const npm = getNpm()
+  const bin = getPackageManagerBin(packageManager)
 
   return new Promise((resolve) => {
-    const child = spawn(npm, args, {
+    const child = spawn(bin, args, {
       cwd,
       shell: process.platform === 'win32',
       stdio: ['ignore', captureStdout ? 'pipe' : 'ignore', 'pipe'],
@@ -85,7 +132,7 @@ function runNpmAsync(args, {
           ok: false,
           stdout,
           stderr,
-          error: new Error(`npm ${args.join(' ')} timed out after ${timeout}ms`),
+          error: new Error(`${packageManager} ${args.join(' ')} timed out after ${timeout}ms`),
         })
         return
       }
@@ -100,20 +147,35 @@ function runNpmAsync(args, {
         ok: false,
         stdout,
         stderr,
-        error: new Error(`npm ${args.join(' ')} failed with ${reason}`),
+        error: new Error(`${packageManager} ${args.join(' ')} failed with ${reason}`),
       })
     })
   })
 }
 
-export function getGlobalPaths() {
-  const prefix = runNpm(['prefix', '-g'])
-  const root = runNpm(['root', '-g'])
+export function getGlobalPaths(options = {}) {
+  const packageManager = normalizePackageManager(options.packageManager ?? detectPackageManager())
+
+  if (packageManager === 'pnpm') {
+    const binDir = runPackageManager(packageManager, ['bin', '-g'])
+    const root = runPackageManager(packageManager, ['root', '-g'])
+    return {
+      prefix: binDir,
+      root,
+      binDir,
+      packageRoot: join(root, '@opengsd', 'gsd-pi'),
+      packageManager,
+    }
+  }
+
+  const prefix = runPackageManager(packageManager, ['prefix', '-g'])
+  const root = runPackageManager(packageManager, ['root', '-g'])
   return {
     prefix,
     root,
     binDir: process.platform === 'win32' ? prefix : join(prefix, 'bin'),
     packageRoot: join(root, '@opengsd', 'gsd-pi'),
+    packageManager,
   }
 }
 
@@ -121,33 +183,41 @@ export function getLocalPackageRoot(cwd = process.cwd()) {
   return join(cwd, 'node_modules', '@opengsd', 'gsd-pi')
 }
 
-export async function installGlobalPackage(version) {
-  const result = await runNpmAsync([
-    'install',
-    '-g',
-    '--ignore-scripts',
-    `@opengsd/gsd-pi@${version}`,
-  ])
+export async function installGlobalPackage(version, options = {}) {
+  const packageManager = normalizePackageManager(options.packageManager ?? detectPackageManager())
+  const packageSpec = `@opengsd/gsd-pi@${version}`
+  const installArgs = packageManager === 'pnpm'
+    ? ['add', '-g', '--ignore-scripts', packageSpec]
+    : ['install', '-g', '--ignore-scripts', packageSpec]
+
+  const result = await runPackageManagerAsync(packageManager, installArgs)
   if (!result.ok) {
-    throw new Error(formatNpmFailure(result))
+    throw new Error(formatPackageManagerFailure(packageManager, result))
   }
-  const rootResult = await runNpmAsync(['root', '-g'], {
+  const rootResult = await runPackageManagerAsync(packageManager, ['root', '-g'], {
     captureStdout: true,
     timeout: 120_000,
   })
   if (!rootResult.ok) {
-    throw new Error(formatNpmFailure(rootResult))
+    throw new Error(formatPackageManagerFailure(packageManager, rootResult))
   }
   return join(rootResult.stdout.trim(), '@opengsd', 'gsd-pi')
 }
 
-export async function installLocalPackage(version, cwd = process.cwd()) {
-  const result = await runNpmAsync(
-    ['install', '--ignore-scripts', `@opengsd/gsd-pi@${version}`],
+export async function installLocalPackage(version, cwd = process.cwd(), options = {}) {
+  const packageManager = normalizePackageManager(options.packageManager ?? detectPackageManager())
+  const packageSpec = `@opengsd/gsd-pi@${version}`
+  const installArgs = packageManager === 'pnpm'
+    ? ['add', '--ignore-scripts', packageSpec]
+    : ['install', '--ignore-scripts', packageSpec]
+
+  const result = await runPackageManagerAsync(
+    packageManager,
+    installArgs,
     { cwd },
   )
   if (!result.ok) {
-    throw new Error(formatNpmFailure(result))
+    throw new Error(formatPackageManagerFailure(packageManager, result))
   }
   return getLocalPackageRoot(cwd)
 }

package/scripts/install.js

@@ -71,6 +71,7 @@ if (HAS_HELP) {
 
   ${colors.yellow}Usage:${colors.reset}
     npx @opengsd/gsd-pi@latest              Install GSD-Pi globally (recommended)
+    pnpm dlx @opengsd/gsd-pi@latest         Install GSD-Pi globally with pnpm
     npx @opengsd/gsd-pi@latest --local      Install to current project (advanced)
 
   ${colors.yellow}Options:${colors.reset}

package/src/resources/extensions/context7/index.ts

@@ -132,6 +132,19 @@ function formatLibraryList(libs: C7Library[], query: string): string {
 	return lines.join("\n");
 }
 
+function getFirstTextContent(result: { content?: unknown }): string | undefined {
+	const content = result.content;
+	if (!Array.isArray(content)) return undefined;
+	const textBlock = content.find(
+		(block: unknown) =>
+			typeof block === "object" &&
+			block !== null &&
+			(block as { type?: unknown }).type === "text" &&
+			typeof (block as { text?: unknown }).text === "string",
+	) as { text: string } | undefined;
+	return textBlock?.text.trim() || undefined;
+}
+
 // ─── Tool details types ───────────────────────────────────────────────────────
 
 interface ResolveDetails {
@@ -234,7 +247,7 @@ export default function (pi: ExtensionAPI) {
 			const d = result.details as ResolveDetails | undefined;
 			if (isPartial) return new Text(theme.fg("warning", "Searching Context7..."), 0, 0);
 			if ((result as any).isError || d?.error) {
-				return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
+				return new Text(theme.fg("error", `Error: ${d?.error ?? getFirstTextContent(result) ?? "unknown"}`), 0, 0);
 			}
 			let text = theme.fg("success", `${d?.resultCount ?? 0} ${d?.resultCount === 1 ? "library" : "libraries"} found`);
 			if (d?.cached) text += theme.fg("dim", " (cached)");
@@ -389,7 +402,7 @@ export default function (pi: ExtensionAPI) {
 
 			if (isPartial) return new Text(theme.fg("warning", "Fetching documentation..."), 0, 0);
 			if ((result as any).isError || d?.error) {
-				return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
+				return new Text(theme.fg("error", `Error: ${d?.error ?? getFirstTextContent(result) ?? "unknown"}`), 0, 0);
 			}
 
 			let text = theme.fg("success", `${(d?.charCount ?? 0).toLocaleString()} chars`);

package/src/resources/extensions/gsd/auto/loop.ts

@@ -106,6 +106,7 @@ import {
 import { handleCustomEngineReconcile } from "./workflow-custom-engine-reconcile.js";
 import { handleCustomEngineReconcileOutcome } from "./workflow-custom-engine-reconcile-outcome.js";
 import { formatLeaseConflictNotice } from "./lease-conflict-notice.js";
+import { setAutoOutcomeWidget, unitVerb } from "../auto-dashboard.js";
 
 /**
  * Returns true if workerId is an active worker in this project whose OS
@@ -834,6 +835,27 @@ export async function autoLoop(
           },
         });
         if (reconcileFlow.action === "break") break;
+        if (s.stepMode) {
+          if (ctx.hasUI) {
+            ctx.ui.setWidget?.("gsd-progress", undefined);
+            setAutoOutcomeWidget(ctx, {
+              status: "step",
+              title: "Step complete",
+              detail: `Completed ${unitVerb(iterData.unitType)} ${iterData.unitId}.`,
+              unitLabel: `${unitVerb(iterData.unitType)} ${iterData.unitId}`,
+              nextAction: "Advance one step, or resume automatic mode.",
+              commands: ["/gsd next", "/gsd auto", "/gsd status for overview"],
+              startedAt: s.autoStartTime,
+            });
+          }
+          ctx.ui.setStatus("gsd-auto", "next");
+          ctx.ui.notify(
+            `Step complete: ${unitVerb(iterData.unitType)} ${iterData.unitId}. Run /gsd next for the next step, or /gsd auto to continue automatically.`,
+            "info",
+          );
+          s.preserveStepSurfaceAfterLoopExit = true;
+          break;
+        }
         continue;
       }
 

package/src/resources/extensions/gsd/auto/phases.ts

@@ -2072,7 +2072,7 @@ export async function runUnitPhase(
   const nextDispatchCount = (s.unitDispatchCount.get(dispatchKey) ?? 0) + 1;
 
   // Status bar (widget + preconditions deferred until after model selection — see #2899)
-  ctx.ui.setStatus("gsd-auto", "auto");
+  ctx.ui.setStatus("gsd-auto", s.stepMode ? "next" : "auto");
   if (mid)
     deps.updateSliceProgressCache(s.basePath, mid, state.activeSlice?.id);
 

package/src/resources/extensions/gsd/auto/session.ts

@@ -218,6 +218,8 @@ export class AutoSession {
   // ── Isolation degradation ────────────────────────────────────────────
   /** Set to true when worktree creation fails; prevents merge of nonexistent branch. */
   isolationDegraded = false;
+  /** Temporary recovery mode for stranded work adopted from physical git evidence. */
+  strandedRecoveryIsolationMode: "worktree" | "branch" | null = null;
   /** Project-root dirty snapshot captured before an isolated worktree unit runs. */
   rootWriteBaseline: RootDirtySnapshot | null = null;
 
@@ -382,6 +384,7 @@ export class AutoSession {
     this.lastGitActionFailure = null;
     this.lastGitActionStatus = null;
     this.isolationDegraded = false;
+    this.strandedRecoveryIsolationMode = null;
     this.rootWriteBaseline = null;
     this.milestoneMergedInPhases = false;
     this.milestoneStartShas = new Map();