sentinelayer-cli 0.28.0 → 0.28.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentinelayer-cli",
-  "version": "0.28.0",
+  "version": "0.28.2",
   "description": "Scaffold Sentinelayer spec/prompt/guide artifacts with secure browser auth and token bootstrap.",
   "type": "module",
   "scripts": {

package/src/ai/proxy.js

@@ -15,6 +15,298 @@ const DEFAULT_PROXY_MODEL = "gpt-5.3-codex";
 const PROXY_TIMEOUT_MS = 120_000;
 const PROXY_MAX_RETRIES = 2;
 const PROXY_RETRY_STATUSES = new Set([429, 502, 503, 504]);
+const ACTIONABLE_PROXY_DENIAL_CODES = new Set([
+  "FREE_TRIAL_EXPIRED",
+  "DAILY_SCAN_LIMIT_EXCEEDED",
+  "WEEKLY_SCAN_LIMIT_EXCEEDED",
+  "DAILY_BUDGET_EXCEEDED",
+  "RATE_LIMIT_EXCEEDED",
+]);
+
+export class SentinelayerProxyError extends Error {
+  constructor(message, {
+    status = 0,
+    code = "PROXY_ERROR",
+    requestId = "",
+    retryAfterMs = undefined,
+    quota = null,
+    raw = null,
+  } = {}) {
+    super(message);
+    this.name = "SentinelayerProxyError";
+    this.status = status;
+    this.code = code;
+    this.requestId = requestId;
+    this.retryAfterMs = retryAfterMs;
+    this.quota = quota;
+    this.raw = raw;
+  }
+}
+
+export function serializeProxyError(error) {
+  if (!error || typeof error !== "object") {
+    return null;
+  }
+  const status = normalizeInteger(error.status);
+  const code = String(error.code || "").trim();
+  const requestId = String(error.requestId || "").trim();
+  const retryAfterMs = normalizeInteger(error.retryAfterMs);
+  const quota =
+    error.quota && typeof error.quota === "object" && !Array.isArray(error.quota)
+      ? JSON.parse(JSON.stringify(error.quota))
+      : null;
+  const serialized = {
+    status,
+    code: code || undefined,
+    requestId: requestId || undefined,
+    retryAfterMs,
+    quota,
+  };
+  for (const key of Object.keys(serialized)) {
+    if (serialized[key] === undefined || serialized[key] === null || serialized[key] === "") {
+      delete serialized[key];
+    }
+  }
+  return Object.keys(serialized).length > 0 ? serialized : null;
+}
+
+function normalizeNumber(value) {
+  if (value === undefined || value === null || value === "") {
+    return undefined;
+  }
+  const numeric = Number(value);
+  return Number.isFinite(numeric) ? numeric : undefined;
+}
+
+function normalizeInteger(value) {
+  const numeric = normalizeNumber(value);
+  return numeric === undefined ? undefined : Math.max(0, Math.floor(numeric));
+}
+
+function getHeader(headers, name) {
+  if (!headers || typeof headers.get !== "function") {
+    return null;
+  }
+  return headers.get(name) || headers.get(name.toLowerCase()) || null;
+}
+
+function parseRetryAfterMs(raw) {
+  if (typeof raw !== "string") {
+    return undefined;
+  }
+  const trimmed = raw.trim();
+  if (!trimmed) {
+    return undefined;
+  }
+  const asSeconds = Number.parseFloat(trimmed);
+  if (Number.isFinite(asSeconds) && asSeconds >= 0) {
+    return Math.ceil(asSeconds * 1000);
+  }
+  const asDate = Date.parse(trimmed);
+  if (Number.isNaN(asDate)) {
+    return undefined;
+  }
+  return Math.max(0, asDate - Date.now());
+}
+
+function chooseObject(...candidates) {
+  for (const candidate of candidates) {
+    if (candidate && typeof candidate === "object" && !Array.isArray(candidate)) {
+      return candidate;
+    }
+  }
+  return {};
+}
+
+function normalizeQuotaDetails(details = {}, headers = null) {
+  const policy = String(details.policy || "").trim();
+  const scope = String(details.scope || "").trim();
+  const unit = String(details.unit || "").trim();
+  const resetAt = String(details.resetAt || details.reset_at || "").trim();
+  const upgradeUrl = String(details.upgradeUrl || details.upgrade_url || "").trim();
+  const checkoutMode = String(details.checkoutMode || details.checkout_mode || "").trim();
+  const limit =
+    normalizeInteger(details.limit) ??
+    normalizeInteger(getHeader(headers, "X-RateLimit-Limit"));
+  const remaining =
+    normalizeInteger(details.remaining) ??
+    normalizeInteger(getHeader(headers, "X-RateLimit-Remaining"));
+  const used = normalizeInteger(details.used);
+  const resetAfterSeconds =
+    normalizeInteger(details.resetAfterSeconds ?? details.reset_after_seconds) ??
+    normalizeInteger(details.retryAfterSeconds ?? details.retry_after_seconds);
+  const retryAfterSeconds =
+    normalizeInteger(details.retryAfterSeconds ?? details.retry_after_seconds) ??
+    normalizeInteger(resetAfterSeconds);
+  const retryAfterMs =
+    retryAfterSeconds !== undefined
+      ? retryAfterSeconds * 1000
+      : parseRetryAfterMs(getHeader(headers, "Retry-After"));
+  const headerReset = getHeader(headers, "X-RateLimit-Reset");
+  const headerPolicy = getHeader(headers, "X-RateLimit-Policy");
+
+  const quota = {
+    policy: policy || String(headerPolicy || "").trim() || undefined,
+    scope: scope || undefined,
+    limit,
+    remaining,
+    used,
+    unit: unit || undefined,
+    resetAfterSeconds,
+    resetAt: resetAt || String(headerReset || "").trim() || undefined,
+    retryAfterSeconds,
+    retryAfterMs,
+    upgradeUrl: upgradeUrl || undefined,
+    checkoutMode: checkoutMode || undefined,
+  };
+
+  for (const key of Object.keys(quota)) {
+    if (quota[key] === undefined || quota[key] === "") {
+      delete quota[key];
+    }
+  }
+
+  return Object.keys(quota).length > 0 ? quota : null;
+}
+
+function formatSeconds(seconds) {
+  const normalized = normalizeInteger(seconds);
+  if (normalized === undefined) {
+    return "";
+  }
+  if (normalized < 60) {
+    return `${normalized}s`;
+  }
+  const minutes = Math.ceil(normalized / 60);
+  if (minutes < 60) {
+    return `${minutes}m`;
+  }
+  const hours = Math.ceil(minutes / 60);
+  if (hours < 48) {
+    return `${hours}h`;
+  }
+  const days = Math.ceil(hours / 24);
+  return `${days}d`;
+}
+
+function buildProxyErrorMessage({ status, code, message, quota }) {
+  const parts = [`SentinelLayer LLM proxy error (${status}${code ? ` ${code}` : ""}): ${message || "Request denied"}`];
+  if (quota?.policy || quota?.scope) {
+    parts.push(`policy=${quota.policy || "unknown"}${quota.scope ? ` scope=${quota.scope}` : ""}`);
+  }
+  if (quota?.limit !== undefined || quota?.remaining !== undefined || quota?.used !== undefined) {
+    const unit = quota.unit ? ` ${quota.unit}` : "";
+    const limit = quota.limit !== undefined ? quota.limit : "?";
+    const remaining = quota.remaining !== undefined ? quota.remaining : "?";
+    const used = quota.used !== undefined ? quota.used : "?";
+    parts.push(`quota used=${used} remaining=${remaining} limit=${limit}${unit}`);
+  }
+  if (quota?.resetAt) {
+    parts.push(`resets at ${quota.resetAt}`);
+  } else if (quota?.resetAfterSeconds !== undefined) {
+    parts.push(`resets in ${formatSeconds(quota.resetAfterSeconds)}`);
+  } else if (quota?.retryAfterSeconds !== undefined) {
+    parts.push(`retry after ${formatSeconds(quota.retryAfterSeconds)}`);
+  }
+  if (quota?.upgradeUrl) {
+    parts.push(`upgrade: ${quota.upgradeUrl}`);
+  }
+  if (quota?.checkoutMode) {
+    parts.push(`checkout=${quota.checkoutMode}`);
+  }
+  return parts.join(" | ");
+}
+
+async function parseProxyErrorResponse(response) {
+  let payload = null;
+  let text = "";
+  try {
+    payload = await response.json();
+  } catch {
+    text = await response.text().catch(() => "");
+  }
+
+  const detailObject =
+    payload?.detail && typeof payload.detail === "object" && !Array.isArray(payload.detail)
+      ? payload.detail
+      : null;
+  const nestedError = chooseObject(payload?.error, detailObject?.error);
+  const details = chooseObject(
+    nestedError?.details,
+    nestedError?.detail,
+    payload?.details,
+    detailObject?.details,
+    detailObject
+  );
+  const code = String(
+    nestedError?.code ||
+      payload?.code ||
+      detailObject?.code ||
+      "PROXY_ERROR"
+  ).trim() || "PROXY_ERROR";
+  const message = String(
+    nestedError?.message ||
+      payload?.message ||
+      (typeof payload?.detail === "string" ? payload.detail : "") ||
+      detailObject?.message ||
+      text ||
+      "Request denied"
+  ).trim();
+  const requestId = String(
+    nestedError?.request_id ||
+      nestedError?.requestId ||
+      payload?.request_id ||
+      payload?.requestId ||
+      detailObject?.request_id ||
+      detailObject?.requestId ||
+      getHeader(response.headers, "x-request-id") ||
+      ""
+  ).trim();
+  const quota = normalizeQuotaDetails(details, response.headers);
+  const retryAfterMs =
+    quota?.retryAfterMs ??
+    parseRetryAfterMs(getHeader(response.headers, "Retry-After")) ??
+    normalizeInteger(nestedError?.retry_after_ms ?? payload?.retry_after_ms);
+
+  return {
+    code,
+    message,
+    requestId,
+    quota,
+    retryAfterMs,
+    raw: payload || text,
+  };
+}
+
+function isActionableProxyDenial(status, parsed) {
+  if (status === 402 || status === 403) {
+    return true;
+  }
+  if (ACTIONABLE_PROXY_DENIAL_CODES.has(String(parsed?.code || "").trim())) {
+    return true;
+  }
+  return Boolean(parsed?.quota?.policy || parsed?.quota?.upgradeUrl || parsed?.quota?.resetAt);
+}
+
+function buildProxyError(status, parsed) {
+  const retryAfterMs = parsed.retryAfterMs ?? parsed.quota?.retryAfterMs;
+  return new SentinelayerProxyError(
+    buildProxyErrorMessage({
+      status,
+      code: parsed.code,
+      message: parsed.message,
+      quota: parsed.quota,
+    }),
+    {
+      status,
+      code: parsed.code,
+      requestId: parsed.requestId,
+      retryAfterMs,
+      quota: parsed.quota,
+      raw: parsed.raw,
+    }
+  );
+}
 
 /**
  * Invoke LLM via SentinelLayer proxy.
@@ -128,15 +420,25 @@ export async function invokeViaProxy({
         clearTimeout(timeoutHandle);
       }
 
-      if (PROXY_RETRY_STATUSES.has(response.status) && attempt < PROXY_MAX_RETRIES) {
-        const retryAfter = response.headers.get("Retry-After");
-        const delay = retryAfter && !isNaN(retryAfter) ? Math.min(Number(retryAfter), 5) * 1000 : 500 * (attempt + 1);
+      if (response.ok) {
+        break;
+      }
+
+      const parsedError = await parseProxyErrorResponse(response);
+      const hardDenial = isActionableProxyDenial(response.status, parsedError);
+      if (!hardDenial && PROXY_RETRY_STATUSES.has(response.status) && attempt < PROXY_MAX_RETRIES) {
+        const retryAfter = getHeader(response.headers, "Retry-After");
+        const retryAfterSeconds = retryAfter && !Number.isNaN(Number(retryAfter)) ? Number(retryAfter) : null;
+        const delay = retryAfterSeconds !== null ? Math.min(retryAfterSeconds, 5) * 1000 : 500 * (attempt + 1);
         await new Promise((r) => setTimeout(r, delay));
         continue;
       }
 
-      break;
+      throw buildProxyError(response.status, parsedError);
     } catch (err) {
+      if (err instanceof SentinelayerProxyError) {
+        throw err;
+      }
       lastError = err;
       if (attempt >= PROXY_MAX_RETRIES) break;
       await new Promise((r) => setTimeout(r, 500 * (attempt + 1)));
@@ -147,17 +449,6 @@ export async function invokeViaProxy({
     throw new Error(`SentinelLayer LLM proxy request failed: ${lastError?.message || "no response"}`);
   }
 
-  if (!response.ok) {
-    let detail = "";
-    try {
-      const errBody = await response.json();
-      detail = errBody?.error?.message || errBody?.detail || JSON.stringify(errBody).slice(0, 200);
-    } catch {
-      detail = await response.text().catch(() => "");
-    }
-    throw new Error(`SentinelLayer LLM proxy error (${response.status}): ${detail}`);
-  }
-
   const result = await response.json();
 
   return {

package/src/audit/persona-loop.js

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 import path from "node:path";
 
 import { createMultiProviderApiClient } from "../ai/client.js";
+import { serializeProxyError } from "../ai/proxy.js";
 import { evaluateBudget } from "../cost/budget.js";
 import { estimateTokens } from "../cost/tokenizer.js";
 import { createAgentEvent } from "../events/schema.js";
@@ -866,9 +867,11 @@ async function runSinglePersonaAgenticLoop({
       });
     } catch (error) {
       status = "llm_error_fallback";
+      const proxyError = serializeProxyError(error);
       emit("llm_error", {
         turn: turnCount,
         error: error instanceof Error ? error.message : String(error),
+        ...(proxyError ? { proxyError } : {}),
       });
       break;
     }

package/src/legacy-cli.js

@@ -847,6 +847,35 @@ function hasCommandOption(args, optionName) {
   return args.some((arg) => String(arg || "").trim() === optionName);
 }
 
+// True when `targetPath` is a git work tree with an uncommitted or staged
+// change set. Used to default local Omar deep scope to changed-files (matching
+// gh's PR-scoped scan) instead of flooding a mature repo full-scope. Mirrors the
+// diff-filter the review pipeline uses for --diff/--staged scope. Fail-safe:
+// any error / non-git / no-delta returns false so the caller falls back to full.
+function hasGitDelta(targetPath) {
+  try {
+    const inside = spawnSync("git", ["-C", targetPath, "rev-parse", "--is-inside-work-tree"], {
+      encoding: "utf-8",
+    });
+    if (inside.status !== 0 || String(inside.stdout || "").trim() !== "true") {
+      return false;
+    }
+    const deltaProbes = [
+      ["-C", targetPath, "diff", "--name-only", "--diff-filter=ACMRTUXB"],
+      ["-C", targetPath, "diff", "--name-only", "--cached", "--diff-filter=ACMRTUXB"],
+    ];
+    for (const gitArgs of deltaProbes) {
+      const res = spawnSync("git", gitArgs, { encoding: "utf-8" });
+      if (res.status === 0 && String(res.stdout || "").trim().length > 0) {
+        return true;
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
+
 function resolveScopeModeFromOptions(args, { defaultMode = "full" } = {}) {
   const explicitMode = String(getCommandOptionValue(args, "--scope-mode") || "").trim().toLowerCase();
   const diffFlag = hasCommandOption(args, "--diff");
@@ -1264,7 +1293,6 @@ async function runLocalOmarGateCommand(args) {
   const asJson = hasCommandOption(args, "--json");
   const pathArg = getCommandOptionValue(args, "--path") || ".";
   const outputDirArg = getCommandOptionValue(args, "--output-dir") || "";
-  const scopeMode = resolveScopeModeFromOptions(args, { defaultMode: "full" });
   const aiEnabled = !hasCommandOption(args, "--no-ai");
   const aiDryRun = hasCommandOption(args, "--ai-dry-run");
   const maxCostUsd = parseFloat(getCommandOptionValue(args, "--max-cost") || "5.0") || 5.0;
@@ -1285,6 +1313,12 @@ async function runLocalOmarGateCommand(args) {
   if (!fs.existsSync(targetPath) || !fs.statSync(targetPath).isDirectory()) {
     throw new Error(`Invalid --path target: ${targetPath}`);
   }
+  // Default scope to changed-files when the target has a git delta (uncommitted
+  // or staged), matching gh's PR-scoped Omar; fall back to full repo otherwise.
+  // Explicit --scope-mode/--diff/--staged always override (see resolveScopeModeFromOptions).
+  const scopeMode = resolveScopeModeFromOptions(args, {
+    defaultMode: hasGitDelta(targetPath) ? "diff" : "full",
+  });
 
   if (!asJson) {
     printSection("Local Omar Gate Deep");

package/src/review/spec-binding.js

@@ -172,9 +172,9 @@ export function collectRouteLiteralsFromSource(source = "") {
   return [...endpointSet].sort((left, right) => left.localeCompare(right));
 }
 
-function buildSpecFinding({ ruleId, file, line = 1, message, excerpt, suggestedFix }) {
+function buildSpecFinding({ ruleId, file, line = 1, message, excerpt, suggestedFix, severity = "P2" }) {
   return {
-    severity: "P2",
+    severity,
     file,
     line,
     message,
@@ -433,6 +433,7 @@ export async function runSpecBindingChecks({
         pushFinding(
           buildSpecFinding({
             ruleId: "SL-SPEC-002",
+            severity: "P3",
             file: relativePath,
             line: detectEndpointLine(source, endpoint),
             message: "Endpoint change is missing from spec coverage.",
@@ -462,6 +463,7 @@ export async function runSpecBindingChecks({
         pushFinding(
           buildSpecFinding({
             ruleId: "SL-SPEC-002",
+            severity: "P3",
             file: relativePath,
             line: 1,
             message: "New source file is not represented in spec scope.",

package/src/session/daemon.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import process from "node:process";
 import fsp from "node:fs/promises";
 
-import { invokeViaProxy } from "../ai/proxy.js";
+import { invokeViaProxy, serializeProxyError } from "../ai/proxy.js";
 import { createAgentEvent } from "../events/schema.js";
 import {
   buildDocumentsFromBlackboardEntries,
@@ -496,6 +496,7 @@ async function buildHelpResponseMessage(
   let llmText = "";
   let fallbackPath = false;
   let fallbackReason = "";
+  let proxyError = null;
   let usage = {
     inputTokens: 0,
     outputTokens: 0,
@@ -556,6 +557,7 @@ async function buildHelpResponseMessage(
   } catch (error) {
     fallbackPath = true;
     fallbackReason = normalizeString(error?.message || error) || "Senti model invocation failed.";
+    proxyError = serializeProxyError(error);
   }
 
   if (!usage.latencyMs) {
@@ -579,6 +581,7 @@ async function buildHelpResponseMessage(
     usage,
     fallbackPath,
     fallbackReason,
+    proxyError,
     contextSignals: {
       documentCount: documents.length,
       memoryHits: memoryHits.length,
@@ -641,6 +644,7 @@ async function maybeRespondToHelpRequest(
       latencyMs: response.usage.latencyMs,
       fallbackPath: Boolean(response.fallbackPath),
       fallbackReason: response.fallbackReason || null,
+      proxyError: response.proxyError || null,
       contextSignals: response.contextSignals,
     },
     {