gsd-pi 2.51.0-dev.7d435fe → 2.51.0-dev.859cedb

package/packages/mcp-server/src/types.ts

@@ -0,0 +1,107 @@
+/**
+ * MCP Server types — session lifecycle and orchestration.
+ */
+
+import type { RpcClient, SdkAgentEvent, RpcCostUpdateEvent, RpcExtensionUIRequest } from '@gsd/rpc-client';
+
+// ---------------------------------------------------------------------------
+// Session Status
+// ---------------------------------------------------------------------------
+
+export type SessionStatus = 'starting' | 'running' | 'blocked' | 'completed' | 'error' | 'cancelled';
+
+// ---------------------------------------------------------------------------
+// Managed Session
+// ---------------------------------------------------------------------------
+
+export interface ManagedSession {
+  /** Unique session ID returned from RpcClient.init() */
+  sessionId: string;
+
+  /** Absolute path to the project directory */
+  projectDir: string;
+
+  /** Current lifecycle status */
+  status: SessionStatus;
+
+  /** The RpcClient instance managing the agent process */
+  client: RpcClient;
+
+  /** Ring buffer of recent events (capped at MAX_EVENTS) */
+  events: SdkAgentEvent[];
+
+  /** Pending blocker requiring user response, if any */
+  pendingBlocker: PendingBlocker | null;
+
+  /** Cumulative cost tracking (max pattern per K004) */
+  cost: CostAccumulator;
+
+  /** Session start timestamp */
+  startTime: number;
+
+  /** Error message if status is 'error' */
+  error?: string;
+
+  /** Cleanup function to unsubscribe from events */
+  unsubscribe?: () => void;
+}
+
+// ---------------------------------------------------------------------------
+// Pending Blocker
+// ---------------------------------------------------------------------------
+
+export interface PendingBlocker {
+  /** The extension_ui_request id */
+  id: string;
+
+  /** The request method (e.g. 'select', 'confirm', 'input') */
+  method: string;
+
+  /** Human-readable message or title */
+  message: string;
+
+  /** Full event payload for inspection */
+  event: RpcExtensionUIRequest;
+}
+
+// ---------------------------------------------------------------------------
+// Cost Accumulator (K004 — cumulative-max)
+// ---------------------------------------------------------------------------
+
+export interface CostAccumulator {
+  totalCost: number;
+  tokens: {
+    input: number;
+    output: number;
+    cacheRead: number;
+    cacheWrite: number;
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Execute Options
+// ---------------------------------------------------------------------------
+
+export interface ExecuteOptions {
+  /** Command to send after '/gsd auto' (default: none) */
+  command?: string;
+
+  /** Model ID override */
+  model?: string;
+
+  /** Run in bare mode (skip user config) */
+  bare?: boolean;
+
+  /** Path to CLI binary (overrides GSD_CLI_PATH and which resolution) */
+  cliPath?: string;
+}
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+/** Maximum number of events kept in the ring buffer */
+export const MAX_EVENTS = 50;
+
+/** Timeout for RpcClient initialization (ms) */
+export const INIT_TIMEOUT_MS = 30_000;

package/packages/mcp-server/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "ES2024",
+    "module": "Node16",
+    "lib": ["ES2024"],
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "inlineSourceMap": false,
+    "moduleResolution": "Node16",
+    "resolveJsonModule": true,
+    "allowImportingTsExtensions": false,
+    "types": ["node"],
+    "outDir": "./dist",
+    "rootDir": "./src"
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules", "dist", "**/*.d.ts", "src/**/*.d.ts"]
+}

package/packages/rpc-client/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@gsd/rpc-client",
+  "version": "2.51.0",
+  "description": "Standalone RPC client SDK for GSD — zero internal dependencies",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "engines": {
+    "node": ">=22.0.0"
+  }
+}

package/src/resources/extensions/async-jobs/job-manager.ts

@@ -172,7 +172,10 @@ export class AsyncJobManager {
 
 	private deliverResult(job: Job): void {
 		if (!this.onJobComplete) return;
-		this.onJobComplete(job);
+		// Defer delivery by one microtask so await_job's .then() chain runs first
+		// and can set job.awaited = true before onJobComplete checks it (#2762).
+		const cb = this.onJobComplete;
+		queueMicrotask(() => cb(job));
 	}
 
 	private scheduleEviction(id: string): void {

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

@@ -1069,6 +1069,12 @@ export async function runUnitPhase(
   }
 
   if (unitResult.status === "cancelled") {
+    // Provider-error pause: pauseAuto already handled cleanup and scheduled
+    // recovery. Don't hard-stop — just break out of the loop (#2762).
+    if (unitResult.errorContext?.category === "provider") {
+      debugLog("autoLoop", { phase: "exit", reason: "provider-pause", isTransient: unitResult.errorContext.isTransient });
+      return { action: "break", reason: "provider-pause" };
+    }
     ctx.ui.notify(
       `Session creation timed out or was cancelled for ${unitType} ${unitId}. Will retry.`,
       "warning",

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

@@ -186,7 +186,7 @@ import {
   postUnitPostVerification,
 } from "./auto-post-unit.js";
 import { bootstrapAutoSession, type BootstrapDeps } from "./auto-start.js";
-import { autoLoop, resolveAgentEnd, resolveAgentEndCancelled, _resetPendingResolve, isSessionSwitchInFlight, type LoopDeps } from "./auto-loop.js";
+import { autoLoop, resolveAgentEnd, resolveAgentEndCancelled, _resetPendingResolve, isSessionSwitchInFlight, type LoopDeps, type ErrorContext } from "./auto-loop.js";
 import {
   WorktreeResolver,
   type WorktreeResolverDeps,
@@ -800,11 +800,14 @@ export async function stopAuto(
 export async function pauseAuto(
   ctx?: ExtensionContext,
   _pi?: ExtensionAPI,
+  _errorContext?: ErrorContext,
 ): Promise<void> {
   if (!s.active) return;
   clearUnitTimeout();
   // Unblock any pending unit promise so the auto-loop is not orphaned.
-  resolveAgentEndCancelled();
+  // Pass errorContext so runUnitPhase can distinguish user-initiated pause
+  // from provider-error pause and avoid hard-stopping (#2762).
+  resolveAgentEndCancelled(_errorContext);
 
   s.pausedSessionFile = ctx?.sessionManager?.getSessionFile() ?? null;
 

package/src/resources/extensions/gsd/bootstrap/agent-end-recovery.ts

@@ -33,7 +33,12 @@ async function pauseTransientWithBackoff(
   if (!allowAutoResume) {
     ctx.ui.notify(`Transient provider errors persisted after ${MAX_TRANSIENT_AUTO_RESUMES} auto-resume attempts. Pausing for manual review.`, "warning");
   }
-  await pauseAutoForProviderError(ctx.ui, errorDetail, () => pauseAuto(ctx, pi), {
+  await pauseAutoForProviderError(ctx.ui, errorDetail, () => pauseAuto(ctx, pi, {
+    message: `Provider error: ${errorDetail}`,
+    category: "provider",
+    isTransient: allowAutoResume,
+    retryAfterMs,
+  }), {
     isRateLimit,
     isTransient: allowAutoResume,
     retryAfterMs,
@@ -161,7 +166,11 @@ export async function handleAgentEnd(
     }
 
     // --- Permanent / unknown: pause indefinitely ---
-    await pauseAutoForProviderError(ctx.ui, errorDetail, () => pauseAuto(ctx, pi), {
+    await pauseAutoForProviderError(ctx.ui, errorDetail, () => pauseAuto(ctx, pi, {
+      message: `Provider error: ${errorDetail}`,
+      category: "provider",
+      isTransient: false,
+    }), {
       isRateLimit: false,
       isTransient: false,
       retryAfterMs: 0,

package/src/resources/extensions/gsd/tests/agent-end-retry.test.ts

@@ -102,7 +102,7 @@ test("pauseAuto calls resolveAgentEndCancelled to unblock the loop", () => {
   const fnBlock = source.slice(fnIdx, source.indexOf("\n/**\n * Build", fnIdx + 100));
 
   assert.ok(
-    fnBlock.includes("resolveAgentEndCancelled()"),
+    fnBlock.includes("resolveAgentEndCancelled("),
     "pauseAuto must call resolveAgentEndCancelled to unblock the auto-loop promise",
   );
 });