effect-agent 0.1.0-beta.144 → 0.1.0-beta.149

package/dist/{output-contract-CANJJGA5.mjs → output-contract-DS-S8mTv.mjs}

@@ -58,19 +58,55 @@ const outputSchemaContract = (definition) => {
 };
 const sameSystemMessage = Schema.toEquivalence(Prompt.SystemMessage);
 /**
-* Project system instructions and the output contract into one leading block.
-* Repeated Runs append instructions to canonical history; letting those copies
-* move the contract breaks the preceding user/tool prefix used by provider caches.
-* Keep the last occurrence of each equivalent system message, preserving the
-* precedence of distinct instructions and their native provider options.
+* Keep supported system instructions in conversation order so changing late guidance
+* cannot invalidate the preceding user/tool cache prefix. Omit an exact repeat
+* only when no distinct system instruction intervened; returning to an earlier
+* instruction after a different one must preserve the new directive's precedence.
+* Anchor the immutable output contract after the initial system block.
+* Restore leading static instructions for caller-supplied conversation-only history.
 *
 * This runs after preparation and compaction. Canonical messages, protected
 * instruction/input spans and compaction coverage retain their original positions.
-* Conversation order and message identities are unchanged. A single system block
-* also prevents Anthropic's last-system-group conversion from discarding earlier
-* application instructions or the output contract.
+* Adapters without this capability retain the grouped-system projection: keep the
+* last equivalent instruction with its native options, then the contract and
+* conversation. This prevents older Anthropic adapters from discarding system groups.
 */
-const prepareModelPrompt = (prompt, contract) => {
+const prepareModelPrompt = (prompt, contract, systemMessagesInHistory, staticInstructions) => {
+	if (systemMessagesInHistory) {
+		const content = [];
+		let lastSystem;
+		let ordered = prompt.content;
+		if (staticInstructions !== void 0) {
+			const firstConversation = prompt.content.findIndex((message) => message.role !== "system");
+			const leading = prompt.content.slice(0, firstConversation === -1 ? prompt.content.length : firstConversation);
+			const restored = [];
+			const instructions = typeof staticInstructions === "string" ? [Prompt.systemMessage({ content: staticInstructions })] : Prompt.make(staticInstructions).content;
+			for (const message of instructions) {
+				if (message.role !== "system") break;
+				if (leading.some((candidate) => candidate.role === "system" && sameSystemMessage(candidate, message))) break;
+				const original = prompt.content.find((candidate) => candidate.role === "system" && sameSystemMessage(candidate, message));
+				if (original === void 0) break;
+				restored.push(original);
+			}
+			if (restored.length > 0) ordered = [
+				...leading,
+				...restored,
+				...prompt.content.slice(leading.length)
+			];
+		}
+		for (const message of ordered) {
+			if (message.role === "system") {
+				if (lastSystem !== void 0 && sameSystemMessage(lastSystem, message)) continue;
+				lastSystem = message;
+			}
+			content.push(message);
+		}
+		if (contract !== void 0) {
+			const firstConversation = content.findIndex((message) => message.role !== "system");
+			content.splice(firstConversation === -1 ? content.length : firstConversation, 0, contract);
+		}
+		return Prompt.fromMessages(content);
+	}
 	const systems = [];
 	const conversation = [];
 	const seen = /* @__PURE__ */ new Map();
@@ -96,4 +132,4 @@ const prepareModelPrompt = (prompt, contract) => {
 //#endregion
 export { textOutput as i, outputSchemaContract as n, prepareModelPrompt as r, isTextOutput as t };
 
-//# sourceMappingURL=output-contract-CANJJGA5.mjs.map
+//# sourceMappingURL=output-contract-DS-S8mTv.mjs.map

package/dist/{output-contract-CANJJGA5.mjs.map → output-contract-DS-S8mTv.mjs.map}

@@ -1 +1 @@
-{"version":3,"file":"output-contract-CANJJGA5.mjs","names":[],"sources":["../src/engine/internal/output-contract.ts"],"sourcesContent":["import { Schema } from \"effect\";\nimport { Prompt, Tool } from \"effect/unstable/ai\";\n\nimport type * as Agent from \"../../core/Agent.ts\";\n\nconst outputFormatAnnotation = \"@effect-agent/engine/Output/format\";\n\n/**\n * Declare ordinary assistant text as an Agent's final-output wire format. Apply this to the\n * complete output Schema after composing transformations. Its encoded type must be string;\n * decoding, checks, transformations, and service requirements remain owned by that Schema.\n * Text is preserved verbatim, including whitespace, quotes, and an empty reply when allowed.\n * Required completion Tools still take precedence. Unmarked Schemas use JSON final output.\n *\n * @example\n * ```ts\n * output: Output.text(Schema.String.check(Schema.isMaxLength(20_000)))\n * ```\n */\nexport const textOutput = <S extends Schema.Top & { readonly Encoded: string }>(\n  schema: S,\n): S[\"Rebuild\"] => schema.annotate({ [outputFormatAnnotation]: \"text\" });\n\nexport const isTextOutput = (schema: Schema.Top): boolean =>\n  Schema.resolveAnnotations(schema)?.[outputFormatAnnotation] === \"text\";\n\n/**\n * Model-visible final-output contract (RUN-028).\n *\n * For ordinary text completion, the interpreter's only output-conformance\n * point is `decodeFinalOutput`, which validates the final text after the\n * model has already finished. This module renders that Schema's wire contract\n * with the same Effect AI derivation the providers use for Tool parameters\n * and states it as one framework-owned system message on every model request.\n * A required completion Tool instead gets a native-tool directive: its Tool\n * parameter Schema is already carried by the provider request, and ordinary\n * final text is not an allowed completion path.\n *\n * The contract is a per-request projection of the immutable definition —\n * exactly like the Tool schemas the request already carries. It is inserted\n * at model-request materialization (after context preparation) and never\n * into official history, so canonical records, run events, and the committed\n * DN/DC golden are unchanged.\n *\n */\n\n/** Rendering outcome for one definition's output Schema. */\ntype OutputContract =\n  | {\n      readonly _tag: \"rendered\";\n      /** The complete system-message text: directive plus the derived JSON Schema. */\n      readonly message: string;\n      readonly part: Prompt.SystemMessage;\n    }\n  | {\n      readonly _tag: \"unrenderable\";\n      /** Why Effect AI's JSON-Schema derivation rejected the output Schema. */\n      readonly reason: string;\n    };\n\nconst contractDirective = (definition: Agent.AnyDefinition): string =>\n  definition.completion === undefined\n    ? \"Final output contract: when the task is complete, the final assistant message must be only \" +\n      \"JSON that is valid against this JSON Schema — no prose, no Markdown code fences, nothing \" +\n      \"before or after the JSON.\"\n    : `Final output contract: when the task is complete without calling the \"${definition.completion.tool}\" completion Tool, the final assistant message must be only ` +\n      \"JSON that is valid against this JSON Schema — no prose, no Markdown code fences, nothing \" +\n      `before or after the JSON. When calling the \"${definition.completion.tool}\" completion Tool, never place this private Agent output JSON in any Tool argument; follow the Tool's parameter schema instead. Call it as the sole application Tool Call, after receiving any other needed application Tool results. Completed provider Tool results may accompany it. The engine projects the successful completion Tool result into the Agent output.`;\n\nconst requiredCompletionDirective = (tool: string, hasAlternatives: boolean): string =>\n  `Final output contract: ${hasAlternatives ? \"otherwise complete\" : \"complete only\"} by calling the required completion Tool ${JSON.stringify(tool)} ` +\n  \"as the sole application Tool Call in its batch. Completed provider Tool results may accompany it. Do not emit an ordinary final assistant text answer. \" +\n  \"The Tool's canonical parameters and successful result are projected and validated as the Agent output.\";\n\n/**\n * Render the model-visible final-output contract for one definition. The\n * derivation and message identity are stable for an immutable definition.\n * An output Schema the Effect AI derivation cannot represent is reported as\n * `unrenderable`; the caller falls back to the prior behavior — the contract\n * is guidance, and a Schema that decodes but does not render must not become\n * a new failure mode.\n */\nconst rendered = (message: string): OutputContract => ({\n  _tag: \"rendered\",\n  message,\n  part: Prompt.makeMessage(\"system\", { content: message }),\n});\n\nconst renderOutputSchemaContract = (definition: Agent.AnyDefinition): OutputContract => {\n  if (definition.completion?.required === true) {\n    return rendered(\n      requiredCompletionDirective(\n        definition.completion.tool,\n        (definition.completionFromTools?.length ?? 0) > 0,\n      ),\n    );\n  }\n  if (isTextOutput(definition.output)) {\n    return rendered(\n      \"Final output contract: write the final reply as ordinary assistant text, without JSON wrapping. \" +\n        \"An empty reply is valid only when allowed by the output Schema and the task instructions.\" +\n        (definition.completion === undefined\n          ? \"\"\n          : ` When calling the \"${definition.completion.tool}\" completion Tool, follow its parameter schema instead and call it as the sole application Tool Call, after receiving any other needed application Tool results; completed provider Tool results may accompany it; the engine projects its successful result into the Agent output.`),\n    );\n  }\n  try {\n    const jsonSchema = Tool.getJsonSchemaFromSchema(definition.output);\n\n    return rendered(\n      `${contractDirective(definition)}\\n\\n${JSON.stringify(jsonSchema, undefined, 2)}`,\n    );\n  } catch (cause) {\n    return {\n      _tag: \"unrenderable\",\n      reason: cause instanceof Error ? cause.message : String(cause),\n    };\n  }\n};\n\n// Native incremental-response tracking recognizes message objects, not rendered text.\n// Weak keys retain neither discarded definitions nor their Schema graphs.\nconst outputContracts = new WeakMap<Agent.AnyDefinition, OutputContract>();\n\nexport const outputSchemaContract = (definition: Agent.AnyDefinition): OutputContract => {\n  const cached = outputContracts.get(definition);\n\n  if (cached !== undefined) return cached;\n  const base = renderOutputSchemaContract(definition);\n  const alternatives = definition.completionFromTools ?? [];\n\n  const contract =\n    base._tag === \"rendered\" && alternatives.length > 0\n      ? rendered(\n          `The following action Tools may complete the Run from their successful canonical result: ${alternatives.map((declaration) => JSON.stringify(declaration.tool)).join(\", \")}. ` +\n            \"Call such a Tool as the sole application Tool Call, following its parameter schema. Completed provider Tool results may accompany it. It may complete the Run only when it satisfies the whole request. \" +\n            \"An incomplete or pending result continues the Run. These actions are unavailable during finalization after budget exhaustion.\\n\\n\" +\n            base.message,\n        )\n      : base;\n\n  outputContracts.set(definition, contract);\n\n  return contract;\n};\n\nconst sameSystemMessage = Schema.toEquivalence(Prompt.SystemMessage);\n\n/**\n * Project system instructions and the output contract into one leading block.\n * Repeated Runs append instructions to canonical history; letting those copies\n * move the contract breaks the preceding user/tool prefix used by provider caches.\n * Keep the last occurrence of each equivalent system message, preserving the\n * precedence of distinct instructions and their native provider options.\n *\n * This runs after preparation and compaction. Canonical messages, protected\n * instruction/input spans and compaction coverage retain their original positions.\n * Conversation order and message identities are unchanged. A single system block\n * also prevents Anthropic's last-system-group conversion from discarding earlier\n * application instructions or the output contract.\n */\nexport const prepareModelPrompt = (\n  prompt: Prompt.Prompt,\n  contract: Prompt.SystemMessage | undefined,\n): Prompt.Prompt => {\n  const systems: Array<Prompt.SystemMessage> = [];\n  const conversation: Array<Prompt.Message> = [];\n  const seen = new Map<string, Array<Prompt.SystemMessage>>();\n\n  for (let index = prompt.content.length - 1; index >= 0; index -= 1) {\n    const message = prompt.content[index];\n\n    if (message === undefined) continue;\n    if (message.role !== \"system\") {\n      conversation.push(message);\n      continue;\n    }\n    const variants = seen.get(message.content);\n\n    if (variants?.some((previous) => sameSystemMessage(previous, message))) continue;\n    if (variants === undefined) seen.set(message.content, [message]);\n    else variants.push(message);\n    systems.push(message);\n  }\n\n  return Prompt.fromMessages([\n    ...systems.reverse(),\n    ...(contract === undefined ? [] : [contract]),\n    ...conversation.reverse(),\n  ]);\n};\n"],"mappings":";;;AAKA,MAAM,yBAAyB;;;;;;;;;;;;;AAc/B,MAAa,cACX,WACiB,OAAO,SAAS,GAAG,yBAAyB,OAAO,CAAC;AAEvE,MAAa,gBAAgB,WAC3B,OAAO,mBAAmB,MAAM,CAAC,GAAG,4BAA4B;AAoClE,MAAM,qBAAqB,eACzB,WAAW,eAAe,KAAA,IACtB,kNAGA,yEAAyE,WAAW,WAAW,KAAK,mMAErD,WAAW,WAAW,KAAK;AAEhF,MAAM,+BAA+B,MAAc,oBACjD,0BAA0B,kBAAkB,uBAAuB,gBAAgB,2CAA2C,KAAK,UAAU,IAAI,EAAE;;;;;;;;;AAYrJ,MAAM,YAAY,aAAqC;CACrD,MAAM;CACN;CACA,MAAM,OAAO,YAAY,UAAU,EAAE,SAAS,QAAQ,CAAC;AACzD;AAEA,MAAM,8BAA8B,eAAoD;CACtF,IAAI,WAAW,YAAY,aAAa,MACtC,OAAO,SACL,4BACE,WAAW,WAAW,OACrB,WAAW,qBAAqB,UAAU,KAAK,CAClD,CACF;CAEF,IAAI,aAAa,WAAW,MAAM,GAChC,OAAO,SACL,+LAEG,WAAW,eAAe,KAAA,IACvB,KACA,sBAAsB,WAAW,WAAW,KAAK,qRACzD;CAEF,IAAI;EACF,MAAM,aAAa,KAAK,wBAAwB,WAAW,MAAM;EAEjE,OAAO,SACL,GAAG,kBAAkB,UAAU,EAAE,MAAM,KAAK,UAAU,YAAY,KAAA,GAAW,CAAC,GAChF;CACF,SAAS,OAAO;EACd,OAAO;GACL,MAAM;GACN,QAAQ,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;EAC/D;CACF;AACF;AAIA,MAAM,kCAAkB,IAAI,QAA6C;AAEzE,MAAa,wBAAwB,eAAoD;CACvF,MAAM,SAAS,gBAAgB,IAAI,UAAU;CAE7C,IAAI,WAAW,KAAA,GAAW,OAAO;CACjC,MAAM,OAAO,2BAA2B,UAAU;CAClD,MAAM,eAAe,WAAW,uBAAuB,CAAC;CAExD,MAAM,WACJ,KAAK,SAAS,cAAc,aAAa,SAAS,IAC9C,SACE,2FAA2F,aAAa,KAAK,gBAAgB,KAAK,UAAU,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;;IAGxK,KAAK,OACT,IACA;CAEN,gBAAgB,IAAI,YAAY,QAAQ;CAExC,OAAO;AACT;AAEA,MAAM,oBAAoB,OAAO,cAAc,OAAO,aAAa;;;;;;;;;;;;;;AAenE,MAAa,sBACX,QACA,aACkB;CAClB,MAAM,UAAuC,CAAC;CAC9C,MAAM,eAAsC,CAAC;CAC7C,MAAM,uBAAO,IAAI,IAAyC;CAE1D,KAAK,IAAI,QAAQ,OAAO,QAAQ,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG;EAClE,MAAM,UAAU,OAAO,QAAQ;EAE/B,IAAI,YAAY,KAAA,GAAW;EAC3B,IAAI,QAAQ,SAAS,UAAU;GAC7B,aAAa,KAAK,OAAO;GACzB;EACF;EACA,MAAM,WAAW,KAAK,IAAI,QAAQ,OAAO;EAEzC,IAAI,UAAU,MAAM,aAAa,kBAAkB,UAAU,OAAO,CAAC,GAAG;EACxE,IAAI,aAAa,KAAA,GAAW,KAAK,IAAI,QAAQ,SAAS,CAAC,OAAO,CAAC;OAC1D,SAAS,KAAK,OAAO;EAC1B,QAAQ,KAAK,OAAO;CACtB;CAEA,OAAO,OAAO,aAAa;EACzB,GAAG,QAAQ,QAAQ;EACnB,GAAI,aAAa,KAAA,IAAY,CAAC,IAAI,CAAC,QAAQ;EAC3C,GAAG,aAAa,QAAQ;CAC1B,CAAC;AACH"}
+{"version":3,"file":"output-contract-DS-S8mTv.mjs","names":[],"sources":["../src/engine/internal/output-contract.ts"],"sourcesContent":["import { Schema } from \"effect\";\nimport { Prompt, Tool } from \"effect/unstable/ai\";\n\nimport type * as Agent from \"../../core/Agent.ts\";\n\nconst outputFormatAnnotation = \"@effect-agent/engine/Output/format\";\n\n/**\n * Declare ordinary assistant text as an Agent's final-output wire format. Apply this to the\n * complete output Schema after composing transformations. Its encoded type must be string;\n * decoding, checks, transformations, and service requirements remain owned by that Schema.\n * Text is preserved verbatim, including whitespace, quotes, and an empty reply when allowed.\n * Required completion Tools still take precedence. Unmarked Schemas use JSON final output.\n *\n * @example\n * ```ts\n * output: Output.text(Schema.String.check(Schema.isMaxLength(20_000)))\n * ```\n */\nexport const textOutput = <S extends Schema.Top & { readonly Encoded: string }>(\n  schema: S,\n): S[\"Rebuild\"] => schema.annotate({ [outputFormatAnnotation]: \"text\" });\n\nexport const isTextOutput = (schema: Schema.Top): boolean =>\n  Schema.resolveAnnotations(schema)?.[outputFormatAnnotation] === \"text\";\n\n/**\n * Model-visible final-output contract (RUN-028).\n *\n * For ordinary text completion, the interpreter's only output-conformance\n * point is `decodeFinalOutput`, which validates the final text after the\n * model has already finished. This module renders that Schema's wire contract\n * with the same Effect AI derivation the providers use for Tool parameters\n * and states it as one framework-owned system message on every model request.\n * A required completion Tool instead gets a native-tool directive: its Tool\n * parameter Schema is already carried by the provider request, and ordinary\n * final text is not an allowed completion path.\n *\n * The contract is a per-request projection of the immutable definition —\n * exactly like the Tool schemas the request already carries. It is inserted\n * at model-request materialization (after context preparation) and never\n * into official history, so canonical records, run events, and the committed\n * DN/DC golden are unchanged.\n *\n */\n\n/** Rendering outcome for one definition's output Schema. */\ntype OutputContract =\n  | {\n      readonly _tag: \"rendered\";\n      /** The complete system-message text: directive plus the derived JSON Schema. */\n      readonly message: string;\n      readonly part: Prompt.SystemMessage;\n    }\n  | {\n      readonly _tag: \"unrenderable\";\n      /** Why Effect AI's JSON-Schema derivation rejected the output Schema. */\n      readonly reason: string;\n    };\n\nconst contractDirective = (definition: Agent.AnyDefinition): string =>\n  definition.completion === undefined\n    ? \"Final output contract: when the task is complete, the final assistant message must be only \" +\n      \"JSON that is valid against this JSON Schema — no prose, no Markdown code fences, nothing \" +\n      \"before or after the JSON.\"\n    : `Final output contract: when the task is complete without calling the \"${definition.completion.tool}\" completion Tool, the final assistant message must be only ` +\n      \"JSON that is valid against this JSON Schema — no prose, no Markdown code fences, nothing \" +\n      `before or after the JSON. When calling the \"${definition.completion.tool}\" completion Tool, never place this private Agent output JSON in any Tool argument; follow the Tool's parameter schema instead. Call it as the sole application Tool Call, after receiving any other needed application Tool results. Completed provider Tool results may accompany it. The engine projects the successful completion Tool result into the Agent output.`;\n\nconst requiredCompletionDirective = (tool: string, hasAlternatives: boolean): string =>\n  `Final output contract: ${hasAlternatives ? \"otherwise complete\" : \"complete only\"} by calling the required completion Tool ${JSON.stringify(tool)} ` +\n  \"as the sole application Tool Call in its batch. Completed provider Tool results may accompany it. Do not emit an ordinary final assistant text answer. \" +\n  \"The Tool's canonical parameters and successful result are projected and validated as the Agent output.\";\n\n/**\n * Render the model-visible final-output contract for one definition. The\n * derivation and message identity are stable for an immutable definition.\n * An output Schema the Effect AI derivation cannot represent is reported as\n * `unrenderable`; the caller falls back to the prior behavior — the contract\n * is guidance, and a Schema that decodes but does not render must not become\n * a new failure mode.\n */\nconst rendered = (message: string): OutputContract => ({\n  _tag: \"rendered\",\n  message,\n  part: Prompt.makeMessage(\"system\", { content: message }),\n});\n\nconst renderOutputSchemaContract = (definition: Agent.AnyDefinition): OutputContract => {\n  if (definition.completion?.required === true) {\n    return rendered(\n      requiredCompletionDirective(\n        definition.completion.tool,\n        (definition.completionFromTools?.length ?? 0) > 0,\n      ),\n    );\n  }\n  if (isTextOutput(definition.output)) {\n    return rendered(\n      \"Final output contract: write the final reply as ordinary assistant text, without JSON wrapping. \" +\n        \"An empty reply is valid only when allowed by the output Schema and the task instructions.\" +\n        (definition.completion === undefined\n          ? \"\"\n          : ` When calling the \"${definition.completion.tool}\" completion Tool, follow its parameter schema instead and call it as the sole application Tool Call, after receiving any other needed application Tool results; completed provider Tool results may accompany it; the engine projects its successful result into the Agent output.`),\n    );\n  }\n  try {\n    const jsonSchema = Tool.getJsonSchemaFromSchema(definition.output);\n\n    return rendered(\n      `${contractDirective(definition)}\\n\\n${JSON.stringify(jsonSchema, undefined, 2)}`,\n    );\n  } catch (cause) {\n    return {\n      _tag: \"unrenderable\",\n      reason: cause instanceof Error ? cause.message : String(cause),\n    };\n  }\n};\n\n// Native incremental-response tracking recognizes message objects, not rendered text.\n// Weak keys retain neither discarded definitions nor their Schema graphs.\nconst outputContracts = new WeakMap<Agent.AnyDefinition, OutputContract>();\n\nexport const outputSchemaContract = (definition: Agent.AnyDefinition): OutputContract => {\n  const cached = outputContracts.get(definition);\n\n  if (cached !== undefined) return cached;\n  const base = renderOutputSchemaContract(definition);\n  const alternatives = definition.completionFromTools ?? [];\n\n  const contract =\n    base._tag === \"rendered\" && alternatives.length > 0\n      ? rendered(\n          `The following action Tools may complete the Run from their successful canonical result: ${alternatives.map((declaration) => JSON.stringify(declaration.tool)).join(\", \")}. ` +\n            \"Call such a Tool as the sole application Tool Call, following its parameter schema. Completed provider Tool results may accompany it. It may complete the Run only when it satisfies the whole request. \" +\n            \"An incomplete or pending result continues the Run. These actions are unavailable during finalization after budget exhaustion.\\n\\n\" +\n            base.message,\n        )\n      : base;\n\n  outputContracts.set(definition, contract);\n\n  return contract;\n};\n\nconst sameSystemMessage = Schema.toEquivalence(Prompt.SystemMessage);\n\n/**\n * Keep supported system instructions in conversation order so changing late guidance\n * cannot invalidate the preceding user/tool cache prefix. Omit an exact repeat\n * only when no distinct system instruction intervened; returning to an earlier\n * instruction after a different one must preserve the new directive's precedence.\n * Anchor the immutable output contract after the initial system block.\n * Restore leading static instructions for caller-supplied conversation-only history.\n *\n * This runs after preparation and compaction. Canonical messages, protected\n * instruction/input spans and compaction coverage retain their original positions.\n * Adapters without this capability retain the grouped-system projection: keep the\n * last equivalent instruction with its native options, then the contract and\n * conversation. This prevents older Anthropic adapters from discarding system groups.\n */\nexport const prepareModelPrompt = (\n  prompt: Prompt.Prompt,\n  contract: Prompt.SystemMessage | undefined,\n  systemMessagesInHistory: boolean,\n  staticInstructions: Prompt.RawInput | undefined,\n): Prompt.Prompt => {\n  if (systemMessagesInHistory) {\n    const content: Array<Prompt.Message> = [];\n    let lastSystem: Prompt.SystemMessage | undefined;\n    let ordered = prompt.content;\n\n    if (staticInstructions !== undefined) {\n      const firstConversation = prompt.content.findIndex((message) => message.role !== \"system\");\n\n      const leading = prompt.content.slice(\n        0,\n        firstConversation === -1 ? prompt.content.length : firstConversation,\n      );\n\n      const restored: Array<Prompt.Message> = [];\n\n      const instructions =\n        typeof staticInstructions === \"string\"\n          ? [Prompt.systemMessage({ content: staticInstructions })]\n          : Prompt.make(staticInstructions).content;\n\n      for (const message of instructions) {\n        if (message.role !== \"system\") break;\n        if (\n          leading.some(\n            (candidate) => candidate.role === \"system\" && sameSystemMessage(candidate, message),\n          )\n        )\n          break;\n\n        const original = prompt.content.find(\n          (candidate) => candidate.role === \"system\" && sameSystemMessage(candidate, message),\n        );\n\n        if (original === undefined) break;\n        restored.push(original);\n      }\n      if (restored.length > 0)\n        ordered = [...leading, ...restored, ...prompt.content.slice(leading.length)];\n    }\n\n    for (const message of ordered) {\n      if (message.role === \"system\") {\n        if (lastSystem !== undefined && sameSystemMessage(lastSystem, message)) continue;\n        lastSystem = message;\n      }\n      content.push(message);\n    }\n    if (contract !== undefined) {\n      const firstConversation = content.findIndex((message) => message.role !== \"system\");\n\n      content.splice(firstConversation === -1 ? content.length : firstConversation, 0, contract);\n    }\n\n    return Prompt.fromMessages(content);\n  }\n\n  const systems: Array<Prompt.SystemMessage> = [];\n  const conversation: Array<Prompt.Message> = [];\n  const seen = new Map<string, Array<Prompt.SystemMessage>>();\n\n  for (let index = prompt.content.length - 1; index >= 0; index -= 1) {\n    const message = prompt.content[index];\n\n    if (message === undefined) continue;\n    if (message.role !== \"system\") {\n      conversation.push(message);\n      continue;\n    }\n    const variants = seen.get(message.content);\n\n    if (variants?.some((previous) => sameSystemMessage(previous, message))) continue;\n    if (variants === undefined) seen.set(message.content, [message]);\n    else variants.push(message);\n    systems.push(message);\n  }\n\n  return Prompt.fromMessages([\n    ...systems.reverse(),\n    ...(contract === undefined ? [] : [contract]),\n    ...conversation.reverse(),\n  ]);\n};\n"],"mappings":"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"}

package/package.json

@@ -1 +1 @@
-{"name":"effect-agent","version":"0.1.0-beta.144","devDependencies":{"@effect/platform-node":"4.0.0-rc.117","@effect/vitest":"4.0.0-rc.117","effect":"4.0.0-rc.117","typescript":"7.0.2","vite-plus":"0.3.3"},"peerDependencies":{"effect":"^4.0.0-rc.117"},"exports":{".":{"types":"./dist/index.d.mts","default":"./dist/index.mjs"},"./activity-store":{"types":"./dist/durable/ActivityStore.d.mts","default":"./dist/durable/ActivityStore.mjs"},"./admin":{"types":"./dist/durable/Admin.d.mts","default":"./dist/durable/Admin.mjs"},"./agent":{"types":"./dist/core/Agent.d.mts","default":"./dist/core/Agent.mjs"},"./agent-error":{"types":"./dist/core/AgentError.d.mts","default":"./dist/core/AgentError.mjs"},"./agent-policy":{"types":"./dist/core/AgentPolicy.d.mts","default":"./dist/core/AgentPolicy.mjs"},"./agent-registration":{"types":"./dist/durable/AgentRegistration.d.mts","default":"./dist/durable/AgentRegistration.mjs"},"./agent-runtime":{"types":"./dist/engine/AgentRuntime.d.mts","default":"./dist/engine/AgentRuntime.mjs"},"./agent-updates":{"types":"./dist/core/AgentUpdates.d.mts","default":"./dist/core/AgentUpdates.mjs"},"./approval":{"types":"./dist/capabilities/Approval.d.mts","default":"./dist/capabilities/Approval.mjs"},"./budget":{"types":"./dist/capabilities/Budget.d.mts","default":"./dist/capabilities/Budget.mjs"},"./code-executor":{"types":"./dist/sandbox/CodeExecutor.d.mts","default":"./dist/sandbox/CodeExecutor.mjs"},"./code-mode":{"types":"./dist/capabilities/CodeMode.d.mts","default":"./dist/capabilities/CodeMode.mjs"},"./commands":{"types":"./dist/capabilities/Commands.d.mts","default":"./dist/capabilities/Commands.mjs"},"./committed-activity":{"types":"./dist/durable/CommittedActivity.d.mts","default":"./dist/durable/CommittedActivity.mjs"},"./compaction":{"types":"./dist/engine/Compaction.d.mts","default":"./dist/engine/Compaction.mjs"},"./context-compactor":{"types":"./dist/engine/ContextCompactor.d.mts","default":"./dist/engine/ContextCompactor.mjs"},"./context-history":{"types":"./dist/engine/ContextHistory.d.mts","default":"./dist/engine/ContextHistory.mjs"},"./context-tools":{"types":"./dist/capabilities/ContextTools.d.mts","default":"./dist/capabilities/ContextTools.mjs"},"./context-window":{"types":"./dist/engine/ContextWindow.d.mts","default":"./dist/engine/ContextWindow.mjs"},"./digest":{"types":"./dist/durable/Digest.d.mts","default":"./dist/durable/Digest.mjs"},"./durable-agent-runtime":{"types":"./dist/durable/DurableAgentRuntime.d.mts","default":"./dist/durable/DurableAgentRuntime.mjs"},"./durable-failpoint":{"types":"./dist/durable/DurableFailpoint.d.mts","default":"./dist/durable/DurableFailpoint.mjs"},"./durable-step":{"types":"./dist/engine/DurableStep.d.mts","default":"./dist/engine/DurableStep.mjs"},"./event-source":{"types":"./dist/durable/EventSource.d.mts","default":"./dist/durable/EventSource.mjs"},"./failure-diagnostic":{"types":"./dist/core/FailureDiagnostic.d.mts","default":"./dist/core/FailureDiagnostic.mjs"},"./git-hub-workflow-source":{"types":"./dist/durable/GitHubWorkflowSource.d.mts","default":"./dist/durable/GitHubWorkflowSource.mjs"},"./id-generator":{"types":"./dist/core/IdGenerator.d.mts","default":"./dist/core/IdGenerator.mjs"},"./identifiers":{"types":"./dist/core/Identifiers.d.mts","default":"./dist/core/Identifiers.mjs"},"./in-memory":{"types":"./dist/InMemory.d.mts","default":"./dist/InMemory.mjs"},"./interactive-browser":{"types":"./dist/sandbox/InteractiveBrowser.d.mts","default":"./dist/sandbox/InteractiveBrowser.mjs"},"./mcp":{"types":"./dist/capabilities/Mcp.d.mts","default":"./dist/capabilities/Mcp.mjs"},"./mcp-client":{"types":"./dist/capabilities/McpClient.d.mts","default":"./dist/capabilities/McpClient.mjs"},"./memory":{"types":"./dist/core/Memory.d.mts","default":"./dist/core/Memory.mjs"},"./memory-namespace":{"types":"./dist/core/MemoryNamespace.d.mts","default":"./dist/core/MemoryNamespace.mjs"},"./memory-notes":{"types":"./dist/capabilities/MemoryNotes.d.mts","default":"./dist/capabilities/MemoryNotes.mjs"},"./memory-reference":{"types":"./dist/core/MemoryReference.d.mts","default":"./dist/core/MemoryReference.mjs"},"./memory-revalidation":{"types":"./dist/core/MemoryRevalidation.d.mts","default":"./dist/core/MemoryRevalidation.mjs"},"./memory-store":{"types":"./dist/core/MemoryStore.d.mts","default":"./dist/core/MemoryStore.mjs"},"./message-delivery":{"types":"./dist/durable/MessageDelivery.d.mts","default":"./dist/durable/MessageDelivery.mjs"},"./messaging":{"types":"./dist/capabilities/Messaging.d.mts","default":"./dist/capabilities/Messaging.mjs"},"./messaging-host":{"types":"./dist/engine/MessagingHost.d.mts","default":"./dist/engine/MessagingHost.mjs"},"./model-context":{"types":"./dist/capabilities/ModelContext.d.mts","default":"./dist/capabilities/ModelContext.mjs"},"./operation-authorizer":{"types":"./dist/durable/OperationAuthorizer.d.mts","default":"./dist/durable/OperationAuthorizer.mjs"},"./output":{"types":"./dist/engine/Output.d.mts","default":"./dist/engine/Output.mjs"},"./page-capture":{"types":"./dist/sandbox/PageCapture.d.mts","default":"./dist/sandbox/PageCapture.mjs"},"./page-crawl":{"types":"./dist/sandbox/PageCrawl.d.mts","default":"./dist/sandbox/PageCrawl.mjs"},"./page-screenshot":{"types":"./dist/sandbox/PageScreenshot.d.mts","default":"./dist/sandbox/PageScreenshot.mjs"},"./persistent-history":{"types":"./dist/durable/PersistentHistory.d.mts","default":"./dist/durable/PersistentHistory.mjs"},"./prepared-input-admission":{"types":"./dist/durable/PreparedInputAdmission.d.mts","default":"./dist/durable/PreparedInputAdmission.mjs"},"./receipt":{"types":"./dist/core/Receipt.d.mts","default":"./dist/core/Receipt.mjs"},"./records":{"types":"./dist/durable/Records.d.mts","default":"./dist/durable/Records.mjs"},"./recovery":{"types":"./dist/durable/Recovery.d.mts","default":"./dist/durable/Recovery.mjs"},"./redaction":{"types":"./dist/capabilities/Redaction.d.mts","default":"./dist/capabilities/Redaction.mjs"},"./remembering":{"types":"./dist/capabilities/Remembering.d.mts","default":"./dist/capabilities/Remembering.mjs"},"./remembering-store":{"types":"./dist/core/RememberingStore.d.mts","default":"./dist/core/RememberingStore.mjs"},"./run-event":{"types":"./dist/core/RunEvent.d.mts","default":"./dist/core/RunEvent.mjs"},"./run-event-sink":{"types":"./dist/engine/RunEventSink.d.mts","default":"./dist/engine/RunEventSink.mjs"},"./run-hooks":{"types":"./dist/capabilities/RunHooks.d.mts","default":"./dist/capabilities/RunHooks.mjs"},"./run-journal":{"types":"./dist/durable/RunJournal.d.mts","default":"./dist/durable/RunJournal.mjs"},"./run-options":{"types":"./dist/engine/RunOptions.d.mts","default":"./dist/engine/RunOptions.mjs"},"./run-policy-usage":{"types":"./dist/core/RunPolicyUsage.d.mts","default":"./dist/core/RunPolicyUsage.mjs"},"./sandbox":{"types":"./dist/sandbox/Sandbox.d.mts","default":"./dist/sandbox/Sandbox.mjs"},"./schedule":{"types":"./dist/durable/Schedule.d.mts","default":"./dist/durable/Schedule.mjs"},"./schedule-transition":{"types":"./dist/durable/ScheduleTransition.d.mts","default":"./dist/durable/ScheduleTransition.mjs"},"./scheduling":{"types":"./dist/durable/Scheduling.d.mts","default":"./dist/durable/Scheduling.mjs"},"./semantic-memory":{"types":"./dist/capabilities/SemanticMemory.d.mts","default":"./dist/capabilities/SemanticMemory.mjs"},"./semantic-memory-index":{"types":"./dist/core/SemanticMemoryIndex.d.mts","default":"./dist/core/SemanticMemoryIndex.mjs"},"./semantic-memory-revalidation":{"types":"./dist/core/SemanticMemoryRevalidation.d.mts","default":"./dist/core/SemanticMemoryRevalidation.mjs"},"./sql-memory-store":{"types":"./dist/durable/SqlMemoryStore.d.mts","default":"./dist/durable/SqlMemoryStore.mjs"},"./subagent":{"types":"./dist/capabilities/Subagent.d.mts","default":"./dist/capabilities/Subagent.mjs"},"./subagent-contract":{"types":"./dist/core/SubagentContract.d.mts","default":"./dist/core/SubagentContract.mjs"},"./subagent-host":{"types":"./dist/engine/SubagentHost.d.mts","default":"./dist/engine/SubagentHost.mjs"},"./subagent-reservations":{"types":"./dist/capabilities/SubagentReservations.d.mts","default":"./dist/capabilities/SubagentReservations.mjs"},"./submission-ledger":{"types":"./dist/durable/SubmissionLedger.d.mts","default":"./dist/durable/SubmissionLedger.mjs"},"./submission-status":{"types":"./dist/durable/SubmissionStatus.d.mts","default":"./dist/durable/SubmissionStatus.mjs"},"./subscription":{"types":"./dist/durable/Subscription.d.mts","default":"./dist/durable/Subscription.mjs"},"./subscription-input":{"types":"./dist/durable/SubscriptionInput.d.mts","default":"./dist/durable/SubscriptionInput.mjs"},"./subscription-tools":{"types":"./dist/durable/SubscriptionTools.d.mts","default":"./dist/durable/SubscriptionTools.mjs"},"./subscription-transition":{"types":"./dist/durable/SubscriptionTransition.d.mts","default":"./dist/durable/SubscriptionTransition.mjs"},"./subscriptions":{"types":"./dist/durable/Subscriptions.d.mts","default":"./dist/durable/Subscriptions.mjs"},"./testing/certification":{"types":"./dist/durable/Certification.d.mts","default":"./dist/durable/Certification.mjs"},"./testing/durable-failpoint-test-control":{"types":"./dist/durable/DurableFailpointTestControl.d.mts","default":"./dist/durable/DurableFailpointTestControl.mjs"},"./testing/message-delivery-store-conformance":{"types":"./dist/durable/MessageDeliveryStoreConformance.d.mts","default":"./dist/durable/MessageDeliveryStoreConformance.mjs"},"./testing/schedule-store-conformance":{"types":"./dist/durable/ScheduleStoreConformance.d.mts","default":"./dist/durable/ScheduleStoreConformance.mjs"},"./testing/submission-ledger-conformance":{"types":"./dist/durable/SubmissionLedgerConformance.d.mts","default":"./dist/durable/SubmissionLedgerConformance.mjs"},"./testing/subscription-store-conformance":{"types":"./dist/durable/SubscriptionStoreConformance.d.mts","default":"./dist/durable/SubscriptionStoreConformance.mjs"},"./testing/thread-store-conformance":{"types":"./dist/durable/ThreadStoreConformance.d.mts","default":"./dist/durable/ThreadStoreConformance.mjs"},"./thread":{"types":"./dist/core/Thread.d.mts","default":"./dist/core/Thread.mjs"},"./thread-context-history":{"types":"./dist/durable/ThreadContextHistory.d.mts","default":"./dist/durable/ThreadContextHistory.mjs"},"./thread-context-history-projection":{"types":"./dist/durable/ThreadContextHistoryProjection.d.mts","default":"./dist/durable/ThreadContextHistoryProjection.mjs"},"./thread-history":{"types":"./dist/engine/ThreadHistory.d.mts","default":"./dist/engine/ThreadHistory.mjs"},"./thread-invariants":{"types":"./dist/durable/ThreadInvariants.d.mts","default":"./dist/durable/ThreadInvariants.mjs"},"./thread-projection":{"types":"./dist/durable/ThreadProjection.d.mts","default":"./dist/durable/ThreadProjection.mjs"},"./thread-projection-maintenance":{"types":"./dist/durable/ThreadProjectionMaintenance.d.mts","default":"./dist/durable/ThreadProjectionMaintenance.mjs"},"./thread-store":{"types":"./dist/durable/ThreadStore.d.mts","default":"./dist/durable/ThreadStore.mjs"},"./tool-broker":{"types":"./dist/engine/ToolBroker.d.mts","default":"./dist/engine/ToolBroker.mjs"},"./tool-discovery":{"types":"./dist/capabilities/ToolDiscovery.d.mts","default":"./dist/capabilities/ToolDiscovery.mjs"},"./tool-exposure":{"types":"./dist/ToolExposure.d.mts","default":"./dist/ToolExposure.mjs"},"./tool-reconciler":{"types":"./dist/durable/ToolReconciler.d.mts","default":"./dist/durable/ToolReconciler.mjs"},"./tool-result":{"types":"./dist/core/ToolResult.d.mts","default":"./dist/core/ToolResult.mjs"},"./usage":{"types":"./dist/core/Usage.d.mts","default":"./dist/core/Usage.mjs"},"./wake-scheduler":{"types":"./dist/durable/WakeScheduler.d.mts","default":"./dist/durable/WakeScheduler.mjs"},"./web-capture":{"types":"./dist/capabilities/WebCapture.d.mts","default":"./dist/capabilities/WebCapture.mjs"},"./web-search":{"types":"./dist/capabilities/WebSearch.d.mts","default":"./dist/capabilities/WebSearch.mjs"},"./worker":{"types":"./dist/core/Worker.d.mts","default":"./dist/core/Worker.mjs"},"./worker-host":{"types":"./dist/durable/WorkerHost.d.mts","default":"./dist/durable/WorkerHost.mjs"},"./lifecycle-publication":{"types":"./dist/durable/LifecyclePublication.d.mts","default":"./dist/durable/LifecyclePublication.mjs"}},"description":"Effect-native agents, execution, subagents, and sandbox contracts in one tree-shakeable package.","license":"MIT","repository":{"type":"git","url":"git+https://github.com/danieljvdm/effect-agent.git","directory":"packages/effect-agent"},"files":["dist","src"],"type":"module","sideEffects":[],"publishConfig":{"access":"public"},"scripts":{"build":"vp pack","check":"tsc --noEmit -p tsconfig.json","test":"vp test --passWithNoTests"}}
+{"name":"effect-agent","version":"0.1.0-beta.149","devDependencies":{"@effect/platform-node":"4.0.0-rc.117","@effect/vitest":"4.0.0-rc.117","effect":"4.0.0-rc.117","typescript":"7.0.2","vite-plus":"0.3.3"},"peerDependencies":{"effect":"^4.0.0-rc.117"},"exports":{".":{"types":"./dist/index.d.mts","default":"./dist/index.mjs"},"./activity-store":{"types":"./dist/durable/ActivityStore.d.mts","default":"./dist/durable/ActivityStore.mjs"},"./admin":{"types":"./dist/durable/Admin.d.mts","default":"./dist/durable/Admin.mjs"},"./agent":{"types":"./dist/core/Agent.d.mts","default":"./dist/core/Agent.mjs"},"./agent-error":{"types":"./dist/core/AgentError.d.mts","default":"./dist/core/AgentError.mjs"},"./agent-policy":{"types":"./dist/core/AgentPolicy.d.mts","default":"./dist/core/AgentPolicy.mjs"},"./agent-registration":{"types":"./dist/durable/AgentRegistration.d.mts","default":"./dist/durable/AgentRegistration.mjs"},"./agent-runtime":{"types":"./dist/engine/AgentRuntime.d.mts","default":"./dist/engine/AgentRuntime.mjs"},"./agent-updates":{"types":"./dist/core/AgentUpdates.d.mts","default":"./dist/core/AgentUpdates.mjs"},"./approval":{"types":"./dist/capabilities/Approval.d.mts","default":"./dist/capabilities/Approval.mjs"},"./budget":{"types":"./dist/capabilities/Budget.d.mts","default":"./dist/capabilities/Budget.mjs"},"./code-executor":{"types":"./dist/sandbox/CodeExecutor.d.mts","default":"./dist/sandbox/CodeExecutor.mjs"},"./code-mode":{"types":"./dist/capabilities/CodeMode.d.mts","default":"./dist/capabilities/CodeMode.mjs"},"./commands":{"types":"./dist/capabilities/Commands.d.mts","default":"./dist/capabilities/Commands.mjs"},"./committed-activity":{"types":"./dist/durable/CommittedActivity.d.mts","default":"./dist/durable/CommittedActivity.mjs"},"./compaction":{"types":"./dist/engine/Compaction.d.mts","default":"./dist/engine/Compaction.mjs"},"./context-compactor":{"types":"./dist/engine/ContextCompactor.d.mts","default":"./dist/engine/ContextCompactor.mjs"},"./context-history":{"types":"./dist/engine/ContextHistory.d.mts","default":"./dist/engine/ContextHistory.mjs"},"./context-tools":{"types":"./dist/capabilities/ContextTools.d.mts","default":"./dist/capabilities/ContextTools.mjs"},"./context-window":{"types":"./dist/engine/ContextWindow.d.mts","default":"./dist/engine/ContextWindow.mjs"},"./digest":{"types":"./dist/durable/Digest.d.mts","default":"./dist/durable/Digest.mjs"},"./durable-agent-runtime":{"types":"./dist/durable/DurableAgentRuntime.d.mts","default":"./dist/durable/DurableAgentRuntime.mjs"},"./durable-failpoint":{"types":"./dist/durable/DurableFailpoint.d.mts","default":"./dist/durable/DurableFailpoint.mjs"},"./durable-step":{"types":"./dist/engine/DurableStep.d.mts","default":"./dist/engine/DurableStep.mjs"},"./event-source":{"types":"./dist/durable/EventSource.d.mts","default":"./dist/durable/EventSource.mjs"},"./failure-diagnostic":{"types":"./dist/core/FailureDiagnostic.d.mts","default":"./dist/core/FailureDiagnostic.mjs"},"./git-hub-workflow-source":{"types":"./dist/durable/GitHubWorkflowSource.d.mts","default":"./dist/durable/GitHubWorkflowSource.mjs"},"./id-generator":{"types":"./dist/core/IdGenerator.d.mts","default":"./dist/core/IdGenerator.mjs"},"./identifiers":{"types":"./dist/core/Identifiers.d.mts","default":"./dist/core/Identifiers.mjs"},"./in-memory":{"types":"./dist/InMemory.d.mts","default":"./dist/InMemory.mjs"},"./interactive-browser":{"types":"./dist/sandbox/InteractiveBrowser.d.mts","default":"./dist/sandbox/InteractiveBrowser.mjs"},"./mcp":{"types":"./dist/capabilities/Mcp.d.mts","default":"./dist/capabilities/Mcp.mjs"},"./mcp-client":{"types":"./dist/capabilities/McpClient.d.mts","default":"./dist/capabilities/McpClient.mjs"},"./memory":{"types":"./dist/core/Memory.d.mts","default":"./dist/core/Memory.mjs"},"./memory-namespace":{"types":"./dist/core/MemoryNamespace.d.mts","default":"./dist/core/MemoryNamespace.mjs"},"./memory-notes":{"types":"./dist/capabilities/MemoryNotes.d.mts","default":"./dist/capabilities/MemoryNotes.mjs"},"./memory-reference":{"types":"./dist/core/MemoryReference.d.mts","default":"./dist/core/MemoryReference.mjs"},"./memory-revalidation":{"types":"./dist/core/MemoryRevalidation.d.mts","default":"./dist/core/MemoryRevalidation.mjs"},"./memory-store":{"types":"./dist/core/MemoryStore.d.mts","default":"./dist/core/MemoryStore.mjs"},"./message-delivery":{"types":"./dist/durable/MessageDelivery.d.mts","default":"./dist/durable/MessageDelivery.mjs"},"./messaging":{"types":"./dist/capabilities/Messaging.d.mts","default":"./dist/capabilities/Messaging.mjs"},"./messaging-host":{"types":"./dist/engine/MessagingHost.d.mts","default":"./dist/engine/MessagingHost.mjs"},"./model-context":{"types":"./dist/capabilities/ModelContext.d.mts","default":"./dist/capabilities/ModelContext.mjs"},"./operation-authorizer":{"types":"./dist/durable/OperationAuthorizer.d.mts","default":"./dist/durable/OperationAuthorizer.mjs"},"./output":{"types":"./dist/engine/Output.d.mts","default":"./dist/engine/Output.mjs"},"./page-capture":{"types":"./dist/sandbox/PageCapture.d.mts","default":"./dist/sandbox/PageCapture.mjs"},"./page-crawl":{"types":"./dist/sandbox/PageCrawl.d.mts","default":"./dist/sandbox/PageCrawl.mjs"},"./page-screenshot":{"types":"./dist/sandbox/PageScreenshot.d.mts","default":"./dist/sandbox/PageScreenshot.mjs"},"./persistent-history":{"types":"./dist/durable/PersistentHistory.d.mts","default":"./dist/durable/PersistentHistory.mjs"},"./prepared-input-admission":{"types":"./dist/durable/PreparedInputAdmission.d.mts","default":"./dist/durable/PreparedInputAdmission.mjs"},"./receipt":{"types":"./dist/core/Receipt.d.mts","default":"./dist/core/Receipt.mjs"},"./records":{"types":"./dist/durable/Records.d.mts","default":"./dist/durable/Records.mjs"},"./recovery":{"types":"./dist/durable/Recovery.d.mts","default":"./dist/durable/Recovery.mjs"},"./redaction":{"types":"./dist/capabilities/Redaction.d.mts","default":"./dist/capabilities/Redaction.mjs"},"./remembering":{"types":"./dist/capabilities/Remembering.d.mts","default":"./dist/capabilities/Remembering.mjs"},"./remembering-store":{"types":"./dist/core/RememberingStore.d.mts","default":"./dist/core/RememberingStore.mjs"},"./run-event":{"types":"./dist/core/RunEvent.d.mts","default":"./dist/core/RunEvent.mjs"},"./run-event-sink":{"types":"./dist/engine/RunEventSink.d.mts","default":"./dist/engine/RunEventSink.mjs"},"./run-hooks":{"types":"./dist/capabilities/RunHooks.d.mts","default":"./dist/capabilities/RunHooks.mjs"},"./run-journal":{"types":"./dist/durable/RunJournal.d.mts","default":"./dist/durable/RunJournal.mjs"},"./run-options":{"types":"./dist/engine/RunOptions.d.mts","default":"./dist/engine/RunOptions.mjs"},"./run-policy-usage":{"types":"./dist/core/RunPolicyUsage.d.mts","default":"./dist/core/RunPolicyUsage.mjs"},"./sandbox":{"types":"./dist/sandbox/Sandbox.d.mts","default":"./dist/sandbox/Sandbox.mjs"},"./schedule":{"types":"./dist/durable/Schedule.d.mts","default":"./dist/durable/Schedule.mjs"},"./schedule-transition":{"types":"./dist/durable/ScheduleTransition.d.mts","default":"./dist/durable/ScheduleTransition.mjs"},"./scheduling":{"types":"./dist/durable/Scheduling.d.mts","default":"./dist/durable/Scheduling.mjs"},"./semantic-memory":{"types":"./dist/capabilities/SemanticMemory.d.mts","default":"./dist/capabilities/SemanticMemory.mjs"},"./semantic-memory-index":{"types":"./dist/core/SemanticMemoryIndex.d.mts","default":"./dist/core/SemanticMemoryIndex.mjs"},"./semantic-memory-revalidation":{"types":"./dist/core/SemanticMemoryRevalidation.d.mts","default":"./dist/core/SemanticMemoryRevalidation.mjs"},"./sql-memory-store":{"types":"./dist/durable/SqlMemoryStore.d.mts","default":"./dist/durable/SqlMemoryStore.mjs"},"./subagent":{"types":"./dist/capabilities/Subagent.d.mts","default":"./dist/capabilities/Subagent.mjs"},"./subagent-contract":{"types":"./dist/core/SubagentContract.d.mts","default":"./dist/core/SubagentContract.mjs"},"./subagent-host":{"types":"./dist/engine/SubagentHost.d.mts","default":"./dist/engine/SubagentHost.mjs"},"./subagent-reservations":{"types":"./dist/capabilities/SubagentReservations.d.mts","default":"./dist/capabilities/SubagentReservations.mjs"},"./submission-ledger":{"types":"./dist/durable/SubmissionLedger.d.mts","default":"./dist/durable/SubmissionLedger.mjs"},"./submission-status":{"types":"./dist/durable/SubmissionStatus.d.mts","default":"./dist/durable/SubmissionStatus.mjs"},"./subscription":{"types":"./dist/durable/Subscription.d.mts","default":"./dist/durable/Subscription.mjs"},"./subscription-input":{"types":"./dist/durable/SubscriptionInput.d.mts","default":"./dist/durable/SubscriptionInput.mjs"},"./subscription-tools":{"types":"./dist/durable/SubscriptionTools.d.mts","default":"./dist/durable/SubscriptionTools.mjs"},"./subscription-transition":{"types":"./dist/durable/SubscriptionTransition.d.mts","default":"./dist/durable/SubscriptionTransition.mjs"},"./subscriptions":{"types":"./dist/durable/Subscriptions.d.mts","default":"./dist/durable/Subscriptions.mjs"},"./testing/certification":{"types":"./dist/durable/Certification.d.mts","default":"./dist/durable/Certification.mjs"},"./testing/durable-failpoint-test-control":{"types":"./dist/durable/DurableFailpointTestControl.d.mts","default":"./dist/durable/DurableFailpointTestControl.mjs"},"./testing/message-delivery-store-conformance":{"types":"./dist/durable/MessageDeliveryStoreConformance.d.mts","default":"./dist/durable/MessageDeliveryStoreConformance.mjs"},"./testing/schedule-store-conformance":{"types":"./dist/durable/ScheduleStoreConformance.d.mts","default":"./dist/durable/ScheduleStoreConformance.mjs"},"./testing/submission-ledger-conformance":{"types":"./dist/durable/SubmissionLedgerConformance.d.mts","default":"./dist/durable/SubmissionLedgerConformance.mjs"},"./testing/subscription-store-conformance":{"types":"./dist/durable/SubscriptionStoreConformance.d.mts","default":"./dist/durable/SubscriptionStoreConformance.mjs"},"./testing/thread-store-conformance":{"types":"./dist/durable/ThreadStoreConformance.d.mts","default":"./dist/durable/ThreadStoreConformance.mjs"},"./thread":{"types":"./dist/core/Thread.d.mts","default":"./dist/core/Thread.mjs"},"./thread-context-history":{"types":"./dist/durable/ThreadContextHistory.d.mts","default":"./dist/durable/ThreadContextHistory.mjs"},"./thread-context-history-projection":{"types":"./dist/durable/ThreadContextHistoryProjection.d.mts","default":"./dist/durable/ThreadContextHistoryProjection.mjs"},"./thread-history":{"types":"./dist/engine/ThreadHistory.d.mts","default":"./dist/engine/ThreadHistory.mjs"},"./thread-invariants":{"types":"./dist/durable/ThreadInvariants.d.mts","default":"./dist/durable/ThreadInvariants.mjs"},"./thread-projection":{"types":"./dist/durable/ThreadProjection.d.mts","default":"./dist/durable/ThreadProjection.mjs"},"./thread-projection-maintenance":{"types":"./dist/durable/ThreadProjectionMaintenance.d.mts","default":"./dist/durable/ThreadProjectionMaintenance.mjs"},"./thread-store":{"types":"./dist/durable/ThreadStore.d.mts","default":"./dist/durable/ThreadStore.mjs"},"./tool-broker":{"types":"./dist/engine/ToolBroker.d.mts","default":"./dist/engine/ToolBroker.mjs"},"./tool-discovery":{"types":"./dist/capabilities/ToolDiscovery.d.mts","default":"./dist/capabilities/ToolDiscovery.mjs"},"./tool-exposure":{"types":"./dist/ToolExposure.d.mts","default":"./dist/ToolExposure.mjs"},"./tool-reconciler":{"types":"./dist/durable/ToolReconciler.d.mts","default":"./dist/durable/ToolReconciler.mjs"},"./tool-result":{"types":"./dist/core/ToolResult.d.mts","default":"./dist/core/ToolResult.mjs"},"./usage":{"types":"./dist/core/Usage.d.mts","default":"./dist/core/Usage.mjs"},"./wake-scheduler":{"types":"./dist/durable/WakeScheduler.d.mts","default":"./dist/durable/WakeScheduler.mjs"},"./web-capture":{"types":"./dist/capabilities/WebCapture.d.mts","default":"./dist/capabilities/WebCapture.mjs"},"./web-search":{"types":"./dist/capabilities/WebSearch.d.mts","default":"./dist/capabilities/WebSearch.mjs"},"./worker":{"types":"./dist/core/Worker.d.mts","default":"./dist/core/Worker.mjs"},"./worker-host":{"types":"./dist/durable/WorkerHost.d.mts","default":"./dist/durable/WorkerHost.mjs"},"./lifecycle-publication":{"types":"./dist/durable/LifecyclePublication.d.mts","default":"./dist/durable/LifecyclePublication.mjs"}},"description":"Effect-native agents, execution, subagents, and sandbox contracts in one tree-shakeable package.","license":"MIT","repository":{"type":"git","url":"git+https://github.com/danieljvdm/effect-agent.git","directory":"packages/effect-agent"},"files":["dist","src"],"type":"module","sideEffects":[],"publishConfig":{"access":"public"},"scripts":{"build":"vp pack","check":"tsc --noEmit -p tsconfig.json","test":"vp test --passWithNoTests"}}

package/src/core/Agent.ts

@@ -152,8 +152,12 @@ export interface Definition<
   /** Canonical schema used to decode the final model output. */
   readonly output: OutputSchema;
   /**
-   * Evaluated once while preparing each Run. Outgoing system messages form a leading block;
-   * exact repeats (including provider options) keep their last occurrence. Stored history is unchanged.
+   * Evaluated once while preparing each Run. OpenAI, xAI and native adapters advertising support
+   * preserve chronological system messages, omitting exact repeats only when no distinct system
+   * instruction intervenes. The actual selected model determines support on each call. Other
+   * adapters group systems first and keep the last exact repeat, including provider options;
+   * Anthropic requires an upstream adapter with mid-conversation system-message support.
+   * Stored history is unchanged.
    */
   readonly instructions: Instructions;
   /** Optional projection from decoded input to model-visible native Effect AI prompt content. */

package/src/durable/DurableAgentRuntime.ts

@@ -1266,20 +1266,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
   const submissionScheduling = yield* SubmissionScheduling;
   const store = yield* ThreadStore;
 
-  const publicationPending = (threadId: ThreadId) =>
-    store.lifecyclePublications === undefined
-      ? Effect.succeed(false)
-      : store.lifecyclePublications.pendingDeadlineFor(threadId).pipe(
-          Effect.map(Option.isSome),
-          Effect.mapError((cause) =>
-            ThreadStoreError.make({
-              operation: "read lifecycle publication gate",
-              message: "Native lifecycle publication state is unavailable",
-              cause,
-            }),
-          ),
-        );
-
   const wake = yield* WakeScheduler;
   const failpoint = yield* DurableRuntimeFailpoint;
   const config = yield* DurableRuntimeConfig;
@@ -4625,7 +4611,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
     Effect.gen(function* () {
       const submissionId = submission.submissionId;
 
-      if (yield* publicationPending(submission.threadId)) return { _tag: "yielded" as const };
       const runId = runIdForSubmission(submissionId);
       const boundaries: Array<JournalBoundary> = [];
 
@@ -5532,17 +5517,20 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
       // Current instructions govern the continuation; the original user intent, steering and
       // committed history survive. The pending Turn re-enters through the batch continuation,
       // without duplicating the engine's freshly rendered input.
+      // Retained immediate history can contain system messages. Its prefix stays untouched;
+      // only this Run's instruction slots receive the freshly evaluated instructions.
       const instructionView = (
         messages: ReadonlyArray<Prompt.Message>,
         instructions: ReadonlyArray<Prompt.Message>,
         insertWhenAbsent: boolean,
+        priorRunPrefixLength: number,
       ) => {
         const projected: Array<Prompt.Message> = [];
         const lengths = [0];
         let inserted = false;
 
-        for (const message of messages) {
-          if (message.role === "system") {
+        for (const [index, message] of messages.entries()) {
+          if (index >= priorRunPrefixLength && message.role === "system") {
             if (!inserted) projected.push(...instructions);
             inserted = true;
           } else projected.push(message);
@@ -5556,23 +5544,31 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
         };
       };
 
-      const resumeContext: RunContextHook<never, never> = {
-        prepare: ({ source }) =>
+      const resumeContext = {
+        prepare: ({ source }: { readonly source: Prompt.Prompt }) =>
           Ref.get(stateRef).pipe(
-            Effect.map((state) => ({
-              prompt: Prompt.fromMessages([
-                ...instructionView(
-                  resumeProjection.prompt.content,
-                  source.content
-                    .slice(0, state.baseLen)
-                    .filter((message) => message.role === "system"),
-                  true,
-                ).messages,
-                ...source.content.slice(state.baseLen ?? source.content.length),
-              ]),
-            })),
+            Effect.map((state) => {
+              const view = instructionView(
+                resumeProjection.prompt.content,
+                source.content
+                  .slice(resumeProjection.historyBefore.content.length, state.baseLen)
+                  .filter((message) => message.role === "system"),
+                true,
+                resumeProjection.historyBefore.content.length,
+              );
+
+              return {
+                prompt: Prompt.fromMessages([
+                  ...view.messages,
+                  ...source.content.slice(state.baseLen ?? source.content.length),
+                ]),
+                priorRunPrefixLength: view.prefixLength(
+                  resumeProjection.historyBefore.content.length,
+                ),
+              };
+            }),
           ),
-      };
+      } satisfies RunContextHook<never, never>;
 
       const externalContext = runContextPreparation.hook;
 
@@ -5584,13 +5580,17 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
           : {
               prepare: (request) =>
                 (journal.committedTurns === 0
-                  ? Effect.succeed({ prompt: request.source })
+                  ? Effect.succeed({
+                      prompt: request.source,
+                      priorRunPrefixLength: journal.historyBefore.content.length,
+                    })
                   : resumeContext.prepare(request)
                 ).pipe(
-                  Effect.flatMap(({ prompt }) =>
+                  Effect.flatMap(({ prompt, priorRunPrefixLength }) =>
                     externalContext.prepare({
                       ...request,
                       source: prompt,
+                      priorRunPrefixLength,
                     }),
                   ),
                 ),
@@ -5885,9 +5885,10 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
             const comparisonView = instructionView(
               sourceJournal.prompt.content,
               state.history?.content
-                .slice(0, state.baseLen)
+                .slice(resumeProjection.historyBefore.content.length, state.baseLen)
                 .filter((message) => message.role === "system") ?? [],
               false,
+              sourceJournal.historyBefore.content.length,
             );
 
             // Compare each visible message once. A transformed source can authorize only its
@@ -6251,17 +6252,16 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
           return yield* renderInputPrompt(inputPrompt, decodedInput, encodedInput);
         });
 
-      const yieldForPublication = Effect.gen(function* () {
-        const pending = yield* Effect.exit(publicationPending(submission.threadId));
-
-        if (Exit.isSuccess(pending) && !pending.value) return;
-        // A completed plain-text response may not yet have reached beforeTurn. Retain it
-        // before either a publication wait or its failed state read closes the Attempt.
-        yield* recordHalt(commitPendingTurn);
-        if (Exit.isFailure(pending)) return yield* recordHalt(Effect.failCause(pending.cause));
-        yield* Deferred.succeed(yieldSignal, undefined);
+      // Empty successful drains leave Tool results and RunCompleted in one batch.
+      // A join or interrupted continuation must still retain already returned results.
+      const preserveToolResults = Effect.gen(function* () {
+        const state = yield* Ref.get(stateRef);
 
-        return yield* Effect.never;
+        if (
+          state.pendingTurn !== undefined &&
+          knownIds.has(modelResponseRecordId(runId, state.pendingTurn.turn))
+        )
+          yield* commitPendingTurn;
       });
 
       const input: RunInputHook<
@@ -6270,26 +6270,15 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
       > = {
         drain: (policy) =>
           Effect.gen(function* () {
-            const state = yield* Ref.get(stateRef);
-
-            // A completed Tool batch has returned its outcomes before this steering seam.
-            // Persist them before a host ledger read can halt the Attempt and make those
-            // ordinary calls appear unknown. A no-tool response still belongs to its later
-            // continuation or atomic RunCompleted commit.
-            if (
-              state.pendingTurn !== undefined &&
-              knownIds.has(modelResponseRecordId(runId, state.pendingTurn.turn))
-            )
-              yield* recordHalt(commitPendingTurn);
-
-            yield* yieldForPublication;
-
             const joinedInputs = yield* recordHalt(
               Effect.gen(function* () {
                 const limit = policy === "one" ? 1 : MAX_JOIN_DRAIN;
 
-                const joinedInputs: Array<Pick<UserInputRecorded, "input" | "messageAdmission">> =
-                  [];
+                const joinedInputs: Array<
+                  Pick<UserInputRecorded, "input" | "messageAdmission"> & {
+                    readonly rendered?: Prompt.RawInput;
+                  }
+                > = [];
 
                 if (joinBacklog === undefined) {
                   const hostSnapshot = yield* ledger.loadRecoverySnapshot(
@@ -6331,6 +6320,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
                   const payload = existing.record.payload;
 
                   if (payload._tag !== "UserInputRecorded") continue;
+                  yield* preserveToolResults;
                   joinedInputs.push(payload);
                 }
                 if (joinedInputs.length < limit) {
@@ -6362,6 +6352,28 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
                       );
                       continue;
                     }
+
+                    const payload = {
+                      input: claim.inputPayload,
+                      ...(claimSnapshot.submission.messageAdmission === undefined
+                        ? {}
+                        : { messageAdmission: claimSnapshot.submission.messageAdmission }),
+                    };
+
+                    const rendered = yield* Effect.result(renderJoinedInput(payload));
+
+                    if (Result.isFailure(rendered)) {
+                      // The rejecting input gets its own Run and normal typed failure.
+                      // Leave it and the unconsumed suffix ready, preserving queue order
+                      // and preventing one invalid prompt from failing unrelated receipts.
+                      for (const remaining of claims.slice(claims.indexOf(claim))) {
+                        yield* ledger.revertJoining(
+                          RevertJoiningRequest.make({ submissionId: remaining.submissionId }),
+                        );
+                      }
+                      break;
+                    }
+                    yield* preserveToolResults;
                     const recordId = submissionInputRecordId(claim.submissionId);
                     let sequence: CanonicalSequence;
                     const existing = joinedInputEnvelopes.get(claim.submissionId);
@@ -6410,24 +6422,23 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
                     );
                     deliveredJoinInputs.add(claim.submissionId);
                     joinedInputs.push({
-                      input: claim.inputPayload,
-                      ...(claimSnapshot.submission.messageAdmission === undefined
-                        ? {}
-                        : { messageAdmission: claimSnapshot.submission.messageAdmission }),
+                      ...payload,
+                      rendered: rendered.success,
                     });
                   }
                 }
 
                 return joinedInputs;
-              }),
+              }).pipe(
+                Effect.onExit((exit) => (Exit.isFailure(exit) ? preserveToolResults : Effect.void)),
+              ),
             );
 
-            // Appending a canonical joined input may retain a new publication. Its native
-            // receipt remains successful; recovery reattaches it after acknowledgement.
-            yield* yieldForPublication;
-
             return yield* Effect.forEach(joinedInputs, (joinedInput) =>
-              renderJoinedInput(joinedInput).pipe(
+              (joinedInput.rendered === undefined
+                ? renderJoinedInput(joinedInput)
+                : Effect.succeed(joinedInput.rendered)
+              ).pipe(
                 Effect.map((input): RunInputCommand => ({
                   kind: "steering",
                   input,
@@ -7047,8 +7058,8 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
         history: pending === undefined ? journal.historyBefore : resumeProjection.historyBefore,
         onHistory,
         input,
-        // Worker corrections drain together at safe seams, bounded by MAX_JOIN_DRAIN.
-        commandDrainPolicy: submission.workerAdmission === undefined ? "one" : "all",
+        // Ready corrections share the next model Turn, bounded by MAX_JOIN_DRAIN.
+        commandDrainPolicy: "all",
         ...(journal.committedTurns > 0 || Schema.is(FrameworkMessage)(submission.messageAdmission)
           ? { retainedInput: submission.inputPayload }
           : {}),
@@ -7108,7 +7119,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
             // Preparation may resolve the next Model from canonical Tool results or invoke
             // a compaction Model. Publish the completed Turn before either can observe it.
             yield* recordHalt(commitPendingTurn);
-            yield* yieldForPublication;
 
             if (
               yieldAfter !== undefined &&
@@ -7642,6 +7652,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
             }),
           ),
       ).pipe(
+        Effect.onExit((exit) => (Exit.hasInterrupts(exit) ? preserveToolResults : Effect.void)),
         // Retain while the Attempt's services, claim renewal and abort watcher are still live.
         // A failed retention halts the coordinator; it is not a failed Tool or a safe suspension.
         Effect.tapCause((cause) =>
@@ -7692,9 +7703,7 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
       const execution = Effect.raceFirst(consume, Effect.raceFirst(abortWatcher, renewal));
 
       const raced = (
-        yieldAfter === undefined &&
-        submissionScheduling.yieldTo === undefined &&
-        store.lifecyclePublications === undefined
+        yieldAfter === undefined && submissionScheduling.yieldTo === undefined
           ? execution
           : Effect.raceFirst(
               execution,
@@ -8572,7 +8581,6 @@ const make = Effect.fn("DurableAgentRuntime.make")(function* (
 
       const attempt = Effect.scoped(
         Effect.gen(function* () {
-          if (yield* publicationPending(threadId)) return Option.none();
           const claimed = yield* acquireClaim(threadId, handoff);
 
           if (Option.isNone(claimed)) return Option.none();