@schoolai/shipyard 3.9.1 → 3.10.0-rc.20260609.1

package/dist/{chunk-7AB4NH6T.js → chunk-EI4HMJ54.js}

@@ -10,7 +10,7 @@ import {
   run,
   runWithTimeout,
   truncateDiff
-} from "./chunk-7OD3UJUP.js";
+} from "./chunk-6LINHACK.js";
 import {
   gitExecSafe
 } from "./chunk-4T2OQAVL.js";
@@ -19,13 +19,13 @@ import {
   CODEX_RUNTIME_ID,
   CURSOR_RUNTIME_ID,
   detectMCPServers
-} from "./chunk-MCDZOOAI.js";
+} from "./chunk-RW2OTTUA.js";
 import {
   isEnoent
 } from "./chunk-RR6V6SNM.js";
 import {
   detectSkills
-} from "./chunk-LBTLMT5Z.js";
+} from "./chunk-2EQOL57Z.js";
 import {
   createOneShotPool
 } from "./chunk-ZFKJAYAN.js";
@@ -48,21 +48,21 @@ import {
   isImageMimeType,
   toRecord,
   toSdkContent
-} from "./chunk-AVF7LE7Q.js";
+} from "./chunk-VKCGK333.js";
 import {
   AnthropicAuthStatusSchema,
   CodexAuthStatusSchema,
   CursorAuthStatusSchema,
   PermissionModeSchema
-} from "./chunk-DGX2QR6G.js";
+} from "./chunk-4PBXNWJV.js";
 import {
   logger
-} from "./chunk-3SXIJEPM.js";
+} from "./chunk-QJP7JCIS.js";
 import {
   getShipyardHome,
   resolveNodeExecPath,
   validateEnv
-} from "./chunk-MLEGFDFW.js";
+} from "./chunk-Z37T5W6S.js";
 import {
   external_exports
 } from "./chunk-CNR7O5YH.js";
@@ -79,16 +79,18 @@ function codexAuthFilePath() {
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isCodexTokens(value) {
+  if (!isPlainObject(value)) return false;
+  if (value.access_token !== void 0 && typeof value.access_token !== "string") return false;
+  if (value.id_token !== void 0 && typeof value.id_token !== "string") return false;
+  return value.account_id === void 0 || value.account_id === null || typeof value.account_id === "string";
+}
 function isCodexAuthFile(value) {
   if (!isPlainObject(value)) return false;
   if (value.OPENAI_API_KEY !== void 0 && value.OPENAI_API_KEY !== null && typeof value.OPENAI_API_KEY !== "string")
     return false;
   const tokens = value.tokens;
-  if (tokens !== void 0 && tokens !== null) {
-    if (!isPlainObject(tokens)) return false;
-    if (tokens.access_token !== void 0 && typeof tokens.access_token !== "string") return false;
-    if (tokens.id_token !== void 0 && typeof tokens.id_token !== "string") return false;
-  }
+  if (tokens !== void 0 && tokens !== null && !isCodexTokens(tokens)) return false;
   return true;
 }
 function parseIdTokenClaims(idToken) {
@@ -115,16 +117,29 @@ function classifyJwtFreshness(token, nowSeconds, nowOffsetSeconds = 60) {
   if (exp <= nowSeconds + nowOffsetSeconds) return "expired";
   return "fresh";
 }
-function extractIdentity(claims) {
+function readNamespacedClaim(claims, namespace, field2) {
+  const ns = claims[namespace];
+  return isPlainObject(ns) ? ns[field2] : void 0;
+}
+function extractIdentity(claims, fileAccountId) {
   const result = {};
-  const emailCandidates = [claims.chatgpt_account_email, claims.email];
+  const emailCandidates = [
+    claims.chatgpt_account_email,
+    claims.email,
+    readNamespacedClaim(claims, "https://api.openai.com/profile", "email")
+  ];
   for (const c of emailCandidates) {
     if (typeof c === "string" && c.length > 0) {
       result.email = c;
       break;
     }
   }
-  const accountCandidates = [claims.account_id, claims.chatgpt_account_id];
+  const accountCandidates = [
+    fileAccountId,
+    readNamespacedClaim(claims, "https://api.openai.com/auth", "chatgpt_account_id"),
+    claims.account_id,
+    claims.chatgpt_account_id
+  ];
   for (const c of accountCandidates) {
     if (typeof c === "string" && c.length > 0) {
       result.accountId = c;
@@ -170,14 +185,10 @@ function detectChatgpt(file, nowSeconds) {
     method: "chatgpt"
   };
   const idToken = file.tokens?.id_token;
-  if (idToken && idToken.length > 0) {
-    const claims = parseIdTokenClaims(idToken);
-    if (claims) {
-      const identity = extractIdentity(claims);
-      if (identity.email) auth.email = identity.email;
-      if (identity.accountId) auth.accountId = identity.accountId;
-    }
-  }
+  const claims = idToken && idToken.length > 0 ? parseIdTokenClaims(idToken) : null;
+  const identity = extractIdentity(claims ?? {}, file.tokens?.account_id);
+  if (identity.email) auth.email = identity.email;
+  if (identity.accountId) auth.accountId = identity.accountId;
   return { kind: "detected", auth };
 }
 function detectApiKey() {
@@ -305,6 +316,7 @@ function decideCodexAuthRefresh(result, lastKnown) {
 
 // src/shared/observability/bootstrap-phase.ts
 var metricsSink = null;
+var breadcrumbSink = null;
 var accumulator = [];
 var inFlightPhases = /* @__PURE__ */ new Set();
 var startupBootStart = performance.now();
@@ -312,6 +324,9 @@ var startupCompleteEmitted = false;
 function setBootstrapPhaseMetricsSink(sink) {
   metricsSink = sink;
 }
+function setBootstrapPhaseBreadcrumbSink(sink) {
+  breadcrumbSink = sink;
+}
 function logInFlightPhasesAsKilled() {
   const now = performance.now();
   const snapshot = [...inFlightPhases];
@@ -338,6 +353,7 @@ async function bootstrapPhase(name, fn) {
   const tracker = { name, start };
   inFlightPhases.add(tracker);
   safeLog("info", { event: "bootstrap_phase_start", phase: name });
+  safeRecordBreadcrumb(name);
   try {
     const result = await fn();
     if (!inFlightPhases.delete(tracker)) return result;
@@ -389,6 +405,13 @@ function emitStartupComplete() {
     phases: accumulator
   });
 }
+function getCurrentBootPhase() {
+  let latest;
+  for (const phase of inFlightPhases) latest = phase;
+  if (latest) return latest.name;
+  const last = accumulator.at(-1);
+  return last ? last.name : "unknown";
+}
 function safeLog(level, obj) {
   try {
     if (level === "info") logger.info(obj);
@@ -404,6 +427,14 @@ function safeEmit(eventType, payload) {
   } catch {
   }
 }
+function safeRecordBreadcrumb(phase) {
+  const sink = breadcrumbSink;
+  if (!sink) return;
+  try {
+    sink(phase);
+  } catch {
+  }
+}
 
 // src/shared/capabilities/effort-probe.ts
 import { existsSync as existsSync2 } from "fs";
@@ -1076,8 +1107,9 @@ function classifyStreamEvent(message) {
 }
 function convertAssistantBlock(block, parentToolUseId) {
   if (!isRecord(block)) return null;
+  const parentField = parentToolUseId != null ? { parentToolUseId } : {};
   if (block.type === "text") {
-    return typeof block.text === "string" ? { type: "text", text: block.text } : null;
+    return typeof block.text === "string" ? { type: "text", text: block.text, ...parentField } : null;
   }
   if (block.type === "tool_use") {
     if (typeof block.id !== "string" || typeof block.name !== "string") return null;
@@ -1090,10 +1122,10 @@ function convertAssistantBlock(block, parentToolUseId) {
     };
   }
   if (block.type === "thinking") {
-    return typeof block.thinking === "string" && block.thinking.length > 0 ? { type: "thinking", text: block.thinking } : null;
+    return typeof block.thinking === "string" && block.thinking.length > 0 ? { type: "thinking", text: block.thinking, ...parentField } : null;
   }
   if (block.type === "redacted_thinking") {
-    return { type: "thinking", text: REDACTED_THINKING_PLACEHOLDER };
+    return { type: "thinking", text: REDACTED_THINKING_PLACEHOLDER, ...parentField };
   }
   return null;
 }
@@ -1105,6 +1137,10 @@ function convertAssistantContent(content, parentToolUseId) {
   }
   return blocks;
 }
+function skipForMainChannel(content) {
+  if (content.length === 0) return true;
+  return content.every((b) => "parentToolUseId" in b && b.parentToolUseId != null);
+}
 function flattenRawToolResultContent(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
@@ -3122,7 +3158,7 @@ var CODEX_MODEL_CATALOG = withCapabilityTiers([
 
 // src/services/session/profiles/codex-profile.ts
 var execFileAsync = promisify(execFile);
-var CODEX_BUNDLED_VERSION = "0.135.0";
+var CODEX_BUNDLED_VERSION = "0.138.0";
 function codexPermissionModeMap(mode) {
   switch (mode) {
     case "default":
@@ -6344,6 +6380,10 @@ async function detectModels(lastKnown) {
   }
   return models;
 }
+var PICKER_HIDDEN_MODEL_IDS = /* @__PURE__ */ new Set(["gpt-5.3-codex"]);
+function pickerVisibleModels(models) {
+  return models.filter((model) => !PICKER_HIDDEN_MODEL_IDS.has(model.id));
+}
 var INTENSITY_ORDER = [
   "low",
   "medium",
@@ -6380,7 +6420,9 @@ function toModelInfo(profile, model, efforts = model.supportedEfforts) {
   };
 }
 function buildCatalogModelInfos() {
-  return profileRegistry.list().flatMap((profile) => profile.models.map((model) => toModelInfo(profile, model)));
+  return profileRegistry.list().flatMap(
+    (profile) => pickerVisibleModels(profile.models).map((model) => toModelInfo(profile, model))
+  );
 }
 async function collectProfileModels(profile) {
   let binaryPath = null;
@@ -6407,7 +6449,7 @@ async function collectProfileModels(profile) {
       return probed.has(e);
     });
   };
-  return profile.models.map(
+  return pickerVisibleModels(profile.models).map(
     (model) => toModelInfo(profile, model, filterEfforts(model.supportedEfforts))
   );
 }
@@ -7982,8 +8024,10 @@ export {
   detectCodexAuth,
   REFRESH_DEBOUNCE_MS,
   setBootstrapPhaseMetricsSink,
+  setBootstrapPhaseBreadcrumbSink,
   bootstrapPhase,
   emitStartupComplete,
+  getCurrentBootPhase,
   resolveClaudeBinaryPath,
   getSupportedEfforts,
   getSupportedEffortsSync,
@@ -7995,6 +8039,7 @@ export {
   REDACTED_THINKING_PLACEHOLDER,
   classifyMessage,
   convertAssistantContent,
+  skipForMainChannel,
   extractToolResults,
   convertUserContent,
   estimateCodexCost,
@@ -8090,4 +8135,4 @@ export {
   refreshInstalledAgents,
   refreshCodexAuthSlice
 };
-//# sourceMappingURL=chunk-7AB4NH6T.js.map
+//# sourceMappingURL=chunk-EI4HMJ54.js.map