gsd-pi 2.51.0 → 2.52.0-dev.585e355

package/src/resources/extensions/gsd/error-classifier.ts

@@ -0,0 +1,139 @@
+/**
+ * Unified error classifier for provider/network/server errors.
+ *
+ * Consolidates patterns from:
+ *  - isTransientNetworkError()  in preferences-models.ts
+ *  - classifyProviderError()    in provider-error-pause.ts
+ *
+ * Single entry point: classifyError(errorMsg, retryAfterMs?)
+ *
+ * @see https://github.com/gsd-build/gsd/issues/2577
+ */
+
+// ── ErrorClass discriminated union ──────────────────────────────────────────
+
+export type ErrorClass =
+  | { kind: "network";      retryAfterMs: number }
+  | { kind: "rate-limit";   retryAfterMs: number }
+  | { kind: "server";       retryAfterMs: number }
+  | { kind: "stream";       retryAfterMs: number }
+  | { kind: "connection";   retryAfterMs: number }
+  | { kind: "model-error" }
+  | { kind: "permanent" }
+  | { kind: "unknown" };
+
+// ── RetryState ──────────────────────────────────────────────────────────────
+
+export interface RetryState {
+  networkRetryCount: number;
+  consecutiveTransientCount: number;
+  currentRetryModelId: string | undefined;
+}
+
+export function createRetryState(): RetryState {
+  return { networkRetryCount: 0, consecutiveTransientCount: 0, currentRetryModelId: undefined };
+}
+
+export function resetRetryState(state: RetryState): void {
+  state.networkRetryCount = 0;
+  state.consecutiveTransientCount = 0;
+  state.currentRetryModelId = undefined;
+}
+
+// ── Classification ──────────────────────────────────────────────────────────
+
+const PERMANENT_RE = /auth|unauthorized|forbidden|invalid.*key|invalid.*api|billing|quota exceeded|account/i;
+const RATE_LIMIT_RE = /rate.?limit|too many requests|429/i;
+const NETWORK_RE = /network|ECONNRESET|ETIMEDOUT|ECONNREFUSED|socket hang up|fetch failed|connection.*reset|dns/i;
+const SERVER_RE = /internal server error|500|502|503|overloaded|server_error|api_error|service.?unavailable/i;
+// ECONNRESET/ECONNREFUSED are in NETWORK_RE (same-model retry first).
+const CONNECTION_RE = /terminated|connection.?refused|other side closed|EPIPE|network.?(?:is\s+)?unavailable|stream_exhausted(?:_without_result)?/i;
+const STREAM_RE = /Unexpected end of JSON|Unexpected token.*JSON|Expected double-quoted property name|SyntaxError.*JSON/i;
+const RESET_DELAY_RE = /reset in (\d+)s/i;
+
+/**
+ * Classify an error message into one of the ErrorClass kinds.
+ *
+ * Classification order:
+ *  1. Permanent (auth/billing/quota) — unless also rate-limited
+ *  2. Rate limit (429, rate.?limit, too many requests)
+ *  3. Network (ECONNRESET, ETIMEDOUT, socket hang up, fetch failed, dns)
+ *  4. Server (500/502/503, overloaded, server_error)
+ *  5. Connection (terminated, ECONNREFUSED, EPIPE, other side closed)
+ *  6. Stream truncation (malformed JSON from mid-stream cut)
+ *  7. Unknown
+ */
+export function classifyError(errorMsg: string, retryAfterMs?: number): ErrorClass {
+  const isPermanent = PERMANENT_RE.test(errorMsg);
+  const isRateLimit = RATE_LIMIT_RE.test(errorMsg);
+
+  // 1. Permanent — but rate limit takes precedence
+  if (isPermanent && !isRateLimit) {
+    return { kind: "permanent" };
+  }
+
+  // 2. Rate limit
+  if (isRateLimit) {
+    if (retryAfterMs != null && retryAfterMs > 0) {
+      return { kind: "rate-limit", retryAfterMs };
+    }
+    const resetMatch = errorMsg.match(RESET_DELAY_RE);
+    const delayMs = resetMatch ? Number(resetMatch[1]) * 1000 : 60_000;
+    return { kind: "rate-limit", retryAfterMs: delayMs };
+  }
+
+  // 3. Network errors — same-model retry candidate
+  if (NETWORK_RE.test(errorMsg)) {
+    // Exclude if also matches permanent signals (already handled above for
+    // rate-limit, but double-check for non-rate-limit permanent overlap like
+    // "billing" appearing alongside "network").
+    return { kind: "network", retryAfterMs: retryAfterMs ?? 3_000 };
+  }
+
+  // 4. Server errors — try fallback model
+  if (SERVER_RE.test(errorMsg)) {
+    return { kind: "server", retryAfterMs: retryAfterMs ?? 30_000 };
+  }
+
+  // 5. Connection errors — try fallback model
+  if (CONNECTION_RE.test(errorMsg)) {
+    return { kind: "connection", retryAfterMs: retryAfterMs ?? 15_000 };
+  }
+
+  // 6. Stream truncation — downstream symptom of connection drop
+  if (STREAM_RE.test(errorMsg)) {
+    return { kind: "stream", retryAfterMs: retryAfterMs ?? 15_000 };
+  }
+
+  // 7. Unknown
+  return { kind: "unknown" };
+}
+
+// ── Helpers ─────────────────────────────────────────────────────────────────
+
+/** Returns true for all transient (auto-resumable) error kinds. */
+export function isTransient(cls: ErrorClass): boolean {
+  switch (cls.kind) {
+    case "network":
+    case "rate-limit":
+    case "server":
+    case "stream":
+    case "connection":
+      return true;
+    default:
+      return false;
+  }
+}
+
+/**
+ * Backward-compatible thin wrapper.
+ *
+ * Returns true when the error is a transient *network* error specifically
+ * (worth retrying the same model). Permanent signals (auth, billing, quota)
+ * cause this to return false even if a network keyword is present.
+ */
+export function isTransientNetworkError(errorMsg: string): boolean {
+  if (!errorMsg) return false;
+  const cls = classifyError(errorMsg);
+  return cls.kind === "network";
+}

package/src/resources/extensions/gsd/git-service.ts

@@ -605,11 +605,12 @@ export class GitServiceImpl {
 
   /**
    * Create a snapshot ref for the given label (typically a slice branch name).
-   * Gated on prefs.snapshots === true. Ref path: refs/gsd/snapshots/<label>/<timestamp>
+   * Enabled by default; opt out with prefs.snapshots === false.
+   * Ref path: refs/gsd/snapshots/<label>/<timestamp>
    * The ref points at HEAD, capturing the current commit before destructive operations.
    */
   createSnapshot(label: string): void {
-    if (this.prefs.snapshots !== true) return;
+    if (this.prefs.snapshots === false) return;
 
     const now = new Date();
     const ts = now.getFullYear().toString()
@@ -631,7 +632,7 @@ export class GitServiceImpl {
    * Stub: to be implemented in T03.
    */
   runPreMergeCheck(): PreMergeCheckResult {
-    if (this.prefs.pre_merge_check === false || this.prefs.pre_merge_check === undefined) {
+    if (this.prefs.pre_merge_check === false) {
       return { passed: true, skipped: true };
     }
 

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

@@ -1,8 +1,8 @@
 /**
- * GSD bootstrappers for .gitignore and preferences.md
+ * GSD bootstrappers for .gitignore and PREFERENCES.md
  *
  * Ensures baseline .gitignore exists with universally-correct patterns.
- * Creates an empty preferences.md template if it doesn't exist.
+ * Creates an empty PREFERENCES.md template if it doesn't exist.
  * Both idempotent — non-destructive if already present.
  */
 
@@ -216,16 +216,16 @@ export function untrackRuntimeFiles(basePath: string): void {
 }
 
 /**
- * Ensure basePath/.gsd/preferences.md exists as an empty template.
+ * Ensure basePath/.gsd/PREFERENCES.md exists as an empty template.
  * Creates the file with frontmatter only if it doesn't exist.
  * Returns true if created, false if already exists.
  *
- * Checks both lowercase (canonical) and uppercase (legacy) to avoid
- * creating a duplicate when an uppercase file already exists.
+ * Checks both uppercase (canonical) and lowercase (legacy) to avoid
+ * creating a duplicate when a lowercase file already exists.
  */
 export function ensurePreferences(basePath: string): boolean {
-  const preferencesPath = join(gsdRoot(basePath), "preferences.md");
-  const legacyPath = join(gsdRoot(basePath), "PREFERENCES.md");
+  const preferencesPath = join(gsdRoot(basePath), "PREFERENCES.md");
+  const legacyPath = join(gsdRoot(basePath), "preferences.md");
 
   if (existsSync(preferencesPath) || existsSync(legacyPath)) {
     return false;