perstack 0.0.121 → 0.0.122

package/dist/bin/cli.js

@@ -21327,7 +21327,7 @@ async function expertVersionsHandler(scopeName, options) {
 
 //#endregion
 //#region ../../packages/runtime/package.json
-var version$1 = "0.0.133";
+var version$1 = "0.0.134";
 
 //#endregion
 //#region ../../packages/runtime/src/helpers/usage.ts
@@ -89359,6 +89359,8 @@ const PROVIDERS_WITHOUT_REASONING_HISTORY = [
 	"deepseek",
 	"ollama"
 ];
+/** Providers that don't handle multiple consecutive system messages well */
+const PROVIDERS_REQUIRING_MERGED_SYSTEM_MESSAGES = ["openai", "azure-openai"];
 /**
 * Filter out reasoning parts from messages for providers that don't support them.
 * This prevents "Non-OpenAI reasoning parts are not supported" warnings from AI SDK.
@@ -89377,6 +89379,43 @@ function filterReasoningPartsForProvider(messages, providerName) {
 		};
 	});
 }
+/**
+* Merge consecutive system messages into a single message for providers that
+* don't support multiple system/developer messages (e.g., OpenAI reasoning models).
+* Preserves providerOptions from the last message in each group.
+*/
+function mergeConsecutiveSystemMessages(messages, providerName) {
+	if (!PROVIDERS_REQUIRING_MERGED_SYSTEM_MESSAGES.includes(providerName)) return messages;
+	const result = [];
+	let systemGroup = [];
+	const flushSystemGroup = () => {
+		if (systemGroup.length === 0) return;
+		if (systemGroup.length === 1) result.push({
+			role: "system",
+			content: systemGroup[0].content,
+			providerOptions: systemGroup[0].providerOptions
+		});
+		else {
+			const lastOptions = systemGroup[systemGroup.length - 1].providerOptions;
+			result.push({
+				role: "system",
+				content: systemGroup.map((m) => m.content).join("\n\n"),
+				providerOptions: lastOptions
+			});
+		}
+		systemGroup = [];
+	};
+	for (const message of messages) if (message.role === "system") systemGroup.push({
+		content: message.content,
+		providerOptions: message.providerOptions
+	});
+	else {
+		flushSystemGroup();
+		result.push(message);
+	}
+	flushSystemGroup();
+	return result;
+}
 var LLMExecutor = class {
 	constructor(adapter, model) {
 		this.adapter = adapter;
@@ -89387,7 +89426,7 @@ var LLMExecutor = class {
 		const baseProviderOptions = this.adapter.getProviderOptions(params.providerOptionsConfig);
 		const reasoningOptions = shouldEnableReasoning(params.reasoningBudget) && params.reasoningBudget ? this.adapter.getReasoningOptions(params.reasoningBudget) : void 0;
 		const providerOptions = this.mergeProviderOptions(baseProviderOptions, reasoningOptions);
-		const messages = filterReasoningPartsForProvider(params.messages, this.adapter.providerName);
+		const messages = mergeConsecutiveSystemMessages(filterReasoningPartsForProvider(params.messages, this.adapter.providerName), this.adapter.providerName);
 		try {
 			return {
 				success: true,
@@ -89426,7 +89465,7 @@ var LLMExecutor = class {
 		const baseProviderOptions = this.adapter.getProviderOptions(params.providerOptionsConfig);
 		const reasoningOptions = shouldEnableReasoning(params.reasoningBudget) && params.reasoningBudget ? this.adapter.getReasoningOptions(params.reasoningBudget) : void 0;
 		const providerOptions = this.mergeProviderOptions(baseProviderOptions, reasoningOptions);
-		const messages = filterReasoningPartsForProvider(params.messages, this.adapter.providerName);
+		const messages = mergeConsecutiveSystemMessages(filterReasoningPartsForProvider(params.messages, this.adapter.providerName), this.adapter.providerName);
 		try {
 			return {
 				success: true,
@@ -89451,7 +89490,7 @@ var LLMExecutor = class {
 		const baseProviderOptions = this.adapter.getProviderOptions(params.providerOptionsConfig);
 		const reasoningOptions = shouldEnableReasoning(params.reasoningBudget) && params.reasoningBudget ? this.adapter.getReasoningOptions(params.reasoningBudget) : void 0;
 		const providerOptions = this.mergeProviderOptions(baseProviderOptions, reasoningOptions);
-		const messages = filterReasoningPartsForProvider(params.messages, this.adapter.providerName);
+		const messages = mergeConsecutiveSystemMessages(filterReasoningPartsForProvider(params.messages, this.adapter.providerName), this.adapter.providerName);
 		const streamResult = streamText({
 			model: this.model,
 			messages,
@@ -92621,49 +92660,8 @@ async function callingInteractiveToolsLogic({ setting, checkpoint, step }) {
 	});
 }
 
-//#endregion
-//#region ../../node_modules/.bun/ts-dedent@2.2.0/node_modules/ts-dedent/dist/index.js
-var require_dist = /* @__PURE__ */ __commonJSMin(((exports) => {
-	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.dedent = void 0;
-	function dedent(templ) {
-		var values = [];
-		for (var _i = 1; _i < arguments.length; _i++) values[_i - 1] = arguments[_i];
-		var strings = Array.from(typeof templ === "string" ? [templ] : templ);
-		strings[strings.length - 1] = strings[strings.length - 1].replace(/\r?\n([\t ]*)$/, "");
-		var indentLengths = strings.reduce(function(arr, str) {
-			var matches = str.match(/\n([\t ]+|(?!\s).)/g);
-			if (matches) return arr.concat(matches.map(function(match) {
-				var _a, _b;
-				return (_b = (_a = match.match(/[\t ]/g)) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
-			}));
-			return arr;
-		}, []);
-		if (indentLengths.length) {
-			var pattern_1 = new RegExp("\n[	 ]{" + Math.min.apply(Math, indentLengths) + "}", "g");
-			strings = strings.map(function(str) {
-				return str.replace(pattern_1, "\n");
-			});
-		}
-		strings[0] = strings[0].replace(/^\r?\n/, "");
-		var string = strings[0];
-		values.forEach(function(value, i) {
-			var endentations = string.match(/(?:^|\n)( *)$/);
-			var endentation = endentations ? endentations[1] : "";
-			var indentedValue = value;
-			if (typeof value === "string" && value.includes("\n")) indentedValue = String(value).split("\n").map(function(str, i) {
-				return i === 0 ? str : "" + endentation + str;
-			}).join("\n");
-			string += indentedValue + strings[i + 1];
-		});
-		return string;
-	}
-	exports.dedent = dedent;
-}));
-
 //#endregion
 //#region ../../packages/runtime/src/messages/message.ts
-var import_dist = require_dist();
 function createUserMessage(contents) {
 	return {
 		type: "userMessage",
@@ -92700,36 +92698,31 @@ function createToolMessage(contents) {
 }
 function messageToCoreMessage(message) {
 	switch (message.type) {
-		case "instructionMessage": return {
-			role: "system",
-			content: instructionContentsToCoreContent(message.contents),
-			providerOptions: message.cache ? { anthropic: { cacheControl: { type: "ephemeral" } } } : void 0
-		};
-		case "userMessage": return {
+		case "instructionMessage": {
+			const { contents, cache } = message;
+			return contents.map((part, index) => ({
+				role: "system",
+				content: part.text,
+				providerOptions: cache && index === contents.length - 1 ? { anthropic: { cacheControl: { type: "ephemeral" } } } : void 0
+			}));
+		}
+		case "userMessage": return [{
 			role: "user",
 			content: userContentsToCoreContent(message.contents),
 			providerOptions: message.cache ? { anthropic: { cacheControl: { type: "ephemeral" } } } : void 0
-		};
-		case "expertMessage": return {
+		}];
+		case "expertMessage": return [{
 			role: "assistant",
 			content: expertContentsToCoreContent(message.contents),
 			providerOptions: message.cache ? { anthropic: { cacheControl: { type: "ephemeral" } } } : void 0
-		};
-		case "toolMessage": return {
+		}];
+		case "toolMessage": return [{
 			role: "tool",
 			content: toolContentsToCoreContent(message.contents),
 			providerOptions: message.cache ? { anthropic: { cacheControl: { type: "ephemeral" } } } : void 0
-		};
+		}];
 	}
 }
-function instructionContentsToCoreContent(contents) {
-	return contents.reduce((acc, part) => {
-		return import_dist.dedent`
-      ${acc}
-      ${part.text}
-    `.trim();
-	}, "");
-}
 function userContentsToCoreContent(contents) {
 	return contents.map((part) => {
 		switch (part.type) {
@@ -93032,7 +93025,7 @@ async function generatingToolCallLogic({ setting, checkpoint, step, skillManager
 	const { messages } = checkpoint;
 	let reasoningCompletedViaCallback = false;
 	const executionResult = await llmExecutor.streamText({
-		messages: messages.map(messageToCoreMessage),
+		messages: messages.flatMap(messageToCoreMessage),
 		maxRetries: setting.maxRetries,
 		tools: getToolSet(skillManager),
 		toolChoice: "auto",
@@ -93252,8 +93245,49 @@ async function generatingToolCallLogic({ setting, checkpoint, step, skillManager
 	throw new Error(`Unexpected finish reason: ${finishReason}`);
 }
 
+//#endregion
+//#region ../../node_modules/.bun/ts-dedent@2.2.0/node_modules/ts-dedent/dist/index.js
+var require_dist = /* @__PURE__ */ __commonJSMin(((exports) => {
+	Object.defineProperty(exports, "__esModule", { value: true });
+	exports.dedent = void 0;
+	function dedent(templ) {
+		var values = [];
+		for (var _i = 1; _i < arguments.length; _i++) values[_i - 1] = arguments[_i];
+		var strings = Array.from(typeof templ === "string" ? [templ] : templ);
+		strings[strings.length - 1] = strings[strings.length - 1].replace(/\r?\n([\t ]*)$/, "");
+		var indentLengths = strings.reduce(function(arr, str) {
+			var matches = str.match(/\n([\t ]+|(?!\s).)/g);
+			if (matches) return arr.concat(matches.map(function(match) {
+				var _a, _b;
+				return (_b = (_a = match.match(/[\t ]/g)) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+			}));
+			return arr;
+		}, []);
+		if (indentLengths.length) {
+			var pattern_1 = new RegExp("\n[	 ]{" + Math.min.apply(Math, indentLengths) + "}", "g");
+			strings = strings.map(function(str) {
+				return str.replace(pattern_1, "\n");
+			});
+		}
+		strings[0] = strings[0].replace(/^\r?\n/, "");
+		var string = strings[0];
+		values.forEach(function(value, i) {
+			var endentations = string.match(/(?:^|\n)( *)$/);
+			var endentation = endentations ? endentations[1] : "";
+			var indentedValue = value;
+			if (typeof value === "string" && value.includes("\n")) indentedValue = String(value).split("\n").map(function(str, i) {
+				return i === 0 ? str : "" + endentation + str;
+			}).join("\n");
+			string += indentedValue + strings[i + 1];
+		});
+		return string;
+	}
+	exports.dedent = dedent;
+}));
+
 //#endregion
 //#region ../../packages/runtime/src/messages/instruction-message.ts
+var import_dist = require_dist();
 function getDelegateMetaInstruction(startedAt) {
 	return import_dist.dedent`
     Before starting work, investigate the workspace and understand the current state. Then use the todo tool to create a plan of action. Work through the todos step by step, marking each completed as you go.
@@ -93308,26 +93342,29 @@ function getCoordinatorMetaInstruction(startedAt) {
   `;
 }
 function createInstructionMessage(expert, startedAt) {
-	const instruction = import_dist.dedent`
+	const preamble = import_dist.dedent`
     You are Perstack, an AI expert that tackles tasks requested by users by utilizing all available tools.
 
     ${isCoordinatorExpert(expert.name) ? getCoordinatorMetaInstruction(startedAt) : getDelegateMetaInstruction(startedAt)}
-
-    ---
-
-    ${expert.instruction}
-
-    ---
-
-    ${getSkillRules(expert)}
   `;
+	const contents = [{
+		id: createId(),
+		type: "textPart",
+		text: preamble
+	}, {
+		id: createId(),
+		type: "textPart",
+		text: expert.instruction
+	}];
+	const skillRules = getSkillRules(expert);
+	if (skillRules) contents.push({
+		id: createId(),
+		type: "textPart",
+		text: skillRules
+	});
 	return {
 		type: "instructionMessage",
-		contents: [{
-			id: createId(),
-			type: "textPart",
-			text: instruction
-		}],
+		contents,
 		id: createId()
 	};
 }
@@ -122908,7 +122945,7 @@ async function startHandler(expertKey, query, options, handlerOptions) {
 //#endregion
 //#region package.json
 var name = "perstack";
-var version = "0.0.121";
+var version = "0.0.122";
 var description = "PerStack CLI";
 
 //#endregion