@schoolai/shipyard 3.10.0-rc.20260609.0 → 3.10.0

package/dist/capability-detector-worker.js

@@ -3,7 +3,7 @@ import {
   detectCapabilities,
   refreshMcpServers,
   registerBuiltInProfiles
-} from "./chunk-Q2HUVPOL.js";
+} from "./chunk-EI4HMJ54.js";
 import "./chunk-GM6MH4CD.js";
 import {
   getRepoMetadata
@@ -15,7 +15,7 @@ import {
 import "./chunk-RR6V6SNM.js";
 import "./chunk-2EQOL57Z.js";
 import "./chunk-ZFKJAYAN.js";
-import "./chunk-WMOR5Q6C.js";
+import "./chunk-VKCGK333.js";
 import "./chunk-4PBXNWJV.js";
 import "./chunk-EHQITHQX.js";
 import "./chunk-X3MULCV5.js";

package/dist/{chunk-Q2HUVPOL.js → chunk-EI4HMJ54.js}

@@ -48,7 +48,7 @@ import {
   isImageMimeType,
   toRecord,
   toSdkContent
-} from "./chunk-WMOR5Q6C.js";
+} from "./chunk-VKCGK333.js";
 import {
   AnthropicAuthStatusSchema,
   CodexAuthStatusSchema,
@@ -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() {
@@ -1096,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;
@@ -1110,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;
 }
@@ -1125,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 "";
@@ -3142,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":
@@ -8023,6 +8039,7 @@ export {
   REDACTED_THINKING_PLACEHOLDER,
   classifyMessage,
   convertAssistantContent,
+  skipForMainChannel,
   extractToolResults,
   convertUserContent,
   estimateCodexCost,
@@ -8118,4 +8135,4 @@ export {
   refreshInstalledAgents,
   refreshCodexAuthSlice
 };
-//# sourceMappingURL=chunk-Q2HUVPOL.js.map
+//# sourceMappingURL=chunk-EI4HMJ54.js.map