@schoolai/shipyard 3.18.0 → 3.18.1-rc.20260629.1

package/dist/{chunk-NIVME6MT.js → chunk-LN2AW36U.js}

@@ -10,7 +10,7 @@ import {
   run,
   runWithTimeout,
   truncateDiff
-} from "./chunk-LXIRZZFC.js";
+} from "./chunk-D6RYU2JU.js";
 import {
   gitExecSafe
 } from "./chunk-4T2OQAVL.js";
@@ -19,7 +19,7 @@ import {
   CODEX_RUNTIME_ID,
   CURSOR_RUNTIME_ID,
   detectMCPServers
-} from "./chunk-UTLVWPBT.js";
+} from "./chunk-VDK5N7EH.js";
 import {
   isEnoent
 } from "./chunk-RR6V6SNM.js";
@@ -38,7 +38,7 @@ import {
   formatTaskFeedback,
   toRecord,
   toSdkContent
-} from "./chunk-72CO4KIJ.js";
+} from "./chunk-E74MXZWW.js";
 import {
   AGENT_IDS,
   AGENT_SYSTEM_CLAUDE_CODE,
@@ -50,14 +50,14 @@ import {
   REASONING_EFFORTS,
   inflateToolResultContent,
   isImageMimeType
-} from "./chunk-ETUNY4NF.js";
+} from "./chunk-BK24XTBR.js";
 import {
   AnthropicAuthStatusSchema,
   CodexAuthStatusSchema,
   CursorAuthStatusSchema,
   PermissionModeSchema,
   TESTED_CODEX_VERSION
-} from "./chunk-UD4BVZOD.js";
+} from "./chunk-PXZCSRS5.js";
 import {
   logger
 } from "./chunk-X53VIV2J.js";
@@ -650,6 +650,38 @@ async function readEffortArrayFromBinary(binaryPath) {
   }
 }
 
+// src/shared/observability/watchdog-context.ts
+var currentLabel = null;
+var prevCompletedLabel = null;
+var prevCompletedDurationMs = 0;
+var prevCompletedAtMs = 0;
+async function withLabelAsync(name, fn) {
+  const priorLabel = currentLabel;
+  const start = Date.now();
+  currentLabel = name;
+  try {
+    return await fn();
+  } finally {
+    const completedAt = Date.now();
+    prevCompletedLabel = name;
+    prevCompletedDurationMs = completedAt - start;
+    prevCompletedAtMs = completedAt;
+    currentLabel = priorLabel;
+  }
+}
+function getCurrentWatchdogLabel() {
+  return currentLabel;
+}
+function getPreviousWatchdogLabel() {
+  return prevCompletedLabel;
+}
+function getPreviousWatchdogDurationMs() {
+  return prevCompletedDurationMs;
+}
+function getPreviousWatchdogCompletedAtMs() {
+  return prevCompletedAtMs;
+}
+
 // src/shared/capabilities/env-methods.ts
 function resolveEnvMethod(env) {
   if (env.CLAUDE_CODE_USE_BEDROCK) return { method: "bedrock", envVar: "CLAUDE_CODE_USE_BEDROCK" };
@@ -993,6 +1025,10 @@ function extractXmlTag(xml, tag) {
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
+function toRateLimitInfo(info) {
+  const { rateLimitType, ...rest } = info;
+  return rateLimitType === "seven_day_overage_included" ? rest : { ...rest, rateLimitType };
+}
 function classifyMessage(message, log) {
   switch (message.type) {
     case "system":
@@ -1040,7 +1076,7 @@ function classifyMessage(message, log) {
         toolUseIds: message.preceding_tool_use_ids
       };
     case "rate_limit_event":
-      return { type: "rate_limit", info: message.rate_limit_info };
+      return { type: "rate_limit", info: toRateLimitInfo(message.rate_limit_info) };
     case "prompt_suggestion":
       return null;
     default: {
@@ -5009,7 +5045,7 @@ var cursorProfile = {
     canInjectInputMidRun: false
   },
   /**
-   * Rewind contract — `@cursor/sdk@1.0.13` has no live-rollback RPC, but the
+   * Rewind contract — `@cursor/sdk@1.0.22` has no live-rollback RPC, but the
    * conversation lives in a git-shaped Merkle tree (per-agent `store.db`), so a
    * rewind is a lossless head re-point + ledger trim, done on disk while no SDK
    * process holds the store. We declare `dropLastTurns` (the divider lights up
@@ -5216,13 +5252,11 @@ var cursorProfile = {
    */
   authDetector: cursorAuthDetectorBinding,
   /**
-   * Cursor reports per-call cost via the SDK — but the SDK surface in
-   * 1.0.13 does not expose a stable accessor for cost dollars at the
-   * frame level. Set `reported` per v2 plan §5.8; the daemon's billing
-   * pipeline reads cost off the runner's `run_complete` payload when
-   * present and treats absence as null (no synthetic estimate).
+   * Cursor reports token usage via the SDK, but Shipyard applies local Cursor
+   * catalog pricing when `run_complete` arrives, so the emitted turn cost is
+   * still an estimate rather than vendor-reported dollars.
    */
-  costReporting: "reported",
+  costReporting: "estimated",
   costEstimator: null,
   tokenUsageFieldMap: {
     /**
@@ -5255,7 +5289,7 @@ var cursorProfile = {
         {
           event: "cursor_subagent_terminate_noop",
           subagentId,
-          reason: "Cursor SDK has no targeted subagent-kill RPC at v1.0.13."
+          reason: "Cursor SDK has no targeted subagent-kill RPC at v1.0.22."
         },
         "cursor_subagent_terminate_noop"
       );
@@ -5357,7 +5391,7 @@ var cursorProfile = {
     }
   },
   /**
-   * MCP auth idioms — Cursor 1.0.13 exposes no MCP-auth API
+   * MCP auth idioms — Cursor 1.0.22 exposes no MCP-auth API
    * (`canMcpOauth: false`). The strings here match Claude's shape for
    * contract uniformity but are never reached at runtime.
    */
@@ -5506,38 +5540,6 @@ import { readFile as readFile6 } from "fs/promises";
 import { homedir as homedir8 } from "os";
 import { join as join10 } from "path";
 
-// src/shared/observability/watchdog-context.ts
-var currentLabel = null;
-var prevCompletedLabel = null;
-var prevCompletedDurationMs = 0;
-var prevCompletedAtMs = 0;
-async function withLabelAsync(name, fn) {
-  const priorLabel = currentLabel;
-  const start = Date.now();
-  currentLabel = name;
-  try {
-    return await fn();
-  } finally {
-    const completedAt = Date.now();
-    prevCompletedLabel = name;
-    prevCompletedDurationMs = completedAt - start;
-    prevCompletedAtMs = completedAt;
-    currentLabel = priorLabel;
-  }
-}
-function getCurrentWatchdogLabel() {
-  return currentLabel;
-}
-function getPreviousWatchdogLabel() {
-  return prevCompletedLabel;
-}
-function getPreviousWatchdogDurationMs() {
-  return prevCompletedDurationMs;
-}
-function getPreviousWatchdogCompletedAtMs() {
-  return prevCompletedAtMs;
-}
-
 // src/shared/capabilities/agent-providers-cache.ts
 import { mkdir, readFile, rename, stat, unlink, writeFile } from "fs/promises";
 import { dirname as dirname2, join as join4 } from "path";
@@ -5677,6 +5679,7 @@ function buildAgent(id, name, version) {
 }
 var sessionClaudeVersionCache = null;
 var inflightClaudeRevalidation = null;
+var pendingSessionVersionCachePersists = /* @__PURE__ */ new Set();
 async function loadAgentProvidersFromDisk() {
   if (sessionClaudeVersionCache !== null) return false;
   const entry = await loadClaudeVersionCache();
@@ -5700,7 +5703,7 @@ async function loadAgentProvidersFromDisk() {
 }
 function persistSessionVersionCache(cache) {
   if (!cache.version || cache.binaryMtimeMs == null) return;
-  void saveClaudeVersionCache({
+  const persist = saveClaudeVersionCache({
     binaryPath: cache.binaryPath,
     version: cache.version,
     binaryMtimeMs: cache.binaryMtimeMs,
@@ -5710,7 +5713,10 @@ function persistSessionVersionCache(cache) {
       { binaryPath: cache.binaryPath, version: cache.version },
       "claude_code_version_cache_persisted"
     );
+  }).finally(() => {
+    pendingSessionVersionCachePersists.delete(persist);
   });
+  pendingSessionVersionCachePersists.add(persist);
 }
 function isAuthoritativeNotFound(err) {
   if (!(err instanceof Error)) return false;
@@ -6770,6 +6776,71 @@ async function findRenames(cwd, oldRef, newRef) {
   return result;
 }
 
+// src/services/pr-poll-plan.ts
+var DAEMON_PR_POLL_INTERVAL_MS = 6e4;
+var DAEMON_PR_POLL_MAX_CONCURRENT = 4;
+var DAEMON_PR_POLL_RATE_LIMIT_BACKOFF_MS = 5 * 6e4;
+function isDaemonPrPollEligible(task) {
+  if (!task.cwd) return false;
+  if (task.archivedAt !== null) return false;
+  if (task.status === "completed" || task.status === "canceled") return false;
+  if (task.mergedAt !== null) return false;
+  if (task.prState === "closed" || task.prState === "merged") return false;
+  if (task.prState === "open" || task.prState === "draft") return true;
+  return task.prUrl !== null;
+}
+function decidePrPollPlan(tasks, now, lastPolledAt, rateLimitState, options = {}) {
+  if (rateLimitState.backoffUntil !== null && now < rateLimitState.backoffUntil) return [];
+  const intervalMs = options.intervalMs ?? DAEMON_PR_POLL_INTERVAL_MS;
+  const maxConcurrentPolls = options.maxConcurrentPolls ?? DAEMON_PR_POLL_MAX_CONCURRENT;
+  if (maxConcurrentPolls <= 0) return [];
+  return tasks.filter((task) => {
+    if (!isDaemonPrPollEligible(task)) return false;
+    const last = lastPolledAt.get(task.taskId);
+    return last === void 0 || now - last >= intervalMs;
+  }).sort((a, b) => {
+    const aLast = lastPolledAt.get(a.taskId) ?? Number.NEGATIVE_INFINITY;
+    const bLast = lastPolledAt.get(b.taskId) ?? Number.NEGATIVE_INFINITY;
+    if (aLast !== bLast) return aLast - bLast;
+    return a.taskId.localeCompare(b.taskId);
+  }).slice(0, maxConcurrentPolls).map((task) => task.taskId);
+}
+
+// src/shared/capabilities/github-read-backoff.ts
+var GITHUB_READ_FAILURE_BACKOFF_MS = 6e4;
+var currentBackoff = null;
+function messageFor(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function isExpectedNoPullRequest(err) {
+  const message = messageFor(err).toLowerCase();
+  return message.includes("no pull requests found") || message.includes("no pull request found");
+}
+function classifyGithubReadFailure(err) {
+  if (isExpectedNoPullRequest(err)) return null;
+  const message = messageFor(err).toLowerCase();
+  const isRateLimit = message.includes("secondary rate") || message.includes("abuse detection") || message.includes("rate limit") || message.includes("http 403") || message.includes("status code 403");
+  return {
+    backoffUntil: Date.now() + (isRateLimit ? DAEMON_PR_POLL_RATE_LIMIT_BACKOFF_MS : GITHUB_READ_FAILURE_BACKOFF_MS),
+    reason: isRateLimit ? "github_rate_limit" : "github_read_failure"
+  };
+}
+function recordGithubReadFailure(err) {
+  const next = classifyGithubReadFailure(err);
+  if (!next) return;
+  if (currentBackoff && currentBackoff.backoffUntil >= next.backoffUntil) return;
+  currentBackoff = next;
+}
+function getGithubReadBackoffState(now = Date.now()) {
+  if (currentBackoff && now >= currentBackoff.backoffUntil) {
+    currentBackoff = null;
+  }
+  return {
+    backoffUntil: currentBackoff?.backoffUntil ?? null,
+    reason: currentBackoff?.reason ?? null
+  };
+}
+
 // src/shared/capabilities/git-pr-search.ts
 var SEARCH_PR_JSON_FIELDS = "number,title,url,state,isDraft,author,labels,updatedAt,createdAt,assignees,repository,commentsCount";
 var PR_VIEW_JSON_FIELDS = "baseRefName,headRefName,headRepository,isCrossRepository,reviewDecision,additions,deletions,changedFiles,comments,reviewRequests";
@@ -7226,7 +7297,8 @@ async function getPRForCurrentBranch(cwd) {
       return null;
     }
     return mapGhPRToPRData(parseResult.data);
-  } catch {
+  } catch (err) {
+    recordGithubReadFailure(err);
     return null;
   }
 }
@@ -7249,7 +7321,8 @@ async function getAssignedReviews(cwd) {
     const parseResult = GhPRListResponseSchema.safeParse(JSON.parse(result.value.trim()));
     if (!parseResult.success) return [];
     return parseResult.data.map(mapGhPRToPRData);
-  } catch {
+  } catch (err) {
+    recordGithubReadFailure(err);
     return [];
   }
 }
@@ -7287,7 +7360,8 @@ async function getPRByBranch(cwd, branch) {
       return b.updatedAt - a.updatedAt;
     });
     return prs[0] ?? null;
-  } catch {
+  } catch (err) {
+    recordGithubReadFailure(err);
     return null;
   }
 }
@@ -7312,7 +7386,8 @@ async function getUserPRs(cwd) {
     const parseResult = GhPRListResponseSchema.safeParse(JSON.parse(result.value.trim()));
     if (!parseResult.success) return [];
     return parseResult.data.map(mapGhPRToPRData);
-  } catch {
+  } catch (err) {
+    recordGithubReadFailure(err);
     return [];
   }
 }
@@ -8067,6 +8142,7 @@ export {
   resolveClaudeBinaryPath,
   getSupportedEfforts,
   getSupportedEffortsSync,
+  withLabelAsync,
   getCurrentWatchdogLabel,
   getPreviousWatchdogLabel,
   getPreviousWatchdogDurationMs,
@@ -8140,6 +8216,11 @@ export {
   getStackFiles,
   getFileAtRef,
   findRenames,
+  DAEMON_PR_POLL_INTERVAL_MS,
+  isDaemonPrPollEligible,
+  decidePrPollPlan,
+  recordGithubReadFailure,
+  getGithubReadBackoffState,
   searchPrs,
   notificationsSince,
   getPRForCurrentBranch,
@@ -8174,4 +8255,4 @@ export {
   refreshInstalledAgents,
   refreshCodexAuthSlice
 };
-//# sourceMappingURL=chunk-NIVME6MT.js.map
+//# sourceMappingURL=chunk-LN2AW36U.js.map