@tangle-network/agent-app 0.47.13 → 0.47.15

package/dist/chat-routes/index.js

@@ -41,7 +41,7 @@ import {
   flattenHistory,
   readSandboxBinaryBytes,
   statSandboxFileSize
-} from "../chunk-P6YXUGNA.js";
+} from "../chunk-XR5ZXMYL.js";
 import "../chunk-MCYJON3F.js";
 import "../chunk-LWSJK546.js";
 import "../chunk-P5PIAQVS.js";

package/dist/{chunk-P6YXUGNA.js → chunk-XR5ZXMYL.js}

@@ -1,5 +1,7 @@
 import {
-  assertHarnessModelCompatible
+  DEFAULT_HARNESS,
+  assertHarnessModelCompatible,
+  isHarness
 } from "./chunk-MCYJON3F.js";
 import {
   assertProfilePromptWithinBudget,
@@ -18,6 +20,7 @@ import {
   Sandbox
 } from "@tangle-network/sandbox/core";
 import { createHash } from "crypto";
+import { mergeAgentProfiles } from "@tangle-network/agent-interface";
 
 // src/sandbox/outcome.ts
 var ok = (value) => ({ succeeded: true, value });
@@ -2428,46 +2431,77 @@ function adaptSandboxStream(events) {
     }
   })();
 }
-async function* streamSandboxPrompt(shell, box, message, options) {
-  const harness = options?.harness ?? "opencode";
+async function resolveSandboxPromptBackend(shell, options, operation = "sandbox prompt") {
+  const initialHarness = options.harness ?? options.profile?.harness ?? DEFAULT_HARNESS;
+  if (!isHarness(initialHarness)) throw new Error(`Unsupported sandbox harness: ${initialHarness}`);
+  const extraMcp = mergeExtraMcp(
+    options.appToolMcp ?? {},
+    options.profile?.mcp ?? options.baseProfileMcp ?? {},
+    options.extraMcp
+  );
+  const compose = (harness2) => {
+    if (!shell.profile) throw new Error(`${operation}: supply a profile or a shell profile composer`);
+    return shell.profile({ systemPrompt: options.systemPrompt, extraMcp, harness: harness2 });
+  };
+  let fullProfile = options.profile ? mergeAgentProfiles(options.profile, {
+    ...options.systemPrompt !== void 0 ? { prompt: { systemPrompt: options.systemPrompt } } : {},
+    ...Object.keys(extraMcp).length > 0 ? { mcp: extraMcp } : {}
+  }) : compose(initialHarness);
+  const harness = options.harness ?? fullProfile.harness ?? DEFAULT_HARNESS;
+  if (!isHarness(harness)) throw new Error(`Unsupported sandbox harness: ${harness}`);
+  if (!options.profile && harness !== initialHarness) fullProfile = compose(harness);
+  const explicitModel = trimOrNull(options.model);
+  const profileModel = trimOrNull(fullProfile.model?.default);
+  const profileProvider = profileModel && (!explicitModel || explicitModel === profileModel) ? trimOrNull(fullProfile.model?.provider) : null;
   const model = requireTransportableModel(
-    resolveModelSelection(shell.provider, {
-      model: options?.model,
-      modelApiKey: options?.modelApiKey
+    resolveModelSelection({
+      ...shell.provider,
+      providerName: trimOrNull(shell.provider?.providerName) ?? profileProvider ?? void 0
+    }, {
+      model: explicitModel ?? profileModel ?? void 0,
+      modelApiKey: options.modelApiKey
     }),
-    "streamSandboxPrompt"
+    operation
   );
-  if (model?.model) assertHarnessModelCompatible(harness, model);
-  const prompt = typeof message === "string" ? flattenHistory(message, options?.history) : mergeHistoryIntoParts(message, options?.history);
-  const appToolMcp = options?.appToolMcp ?? {};
-  const extraMcp = mergeExtraMcp(appToolMcp, options?.baseProfileMcp ?? {}, options?.extraMcp);
-  const fullProfile = shell.profile({ systemPrompt: options?.systemPrompt, extraMcp, harness });
-  const profile = shell.deferProfileFiles ? splitDeferredProfileFiles(fullProfile).leanProfile : fullProfile;
-  const profileWithLimits = applyPromptTokenLimits(
-    attachReasoningEffort(profile, harness, options?.effort),
+  if (model) assertHarnessModelCompatible(harness, {
+    ...model,
+    provider: profileProvider ?? model.provider
+  });
+  const selectedProfile = {
+    ...fullProfile,
+    harness,
+    // The materializer compares the profile and transport as provider-qualified
+    // identities. Authored provider evidence has already served preflight above.
+    ...model ? { model: { ...fullProfile.model, provider: model.provider, default: model.model } } : {}
+  };
+  const executionProfile = shell.deferProfileFiles && !options.profile ? splitDeferredProfileFiles(selectedProfile).leanProfile : selectedProfile;
+  const profile = applyPromptTokenLimits(
+    attachReasoningEffort(executionProfile, harness, options.effort),
     {
-      maxVisibleOutputTokens: options?.maxOutputTokens,
-      maxReasoningTokens: options?.maxReasoningTokens,
-      maxTotalOutputTokens: options?.maxTotalOutputTokens
+      maxVisibleOutputTokens: options.maxOutputTokens,
+      maxReasoningTokens: options.maxReasoningTokens,
+      maxTotalOutputTokens: options.maxTotalOutputTokens
     }
   );
   assertProfilePromptWithinBudget(
-    profileWithLimits,
+    profile,
     shell.promptBudget ?? {},
-    "streamSandboxPrompt profile systemPrompt",
+    `${operation} profile systemPrompt`,
     SHELL_PROMPT_BUDGET_HINT
   );
-  if (options?.onProfileResolved) {
-    options.onProfileResolved(
-      await fingerprintAgentProfile(profileWithLimits, { model: model?.model, harness })
-    );
+  if (options.onProfileResolved) {
+    options.onProfileResolved(await fingerprintAgentProfile(profile, { model: model?.model, harness }));
   }
-  const backend = {
+  return {
     type: harness,
-    profile: profileWithLimits,
+    profile,
     ...model ? { model } : {},
-    ...options?.interactions ? { interactions: options.interactions } : {}
+    ...options.interactions ? { interactions: options.interactions } : {}
   };
+}
+async function* streamSandboxPrompt(shell, box, message, options) {
+  const backend = await resolveSandboxPromptBackend(shell, options ?? {}, "streamSandboxPrompt");
+  const prompt = typeof message === "string" ? flattenHistory(message, options?.history) : mergeHistoryIntoParts(message, options?.history);
   const stream = options?.detach ? detachedSandboxPromptEvents(box, prompt, options, backend) : box.streamPrompt(prompt, {
     sessionId: options?.sessionId,
     executionId: options?.executionId,
@@ -2625,31 +2659,8 @@ async function mintSandboxScopedToken(box, options) {
   }
 }
 async function driveSandboxTurn(shell, box, message, options) {
-  const harness = options.harness ?? "opencode";
-  const model = requireTransportableModel(
-    resolveModelSelection(shell.provider, {
-      model: options.model,
-      modelApiKey: options.modelApiKey
-    }),
-    "driveSandboxTurn"
-  );
-  if (model?.model) assertHarnessModelCompatible(harness, model);
+  const backend = await resolveSandboxPromptBackend(shell, options, "driveSandboxTurn");
   const prompt = typeof message === "string" ? flattenHistory(message, options.history) : mergeHistoryIntoParts(message, options.history);
-  const appToolMcp = options.appToolMcp ?? {};
-  const extraMcp = mergeExtraMcp(appToolMcp, options.baseProfileMcp ?? {}, options.extraMcp);
-  const fullProfile = shell.profile({ systemPrompt: options.systemPrompt, extraMcp, harness });
-  const executionProfile = shell.deferProfileFiles ? splitDeferredProfileFiles(fullProfile).leanProfile : fullProfile;
-  const profile = attachReasoningEffort(
-    executionProfile,
-    harness,
-    options.effort
-  );
-  assertProfilePromptWithinBudget(
-    profile,
-    shell.promptBudget ?? {},
-    "driveSandboxTurn profile systemPrompt",
-    SHELL_PROMPT_BUDGET_HINT
-  );
   try {
     const drive = await box.driveTurn(prompt, {
       sessionId: options.sessionId,
@@ -2660,12 +2671,7 @@ async function driveSandboxTurn(shell, box, message, options) {
       // Sandbox 0.37 drives through the session message lane, so a gateway
       // consumer can handle these events. Callers without one should omit
       // interactions so the run stays unattended.
-      backend: {
-        type: harness,
-        profile,
-        ...model ? { model } : {},
-        ...options.interactions ? { interactions: options.interactions } : {}
-      }
+      backend
     });
     emitSandboxActivity(options.spend, box);
     return ok(drive);
@@ -2801,6 +2807,7 @@ export {
   attachReasoningEffort,
   applyPromptTokenLimits,
   adaptSandboxStream,
+  resolveSandboxPromptBackend,
   streamSandboxPrompt,
   collectSandboxPromptText,
   runSandboxPrompt,
@@ -2816,4 +2823,4 @@ export {
   isTerminalPromptEvent,
   detectInteractiveQuestion
 };
-//# sourceMappingURL=chunk-P6YXUGNA.js.map
+//# sourceMappingURL=chunk-XR5ZXMYL.js.map