@tangle-network/agent-app 0.44.24 → 0.44.25

package/dist/chat-routes/index.js

@@ -93,7 +93,7 @@ import {
   flattenHistory,
   readSandboxBinaryBytes,
   statSandboxFileSize
-} from "../chunk-ALGZJBW2.js";
+} from "../chunk-Q74BS43G.js";
 import "../chunk-LWSJK546.js";
 import "../chunk-CQZSAR77.js";
 import "../chunk-ICOHEZK6.js";

package/dist/{chunk-ALGZJBW2.js → chunk-Q74BS43G.js}

@@ -32,6 +32,75 @@ var fail = (error) => ({
   error: error instanceof Error ? error : new Error(String(error))
 });
 
+// src/sandbox/model.ts
+function resolveModelSelection(config, override) {
+  const c = config ?? {};
+  const explicitBaseUrl = trimOrNull(c.routerBaseUrl);
+  const explicitApiKey = trimOrNull(override?.modelApiKey) ?? trimOrNull(c.apiKey);
+  const providerName = trimOrNull(c.providerName);
+  const openaiApiKey = trimOrNull(c.openaiApiKey);
+  const provider = providerName ?? (explicitApiKey ? "openai-compat" : openaiApiKey ? "openai" : void 0);
+  const overrideModel = trimOrNull(override?.model);
+  const configModel = trimOrNull(c.modelName);
+  const defaultModel = trimOrNull(c.defaultModel);
+  const modelName = overrideModel ?? configModel ?? (provider === "openai" || provider === "openai-compat" ? defaultModel : null);
+  if (!modelName) return { succeeded: true, value: void 0 };
+  const source = overrideModel ? "override" : configModel ? "config" : "default";
+  if (!provider) return { succeeded: false, error: "no_provider", model: modelName, source };
+  const apiKey = explicitApiKey ?? (provider === "openai" ? openaiApiKey : void 0);
+  if (!apiKey && !c.allowKeylessModel) {
+    return { succeeded: false, error: "no_api_key", model: modelName, provider, source };
+  }
+  return {
+    succeeded: true,
+    value: {
+      model: modelName,
+      provider,
+      ...apiKey ? { apiKey } : {},
+      ...explicitBaseUrl ? { baseUrl: explicitBaseUrl } : {}
+    }
+  };
+}
+function resolveModel(config, override) {
+  const selection = resolveModelSelection(config, override);
+  return selection.succeeded ? selection.value : void 0;
+}
+var SandboxModelResolutionError = class extends Error {
+  code;
+  model;
+  provider;
+  source;
+  constructor(failure, context) {
+    const missing = failure.error === "no_provider" ? "no provider could be resolved for it" : `provider "${failure.provider}" resolved but no API key is configured`;
+    const fix = failure.error === "no_provider" ? "set providerName explicitly (provider cannot be inferred without one)" : 'set apiKey (or openaiApiKey when provider is "openai"), or pass allowKeylessModel:true to mint a keyless box';
+    super(
+      `${context}: model "${failure.model}" (from ${failure.source}) is not transportable \u2014 ${missing}. Fix: ${fix}. The requested model was NOT sent to the box.`
+    );
+    this.name = "SandboxModelResolutionError";
+    this.code = failure.error;
+    this.model = failure.model;
+    if (failure.error === "no_api_key") this.provider = failure.provider;
+    this.source = failure.source;
+  }
+};
+function requireTransportableModel(selection, context) {
+  if (selection.succeeded) return selection.value;
+  if (selection.source === "override") {
+    throw new SandboxModelResolutionError(selection, context);
+  }
+  const reason = selection.error === "no_api_key" ? `provider "${selection.provider}" has no api key` : "no provider resolved";
+  if (selection.source === "config") {
+    console.error(
+      `[sandbox] ${context}: dropping configured provider.modelName "${selection.model}" (${reason}); the box will use its own default model \u2014 set allowKeylessModel:true to bake a keyless model, or configure an api key`
+    );
+  } else {
+    console.error(
+      `[sandbox] ${context}: dropping provider.defaultModel "${selection.model}" (${reason}); using the box default`
+    );
+  }
+  return void 0;
+}
+
 // src/sandbox/binary-read.ts
 function shellQuote(value) {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
@@ -1271,7 +1340,7 @@ async function ensureWorkspaceSandbox(shell, options) {
   const { leanProfile, deferredFiles } = shell.deferProfileFiles ? splitDeferredProfileFiles(fullProfile) : { leanProfile: fullProfile, deferredFiles: [] };
   const profile = leanProfile;
   const role = userId && shell.permissionRole ? shell.permissionRole("developer") : void 0;
-  let model = shell.backendModelAtCreate ? resolveModel(shell.provider) : void 0;
+  let model = shell.backendModelAtCreate ? requireTransportableModel(resolveModelSelection(shell.provider), `backendModelAtCreate for ${name}`) : void 0;
   if (model && shell.childKeyMint && model.provider === "openai-compat") {
     const minted = await shell.childKeyMint(scope);
     if (minted.succeeded) model = { ...model, apiKey: minted.value };
@@ -1337,22 +1406,6 @@ async function ensureWorkspaceSandbox(shell, options) {
   }
   return box;
 }
-function resolveModel(config, override) {
-  const c = config ?? {};
-  const explicitBaseUrl = c.routerBaseUrl;
-  const explicitApiKey = override?.modelApiKey ?? c.apiKey;
-  const provider = c.providerName ?? (explicitApiKey ? "openai-compat" : c.openaiApiKey ? "openai" : void 0);
-  const modelName = override?.model ?? c.modelName ?? (provider === "openai" || provider === "openai-compat" ? c.defaultModel : void 0);
-  const apiKey = explicitApiKey ?? (provider === "openai" ? c.openaiApiKey : void 0);
-  if (!provider || !modelName) return void 0;
-  if (!apiKey && !c.allowKeylessModel) return void 0;
-  return {
-    model: modelName,
-    provider,
-    ...apiKey ? { apiKey } : {},
-    ...explicitBaseUrl ? { baseUrl: explicitBaseUrl } : {}
-  };
-}
 function historyTranscript(history) {
   return history.map((entry) => `${entry.role === "assistant" ? "Assistant" : "User"}: ${entry.content}`).join("\n\n");
 }
@@ -1398,10 +1451,13 @@ function attachReasoningEffort(profile, harness, effort) {
 }
 async function* streamSandboxPrompt(shell, box, message, options) {
   const harness = options?.harness ?? "opencode";
-  const model = resolveModel(shell.provider, {
-    model: options?.model,
-    modelApiKey: options?.modelApiKey
-  });
+  const model = requireTransportableModel(
+    resolveModelSelection(shell.provider, {
+      model: options?.model,
+      modelApiKey: options?.modelApiKey
+    }),
+    "streamSandboxPrompt"
+  );
   if (model?.model) assertHarnessModelCompatible(harness, model.model);
   const prompt = typeof message === "string" ? flattenHistory(message, options?.history) : mergeHistoryIntoParts(message, options?.history);
   const appToolMcp = options?.appToolMcp ?? {};
@@ -1574,10 +1630,13 @@ async function mintSandboxScopedToken(box, options) {
 }
 async function driveSandboxTurn(shell, box, message, options) {
   const harness = options.harness ?? "opencode";
-  const model = resolveModel(shell.provider, {
-    model: options.model,
-    modelApiKey: options.modelApiKey
-  });
+  const model = requireTransportableModel(
+    resolveModelSelection(shell.provider, {
+      model: options.model,
+      modelApiKey: options.modelApiKey
+    }),
+    "driveSandboxTurn"
+  );
   if (model?.model) assertHarnessModelCompatible(harness, model.model);
   const prompt = typeof message === "string" ? flattenHistory(message, options.history) : mergeHistoryIntoParts(message, options.history);
   const appToolMcp = options.appToolMcp ?? {};
@@ -1653,6 +1712,10 @@ function firstQuestionText(value) {
 }
 
 export {
+  resolveModelSelection,
+  resolveModel,
+  SandboxModelResolutionError,
+  requireTransportableModel,
   shellQuote,
   statSandboxFileSize,
   readSandboxBinaryBytes,
@@ -1694,7 +1757,6 @@ export {
   assertEnvWithinLimits,
   peekWorkspaceSandbox,
   ensureWorkspaceSandbox,
-  resolveModel,
   flattenHistory,
   mergeHistoryIntoParts,
   mergeExtraMcp,
@@ -1715,4 +1777,4 @@ export {
   isTerminalPromptEvent,
   detectInteractiveQuestion
 };
-//# sourceMappingURL=chunk-ALGZJBW2.js.map
+//# sourceMappingURL=chunk-Q74BS43G.js.map