@yielded/agent 0.1.0-beta.174 → 0.1.0-beta.175

package/src/engine/internal/output-contract.ts

@@ -169,6 +169,7 @@ export const prepareModelPrompt = (
 ): Prompt.Prompt => {
   if (systemMessagesInHistory) {
     const content: Array<Prompt.Message> = [];
+    let pendingContract = contract;
     let lastSystem: Prompt.SystemMessage | undefined;
     let ordered = prompt.content;
 
@@ -212,29 +213,25 @@ export const prepareModelPrompt = (
         if (lastSystem !== undefined && sameSystemMessage(lastSystem, message)) continue;
         lastSystem = message;
       }
+      if (message.role !== "system" && pendingContract !== undefined) {
+        content.push(pendingContract);
+        pendingContract = undefined;
+      }
       content.push(message);
     }
-    if (contract !== undefined) {
-      const firstConversation = content.findIndex((message) => message.role !== "system");
-
-      content.splice(firstConversation === -1 ? content.length : firstConversation, 0, contract);
-    }
+    if (pendingContract !== undefined) content.push(pendingContract);
 
     return Prompt.fromMessages(content);
   }
 
   const systems: Array<Prompt.SystemMessage> = [];
-  const conversation: Array<Prompt.Message> = [];
   const seen = new Map<string, Array<Prompt.SystemMessage>>();
 
   for (let index = prompt.content.length - 1; index >= 0; index -= 1) {
     const message = prompt.content[index];
 
     if (message === undefined) continue;
-    if (message.role !== "system") {
-      conversation.push(message);
-      continue;
-    }
+    if (message.role !== "system") continue;
     const variants = seen.get(message.content);
 
     if (variants?.some((previous) => sameSystemMessage(previous, message))) continue;
@@ -243,9 +240,12 @@ export const prepareModelPrompt = (
     systems.push(message);
   }
 
-  return Prompt.fromMessages([
-    ...systems.reverse(),
-    ...(contract === undefined ? [] : [contract]),
-    ...conversation.reverse(),
-  ]);
+  const content: Array<Prompt.Message> = systems.reverse();
+
+  if (contract !== undefined) content.push(contract);
+  for (const message of prompt.content) {
+    if (message !== undefined && message.role !== "system") content.push(message);
+  }
+
+  return Prompt.fromMessages(content);
 };

package/src/engine/internal/primitive-delta.ts

@@ -35,7 +35,7 @@ const overheads = {
 };
 
 /**
- * Capture primitive text and reasoning encodings for the native Schema decoder.
+ * Capture complete primitive text and reasoning values for native Schema validation.
  * Descriptor checks select this optimization; they do not replace the native codec.
  * Extra fields, accessors, and nonempty metadata use the general ownership path.
  * No provider object survives, including an empty metadata object's hidden storage.
@@ -95,9 +95,8 @@ export const capturePrimitiveTextPart = (part: unknown, maxBytes: number) => {
     if (bytes + fixed.source > maxBytes || bytes + fixed.encoded > maxBytes) return undefined;
     // Never pass the provider's metadata object (or any other object) to the decoder.
     snapshot.metadata = {};
-    delete snapshot[brand];
 
-    return { encodedPart: snapshot, retainedBytes: bytes + fixed.encoded };
+    return { part: snapshot, retainedBytes: bytes + fixed.encoded };
   } catch {
     // Reflection may throw for proxies. The general path owns the typed failure.
     return undefined;

package/src/engine/internal/tool-telemetry.ts

@@ -6,7 +6,6 @@ import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as ErrorReporter from "effect/ErrorReporter";
 import * as Exit from "effect/Exit";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
@@ -425,9 +424,9 @@ export class ToolSpanTelemetry extends Context.Service<
   ToolSpanTelemetry,
   ToolSpanTelemetryService
 >()("@effect-agent/engine/ToolSpanTelemetry") {
-  static readonly layer: Layer.Layer<ToolSpanTelemetry> = Layer.effect(
-    ToolSpanTelemetry,
-    Effect.map(Tracer.Tracer, (delegate) =>
+  static readonly make: Effect.Effect<ToolSpanTelemetryService> = Effect.map(
+    Tracer.Tracer,
+    (delegate) =>
       ToolSpanTelemetry.of({
         isolateEffectSpanLifecycle: (effect) =>
           Effect.suspend(() => {
@@ -485,6 +484,5 @@ export class ToolSpanTelemetry extends Context.Service<
             }),
           ),
       }),
-    ),
   );
 }